From 279853b16a2bca4f931be0237fff97c5ba702b1f Mon Sep 17 00:00:00 2001
From: Denis Glazachev <d.glazachev@gmail.com>
Date: Fri, 20 Nov 2020 02:02:18 +0400
Subject: [PATCH 001/611] WIP: Implement group extraction and role mapping

---
 src/Access/AccessControlManager.cpp |   2 +-
 src/Access/Authentication.cpp       |  20 +-
 src/Access/Authentication.h         |   7 +
 src/Access/LDAPAccessStorage.cpp    | 359 ++++++++++++++++++++++++----
 src/Access/LDAPAccessStorage.h      |  20 +-
 src/Access/LDAPClient.cpp           | 217 +++++++++++++++--
 src/Access/LDAPClient.h             |   5 +-
 src/Access/LDAPParams.h             |  35 +++
 8 files changed, 588 insertions(+), 77 deletions(-)

diff --git a/src/Access/AccessControlManager.cpp b/src/Access/AccessControlManager.cpp
index a95d65ebb59..5aa9699d96f 100644
--- a/src/Access/AccessControlManager.cpp
+++ b/src/Access/AccessControlManager.cpp
@@ -292,7 +292,7 @@ void AccessControlManager::addStoragesFromUserDirectoriesConfig(
         else if (type == "ldap")
             type = LDAPAccessStorage::STORAGE_TYPE;
 
-        String name = config.getString(prefix + ".name", type);
+        String name = config.getString(prefix + ".name", key_in_user_directories);
 
         if (type == MemoryAccessStorage::STORAGE_TYPE)
         {
diff --git a/src/Access/Authentication.cpp b/src/Access/Authentication.cpp
index d29e2f897e8..27a62e3a2af 100644
--- a/src/Access/Authentication.cpp
+++ b/src/Access/Authentication.cpp
@@ -82,12 +82,7 @@ bool Authentication::isCorrectPassword(const String & password_, const String &
 
         case LDAP_SERVER:
         {
-            auto ldap_server_params = external_authenticators.getLDAPServerParams(server_name);
-            ldap_server_params.user = user_;
-            ldap_server_params.password = password_;
-
-            LDAPSimpleAuthClient ldap_client(ldap_server_params);
-            return ldap_client.check();
+            return isCorrectPasswordLDAP(password_, user_, external_authenticators);
         }
 
         case MAX_TYPE:
@@ -96,4 +91,17 @@ bool Authentication::isCorrectPassword(const String & password_, const String &
     throw Exception("Cannot check if the password is correct for authentication type " + toString(type), ErrorCodes::NOT_IMPLEMENTED);
 }
 
+bool Authentication::isCorrectPasswordLDAP(const String & password_, const String & user_, const ExternalAuthenticators & external_authenticators, const LDAPSearchParamsList * search_params, LDAPSearchResultsList * search_results) const
+{
+    if (type != LDAP_SERVER)
+        throw Exception("Cannot check if the password is correct using LDAP logic for authentication type " + toString(type), ErrorCodes::BAD_ARGUMENTS);
+
+    auto ldap_server_params = external_authenticators.getLDAPServerParams(server_name);
+    ldap_server_params.user = user_;
+    ldap_server_params.password = password_;
+
+    LDAPSimpleAuthClient ldap_client(ldap_server_params);
+    return ldap_client.authenticate(search_params, search_results);
+}
+
 }
diff --git a/src/Access/Authentication.h b/src/Access/Authentication.h
index 38714339221..87f320d6e1a 100644
--- a/src/Access/Authentication.h
+++ b/src/Access/Authentication.h
@@ -6,6 +6,8 @@
 #include <Poco/SHA1Engine.h>
 #include <boost/algorithm/hex.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
+#include <set>
+#include <vector>
 
 
 namespace DB
@@ -19,6 +21,10 @@ namespace ErrorCodes
 }
 
 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.
 class Authentication
@@ -90,6 +96,7 @@ public:
     /// Checks if the provided password is correct. Returns false if not.
     /// User name and external authenticators' info are used only by some specific authentication type (e.g., LDAP_SERVER).
     bool isCorrectPassword(const String & password_, const String & user_, const ExternalAuthenticators & external_authenticators) const;
+    bool isCorrectPasswordLDAP(const String & password_, const String & user_, const ExternalAuthenticators & external_authenticators, const LDAPSearchParamsList * search_params = nullptr, LDAPSearchResultsList * search_results = nullptr) 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); }
diff --git a/src/Access/LDAPAccessStorage.cpp b/src/Access/LDAPAccessStorage.cpp
index 92de7fce8d7..7218c317b8c 100644
--- a/src/Access/LDAPAccessStorage.cpp
+++ b/src/Access/LDAPAccessStorage.cpp
@@ -2,6 +2,7 @@
 #include <Access/AccessControlManager.h>
 #include <Access/User.h>
 #include <Access/Role.h>
+#include <Access/LDAPClient.h>
 #include <Common/Exception.h>
 #include <common/logger_useful.h>
 #include <ext/scope_guard.h>
@@ -9,8 +10,10 @@
 #include <Poco/JSON/JSON.h>
 #include <Poco/JSON/Object.h>
 #include <Poco/JSON/Stringifier.h>
+#include <boost/container_hash/hash.hpp>
 #include <boost/range/algorithm/copy.hpp>
 #include <iterator>
+#include <regex>
 #include <sstream>
 
 
@@ -44,6 +47,7 @@ void LDAPAccessStorage::setConfiguration(AccessControlManager * access_control_m
 
     const bool has_server = config.has(prefix_str + "server");
     const bool has_roles = config.has(prefix_str + "roles");
+    const bool has_role_mapping = config.has(prefix_str + "role_mapping");
 
     if (!has_server)
         throw Exception("Missing 'server' field for LDAP user directory.", ErrorCodes::BAD_ARGUMENTS);
@@ -52,20 +56,75 @@ void LDAPAccessStorage::setConfiguration(AccessControlManager * access_control_m
     if (ldap_server_cfg.empty())
         throw Exception("Empty 'server' field for LDAP user directory.", ErrorCodes::BAD_ARGUMENTS);
 
-    std::set<String> roles_cfg;
+    std::set<String> common_roles_cfg;
     if (has_roles)
     {
         Poco::Util::AbstractConfiguration::Keys role_names;
         config.keys(prefix_str + "roles", role_names);
 
         // Currently, we only extract names of roles from the section names and assign them directly and unconditionally.
-        roles_cfg.insert(role_names.begin(), role_names.end());
+        common_roles_cfg.insert(role_names.begin(), role_names.end());
+    }
+
+    LDAPSearchParamsList role_search_params_cfg;
+    if (has_role_mapping)
+    {
+        Poco::Util::AbstractConfiguration::Keys all_keys;
+        config.keys(prefix, all_keys);
+        for (const auto & key : all_keys)
+        {
+            if (key != "role_mapping" && key.find("role_mapping[") != 0)
+                continue;
+
+            const String rm_prefix = prefix_str + key;
+            const String rm_prefix_str = rm_prefix + '.';
+            role_search_params_cfg.emplace_back();
+            auto & rm_params = role_search_params_cfg.back();
+
+            rm_params.base_dn = config.getString(rm_prefix_str + "base_dn", "");
+            rm_params.attribute = config.getString(rm_prefix_str + "attribute", "cn");
+            rm_params.filter_prefix = config.getString(rm_prefix_str + "filter_prefix", "");
+            rm_params.filter_suffix = config.getString(rm_prefix_str + "filter_suffix", "");
+            rm_params.fail_if_all_rules_mismatch = config.getBool(rm_prefix_str + "fail_if_all_rules_mismatch", true);
+
+            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;
+            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);
+
+            Poco::Util::AbstractConfiguration::Keys all_mapping_keys;
+            config.keys(rm_prefix, all_mapping_keys);
+            for (const auto & mkey : all_mapping_keys)
+            {
+                if (mkey != "rule" && mkey.find("rule[") != 0)
+                    continue;
+
+                const String rule_prefix = rm_prefix_str + mkey;
+                const String rule_prefix_str = rule_prefix + '.';
+                rm_params.role_mapping_rules.emplace_back();
+                auto & role_mapping_rule = rm_params.role_mapping_rules.back();
+
+                role_mapping_rule.match = config.getString(rule_prefix_str + "match", ".+");
+                role_mapping_rule.replace = config.getString(rule_prefix_str + "replace", "$&");
+                role_mapping_rule.continue_on_match = config.getBool(rule_prefix_str + "continue_on_match", false);
+            }
+        }
     }
 
     access_control_manager = access_control_manager_;
     ldap_server = ldap_server_cfg;
-    default_role_names.swap(roles_cfg);
-    roles_of_interest.clear();
+    role_search_params.swap(role_search_params_cfg);
+    common_role_names.swap(common_roles_cfg);
+
+    users_per_roles.clear();
+    granted_role_names.clear();
+    granted_role_ids.clear();
+    external_role_hashes.clear();
+
     role_change_subscription = access_control_manager->subscribeForChanges<Role>(
         [this] (const UUID & id, const AccessEntityPtr & entity)
         {
@@ -73,11 +132,14 @@ void LDAPAccessStorage::setConfiguration(AccessControlManager * access_control_m
         }
     );
 
-    /// Update `roles_of_interests` with initial values.
-    for (const auto & role_name : default_role_names)
+    // Update granted_role_* with the initial values: resolved ids of roles from common_role_names.
+    for (const auto & role_name : common_role_names)
     {
-        if (auto role_id = access_control_manager->find<Role>(role_name))
-            roles_of_interest.emplace(*role_id, role_name);
+        if (const auto role_id = access_control_manager->find<Role>(role_name))
+        {
+            granted_role_names.insert_or_assign(*role_id, role_name);
+            granted_role_ids.insert_or_assign(role_name, *role_id);
+        }
     }
 }
 
@@ -85,54 +147,263 @@ void LDAPAccessStorage::setConfiguration(AccessControlManager * access_control_m
 void LDAPAccessStorage::processRoleChange(const UUID & id, const AccessEntityPtr & entity)
 {
     std::scoped_lock lock(mutex);
-
-    /// Update `roles_of_interests`.
     auto role = typeid_cast<std::shared_ptr<const Role>>(entity);
-    bool need_to_update_users = false;
+    const auto it = granted_role_names.find(id);
 
-    if (role && default_role_names.count(role->getName()))
+    if (role) // Added or renamed role.
     {
-        /// If a role was created with one of the `default_role_names` or renamed to one of the `default_role_names`,
-        /// then set `need_to_update_users`.
-        need_to_update_users = roles_of_interest.insert_or_assign(id, role->getName()).second;
+        const auto & new_role_name = role->getName();
+        if (it != granted_role_names.end())
+        {
+            // Revoke the old role if its name has been changed.
+            const auto & old_role_name = it->second;
+            if (new_role_name != old_role_name)
+            {
+                applyRoleChangeNoLock(false /* revoke */, id, old_role_name);
+            }
+        }
+
+        // Grant the role.
+        applyRoleChangeNoLock(true /* grant */, id, new_role_name);
     }
-    else
+    else // Removed role.
     {
-        /// If a role was removed or renamed to a name which isn't contained in the `default_role_names`,
-        /// then set `need_to_update_users`.
-        need_to_update_users = roles_of_interest.erase(id) > 0;
+        if (it != granted_role_names.end())
+        {
+            // Revoke the old role.
+            const auto & old_role_name = it->second;
+            applyRoleChangeNoLock(false /* revoke */, id, old_role_name);
+        }
+    }
+}
+
+
+void LDAPAccessStorage::applyRoleChangeNoLock(bool grant, const UUID & role_id, const String & role_name)
+{
+    std::vector<UUID> user_ids;
+
+    // Find relevant user ids.
+    if (common_role_names.count(role_name))
+    {
+        user_ids = memory_storage.findAll<User>();
+    }
+    else {
+        const auto it = users_per_roles.find(role_name);
+        if (it != users_per_roles.end())
+        {
+            const auto & user_names = it->second;
+            user_ids.reserve(user_names.size());
+            for (const auto & user_name : user_names)
+            {
+                if (const auto user_id = memory_storage.find<User>(user_name))
+                    user_ids.emplace_back(*user_id);
+            }
+        }
     }
 
-    /// Update users which have been created.
-    if (need_to_update_users)
+    // Update relevant users' granted roles.
+    if (!user_ids.empty())
     {
-        auto update_func = [this] (const AccessEntityPtr & entity_) -> AccessEntityPtr
+        auto update_func = [&role_id, &grant] (const AccessEntityPtr & entity_) -> AccessEntityPtr
         {
             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;
-                granted_roles.clear();
-                boost::range::copy(roles_of_interest | boost::adaptors::map_keys, std::inserter(granted_roles, granted_roles.end()));
+
+                if (grant)
+                    granted_roles.insert(role_id);
+                else
+                    granted_roles.erase(role_id);
+
                 return changed_user;
             }
             return entity_;
         };
-        memory_storage.update(memory_storage.findAll<User>(), update_func);
+
+        memory_storage.update(user_ids, update_func);
+
+        if (grant)
+        {
+            granted_role_names.insert_or_assign(role_id, role_name);
+            granted_role_ids.insert_or_assign(role_name, role_id);
+        }
+        else
+        {
+            granted_role_names.erase(role_id);
+            granted_role_ids.erase(role_name);
+        }
     }
 }
 
 
-void LDAPAccessStorage::checkAllDefaultRoleNamesFoundNoLock() const
+void LDAPAccessStorage::grantRolesNoLock(User & user, const LDAPSearchResultsList & external_roles) const
 {
-    boost::container::flat_set<std::string_view> role_names_of_interest;
-    boost::range::copy(roles_of_interest | boost::adaptors::map_values, std::inserter(role_names_of_interest, role_names_of_interest.end()));
+    const auto & user_name = user.getName();
+    const auto new_hash = boost::hash<LDAPSearchResultsList>{}(external_roles);
+    auto & granted_roles = user.granted_roles.roles;
 
-    for (const auto & role_name : default_role_names)
+    // Map external role names to local role names.
+    const auto user_role_names = mapExternalRolesNoLock(user_name, external_roles);
+
+    external_role_hashes.erase(user_name);
+    granted_roles.clear();
+
+    // Grant the common roles.
+
+    // Initially, all the available ids of common roles were resolved in setConfiguration(),
+    // and, then, maintained by processRoleChange(), so here we just grant those that exist (i.e., resolved).
+    for (const auto & role_name : common_role_names)
     {
-        if (!role_names_of_interest.count(role_name))
-            throwDefaultRoleNotFound(role_name);
+        const auto it = granted_role_ids.find(role_name);
+        if (it == granted_role_ids.end())
+        {
+            LOG_WARNING(getLogger(), "Unable to grant common role '{}' to user '{}': role not found", role_name, user_name);
+        }
+        else
+        {
+            const auto & role_id = it->second;
+            granted_roles.insert(role_id);
+        }
     }
+
+    // Grant the mapped external roles.
+
+    // Cleanup helper relations.
+    for (auto it = users_per_roles.begin(); it != users_per_roles.end();)
+    {
+        const auto & role_name = it->first;
+        auto & user_names = it->second;
+        if (user_role_names.count(role_name) == 0)
+        {
+            user_names.erase(user_name);
+            if (user_names.empty())
+            {
+                if (common_role_names.count(role_name) == 0)
+                {
+                    auto rit = granted_role_ids.find(role_name);
+                    if (rit != granted_role_ids.end())
+                    {
+                        granted_role_names.erase(rit->second);
+                        granted_role_ids.erase(rit);
+                    }
+                }
+                users_per_roles.erase(it++);
+            }
+            else
+            {
+                ++it;
+            }
+        }
+        else
+        {
+            ++it;
+        }
+    }
+
+    // Resolve and assign mapped external role ids.
+    for (const auto & role_name : user_role_names)
+    {
+        users_per_roles[role_name].insert(user_name);
+        const auto it = granted_role_ids.find(role_name);
+        if (it == granted_role_ids.end())
+        {
+            if (const auto role_id = access_control_manager->find<Role>(role_name))
+            {
+                granted_roles.insert(*role_id);
+                granted_role_names.insert_or_assign(*role_id, role_name);
+                granted_role_ids.insert_or_assign(role_name, *role_id);
+            }
+            else
+            {
+                LOG_WARNING(getLogger(), "Unable to grant mapped role '{}' to user '{}': role not found", role_name, user_name);
+            }
+        }
+        else
+        {
+            const auto & role_id = it->second;
+            granted_roles.insert(role_id);
+        }
+    }
+
+    external_role_hashes[user_name] = new_hash;
+}
+
+
+void LDAPAccessStorage::updateRolesNoLock(const UUID & id, const String & user_name, const LDAPSearchResultsList & external_roles) const
+{
+    // common_role_names are not included since they don't change.
+    const auto new_hash = boost::hash<LDAPSearchResultsList>{}(external_roles);
+
+    const auto it = external_role_hashes.find(user_name);
+    if (it != external_role_hashes.end() && it->second == new_hash)
+        return;
+
+    auto update_func = [this, &external_roles] (const AccessEntityPtr & entity_) -> AccessEntityPtr
+    {
+        if (auto user = typeid_cast<std::shared_ptr<const User>>(entity_))
+        {
+            auto changed_user = typeid_cast<std::shared_ptr<User>>(user->clone());
+            grantRolesNoLock(*changed_user, external_roles);
+            return changed_user;
+        }
+        return entity_;
+    };
+
+    memory_storage.update(id, update_func);
+}
+
+
+std::set<String> LDAPAccessStorage::mapExternalRolesNoLock(const String & user_name, const LDAPSearchResultsList & external_roles) const
+{
+    std::set<String> role_names;
+
+    if (external_roles.size() != role_search_params.size())
+        throw Exception("Unable to match external roles to mapping rules", ErrorCodes::BAD_ARGUMENTS);
+
+    std::vector<std::regex> re_cache;
+
+    for (std::size_t i = 0; i < external_roles.size(); ++i)
+    {
+        const auto & external_role_set = external_roles[i];
+        const auto & role_mapping_rules = role_search_params[i].role_mapping_rules;
+
+        re_cache.clear();
+        re_cache.reserve(role_mapping_rules.size());
+
+        for (const auto & mapping_rule : role_mapping_rules)
+        {
+            re_cache.emplace_back(mapping_rule.match, std::regex_constants::ECMAScript | std::regex_constants::optimize);
+        }
+
+        for (const auto & external_role : external_role_set)
+        {
+            bool have_match = false;
+            for (std::size_t j = 0; j < role_mapping_rules.size(); ++j)
+            {
+                const auto & mapping_rule = role_mapping_rules[j];
+                const auto & re = re_cache[j];
+                std::smatch match_results;
+                if (std::regex_match(external_role, match_results, re))
+                {
+                    role_names.emplace(match_results.format(mapping_rule.replace));
+                    have_match = true;
+                    if (!mapping_rule.continue_on_match)
+                        break;
+                }
+            }
+            if (!have_match && role_search_params[i].fail_if_all_rules_mismatch)
+                throw Exception("None of the external role mapping rules were able to match '" + external_role + "' string, received from LDAP server '" + ldap_server + "' for user '" + user_name + "'", ErrorCodes::BAD_ARGUMENTS);
+        }
+    }
+
+    return role_names;
+}
+
+
+bool LDAPAccessStorage::isPasswordCorrectLDAPNoLock(const User & user, const String & password, const ExternalAuthenticators & external_authenticators, LDAPSearchResultsList & search_results) const
+{
+    return user.authentication.isCorrectPasswordLDAP(password, user.getName(), external_authenticators, &role_search_params, &search_results);
 }
 
 
@@ -148,7 +419,7 @@ String LDAPAccessStorage::getStorageParamsJSON() const
     Poco::JSON::Object params_json;
 
     params_json.set("server", ldap_server);
-    params_json.set("roles", default_role_names);
+    params_json.set("roles", common_role_names);
 
     std::ostringstream oss;     // STYLE_CHECK_ALLOW_STD_STRING_STREAM
     oss.exceptions(std::ios::failbit);
@@ -251,17 +522,21 @@ bool LDAPAccessStorage::hasSubscriptionImpl(EntityType type) const
 UUID LDAPAccessStorage::loginImpl(const String & user_name, const String & password, 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);
     if (id)
     {
         auto user = memory_storage.read<User>(*id);
 
-        if (!isPasswordCorrectImpl(*user, password, external_authenticators))
+        if (!isPasswordCorrectLDAPNoLock(*user, password, external_authenticators, external_roles))
             throwInvalidPassword();
 
         if (!isAddressAllowedImpl(*user, address))
             throwAddressNotAllowed(address);
 
+        // Just in case external_roles are changed. This will be no-op if they are not.
+        updateRolesNoLock(*id, user_name, external_roles);
+
         return *id;
     }
     else
@@ -272,16 +547,13 @@ UUID LDAPAccessStorage::loginImpl(const String & user_name, const String & passw
         user->authentication = Authentication(Authentication::Type::LDAP_SERVER);
         user->authentication.setServerName(ldap_server);
 
-        if (!isPasswordCorrectImpl(*user, password, external_authenticators))
+        if (!isPasswordCorrectLDAPNoLock(*user, password, external_authenticators, external_roles))
             throwInvalidPassword();
 
         if (!isAddressAllowedImpl(*user, address))
             throwAddressNotAllowed(address);
 
-        checkAllDefaultRoleNamesFoundNoLock();
-
-        auto & granted_roles = user->granted_roles.roles;
-        boost::range::copy(roles_of_interest | boost::adaptors::map_keys, std::inserter(granted_roles, granted_roles.end()));
+        grantRolesNoLock(*user, external_roles);
 
         return memory_storage.insert(user);
     }
@@ -303,18 +575,13 @@ UUID LDAPAccessStorage::getIDOfLoggedUserImpl(const String & user_name) const
         user->authentication = Authentication(Authentication::Type::LDAP_SERVER);
         user->authentication.setServerName(ldap_server);
 
-        checkAllDefaultRoleNamesFoundNoLock();
+        LDAPSearchResultsList external_roles;
+        // TODO: mapped external roles are not available here. Implement?
 
-        auto & granted_roles = user->granted_roles.roles;
-        boost::range::copy(roles_of_interest | boost::adaptors::map_keys, std::inserter(granted_roles, granted_roles.end()));
+        grantRolesNoLock(*user, external_roles);
 
         return memory_storage.insert(user);
     }
 }
 
-void LDAPAccessStorage::throwDefaultRoleNotFound(const String & role_name)
-{
-    throw Exception("One of the default roles, the role '" + role_name + "', is not found", IAccessEntity::TypeInfo::get(IAccessEntity::Type::ROLE).not_found_error_code);
-}
-
 }
diff --git a/src/Access/LDAPAccessStorage.h b/src/Access/LDAPAccessStorage.h
index b1b0001d9bc..eaa39dd1624 100644
--- a/src/Access/LDAPAccessStorage.h
+++ b/src/Access/LDAPAccessStorage.h
@@ -6,6 +6,7 @@
 #include <map>
 #include <mutex>
 #include <set>
+#include <vector>
 
 
 namespace Poco
@@ -20,6 +21,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,
@@ -58,15 +63,22 @@ private: // IAccessStorage implementations.
 private:
     void setConfiguration(AccessControlManager * access_control_manager_, const Poco::Util::AbstractConfiguration & config, const String & prefix);
     void processRoleChange(const UUID & id, const AccessEntityPtr & entity);
-    void checkAllDefaultRoleNamesFoundNoLock() const;
 
-    [[noreturn]] static void throwDefaultRoleNotFound(const String & role_name);
+    void applyRoleChangeNoLock(bool grant, const UUID & role_id, const String & role_name);
+    void grantRolesNoLock(User & user, const LDAPSearchResultsList & external_roles) const;
+    void updateRolesNoLock(const UUID & id, const String & user_name, const LDAPSearchResultsList & external_roles) const;
+    std::set<String> mapExternalRolesNoLock(const String & user_name, const LDAPSearchResultsList & external_roles) const;
+    bool isPasswordCorrectLDAPNoLock(const User & user, const String & password, const ExternalAuthenticators & external_authenticators, LDAPSearchResultsList & search_results) const;
 
     mutable std::recursive_mutex mutex;
     AccessControlManager * access_control_manager = nullptr;
     String ldap_server;
-    std::set<String> default_role_names;
-    std::map<UUID, String> roles_of_interest;
+    LDAPSearchParamsList role_search_params;
+    std::set<String> common_role_names;
+    mutable std::map<String, std::set<String>> users_per_roles; // per-user roles: role name -> user names
+    mutable std::map<UUID, String> granted_role_names;          // currently granted roles: role id -> role name
+    mutable std::map<String, UUID> granted_role_ids;            // currently granted roles: role name -> role id
+    mutable std::map<String, std::size_t> external_role_hashes; // user name -> LDAPSearchResultsList hash
     ext::scope_guard role_change_subscription;
     mutable MemoryAccessStorage memory_storage;
 };
diff --git a/src/Access/LDAPClient.cpp b/src/Access/LDAPClient.cpp
index a3223902361..5bc63ebfd83 100644
--- a/src/Access/LDAPClient.cpp
+++ b/src/Access/LDAPClient.cpp
@@ -1,6 +1,10 @@
 #include <Access/LDAPClient.h>
 #include <Common/Exception.h>
 #include <ext/scope_guard.h>
+#include <common/logger_useful.h>
+
+#include <Poco/Logger.h>
+#include <boost/algorithm/string/predicate.hpp>
 
 #include <mutex>
 
@@ -65,36 +69,38 @@ namespace
 
 }
 
-void LDAPClient::diag(const int rc)
+void LDAPClient::diag(const int rc, String text)
 {
     std::scoped_lock lock(ldap_global_mutex);
 
     if (rc != LDAP_SUCCESS)
     {
-        String text;
         const char * raw_err_str = ldap_err2string(rc);
-
-        if (raw_err_str)
-            text = raw_err_str;
+        if (raw_err_str && *raw_err_str != '\0')
+        {
+            if (!text.empty())
+                text += ": ";
+            text += raw_err_str;
+        }
 
         if (handle)
         {
-            String message;
             char * raw_message = nullptr;
             ldap_get_option(handle, LDAP_OPT_DIAGNOSTIC_MESSAGE, &raw_message);
 
-            if (raw_message)
-            {
-                message = raw_message;
-                ldap_memfree(raw_message);
-                raw_message = nullptr;
-            }
+            SCOPE_EXIT({
+                if (raw_message)
+                {
+                    ldap_memfree(raw_message);
+                    raw_message = nullptr;
+                }
+            });
 
-            if (!message.empty())
+            if (raw_message && *raw_message != '\0')
             {
                 if (!text.empty())
                     text += ": ";
-                text += message;
+                text += raw_message;
             }
         }
 
@@ -250,10 +256,9 @@ void LDAPClient::openConnection()
 
             break;
         }
+
         default:
-        {
             throw Exception("Unknown SASL mechanism", ErrorCodes::LDAP_ERROR);
-        }
     }
 }
 
@@ -268,13 +273,164 @@ void LDAPClient::closeConnection() noexcept
     handle = nullptr;
 }
 
-bool LDAPSimpleAuthClient::check()
+LDAPSearchResults LDAPClient::search(const LDAPSearchParams & search_params)
 {
     std::scoped_lock lock(ldap_global_mutex);
 
+    LDAPSearchResults 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;
+    }
+
+    const String filter = search_params.filter_prefix + escapeForLDAP(params.user) + search_params.filter_suffix;
+    char * attrs[] = { const_cast<char *>(search_params.attribute.c_str()), nullptr };
+    ::timeval timeout = { params.search_timeout.count(), 0 };
+    LDAPMessage* msgs = nullptr;
+
+    SCOPE_EXIT({
+        if (msgs)
+        {
+            ldap_msgfree(msgs);
+            msgs = nullptr;
+        }
+    });
+
+    diag(ldap_search_ext_s(handle, search_params.base_dn.c_str(), scope, filter.c_str(), attrs, 0, nullptr, nullptr, &timeout, params.search_limit, &msgs));
+
+    for (
+         auto * msg = ldap_first_message(handle, msgs);
+         msg != nullptr;
+         msg = ldap_next_message(handle, msg)
+    )
+    {
+        switch (ldap_msgtype(msg))
+        {
+            case LDAP_RES_SEARCH_ENTRY:
+            {
+                BerElement * ber = nullptr;
+
+                SCOPE_EXIT({
+                    if (ber)
+                    {
+                        ber_free(ber, 0);
+                        ber = nullptr;
+                    }
+                });
+
+                for (
+                     auto * attr = ldap_first_attribute(handle, msg, &ber);
+                     attr != nullptr;
+                     attr = ldap_next_attribute(handle, msg, ber)
+                )
+                {
+                    SCOPE_EXIT({
+                        ldap_memfree(attr);
+                        attr = nullptr;
+                    });
+
+                    if (search_params.attribute.empty() || boost::iequals(attr, search_params.attribute))
+                    {
+                        auto ** vals = ldap_get_values_len(handle, msg, attr);
+                        if (vals)
+                        {
+                            SCOPE_EXIT({
+                                ldap_value_free_len(vals);
+                                vals = nullptr;
+                            });
+
+                            for (std::size_t i = 0; vals[i]; i++)
+                            {
+                                if (vals[i]->bv_val && vals[i]->bv_len > 0)
+                                    result.emplace(vals[i]->bv_val, vals[i]->bv_len);
+                            }
+                        }
+                    }
+                }
+
+                break;
+            }
+
+            case LDAP_RES_SEARCH_REFERENCE:
+            {
+                char ** referrals = nullptr;
+                diag(ldap_parse_reference(handle, msg, &referrals, nullptr, 0));
+
+                if (referrals)
+                {
+                    SCOPE_EXIT({
+//                      ldap_value_free(referrals);
+                        ber_memvfree(reinterpret_cast<void **>(referrals));
+                        referrals = nullptr;
+                    });
+
+                    for (std::size_t i = 0; referrals[i]; i++)
+                    {
+                        LOG_WARNING(&Poco::Logger::get("LDAPClient"), "Received reference during LDAP search but not following it: {}", referrals[i]);
+                    }
+                }
+
+                break;
+            }
+
+            case LDAP_RES_SEARCH_RESULT:
+            {
+                int rc = LDAP_SUCCESS;
+                char * matched_msg = nullptr;
+                char * error_msg = nullptr;
+
+                diag(ldap_parse_result(handle, msg, &rc, &matched_msg, &error_msg, nullptr, nullptr, 0));
+
+                if (rc != LDAP_SUCCESS)
+                {
+                    String message = "LDAP search failed";
+
+                    const char * raw_err_str = ldap_err2string(rc);
+                    if (raw_err_str && *raw_err_str != '\0')
+                    {
+                        message += ": ";
+                        message += raw_err_str;
+                    }
+
+                    if (error_msg && *error_msg != '\0')
+                    {
+                        message += ", ";
+                        message += error_msg;
+                    }
+
+                    if (matched_msg && *matched_msg != '\0')
+                    {
+                        message += ", matching DN part: ";
+                        message += matched_msg;
+                    }
+
+                    throw Exception(message, ErrorCodes::LDAP_ERROR);
+                }
+
+                break;
+            }
+
+            case -1:
+                throw Exception("Failed to process LDAP search message", ErrorCodes::LDAP_ERROR);
+        }
+    }
+
+    return result;
+}
+
+bool LDAPSimpleAuthClient::authenticate(const LDAPSearchParamsList * search_params, LDAPSearchResultsList * search_results)
+{
     if (params.user.empty())
         throw Exception("LDAP authentication of a user with empty name is not allowed", ErrorCodes::BAD_ARGUMENTS);
 
+    if (!search_params != !search_results)
+        throw Exception("Cannot return LDAP search results", ErrorCodes::BAD_ARGUMENTS);
+
     // Silently reject authentication attempt if the password is empty as if it didn't match.
     if (params.password.empty())
         return false;
@@ -284,6 +440,26 @@ bool LDAPSimpleAuthClient::check()
     // Will throw on any error, including invalid credentials.
     openConnection();
 
+    // While connected, run search queries and save the results, if asked.
+    if (search_params)
+    {
+        search_results->clear();
+        search_results->reserve(search_params->size());
+
+        try
+        {
+            for (const auto & single_search_params : *search_params)
+            {
+                search_results->emplace_back(search(single_search_params));
+            }
+        }
+        catch (...)
+        {
+            search_results->clear();
+            throw;
+        }
+    }
+
     return true;
 }
 
@@ -303,7 +479,12 @@ void LDAPClient::closeConnection() noexcept
 {
 }
 
-bool LDAPSimpleAuthClient::check()
+LDAPSearchResults LDAPClient::search(const LDAPSearchParams & search_params)
+{
+    throw Exception("ClickHouse was built without LDAP support", ErrorCodes::FEATURE_IS_NOT_ENABLED_AT_BUILD_TIME);
+}
+
+bool LDAPSimpleAuthClient::authenticate()
 {
     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 777c87c5b94..f0ace69649b 100644
--- a/src/Access/LDAPClient.h
+++ b/src/Access/LDAPClient.h
@@ -30,9 +30,10 @@ public:
     LDAPClient & operator= (LDAPClient &&) = delete;
 
 protected:
-    MAYBE_NORETURN void diag(const int rc);
+    MAYBE_NORETURN void diag(const int rc, String text = "");
     MAYBE_NORETURN void openConnection();
     void closeConnection() noexcept;
+    LDAPSearchResults search(const LDAPSearchParams & search_params);
 
 protected:
     const LDAPServerParams params;
@@ -46,7 +47,7 @@ class LDAPSimpleAuthClient
 {
 public:
     using LDAPClient::LDAPClient;
-    bool check();
+    bool authenticate(const LDAPSearchParamsList * search_params, LDAPSearchResultsList * search_results);
 };
 
 }
diff --git a/src/Access/LDAPParams.h b/src/Access/LDAPParams.h
index eeadba6bc01..70a11155854 100644
--- a/src/Access/LDAPParams.h
+++ b/src/Access/LDAPParams.h
@@ -3,11 +3,46 @@
 #include <common/types.h>
 
 #include <chrono>
+#include <set>
+#include <vector>
 
 
 namespace DB
 {
 
+struct LDAPRoleMappingRules
+{
+    String match = ".+";
+    String replace = "$&";
+
+    bool continue_on_match = false;
+};
+
+struct LDAPSearchParams
+{
+    enum class Scope
+    {
+        BASE,
+        ONE_LEVEL,
+        SUBTREE,
+        CHILDREN
+    };
+
+    String base_dn;
+    String attribute = "cn";
+    Scope scope = Scope::SUBTREE;
+
+    String filter_prefix;
+    String filter_suffix;
+
+    bool fail_if_all_rules_mismatch = false;
+    std::vector<LDAPRoleMappingRules> role_mapping_rules;
+};
+
+using LDAPSearchParamsList = std::vector<LDAPSearchParams>;
+using LDAPSearchResults = std::set<String>;
+using LDAPSearchResultsList = std::vector<LDAPSearchResults>;
+
 struct LDAPServerParams
 {
     enum class ProtocolVersion

From be184272d8a84a8887e9f0d7a76c28025d1c9c33 Mon Sep 17 00:00:00 2001
From: Denis Glazachev <d.glazachev@gmail.com>
Date: Fri, 20 Nov 2020 02:26:52 +0400
Subject: [PATCH 002/611] Compilation fixes

---
 src/Access/LDAPAccessStorage.cpp | 3 ++-
 src/Access/LDAPClient.cpp        | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Access/LDAPAccessStorage.cpp b/src/Access/LDAPAccessStorage.cpp
index 7218c317b8c..e12098c69a6 100644
--- a/src/Access/LDAPAccessStorage.cpp
+++ b/src/Access/LDAPAccessStorage.cpp
@@ -187,7 +187,8 @@ void LDAPAccessStorage::applyRoleChangeNoLock(bool grant, const UUID & role_id,
     {
         user_ids = memory_storage.findAll<User>();
     }
-    else {
+    else
+    {
         const auto it = users_per_roles.find(role_name);
         if (it != users_per_roles.end())
         {
diff --git a/src/Access/LDAPClient.cpp b/src/Access/LDAPClient.cpp
index 5bc63ebfd83..45879ddf480 100644
--- a/src/Access/LDAPClient.cpp
+++ b/src/Access/LDAPClient.cpp
@@ -465,7 +465,7 @@ bool LDAPSimpleAuthClient::authenticate(const LDAPSearchParamsList * search_para
 
 #else // USE_LDAP
 
-void LDAPClient::diag(const int)
+void LDAPClient::diag(const int, String)
 {
     throw Exception("ClickHouse was built without LDAP support", ErrorCodes::FEATURE_IS_NOT_ENABLED_AT_BUILD_TIME);
 }
@@ -479,12 +479,12 @@ void LDAPClient::closeConnection() noexcept
 {
 }
 
-LDAPSearchResults LDAPClient::search(const LDAPSearchParams & search_params)
+LDAPSearchResults LDAPClient::search(const LDAPSearchParams &)
 {
     throw Exception("ClickHouse was built without LDAP support", ErrorCodes::FEATURE_IS_NOT_ENABLED_AT_BUILD_TIME);
 }
 
-bool LDAPSimpleAuthClient::authenticate()
+bool LDAPSimpleAuthClient::authenticate(const LDAPSearchParamsList *, LDAPSearchResultsList *)
 {
     throw Exception("ClickHouse was built without LDAP support", ErrorCodes::FEATURE_IS_NOT_ENABLED_AT_BUILD_TIME);
 }

From facdd225aaeb4628a6dce48592b8d2a0fe5a110c Mon Sep 17 00:00:00 2001
From: Denis Glazachev <d.glazachev@gmail.com>
Date: Fri, 20 Nov 2020 20:59:56 +0400
Subject: [PATCH 003/611] Add regex syntax checks

---
 src/Access/Authentication.cpp    |  4 ++--
 src/Access/LDAPAccessStorage.cpp | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/Access/Authentication.cpp b/src/Access/Authentication.cpp
index 27a62e3a2af..8270c1465fe 100644
--- a/src/Access/Authentication.cpp
+++ b/src/Access/Authentication.cpp
@@ -34,13 +34,13 @@ Authentication::Digest Authentication::getPasswordDoubleSHA1() const
         }
 
         case SHA256_PASSWORD:
-            throw Exception("Cannot get password double SHA1 for user with 'SHA256_PASSWORD' authentication.", ErrorCodes::BAD_ARGUMENTS);
+            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);
+            throw Exception("Cannot get password double SHA1 for user with 'LDAP_SERVER' authentication", ErrorCodes::BAD_ARGUMENTS);
 
         case MAX_TYPE:
             break;
diff --git a/src/Access/LDAPAccessStorage.cpp b/src/Access/LDAPAccessStorage.cpp
index e12098c69a6..02d64a9e4c9 100644
--- a/src/Access/LDAPAccessStorage.cpp
+++ b/src/Access/LDAPAccessStorage.cpp
@@ -50,11 +50,11 @@ void LDAPAccessStorage::setConfiguration(AccessControlManager * access_control_m
     const bool has_role_mapping = config.has(prefix_str + "role_mapping");
 
     if (!has_server)
-        throw Exception("Missing 'server' field for LDAP user directory.", ErrorCodes::BAD_ARGUMENTS);
+        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())
-        throw Exception("Empty 'server' field for LDAP user directory.", ErrorCodes::BAD_ARGUMENTS);
+        throw Exception("Empty 'server' field for LDAP user directory", ErrorCodes::BAD_ARGUMENTS);
 
     std::set<String> common_roles_cfg;
     if (has_roles)
@@ -94,7 +94,7 @@ void LDAPAccessStorage::setConfiguration(AccessControlManager * access_control_m
             else if (scope == "subtree")   rm_params.scope = LDAPSearchParams::Scope::SUBTREE;
             else if (scope == "children")  rm_params.scope = LDAPSearchParams::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);
+                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);
 
             Poco::Util::AbstractConfiguration::Keys all_mapping_keys;
             config.keys(rm_prefix, all_mapping_keys);
@@ -109,6 +109,16 @@ void LDAPAccessStorage::setConfiguration(AccessControlManager * access_control_m
                 auto & role_mapping_rule = rm_params.role_mapping_rules.back();
 
                 role_mapping_rule.match = config.getString(rule_prefix_str + "match", ".+");
+                try
+                {
+                    // Construct unused regex instance just to check the syntax.
+                    std::regex(role_mapping_rule.match, std::regex_constants::ECMAScript);
+                }
+                catch (const std::regex_error & e)
+                {
+                    throw Exception("ECMAScript regex syntax error in 'match' field in '" + mkey + "' rule of '" + key + "' section of LDAP user directory: " + e.what(), ErrorCodes::BAD_ARGUMENTS);
+                }
+
                 role_mapping_rule.replace = config.getString(rule_prefix_str + "replace", "$&");
                 role_mapping_rule.continue_on_match = config.getBool(rule_prefix_str + "continue_on_match", false);
             }
@@ -371,7 +381,6 @@ std::set<String> LDAPAccessStorage::mapExternalRolesNoLock(const String & user_n
 
         re_cache.clear();
         re_cache.reserve(role_mapping_rules.size());
-
         for (const auto & mapping_rule : role_mapping_rules)
         {
             re_cache.emplace_back(mapping_rule.match, std::regex_constants::ECMAScript | std::regex_constants::optimize);

From a0a50c1eb62a0082efebb1beeecbd8a7ac68c5f1 Mon Sep 17 00:00:00 2001
From: Denis Glazachev <d.glazachev@gmail.com>
Date: Fri, 20 Nov 2020 23:31:21 +0400
Subject: [PATCH 004/611] Change some config parameters to handle placeholders

---
 src/Access/ExternalAuthenticators.cpp | 17 ++++++++++---
 src/Access/LDAPAccessStorage.cpp      |  3 +--
 src/Access/LDAPClient.cpp             | 36 ++++++++++++++++++++++++---
 src/Access/LDAPParams.h               |  8 ++----
 4 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/src/Access/ExternalAuthenticators.cpp b/src/Access/ExternalAuthenticators.cpp
index 3ed1b21c3c2..6f37bbf666e 100644
--- a/src/Access/ExternalAuthenticators.cpp
+++ b/src/Access/ExternalAuthenticators.cpp
@@ -27,6 +27,7 @@ auto parseLDAPServer(const Poco::Util::AbstractConfiguration & config, const Str
 
     const bool has_host = config.has(ldap_server_config + ".host");
     const bool has_port = config.has(ldap_server_config + ".port");
+    const bool has_bind_dn = config.has(ldap_server_config + ".bind_dn");
     const bool has_auth_dn_prefix = config.has(ldap_server_config + ".auth_dn_prefix");
     const bool has_auth_dn_suffix = config.has(ldap_server_config + ".auth_dn_suffix");
     const bool has_enable_tls = config.has(ldap_server_config + ".enable_tls");
@@ -46,11 +47,19 @@ auto parseLDAPServer(const Poco::Util::AbstractConfiguration & config, const Str
     if (params.host.empty())
         throw Exception("Empty 'host' entry", ErrorCodes::BAD_ARGUMENTS);
 
-    if (has_auth_dn_prefix)
-        params.auth_dn_prefix = config.getString(ldap_server_config + ".auth_dn_prefix");
+    if (has_bind_dn)
+    {
+        if (has_auth_dn_prefix || has_auth_dn_suffix)
+            throw Exception("Deprecated 'auth_dn_prefix' and 'auth_dn_suffix' entries cannot be used with 'bind_dn' entry", ErrorCodes::BAD_ARGUMENTS);
 
-    if (has_auth_dn_suffix)
-        params.auth_dn_suffix = config.getString(ldap_server_config + ".auth_dn_suffix");
+        params.bind_dn = config.getString(ldap_server_config + ".bind_dn");
+    }
+    else if (has_auth_dn_prefix || has_auth_dn_suffix)
+    {
+        const auto auth_dn_prefix = config.getString(ldap_server_config + ".auth_dn_prefix");
+        const auto auth_dn_suffix = config.getString(ldap_server_config + ".auth_dn_suffix");
+        params.bind_dn = auth_dn_prefix + "{username}" + auth_dn_suffix;
+    }
 
     if (has_enable_tls)
     {
diff --git a/src/Access/LDAPAccessStorage.cpp b/src/Access/LDAPAccessStorage.cpp
index 02d64a9e4c9..814e9d63826 100644
--- a/src/Access/LDAPAccessStorage.cpp
+++ b/src/Access/LDAPAccessStorage.cpp
@@ -82,9 +82,8 @@ void LDAPAccessStorage::setConfiguration(AccessControlManager * access_control_m
             auto & rm_params = role_search_params_cfg.back();
 
             rm_params.base_dn = config.getString(rm_prefix_str + "base_dn", "");
+            rm_params.search_filter = config.getString(rm_prefix_str + "search_filter", "");
             rm_params.attribute = config.getString(rm_prefix_str + "attribute", "cn");
-            rm_params.filter_prefix = config.getString(rm_prefix_str + "filter_prefix", "");
-            rm_params.filter_suffix = config.getString(rm_prefix_str + "filter_suffix", "");
             rm_params.fail_if_all_rules_mismatch = config.getBool(rm_prefix_str + "fail_if_all_rules_mismatch", true);
 
             auto scope = config.getString(rm_prefix_str + "scope", "subtree");
diff --git a/src/Access/LDAPClient.cpp b/src/Access/LDAPClient.cpp
index 45879ddf480..c702aa3c40f 100644
--- a/src/Access/LDAPClient.cpp
+++ b/src/Access/LDAPClient.cpp
@@ -7,6 +7,8 @@
 #include <boost/algorithm/string/predicate.hpp>
 
 #include <mutex>
+#include <utility>
+#include <vector>
 
 #include <cstring>
 
@@ -67,6 +69,28 @@ namespace
         return dest;
     }
 
+    auto replacePlaceholders(const String & src, const std::vector<std::pair<String, String>> & pairs)
+    {
+        String dest = src;
+
+        for (const auto & pair : pairs)
+        {
+            const auto & placeholder = pair.first;
+            const auto & value = pair.second;
+            for (
+                 auto pos = dest.find(placeholder);
+                 pos != std::string::npos;
+                 pos = dest.find(placeholder, pos)
+            )
+            {
+                dest.replace(pos, placeholder.size(), value);
+                pos += value.size();
+            }
+        }
+
+        return dest;
+    }
+
 }
 
 void LDAPClient::diag(const int rc, String text)
@@ -246,13 +270,14 @@ void LDAPClient::openConnection()
     {
         case LDAPServerParams::SASLMechanism::SIMPLE:
         {
-            const String dn = params.auth_dn_prefix + escapeForLDAP(params.user) + params.auth_dn_suffix;
+            const auto escaped_username = escapeForLDAP(params.user);
+            const auto bind_dn = replacePlaceholders(params.bind_dn, { {"{username}", escaped_username} });
 
             ::berval cred;
             cred.bv_val = const_cast<char *>(params.password.c_str());
             cred.bv_len = params.password.size();
 
-            diag(ldap_sasl_bind_s(handle, dn.c_str(), LDAP_SASL_SIMPLE, &cred, nullptr, nullptr, nullptr));
+            diag(ldap_sasl_bind_s(handle, bind_dn.c_str(), LDAP_SASL_SIMPLE, &cred, nullptr, nullptr, nullptr));
 
             break;
         }
@@ -288,7 +313,10 @@ LDAPSearchResults LDAPClient::search(const LDAPSearchParams & search_params)
         case LDAPSearchParams::Scope::CHILDREN:  scope = LDAP_SCOPE_CHILDREN; break;
     }
 
-    const String filter = search_params.filter_prefix + escapeForLDAP(params.user) + search_params.filter_suffix;
+    const auto escaped_username = escapeForLDAP(params.user);
+    const auto bind_dn = replacePlaceholders(params.bind_dn, { {"{username}", escaped_username} });
+    const auto base_dn = replacePlaceholders(search_params.base_dn, { {"{username}", escaped_username}, {"{bind_dn}", bind_dn} });
+    const auto search_filter = replacePlaceholders(search_params.search_filter, { {"{username}", escaped_username}, {"{bind_dn}", bind_dn}, {"{base_dn}", base_dn} });
     char * attrs[] = { const_cast<char *>(search_params.attribute.c_str()), nullptr };
     ::timeval timeout = { params.search_timeout.count(), 0 };
     LDAPMessage* msgs = nullptr;
@@ -301,7 +329,7 @@ LDAPSearchResults LDAPClient::search(const LDAPSearchParams & search_params)
         }
     });
 
-    diag(ldap_search_ext_s(handle, search_params.base_dn.c_str(), scope, filter.c_str(), attrs, 0, nullptr, nullptr, &timeout, params.search_limit, &msgs));
+    diag(ldap_search_ext_s(handle, base_dn.c_str(), scope, search_filter.c_str(), attrs, 0, nullptr, nullptr, &timeout, params.search_limit, &msgs));
 
     for (
          auto * msg = ldap_first_message(handle, msgs);
diff --git a/src/Access/LDAPParams.h b/src/Access/LDAPParams.h
index 70a11155854..7e03a94e76e 100644
--- a/src/Access/LDAPParams.h
+++ b/src/Access/LDAPParams.h
@@ -29,12 +29,10 @@ struct LDAPSearchParams
     };
 
     String base_dn;
+    String search_filter;
     String attribute = "cn";
     Scope scope = Scope::SUBTREE;
 
-    String filter_prefix;
-    String filter_suffix;
-
     bool fail_if_all_rules_mismatch = false;
     std::vector<LDAPRoleMappingRules> role_mapping_rules;
 };
@@ -97,9 +95,7 @@ struct LDAPServerParams
 
     SASLMechanism sasl_mechanism = SASLMechanism::SIMPLE;
 
-    String auth_dn_prefix;
-    String auth_dn_suffix;
-
+    String bind_dn;
     String user;
     String password;
 

From c12e6ae7c5eb408d06e2a16acb980e3d51553141 Mon Sep 17 00:00:00 2001
From: Denis Glazachev <d.glazachev@gmail.com>
Date: Sat, 21 Nov 2020 00:49:29 +0400
Subject: [PATCH 005/611] Actualize Add role_mapping documentation (comments)

---
 programs/server/config.xml | 66 +++++++++++++++++++++++++++++++++-----
 1 file changed, 58 insertions(+), 8 deletions(-)

diff --git a/programs/server/config.xml b/programs/server/config.xml
index e17b59671af..380fcacd543 100644
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@@ -219,9 +219,9 @@
              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.
-                auth_dn_prefix, auth_dn_suffix - prefix and suffix used to construct the DN to bind to.
-                        Effectively, the resulting DN will be constructed as auth_dn_prefix + escape(user_name) + auth_dn_suffix string.
-                        Note, that this implies that auth_dn_suffix should usually have comma ',' as its first non-space character.
+                bind_dn - template used to construct the DN to bind to.
+                        The resulting DN will be constructed by replacing all '{username}' substrings of the template with the actual
+                         user name during each authentication attempt.
                 enable_tls - flag to trigger use of 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).
@@ -239,8 +239,7 @@
                 <my_ldap_server>
                     <host>localhost</host>
                     <port>636</port>
-                    <auth_dn_prefix>uid=</auth_dn_prefix>
-                    <auth_dn_suffix>,ou=users,dc=example,dc=com</auth_dn_suffix>
+                    <bind_dn>uid={username},ou=users,dc=example,dc=com</bind_dn>
                     <enable_tls>yes</enable_tls>
                     <tls_minimum_protocol_version>tls1.2</tls_minimum_protocol_version>
                     <tls_require_cert>demand</tls_require_cert>
@@ -269,9 +268,43 @@
                 server - one of LDAP server names defined in '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, user will not be able to perform any actions after authentication.
-                        If any of the listed roles is not defined locally at the time of authentication, the authenthication attempt
-                         will fail as if the provided password was incorrect.
+                        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.
+                        The list of strings (values of attributes) returned by the search will be transformed and the resulting strings
+                         will be treated as local role names and assigned to the user.
+                        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 '{username}' and '{bind_dn}' substrings
+                             of the template with the actual user name and bind DN during each LDAP search.
+                    attribute - attribute name whose values will be returned by the 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 '{username}', '{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.
+                    fail_if_all_rules_mismatch - flag to trigger failure if none of the rules were able to match and transform any
+                             of the resulting strings returned by the LDAP search. By default, set to 'true'.
+                    rule - section with matching and mapping info.
+                            Each string will be matched to the regex and, if there is a full match, replaced using format string to
+                             get the name of the local role that needs to be assigned to the user.
+                            There can be multiple 'rule' sections defined inside the same 'role_mapping' section. Each of those rules
+                             will be applied in the order they are listed in 'role_mapping' section. If a rule does not match a string
+                             the next rule will be applied. If none of the rules matched a string and 'fail_if_all_rules_mismatch' is
+                             set to 'false', that particular string will be ignored. If a rule matched a string and 'continue_on_match'
+                             is set to 'false', the subsequent rules will not be applied to the current string.
+                        match - regular expression, in ECMAScript format, used to match each entire string retured by LDAP serach. If
+                             matched successfully, a replacement will be performed and the resulting string will be treated as local
+                             role name and assigned to the user. By default, set to '.+' (match any non-empty string).
+                            Note, that the special characters must be escaped properly in XML.
+                        replace - format string used as a replace expression after the match succeeded. References like '$&' (entire
+                             matched string), or '$n' (n-th subgroup) can be used. By default, set to '$&'.
+                            Note, that the special characters must be escaped properly in XML.
+                        continue_on_match - flag that indicates, whether to continue matching and mapping using the subsequent rules
+                             after this rule successfully matched and mapped the string. By default, set to 'false'.
+                            If set to 'true' and multiple rules match, multiple role names may be generated from one same input string.
              Example:
                 <ldap>
                     <server>my_ldap_server</server>
@@ -279,6 +312,23 @@
                         <my_local_role1 />
                         <my_local_role2 />
                     </roles>
+                    <role_mapping>
+                        <base_dn>ou=groups,dc=example,dc=com</base_dn>
+                        <attribute>cn</attribute>
+                        <scope>subtree</scope>
+                        <search_filter>(&amp;(objectClass=groupOfNames)(member={bind_dn}))</search_filter>
+                        <fail_if_all_rules_mismatch>true</fail_if_all_rules_mismatch>
+                        <rule>
+                            <match>clickhouse_(.+)</match>
+                            <replace>$1</replace>
+                            <continue_on_match>true</continue_on_match>
+                        </rule>
+                        <rule>
+                            <match>.+</match>
+                            <replace>$&amp;</replace>
+                            <continue_on_match>false</continue_on_match>
+                        </rule>
+                    </role_mapping>
                 </ldap>
         -->
     </user_directories>

From 78acf226dbb467a51868704c2a86eb0eb2d47683 Mon Sep 17 00:00:00 2001
From: Denis Glazachev <d.glazachev@gmail.com>
Date: Sat, 21 Nov 2020 18:08:40 +0400
Subject: [PATCH 006/611] Revert user directory name change

---
 src/Access/AccessControlManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Access/AccessControlManager.cpp b/src/Access/AccessControlManager.cpp
index 5aa9699d96f..a95d65ebb59 100644
--- a/src/Access/AccessControlManager.cpp
+++ b/src/Access/AccessControlManager.cpp
@@ -292,7 +292,7 @@ void AccessControlManager::addStoragesFromUserDirectoriesConfig(
         else if (type == "ldap")
             type = LDAPAccessStorage::STORAGE_TYPE;
 
-        String name = config.getString(prefix + ".name", key_in_user_directories);
+        String name = config.getString(prefix + ".name", type);
 
         if (type == MemoryAccessStorage::STORAGE_TYPE)
         {

From fb481649ecbc5c6046e29f3bd54c842392dc418c Mon Sep 17 00:00:00 2001
From: Denis Glazachev <d.glazachev@gmail.com>
Date: Sat, 21 Nov 2020 19:08:02 +0400
Subject: [PATCH 007/611] Change naming Add serialization of new params in
 getStorageParamsJSON()

---
 src/Access/LDAPAccessStorage.cpp | 71 +++++++++++++++++++++++++-------
 src/Access/LDAPParams.h          |  2 +-
 2 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/src/Access/LDAPAccessStorage.cpp b/src/Access/LDAPAccessStorage.cpp
index 814e9d63826..5ef1722cb6d 100644
--- a/src/Access/LDAPAccessStorage.cpp
+++ b/src/Access/LDAPAccessStorage.cpp
@@ -104,22 +104,22 @@ void LDAPAccessStorage::setConfiguration(AccessControlManager * access_control_m
 
                 const String rule_prefix = rm_prefix_str + mkey;
                 const String rule_prefix_str = rule_prefix + '.';
-                rm_params.role_mapping_rules.emplace_back();
-                auto & role_mapping_rule = rm_params.role_mapping_rules.back();
+                rm_params.rules.emplace_back();
+                auto & rule = rm_params.rules.back();
 
-                role_mapping_rule.match = config.getString(rule_prefix_str + "match", ".+");
+                rule.match = config.getString(rule_prefix_str + "match", ".+");
                 try
                 {
                     // Construct unused regex instance just to check the syntax.
-                    std::regex(role_mapping_rule.match, std::regex_constants::ECMAScript);
+                    std::regex(rule.match, std::regex_constants::ECMAScript);
                 }
                 catch (const std::regex_error & e)
                 {
                     throw Exception("ECMAScript regex syntax error in 'match' field in '" + mkey + "' rule of '" + key + "' section of LDAP user directory: " + e.what(), ErrorCodes::BAD_ARGUMENTS);
                 }
 
-                role_mapping_rule.replace = config.getString(rule_prefix_str + "replace", "$&");
-                role_mapping_rule.continue_on_match = config.getBool(rule_prefix_str + "continue_on_match", false);
+                rule.replace = config.getString(rule_prefix_str + "replace", "$&");
+                rule.continue_on_match = config.getBool(rule_prefix_str + "continue_on_match", false);
             }
         }
     }
@@ -376,28 +376,28 @@ std::set<String> LDAPAccessStorage::mapExternalRolesNoLock(const String & user_n
     for (std::size_t i = 0; i < external_roles.size(); ++i)
     {
         const auto & external_role_set = external_roles[i];
-        const auto & role_mapping_rules = role_search_params[i].role_mapping_rules;
+        const auto & rules = role_search_params[i].rules;
 
         re_cache.clear();
-        re_cache.reserve(role_mapping_rules.size());
-        for (const auto & mapping_rule : role_mapping_rules)
+        re_cache.reserve(rules.size());
+        for (const auto & rule : rules)
         {
-            re_cache.emplace_back(mapping_rule.match, std::regex_constants::ECMAScript | std::regex_constants::optimize);
+            re_cache.emplace_back(rule.match, std::regex_constants::ECMAScript | std::regex_constants::optimize);
         }
 
         for (const auto & external_role : external_role_set)
         {
             bool have_match = false;
-            for (std::size_t j = 0; j < role_mapping_rules.size(); ++j)
+            for (std::size_t j = 0; j < rules.size(); ++j)
             {
-                const auto & mapping_rule = role_mapping_rules[j];
+                const auto & rule = rules[j];
                 const auto & re = re_cache[j];
                 std::smatch match_results;
                 if (std::regex_match(external_role, match_results, re))
                 {
-                    role_names.emplace(match_results.format(mapping_rule.replace));
+                    role_names.emplace(match_results.format(rule.replace));
                     have_match = true;
-                    if (!mapping_rule.continue_on_match)
+                    if (!rule.continue_on_match)
                         break;
                 }
             }
@@ -428,7 +428,48 @@ String LDAPAccessStorage::getStorageParamsJSON() const
     Poco::JSON::Object params_json;
 
     params_json.set("server", ldap_server);
-    params_json.set("roles", common_role_names);
+
+    Poco::JSON::Array common_role_names_json;
+    for (const auto & role : common_role_names)
+    {
+        common_role_names_json.add(role);
+    }
+    params_json.set("roles", common_role_names_json);
+
+    Poco::JSON::Array role_mappings_json;
+    for (const auto & role_mapping : role_search_params)
+    {
+        Poco::JSON::Object role_mapping_json;
+
+        role_mapping_json.set("base_dn", role_mapping.base_dn);
+        role_mapping_json.set("search_filter", role_mapping.search_filter);
+        role_mapping_json.set("attribute", role_mapping.attribute);
+        role_mapping_json.set("fail_if_all_rules_mismatch", role_mapping.fail_if_all_rules_mismatch);
+
+        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;
+        }
+        role_mapping_json.set("scope", scope);
+
+        Poco::JSON::Array rules_json;
+        for (const auto & rule : role_mapping.rules)
+        {
+            Poco::JSON::Object rule_json;
+            rule_json.set("match", rule.match);
+            rule_json.set("replace", rule.replace);
+            rule_json.set("continue_on_match", rule.continue_on_match);
+            rules_json.add(rule_json);
+        }
+        role_mapping_json.set("rules", rules_json);
+
+        role_mappings_json.add(role_mapping_json);
+    }
+    params_json.set("role_mappings", role_mappings_json);
 
     std::ostringstream oss;     // STYLE_CHECK_ALLOW_STD_STRING_STREAM
     oss.exceptions(std::ios::failbit);
diff --git a/src/Access/LDAPParams.h b/src/Access/LDAPParams.h
index 7e03a94e76e..811d3775684 100644
--- a/src/Access/LDAPParams.h
+++ b/src/Access/LDAPParams.h
@@ -34,7 +34,7 @@ struct LDAPSearchParams
     Scope scope = Scope::SUBTREE;
 
     bool fail_if_all_rules_mismatch = false;
-    std::vector<LDAPRoleMappingRules> role_mapping_rules;
+    std::vector<LDAPRoleMappingRules> rules;
 };
 
 using LDAPSearchParamsList = std::vector<LDAPSearchParams>;

From e9a3a97cb929b0cbf87faac660a27df38a6ffa54 Mon Sep 17 00:00:00 2001
From: Denis Glazachev <d.glazachev@gmail.com>
Date: Sun, 22 Nov 2020 00:44:54 +0400
Subject: [PATCH 008/611] Improve regex instance creation code

---
 src/Access/LDAPAccessStorage.cpp | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/Access/LDAPAccessStorage.cpp b/src/Access/LDAPAccessStorage.cpp
index 5ef1722cb6d..48b10a17d1e 100644
--- a/src/Access/LDAPAccessStorage.cpp
+++ b/src/Access/LDAPAccessStorage.cpp
@@ -15,6 +15,7 @@
 #include <iterator>
 #include <regex>
 #include <sstream>
+#include <unordered_map>
 
 
 namespace DB
@@ -371,27 +372,18 @@ std::set<String> LDAPAccessStorage::mapExternalRolesNoLock(const String & user_n
     if (external_roles.size() != role_search_params.size())
         throw Exception("Unable to match external roles to mapping rules", ErrorCodes::BAD_ARGUMENTS);
 
-    std::vector<std::regex> re_cache;
-
+    std::unordered_map<String, std::regex> re_cache;
     for (std::size_t i = 0; i < external_roles.size(); ++i)
     {
         const auto & external_role_set = external_roles[i];
         const auto & rules = role_search_params[i].rules;
-
-        re_cache.clear();
-        re_cache.reserve(rules.size());
-        for (const auto & rule : rules)
-        {
-            re_cache.emplace_back(rule.match, std::regex_constants::ECMAScript | std::regex_constants::optimize);
-        }
-
         for (const auto & external_role : external_role_set)
         {
             bool have_match = false;
             for (std::size_t j = 0; j < rules.size(); ++j)
             {
                 const auto & rule = rules[j];
-                const auto & re = re_cache[j];
+                const auto & re = re_cache.try_emplace(rule.match, rule.match, std::regex_constants::ECMAScript | std::regex_constants::optimize).first->second;
                 std::smatch match_results;
                 if (std::regex_match(external_role, match_results, re))
                 {
@@ -401,6 +393,7 @@ std::set<String> LDAPAccessStorage::mapExternalRolesNoLock(const String & user_n
                         break;
                 }
             }
+
             if (!have_match && role_search_params[i].fail_if_all_rules_mismatch)
                 throw Exception("None of the external role mapping rules were able to match '" + external_role + "' string, received from LDAP server '" + ldap_server + "' for user '" + user_name + "'", ErrorCodes::BAD_ARGUMENTS);
         }

From 03b3a93a154358557243ab4104936aeafb4ee20b Mon Sep 17 00:00:00 2001
From: Denis Glazachev <d.glazachev@gmail.com>
Date: Sun, 22 Nov 2020 11:17:01 +0400
Subject: [PATCH 009/611] Compilation fix

---
 src/Access/LDAPAccessStorage.cpp | 3 +--
 src/Access/LDAPClient.cpp        | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Access/LDAPAccessStorage.cpp b/src/Access/LDAPAccessStorage.cpp
index 48b10a17d1e..a7441d8c679 100644
--- a/src/Access/LDAPAccessStorage.cpp
+++ b/src/Access/LDAPAccessStorage.cpp
@@ -380,9 +380,8 @@ std::set<String> LDAPAccessStorage::mapExternalRolesNoLock(const String & user_n
         for (const auto & external_role : external_role_set)
         {
             bool have_match = false;
-            for (std::size_t j = 0; j < rules.size(); ++j)
+            for (const auto & rule : rules)
             {
-                const auto & rule = rules[j];
                 const auto & re = re_cache.try_emplace(rule.match, rule.match, std::regex_constants::ECMAScript | std::regex_constants::optimize).first->second;
                 std::smatch match_results;
                 if (std::regex_match(external_role, match_results, re))
diff --git a/src/Access/LDAPClient.cpp b/src/Access/LDAPClient.cpp
index c702aa3c40f..cba74fbbb89 100644
--- a/src/Access/LDAPClient.cpp
+++ b/src/Access/LDAPClient.cpp
@@ -110,7 +110,6 @@ void LDAPClient::diag(const int rc, String text)
         if (handle)
         {
             char * raw_message = nullptr;
-            ldap_get_option(handle, LDAP_OPT_DIAGNOSTIC_MESSAGE, &raw_message);
 
             SCOPE_EXIT({
                 if (raw_message)
@@ -120,6 +119,8 @@ void LDAPClient::diag(const int rc, String text)
                 }
             });
 
+            ldap_get_option(handle, LDAP_OPT_DIAGNOSTIC_MESSAGE, &raw_message);
+
             if (raw_message && *raw_message != '\0')
             {
                 if (!text.empty())

From b6c2743103d02afcf8c09ed4a8a3b5a7619e3eba Mon Sep 17 00:00:00 2001
From: Vitaliy Zakaznikov <vzakaznikov@protonmail.com>
Date: Thu, 3 Dec 2020 22:52:35 -0500
Subject: [PATCH 010/611] Updating TestFlows tests to support changes for LDAP
 role mapping.

---
 .../ldap/authentication/regression.py         |   3 +
 .../requirements/requirements.py              |   2 +-
 .../external_user_directory/regression.py     |   3 +
 .../requirements/requirements.md              |  23 +-
 .../requirements/requirements.py              | 793 +++++++++++++++++-
 .../tests/external_user_directory_config.py   |  10 +-
 .../external_user_directory/tests/roles.py    |  77 +-
 .../tests/server_config.py                    |   2 +-
 8 files changed, 872 insertions(+), 41 deletions(-)

diff --git a/tests/testflows/ldap/authentication/regression.py b/tests/testflows/ldap/authentication/regression.py
index ed75ce4fe75..ff004a998ca 100755
--- a/tests/testflows/ldap/authentication/regression.py
+++ b/tests/testflows/ldap/authentication/regression.py
@@ -29,6 +29,9 @@ xfails = {
 @TestFeature
 @Name("authentication")
 @ArgumentParser(argparser)
+@Specifications(
+    SRS_007_ClickHouse_Authentication_of_Users_via_LDAP
+)
 @Requirements(
     RQ_SRS_007_LDAP_Authentication("1.0")
 )
diff --git a/tests/testflows/ldap/authentication/requirements/requirements.py b/tests/testflows/ldap/authentication/requirements/requirements.py
index 60fbef9b8cd..b1af73ac039 100644
--- a/tests/testflows/ldap/authentication/requirements/requirements.py
+++ b/tests/testflows/ldap/authentication/requirements/requirements.py
@@ -1,6 +1,6 @@
 # These requirements were auto generated
 # from software requirements specification (SRS)
-# document by TestFlows v1.6.201026.1232822.
+# document by TestFlows v1.6.201124.1002350.
 # Do not edit by hand but re-generate instead
 # using 'tfs requirements generate' command.
 from testflows.core import Specification
diff --git a/tests/testflows/ldap/external_user_directory/regression.py b/tests/testflows/ldap/external_user_directory/regression.py
index bd404d54438..b88c1a2a6d6 100755
--- a/tests/testflows/ldap/external_user_directory/regression.py
+++ b/tests/testflows/ldap/external_user_directory/regression.py
@@ -29,6 +29,9 @@ xfails = {
 @TestFeature
 @Name("external user directory")
 @ArgumentParser(argparser)
+@Specifications(
+    SRS_009_ClickHouse_LDAP_External_User_Directory
+)
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Authentication("1.0")
 )
diff --git a/tests/testflows/ldap/external_user_directory/requirements/requirements.md b/tests/testflows/ldap/external_user_directory/requirements/requirements.md
index 46532c3945d..7a8e554c17a 100644
--- a/tests/testflows/ldap/external_user_directory/requirements/requirements.md
+++ b/tests/testflows/ldap/external_user_directory/requirements/requirements.md
@@ -51,6 +51,7 @@
       * 4.2.2.4 [RQ.SRS-009.LDAP.ExternalUserDirectory.Role.New](#rqsrs-009ldapexternaluserdirectoryrolenew)
       * 4.2.2.5 [RQ.SRS-009.LDAP.ExternalUserDirectory.Role.NewPrivilege](#rqsrs-009ldapexternaluserdirectoryrolenewprivilege)
       * 4.2.2.6 [RQ.SRS-009.LDAP.ExternalUserDirectory.Role.RemovedPrivilege](#rqsrs-009ldapexternaluserdirectoryroleremovedprivilege)
+      * 4.2.2.7 [RQ.SRS-009.LDAP.ExternalUserDirectory.Role.NotPresent.Added](#rqsrs-009ldapexternaluserdirectoryrolenotpresentadded)
     * 4.2.3 [Configuration](#configuration)
       * 4.2.3.1 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Invalid](#rqsrs-009ldapexternaluserdirectoryconfigurationserverinvalid)
       * 4.2.3.2 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Definition](#rqsrs-009ldapexternaluserdirectoryconfigurationserverdefinition)
@@ -334,12 +335,10 @@ are configured during parallel [LDAP] user logins.
 #### Roles
 
 ##### RQ.SRS-009.LDAP.ExternalUserDirectory.Role.Removed
-version: 1.0
+version: 2.0
 
-[ClickHouse] SHALL reject authentication attempt if any of the roles that are specified in the configuration
-of the external user directory are not defined at the time of the authentication attempt
-with an exception that if a user was able to authenticate in past and its internal user object was created and cached
-then the user SHALL be able to authenticate again, even if one of the roles is missing.
+[ClickHouse] SHALL allow authentication even if the roles that are specified in the configuration
+of the external user directory are not defined at the time of the authentication attempt.
 
 ##### RQ.SRS-009.LDAP.ExternalUserDirectory.Role.Removed.Privileges
 version: 1.0
@@ -377,6 +376,14 @@ version: 1.0
 including cached users when privilege is removed from all the roles specified
 in the configuration of the external user directory.
 
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Role.NotPresent.Added
+version: 1.0
+
+[ClickHouse] SHALL add a role to the users authenticated using LDAP external user directory
+that did not exist during the time of authentication but are defined in the 
+configuration file as soon as the role with that name becomes
+available.
+
 #### Configuration
 
 ##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Invalid
@@ -659,10 +666,10 @@ in the `<ldap>` sub-section in the `<user_directories>`
 if more than one `roles` parameter is defined in the configuration.
 
 ##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Roles.Invalid
-version: 1.0
+version: 2.0
 
-[ClickHouse] SHALL return an error if the role specified in the `<roles>`
-parameter does not exist locally.
+[ClickHouse] SHALL not return an error if the role specified in the `<roles>`
+parameter does not exist locally. 
 
 ##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Roles.Empty
 version: 1.0
diff --git a/tests/testflows/ldap/external_user_directory/requirements/requirements.py b/tests/testflows/ldap/external_user_directory/requirements/requirements.py
index 4c4b17d01dc..c499fc685f5 100644
--- a/tests/testflows/ldap/external_user_directory/requirements/requirements.py
+++ b/tests/testflows/ldap/external_user_directory/requirements/requirements.py
@@ -1,10 +1,771 @@
 # These requirements were auto generated
 # from software requirements specification (SRS)
-# document by TestFlows v1.6.201009.1190249.
+# document by TestFlows v1.6.201124.1002350.
 # Do not edit by hand but re-generate instead
 # using 'tfs requirements generate' command.
+from testflows.core import Specification
 from testflows.core import Requirement
 
+SRS_009_ClickHouse_LDAP_External_User_Directory = Specification(
+        name='SRS-009 ClickHouse LDAP External User Directory', 
+        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='''
+# SRS-009 ClickHouse LDAP External User Directory
+# Software Requirements Specification
+
+## Table of Contents
+
+* 1 [Revision History](#revision-history)
+* 2 [Introduction](#introduction)
+* 3 [Terminology](#terminology)
+  * 3.1 [LDAP](#ldap)
+* 4 [Requirements](#requirements)
+  * 4.1 [Generic](#generic)
+    * 4.1.1 [User Authentication](#user-authentication)
+      * 4.1.1.1 [RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication](#rqsrs-009ldapexternaluserdirectoryauthentication)
+      * 4.1.1.2 [RQ.SRS-009.LDAP.ExternalUserDirectory.MultipleUserDirectories](#rqsrs-009ldapexternaluserdirectorymultipleuserdirectories)
+      * 4.1.1.3 [RQ.SRS-009.LDAP.ExternalUserDirectory.MultipleUserDirectories.Lookup](#rqsrs-009ldapexternaluserdirectorymultipleuserdirectorieslookup)
+      * 4.1.1.4 [RQ.SRS-009.LDAP.ExternalUserDirectory.Users.Authentication.NewUsers](#rqsrs-009ldapexternaluserdirectoryusersauthenticationnewusers)
+      * 4.1.1.5 [RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.DeletedUsers](#rqsrs-009ldapexternaluserdirectoryauthenticationdeletedusers)
+      * 4.1.1.6 [RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Valid](#rqsrs-009ldapexternaluserdirectoryauthenticationvalid)
+      * 4.1.1.7 [RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Invalid](#rqsrs-009ldapexternaluserdirectoryauthenticationinvalid)
+      * 4.1.1.8 [RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.UsernameChanged](#rqsrs-009ldapexternaluserdirectoryauthenticationusernamechanged)
+      * 4.1.1.9 [RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.PasswordChanged](#rqsrs-009ldapexternaluserdirectoryauthenticationpasswordchanged)
+      * 4.1.1.10 [RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.LDAPServerRestart](#rqsrs-009ldapexternaluserdirectoryauthenticationldapserverrestart)
+      * 4.1.1.11 [RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.ClickHouseServerRestart](#rqsrs-009ldapexternaluserdirectoryauthenticationclickhouseserverrestart)
+      * 4.1.1.12 [RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Parallel](#rqsrs-009ldapexternaluserdirectoryauthenticationparallel)
+      * 4.1.1.13 [RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Parallel.ValidAndInvalid](#rqsrs-009ldapexternaluserdirectoryauthenticationparallelvalidandinvalid)
+      * 4.1.1.14 [RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Parallel.MultipleServers](#rqsrs-009ldapexternaluserdirectoryauthenticationparallelmultipleservers)
+      * 4.1.1.15 [RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Parallel.LocalOnly](#rqsrs-009ldapexternaluserdirectoryauthenticationparallellocalonly)
+      * 4.1.1.16 [RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Parallel.LocalAndMultipleLDAP](#rqsrs-009ldapexternaluserdirectoryauthenticationparallellocalandmultipleldap)
+      * 4.1.1.17 [RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Parallel.SameUser](#rqsrs-009ldapexternaluserdirectoryauthenticationparallelsameuser)
+      * 4.1.1.18 [RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Parallel.DynamicallyAddedAndRemovedUsers](#rqsrs-009ldapexternaluserdirectoryauthenticationparalleldynamicallyaddedandremovedusers)
+    * 4.1.2 [Connection](#connection)
+      * 4.1.2.1 [RQ.SRS-009.LDAP.ExternalUserDirectory.Connection.Protocol.PlainText](#rqsrs-009ldapexternaluserdirectoryconnectionprotocolplaintext)
+      * 4.1.2.2 [RQ.SRS-009.LDAP.ExternalUserDirectory.Connection.Protocol.TLS](#rqsrs-009ldapexternaluserdirectoryconnectionprotocoltls)
+      * 4.1.2.3 [RQ.SRS-009.LDAP.ExternalUserDirectory.Connection.Protocol.StartTLS](#rqsrs-009ldapexternaluserdirectoryconnectionprotocolstarttls)
+      * 4.1.2.4 [RQ.SRS-009.LDAP.ExternalUserDirectory.Connection.Protocol.TLS.Certificate.Validation](#rqsrs-009ldapexternaluserdirectoryconnectionprotocoltlscertificatevalidation)
+      * 4.1.2.5 [RQ.SRS-009.LDAP.ExternalUserDirectory.Connection.Protocol.TLS.Certificate.SelfSigned](#rqsrs-009ldapexternaluserdirectoryconnectionprotocoltlscertificateselfsigned)
+      * 4.1.2.6 [RQ.SRS-009.LDAP.ExternalUserDirectory.Connection.Protocol.TLS.Certificate.SpecificCertificationAuthority](#rqsrs-009ldapexternaluserdirectoryconnectionprotocoltlscertificatespecificcertificationauthority)
+      * 4.1.2.7 [RQ.SRS-009.LDAP.ExternalUserDirectory.Connection.Authentication.Mechanism.Anonymous](#rqsrs-009ldapexternaluserdirectoryconnectionauthenticationmechanismanonymous)
+      * 4.1.2.8 [RQ.SRS-009.LDAP.ExternalUserDirectory.Connection.Authentication.Mechanism.Unauthenticated](#rqsrs-009ldapexternaluserdirectoryconnectionauthenticationmechanismunauthenticated)
+      * 4.1.2.9 [RQ.SRS-009.LDAP.ExternalUserDirectory.Connection.Authentication.Mechanism.NamePassword](#rqsrs-009ldapexternaluserdirectoryconnectionauthenticationmechanismnamepassword)
+      * 4.1.2.10 [RQ.SRS-009.LDAP.ExternalUserDirectory.Connection.Authentication.UnreachableServer](#rqsrs-009ldapexternaluserdirectoryconnectionauthenticationunreachableserver)
+  * 4.2 [Specific](#specific)
+    * 4.2.1 [User Discovery](#user-discovery)
+      * 4.2.1.1 [RQ.SRS-009.LDAP.ExternalUserDirectory.Users.Lookup.Priority](#rqsrs-009ldapexternaluserdirectoryuserslookuppriority)
+      * 4.2.1.2 [RQ.SRS-009.LDAP.ExternalUserDirectory.Restart.Server](#rqsrs-009ldapexternaluserdirectoryrestartserver)
+      * 4.2.1.3 [RQ.SRS-009.LDAP.ExternalUserDirectory.Restart.Server.ParallelLogins](#rqsrs-009ldapexternaluserdirectoryrestartserverparallellogins)
+    * 4.2.2 [Roles](#roles)
+      * 4.2.2.1 [RQ.SRS-009.LDAP.ExternalUserDirectory.Role.Removed](#rqsrs-009ldapexternaluserdirectoryroleremoved)
+      * 4.2.2.2 [RQ.SRS-009.LDAP.ExternalUserDirectory.Role.Removed.Privileges](#rqsrs-009ldapexternaluserdirectoryroleremovedprivileges)
+      * 4.2.2.3 [RQ.SRS-009.LDAP.ExternalUserDirectory.Role.Readded.Privileges](#rqsrs-009ldapexternaluserdirectoryrolereaddedprivileges)
+      * 4.2.2.4 [RQ.SRS-009.LDAP.ExternalUserDirectory.Role.New](#rqsrs-009ldapexternaluserdirectoryrolenew)
+      * 4.2.2.5 [RQ.SRS-009.LDAP.ExternalUserDirectory.Role.NewPrivilege](#rqsrs-009ldapexternaluserdirectoryrolenewprivilege)
+      * 4.2.2.6 [RQ.SRS-009.LDAP.ExternalUserDirectory.Role.RemovedPrivilege](#rqsrs-009ldapexternaluserdirectoryroleremovedprivilege)
+      * 4.2.2.7 [RQ.SRS-009.LDAP.ExternalUserDirectory.Role.NotPresent.Added](#rqsrs-009ldapexternaluserdirectoryrolenotpresentadded)
+    * 4.2.3 [Configuration](#configuration)
+      * 4.2.3.1 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Invalid](#rqsrs-009ldapexternaluserdirectoryconfigurationserverinvalid)
+      * 4.2.3.2 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Definition](#rqsrs-009ldapexternaluserdirectoryconfigurationserverdefinition)
+      * 4.2.3.3 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Name](#rqsrs-009ldapexternaluserdirectoryconfigurationservername)
+      * 4.2.3.4 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Host](#rqsrs-009ldapexternaluserdirectoryconfigurationserverhost)
+      * 4.2.3.5 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Port](#rqsrs-009ldapexternaluserdirectoryconfigurationserverport)
+      * 4.2.3.6 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Port.Default](#rqsrs-009ldapexternaluserdirectoryconfigurationserverportdefault)
+      * 4.2.3.7 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.AuthDN.Prefix](#rqsrs-009ldapexternaluserdirectoryconfigurationserverauthdnprefix)
+      * 4.2.3.8 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.AuthDN.Suffix](#rqsrs-009ldapexternaluserdirectoryconfigurationserverauthdnsuffix)
+      * 4.2.3.9 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.AuthDN.Value](#rqsrs-009ldapexternaluserdirectoryconfigurationserverauthdnvalue)
+      * 4.2.3.10 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.EnableTLS](#rqsrs-009ldapexternaluserdirectoryconfigurationserverenabletls)
+      * 4.2.3.11 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.EnableTLS.Options.Default](#rqsrs-009ldapexternaluserdirectoryconfigurationserverenabletlsoptionsdefault)
+      * 4.2.3.12 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.EnableTLS.Options.No](#rqsrs-009ldapexternaluserdirectoryconfigurationserverenabletlsoptionsno)
+      * 4.2.3.13 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.EnableTLS.Options.Yes](#rqsrs-009ldapexternaluserdirectoryconfigurationserverenabletlsoptionsyes)
+      * 4.2.3.14 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.EnableTLS.Options.StartTLS](#rqsrs-009ldapexternaluserdirectoryconfigurationserverenabletlsoptionsstarttls)
+      * 4.2.3.15 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSMinimumProtocolVersion](#rqsrs-009ldapexternaluserdirectoryconfigurationservertlsminimumprotocolversion)
+      * 4.2.3.16 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSMinimumProtocolVersion.Values](#rqsrs-009ldapexternaluserdirectoryconfigurationservertlsminimumprotocolversionvalues)
+      * 4.2.3.17 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSMinimumProtocolVersion.Default](#rqsrs-009ldapexternaluserdirectoryconfigurationservertlsminimumprotocolversiondefault)
+      * 4.2.3.18 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSRequireCert](#rqsrs-009ldapexternaluserdirectoryconfigurationservertlsrequirecert)
+      * 4.2.3.19 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSRequireCert.Options.Default](#rqsrs-009ldapexternaluserdirectoryconfigurationservertlsrequirecertoptionsdefault)
+      * 4.2.3.20 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSRequireCert.Options.Demand](#rqsrs-009ldapexternaluserdirectoryconfigurationservertlsrequirecertoptionsdemand)
+      * 4.2.3.21 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSRequireCert.Options.Allow](#rqsrs-009ldapexternaluserdirectoryconfigurationservertlsrequirecertoptionsallow)
+      * 4.2.3.22 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSRequireCert.Options.Try](#rqsrs-009ldapexternaluserdirectoryconfigurationservertlsrequirecertoptionstry)
+      * 4.2.3.23 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSRequireCert.Options.Never](#rqsrs-009ldapexternaluserdirectoryconfigurationservertlsrequirecertoptionsnever)
+      * 4.2.3.24 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSCertFile](#rqsrs-009ldapexternaluserdirectoryconfigurationservertlscertfile)
+      * 4.2.3.25 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSKeyFile](#rqsrs-009ldapexternaluserdirectoryconfigurationservertlskeyfile)
+      * 4.2.3.26 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSCACertDir](#rqsrs-009ldapexternaluserdirectoryconfigurationservertlscacertdir)
+      * 4.2.3.27 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSCACertFile](#rqsrs-009ldapexternaluserdirectoryconfigurationservertlscacertfile)
+      * 4.2.3.28 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSCipherSuite](#rqsrs-009ldapexternaluserdirectoryconfigurationservertlsciphersuite)
+      * 4.2.3.29 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Syntax](#rqsrs-009ldapexternaluserdirectoryconfigurationserversyntax)
+      * 4.2.3.30 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.LDAPUserDirectory](#rqsrs-009ldapexternaluserdirectoryconfigurationusersldapuserdirectory)
+      * 4.2.3.31 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.LDAPUserDirectory.MoreThanOne](#rqsrs-009ldapexternaluserdirectoryconfigurationusersldapuserdirectorymorethanone)
+      * 4.2.3.32 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Syntax](#rqsrs-009ldapexternaluserdirectoryconfigurationuserssyntax)
+      * 4.2.3.33 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Server](#rqsrs-009ldapexternaluserdirectoryconfigurationusersparametersserver)
+      * 4.2.3.34 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Server.Empty](#rqsrs-009ldapexternaluserdirectoryconfigurationusersparametersserverempty)
+      * 4.2.3.35 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Server.Missing](#rqsrs-009ldapexternaluserdirectoryconfigurationusersparametersservermissing)
+      * 4.2.3.36 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Server.MoreThanOne](#rqsrs-009ldapexternaluserdirectoryconfigurationusersparametersservermorethanone)
+      * 4.2.3.37 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Server.Invalid](#rqsrs-009ldapexternaluserdirectoryconfigurationusersparametersserverinvalid)
+      * 4.2.3.38 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Roles](#rqsrs-009ldapexternaluserdirectoryconfigurationusersparametersroles)
+      * 4.2.3.39 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Roles.MoreThanOne](#rqsrs-009ldapexternaluserdirectoryconfigurationusersparametersrolesmorethanone)
+      * 4.2.3.40 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Roles.Invalid](#rqsrs-009ldapexternaluserdirectoryconfigurationusersparametersrolesinvalid)
+      * 4.2.3.41 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Roles.Empty](#rqsrs-009ldapexternaluserdirectoryconfigurationusersparametersrolesempty)
+      * 4.2.3.42 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Roles.Missing](#rqsrs-009ldapexternaluserdirectoryconfigurationusersparametersrolesmissing)
+    * 4.2.4 [Authentication](#authentication)
+      * 4.2.4.1 [RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Username.Empty](#rqsrs-009ldapexternaluserdirectoryauthenticationusernameempty)
+      * 4.2.4.2 [RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Username.Long](#rqsrs-009ldapexternaluserdirectoryauthenticationusernamelong)
+      * 4.2.4.3 [RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Username.UTF8](#rqsrs-009ldapexternaluserdirectoryauthenticationusernameutf8)
+      * 4.2.4.4 [RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Password.Empty](#rqsrs-009ldapexternaluserdirectoryauthenticationpasswordempty)
+      * 4.2.4.5 [RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Password.Long](#rqsrs-009ldapexternaluserdirectoryauthenticationpasswordlong)
+      * 4.2.4.6 [RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Password.UTF8](#rqsrs-009ldapexternaluserdirectoryauthenticationpasswordutf8)
+* 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 [Revision History].
+
+## Introduction
+
+The [QA-SRS007 ClickHouse Authentication of Users via LDAP] enables support for authenticating
+users using an [LDAP] server. This requirements specifications add addition functionality
+for integrating [LDAP] with [ClickHouse].
+
+This document will cover requirements to allow authenticatoin of users stored in the
+external user discovery using an [LDAP] server without having to explicitly define users in [ClickHouse]'s
+`users.xml` configuration file.
+
+## Terminology
+
+### LDAP
+
+* Lightweight Directory Access Protocol
+
+## Requirements
+
+### Generic
+
+#### User Authentication
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication
+version: 1.0
+
+[ClickHouse] SHALL support authenticating users that are defined only on the [LDAP] server.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.MultipleUserDirectories
+version: 1.0
+
+[ClickHouse] SHALL support authenticating users using multiple [LDAP] external user directories.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.MultipleUserDirectories.Lookup
+version: 1.0
+
+[ClickHouse] SHALL attempt to authenticate external [LDAP] user
+using [LDAP] external user directory in the same order
+in which user directories are specified in the `config.xml` file.
+If a user cannot be authenticated using the first [LDAP] external user directory
+then the next user directory in the list SHALL be used.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Users.Authentication.NewUsers
+version: 1.0
+
+[ClickHouse] SHALL support authenticating users that are defined only on the [LDAP] server
+as soon as they are added to the [LDAP] server.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.DeletedUsers
+version: 1.0
+
+[ClickHouse] SHALL not allow authentication of users that
+were previously defined only on the [LDAP] server but were removed
+from the [LDAP] server.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Valid
+version: 1.0
+
+[ClickHouse] SHALL only allow user authentication using [LDAP] server if and only if
+user name and password match [LDAP] server records for the user
+when using [LDAP] external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Invalid
+version: 1.0
+
+[ClickHouse] SHALL return an error and prohibit authentication if either user name or password
+do not match [LDAP] server records for the user
+when using [LDAP] external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.UsernameChanged
+version: 1.0
+
+[ClickHouse] SHALL return an error and prohibit authentication if the username is changed
+on the [LDAP] server when using [LDAP] external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.PasswordChanged
+version: 1.0
+
+[ClickHouse] SHALL return an error and prohibit authentication if the password
+for the user is changed on the [LDAP] server when using [LDAP] external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.LDAPServerRestart
+version: 1.0
+
+[ClickHouse] SHALL support authenticating users after [LDAP] server is restarted
+when using [LDAP] external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.ClickHouseServerRestart
+version: 1.0
+
+[ClickHouse] SHALL support authenticating users after server is restarted
+when using [LDAP] external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Parallel
+version: 1.0
+
+[ClickHouse] SHALL support parallel authentication of users using [LDAP] server
+when using [LDAP] external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Parallel.ValidAndInvalid
+version: 1.0
+
+[ClickHouse] SHALL support authentication of valid users and
+prohibit authentication of invalid users using [LDAP] server
+in parallel without having invalid attempts affecting valid authentications
+when using [LDAP] external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Parallel.MultipleServers
+version: 1.0
+
+[ClickHouse] SHALL support parallel authentication of external [LDAP] users
+authenticated using multiple [LDAP] external user directories.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Parallel.LocalOnly
+version: 1.0
+
+[ClickHouse] SHALL support parallel authentication of users defined only locally
+when one or more [LDAP] external user directories are specified in the configuration file.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Parallel.LocalAndMultipleLDAP
+version: 1.0
+
+[ClickHouse] SHALL support parallel authentication of local and external [LDAP] users
+authenticated using multiple [LDAP] external user directories.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Parallel.SameUser
+version: 1.0
+
+[ClickHouse] SHALL support parallel authentication of the same external [LDAP] user
+authenticated using the same [LDAP] external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Parallel.DynamicallyAddedAndRemovedUsers
+version: 1.0
+
+[ClickHouse] SHALL support parallel authentication of users using
+[LDAP] external user directory when [LDAP] users are dynamically added and
+removed.
+
+#### Connection
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Connection.Protocol.PlainText
+version: 1.0
+
+[ClickHouse] SHALL support user authentication using plain text `ldap://` non secure protocol
+while connecting to the [LDAP] server when using [LDAP] external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Connection.Protocol.TLS
+version: 1.0
+
+[ClickHouse] SHALL support user authentication using `SSL/TLS` `ldaps://` secure protocol
+while connecting to the [LDAP] server when using [LDAP] external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Connection.Protocol.StartTLS
+version: 1.0
+
+[ClickHouse] SHALL support user authentication using legacy `StartTLS` protocol which is a
+plain text `ldap://` protocol that is upgraded to [TLS] when connecting to the [LDAP] server
+when using [LDAP] external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Connection.Protocol.TLS.Certificate.Validation
+version: 1.0
+
+[ClickHouse] SHALL support certificate validation used for [TLS] connections
+to the [LDAP] server when using [LDAP] external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Connection.Protocol.TLS.Certificate.SelfSigned
+version: 1.0
+
+[ClickHouse] SHALL support self-signed certificates for [TLS] connections
+to the [LDAP] server when using [LDAP] external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Connection.Protocol.TLS.Certificate.SpecificCertificationAuthority
+version: 1.0
+
+[ClickHouse] SHALL support certificates signed by specific Certification Authority for [TLS] connections
+to the [LDAP] server when using [LDAP] external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Connection.Authentication.Mechanism.Anonymous
+version: 1.0
+
+[ClickHouse] SHALL return an error and prohibit authentication using [Anonymous Authentication Mechanism of Simple Bind]
+authentication mechanism when connecting to the [LDAP] server when using [LDAP] external server directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Connection.Authentication.Mechanism.Unauthenticated
+version: 1.0
+
+[ClickHouse] SHALL return an error and prohibit authentication using [Unauthenticated Authentication Mechanism of Simple Bind]
+authentication mechanism when connecting to the [LDAP] server when using [LDAP] external server directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Connection.Authentication.Mechanism.NamePassword
+version: 1.0
+
+[ClickHouse] SHALL allow authentication using only [Name/Password Authentication Mechanism of Simple Bind]
+authentication mechanism when connecting to the [LDAP] server when using [LDAP] external server directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Connection.Authentication.UnreachableServer
+version: 1.0
+
+[ClickHouse] SHALL return an error and prohibit user login if [LDAP] server is unreachable
+when using [LDAP] external user directory.
+
+### Specific
+
+#### User Discovery
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Users.Lookup.Priority
+version: 2.0
+
+[ClickHouse] SHALL lookup user presence in the same order
+as user directories are defined in the `config.xml`.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Restart.Server
+version: 1.0
+
+[ClickHouse] SHALL support restarting server when one or more LDAP external directories
+are configured.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Restart.Server.ParallelLogins
+version: 1.0
+
+[ClickHouse] SHALL support restarting server when one or more LDAP external directories
+are configured during parallel [LDAP] user logins.
+
+#### Roles
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Role.Removed
+version: 2.0
+
+[ClickHouse] SHALL allow authentication even if the roles that are specified in the configuration
+of the external user directory are not defined at the time of the authentication attempt.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Role.Removed.Privileges
+version: 1.0
+
+[ClickHouse] SHALL remove the privileges provided by the role from all the LDAP
+users authenticated using external user directory if it is removed
+including currently cached users that are still able to authenticated where the removed
+role is specified in the configuration of the external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Role.Readded.Privileges
+version: 1.0
+
+[ClickHouse] SHALL reassign the role and add the privileges provided by the role
+when it is re-added after removal for all LDAP users authenticated using external user directory
+including any cached users where the re-added role was specified in the configuration of the external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Role.New
+version: 1.0
+
+[ClickHouse] SHALL not allow any new roles to be assigned to any LDAP
+users authenticated using external user directory unless the role is specified
+in the configuration of the external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Role.NewPrivilege
+version: 1.0
+
+[ClickHouse] SHALL add new privilege to all the LDAP users authenticated using external user directory
+including cached users when new privilege is added to one of the roles specified
+in the configuration of the external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Role.RemovedPrivilege
+version: 1.0
+
+[ClickHouse] SHALL remove privilege from all the LDAP users authenticated using external user directory
+including cached users when privilege is removed from all the roles specified
+in the configuration of the external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Role.NotPresent.Added
+version: 1.0
+
+[ClickHouse] SHALL add a role to the users authenticated using LDAP external user directory
+that did not exist during the time of authentication but are defined in the 
+configuration file as soon as the role with that name becomes
+available.
+
+#### Configuration
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Invalid
+version: 1.0
+
+[ClickHouse] SHALL return an error and prohibit user login if [LDAP] server configuration is not valid.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Definition
+version: 1.0
+
+[ClickHouse] SHALL support using the [LDAP] servers defined in the
+`ldap_servers` section of the `config.xml` as the server to be used
+for a external user directory that uses an [LDAP] server as a source of user definitions.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Name
+version: 1.0
+
+[ClickHouse] SHALL not support empty string as a server name.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Host
+version: 1.0
+
+[ClickHouse] SHALL support `<host>` parameter to specify [LDAP]
+server hostname or IP, this parameter SHALL be mandatory and SHALL not be empty.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Port
+version: 1.0
+
+[ClickHouse] SHALL support `<port>` parameter to specify [LDAP] server port.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Port.Default
+version: 1.0
+
+[ClickHouse] SHALL use default port number `636` if `enable_tls` is set to `yes` or `389` otherwise.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.AuthDN.Prefix
+version: 1.0
+
+[ClickHouse] SHALL support `<auth_dn_prefix>` parameter to specify the prefix
+of value used to construct the DN to bound to during authentication via [LDAP] server.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.AuthDN.Suffix
+version: 1.0
+
+[ClickHouse] SHALL support `<auth_dn_suffix>` parameter to specify the suffix
+of value used to construct the DN to bound to during authentication via [LDAP] server.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.AuthDN.Value
+version: 1.0
+
+[ClickHouse] SHALL construct DN as  `auth_dn_prefix + escape(user_name) + auth_dn_suffix` string.
+
+> This implies that auth_dn_suffix should usually have comma ',' as its first non-space character.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.EnableTLS
+version: 1.0
+
+[ClickHouse] SHALL support `<enable_tls>` parameter to trigger the use of secure connection to the [LDAP] server.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.EnableTLS.Options.Default
+version: 1.0
+
+[ClickHouse] SHALL use `yes` value as the default for `<enable_tls>` parameter
+to enable SSL/TLS `ldaps://` protocol.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.EnableTLS.Options.No
+version: 1.0
+
+[ClickHouse] SHALL support specifying `no` as the value of `<enable_tls>` parameter to enable
+plain text `ldap://` protocol.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.EnableTLS.Options.Yes
+version: 1.0
+
+[ClickHouse] SHALL support specifying `yes` as the value of `<enable_tls>` parameter to enable
+SSL/TLS `ldaps://` protocol.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.EnableTLS.Options.StartTLS
+version: 1.0
+
+[ClickHouse] SHALL support specifying `starttls` as the value of `<enable_tls>` parameter to enable
+legacy `StartTLS` protocol that used plain text `ldap://` protocol, upgraded to [TLS].
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSMinimumProtocolVersion
+version: 1.0
+
+[ClickHouse] SHALL support `<tls_minimum_protocol_version>` parameter to specify
+the minimum protocol version of SSL/TLS.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSMinimumProtocolVersion.Values
+version: 1.0
+
+[ClickHouse] SHALL support specifying `ssl2`, `ssl3`, `tls1.0`, `tls1.1`, and `tls1.2`
+as a value of the `<tls_minimum_protocol_version>` parameter.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSMinimumProtocolVersion.Default
+version: 1.0
+
+[ClickHouse] SHALL set `tls1.2` as the default value of the `<tls_minimum_protocol_version>` parameter.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSRequireCert
+version: 1.0
+
+[ClickHouse] SHALL support `<tls_require_cert>` parameter to specify [TLS] peer
+certificate verification behavior.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSRequireCert.Options.Default
+version: 1.0
+
+[ClickHouse] SHALL use `demand` value as the default for the `<tls_require_cert>` parameter.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSRequireCert.Options.Demand
+version: 1.0
+
+[ClickHouse] SHALL support specifying `demand` as the value of `<tls_require_cert>` parameter to
+enable requesting of client certificate.  If no certificate  is  provided,  or  a  bad   certificate   is
+provided, the session SHALL be immediately terminated.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSRequireCert.Options.Allow
+version: 1.0
+
+[ClickHouse] SHALL support specifying `allow` as the value of `<tls_require_cert>` parameter to
+enable requesting of client certificate. If no
+certificate is provided, the session SHALL proceed normally.
+If a bad certificate is provided, it SHALL be ignored and the session SHALL proceed normally.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSRequireCert.Options.Try
+version: 1.0
+
+[ClickHouse] SHALL support specifying `try` as the value of `<tls_require_cert>` parameter to
+enable requesting of client certificate. If no certificate is provided, the session
+SHALL proceed  normally.  If a bad certificate is provided, the session SHALL be
+immediately terminated.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSRequireCert.Options.Never
+version: 1.0
+
+[ClickHouse] SHALL support specifying `never` as the value of `<tls_require_cert>` parameter to
+disable requesting of client certificate.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSCertFile
+version: 1.0
+
+[ClickHouse] SHALL support `<tls_cert_file>` to specify the path to certificate file used by
+[ClickHouse] to establish connection with the [LDAP] server.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSKeyFile
+version: 1.0
+
+[ClickHouse] SHALL support `<tls_key_file>` to specify the path to key file for the certificate
+specified by the `<tls_cert_file>` parameter.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSCACertDir
+version: 1.0
+
+[ClickHouse] SHALL support `<tls_ca_cert_dir>` parameter to specify to a path to
+the directory containing [CA] certificates used to verify certificates provided by the [LDAP] server.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSCACertFile
+version: 1.0
+
+[ClickHouse] SHALL support `<tls_ca_cert_file>` parameter to specify a path to a specific
+[CA] certificate file used to verify certificates provided by the [LDAP] server.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.TLSCipherSuite
+version: 1.0
+
+[ClickHouse] SHALL support `tls_cipher_suite` parameter to specify allowed cipher suites.
+The value SHALL use the same format as the `ciphersuites` in the [OpenSSL Ciphers].
+
+For example,
+
+```xml
+<tls_cipher_suite>ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:AES256-GCM-SHA384</tls_cipher_suite>
+```
+
+The available suites SHALL depend on the [OpenSSL] library version and variant used to build
+[ClickHouse] and therefore might change.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Syntax
+version: 1.0
+
+[ClickHouse] SHALL support the following example syntax to create an entry for an [LDAP] server inside the `config.xml`
+configuration file or of any configuration file inside the `config.d` directory.
+
+```xml
+<yandex>
+    <my_ldap_server>
+        <host>localhost</host>
+        <port>636</port>
+        <auth_dn_prefix>cn=</auth_dn_prefix>
+        <auth_dn_suffix>, ou=users, dc=example, dc=com</auth_dn_suffix>
+        <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>
+</yandex>
+```
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.LDAPUserDirectory
+version: 1.0
+
+[ClickHouse] SHALL support `<ldap>` sub-section in the `<user_directories>` section of the `config.xml`
+that SHALL define a external user directory that uses an [LDAP] server as a source of user definitions.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.LDAPUserDirectory.MoreThanOne
+version: 2.0
+
+[ClickHouse] SHALL support more than one `<ldap>` sub-sections in the `<user_directories>` section of the `config.xml`
+that SHALL allow to define more than one external user directory that use an [LDAP] server as a source
+of user definitions.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Syntax
+version: 1.0
+
+[ClickHouse] SHALL support `<ldap>` section with the following syntax
+
+```xml
+<yandex>
+    <user_directories>
+        <ldap>
+            <server>my_ldap_server</server>
+            <roles>
+                <my_local_role1 />
+                <my_local_role2 />
+            </roles>
+        </ldap>
+    </user_directories>
+</yandex>
+```
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Server
+version: 1.0
+
+[ClickHouse] SHALL support `server` parameter in the `<ldap>` sub-section in the `<user_directories>`
+section of the `config.xml` that SHALL specify one of LDAP server names
+defined in `<ldap_servers>` section.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Server.Empty
+version: 1.0
+
+[ClickHouse] SHALL return an error if the `server` parameter in the `<ldap>` sub-section in the `<user_directories>`
+is empty.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Server.Missing
+version: 1.0
+
+[ClickHouse] SHALL return an error if the `server` parameter in the `<ldap>` sub-section in the `<user_directories>`
+is missing.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Server.MoreThanOne
+version: 1.0
+
+[ClickHouse] SHALL only use the first definitition of the `server` parameter in the `<ldap>` sub-section in the `<user_directories>`
+if more than one `server` parameter is defined in the configuration.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Server.Invalid
+version: 1.0
+
+[ClickHouse] SHALL return an error if the server specified as the value of the `<server>`
+parameter is not defined.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Roles
+version: 1.0
+
+[ClickHouse] SHALL support `roles` parameter in the `<ldap>` sub-section in the `<user_directories>`
+section of the `config.xml` that SHALL specify the names of a locally defined roles that SHALL
+be assigned to all users retrieved from the [LDAP] server.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Roles.MoreThanOne
+version: 1.0
+
+[ClickHouse] SHALL only use the first definitition of the `roles` parameter
+in the `<ldap>` sub-section in the `<user_directories>`
+if more than one `roles` parameter is defined in the configuration.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Roles.Invalid
+version: 2.0
+
+[ClickHouse] SHALL not return an error if the role specified in the `<roles>`
+parameter does not exist locally. 
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Roles.Empty
+version: 1.0
+
+[ClickHouse] SHALL not allow users authenticated using LDAP external user directory
+to perform any action if the `roles` parameter in the `<ldap>` sub-section in the `<user_directories>`
+section is empty.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Roles.Missing
+version: 1.0
+
+[ClickHouse] SHALL not allow users authenticated using LDAP external user directory
+to perform any action if the `roles` parameter in the `<ldap>` sub-section in the `<user_directories>`
+section is missing.
+
+#### Authentication
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Username.Empty
+version: 1.0
+
+[ClickHouse] SHALL not support authenticating users with empty username
+when using [LDAP] external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Username.Long
+version: 1.0
+
+[ClickHouse] SHALL support authenticating users with a long username of at least 256 bytes
+when using [LDAP] external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Username.UTF8
+version: 1.0
+
+[ClickHouse] SHALL support authentication users with a username that contains [UTF-8] characters
+when using [LDAP] external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Password.Empty
+version: 1.0
+
+[ClickHouse] SHALL not support authenticating users with empty passwords
+even if an empty password is valid for the user and
+is allowed by the [LDAP] server when using [LDAP] external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Password.Long
+version: 1.0
+
+[ClickHouse] SHALL support long password of at least 256 bytes
+that can be used to authenticate users when using [LDAP] external user directory.
+
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication.Password.UTF8
+version: 1.0
+
+[ClickHouse] SHALL support [UTF-8] characters in passwords
+used to authenticate users when using [LDAP] external user directory.
+
+## References
+
+* **Access Control and Account Management**: https://clickhouse.tech/docs/en/operations/access-rights/
+* **LDAP**: https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol
+* **ClickHouse:** https://clickhouse.tech
+
+[SRS]: #srs
+[Access Control and Account Management]: https://clickhouse.tech/docs/en/operations/access-rights/
+[SRS-007 ClickHouse Authentication of Users via LDAP]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/ldap/authentication/requirements/requirements.md
+[LDAP]: https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol
+[ClickHouse]: https://clickhouse.tech
+[GitHub Repository]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/ldap/external_user_directory/requirements/requirements.md
+[Revision History]: https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/ldap/external_user_directory/requirements/requirements.md
+[Git]: https://git-scm.com/
+[GitHub]: https://github.com
+''')
+
 RQ_SRS_009_LDAP_ExternalUserDirectory_Authentication = Requirement(
         name='RQ.SRS-009.LDAP.ExternalUserDirectory.Authentication',
         version='1.0',
@@ -449,16 +1210,14 @@ RQ_SRS_009_LDAP_ExternalUserDirectory_Restart_Server_ParallelLogins = Requiremen
 
 RQ_SRS_009_LDAP_ExternalUserDirectory_Role_Removed = Requirement(
         name='RQ.SRS-009.LDAP.ExternalUserDirectory.Role.Removed',
-        version='1.0',
+        version='2.0',
         priority=None,
         group=None,
         type=None,
         uid=None,
         description=(
-        '[ClickHouse] SHALL reject authentication attempt if any of the roles that are specified in the configuration\n'
-        'of the external user directory are not defined at the time of the authentication attempt\n'
-        'with an exception that if a user was able to authenticate in past and its internal user object was created and cached\n'
-        'then the user SHALL be able to authenticate again, even if one of the roles is missing.\n'
+        '[ClickHouse] SHALL allow authentication even if the roles that are specified in the configuration\n'
+        'of the external user directory are not defined at the time of the authentication attempt.\n'
         '\n'
         ),
         link=None)
@@ -539,6 +1298,22 @@ RQ_SRS_009_LDAP_ExternalUserDirectory_Role_RemovedPrivilege = Requirement(
         ),
         link=None)
 
+RQ_SRS_009_LDAP_ExternalUserDirectory_Role_NotPresent_Added = Requirement(
+        name='RQ.SRS-009.LDAP.ExternalUserDirectory.Role.NotPresent.Added',
+        version='1.0',
+        priority=None,
+        group=None,
+        type=None,
+        uid=None,
+        description=(
+        '[ClickHouse] SHALL add a role to the users authenticated using LDAP external user directory\n'
+        'that did not exist during the time of authentication but are defined in the \n'
+        'configuration file as soon as the role with that name becomes\n'
+        'available.\n'
+        '\n'
+        ),
+        link=None)
+
 RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Server_Invalid = Requirement(
         name='RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Invalid',
         version='1.0',
@@ -1132,14 +1907,14 @@ RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Users_Parameters_Roles_MoreT
 
 RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Users_Parameters_Roles_Invalid = Requirement(
         name='RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Roles.Invalid',
-        version='1.0',
+        version='2.0',
         priority=None,
         group=None,
         type=None,
         uid=None,
         description=(
-        '[ClickHouse] SHALL return an error if the role specified in the `<roles>`\n'
-        'parameter does not exist locally.\n'
+        '[ClickHouse] SHALL not return an error if the role specified in the `<roles>`\n'
+        'parameter does not exist locally. \n'
         '\n'
         ),
         link=None)
diff --git a/tests/testflows/ldap/external_user_directory/tests/external_user_directory_config.py b/tests/testflows/ldap/external_user_directory/tests/external_user_directory_config.py
index b5677eba4b2..9ff480426bf 100644
--- a/tests/testflows/ldap/external_user_directory/tests/external_user_directory_config.py
+++ b/tests/testflows/ldap/external_user_directory/tests/external_user_directory_config.py
@@ -220,15 +220,12 @@ def defined_twice_roles(self, timeout=20):
 
 @TestScenario
 @Requirements(
-    RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Users_Parameters_Roles_Invalid("1.0")
+    RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Users_Parameters_Roles_Invalid("2.0")
 )
 def invalid_role_in_roles(self, timeout=20):
-    """Check that an error is returned when LDAP users try to authenticate
+    """Check that no error is returned when LDAP users try to authenticate
     if an invalid role is specified inside the `roles` section.
     """
-    exitcode = 4
-    message = "DB::Exception: user1: Authentication failed"
-
     servers = {
         "openldap1": {
             "host": "openldap1", "port": "389", "enable_tls": "no",
@@ -241,8 +238,7 @@ def invalid_role_in_roles(self, timeout=20):
         with ldap_external_user_directory("openldap1", roles=["foo"], restart=True):
             with When(f"I login as {user['username']} and execute query"):
                 current().context.node.query("SELECT 1",
-                settings=[("user", user["username"]), ("password", user["password"])],
-                exitcode=exitcode, message=message)
+                    settings=[("user", user["username"]), ("password", user["password"])])
 
 @TestScenario
 @Requirements(
diff --git a/tests/testflows/ldap/external_user_directory/tests/roles.py b/tests/testflows/ldap/external_user_directory/tests/roles.py
index 8a6c6f465d1..2b68c1da36b 100644
--- a/tests/testflows/ldap/external_user_directory/tests/roles.py
+++ b/tests/testflows/ldap/external_user_directory/tests/roles.py
@@ -139,17 +139,15 @@ def remove_privilege(self, server, timeout=20):
 
 @TestScenario
 @Requirements(
-    RQ_SRS_009_LDAP_ExternalUserDirectory_Role_Removed("1.0")
+    RQ_SRS_009_LDAP_ExternalUserDirectory_Role_Removed("2.0")
 )
 def remove_role(self, server, timeout=20):
     """Check that when a role used in the external user directory configuration
-    is dynamically removed then any non-cached LDAP users should not be authenticated using
+    is dynamically removed then any LDAP users should still be authenticated using
     LDAP external user directory.
     """
     node = self.context.node
     uid = getuid()
-    exitcode = 4
-    message = "DB::Exception: {user}: Authentication failed: password is incorrect or there is no user with such name"
 
     self.context.ldap_node = self.context.cluster.node(server)
 
@@ -174,8 +172,7 @@ def remove_role(self, server, timeout=20):
 
                     with And(f"I try to login again using non-cached LDAP user"):
                         node.query(f"SELECT 1",
-                            settings=[("user", users[1]["username"]), ("password", users[1]["password"])],
-                            exitcode=exitcode, message=message.format(user=users[1]["username"]))
+                            settings=[("user", users[1]["username"]), ("password", users[1]["password"])])
 
 @TestScenario
 @Requirements(
@@ -228,7 +225,7 @@ def readd_privilege_by_readding_role(self, server, timeout=20):
     """Check that when the role used in the external user directory configuration
     is dynamically removed then all the privileges are removed from any
     LDAP users authenticated using external user directory but when the role is re-added
-    then privileges are restored and non-cached users can login again.
+    then privileges are restored.
     """
     node = self.context.node
     uid = getuid()
@@ -265,13 +262,9 @@ def readd_privilege_by_readding_role(self, server, timeout=20):
                                 settings=[("user", users[0]["username"]), ("password", users[0]["password"])],
                                 exitcode=exitcode, message=message.format(user=users[0]["username"]))
 
-                        message = "DB::Exception: {user}: Authentication failed: password is incorrect or there is no user with such name"
-                        exitcode = 4
-
-                        with And(f"I try to login using non-cached LDAP user and expect it to fail"):
+                        with And(f"I try to login using non-cached LDAP user and expect it to succeed"):
                             node.query(f"SELECT 1",
-                                settings=[("user", users[1]["username"]), ("password", users[1]["password"])],
-                                exitcode=exitcode, message=message.format(user=users[1]["username"]))
+                                settings=[("user", users[1]["username"]), ("password", users[1]["password"])])
 
                         with When("I re-add the role"):
                             node.query(f"CREATE ROLE {roles[0]}")
@@ -284,11 +277,65 @@ def readd_privilege_by_readding_role(self, server, timeout=20):
                             node.query(f"SELECT * FROM {table_name} LIMIT 1",
                                 settings=[("user", users[0]["username"]), ("password", users[0]["password"])])
 
-                        with And("I try to login using non-cached LDAP expect it to work "
-                                "with user also having privilege provided by the role"):
+                        with And("I try to login using non-cached LDAP expect it to also work again and expect"
+                                "for the user also to have privilege provided by the role"):
                             node.query(f"SELECT * FROM {table_name} LIMIT 1",
                                 settings=[("user", users[1]["username"]), ("password", users[1]["password"])])
 
+@TestScenario
+@Requirements(
+    RQ_SRS_009_LDAP_ExternalUserDirectory_Role_NotPresent_Added("1.0")
+)
+def not_present_role_added(self, server, timeout=20):
+    """Check that when the role used in the external user directory configuration
+    which was not present during LDAP user authentication
+    is dynamically added then all the privileges granted by the role
+    are given to all users authenticated using external LDAP user directory.
+    """
+    node = self.context.node
+    uid = getuid()
+
+    self.context.ldap_node = self.context.cluster.node(server)
+
+    users = [
+        {"username": f"user0_{uid}", "password": "user0_password"},
+        {"username": f"user1_{uid}", "password": "user1_password"}
+    ]
+
+    roles = [f"role0_{uid}", f"role1_{uid}"]
+
+    with table(f"table_{getuid()}", "CREATE TABLE {name} (d DATE, s String, i UInt8) ENGINE = Memory()") as table_name:
+        with ldap_external_user_directory(server=server, roles=roles, restart=True):
+            with ldap_users(*[{"cn": user["username"], "userpassword": user["password"]} for user in users]):
+                with When(f"I login using clickhouse-client"):
+                    with self.context.cluster.shell(node=node.name) as shell:
+                        with shell(f"TERM=dumb clickhouse client --user {users[0]['username']} --password {users[0]['password']} | tee",
+                                asynchronous=True, name="client") as client:
+                            client.app.expect("clickhouse1 :\) ")
+
+                            with When("I execute select on the table"):
+                                client.app.send(f"SELECT * FROM {table_name} LIMIT 1")
+
+                            with Then("I expect to get not enough privileges error"):
+                                client.app.expect("Not enough privileges")
+                                client.app.expect("clickhouse1 :\) ")
+
+                            try:
+                                with Given("I add the role and grant the select privilege to it for the table"):
+                                    node.query(f"CREATE ROLE {roles[0]}")
+                                    node.query(f"GRANT SELECT ON {table_name} TO {roles[0]}")
+
+                                with When("I re-execute select on the table"):
+                                    client.app.send(f"SELECT * FROM {table_name} LIMIT 1")
+
+                                with Then("I expect to get no errors"):
+                                    client.app.expect("Ok\.")
+                                    client.app.expect("clickhouse1 :\) ")
+
+                            finally:
+                                with Finally("I delete the role"):
+                                    node.query(f"DROP ROLE IF EXISTS {roles[0]}")
+
 @TestFeature
 @Name("roles")
 @Requirements(
diff --git a/tests/testflows/ldap/external_user_directory/tests/server_config.py b/tests/testflows/ldap/external_user_directory/tests/server_config.py
index 5df343b53df..8fbf4c0f7f2 100644
--- a/tests/testflows/ldap/external_user_directory/tests/server_config.py
+++ b/tests/testflows/ldap/external_user_directory/tests/server_config.py
@@ -149,7 +149,7 @@ def invalid_enable_tls_value(self, timeout=60):
     servers = {"openldap1": {"host": "openldap1", "port": "389", "enable_tls": "foo",
         "auth_dn_prefix": "cn=", "auth_dn_suffix": ",ou=users,dc=company,dc=com"
     }}
-    invalid_server_config(servers, message=message, tail=17, timeout=timeout)
+    invalid_server_config(servers, message=message, tail=18, timeout=timeout)
 
 @TestScenario
 @Requirements(

From 53db7e564c67c0e7841a0cd2cf6f29ee86e9dc3c Mon Sep 17 00:00:00 2001
From: Denis Glazachev <d.glazachev@gmail.com>
Date: Thu, 17 Dec 2020 18:27:30 +0400
Subject: [PATCH 011/611] Do transformations based on prefix only

---
 programs/server/config.xml       | 35 ++--------------
 src/Access/LDAPAccessStorage.cpp | 72 ++++++--------------------------
 src/Access/LDAPAccessStorage.h   |  2 +-
 src/Access/LDAPParams.h          | 12 +-----
 4 files changed, 18 insertions(+), 103 deletions(-)

diff --git a/programs/server/config.xml b/programs/server/config.xml
index e88e4a5bf3c..acf101ff8b0 100644
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@@ -316,26 +316,9 @@
                             The resulting filter will be constructed by replacing all '{username}', '{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.
-                    fail_if_all_rules_mismatch - flag to trigger failure if none of the rules were able to match and transform any
-                             of the resulting strings returned by the LDAP search. By default, set to 'true'.
-                    rule - section with matching and mapping info.
-                            Each string will be matched to the regex and, if there is a full match, replaced using format string to
-                             get the name of the local role that needs to be assigned to the user.
-                            There can be multiple 'rule' sections defined inside the same 'role_mapping' section. Each of those rules
-                             will be applied in the order they are listed in 'role_mapping' section. If a rule does not match a string
-                             the next rule will be applied. If none of the rules matched a string and 'fail_if_all_rules_mismatch' is
-                             set to 'false', that particular string will be ignored. If a rule matched a string and 'continue_on_match'
-                             is set to 'false', the subsequent rules will not be applied to the current string.
-                        match - regular expression, in ECMAScript format, used to match each entire string retured by LDAP serach. If
-                             matched successfully, a replacement will be performed and the resulting string will be treated as local
-                             role name and assigned to the user. By default, set to '.+' (match any non-empty string).
-                            Note, that the special characters must be escaped properly in XML.
-                        replace - format string used as a replace expression after the match succeeded. References like '$&' (entire
-                             matched string), or '$n' (n-th subgroup) can be used. By default, set to '$&'.
-                            Note, that the special characters must be escaped properly in XML.
-                        continue_on_match - flag that indicates, whether to continue matching and mapping using the subsequent rules
-                             after this rule successfully matched and mapped the string. By default, set to 'false'.
-                            If set to 'true' and multiple rules match, multiple role names may be generated from one same input string.
+                    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.
              Example:
                 <ldap>
                     <server>my_ldap_server</server>
@@ -348,17 +331,7 @@
                         <attribute>cn</attribute>
                         <scope>subtree</scope>
                         <search_filter>(&amp;(objectClass=groupOfNames)(member={bind_dn}))</search_filter>
-                        <fail_if_all_rules_mismatch>true</fail_if_all_rules_mismatch>
-                        <rule>
-                            <match>clickhouse_(.+)</match>
-                            <replace>$1</replace>
-                            <continue_on_match>true</continue_on_match>
-                        </rule>
-                        <rule>
-                            <match>.+</match>
-                            <replace>$&amp;</replace>
-                            <continue_on_match>false</continue_on_match>
-                        </rule>
+                        <prefix>clickhouse_</prefix>
                     </role_mapping>
                 </ldap>
         -->
diff --git a/src/Access/LDAPAccessStorage.cpp b/src/Access/LDAPAccessStorage.cpp
index a7441d8c679..27f12b5c6a0 100644
--- a/src/Access/LDAPAccessStorage.cpp
+++ b/src/Access/LDAPAccessStorage.cpp
@@ -13,7 +13,6 @@
 #include <boost/container_hash/hash.hpp>
 #include <boost/range/algorithm/copy.hpp>
 #include <iterator>
-#include <regex>
 #include <sstream>
 #include <unordered_map>
 
@@ -85,7 +84,7 @@ void LDAPAccessStorage::setConfiguration(AccessControlManager * access_control_m
             rm_params.base_dn = config.getString(rm_prefix_str + "base_dn", "");
             rm_params.search_filter = config.getString(rm_prefix_str + "search_filter", "");
             rm_params.attribute = config.getString(rm_prefix_str + "attribute", "cn");
-            rm_params.fail_if_all_rules_mismatch = config.getBool(rm_prefix_str + "fail_if_all_rules_mismatch", true);
+            rm_params.prefix = config.getString(rm_prefix_str + "prefix", "");
 
             auto scope = config.getString(rm_prefix_str + "scope", "subtree");
             boost::algorithm::to_lower(scope);
@@ -95,33 +94,6 @@ void LDAPAccessStorage::setConfiguration(AccessControlManager * access_control_m
             else if (scope == "children")  rm_params.scope = LDAPSearchParams::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);
-
-            Poco::Util::AbstractConfiguration::Keys all_mapping_keys;
-            config.keys(rm_prefix, all_mapping_keys);
-            for (const auto & mkey : all_mapping_keys)
-            {
-                if (mkey != "rule" && mkey.find("rule[") != 0)
-                    continue;
-
-                const String rule_prefix = rm_prefix_str + mkey;
-                const String rule_prefix_str = rule_prefix + '.';
-                rm_params.rules.emplace_back();
-                auto & rule = rm_params.rules.back();
-
-                rule.match = config.getString(rule_prefix_str + "match", ".+");
-                try
-                {
-                    // Construct unused regex instance just to check the syntax.
-                    std::regex(rule.match, std::regex_constants::ECMAScript);
-                }
-                catch (const std::regex_error & e)
-                {
-                    throw Exception("ECMAScript regex syntax error in 'match' field in '" + mkey + "' rule of '" + key + "' section of LDAP user directory: " + e.what(), ErrorCodes::BAD_ARGUMENTS);
-                }
-
-                rule.replace = config.getString(rule_prefix_str + "replace", "$&");
-                rule.continue_on_match = config.getBool(rule_prefix_str + "continue_on_match", false);
-            }
         }
     }
 
@@ -255,7 +227,7 @@ void LDAPAccessStorage::grantRolesNoLock(User & user, const LDAPSearchResultsLis
     auto & granted_roles = user.granted_roles.roles;
 
     // Map external role names to local role names.
-    const auto user_role_names = mapExternalRolesNoLock(user_name, external_roles);
+    const auto user_role_names = mapExternalRolesNoLock(external_roles);
 
     external_role_hashes.erase(user_name);
     granted_roles.clear();
@@ -365,36 +337,27 @@ void LDAPAccessStorage::updateRolesNoLock(const UUID & id, const String & user_n
 }
 
 
-std::set<String> LDAPAccessStorage::mapExternalRolesNoLock(const String & user_name, const LDAPSearchResultsList & external_roles) const
+std::set<String> LDAPAccessStorage::mapExternalRolesNoLock(const LDAPSearchResultsList & external_roles) const
 {
     std::set<String> role_names;
 
     if (external_roles.size() != role_search_params.size())
-        throw Exception("Unable to match external roles to mapping rules", ErrorCodes::BAD_ARGUMENTS);
+        throw Exception("Unable to map external roles", ErrorCodes::BAD_ARGUMENTS);
 
-    std::unordered_map<String, std::regex> re_cache;
     for (std::size_t i = 0; i < external_roles.size(); ++i)
     {
         const auto & external_role_set = external_roles[i];
-        const auto & rules = role_search_params[i].rules;
+        const auto & prefix = role_search_params[i].prefix;
+
         for (const auto & external_role : external_role_set)
         {
-            bool have_match = false;
-            for (const auto & rule : rules)
+            if (
+                prefix.size() < external_role.size() &&
+                external_role.compare(0, prefix.size(), prefix) == 0
+            )
             {
-                const auto & re = re_cache.try_emplace(rule.match, rule.match, std::regex_constants::ECMAScript | std::regex_constants::optimize).first->second;
-                std::smatch match_results;
-                if (std::regex_match(external_role, match_results, re))
-                {
-                    role_names.emplace(match_results.format(rule.replace));
-                    have_match = true;
-                    if (!rule.continue_on_match)
-                        break;
-                }
+                role_names.emplace(external_role.substr(prefix.size()));
             }
-
-            if (!have_match && role_search_params[i].fail_if_all_rules_mismatch)
-                throw Exception("None of the external role mapping rules were able to match '" + external_role + "' string, received from LDAP server '" + ldap_server + "' for user '" + user_name + "'", ErrorCodes::BAD_ARGUMENTS);
         }
     }
 
@@ -436,7 +399,7 @@ String LDAPAccessStorage::getStorageParamsJSON() const
         role_mapping_json.set("base_dn", role_mapping.base_dn);
         role_mapping_json.set("search_filter", role_mapping.search_filter);
         role_mapping_json.set("attribute", role_mapping.attribute);
-        role_mapping_json.set("fail_if_all_rules_mismatch", role_mapping.fail_if_all_rules_mismatch);
+        role_mapping_json.set("prefix", role_mapping.prefix);
 
         String scope;
         switch (role_mapping.scope)
@@ -448,17 +411,6 @@ String LDAPAccessStorage::getStorageParamsJSON() const
         }
         role_mapping_json.set("scope", scope);
 
-        Poco::JSON::Array rules_json;
-        for (const auto & rule : role_mapping.rules)
-        {
-            Poco::JSON::Object rule_json;
-            rule_json.set("match", rule.match);
-            rule_json.set("replace", rule.replace);
-            rule_json.set("continue_on_match", rule.continue_on_match);
-            rules_json.add(rule_json);
-        }
-        role_mapping_json.set("rules", rules_json);
-
         role_mappings_json.add(role_mapping_json);
     }
     params_json.set("role_mappings", role_mappings_json);
diff --git a/src/Access/LDAPAccessStorage.h b/src/Access/LDAPAccessStorage.h
index eaa39dd1624..8ec7325f9c2 100644
--- a/src/Access/LDAPAccessStorage.h
+++ b/src/Access/LDAPAccessStorage.h
@@ -67,7 +67,7 @@ private:
     void applyRoleChangeNoLock(bool grant, const UUID & role_id, const String & role_name);
     void grantRolesNoLock(User & user, const LDAPSearchResultsList & external_roles) const;
     void updateRolesNoLock(const UUID & id, const String & user_name, const LDAPSearchResultsList & external_roles) const;
-    std::set<String> mapExternalRolesNoLock(const String & user_name, const LDAPSearchResultsList & external_roles) const;
+    std::set<String> mapExternalRolesNoLock(const LDAPSearchResultsList & external_roles) const;
     bool isPasswordCorrectLDAPNoLock(const User & user, const String & password, const ExternalAuthenticators & external_authenticators, LDAPSearchResultsList & search_results) const;
 
     mutable std::recursive_mutex mutex;
diff --git a/src/Access/LDAPParams.h b/src/Access/LDAPParams.h
index 811d3775684..be5d1d66542 100644
--- a/src/Access/LDAPParams.h
+++ b/src/Access/LDAPParams.h
@@ -10,14 +10,6 @@
 namespace DB
 {
 
-struct LDAPRoleMappingRules
-{
-    String match = ".+";
-    String replace = "$&";
-
-    bool continue_on_match = false;
-};
-
 struct LDAPSearchParams
 {
     enum class Scope
@@ -32,9 +24,7 @@ struct LDAPSearchParams
     String search_filter;
     String attribute = "cn";
     Scope scope = Scope::SUBTREE;
-
-    bool fail_if_all_rules_mismatch = false;
-    std::vector<LDAPRoleMappingRules> rules;
+    String prefix;
 };
 
 using LDAPSearchParamsList = std::vector<LDAPSearchParams>;

From c4b85f2dcdcdb751c37abecbd99b167ba53eda20 Mon Sep 17 00:00:00 2001
From: Denis Glazachev <d.glazachev@gmail.com>
Date: Thu, 17 Dec 2020 18:48:12 +0400
Subject: [PATCH 012/611] Simplify the code

---
 src/Access/LDAPAccessStorage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Access/LDAPAccessStorage.cpp b/src/Access/LDAPAccessStorage.cpp
index 27f12b5c6a0..e86a82c1ac2 100644
--- a/src/Access/LDAPAccessStorage.cpp
+++ b/src/Access/LDAPAccessStorage.cpp
@@ -356,7 +356,7 @@ std::set<String> LDAPAccessStorage::mapExternalRolesNoLock(const LDAPSearchResul
                 external_role.compare(0, prefix.size(), prefix) == 0
             )
             {
-                role_names.emplace(external_role.substr(prefix.size()));
+                role_names.emplace(external_role, prefix.size());
             }
         }
     }

From ded199ce2768246467a001abff74ae2b3b547d95 Mon Sep 17 00:00:00 2001
From: Daria Mozhaeva <dmozhaeva@yandex-team.ru>
Date: Wed, 23 Dec 2020 18:32:35 +0300
Subject: [PATCH 013/611] Edit and translate to Russia

---
 .../integrations/embedded-rocksdb.md          |  2 +-
 docs/en/operations/settings/settings.md       |  2 +-
 .../integrations/embedded-rocksdb.md          | 45 +++++++++++++++++++
 docs/ru/operations/settings/settings.md       | 25 +++++++++++
 4 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 docs/ru/engines/table-engines/integrations/embedded-rocksdb.md

diff --git a/docs/en/engines/table-engines/integrations/embedded-rocksdb.md b/docs/en/engines/table-engines/integrations/embedded-rocksdb.md
index 857e148277c..79e0e040377 100644
--- a/docs/en/engines/table-engines/integrations/embedded-rocksdb.md
+++ b/docs/en/engines/table-engines/integrations/embedded-rocksdb.md
@@ -40,6 +40,6 @@ PRIMARY KEY key
 
 ## Description {#description}
 
-- `primary key` must be specified, it only supports one column in primary key. The primary key will serialized in binary as rocksdb key.
+- `primary key` must be specified, it supports only one column in the primary key. The primary key will be serialized in binary as a rocksdb key.
 - columns other than the primary key will be serialized in binary as rocksdb value in corresponding order.
 - queries with key `equals` or `in` filtering will be optimized to multi keys lookup from rocksdb.
diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index fc921f2ef7e..1ff2ea77fd0 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -445,7 +445,7 @@ Possible values:
 
 -   `'simple'` - Simple output format.
 
-    Clickhouse output date and time `YYYY-MM-DD hh:mm:ss` format. For example, `'2019-08-20 10:18:56'`. Calculation is performed according to the data type's time zone (if present) or server time zone.
+    Clickhouse output date and time `YYYY-MM-DD hh:mm:ss` format. For example, `'2019-08-20 10:18:56'`. The calculation is performed according to the data type's time zone (if present) or server time zone.
 
 -   `'iso'` - ISO output format.
 
diff --git a/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md b/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md
new file mode 100644
index 00000000000..e160eb2bdf5
--- /dev/null
+++ b/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md
@@ -0,0 +1,45 @@
+---
+toc_priority: 6
+toc_title: EmbeddedRocksDB
+---
+
+# EmbeddedRocksDB Engine {#EmbeddedRocksDB-engine}
+
+Этот движок позволяет интегрировать ClickHouse с [rocksdb](http://rocksdb.org/).
+
+`EmbeddedRocksDB` дает возможность:
+
+## Создавать таблицу {#table_engine-EmbeddedRocksDB-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 = EmbeddedRocksDB PRIMARY KEY(primary_key_name)
+```
+
+Обязательные параметры:
+
+-  `primary_key_name` – любое имя столбца в списке столбцов.
+
+Пример:
+
+``` sql
+CREATE TABLE test
+(
+    `key` String,
+    `v1` UInt32,
+    `v2` String,
+    `v3` Float32,
+)
+ENGINE = EmbeddedRocksDB
+PRIMARY KEY key
+```
+
+## Описание {#description}
+
+- должен быть указан `primary key`, он поддерживает только один столбец в первичном ключе. Первичный ключ будет сериализован в двоичном формате как ключ rocksdb.
+- столбцы, отличные от первичного ключа, будут сериализованы в двоичном формате как значение rockdb в соответствующем порядке.
+- запросы с фильтрацией по ключу `equals` или `in` будут оптимизированы для поиска по нескольким ключам из rocksdb.
diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index 0a8094231c2..82051a9f999 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -421,6 +421,31 @@ INSERT INTO table_with_enum_column_for_tsv_insert FORMAT TSV 102	2;
 -   [Тип данных DateTime.](../../sql-reference/data-types/datetime.md)
 -   [Функции для работы с датой и временем.](../../sql-reference/functions/date-time-functions.md)
 
+## date_time_output_format {#settings-date_time_output_format}
+
+Позволяет выбрать разные выходные форматы текстового представления даты и времени.
+
+Возможные значения:
+
+-   `'simple'` - простой выходной формат.
+
+    Выходные дата и время Clickhouse в формате `YYYY-MM-DD hh:mm:ss`. Например, `'2019-08-20 10:18:56'`. Расчет выполняется в соответствии с часовым поясом типа данных (если он есть) или часовым поясом сервера.
+
+-   `'iso'` - выходной формат ISO.
+
+    Выходные дата и время Clickhouse в формате [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) `YYYY-MM-DDThh:mm:ssZ`. Например, `'2019-08-20T10:18:56Z'`. Обратите внимание, что выходные данные отображаются в формате UTC (`Z` означает UTC).
+
+-   `'unix_timestamp'` - выходной формат Unix.
+
+    Выходные дата и время в формате [Unix](https://en.wikipedia.org/wiki/Unix_time). Например `'1566285536'`.
+
+Значение по умолчанию: `'simple'`.
+
+См. также:
+
+-   [Тип данных DateTime.](../../sql-reference/data-types/datetime.md)
+-   [Функции для работы с датой и временем.](../../sql-reference/functions/date-time-functions.md)
+
 ## join_default_strictness {#settings-join_default_strictness}
 
 Устанавливает строгость по умолчанию для [JOIN](../../sql-reference/statements/select/join.md#select-join).

From 5c9fe8ff7e6c826bfbcb7fbb42a757ab33728afe Mon Sep 17 00:00:00 2001
From: Daria Mozhaeva <dmozhaeva@yandex-team.ru>
Date: Wed, 23 Dec 2020 18:35:32 +0300
Subject: [PATCH 014/611] Edit and translate to Russian.

---
 docs/ru/sql-reference/data-types/datetime.md   | 3 ++-
 docs/ru/sql-reference/data-types/datetime64.md | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/ru/sql-reference/data-types/datetime.md b/docs/ru/sql-reference/data-types/datetime.md
index 87c5da68f35..74cec551c3f 100644
--- a/docs/ru/sql-reference/data-types/datetime.md
+++ b/docs/ru/sql-reference/data-types/datetime.md
@@ -27,7 +27,7 @@ DateTime([timezone])
 
 Консольный клиент ClickHouse по умолчанию использует часовой пояс сервера, если для значения `DateTime` часовой пояс не был задан в явном виде при инициализации типа данных. Чтобы использовать часовой пояс клиента, запустите [clickhouse-client](../../interfaces/cli.md) с параметром `--use_client_time_zone`.
 
-ClickHouse отображает значения типа `DateTime` в формате `YYYY-MM-DD hh:mm:ss`. Отображение можно поменять с помощью функции [formatDateTime](../../sql-reference/data-types/datetime.md#formatdatetime).
+ClickHouse отображает значения в зависимости от значения параметра [date\_time\_output\_format](../../operations/settings/settings.md#settings-date_time_output_format). Текстовый формат по умолчанию `YYYY-MM-DD hh:mm:ss`. Кроме того, вы можете поменять отображение с помощью функции [formatDateTime](../../sql-reference/functions/date-time-functions.md#formatdatetime).
 
 При вставке данных в ClickHouse, можно использовать различные форматы даты и времени в зависимости от значения настройки [date_time_input_format](../../operations/settings/settings.md#settings-date_time_input_format).
 
@@ -120,6 +120,7 @@ FROM dt
 -   [Функции для работы с датой и временем](../../sql-reference/data-types/datetime.md)
 -   [Функции для работы с массивами](../../sql-reference/data-types/datetime.md)
 -   [Настройка `date_time_input_format`](../../operations/settings/settings.md#settings-date_time_input_format)
+-   [Настройка `date_time_output_format`](../../operations/settings/settings.md#settings-date_time_output_format)
 -   [Конфигурационный параметр сервера `timezone`](../../sql-reference/data-types/datetime.md#server_configuration_parameters-timezone)
 -   [Операторы для работы с датой и временем](../../sql-reference/data-types/datetime.md#operators-datetime)
 -   [Тип данных `Date`](date.md)
diff --git a/docs/ru/sql-reference/data-types/datetime64.md b/docs/ru/sql-reference/data-types/datetime64.md
index 0a602e44636..275783f0097 100644
--- a/docs/ru/sql-reference/data-types/datetime64.md
+++ b/docs/ru/sql-reference/data-types/datetime64.md
@@ -96,6 +96,7 @@ FROM dt
 -   [Функции для работы с датой и временем](../../sql-reference/data-types/datetime64.md)
 -   [Функции для работы с массивами](../../sql-reference/data-types/datetime64.md)
 -   [Настройка `date_time_input_format`](../../operations/settings/settings.md#settings-date_time_input_format)
+-   [Настройка `date_time_output_format`](../../operations/settings/settings.md#settings-date_time_output_format)
 -   [Конфигурационный параметр сервера `timezone`](../../sql-reference/data-types/datetime64.md#server_configuration_parameters-timezone)
 -   [Операторы для работы с датой и временем](../../sql-reference/data-types/datetime64.md#operators-datetime)
 -   [Тип данных `Date`](date.md)

From d53919d8320788cda04e61d7ea37cad24219110f Mon Sep 17 00:00:00 2001
From: Vitaliy Zakaznikov <vzakaznikov@protonmail.com>
Date: Wed, 23 Dec 2020 14:46:47 -0500
Subject: [PATCH 015/611] Updating
 ldap/external_user_directory/requirements/requirements.py

---
 .../requirements/requirements.py              | 57 +++++++++++++------
 1 file changed, 41 insertions(+), 16 deletions(-)

diff --git a/tests/testflows/ldap/external_user_directory/requirements/requirements.py b/tests/testflows/ldap/external_user_directory/requirements/requirements.py
index 3b77685188e..7ee45ac485e 100644
--- a/tests/testflows/ldap/external_user_directory/requirements/requirements.py
+++ b/tests/testflows/ldap/external_user_directory/requirements/requirements.py
@@ -514,16 +514,14 @@ RQ_SRS_009_LDAP_ExternalUserDirectory_Restart_Server_ParallelLogins = Requiremen
 
 RQ_SRS_009_LDAP_ExternalUserDirectory_Role_Removed = Requirement(
     name='RQ.SRS-009.LDAP.ExternalUserDirectory.Role.Removed',
-    version='1.0',
+    version='2.0',
     priority=None,
     group=None,
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL reject authentication attempt if any of the roles that are specified in the configuration\n'
-        'of the external user directory are not defined at the time of the authentication attempt\n'
-        'with an exception that if a user was able to authenticate in past and its internal user object was created and cached\n'
-        'then the user SHALL be able to authenticate again, even if one of the roles is missing.\n'
+        '[ClickHouse] SHALL allow authentication even if the roles that are specified in the configuration\n'
+        'of the external user directory are not defined at the time of the authentication attempt.\n'
         '\n'
         ),
     link=None,
@@ -616,6 +614,24 @@ RQ_SRS_009_LDAP_ExternalUserDirectory_Role_RemovedPrivilege = Requirement(
     level=4,
     num='4.2.2.6')
 
+RQ_SRS_009_LDAP_ExternalUserDirectory_Role_NotPresent_Added = Requirement(
+    name='RQ.SRS-009.LDAP.ExternalUserDirectory.Role.NotPresent.Added',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL add a role to the users authenticated using LDAP external user directory\n'
+        'that did not exist during the time of authentication but are defined in the \n'
+        'configuration file as soon as the role with that name becomes\n'
+        'available.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.2.2.7')
+
 RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Server_Invalid = Requirement(
     name='RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Invalid',
     version='1.0',
@@ -1287,14 +1303,14 @@ RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Users_Parameters_Roles_MoreT
 
 RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Users_Parameters_Roles_Invalid = Requirement(
     name='RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Roles.Invalid',
-    version='1.0',
+    version='2.0',
     priority=None,
     group=None,
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL return an error if the role specified in the `<roles>`\n'
-        'parameter does not exist locally.\n'
+        '[ClickHouse] SHALL not return an error if the role specified in the `<roles>`\n'
+        'parameter does not exist locally. \n'
         '\n'
         ),
     link=None,
@@ -1497,6 +1513,7 @@ SRS_009_ClickHouse_LDAP_External_User_Directory = Specification(
         Heading(name='RQ.SRS-009.LDAP.ExternalUserDirectory.Role.New', level=4, num='4.2.2.4'),
         Heading(name='RQ.SRS-009.LDAP.ExternalUserDirectory.Role.NewPrivilege', level=4, num='4.2.2.5'),
         Heading(name='RQ.SRS-009.LDAP.ExternalUserDirectory.Role.RemovedPrivilege', level=4, num='4.2.2.6'),
+        Heading(name='RQ.SRS-009.LDAP.ExternalUserDirectory.Role.NotPresent.Added', level=4, num='4.2.2.7'),
         Heading(name='Configuration', level=3, num='4.2.3'),
         Heading(name='RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Invalid', level=4, num='4.2.3.1'),
         Heading(name='RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Definition', level=4, num='4.2.3.2'),
@@ -1587,6 +1604,7 @@ SRS_009_ClickHouse_LDAP_External_User_Directory = Specification(
         RQ_SRS_009_LDAP_ExternalUserDirectory_Role_New,
         RQ_SRS_009_LDAP_ExternalUserDirectory_Role_NewPrivilege,
         RQ_SRS_009_LDAP_ExternalUserDirectory_Role_RemovedPrivilege,
+        RQ_SRS_009_LDAP_ExternalUserDirectory_Role_NotPresent_Added,
         RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Server_Invalid,
         RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Server_Definition,
         RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Server_Name,
@@ -1690,6 +1708,7 @@ SRS_009_ClickHouse_LDAP_External_User_Directory = Specification(
       * 4.2.2.4 [RQ.SRS-009.LDAP.ExternalUserDirectory.Role.New](#rqsrs-009ldapexternaluserdirectoryrolenew)
       * 4.2.2.5 [RQ.SRS-009.LDAP.ExternalUserDirectory.Role.NewPrivilege](#rqsrs-009ldapexternaluserdirectoryrolenewprivilege)
       * 4.2.2.6 [RQ.SRS-009.LDAP.ExternalUserDirectory.Role.RemovedPrivilege](#rqsrs-009ldapexternaluserdirectoryroleremovedprivilege)
+      * 4.2.2.7 [RQ.SRS-009.LDAP.ExternalUserDirectory.Role.NotPresent.Added](#rqsrs-009ldapexternaluserdirectoryrolenotpresentadded)
     * 4.2.3 [Configuration](#configuration)
       * 4.2.3.1 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Invalid](#rqsrs-009ldapexternaluserdirectoryconfigurationserverinvalid)
       * 4.2.3.2 [RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Definition](#rqsrs-009ldapexternaluserdirectoryconfigurationserverdefinition)
@@ -1973,12 +1992,10 @@ are configured during parallel [LDAP] user logins.
 #### Roles
 
 ##### RQ.SRS-009.LDAP.ExternalUserDirectory.Role.Removed
-version: 1.0
+version: 2.0
 
-[ClickHouse] SHALL reject authentication attempt if any of the roles that are specified in the configuration
-of the external user directory are not defined at the time of the authentication attempt
-with an exception that if a user was able to authenticate in past and its internal user object was created and cached
-then the user SHALL be able to authenticate again, even if one of the roles is missing.
+[ClickHouse] SHALL allow authentication even if the roles that are specified in the configuration
+of the external user directory are not defined at the time of the authentication attempt.
 
 ##### RQ.SRS-009.LDAP.ExternalUserDirectory.Role.Removed.Privileges
 version: 1.0
@@ -2016,6 +2033,14 @@ version: 1.0
 including cached users when privilege is removed from all the roles specified
 in the configuration of the external user directory.
 
+##### RQ.SRS-009.LDAP.ExternalUserDirectory.Role.NotPresent.Added
+version: 1.0
+
+[ClickHouse] SHALL add a role to the users authenticated using LDAP external user directory
+that did not exist during the time of authentication but are defined in the 
+configuration file as soon as the role with that name becomes
+available.
+
 #### Configuration
 
 ##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Server.Invalid
@@ -2298,10 +2323,10 @@ in the `<ldap>` sub-section in the `<user_directories>`
 if more than one `roles` parameter is defined in the configuration.
 
 ##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Roles.Invalid
-version: 1.0
+version: 2.0
 
-[ClickHouse] SHALL return an error if the role specified in the `<roles>`
-parameter does not exist locally.
+[ClickHouse] SHALL not return an error if the role specified in the `<roles>`
+parameter does not exist locally. 
 
 ##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Roles.Empty
 version: 1.0

From 49631a39ae843426a87bd94baa2398b125838e3a Mon Sep 17 00:00:00 2001
From: damozhaeva <68770561+damozhaeva@users.noreply.github.com>
Date: Fri, 25 Dec 2020 15:05:23 +0300
Subject: [PATCH 016/611] Update
 docs/ru/engines/table-engines/integrations/embedded-rocksdb.md

Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
---
 docs/ru/engines/table-engines/integrations/embedded-rocksdb.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md b/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md
index e160eb2bdf5..2074021121a 100644
--- a/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md
+++ b/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md
@@ -9,7 +9,7 @@ toc_title: EmbeddedRocksDB
 
 `EmbeddedRocksDB` дает возможность:
 
-## Создавать таблицу {#table_engine-EmbeddedRocksDB-creating-a-table}
+## Создание таблицы {#table_engine-EmbeddedRocksDB-creating-a-table}
 
 ``` sql
 CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]

From e00b0117410d7e024889e82f825757bf769b8a18 Mon Sep 17 00:00:00 2001
From: damozhaeva <68770561+damozhaeva@users.noreply.github.com>
Date: Fri, 25 Dec 2020 15:05:52 +0300
Subject: [PATCH 017/611] Update docs/ru/operations/settings/settings.md

Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
---
 docs/ru/operations/settings/settings.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index 82051a9f999..2f940758e09 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -443,7 +443,7 @@ INSERT INTO table_with_enum_column_for_tsv_insert FORMAT TSV 102	2;
 
 См. также:
 
--   [Тип данных DateTime.](../../sql-reference/data-types/datetime.md)
+-   [Тип данных DateTime](../../sql-reference/data-types/datetime.md)
 -   [Функции для работы с датой и временем.](../../sql-reference/functions/date-time-functions.md)
 
 ## join_default_strictness {#settings-join_default_strictness}

From 5bc3d563d56bc837c28d177af7eb5066e4a24970 Mon Sep 17 00:00:00 2001
From: damozhaeva <68770561+damozhaeva@users.noreply.github.com>
Date: Fri, 25 Dec 2020 15:06:54 +0300
Subject: [PATCH 018/611] Update docs/ru/operations/settings/settings.md

Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
---
 docs/ru/operations/settings/settings.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index 2f940758e09..b48ca668aa4 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -444,7 +444,7 @@ INSERT INTO table_with_enum_column_for_tsv_insert FORMAT TSV 102	2;
 См. также:
 
 -   [Тип данных DateTime](../../sql-reference/data-types/datetime.md)
--   [Функции для работы с датой и временем.](../../sql-reference/functions/date-time-functions.md)
+-   [Функции для работы с датой и временем](../../sql-reference/functions/date-time-functions.md)
 
 ## join_default_strictness {#settings-join_default_strictness}
 

From bc3e8f77f67ec0bd76533abefd0f4707185e82d6 Mon Sep 17 00:00:00 2001
From: damozhaeva <68770561+damozhaeva@users.noreply.github.com>
Date: Fri, 25 Dec 2020 15:07:20 +0300
Subject: [PATCH 019/611] Update
 docs/ru/engines/table-engines/integrations/embedded-rocksdb.md

Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
---
 docs/ru/engines/table-engines/integrations/embedded-rocksdb.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md b/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md
index 2074021121a..e57b83070dc 100644
--- a/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md
+++ b/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md
@@ -22,7 +22,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 Обязательные параметры:
 
--  `primary_key_name` – любое имя столбца в списке столбцов.
+-  `primary_key_name` – любое имя столбца из списка столбцов.
 
 Пример:
 

From 8088b17ae25a76ae10ea74ac01aaba172500b38a Mon Sep 17 00:00:00 2001
From: damozhaeva <68770561+damozhaeva@users.noreply.github.com>
Date: Fri, 25 Dec 2020 15:08:22 +0300
Subject: [PATCH 020/611] Update
 docs/ru/engines/table-engines/integrations/embedded-rocksdb.md

Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
---
 docs/ru/engines/table-engines/integrations/embedded-rocksdb.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md b/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md
index e57b83070dc..3fd1b1e8d89 100644
--- a/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md
+++ b/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md
@@ -17,7 +17,8 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
     name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1],
     name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
     ...
-) ENGINE = EmbeddedRocksDB PRIMARY KEY(primary_key_name)
+) ENGINE = EmbeddedRocksDB 
+PRIMARY KEY(primary_key_name);
 ```
 
 Обязательные параметры:

From 47e8783f5be5a133ab133a18b90ced056aa00b4c Mon Sep 17 00:00:00 2001
From: damozhaeva <68770561+damozhaeva@users.noreply.github.com>
Date: Fri, 25 Dec 2020 15:08:35 +0300
Subject: [PATCH 021/611] Update
 docs/ru/engines/table-engines/integrations/embedded-rocksdb.md

Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
---
 docs/ru/engines/table-engines/integrations/embedded-rocksdb.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md b/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md
index 3fd1b1e8d89..575fc279b74 100644
--- a/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md
+++ b/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md
@@ -36,7 +36,7 @@ CREATE TABLE test
     `v3` Float32,
 )
 ENGINE = EmbeddedRocksDB
-PRIMARY KEY key
+PRIMARY KEY key;
 ```
 
 ## Описание {#description}

From 51cfbe8c2ec5970934438df8be4d16651458fa8c Mon Sep 17 00:00:00 2001
From: alfredlu <alfredlu@MacBook-Pro.local>
Date: Sun, 27 Dec 2020 18:35:46 +0800
Subject: [PATCH 022/611] Add log_comment setting

---
 src/Core/Settings.h               |  1 +
 src/Interpreters/executeQuery.cpp | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index b09e960da36..fb2e13304d3 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -324,6 +324,7 @@ class IColumn;
     M(Bool, log_profile_events, true, "Log query performance statistics into the query_log and query_thread_log.", 0) \
     M(Bool, log_query_settings, true, "Log query settings into the query_log.", 0) \
     M(Bool, log_query_threads, true, "Log query threads into system.query_thread_log table. This setting have effect only when 'log_queries' is true.", 0) \
+    M(String, log_comment, "comment: ", "Log comment format", 0) \
     M(LogsLevel, send_logs_level, LogsLevel::fatal, "Send server text logs with specified minimum level to client. Valid values: 'trace', 'debug', 'information', 'warning', 'error', 'fatal', 'none'", 0) \
     M(Bool, enable_optimize_predicate_expression, 1, "If it is set to true, optimize predicates to subqueries.", 0) \
     M(Bool, enable_optimize_predicate_expression_to_final_subquery, 1, "Allow push predicate to final subquery.", 0) \
diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index a2ae96e8199..8b3a56a5a97 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -158,6 +158,13 @@ static void logQuery(const String & query, const Context & context, bool interna
         const auto & initial_query_id = client_info.initial_query_id;
         const auto & current_user = client_info.current_user;
 
+        const Settings & settings = context.getSettingsRef();
+        const auto & log_comment = settings.log_comment;
+        if (!log_comment.toString().empty())
+        {
+            query = query + log_comment;
+        }
+
         LOG_DEBUG(&Poco::Logger::get("executeQuery"), "(from {}{}{}, using {} parser) {}",
             client_info.current_address.toString(),
             (current_user != "default" ? ", user: " + current_user : ""),
@@ -171,6 +178,22 @@ static void logQuery(const String & query, const Context & context, bool interna
                 "OpenTelemetry traceparent '{}'",
                 client_info.client_trace_context.composeTraceparentHeader());
         }
+
+        QueryLogElement elem;
+
+        elem.type = QueryLogElementType::QUERY_START;
+        elem.event_time = current_time_us / 1000000;
+        elem.event_time_microseconds = current_time_us;
+        elem.query_start_time = current_time_us / 1000000;
+        elem.query_start_time_microseconds = current_time_us;
+
+        elem.current_database = context.getCurrentDatabase();
+        elem.query = query;
+        elem.normalized_query_hash = normalizedQueryHash(query);
+
+        elem.client_info = client_info;
+        if (auto query_log = context.getQueryLog())
+            query_log->add(elem);
     }
 }
 

From 0c7b1518008812263f8e6f4c2a17c2360c8877f1 Mon Sep 17 00:00:00 2001
From: Denis Glazachev <d.glazachev@gmail.com>
Date: Mon, 28 Dec 2020 00:54:24 +0400
Subject: [PATCH 023/611] Revisit mapped role management

---
 src/Access/LDAPAccessStorage.cpp | 226 +++++++++++++++----------------
 src/Access/LDAPAccessStorage.h   |  16 ++-
 2 files changed, 122 insertions(+), 120 deletions(-)

diff --git a/src/Access/LDAPAccessStorage.cpp b/src/Access/LDAPAccessStorage.cpp
index e86a82c1ac2..a787c704999 100644
--- a/src/Access/LDAPAccessStorage.cpp
+++ b/src/Access/LDAPAccessStorage.cpp
@@ -102,10 +102,11 @@ void LDAPAccessStorage::setConfiguration(AccessControlManager * access_control_m
     role_search_params.swap(role_search_params_cfg);
     common_role_names.swap(common_roles_cfg);
 
+    external_role_hashes.clear();
     users_per_roles.clear();
+    roles_per_users.clear();
     granted_role_names.clear();
     granted_role_ids.clear();
-    external_role_hashes.clear();
 
     role_change_subscription = access_control_manager->subscribeForChanges<Role>(
         [this] (const UUID & id, const AccessEntityPtr & entity)
@@ -113,46 +114,37 @@ void LDAPAccessStorage::setConfiguration(AccessControlManager * access_control_m
             return this->processRoleChange(id, entity);
         }
     );
-
-    // Update granted_role_* with the initial values: resolved ids of roles from common_role_names.
-    for (const auto & role_name : common_role_names)
-    {
-        if (const auto role_id = access_control_manager->find<Role>(role_name))
-        {
-            granted_role_names.insert_or_assign(*role_id, role_name);
-            granted_role_ids.insert_or_assign(role_name, *role_id);
-        }
-    }
 }
 
 
 void LDAPAccessStorage::processRoleChange(const UUID & id, const AccessEntityPtr & entity)
 {
     std::scoped_lock lock(mutex);
-    auto role = typeid_cast<std::shared_ptr<const Role>>(entity);
+    const auto role = typeid_cast<std::shared_ptr<const Role>>(entity);
     const auto it = granted_role_names.find(id);
 
-    if (role) // Added or renamed role.
+    if (role) // Added or renamed a role.
     {
         const auto & new_role_name = role->getName();
-        if (it != granted_role_names.end())
+        if (it != granted_role_names.end()) // Renamed a granted role.
         {
-            // Revoke the old role if its name has been changed.
             const auto & old_role_name = it->second;
             if (new_role_name != old_role_name)
             {
+                // Revoke the old role first, then grant the new role.
                 applyRoleChangeNoLock(false /* revoke */, id, old_role_name);
+                applyRoleChangeNoLock(true /* grant */, id, new_role_name);
             }
         }
-
-        // Grant the role.
-        applyRoleChangeNoLock(true /* grant */, id, new_role_name);
-    }
-    else // Removed role.
-    {
-        if (it != granted_role_names.end())
+        else // Added a role.
+        {
+            applyRoleChangeNoLock(true /* grant */, id, new_role_name);
+        }
+    }
+    else // Removed a role.
+    {
+        if (it != granted_role_names.end()) // Removed a granted role.
         {
-            // Revoke the old role.
             const auto & old_role_name = it->second;
             applyRoleChangeNoLock(false /* revoke */, id, old_role_name);
         }
@@ -164,7 +156,7 @@ void LDAPAccessStorage::applyRoleChangeNoLock(bool grant, const UUID & role_id,
 {
     std::vector<UUID> user_ids;
 
-    // Find relevant user ids.
+    // Build a list of ids of the relevant users.
     if (common_role_names.count(role_name))
     {
         user_ids = memory_storage.findAll<User>();
@@ -176,6 +168,7 @@ void LDAPAccessStorage::applyRoleChangeNoLock(bool grant, const UUID & role_id,
         {
             const auto & user_names = it->second;
             user_ids.reserve(user_names.size());
+
             for (const auto & user_name : user_names)
             {
                 if (const auto user_id = memory_storage.find<User>(user_name))
@@ -184,7 +177,7 @@ void LDAPAccessStorage::applyRoleChangeNoLock(bool grant, const UUID & role_id,
         }
     }
 
-    // Update relevant users' granted roles.
+    // Update the granted roles of the relevant users.
     if (!user_ids.empty())
     {
         auto update_func = [&role_id, &grant] (const AccessEntityPtr & entity_) -> AccessEntityPtr
@@ -205,129 +198,135 @@ void LDAPAccessStorage::applyRoleChangeNoLock(bool grant, const UUID & role_id,
         };
 
         memory_storage.update(user_ids, update_func);
+    }
 
-        if (grant)
+    // Actualize granted_role_* mappings.
+    if (grant)
+    {
+        if (!user_ids.empty())
         {
             granted_role_names.insert_or_assign(role_id, role_name);
             granted_role_ids.insert_or_assign(role_name, role_id);
         }
-        else
-        {
-            granted_role_names.erase(role_id);
-            granted_role_ids.erase(role_name);
-        }
+    }
+    else
+    {
+        granted_role_names.erase(role_id);
+        granted_role_ids.erase(role_name);
     }
 }
 
 
-void LDAPAccessStorage::grantRolesNoLock(User & user, const LDAPSearchResultsList & external_roles) const
+void LDAPAccessStorage::assignRolesNoLock(User & user, const LDAPSearchResultsList & external_roles) const
+{
+    const auto external_roles_hash = boost::hash<LDAPSearchResultsList>{}(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
 {
     const auto & user_name = user.getName();
-    const auto new_hash = boost::hash<LDAPSearchResultsList>{}(external_roles);
     auto & granted_roles = user.granted_roles.roles;
+    const auto local_role_names = mapExternalRolesNoLock(external_roles);
 
-    // Map external role names to local role names.
-    const auto user_role_names = mapExternalRolesNoLock(external_roles);
-
-    external_role_hashes.erase(user_name);
-    granted_roles.clear();
-
-    // Grant the common roles.
-
-    // Initially, all the available ids of common roles were resolved in setConfiguration(),
-    // and, then, maintained by processRoleChange(), so here we just grant those that exist (i.e., resolved).
-    for (const auto & role_name : common_role_names)
+    auto grant_role = [this, &user_name, &granted_roles] (const String & role_name, const bool common)
     {
-        const auto it = granted_role_ids.find(role_name);
-        if (it == granted_role_ids.end())
-        {
-            LOG_WARNING(getLogger(), "Unable to grant common role '{}' to user '{}': role not found", role_name, user_name);
-        }
-        else
-        {
-            const auto & role_id = it->second;
-            granted_roles.insert(role_id);
-        }
-    }
-
-    // Grant the mapped external roles.
-
-    // Cleanup helper relations.
-    for (auto it = users_per_roles.begin(); it != users_per_roles.end();)
-    {
-        const auto & role_name = it->first;
-        auto & user_names = it->second;
-        if (user_role_names.count(role_name) == 0)
-        {
-            user_names.erase(user_name);
-            if (user_names.empty())
-            {
-                if (common_role_names.count(role_name) == 0)
-                {
-                    auto rit = granted_role_ids.find(role_name);
-                    if (rit != granted_role_ids.end())
-                    {
-                        granted_role_names.erase(rit->second);
-                        granted_role_ids.erase(rit);
-                    }
-                }
-                users_per_roles.erase(it++);
-            }
-            else
-            {
-                ++it;
-            }
-        }
-        else
-        {
-            ++it;
-        }
-    }
-
-    // Resolve and assign mapped external role ids.
-    for (const auto & role_name : user_role_names)
-    {
-        users_per_roles[role_name].insert(user_name);
-        const auto it = granted_role_ids.find(role_name);
+        auto it = granted_role_ids.find(role_name);
         if (it == granted_role_ids.end())
         {
             if (const auto role_id = access_control_manager->find<Role>(role_name))
             {
-                granted_roles.insert(*role_id);
                 granted_role_names.insert_or_assign(*role_id, role_name);
-                granted_role_ids.insert_or_assign(role_name, *role_id);
-            }
-            else
-            {
-                LOG_WARNING(getLogger(), "Unable to grant mapped role '{}' to user '{}': role not found", role_name, user_name);
+                it = granted_role_ids.insert_or_assign(role_name, *role_id).first;
             }
         }
-        else
+
+        if (it != granted_role_ids.end())
         {
             const auto & role_id = it->second;
             granted_roles.insert(role_id);
         }
+        else
+        {
+            LOG_WARNING(getLogger(), "Unable to grant {} role '{}' to user '{}': role not found", (common ? "common" : "mapped"), role_name, user_name);
+        }
+    };
+
+    external_role_hashes.erase(user_name);
+    granted_roles.clear();
+    const auto old_role_names = std::move(roles_per_users[user_name]);
+
+    // Grant the common roles first.
+    for (const auto & role_name : common_role_names)
+    {
+        grant_role(role_name, true /* common */);
     }
 
-    external_role_hashes[user_name] = new_hash;
+    // Grant the mapped external roles and actualize users_per_roles mapping.
+    // local_role_names allowed to overlap with common_role_names.
+    for (const auto & role_name : local_role_names)
+    {
+        grant_role(role_name, false /* mapped */);
+        users_per_roles[role_name].insert(user_name);
+    }
+
+    // Cleanup users_per_roles and granted_role_* mappings.
+    for (const auto & old_role_name : old_role_names)
+    {
+        if (local_role_names.count(old_role_name))
+            continue;
+
+        const auto rit = users_per_roles.find(old_role_name);
+        if (rit == users_per_roles.end())
+            continue;
+
+        auto & user_names = rit->second;
+        user_names.erase(user_name);
+
+        if (!user_names.empty())
+            continue;
+
+        users_per_roles.erase(rit);
+
+        if (common_role_names.count(old_role_name))
+            continue;
+
+        const auto iit = granted_role_ids.find(old_role_name);
+        if (iit == granted_role_ids.end())
+            continue;
+
+        const auto old_role_id = iit->second;
+        granted_role_names.erase(old_role_id);
+        granted_role_ids.erase(iit);
+    }
+
+    // Actualize roles_per_users mapping and external_role_hashes cache.
+    if (local_role_names.empty())
+        roles_per_users.erase(user_name);
+    else
+        roles_per_users[user_name] = std::move(local_role_names);
+
+    external_role_hashes[user_name] = external_roles_hash;
 }
 
 
-void LDAPAccessStorage::updateRolesNoLock(const UUID & id, const String & user_name, const LDAPSearchResultsList & external_roles) const
+void LDAPAccessStorage::updateAssignedRolesNoLock(const UUID & id, const String & user_name, const LDAPSearchResultsList & external_roles) const
 {
-    // common_role_names are not included since they don't change.
-    const auto new_hash = boost::hash<LDAPSearchResultsList>{}(external_roles);
+    // 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);
 
+    // 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);
-    if (it != external_role_hashes.end() && it->second == new_hash)
+    if (it != external_role_hashes.end() && it->second == external_roles_hash)
         return;
 
-    auto update_func = [this, &external_roles] (const AccessEntityPtr & entity_) -> AccessEntityPtr
+    auto update_func = [this, &external_roles, external_roles_hash] (const AccessEntityPtr & entity_) -> AccessEntityPtr
     {
         if (auto user = typeid_cast<std::shared_ptr<const User>>(entity_))
         {
             auto changed_user = typeid_cast<std::shared_ptr<User>>(user->clone());
-            grantRolesNoLock(*changed_user, external_roles);
+            assignRolesNoLock(*changed_user, external_roles, external_roles_hash);
             return changed_user;
         }
         return entity_;
@@ -529,7 +528,7 @@ UUID LDAPAccessStorage::loginImpl(const String & user_name, const String & passw
             throwAddressNotAllowed(address);
 
         // Just in case external_roles are changed. This will be no-op if they are not.
-        updateRolesNoLock(*id, user_name, external_roles);
+        updateAssignedRolesNoLock(*id, user_name, external_roles);
 
         return *id;
     }
@@ -547,7 +546,7 @@ UUID LDAPAccessStorage::loginImpl(const String & user_name, const String & passw
         if (!isAddressAllowedImpl(*user, address))
             throwAddressNotAllowed(address);
 
-        grantRolesNoLock(*user, external_roles);
+        assignRolesNoLock(*user, external_roles);
 
         return memory_storage.insert(user);
     }
@@ -570,9 +569,10 @@ UUID LDAPAccessStorage::getIDOfLoggedUserImpl(const String & user_name) const
         user->authentication.setServerName(ldap_server);
 
         LDAPSearchResultsList external_roles;
-        // TODO: mapped external roles are not available here. Implement?
 
-        grantRolesNoLock(*user, external_roles);
+        // TODO: mapped external roles are not available here. Without a password we can't authenticate and retrieve roles from LDAP server.
+
+        assignRolesNoLock(*user, external_roles);
 
         return memory_storage.insert(user);
     }
diff --git a/src/Access/LDAPAccessStorage.h b/src/Access/LDAPAccessStorage.h
index 8ec7325f9c2..cce50fd03aa 100644
--- a/src/Access/LDAPAccessStorage.h
+++ b/src/Access/LDAPAccessStorage.h
@@ -65,8 +65,9 @@ private:
     void processRoleChange(const UUID & id, const AccessEntityPtr & entity);
 
     void applyRoleChangeNoLock(bool grant, const UUID & role_id, const String & role_name);
-    void grantRolesNoLock(User & user, const LDAPSearchResultsList & external_roles) const;
-    void updateRolesNoLock(const UUID & id, const String & user_name, const LDAPSearchResultsList & external_roles) const;
+    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 User & user, const String & password, const ExternalAuthenticators & external_authenticators, LDAPSearchResultsList & search_results) const;
 
@@ -74,11 +75,12 @@ private:
     AccessControlManager * access_control_manager = nullptr;
     String ldap_server;
     LDAPSearchParamsList role_search_params;
-    std::set<String> common_role_names;
-    mutable std::map<String, std::set<String>> users_per_roles; // per-user roles: role name -> user names
-    mutable std::map<UUID, String> granted_role_names;          // currently granted roles: role id -> role name
-    mutable std::map<String, UUID> granted_role_ids;            // currently granted roles: role name -> role id
-    mutable std::map<String, std::size_t> external_role_hashes; // user name -> LDAPSearchResultsList hash
+    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::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
+    mutable std::map<String, UUID> granted_role_ids;            // (currently granted) role name -> its id
     ext::scope_guard role_change_subscription;
     mutable MemoryAccessStorage memory_storage;
 };

From 5b544b5850efd54e56f2ce17e593923a889b30b4 Mon Sep 17 00:00:00 2001
From: Anna <annaconda@bk.ru>
Date: Mon, 28 Dec 2020 00:45:07 +0300
Subject: [PATCH 024/611] add desc for SHOW CLUSTERS

---
 docs/en/sql-reference/statements/show.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/en/sql-reference/statements/show.md b/docs/en/sql-reference/statements/show.md
index e1f2ef3488a..4d18018e4d1 100644
--- a/docs/en/sql-reference/statements/show.md
+++ b/docs/en/sql-reference/statements/show.md
@@ -348,4 +348,21 @@ Returns a [quota](../../operations/quotas.md) consumption for all users or for c
 SHOW [CURRENT] QUOTA
 ```
 
+## SHOW CLUSTER(s) {#show-cluster-statement}
+
+Returns a list of clusters. All available clusters are listed in the [system.clusters](../../operations/system-tables/clusters.md) table.
+
+### Syntax {#show-cluster-syntax}
+
+``` sql
+SHOW (CLUSTER '<name>') | (CLUSTERS [LIKE|NOT LIKE '<pattern>'] [LIMIT <N>]);
+```
+### Examples 
+
+``` sql
+SHOW CLUSTERS;
+SHOW CLUSTERS LIKE 'xxx';
+SHOW CLUSTER 'xxx';
+```
+
 [Original article](https://clickhouse.tech/docs/en/query_language/show/) <!--hide-->

From 7ec8a73cc321640edc002b21e6263c5284cb89b5 Mon Sep 17 00:00:00 2001
From: alfredlu <alfredlu@MacBook-Pro.local>
Date: Mon, 28 Dec 2020 10:38:16 +0800
Subject: [PATCH 025/611] fix build

---
 src/Core/Settings.h               |  2 +-
 src/Interpreters/QueryLog.h       |  2 ++
 src/Interpreters/executeQuery.cpp | 25 ++++---------------------
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index fb2e13304d3..16e6a72ab82 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -324,7 +324,7 @@ class IColumn;
     M(Bool, log_profile_events, true, "Log query performance statistics into the query_log and query_thread_log.", 0) \
     M(Bool, log_query_settings, true, "Log query settings into the query_log.", 0) \
     M(Bool, log_query_threads, true, "Log query threads into system.query_thread_log table. This setting have effect only when 'log_queries' is true.", 0) \
-    M(String, log_comment, "comment: ", "Log comment format", 0) \
+    M(String, log_comment, "", "Log comment into system.query_thread_log table. It can be set to arbitrary string no longer than max_query_size.", 0) \
     M(LogsLevel, send_logs_level, LogsLevel::fatal, "Send server text logs with specified minimum level to client. Valid values: 'trace', 'debug', 'information', 'warning', 'error', 'fatal', 'none'", 0) \
     M(Bool, enable_optimize_predicate_expression, 1, "If it is set to true, optimize predicates to subqueries.", 0) \
     M(Bool, enable_optimize_predicate_expression_to_final_subquery, 1, "Allow push predicate to final subquery.", 0) \
diff --git a/src/Interpreters/QueryLog.h b/src/Interpreters/QueryLog.h
index 8b23a1f1ef9..2a90f78941d 100644
--- a/src/Interpreters/QueryLog.h
+++ b/src/Interpreters/QueryLog.h
@@ -64,6 +64,8 @@ struct QueryLogElement
 
     ClientInfo client_info;
 
+    String log_comment;
+
     std::vector<UInt64> thread_ids;
     std::shared_ptr<ProfileEvents::Counters> profile_counters;
     std::shared_ptr<Settings> query_settings;
diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index 8b3a56a5a97..2c4e8cd7cb3 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -160,16 +160,12 @@ static void logQuery(const String & query, const Context & context, bool interna
 
         const Settings & settings = context.getSettingsRef();
         const auto & log_comment = settings.log_comment;
-        if (!log_comment.toString().empty())
-        {
-            query = query + log_comment;
-        }
 
         LOG_DEBUG(&Poco::Logger::get("executeQuery"), "(from {}{}{}, using {} parser) {}",
             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 ? "new" : "old"),
+            (context.getSettingsRef().use_antlr_parser ? "new" : "old"), (!log_comment.empty() ? ", comment: " + log_comment : std::string() : ""),
             joinLines(query));
 
         if (client_info.client_trace_context.trace_id)
@@ -178,22 +174,6 @@ static void logQuery(const String & query, const Context & context, bool interna
                 "OpenTelemetry traceparent '{}'",
                 client_info.client_trace_context.composeTraceparentHeader());
         }
-
-        QueryLogElement elem;
-
-        elem.type = QueryLogElementType::QUERY_START;
-        elem.event_time = current_time_us / 1000000;
-        elem.event_time_microseconds = current_time_us;
-        elem.query_start_time = current_time_us / 1000000;
-        elem.query_start_time_microseconds = current_time_us;
-
-        elem.current_database = context.getCurrentDatabase();
-        elem.query = query;
-        elem.normalized_query_hash = normalizedQueryHash(query);
-
-        elem.client_info = client_info;
-        if (auto query_log = context.getQueryLog())
-            query_log->add(elem);
     }
 }
 
@@ -650,6 +630,9 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 if (settings.log_query_settings)
                     elem.query_settings = std::make_shared<Settings>(context.getSettingsRef());
 
+                if (!settings.log_comment.toString().empty() && settings.log_comment.toString().length() <= max_query_size)
+                    elem.log_comment = settings.log_comment.toString();
+
                 if (elem.type >= settings.log_queries_min_type && !settings.log_queries_min_query_duration_ms.totalMilliseconds())
                 {
                     if (auto query_log = context.getQueryLog())

From 8e665955e76a2a5920b18a6b139ba21f4b3f1f08 Mon Sep 17 00:00:00 2001
From: TszkitLo40 <wslzj40@gmail.com>
Date: Mon, 28 Dec 2020 11:09:29 +0800
Subject: [PATCH 026/611] fix build.

---
 src/Interpreters/executeQuery.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index 2c4e8cd7cb3..aa820eee429 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -159,13 +159,13 @@ static void logQuery(const String & query, const Context & context, bool interna
         const auto & current_user = client_info.current_user;
 
         const Settings & settings = context.getSettingsRef();
-        const auto & log_comment = settings.log_comment;
+        const String & log_comment = settings.log_comment;
 
         LOG_DEBUG(&Poco::Logger::get("executeQuery"), "(from {}{}{}, using {} parser) {}",
             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 ? "new" : "old"), (!log_comment.empty() ? ", comment: " + log_comment : std::string() : ""),
+            (context.getSettingsRef().use_antlr_parser ? "new" : "old"), (!log_comment.empty() && log_comment.length() < context.getSettingsRef().max_query_size ? ", comment: " + log_comment : std::string()),
             joinLines(query));
 
         if (client_info.client_trace_context.trace_id)

From 9f2ae66eb5c3796c5838690fcf78b3ce24d4012f Mon Sep 17 00:00:00 2001
From: TszkitLo40 <wslzj40@gmail.com>
Date: Mon, 28 Dec 2020 20:37:09 +0800
Subject: [PATCH 027/611] fix style.

---
 src/Interpreters/executeQuery.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index aa820eee429..668188ee93d 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -158,14 +158,15 @@ static void logQuery(const String & query, const Context & context, bool interna
         const auto & initial_query_id = client_info.initial_query_id;
         const auto & current_user = client_info.current_user;
 
-        const Settings & settings = context.getSettingsRef();
-        const String & log_comment = settings.log_comment;
-
         LOG_DEBUG(&Poco::Logger::get("executeQuery"), "(from {}{}{}, using {} parser) {}",
             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 ? "new" : "old"), (!log_comment.empty() && log_comment.length() < context.getSettingsRef().max_query_size ? ", comment: " + log_comment : std::string()),
+            (context.getSettingsRef().use_antlr_parser ? "new" : "old"),
+            (!context.getSettingsRef().log_comment.empty()
+                     && context.getSettingsRef().log_comment.length() <= context.getSettingsRef().max_query_size
+                 ? ", comment: " + context.getSettingsRef().log_comment
+                 : std::string()),
             joinLines(query));
 
         if (client_info.client_trace_context.trace_id)

From 55dac9715ae567f4c577fbb8ee5859a82b5500bb Mon Sep 17 00:00:00 2001
From: TszkitLo40 <wslzj40@gmail.com>
Date: Mon, 28 Dec 2020 20:57:27 +0800
Subject: [PATCH 028/611] bugfix

---
 src/Interpreters/executeQuery.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index 668188ee93d..d7e174e0113 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -163,8 +163,8 @@ static void logQuery(const String & query, const Context & context, bool interna
             (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 ? "new" : "old"),
-            (!context.getSettingsRef().log_comment.empty()
-                     && context.getSettingsRef().log_comment.length() <= context.getSettingsRef().max_query_size
+            (!context.getSettingsRef().log_comment.toString().empty()
+                     && context.getSettingsRef().log_comment.toString().length() <= context.getSettingsRef().max_query_size
                  ? ", comment: " + context.getSettingsRef().log_comment
                  : std::string()),
             joinLines(query));
@@ -253,6 +253,9 @@ static void onExceptionBeforeStart(const String & query_for_logging, Context & c
 
     elem.client_info = context.getClientInfo();
 
+    if (!settings.log_comment.toString().empty() && settings.log_comment.toString().length() <= max_query_size)
+        elem.log_comment = settings.log_comment.toString();
+
     if (settings.calculate_text_stack_trace)
         setExceptionStackTrace(elem);
     logException(context, elem);

From f7d7880ad54fd22e7c80e73977fb26c7c45aa666 Mon Sep 17 00:00:00 2001
From: TszkitLo40 <wslzj40@gmail.com>
Date: Tue, 29 Dec 2020 10:13:27 +0800
Subject: [PATCH 029/611] fix build

---
 src/Core/Settings.h               | 2 +-
 src/Interpreters/executeQuery.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index 16e6a72ab82..00e5651ec97 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -324,7 +324,7 @@ class IColumn;
     M(Bool, log_profile_events, true, "Log query performance statistics into the query_log and query_thread_log.", 0) \
     M(Bool, log_query_settings, true, "Log query settings into the query_log.", 0) \
     M(Bool, log_query_threads, true, "Log query threads into system.query_thread_log table. This setting have effect only when 'log_queries' is true.", 0) \
-    M(String, log_comment, "", "Log comment into system.query_thread_log table. It can be set to arbitrary string no longer than max_query_size.", 0) \
+    M(String, log_comment, "", "Log comment into system.query_log table. It can be set to arbitrary string no longer than max_query_size.", 0) \
     M(LogsLevel, send_logs_level, LogsLevel::fatal, "Send server text logs with specified minimum level to client. Valid values: 'trace', 'debug', 'information', 'warning', 'error', 'fatal', 'none'", 0) \
     M(Bool, enable_optimize_predicate_expression, 1, "If it is set to true, optimize predicates to subqueries.", 0) \
     M(Bool, enable_optimize_predicate_expression_to_final_subquery, 1, "Allow push predicate to final subquery.", 0) \
diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index d7e174e0113..8ed77de6ac6 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -165,7 +165,7 @@ static void logQuery(const String & query, const Context & context, bool interna
             (context.getSettingsRef().use_antlr_parser ? "new" : "old"),
             (!context.getSettingsRef().log_comment.toString().empty()
                      && context.getSettingsRef().log_comment.toString().length() <= context.getSettingsRef().max_query_size
-                 ? ", comment: " + context.getSettingsRef().log_comment
+                 ? ", comment: " + context.getSettingsRef().log_comment.toString()
                  : std::string()),
             joinLines(query));
 
@@ -253,7 +253,7 @@ static void onExceptionBeforeStart(const String & query_for_logging, Context & c
 
     elem.client_info = context.getClientInfo();
 
-    if (!settings.log_comment.toString().empty() && settings.log_comment.toString().length() <= max_query_size)
+    if (!settings.log_comment.toString().empty() && settings.log_comment.toString().length() <= settings.max_query_size)
         elem.log_comment = settings.log_comment.toString();
 
     if (settings.calculate_text_stack_trace)

From 5875b934f8f5a6e38892c908d2571f326c4b7ba7 Mon Sep 17 00:00:00 2001
From: George <gyuton@yandex-team.ru>
Date: Wed, 30 Dec 2020 16:33:47 +0300
Subject: [PATCH 030/611] Edited original article

---
 .../utilities/clickhouse-benchmark.md         | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/docs/en/operations/utilities/clickhouse-benchmark.md b/docs/en/operations/utilities/clickhouse-benchmark.md
index 9c90ba7f028..e3ebef76dae 100644
--- a/docs/en/operations/utilities/clickhouse-benchmark.md
+++ b/docs/en/operations/utilities/clickhouse-benchmark.md
@@ -7,7 +7,7 @@ toc_title: clickhouse-benchmark
 
 Connects to a ClickHouse server and repeatedly sends specified queries.
 
-Syntax:
+**Syntax**
 
 ``` bash
 $ clickhouse-benchmark --query ["single query"] [keys]
@@ -28,11 +28,11 @@ $ clickhouse-benchmark [keys] <<< "single query"
 If you want to send a set of queries, create a text file and place each query on the individual string in this file. For example:
 
 ``` sql
-SELECT * FROM system.numbers LIMIT 10000000
-SELECT 1
+SELECT * FROM system.numbers LIMIT 10000000;
+SELECT 1;
 ```
 
-Then pass this file to a standard input of `clickhouse-benchmark`.
+Then pass this file to a standard input of `clickhouse-benchmark`:
 
 ``` bash
 clickhouse-benchmark [keys] < queries_file
@@ -40,23 +40,23 @@ clickhouse-benchmark [keys] < queries_file
 
 ## Keys {#clickhouse-benchmark-keys}
 
--   `--query=WORD` - Query to execute. If this parameter is not passed clickhouse-benchmark will read queries from standard input. 
--   `-c N`, `--concurrency=N` — Number of queries that `clickhouse-benchmark` sends simultaneously. Default value: 1.
--   `-d N`, `--delay=N` — Interval in seconds between intermediate reports (set 0 to disable reports). Default value: 1.
+-   `--query=WORD` - Query to execute. If this parameter is not passed, `clickhouse-benchmark` will read queries from standard input. 
+-   `-c N`, `--concurrency=N` — Number of queries that `clickhouse-benchmark` sends simultaneously. Default value: `1`.
+-   `-d N`, `--delay=N` — Interval in seconds between intermediate reports (to disable reports set `0`). Default value: `1`.
 -   `-h WORD`, `--host=WORD` — Server host. Default value: `localhost`. For the [comparison mode](#clickhouse-benchmark-comparison-mode) you can use multiple `-h` keys.
--   `-p N`, `--port=N` — Server port. Default value: 9000. For the [comparison mode](#clickhouse-benchmark-comparison-mode) you can use multiple `-p` keys.
--   `-i N`, `--iterations=N` — Total number of queries. Default value: 0 (repeat forever).
--   `-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` stops sending queries when the specified time limit is reached. Default value: 0 (time limit disabled).
--   `--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 [comparison mode](#clickhouse-benchmark-comparison-mode) `clickhouse-benchmark` performs the [Independent two-sample Student’s t-test](https://en.wikipedia.org/wiki/Student%27s_t-test#Independent_two-sample_t-test) test to determine whether the two distributions aren’t different with the selected level of confidence.
+-   `-p N`, `--port=N` — Server port. Default value: `9000`. For the [comparison mode](#clickhouse-benchmark-comparison-mode) you can use multiple `-p` keys.
+-   `-i N`, `--iterations=N` — Total number of queries. Default value: `0` (repeat forever).
+-   `-r`, `--randomize` — Random order of queries execution if there is more than one input query.
+-   `-s`, `--secure` — Using `TLS` connection.
+-   `-t N`, `--timelimit=N` — Time limit in seconds. `clickhouse-benchmark` stops sending queries when the specified time limit is reached. Default value: `0` (time limit disabled).
+-   `--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 [comparison mode](#clickhouse-benchmark-comparison-mode) `clickhouse-benchmark` performs the [Independent two-sample Student’s t-test](https://en.wikipedia.org/wiki/Student%27s_t-test#Independent_two-sample_t-test) to determine whether the two distributions aren’t different with the selected level of confidence.
 -   `--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` outputs a report to the specified JSON-file.
+-   `--json=FILEPATH` — `JSON` output. When the key is set, `clickhouse-benchmark` outputs a report to the specified JSON-file.
 -   `--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` outputs stack traces of exceptions.
--   `--stage=WORD` — Query processing stage at server. ClickHouse stops query processing and returns answer to `clickhouse-benchmark` at the specified stage. Possible values: `complete`, `fetch_columns`, `with_mergeable_state`. Default value: `complete`.
+-   `--stage=WORD` — Query processing stage at server. ClickHouse stops query processing and returns an answer to `clickhouse-benchmark` at the specified stage. Possible values: `complete`, `fetch_columns`, `with_mergeable_state`. Default value: `complete`.
 -   `--help` — Shows the help message.
 
 If you want to apply some [settings](../../operations/settings/index.md) for queries, pass them as a key `--<session setting name>= SETTING_VALUE`. For example, `--max_memory_usage=1048576`.
@@ -96,11 +96,11 @@ In the report you can find:
 
     -   Endpoint of ClickHouse server.
     -   Number of processed queries.
-    -   QPS: QPS: How many queries server performed per second during a period specified in the `--delay` argument.
-    -   RPS: How many rows server read per second during a period specified in the `--delay` argument.
-    -   MiB/s: How many mebibytes server read per second during a period specified in the `--delay` argument.
-    -   result RPS: How many rows placed by server to the result of a query per second during a period specified in the `--delay` argument.
-    -   result MiB/s. How many mebibytes placed by server to the result of a query per second during a period specified in the `--delay` argument.
+    -   QPS: How many queries the server performed per second during a period specified in the `--delay` argument.
+    -   RPS: How many rows the server reads per second during a period specified in the `--delay` argument.
+    -   MiB/s: How many mebibytes the server reads per second during a period specified in the `--delay` argument.
+    -   result RPS: How many rows placed by the server to the result of a query per second during a period specified in the `--delay` argument.
+    -   result MiB/s. How many mebibytes placed by the server to the result of a query per second during a period specified in the `--delay` argument.
 
 -   Percentiles of queries execution time.
 
@@ -159,3 +159,5 @@ localhost:9000, queries 10, QPS: 6.082, RPS: 121959604.568, MiB/s: 930.478, resu
 99.900%     0.172 sec.
 99.990%     0.172 sec.
 ```
+
+[Original article](https://clickhouse.tech/docs/en/operations/utilities/clickhouse-benchmark.md) <!--hide-->

From b9694e42cf55b61a132904df1e9b495f8d4f8dec Mon Sep 17 00:00:00 2001
From: George <gyuton@yandex-team.ru>
Date: Wed, 30 Dec 2020 16:34:10 +0300
Subject: [PATCH 031/611] Added Russian translation

---
 .../utilities/clickhouse-benchmark.md         | 164 +++++++++++++++++-
 1 file changed, 163 insertions(+), 1 deletion(-)

diff --git a/docs/ru/operations/utilities/clickhouse-benchmark.md b/docs/ru/operations/utilities/clickhouse-benchmark.md
index 3695c9fbdd3..5929dc0c756 120000
--- a/docs/ru/operations/utilities/clickhouse-benchmark.md
+++ b/docs/ru/operations/utilities/clickhouse-benchmark.md
@@ -1 +1,163 @@
-../../../en/operations/utilities/clickhouse-benchmark.md
\ No newline at end of file
+---
+toc_priority: 61
+toc_title: clickhouse-benchmark
+---
+
+# clickhouse-benchmark {#clickhouse-benchmark}
+
+Устанавливает соединение с сервером ClickHouse и неоднократно посылает указанные запросы.
+
+**Синтаксис**
+
+``` bash
+$ clickhouse-benchmark --query ["single query"] [keys]
+```
+
+или
+
+``` bash
+$ echo "single query" | clickhouse-benchmark [keys]
+```
+
+или
+
+``` bash
+$ clickhouse-benchmark [keys] <<< "single query"
+```
+
+Если нужно послать набор запросов, создайте текстовый файл и расположите каждый запрос на отдельной строке в файле. Например:
+
+``` sql
+SELECT * FROM system.numbers LIMIT 10000000;
+SELECT 1;
+```
+
+После этого передайте этот файл в стандартный ввод `clickhouse-benchmark`:
+
+``` bash
+clickhouse-benchmark [keys] < queries_file
+```
+
+## Ключи {#clickhouse-benchmark-keys}
+
+-   `--query=WORD` - запрос для исполнения. Если параметр не передан, `clickhouse-benchmark` будет считывать считывать запросы из стандартного ввода. 
+-   `-c N`, `--concurrency=N` — количество запросов, которые `clickhouse-benchmark` отправляет одновременно. Значение по умолчанию: `1`.
+-   `-d N`, `--delay=N` — интервал в секундах между промежуточными сообщениями. (чтобы отлючить сообщения, установите `0`). Значение по умолчанию: `1`.
+-   `-h WORD`, `--host=WORD` — хост сервера. Значение по умолчанию: `localhost`. Для [сравнительного режима](#clickhouse-benchmark-comparison-mode) можно использовать несколько `-h` ключей. 
+-   `-p N`, `--port=N` — порт сервера. Значение по умолчанию: `9000`. Для [сравнительного режима](#clickhouse-benchmark-comparison-mode) можно использовать несколько `-p` ключей. 
+-   `-i N`, `--iterations=N` — общее число запросов. Значение по умолчанию: `0` (вечно будет повторяться).
+-   `-r`, `--randomize` — случайный порядок выполнения запросов при наличии больше чем одного входного запроса.
+-   `-s`, `--secure` — использование `TLS` соединения.
+-   `-t N`, `--timelimit=N` — лимит по времени в секундах. `clickhouse-benchmark` перестает отправлять запросы при достижении лимита по времени. Значение по умолчанию: `0` (лимит отключен).
+-   `--confidence=N` — уровень доверия для  T-критерия. Возможные значения: 0 (80%), 1 (90%), 2 (95%), 3 (98%), 4 (99%), 5 (99.5%). Значение по умолчанию: `5`. В [сравнительном режиме](#clickhouse-benchmark-comparison-mode) `clickhouse-benchmark` проверяет [двухвыборочный  t-критерий Стьюдента для независимых выборок](https://en.wikipedia.org/wiki/Student%27s_t-test#Independent_two-sample_t-test) чтобы определить, различны ли две выборки при выбранном уровне доверия.
+-   `--cumulative` — выводит совокупность данных, а не данные за интервал.
+-   `--database=DATABASE_NAME` — имя базы данных ClickHouse. Значение по умолчанию: `default`. 
+-   `--json=FILEPATH` — формат вывода `JSON`. Когда этот ключ указан, `clickhouse-benchmark` выводит сообщение в указанный JSON-файл.
+-   `--user=USERNAME` — имя пользователя ClickHouse. Значение по умолчанию: `default`.
+-   `--password=PSWD` — пароль пользователя ClickHouse. Значение по умолчанию: пустая строка.
+-   `--stacktrace` — вывод трассировки стека. Когда этот ключ указан, `clickhouse-bencmark` выводит трассировку стека исключений.
+-   `--stage=WORD` — стадия обработки запроса на сервере. ClickHouse останавливает обработку запроса и возвращает ответ `clickhouse-benchmark` на заданной стадии. Возможные значения: `complete`, `fetch_columns`, `with_mergeable_state`. Значение по умолчанию: `complete`. 
+-   `--help` — показывает help-сообщение.
+
+Если нужно применить какие-нибудь [настройки](../../operations/settings/index.md) для запросов, их можно передать как ключ `--<session setting name>= SETTING_VALUE`. Например, `--max_memory_usage=1048576`.
+
+## Вывод {#clickhouse-benchmark-output}
+
+По умолчанию, `clickhouse-benchmark` выводит сообщение для каждого `--delay` интервала.
+
+Пример сообщения: 
+
+``` 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.
+```
+
+В сообщении можно найти:
+
+-   Количество запросов в поле `Queries executed:`.
+
+-   Строка статуса, содержащая (в данном порядке):
+
+    -   Конечная точка сервера ClickHouse.
+    -   Число обработанных запросов.
+    -   QPS: количество запросов, выполняемых сервером за секунду за в течение `--delay` интервала.
+    -   RPS: количество строк, читаемых сервером за секунду за в течение `--delay` интервала.
+    -   MiB/s: количество Мебибайтов, считываемых сервером за секунду в течение `--delay` интервала.
+    -   result RPS: количество столбцов, размещаемое сервером в результат запроса за секунду в течение `--delay` интервала.
+    -   result MiB/s. количество Мебибайтов, размещаемое сервером в результат запроса за секунду в течение `--delay` интервала.
+
+-   Процентили времени выполнения запросов.
+
+## Сравнительный режим {#clickhouse-benchmark-comparison-mode}
+
+`clickhouse-benchmark` может сравнивать производительность двух работающих серверов ClickHouse.
+
+Для использования сравнительного режима укажите конечную точку двух серверов двумя парами ключей `--host`, `--port`. Связь ключей соответствует позициям в списке аргументов, первый `--host` соответствует первому `--port` и так далее. `clickhouse-benchmark` устанавливает соединение с обоими серверами и отсылает запросы. Каждый запрос адресован случайно выбранному серверу. Результаты выводятся отдельно для каждого сервера.
+
+## Пример {#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.
+```
+
+[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/utilities/clickhouse-benchmark.md)

From c7b9cf73488da560dbd9e878ab6473f72edc8625 Mon Sep 17 00:00:00 2001
From: George <gyuton@yandex-team.ru>
Date: Wed, 30 Dec 2020 17:12:10 +0300
Subject: [PATCH 032/611] Minor fixes

---
 docs/en/operations/utilities/clickhouse-benchmark.md | 2 +-
 docs/ru/operations/utilities/clickhouse-benchmark.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/operations/utilities/clickhouse-benchmark.md b/docs/en/operations/utilities/clickhouse-benchmark.md
index e3ebef76dae..b8a29ec871e 100644
--- a/docs/en/operations/utilities/clickhouse-benchmark.md
+++ b/docs/en/operations/utilities/clickhouse-benchmark.md
@@ -40,7 +40,7 @@ clickhouse-benchmark [keys] < queries_file
 
 ## Keys {#clickhouse-benchmark-keys}
 
--   `--query=WORD` - Query to execute. If this parameter is not passed, `clickhouse-benchmark` will read queries from standard input. 
+-   `--query=WORD` — Query to execute. If this parameter is not passed, `clickhouse-benchmark` will read queries from standard input. 
 -   `-c N`, `--concurrency=N` — Number of queries that `clickhouse-benchmark` sends simultaneously. Default value: `1`.
 -   `-d N`, `--delay=N` — Interval in seconds between intermediate reports (to disable reports set `0`). Default value: `1`.
 -   `-h WORD`, `--host=WORD` — Server host. Default value: `localhost`. For the [comparison mode](#clickhouse-benchmark-comparison-mode) you can use multiple `-h` keys.
diff --git a/docs/ru/operations/utilities/clickhouse-benchmark.md b/docs/ru/operations/utilities/clickhouse-benchmark.md
index 5929dc0c756..4fbc5b230ec 120000
--- a/docs/ru/operations/utilities/clickhouse-benchmark.md
+++ b/docs/ru/operations/utilities/clickhouse-benchmark.md
@@ -40,7 +40,7 @@ clickhouse-benchmark [keys] < queries_file
 
 ## Ключи {#clickhouse-benchmark-keys}
 
--   `--query=WORD` - запрос для исполнения. Если параметр не передан, `clickhouse-benchmark` будет считывать считывать запросы из стандартного ввода. 
+-   `--query=WORD` — запрос для исполнения. Если параметр не передан, `clickhouse-benchmark` будет считывать считывать запросы из стандартного ввода. 
 -   `-c N`, `--concurrency=N` — количество запросов, которые `clickhouse-benchmark` отправляет одновременно. Значение по умолчанию: `1`.
 -   `-d N`, `--delay=N` — интервал в секундах между промежуточными сообщениями. (чтобы отлючить сообщения, установите `0`). Значение по умолчанию: `1`.
 -   `-h WORD`, `--host=WORD` — хост сервера. Значение по умолчанию: `localhost`. Для [сравнительного режима](#clickhouse-benchmark-comparison-mode) можно использовать несколько `-h` ключей. 

From ab7e3e87cfc267e6d49f9be0e658766f61a6fd5b Mon Sep 17 00:00:00 2001
From: George <gyuton@yandex-team.ru>
Date: Wed, 30 Dec 2020 18:09:24 +0300
Subject: [PATCH 033/611] Fixed typos

---
 docs/ru/operations/utilities/clickhouse-benchmark.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/operations/utilities/clickhouse-benchmark.md b/docs/ru/operations/utilities/clickhouse-benchmark.md
index 4fbc5b230ec..e3e567f3978 120000
--- a/docs/ru/operations/utilities/clickhouse-benchmark.md
+++ b/docs/ru/operations/utilities/clickhouse-benchmark.md
@@ -40,7 +40,7 @@ clickhouse-benchmark [keys] < queries_file
 
 ## Ключи {#clickhouse-benchmark-keys}
 
--   `--query=WORD` — запрос для исполнения. Если параметр не передан, `clickhouse-benchmark` будет считывать считывать запросы из стандартного ввода. 
+-   `--query=WORD` — запрос для исполнения. Если параметр не передан, `clickhouse-benchmark` будет считывать запросы из стандартного ввода. 
 -   `-c N`, `--concurrency=N` — количество запросов, которые `clickhouse-benchmark` отправляет одновременно. Значение по умолчанию: `1`.
 -   `-d N`, `--delay=N` — интервал в секундах между промежуточными сообщениями. (чтобы отлючить сообщения, установите `0`). Значение по умолчанию: `1`.
 -   `-h WORD`, `--host=WORD` — хост сервера. Значение по умолчанию: `localhost`. Для [сравнительного режима](#clickhouse-benchmark-comparison-mode) можно использовать несколько `-h` ключей. 

From 9da4e2509247e47ca3891b6c90af89ad79a0c810 Mon Sep 17 00:00:00 2001
From: George <gyuton@yandex-team.ru>
Date: Wed, 30 Dec 2020 18:27:35 +0300
Subject: [PATCH 034/611] Resolving symling issue

---
 .../utilities/clickhouse-benchmark.md         | 163 ------------------
 1 file changed, 163 deletions(-)
 delete mode 120000 docs/ru/operations/utilities/clickhouse-benchmark.md

diff --git a/docs/ru/operations/utilities/clickhouse-benchmark.md b/docs/ru/operations/utilities/clickhouse-benchmark.md
deleted file mode 120000
index e3e567f3978..00000000000
--- a/docs/ru/operations/utilities/clickhouse-benchmark.md
+++ /dev/null
@@ -1,163 +0,0 @@
----
-toc_priority: 61
-toc_title: clickhouse-benchmark
----
-
-# clickhouse-benchmark {#clickhouse-benchmark}
-
-Устанавливает соединение с сервером ClickHouse и неоднократно посылает указанные запросы.
-
-**Синтаксис**
-
-``` bash
-$ clickhouse-benchmark --query ["single query"] [keys]
-```
-
-или
-
-``` bash
-$ echo "single query" | clickhouse-benchmark [keys]
-```
-
-или
-
-``` bash
-$ clickhouse-benchmark [keys] <<< "single query"
-```
-
-Если нужно послать набор запросов, создайте текстовый файл и расположите каждый запрос на отдельной строке в файле. Например:
-
-``` sql
-SELECT * FROM system.numbers LIMIT 10000000;
-SELECT 1;
-```
-
-После этого передайте этот файл в стандартный ввод `clickhouse-benchmark`:
-
-``` bash
-clickhouse-benchmark [keys] < queries_file
-```
-
-## Ключи {#clickhouse-benchmark-keys}
-
--   `--query=WORD` — запрос для исполнения. Если параметр не передан, `clickhouse-benchmark` будет считывать запросы из стандартного ввода. 
--   `-c N`, `--concurrency=N` — количество запросов, которые `clickhouse-benchmark` отправляет одновременно. Значение по умолчанию: `1`.
--   `-d N`, `--delay=N` — интервал в секундах между промежуточными сообщениями. (чтобы отлючить сообщения, установите `0`). Значение по умолчанию: `1`.
--   `-h WORD`, `--host=WORD` — хост сервера. Значение по умолчанию: `localhost`. Для [сравнительного режима](#clickhouse-benchmark-comparison-mode) можно использовать несколько `-h` ключей. 
--   `-p N`, `--port=N` — порт сервера. Значение по умолчанию: `9000`. Для [сравнительного режима](#clickhouse-benchmark-comparison-mode) можно использовать несколько `-p` ключей. 
--   `-i N`, `--iterations=N` — общее число запросов. Значение по умолчанию: `0` (вечно будет повторяться).
--   `-r`, `--randomize` — случайный порядок выполнения запросов при наличии больше чем одного входного запроса.
--   `-s`, `--secure` — использование `TLS` соединения.
--   `-t N`, `--timelimit=N` — лимит по времени в секундах. `clickhouse-benchmark` перестает отправлять запросы при достижении лимита по времени. Значение по умолчанию: `0` (лимит отключен).
--   `--confidence=N` — уровень доверия для  T-критерия. Возможные значения: 0 (80%), 1 (90%), 2 (95%), 3 (98%), 4 (99%), 5 (99.5%). Значение по умолчанию: `5`. В [сравнительном режиме](#clickhouse-benchmark-comparison-mode) `clickhouse-benchmark` проверяет [двухвыборочный  t-критерий Стьюдента для независимых выборок](https://en.wikipedia.org/wiki/Student%27s_t-test#Independent_two-sample_t-test) чтобы определить, различны ли две выборки при выбранном уровне доверия.
--   `--cumulative` — выводит совокупность данных, а не данные за интервал.
--   `--database=DATABASE_NAME` — имя базы данных ClickHouse. Значение по умолчанию: `default`. 
--   `--json=FILEPATH` — формат вывода `JSON`. Когда этот ключ указан, `clickhouse-benchmark` выводит сообщение в указанный JSON-файл.
--   `--user=USERNAME` — имя пользователя ClickHouse. Значение по умолчанию: `default`.
--   `--password=PSWD` — пароль пользователя ClickHouse. Значение по умолчанию: пустая строка.
--   `--stacktrace` — вывод трассировки стека. Когда этот ключ указан, `clickhouse-bencmark` выводит трассировку стека исключений.
--   `--stage=WORD` — стадия обработки запроса на сервере. ClickHouse останавливает обработку запроса и возвращает ответ `clickhouse-benchmark` на заданной стадии. Возможные значения: `complete`, `fetch_columns`, `with_mergeable_state`. Значение по умолчанию: `complete`. 
--   `--help` — показывает help-сообщение.
-
-Если нужно применить какие-нибудь [настройки](../../operations/settings/index.md) для запросов, их можно передать как ключ `--<session setting name>= SETTING_VALUE`. Например, `--max_memory_usage=1048576`.
-
-## Вывод {#clickhouse-benchmark-output}
-
-По умолчанию, `clickhouse-benchmark` выводит сообщение для каждого `--delay` интервала.
-
-Пример сообщения: 
-
-``` 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.
-```
-
-В сообщении можно найти:
-
--   Количество запросов в поле `Queries executed:`.
-
--   Строка статуса, содержащая (в данном порядке):
-
-    -   Конечная точка сервера ClickHouse.
-    -   Число обработанных запросов.
-    -   QPS: количество запросов, выполняемых сервером за секунду за в течение `--delay` интервала.
-    -   RPS: количество строк, читаемых сервером за секунду за в течение `--delay` интервала.
-    -   MiB/s: количество Мебибайтов, считываемых сервером за секунду в течение `--delay` интервала.
-    -   result RPS: количество столбцов, размещаемое сервером в результат запроса за секунду в течение `--delay` интервала.
-    -   result MiB/s. количество Мебибайтов, размещаемое сервером в результат запроса за секунду в течение `--delay` интервала.
-
--   Процентили времени выполнения запросов.
-
-## Сравнительный режим {#clickhouse-benchmark-comparison-mode}
-
-`clickhouse-benchmark` может сравнивать производительность двух работающих серверов ClickHouse.
-
-Для использования сравнительного режима укажите конечную точку двух серверов двумя парами ключей `--host`, `--port`. Связь ключей соответствует позициям в списке аргументов, первый `--host` соответствует первому `--port` и так далее. `clickhouse-benchmark` устанавливает соединение с обоими серверами и отсылает запросы. Каждый запрос адресован случайно выбранному серверу. Результаты выводятся отдельно для каждого сервера.
-
-## Пример {#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.
-```
-
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/utilities/clickhouse-benchmark.md)

From 43de7688ef0262d17ab0e09262bc6e95866ddf9f Mon Sep 17 00:00:00 2001
From: George <gyuton@yandex-team.ru>
Date: Wed, 30 Dec 2020 18:28:34 +0300
Subject: [PATCH 035/611] Resolving symlink issue

---
 .../utilities/clickhouse-benchmark.md         | 162 ++++++++++++++++++
 1 file changed, 162 insertions(+)
 create mode 100644 docs/ru/operations/utilities/clickhouse-benchmark.md

diff --git a/docs/ru/operations/utilities/clickhouse-benchmark.md b/docs/ru/operations/utilities/clickhouse-benchmark.md
new file mode 100644
index 00000000000..a72a7e9f0a1
--- /dev/null
+++ b/docs/ru/operations/utilities/clickhouse-benchmark.md
@@ -0,0 +1,162 @@
+toc_priority: 61
+toc_title: clickhouse-benchmark
+---
+
+# clickhouse-benchmark {#clickhouse-benchmark}
+
+Устанавливает соединение с сервером ClickHouse и неоднократно посылает указанные запросы.
+
+**Синтаксис**
+
+``` bash
+$ clickhouse-benchmark --query ["single query"] [keys]
+```
+
+или
+
+``` bash
+$ echo "single query" | clickhouse-benchmark [keys]
+```
+
+или
+
+``` bash
+$ clickhouse-benchmark [keys] <<< "single query"
+```
+
+Если нужно послать набор запросов, создайте текстовый файл и расположите каждый запрос на отдельной строке в файле. Например:
+
+``` sql
+SELECT * FROM system.numbers LIMIT 10000000;
+SELECT 1;
+```
+
+После этого передайте этот файл в стандартный ввод `clickhouse-benchmark`:
+
+``` bash
+clickhouse-benchmark [keys] < queries_file
+```
+
+## Ключи {#clickhouse-benchmark-keys}
+
+-   `--query=WORD` — запрос для исполнения. Если параметр не передан, `clickhouse-benchmark` будет считывать запросы из стандартного ввода. 
+-   `-c N`, `--concurrency=N` — количество запросов, которые `clickhouse-benchmark` отправляет одновременно. Значение по умолчанию: `1`.
+-   `-d N`, `--delay=N` — интервал в секундах между промежуточными сообщениями. (чтобы отлючить сообщения, установите `0`). Значение по умолчанию: `1`.
+-   `-h WORD`, `--host=WORD` — хост сервера. Значение по умолчанию: `localhost`. Для [сравнительного режима](#clickhouse-benchmark-comparison-mode) можно использовать несколько `-h` ключей. 
+-   `-p N`, `--port=N` — порт сервера. Значение по умолчанию: `9000`. Для [сравнительного режима](#clickhouse-benchmark-comparison-mode) можно использовать несколько `-p` ключей. 
+-   `-i N`, `--iterations=N` — общее число запросов. Значение по умолчанию: `0` (вечно будет повторяться).
+-   `-r`, `--randomize` — случайный порядок выполнения запросов при наличии больше чем одного входного запроса.
+-   `-s`, `--secure` — использование `TLS` соединения.
+-   `-t N`, `--timelimit=N` — лимит по времени в секундах. `clickhouse-benchmark` перестает отправлять запросы при достижении лимита по времени. Значение по умолчанию: `0` (лимит отключен).
+-   `--confidence=N` — уровень доверия для  T-критерия. Возможные значения: 0 (80%), 1 (90%), 2 (95%), 3 (98%), 4 (99%), 5 (99.5%). Значение по умолчанию: `5`. В [сравнительном режиме](#clickhouse-benchmark-comparison-mode) `clickhouse-benchmark` проверяет [двухвыборочный  t-критерий Стьюдента для независимых выборок](https://en.wikipedia.org/wiki/Student%27s_t-test#Independent_two-sample_t-test) чтобы определить, различны ли две выборки при выбранном уровне доверия.
+-   `--cumulative` — выводит совокупность данных, а не данные за интервал.
+-   `--database=DATABASE_NAME` — имя базы данных ClickHouse. Значение по умолчанию: `default`. 
+-   `--json=FILEPATH` — формат вывода `JSON`. Когда этот ключ указан, `clickhouse-benchmark` выводит сообщение в указанный JSON-файл.
+-   `--user=USERNAME` — имя пользователя ClickHouse. Значение по умолчанию: `default`.
+-   `--password=PSWD` — пароль пользователя ClickHouse. Значение по умолчанию: пустая строка.
+-   `--stacktrace` — вывод трассировки стека. Когда этот ключ указан, `clickhouse-bencmark` выводит трассировку стека исключений.
+-   `--stage=WORD` — стадия обработки запроса на сервере. ClickHouse останавливает обработку запроса и возвращает ответ `clickhouse-benchmark` на заданной стадии. Возможные значения: `complete`, `fetch_columns`, `with_mergeable_state`. Значение по умолчанию: `complete`. 
+-   `--help` — показывает help-сообщение.
+
+Если нужно применить какие-нибудь [настройки](../../operations/settings/index.md) для запросов, их можно передать как ключ `--<session setting name>= SETTING_VALUE`. Например, `--max_memory_usage=1048576`.
+
+## Вывод {#clickhouse-benchmark-output}
+
+По умолчанию, `clickhouse-benchmark` выводит сообщение для каждого `--delay` интервала.
+
+Пример сообщения: 
+
+``` 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.
+```
+
+В сообщении можно найти:
+
+-   Количество запросов в поле `Queries executed:`.
+
+-   Строка статуса, содержащая (в данном порядке):
+
+    -   Конечная точка сервера ClickHouse.
+    -   Число обработанных запросов.
+    -   QPS: количество запросов, выполняемых сервером за секунду за в течение `--delay` интервала.
+    -   RPS: количество строк, читаемых сервером за секунду за в течение `--delay` интервала.
+    -   MiB/s: количество Мебибайтов, считываемых сервером за секунду в течение `--delay` интервала.
+    -   result RPS: количество столбцов, размещаемое сервером в результат запроса за секунду в течение `--delay` интервала.
+    -   result MiB/s. количество Мебибайтов, размещаемое сервером в результат запроса за секунду в течение `--delay` интервала.
+
+-   Процентили времени выполнения запросов.
+
+## Сравнительный режим {#clickhouse-benchmark-comparison-mode}
+
+`clickhouse-benchmark` может сравнивать производительность двух работающих серверов ClickHouse.
+
+Для использования сравнительного режима укажите конечную точку двух серверов двумя парами ключей `--host`, `--port`. Связь ключей соответствует позициям в списке аргументов, первый `--host` соответствует первому `--port` и так далее. `clickhouse-benchmark` устанавливает соединение с обоими серверами и отсылает запросы. Каждый запрос адресован случайно выбранному серверу. Результаты выводятся отдельно для каждого сервера.
+
+## Пример {#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.
+```
+
+[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/utilities/clickhouse-benchmark.md)

From 3ad314af4d073c18c4a0ed092e866a158c51fcdc Mon Sep 17 00:00:00 2001
From: George <gyuton@yandex-team.ru>
Date: Wed, 30 Dec 2020 19:15:01 +0300
Subject: [PATCH 036/611] fixed a mistake

---
 docs/ru/operations/utilities/clickhouse-benchmark.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/ru/operations/utilities/clickhouse-benchmark.md b/docs/ru/operations/utilities/clickhouse-benchmark.md
index a72a7e9f0a1..e3e567f3978 100644
--- a/docs/ru/operations/utilities/clickhouse-benchmark.md
+++ b/docs/ru/operations/utilities/clickhouse-benchmark.md
@@ -1,3 +1,4 @@
+---
 toc_priority: 61
 toc_title: clickhouse-benchmark
 ---

From 0dcf69ea0490092aa880280ec67135d095125aef Mon Sep 17 00:00:00 2001
From: George <gyuton@yandex-team.ru>
Date: Wed, 30 Dec 2020 20:36:06 +0300
Subject: [PATCH 037/611] Minor improvements

---
 .../operations/utilities/clickhouse-benchmark.md   |  2 +-
 .../operations/utilities/clickhouse-benchmark.md   | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/en/operations/utilities/clickhouse-benchmark.md b/docs/en/operations/utilities/clickhouse-benchmark.md
index b8a29ec871e..f7ea0aa1302 100644
--- a/docs/en/operations/utilities/clickhouse-benchmark.md
+++ b/docs/en/operations/utilities/clickhouse-benchmark.md
@@ -35,7 +35,7 @@ SELECT 1;
 Then pass this file to a standard input of `clickhouse-benchmark`:
 
 ``` bash
-clickhouse-benchmark [keys] < queries_file
+clickhouse-benchmark [keys] < queries_file;
 ```
 
 ## Keys {#clickhouse-benchmark-keys}
diff --git a/docs/ru/operations/utilities/clickhouse-benchmark.md b/docs/ru/operations/utilities/clickhouse-benchmark.md
index e3e567f3978..218e41c6a72 100644
--- a/docs/ru/operations/utilities/clickhouse-benchmark.md
+++ b/docs/ru/operations/utilities/clickhouse-benchmark.md
@@ -35,18 +35,18 @@ SELECT 1;
 После этого передайте этот файл в стандартный ввод `clickhouse-benchmark`:
 
 ``` bash
-clickhouse-benchmark [keys] < queries_file
+clickhouse-benchmark [keys] < queries_file;
 ```
 
 ## Ключи {#clickhouse-benchmark-keys}
 
 -   `--query=WORD` — запрос для исполнения. Если параметр не передан, `clickhouse-benchmark` будет считывать запросы из стандартного ввода. 
 -   `-c N`, `--concurrency=N` — количество запросов, которые `clickhouse-benchmark` отправляет одновременно. Значение по умолчанию: `1`.
--   `-d N`, `--delay=N` — интервал в секундах между промежуточными сообщениями. (чтобы отлючить сообщения, установите `0`). Значение по умолчанию: `1`.
+-   `-d N`, `--delay=N` — интервал в секундах между промежуточными сообщениями (чтобы отлючить сообщения, установите `0`). Значение по умолчанию: `1`.
 -   `-h WORD`, `--host=WORD` — хост сервера. Значение по умолчанию: `localhost`. Для [сравнительного режима](#clickhouse-benchmark-comparison-mode) можно использовать несколько `-h` ключей. 
 -   `-p N`, `--port=N` — порт сервера. Значение по умолчанию: `9000`. Для [сравнительного режима](#clickhouse-benchmark-comparison-mode) можно использовать несколько `-p` ключей. 
 -   `-i N`, `--iterations=N` — общее число запросов. Значение по умолчанию: `0` (вечно будет повторяться).
--   `-r`, `--randomize` — случайный порядок выполнения запросов при наличии больше чем одного входного запроса.
+-   `-r`, `--randomize` — случайный порядок выполнения запросов при наличии более одного входного запроса.
 -   `-s`, `--secure` — использование `TLS` соединения.
 -   `-t N`, `--timelimit=N` — лимит по времени в секундах. `clickhouse-benchmark` перестает отправлять запросы при достижении лимита по времени. Значение по умолчанию: `0` (лимит отключен).
 -   `--confidence=N` — уровень доверия для  T-критерия. Возможные значения: 0 (80%), 1 (90%), 2 (95%), 3 (98%), 4 (99%), 5 (99.5%). Значение по умолчанию: `5`. В [сравнительном режиме](#clickhouse-benchmark-comparison-mode) `clickhouse-benchmark` проверяет [двухвыборочный  t-критерий Стьюдента для независимых выборок](https://en.wikipedia.org/wiki/Student%27s_t-test#Independent_two-sample_t-test) чтобы определить, различны ли две выборки при выбранном уровне доверия.
@@ -92,12 +92,12 @@ localhost:9000, queries 10, QPS: 6.772, RPS: 67904487.440, MiB/s: 518.070, resul
 
 -   Количество запросов в поле `Queries executed:`.
 
--   Строка статуса, содержащая (в данном порядке):
+-   Строка статуса, содержащая (в таком же порядке):
 
     -   Конечная точка сервера ClickHouse.
     -   Число обработанных запросов.
-    -   QPS: количество запросов, выполняемых сервером за секунду за в течение `--delay` интервала.
-    -   RPS: количество строк, читаемых сервером за секунду за в течение `--delay` интервала.
+    -   QPS: количество запросов, выполняемых сервером за секунду в течение `--delay` интервала.
+    -   RPS: количество строк, читаемых сервером за секунду в течение `--delay` интервала.
     -   MiB/s: количество Мебибайтов, считываемых сервером за секунду в течение `--delay` интервала.
     -   result RPS: количество столбцов, размещаемое сервером в результат запроса за секунду в течение `--delay` интервала.
     -   result MiB/s. количество Мебибайтов, размещаемое сервером в результат запроса за секунду в течение `--delay` интервала.
@@ -108,7 +108,7 @@ localhost:9000, queries 10, QPS: 6.772, RPS: 67904487.440, MiB/s: 518.070, resul
 
 `clickhouse-benchmark` может сравнивать производительность двух работающих серверов ClickHouse.
 
-Для использования сравнительного режима укажите конечную точку двух серверов двумя парами ключей `--host`, `--port`. Связь ключей соответствует позициям в списке аргументов, первый `--host` соответствует первому `--port` и так далее. `clickhouse-benchmark` устанавливает соединение с обоими серверами и отсылает запросы. Каждый запрос адресован случайно выбранному серверу. Результаты выводятся отдельно для каждого сервера.
+Для использования сравнительного режима укажите конечную точку двух серверов двумя парами ключей `--host`, `--port`. Связь ключей соответствует позициям в списке аргументов: первый `--host` соответствует первому `--port` и так далее. `clickhouse-benchmark` устанавливает соединение с обоими серверами и отсылает запросы. Каждый запрос адресован случайно выбранному серверу. Результаты выводятся отдельно для каждого сервера.
 
 ## Пример {#clickhouse-benchmark-example}
 

From 5cbc25c647ff4d6564d20ffa8830a1a503da23c6 Mon Sep 17 00:00:00 2001
From: Vladimir Chebotarev <vladimir.chebotarev@gmail.com>
Date: Thu, 3 Dec 2020 07:18:12 +0300
Subject: [PATCH 038/611] Added global setting `s3_max_connections`.

---
 src/Core/Settings.h                    |   1 +
 src/Disks/S3/registerDiskS3.cpp        |   1 +
 src/IO/HTTPCommon.cpp                  | 107 ++++++++++++++++++++-----
 src/IO/HTTPCommon.h                    |   5 +-
 src/IO/S3/PocoHTTPClient.cpp           |  30 ++++---
 src/IO/S3/PocoHTTPClient.h             |   1 +
 src/IO/S3/PocoHTTPResponseStream.cpp   |  19 -----
 src/IO/S3/PocoHTTPResponseStream.h     |  21 -----
 src/IO/S3/SessionAwareAwsStream.h      |  27 +++++++
 src/IO/S3Common.cpp                    |   9 +--
 src/IO/S3Common.h                      |   4 +-
 src/Storages/StorageS3.cpp             |   9 ++-
 src/Storages/StorageS3.h               |   1 +
 src/TableFunctions/TableFunctionS3.cpp |   2 +
 14 files changed, 152 insertions(+), 85 deletions(-)
 delete mode 100644 src/IO/S3/PocoHTTPResponseStream.cpp
 delete mode 100644 src/IO/S3/PocoHTTPResponseStream.h
 create mode 100644 src/IO/S3/SessionAwareAwsStream.h

diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index 00d4682332d..0b20f5fb033 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -67,6 +67,7 @@ class IColumn;
     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_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) \
     M(Bool, use_uncompressed_cache, true, "Whether to use the cache of uncompressed blocks.", 0) \
     M(Bool, replace_running_query, false, "Whether the running request should be canceled with the same id as the new one.", 0) \
diff --git a/src/Disks/S3/registerDiskS3.cpp b/src/Disks/S3/registerDiskS3.cpp
index fd658d95327..dc7020c9617 100644
--- a/src/Disks/S3/registerDiskS3.cpp
+++ b/src/Disks/S3/registerDiskS3.cpp
@@ -120,6 +120,7 @@ void registerDiskS3(DiskFactory & factory)
 
         cfg.connectTimeoutMs = config.getUInt(config_prefix + ".connect_timeout_ms", 10000);
         cfg.httpRequestTimeoutMs = config.getUInt(config_prefix + ".request_timeout_ms", 5000);
+        cfg.maxConnections = config.getUInt(config_prefix + ".max_connections", 100);
         cfg.endpointOverride = uri.endpoint;
 
         auto proxy_config = getProxyConfiguration(config_prefix, config);
diff --git a/src/IO/HTTPCommon.cpp b/src/IO/HTTPCommon.cpp
index 91136d1fded..39951477779 100644
--- a/src/IO/HTTPCommon.cpp
+++ b/src/IO/HTTPCommon.cpp
@@ -106,23 +106,68 @@ namespace
         const std::string host;
         const UInt16 port;
         bool https;
+        const String proxy_host;
+        const UInt16 proxy_port;
+        bool proxy_https;
+        bool resolve_host;
         using Base = PoolBase<Poco::Net::HTTPClientSession>;
         ObjectPtr allocObject() override
         {
-            return makeHTTPSessionImpl(host, port, https, true);
+            auto session = makeHTTPSessionImpl(host, port, https, true, resolve_host);
+            if (!proxy_host.empty())
+            {
+                const String proxy_scheme = proxy_https ? "https" : "http";
+                session->setProxyHost(proxy_host);
+                session->setProxyPort(proxy_port);
+
+#if !defined(ARCADIA_BUILD)
+                session->setProxyProtocol(proxy_scheme);
+
+                /// Turn on tunnel mode if proxy scheme is HTTP while endpoint scheme is HTTPS.
+                session->setProxyTunnel(!proxy_https && https);
+#endif
+            }
+            return session;
         }
 
     public:
-        SingleEndpointHTTPSessionPool(const std::string & host_, UInt16 port_, bool https_, size_t max_pool_size_)
-            : Base(max_pool_size_, &Poco::Logger::get("HTTPSessionPool")), host(host_), port(port_), https(https_)
+        SingleEndpointHTTPSessionPool(
+                const std::string & host_,
+                UInt16 port_,
+                bool https_,
+                const std::string & proxy_host_,
+                UInt16 proxy_port_,
+                bool proxy_https_,
+                size_t max_pool_size_,
+                bool resolve_host_ = true)
+            : Base(max_pool_size_, &Poco::Logger::get("HTTPSessionPool"))
+            , host(host_)
+            , port(port_)
+            , https(https_)
+            , proxy_host(proxy_host_)
+            , proxy_port(proxy_port_)
+            , proxy_https(proxy_https_)
+            , resolve_host(resolve_host_)
         {
         }
     };
 
     class HTTPSessionPool : private boost::noncopyable
     {
+    public:
+        struct Key
+        {
+            String target_host;
+            UInt16 target_port;
+            bool is_target_https;
+            String proxy_host;
+            UInt16 proxy_port;
+            bool is_proxy_https;
+
+            bool operator ==(const Key &) const = default;
+        };
+
     private:
-        using Key = std::tuple<std::string, UInt16, bool>;
         using PoolPtr = std::shared_ptr<SingleEndpointHTTPSessionPool>;
         using Entry = SingleEndpointHTTPSessionPool::Entry;
 
@@ -131,9 +176,12 @@ namespace
             size_t operator()(const Key & k) const
             {
                 SipHash s;
-                s.update(std::get<0>(k));
-                s.update(std::get<1>(k));
-                s.update(std::get<2>(k));
+                s.update(k.target_host);
+                s.update(k.target_port);
+                s.update(k.is_target_https);
+                s.update(k.proxy_host);
+                s.update(k.proxy_port);
+                s.update(k.is_proxy_https);
                 return s.get64();
             }
         };
@@ -153,18 +201,32 @@ namespace
 
         Entry getSession(
             const Poco::URI & uri,
+            const Poco::URI & proxy_uri,
             const ConnectionTimeouts & timeouts,
-            size_t max_connections_per_endpoint)
+            size_t max_connections_per_endpoint,
+            bool resolve_host = true)
         {
             std::unique_lock lock(mutex);
             const std::string & host = uri.getHost();
             UInt16 port = uri.getPort();
             bool https = isHTTPS(uri);
-            auto key = std::make_tuple(host, port, https);
+
+
+            String proxy_host;
+            UInt16 proxy_port = 0;
+            bool proxy_https = false;
+            if (!proxy_uri.empty())
+            {
+                proxy_host = proxy_uri.getHost();
+                proxy_port = proxy_uri.getPort();
+                proxy_https = isHTTPS(proxy_uri);
+            }
+
+            HTTPSessionPool::Key key{host, port, https, proxy_host, proxy_port, proxy_https};
             auto pool_ptr = endpoints_pool.find(key);
             if (pool_ptr == endpoints_pool.end())
                 std::tie(pool_ptr, std::ignore) = endpoints_pool.emplace(
-                    key, std::make_shared<SingleEndpointHTTPSessionPool>(host, port, https, max_connections_per_endpoint));
+                    key, std::make_shared<SingleEndpointHTTPSessionPool>(host, port, https, proxy_host, proxy_port, proxy_https, max_connections_per_endpoint, resolve_host));
 
             auto retry_timeout = timeouts.connection_timeout.totalMicroseconds();
             auto session = pool_ptr->second->get(retry_timeout);
@@ -178,13 +240,17 @@ namespace
                 if (!msg.empty())
                 {
                     LOG_TRACE((&Poco::Logger::get("HTTPCommon")), "Failed communicating with {} with error '{}' will try to reconnect session", host, msg);
-                    /// Host can change IP
-                    const auto ip = DNSResolver::instance().resolveHost(host).toString();
-                    if (ip != session->getHost())
+
+                    if (resolve_host)
                     {
-                        session->reset();
-                        session->setHost(ip);
-                        session->attachSessionData({});
+                        /// Host can change IP
+                        const auto ip = DNSResolver::instance().resolveHost(host).toString();
+                        if (ip != session->getHost())
+                        {
+                            session->reset();
+                            session->setHost(ip);
+                            session->attachSessionData({});
+                        }
                     }
                 }
             }
@@ -218,9 +284,14 @@ HTTPSessionPtr makeHTTPSession(const Poco::URI & uri, const ConnectionTimeouts &
 }
 
 
-PooledHTTPSessionPtr makePooledHTTPSession(const Poco::URI & uri, const ConnectionTimeouts & timeouts, size_t per_endpoint_pool_size)
+PooledHTTPSessionPtr makePooledHTTPSession(const Poco::URI & uri, const ConnectionTimeouts & timeouts, size_t per_endpoint_pool_size, bool resolve_host)
 {
-    return HTTPSessionPool::instance().getSession(uri, timeouts, per_endpoint_pool_size);
+    return makePooledHTTPSession(uri, {}, timeouts, per_endpoint_pool_size, resolve_host);
+}
+
+PooledHTTPSessionPtr makePooledHTTPSession(const Poco::URI & uri, const Poco::URI & proxy_uri, const ConnectionTimeouts & timeouts, size_t per_endpoint_pool_size, bool resolve_host)
+{
+    return HTTPSessionPool::instance().getSession(uri, proxy_uri, timeouts, per_endpoint_pool_size, resolve_host);
 }
 
 bool isRedirect(const Poco::Net::HTTPResponse::HTTPStatus status) { return status == Poco::Net::HTTPResponse::HTTP_MOVED_PERMANENTLY  || status == Poco::Net::HTTPResponse::HTTP_FOUND || status == Poco::Net::HTTPResponse::HTTP_SEE_OTHER  || status == Poco::Net::HTTPResponse::HTTP_TEMPORARY_REDIRECT; }
diff --git a/src/IO/HTTPCommon.h b/src/IO/HTTPCommon.h
index db0abe8fc6e..4a81d23a8a3 100644
--- a/src/IO/HTTPCommon.h
+++ b/src/IO/HTTPCommon.h
@@ -50,8 +50,9 @@ void setResponseDefaultHeaders(Poco::Net::HTTPServerResponse & response, unsigne
 /// Create session object to perform requests and set required parameters.
 HTTPSessionPtr makeHTTPSession(const Poco::URI & uri, const ConnectionTimeouts & timeouts, bool resolve_host = true);
 
-/// As previous method creates session, but tooks it from pool
-PooledHTTPSessionPtr makePooledHTTPSession(const Poco::URI & uri, const ConnectionTimeouts & timeouts, size_t per_endpoint_pool_size);
+/// As previous method creates session, but tooks it from pool, without and with proxy uri.
+PooledHTTPSessionPtr makePooledHTTPSession(const Poco::URI & uri, const ConnectionTimeouts & timeouts, size_t per_endpoint_pool_size, bool resolve_host = true);
+PooledHTTPSessionPtr makePooledHTTPSession(const Poco::URI & uri, const Poco::URI & proxy_uri, const ConnectionTimeouts & timeouts, size_t per_endpoint_pool_size, bool resolve_host = true);
 
 bool isRedirect(const Poco::Net::HTTPResponse::HTTPStatus status);
 
diff --git a/src/IO/S3/PocoHTTPClient.cpp b/src/IO/S3/PocoHTTPClient.cpp
index 57916251d9b..2389f9a2192 100644
--- a/src/IO/S3/PocoHTTPClient.cpp
+++ b/src/IO/S3/PocoHTTPClient.cpp
@@ -6,7 +6,7 @@
 
 #include <utility>
 #include <IO/HTTPCommon.h>
-#include <IO/S3/PocoHTTPResponseStream.h>
+#include <IO/S3/SessionAwareAwsStream.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 #include <Common/Stopwatch.h>
@@ -86,6 +86,7 @@ PocoHTTPClient::PocoHTTPClient(const PocoHTTPClientConfiguration & clientConfigu
           ))
     , remote_host_filter(clientConfiguration.remote_host_filter)
     , s3_max_redirects(clientConfiguration.s3_max_redirects)
+    , max_connections(clientConfiguration.maxConnections)
 {
 }
 
@@ -164,28 +165,24 @@ void PocoHTTPClient::makeRequestInternal(
     {
         for (unsigned int attempt = 0; attempt <= s3_max_redirects; ++attempt)
         {
-            Poco::URI poco_uri(uri);
-
-            /// 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 = makeHTTPSession(poco_uri, timeouts, false);
+            Poco::URI target_uri(uri);
+            Poco::URI proxy_uri;
 
             auto request_configuration = per_request_configuration(request);
             if (!request_configuration.proxyHost.empty())
             {
-                /// Turn on tunnel mode if proxy scheme is HTTP while endpoint scheme is HTTPS.
-                bool use_tunnel = request_configuration.proxyScheme == Aws::Http::Scheme::HTTP && poco_uri.getScheme() == "https";
-                session->setProxy(
-                    request_configuration.proxyHost,
-                    request_configuration.proxyPort,
-                    Aws::Http::SchemeMapper::ToString(request_configuration.proxyScheme),
-                    use_tunnel
-                );
+                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);
+
             Poco::Net::HTTPRequest poco_request(Poco::Net::HTTPRequest::HTTP_1_1);
 
-            poco_request.setURI(poco_uri.getPathAndQuery());
+            poco_request.setURI(target_uri.getPathAndQuery());
 
             switch (request.GetMethod())
             {
@@ -281,7 +278,7 @@ void PocoHTTPClient::makeRequestInternal(
                 }
             }
             else
-                response->GetResponseStream().SetUnderlyingStream(std::make_shared<PocoHTTPResponseStream>(session, response_body_stream));
+                response->GetResponseStream().SetUnderlyingStream(std::make_shared<SessionAwareAwsStream<decltype(session)>>(session, response_body_stream));
 
             return;
         }
@@ -297,6 +294,7 @@ void PocoHTTPClient::makeRequestInternal(
         ProfileEvents::increment(select_metric(S3MetricType::Errors));
     }
 }
+
 }
 
 #endif
diff --git a/src/IO/S3/PocoHTTPClient.h b/src/IO/S3/PocoHTTPClient.h
index 560f0a455f0..e4fc453f388 100644
--- a/src/IO/S3/PocoHTTPClient.h
+++ b/src/IO/S3/PocoHTTPClient.h
@@ -56,6 +56,7 @@ private:
     ConnectionTimeouts timeouts;
     const RemoteHostFilter & remote_host_filter;
     unsigned int s3_max_redirects;
+    unsigned int max_connections;
 };
 
 }
diff --git a/src/IO/S3/PocoHTTPResponseStream.cpp b/src/IO/S3/PocoHTTPResponseStream.cpp
deleted file mode 100644
index 93f85d65e30..00000000000
--- a/src/IO/S3/PocoHTTPResponseStream.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <Common/config.h>
-
-#if USE_AWS_S3
-
-
-#include "PocoHTTPResponseStream.h"
-
-#include <utility>
-
-namespace DB::S3
-{
-PocoHTTPResponseStream::PocoHTTPResponseStream(std::shared_ptr<Poco::Net::HTTPClientSession> session_, std::istream & response_stream_)
-    : Aws::IOStream(response_stream_.rdbuf()), session(std::move(session_))
-{
-}
-
-}
-
-#endif
diff --git a/src/IO/S3/PocoHTTPResponseStream.h b/src/IO/S3/PocoHTTPResponseStream.h
deleted file mode 100644
index fe3df6e52a7..00000000000
--- a/src/IO/S3/PocoHTTPResponseStream.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include <aws/core/utils/stream/ResponseStream.h>
-#include <Poco/Net/HTTPClientSession.h>
-
-namespace DB::S3
-{
-/**
- * Wrapper of IStream to store response stream and corresponding HTTP session.
- */
-class PocoHTTPResponseStream : public Aws::IOStream
-{
-public:
-    PocoHTTPResponseStream(std::shared_ptr<Poco::Net::HTTPClientSession> session_, std::istream & response_stream_);
-
-private:
-    /// Poco HTTP session is holder of response stream.
-    std::shared_ptr<Poco::Net::HTTPClientSession> session;
-};
-
-}
diff --git a/src/IO/S3/SessionAwareAwsStream.h b/src/IO/S3/SessionAwareAwsStream.h
new file mode 100644
index 00000000000..70ddafba067
--- /dev/null
+++ b/src/IO/S3/SessionAwareAwsStream.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <IO/HTTPCommon.h>
+
+#include <aws/core/utils/stream/ResponseStream.h>
+
+
+namespace DB::S3
+{
+/**
+ * Wrapper of IOStream to store response stream and corresponding HTTP session.
+ */
+template <typename Session>
+class SessionAwareAwsStream : public Aws::IOStream
+{
+public:
+    SessionAwareAwsStream(Session session_, std::iostream & response_stream_)
+        : Aws::IStream(response_stream_.rdbuf()), session(std::move(session_))
+    {
+    }
+
+private:
+    /// Poco HTTP session is holder of response stream.
+    Session session;
+};
+
+}
diff --git a/src/IO/S3Common.cpp b/src/IO/S3Common.cpp
index 06c51e058a0..d4c4ba9bb02 100644
--- a/src/IO/S3Common.cpp
+++ b/src/IO/S3Common.cpp
@@ -280,7 +280,7 @@ namespace S3
     }
 
     std::shared_ptr<Aws::S3::S3Client> ClientFactory::create( // NOLINT
-        Aws::Client::ClientConfiguration & cfg,
+        const Aws::Client::ClientConfiguration & cfg,
         bool is_virtual_hosted_style,
         const String & access_key_id,
         const String & secret_access_key,
@@ -306,7 +306,7 @@ namespace S3
     }
 
     std::shared_ptr<Aws::S3::S3Client> ClientFactory::create( // NOLINT
-        const String & endpoint,
+        const Aws::Client::ClientConfiguration & cfg,
         bool is_virtual_hosted_style,
         const String & access_key_id,
         const String & secret_access_key,
@@ -315,10 +315,7 @@ namespace S3
         const RemoteHostFilter & remote_host_filter,
         unsigned int s3_max_redirects)
     {
-        PocoHTTPClientConfiguration client_configuration({}, remote_host_filter, s3_max_redirects);
-
-        if (!endpoint.empty())
-            client_configuration.endpointOverride = endpoint;
+        PocoHTTPClientConfiguration client_configuration(cfg, remote_host_filter, s3_max_redirects);
 
         client_configuration.updateSchemeAndRegion();
 
diff --git a/src/IO/S3Common.h b/src/IO/S3Common.h
index 664c07d5bf4..e2ec0785811 100644
--- a/src/IO/S3Common.h
+++ b/src/IO/S3Common.h
@@ -41,7 +41,7 @@ public:
         unsigned int s3_max_redirects);
 
     std::shared_ptr<Aws::S3::S3Client> create(
-        Aws::Client::ClientConfiguration & cfg,
+        const Aws::Client::ClientConfiguration & cfg,
         bool is_virtual_hosted_style,
         const String & access_key_id,
         const String & secret_access_key,
@@ -50,7 +50,7 @@ public:
         unsigned int s3_max_redirects);
 
     std::shared_ptr<Aws::S3::S3Client> create(
-        const String & endpoint,
+        const Aws::Client::ClientConfiguration & cfg,
         bool is_virtual_hosted_style,
         const String & access_key_id,
         const String & secret_access_key,
diff --git a/src/Storages/StorageS3.cpp b/src/Storages/StorageS3.cpp
index 5d7fc0cdaa9..1920a84e447 100644
--- a/src/Storages/StorageS3.cpp
+++ b/src/Storages/StorageS3.cpp
@@ -196,6 +196,7 @@ StorageS3::StorageS3(
     const String & format_name_,
     UInt64 min_upload_part_size_,
     UInt64 max_single_part_upload_size_,
+    UInt64 max_connections_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
     const Context & context_,
@@ -220,8 +221,12 @@ StorageS3::StorageS3(
     if (access_key_id_.empty())
         credentials = Aws::Auth::AWSCredentials(std::move(settings.access_key_id), std::move(settings.secret_access_key));
 
+    Aws::Client::ClientConfiguration client_configuration;
+    client_configuration.endpointOverride = uri_.endpoint;
+    client_configuration.maxConnections = max_connections_;
+
     client = S3::ClientFactory::instance().create(
-        uri_.endpoint,
+        client_configuration,
         uri_.is_virtual_hosted_style,
         credentials.GetAWSAccessKeyId(),
         credentials.GetAWSSecretKey(),
@@ -374,6 +379,7 @@ void registerStorageS3Impl(const String & name, StorageFactory & factory)
 
         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;
 
         String compression_method;
         String format_name;
@@ -396,6 +402,7 @@ void registerStorageS3Impl(const String & name, StorageFactory & factory)
             format_name,
             min_upload_part_size,
             max_single_part_upload_size,
+            max_connections,
             args.columns,
             args.constraints,
             args.context,
diff --git a/src/Storages/StorageS3.h b/src/Storages/StorageS3.h
index f436fb85c90..f006de39c99 100644
--- a/src/Storages/StorageS3.h
+++ b/src/Storages/StorageS3.h
@@ -32,6 +32,7 @@ public:
         const String & format_name_,
         UInt64 min_upload_part_size_,
         UInt64 max_single_part_upload_size_,
+        UInt64 max_connections_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
         const Context & context_,
diff --git a/src/TableFunctions/TableFunctionS3.cpp b/src/TableFunctions/TableFunctionS3.cpp
index cc7877b204e..6dc9230ca46 100644
--- a/src/TableFunctions/TableFunctionS3.cpp
+++ b/src/TableFunctions/TableFunctionS3.cpp
@@ -68,6 +68,7 @@ StoragePtr TableFunctionS3::executeImpl(const ASTPtr & /*ast_function*/, const C
     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;
 
     StoragePtr storage = StorageS3::create(
             s3_uri,
@@ -77,6 +78,7 @@ StoragePtr TableFunctionS3::executeImpl(const ASTPtr & /*ast_function*/, const C
             format,
             min_upload_part_size,
             max_single_part_upload_size,
+            max_connections,
             getActualTableStructure(context),
             ConstraintsDescription{},
             const_cast<Context &>(context),

From 59fb76e8bc04a76b1a791b684075a11a7a4e17a4 Mon Sep 17 00:00:00 2001
From: Vladimir Chebotarev <vladimir.chebotarev@gmail.com>
Date: Mon, 14 Dec 2020 10:08:29 +0300
Subject: [PATCH 039/611] Fix.

---
 src/IO/S3/SessionAwareAwsStream.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/IO/S3/SessionAwareAwsStream.h b/src/IO/S3/SessionAwareAwsStream.h
index 70ddafba067..f64be5dac16 100644
--- a/src/IO/S3/SessionAwareAwsStream.h
+++ b/src/IO/S3/SessionAwareAwsStream.h
@@ -11,10 +11,10 @@ namespace DB::S3
  * Wrapper of IOStream to store response stream and corresponding HTTP session.
  */
 template <typename Session>
-class SessionAwareAwsStream : public Aws::IOStream
+class SessionAwareAwsStream : public Aws::IStream
 {
 public:
-    SessionAwareAwsStream(Session session_, std::iostream & response_stream_)
+    SessionAwareAwsStream(Session session_, std::istream & response_stream_)
         : Aws::IStream(response_stream_.rdbuf()), session(std::move(session_))
     {
     }

From ad6fe2a8b138ac118bb5767e6a4a8ce4daae1c93 Mon Sep 17 00:00:00 2001
From: Vladimir Chebotarev <vladimir.chebotarev@gmail.com>
Date: Mon, 21 Dec 2020 10:48:26 +0300
Subject: [PATCH 040/611] Build fix.

---
 src/IO/HTTPCommon.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/IO/HTTPCommon.cpp b/src/IO/HTTPCommon.cpp
index 39951477779..6a3ebb97734 100644
--- a/src/IO/HTTPCommon.cpp
+++ b/src/IO/HTTPCommon.cpp
@@ -164,7 +164,11 @@ namespace
             UInt16 proxy_port;
             bool is_proxy_https;
 
-            bool operator ==(const Key &) const = default;
+            bool operator ==(const Key & rhs) const
+            {
+                return std::tie(target_host, target_port, is_target_https, proxy_host, proxy_port, is_proxy_https)
+                    == std::tie(rhs.target_host, rhs.target_port, rhs.is_target_https, rhs.proxy_host, rhs.proxy_port, rhs.is_proxy_https);
+            }
         };
 
     private:

From 8893fbcf8e9b1bbe13035209e835b55eaf52c7da Mon Sep 17 00:00:00 2001
From: Denis Glazachev <d.glazachev@gmail.com>
Date: Wed, 6 Jan 2021 07:40:47 +0400
Subject: [PATCH 041/611] Rename {username} to {user_name} Add caching/checking
 of search_params Adjust comments/doc Use special authentication logic from
 ExternalAuthenticators::checkLDAPCredentials

---
 programs/server/config.xml                    | 19 ++++---
 src/Access/Authentication.cpp                 | 13 -----
 src/Access/ExternalAuthenticators.cpp         | 55 ++++++++++++++++---
 src/Access/ExternalAuthenticators.h           |  4 +-
 src/Access/LDAPAccessStorage.cpp              | 10 ++--
 src/Access/LDAPAccessStorage.h                |  3 +-
 src/Access/LDAPClient.cpp                     | 12 ++--
 src/Access/LDAPParams.h                       | 20 ++++---
 .../external_user_directory/tests/common.py   |  2 +-
 9 files changed, 89 insertions(+), 49 deletions(-)

diff --git a/programs/server/config.xml b/programs/server/config.xml
index 98b1801372b..09a53a6589e 100644
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@@ -322,7 +322,7 @@
                 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 '{username}' substrings of the template with the actual
+                        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 a user will be assumed
                          to be successfully authenticated for all consecutive requests without contacting the LDAP server.
@@ -344,7 +344,7 @@
                 <my_ldap_server>
                     <host>localhost</host>
                     <port>636</port>
-                    <bind_dn>uid={username},ou=users,dc=example,dc=com</bind_dn>
+                    <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>
@@ -377,20 +377,23 @@
                         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.
-                        The list of strings (values of attributes) returned by the search will be transformed and the resulting strings
-                         will be treated as local role names and assigned to the user.
+                        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
+                         CREATE ROLE command.
                         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 '{username}' and '{bind_dn}' substrings
+                            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.
-                    attribute - attribute name whose values will be returned by the 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 '{username}', '{bind_dn}', and '{base_dn}'
+                            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.
@@ -403,9 +406,9 @@
                     </roles>
                     <role_mapping>
                         <base_dn>ou=groups,dc=example,dc=com</base_dn>
-                        <attribute>cn</attribute>
                         <scope>subtree</scope>
                         <search_filter>(&amp;(objectClass=groupOfNames)(member={bind_dn}))</search_filter>
+                        <attribute>cn</attribute>
                         <prefix>clickhouse_</prefix>
                     </role_mapping>
                 </ldap>
diff --git a/src/Access/Authentication.cpp b/src/Access/Authentication.cpp
index 3b67563f6eb..19c40c068b4 100644
--- a/src/Access/Authentication.cpp
+++ b/src/Access/Authentication.cpp
@@ -88,17 +88,4 @@ bool Authentication::isCorrectPassword(const String & user_, const String & pass
     throw Exception("Cannot check if the password is correct for authentication type " + toString(type), ErrorCodes::NOT_IMPLEMENTED);
 }
 
-bool Authentication::isCorrectPasswordLDAP(const String & password_, const String & user_, const ExternalAuthenticators & external_authenticators, const LDAPSearchParamsList * search_params, LDAPSearchResultsList * search_results) const
-{
-    if (type != LDAP_SERVER)
-        throw Exception("Cannot check if the password is correct using LDAP logic for authentication type " + toString(type), ErrorCodes::BAD_ARGUMENTS);
-
-    auto ldap_server_params = external_authenticators.getLDAPServerParams(server_name);
-    ldap_server_params.user = user_;
-    ldap_server_params.password = password_;
-
-    LDAPSimpleAuthClient ldap_client(ldap_server_params);
-    return ldap_client.authenticate(search_params, search_results);
-}
-
 }
diff --git a/src/Access/ExternalAuthenticators.cpp b/src/Access/ExternalAuthenticators.cpp
index e13341ff3f9..6f66f4303e1 100644
--- a/src/Access/ExternalAuthenticators.cpp
+++ b/src/Access/ExternalAuthenticators.cpp
@@ -63,7 +63,7 @@ auto parseLDAPServer(const Poco::Util::AbstractConfiguration & config, const Str
     {
         const auto auth_dn_prefix = config.getString(ldap_server_config + ".auth_dn_prefix");
         const auto auth_dn_suffix = config.getString(ldap_server_config + ".auth_dn_suffix");
-        params.bind_dn = auth_dn_prefix + "{username}" + auth_dn_suffix;
+        params.bind_dn = auth_dn_prefix + "{user_name}" + auth_dn_suffix;
     }
 
     if (has_verification_cooldown)
@@ -177,7 +177,8 @@ void ExternalAuthenticators::setConfiguration(const Poco::Util::AbstractConfigur
     }
 }
 
-bool ExternalAuthenticators::checkLDAPCredentials(const String & server, const String & user_name, const String & password) const
+bool ExternalAuthenticators::checkLDAPCredentials(const String & server, const String & user_name, const String & password,
+    const LDAPSearchParamsList * search_params, LDAPSearchResultsList * search_results) const
 {
     std::optional<LDAPServerParams> params;
     std::size_t params_hash = 0;
@@ -193,7 +194,15 @@ bool ExternalAuthenticators::checkLDAPCredentials(const String & server, const S
         params = pit->second;
         params->user = user_name;
         params->password = password;
-        params_hash = params->getCoreHash();
+
+        params->combineCoreHash(params_hash);
+        if (search_params)
+        {
+            for (const auto & params_instance : *search_params)
+            {
+                params_instance.combineHash(params_hash);
+            }
+        }
 
         // Check the cache, but only if the caching is enabled at all.
         if (params->verification_cooldown > std::chrono::seconds{0})
@@ -217,9 +226,19 @@ bool ExternalAuthenticators::checkLDAPCredentials(const String & server, const S
                         // Check if we can safely "reuse" the result of the previous successful password verification.
                         entry.last_successful_params_hash == params_hash &&
                         last_check_period >= std::chrono::seconds{0} &&
-                        last_check_period <= params->verification_cooldown
+                        last_check_period <= params->verification_cooldown &&
+
+                        // Ensure that search_params are compatible.
+                        (
+                            search_params == nullptr ?
+                            entry.last_successful_search_results.empty() :
+                            search_params->size() == entry.last_successful_search_results.size()
+                        )
                     )
                     {
+                        if (search_results)
+                            *search_results = entry.last_successful_search_results;
+
                         return true;
                     }
 
@@ -236,7 +255,7 @@ bool ExternalAuthenticators::checkLDAPCredentials(const String & server, const S
     }
 
     LDAPSimpleAuthClient client(params.value());
-    const auto result = client.check();
+    const auto result = client.authenticate(search_params, search_results);
     const auto current_check_timestamp = std::chrono::steady_clock::now();
 
     // Update the cache, but only if this is the latest check and the server is still configured in a compatible way.
@@ -253,8 +272,18 @@ bool ExternalAuthenticators::checkLDAPCredentials(const String & server, const S
         new_params.user = user_name;
         new_params.password = password;
 
+        std::size_t new_params_hash = 0;
+        new_params.combineCoreHash(new_params_hash);
+        if (search_params)
+        {
+            for (const auto & params_instance : *search_params)
+            {
+                params_instance.combineHash(new_params_hash);
+            }
+        }
+
         // If the critical server params have changed while we were checking the password, we discard the current result.
-        if (params_hash != new_params.getCoreHash())
+        if (params_hash != new_params_hash)
             return false;
 
         auto & entry = ldap_server_caches[server][user_name];
@@ -262,8 +291,20 @@ bool ExternalAuthenticators::checkLDAPCredentials(const String & server, const S
         {
             entry.last_successful_params_hash = params_hash;
             entry.last_successful_authentication_timestamp = current_check_timestamp;
+
+            if (search_results)
+                entry.last_successful_search_results = *search_results;
+            else
+                entry.last_successful_search_results.clear();
         }
-        else if (entry.last_successful_params_hash != params_hash)
+        else if (
+            entry.last_successful_params_hash != params_hash ||
+            (
+                search_params == nullptr ?
+                !entry.last_successful_search_results.empty() :
+                search_params->size() != entry.last_successful_search_results.size()
+            )
+        )
         {
             // Somehow a newer check with different params/password succeeded, so the current result is obsolete and we discard it.
             return false;
diff --git a/src/Access/ExternalAuthenticators.h b/src/Access/ExternalAuthenticators.h
index fa618c92b3f..abcc8e8d10d 100644
--- a/src/Access/ExternalAuthenticators.h
+++ b/src/Access/ExternalAuthenticators.h
@@ -28,13 +28,15 @@ 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;
+    bool checkLDAPCredentials(const String & server, const String & user_name, const String & password,
+        const LDAPSearchParamsList * search_params = nullptr, LDAPSearchResultsList * search_results = nullptr) 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;
     };
 
     using LDAPServerCache = std::unordered_map<String, LDAPCacheEntry>; // user name   -> cache entry
diff --git a/src/Access/LDAPAccessStorage.cpp b/src/Access/LDAPAccessStorage.cpp
index a787c704999..2602422a59a 100644
--- a/src/Access/LDAPAccessStorage.cpp
+++ b/src/Access/LDAPAccessStorage.cpp
@@ -1,5 +1,6 @@
 #include <Access/LDAPAccessStorage.h>
 #include <Access/AccessControlManager.h>
+#include <Access/ExternalAuthenticators.h>
 #include <Access/User.h>
 #include <Access/Role.h>
 #include <Access/LDAPClient.h>
@@ -364,9 +365,10 @@ std::set<String> LDAPAccessStorage::mapExternalRolesNoLock(const LDAPSearchResul
 }
 
 
-bool LDAPAccessStorage::isPasswordCorrectLDAPNoLock(const User & user, const String & password, const ExternalAuthenticators & external_authenticators, LDAPSearchResultsList & search_results) const
+bool LDAPAccessStorage::isPasswordCorrectLDAPNoLock(const String & user_name, const String & password,
+    const ExternalAuthenticators & external_authenticators, LDAPSearchResultsList & search_results) const
 {
-    return user.authentication.isCorrectPasswordLDAP(password, user.getName(), external_authenticators, &role_search_params, &search_results);
+    return external_authenticators.checkLDAPCredentials(ldap_server, user_name, password, &role_search_params, &search_results);
 }
 
 
@@ -521,7 +523,7 @@ UUID LDAPAccessStorage::loginImpl(const String & user_name, const String & passw
     {
         auto user = memory_storage.read<User>(*id);
 
-        if (!isPasswordCorrectLDAPNoLock(*user, password, external_authenticators, external_roles))
+        if (!isPasswordCorrectLDAPNoLock(user->getName(), password, external_authenticators, external_roles))
             throwInvalidPassword();
 
         if (!isAddressAllowedImpl(*user, address))
@@ -540,7 +542,7 @@ UUID LDAPAccessStorage::loginImpl(const String & user_name, const String & passw
         user->authentication = Authentication(Authentication::Type::LDAP_SERVER);
         user->authentication.setServerName(ldap_server);
 
-        if (!isPasswordCorrectLDAPNoLock(*user, password, external_authenticators, external_roles))
+        if (!isPasswordCorrectLDAPNoLock(user->getName(), password, external_authenticators, external_roles))
             throwInvalidPassword();
 
         if (!isAddressAllowedImpl(*user, address))
diff --git a/src/Access/LDAPAccessStorage.h b/src/Access/LDAPAccessStorage.h
index cce50fd03aa..b3d82d1e86b 100644
--- a/src/Access/LDAPAccessStorage.h
+++ b/src/Access/LDAPAccessStorage.h
@@ -69,7 +69,8 @@ private:
     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 User & user, const String & password, const ExternalAuthenticators & external_authenticators, LDAPSearchResultsList & search_results) const;
+    bool isPasswordCorrectLDAPNoLock(const String & user_name, const String & password,
+        const ExternalAuthenticators & external_authenticators, LDAPSearchResultsList & search_results) const;
 
     mutable std::recursive_mutex mutex;
     AccessControlManager * access_control_manager = nullptr;
diff --git a/src/Access/LDAPClient.cpp b/src/Access/LDAPClient.cpp
index cba74fbbb89..41756aebb9a 100644
--- a/src/Access/LDAPClient.cpp
+++ b/src/Access/LDAPClient.cpp
@@ -271,8 +271,8 @@ void LDAPClient::openConnection()
     {
         case LDAPServerParams::SASLMechanism::SIMPLE:
         {
-            const auto escaped_username = escapeForLDAP(params.user);
-            const auto bind_dn = replacePlaceholders(params.bind_dn, { {"{username}", escaped_username} });
+            const auto escaped_user_name = escapeForLDAP(params.user);
+            const auto bind_dn = replacePlaceholders(params.bind_dn, { {"{user_name}", escaped_user_name} });
 
             ::berval cred;
             cred.bv_val = const_cast<char *>(params.password.c_str());
@@ -314,10 +314,10 @@ LDAPSearchResults LDAPClient::search(const LDAPSearchParams & search_params)
         case LDAPSearchParams::Scope::CHILDREN:  scope = LDAP_SCOPE_CHILDREN; break;
     }
 
-    const auto escaped_username = escapeForLDAP(params.user);
-    const auto bind_dn = replacePlaceholders(params.bind_dn, { {"{username}", escaped_username} });
-    const auto base_dn = replacePlaceholders(search_params.base_dn, { {"{username}", escaped_username}, {"{bind_dn}", bind_dn} });
-    const auto search_filter = replacePlaceholders(search_params.search_filter, { {"{username}", escaped_username}, {"{bind_dn}", bind_dn}, {"{base_dn}", base_dn} });
+    const auto escaped_user_name = escapeForLDAP(params.user);
+    const auto bind_dn = replacePlaceholders(params.bind_dn, { {"{user_name}", escaped_user_name} });
+    const auto base_dn = replacePlaceholders(search_params.base_dn, { {"{user_name}", escaped_user_name}, {"{bind_dn}", bind_dn} });
+    const auto search_filter = replacePlaceholders(search_params.search_filter, { {"{user_name}", escaped_user_name}, {"{bind_dn}", bind_dn}, {"{base_dn}", base_dn} });
     char * attrs[] = { const_cast<char *>(search_params.attribute.c_str()), nullptr };
     ::timeval timeout = { params.search_timeout.count(), 0 };
     LDAPMessage* msgs = nullptr;
diff --git a/src/Access/LDAPParams.h b/src/Access/LDAPParams.h
index 426e81719bc..5181b2d1621 100644
--- a/src/Access/LDAPParams.h
+++ b/src/Access/LDAPParams.h
@@ -23,10 +23,19 @@ struct LDAPSearchParams
     };
 
     String base_dn;
+    Scope scope = Scope::SUBTREE;
     String search_filter;
     String attribute = "cn";
-    Scope scope = Scope::SUBTREE;
     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>;
@@ -98,18 +107,13 @@ struct LDAPServerParams
     std::chrono::seconds search_timeout{20};
     std::uint32_t search_limit = 100;
 
-    std::size_t getCoreHash() const
+    void combineCoreHash(std::size_t & seed) const
     {
-        std::size_t seed = 0;
-
         boost::hash_combine(seed, host);
         boost::hash_combine(seed, port);
-        boost::hash_combine(seed, auth_dn_prefix);
-        boost::hash_combine(seed, auth_dn_suffix);
+        boost::hash_combine(seed, bind_dn);
         boost::hash_combine(seed, user);
         boost::hash_combine(seed, password);
-
-        return seed;
     }
 };
 
diff --git a/tests/testflows/ldap/external_user_directory/tests/common.py b/tests/testflows/ldap/external_user_directory/tests/common.py
index 6d8a97e8611..e1ee4f99545 100644
--- a/tests/testflows/ldap/external_user_directory/tests/common.py
+++ b/tests/testflows/ldap/external_user_directory/tests/common.py
@@ -77,7 +77,7 @@ def verify_ldap_user_exists(server, username, password):
     with By("searching LDAP database"):
         ldap_node = current().context.cluster.node(server)
         r = ldap_node.command(
-            f"ldapwhoami -H ldap://localhost -D 'cn={username},ou=users,dc=company,dc=com' -w {password}")
+            f"ldapwhoami -H ldap://localhost -D 'cn={user_name},ou=users,dc=company,dc=com' -w {password}")
         assert r.exitcode == 0, error()
 
 def create_ldap_external_user_directory_config_content(server=None, roles=None, **kwargs):

From 31105670a8a62050f87780f595ac9c2fb2e8492d Mon Sep 17 00:00:00 2001
From: hexiaoting <hewenting_ict@163.com>
Date: Wed, 6 Jan 2021 18:53:14 +0800
Subject: [PATCH 042/611] Introduce mapContains, mapKeys, mapValues functions
 for Map data type

---
 src/Functions/map.cpp                         | 161 ++++++++++++++++++
 .../0_stateless/01651_map_functions.reference |  16 ++
 .../0_stateless/01651_map_functions.sql       |  21 +++
 3 files changed, 198 insertions(+)
 create mode 100644 tests/queries/0_stateless/01651_map_functions.reference
 create mode 100644 tests/queries/0_stateless/01651_map_functions.sql

diff --git a/src/Functions/map.cpp b/src/Functions/map.cpp
index 5993ab3706e..dd74d3efa47 100644
--- a/src/Functions/map.cpp
+++ b/src/Functions/map.cpp
@@ -1,20 +1,28 @@
 #include <Functions/IFunctionImpl.h>
 #include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeMap.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnMap.h>
 #include <Columns/ColumnArray.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
 #include <DataTypes/getLeastSupertype.h>
 #include <Interpreters/castColumn.h>
 #include <memory>
 
+#include <Common/assert_cast.h>
+#include <Common/typeid_cast.h>
+#include "array/arrayIndex.h"
+
 
 namespace DB
 {
 namespace ErrorCodes
 {
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
 namespace
@@ -130,11 +138,164 @@ public:
     }
 };
 
+struct NameMapContains { static constexpr auto name = "mapContains"; };
+
+class FunctionMapContains : public IFunction
+{
+public:
+    static constexpr auto name = NameMapContains::name;
+    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMapContains>(); }
+
+    String getName() const override
+    {
+        return NameMapContains::name ;
+    }
+
+    size_t getNumberOfArguments() const override { return 2; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & 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 DataTypeMap * map_type = checkAndGetDataType<DataTypeMap>(arguments[0].type.get());
+
+        if (!map_type)
+            throw Exception{"First argument for function " + getName() + " must be a map.",
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+
+        auto key_type = map_type->getKeyType();
+
+        if (!(isNumber(arguments[1].type) && isNumber(key_type))
+            && key_type->getName() != arguments[1].type->getName())
+            throw Exception{"Second argument for function " + getName() + " must be a " + key_type->getName(),
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+
+        return std::make_shared<DataTypeUInt8>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    {
+        const ColumnMap * col_map = typeid_cast<const ColumnMap *>(arguments[0].column.get());
+        if (!col_map)
+            return nullptr;
+
+        const auto & nested_column = col_map->getNestedColumn();
+        const auto & keys_data = col_map->getNestedData().getColumn(0);
+
+        /// Prepare arguments to call arrayIndex for check has the array element.
+        ColumnsWithTypeAndName new_arguments =
+        {
+            {
+                ColumnArray::create(keys_data.getPtr(), nested_column.getOffsetsPtr()),
+                std::make_shared<DataTypeArray>(result_type),
+                ""
+            },
+            arguments[1]
+        };
+
+        return FunctionArrayIndex<HasAction, NameMapContains>().executeImpl(new_arguments, result_type, input_rows_count);
+    }
+};
+
+class FunctionMapKeys : public IFunction
+{
+public:
+    static constexpr auto name = "mapKeys";
+    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMapKeys>(); }
+
+    String getName() const override
+    {
+        return name ;
+    }
+
+    size_t getNumberOfArguments() const override { return 1; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        if (arguments.size() != 1)
+            throw Exception("Number of arguments for function " + getName() + " doesn't match: passed "
+                + toString(arguments.size()) + ", should be 1",
+                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+        const DataTypeMap * map_type = checkAndGetDataType<DataTypeMap>(arguments[0].type.get());
+
+        if (!map_type)
+            throw Exception{"First argument for function " + getName() + " must be a map.",
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+
+        auto key_type = map_type->getKeyType();
+
+        return std::make_shared<DataTypeArray>(key_type);
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t /*input_rows_count*/) const override
+    {
+        const ColumnMap * col_map = typeid_cast<const ColumnMap *>(arguments[0].column.get());
+        if (!col_map)
+            return nullptr;
+
+        const auto & nested_column = col_map->getNestedColumn();
+        const auto & keys_data = col_map->getNestedData().getColumn(0);
+
+        return ColumnArray::create(keys_data.getPtr(), nested_column.getOffsetsPtr());
+    }
+};
+
+class FunctionMapValues : public IFunction
+{
+public:
+    static constexpr auto name = "mapValues";
+    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMapValues>(); }
+
+    String getName() const override
+    {
+        return name ;
+    }
+
+    size_t getNumberOfArguments() const override { return 1; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        if (arguments.size() != 1)
+            throw Exception("Number of arguments for function " + getName() + " doesn't match: passed "
+                + toString(arguments.size()) + ", should be 1",
+                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+        const DataTypeMap * map_type = checkAndGetDataType<DataTypeMap>(arguments[0].type.get());
+
+        if (!map_type)
+            throw Exception{"First argument for function " + getName() + " must be a map.",
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+
+        auto value_type = map_type->getValueType();
+
+        return std::make_shared<DataTypeArray>(value_type);
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t /*input_rows_count*/) const override
+    {
+        const ColumnMap * col_map = typeid_cast<const ColumnMap *>(arguments[0].column.get());
+        if (!col_map)
+            return nullptr;
+
+        const auto & nested_column = col_map->getNestedColumn();
+        const auto & values_data = col_map->getNestedData().getColumn(1);
+
+        return ColumnArray::create(values_data.getPtr(), nested_column.getOffsetsPtr());
+    }
+};
+
 }
 
 void registerFunctionsMap(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionMap>();
+    factory.registerFunction<FunctionMapContains>();
+    factory.registerFunction<FunctionMapKeys>();
+    factory.registerFunction<FunctionMapValues>();
 }
 
 }
diff --git a/tests/queries/0_stateless/01651_map_functions.reference b/tests/queries/0_stateless/01651_map_functions.reference
new file mode 100644
index 00000000000..efcd9ce8bcd
--- /dev/null
+++ b/tests/queries/0_stateless/01651_map_functions.reference
@@ -0,0 +1,16 @@
+1
+1
+0
+1
+0
+0
+1
+0
+['name','age']
+['name','gender']
+1	0	0
+1	0	1
+1	0	0
+[232]
+[233]
+[234]
diff --git a/tests/queries/0_stateless/01651_map_functions.sql b/tests/queries/0_stateless/01651_map_functions.sql
new file mode 100644
index 00000000000..30ca3a4aeea
--- /dev/null
+++ b/tests/queries/0_stateless/01651_map_functions.sql
@@ -0,0 +1,21 @@
+set allow_experimental_map_type = 1;
+
+-- String type
+drop table if exists table_map;
+create table table_map (a Map(String, String), b String) engine = Memory;
+insert into table_map values ({'name':'zhangsan', 'age':'10'}, 'name'), ({'name':'lisi', 'gender':'female'},'age');
+select mapContains(a, 'name') from table_map;
+select mapContains(a, 'gender') from table_map;
+select mapContains(a, 'abc') from table_map;
+select mapContains(a, b) from table_map;
+select mapContains(a, 10) from table_map; -- { serverError 43 }
+select mapKeys(a) from table_map;
+drop table if exists table_map;
+
+CREATE TABLE table_map (a Map(UInt8, Int), b UInt8, c UInt32) engine = MergeTree order by tuple();
+insert into table_map select map(number, number), number, number from numbers(1000, 3);
+select mapContains(a, b), mapContains(a, c), mapContains(a, 233) from table_map;
+select mapContains(a, 'aaa') from table_map; -- { serverError 43 }
+select mapContains(b, 'aaa') from table_map; -- { serverError 43 }
+select mapKeys(a) from table_map;
+drop table if exists table_map;

From 41fe290b2bd9131e3895eb4ad9b0c1ddc6facbdf Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Sat, 9 Jan 2021 07:15:28 +0300
Subject: [PATCH 043/611] Update map.cpp

---
 src/Functions/map.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Functions/map.cpp b/src/Functions/map.cpp
index dd74d3efa47..f1c5a26ce7d 100644
--- a/src/Functions/map.cpp
+++ b/src/Functions/map.cpp
@@ -138,17 +138,16 @@ public:
     }
 };
 
-struct NameMapContains { static constexpr auto name = "mapContains"; };
 
 class FunctionMapContains : public IFunction
 {
 public:
-    static constexpr auto name = NameMapContains::name;
+    static constexpr auto name = "mapContains";
     static FunctionPtr create(const Context &) { return std::make_shared<FunctionMapContains>(); }
 
     String getName() const override
     {
-        return NameMapContains::name ;
+        return name;
     }
 
     size_t getNumberOfArguments() const override { return 2; }
@@ -200,6 +199,7 @@ public:
     }
 };
 
+
 class FunctionMapKeys : public IFunction
 {
 public:
@@ -208,7 +208,7 @@ public:
 
     String getName() const override
     {
-        return name ;
+        return name;
     }
 
     size_t getNumberOfArguments() const override { return 1; }
@@ -244,6 +244,7 @@ public:
     }
 };
 
+
 class FunctionMapValues : public IFunction
 {
 public:
@@ -252,7 +253,7 @@ public:
 
     String getName() const override
     {
-        return name ;
+        return name;
     }
 
     size_t getNumberOfArguments() const override { return 1; }

From 9e3b4a67deb9bfcbb0d3d280ad96aa140b0380ed Mon Sep 17 00:00:00 2001
From: hexiaoting <hewenting_ict@163.com>
Date: Mon, 11 Jan 2021 10:56:13 +0800
Subject: [PATCH 044/611] Add mapValues test

---
 tests/queries/0_stateless/01651_map_functions.reference | 3 +++
 tests/queries/0_stateless/01651_map_functions.sql       | 1 +
 2 files changed, 4 insertions(+)

diff --git a/tests/queries/0_stateless/01651_map_functions.reference b/tests/queries/0_stateless/01651_map_functions.reference
index efcd9ce8bcd..ede7a6f5e68 100644
--- a/tests/queries/0_stateless/01651_map_functions.reference
+++ b/tests/queries/0_stateless/01651_map_functions.reference
@@ -14,3 +14,6 @@
 [232]
 [233]
 [234]
+[1000]
+[1001]
+[1002]
diff --git a/tests/queries/0_stateless/01651_map_functions.sql b/tests/queries/0_stateless/01651_map_functions.sql
index 30ca3a4aeea..c3b5bd7edd1 100644
--- a/tests/queries/0_stateless/01651_map_functions.sql
+++ b/tests/queries/0_stateless/01651_map_functions.sql
@@ -18,4 +18,5 @@ select mapContains(a, b), mapContains(a, c), mapContains(a, 233) from table_map;
 select mapContains(a, 'aaa') from table_map; -- { serverError 43 }
 select mapContains(b, 'aaa') from table_map; -- { serverError 43 }
 select mapKeys(a) from table_map;
+select mapValues(a) from table_map;
 drop table if exists table_map;

From bd05d9db2f01382b76b202177db27a5932810932 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Wed, 6 Jan 2021 00:57:05 +0300
Subject: [PATCH 045/611] Fix memory tracking for OPTIMIZE TABLE queries

Because of BlockerInThread in
MergeTreeDataPartWriterOnDisk::calculateAndSerializePrimaryIndex memory
was accounted incorrectly and grows constantly.

And IIUC there is no need in that blocker, since INSERT SELECT shares
the same thread group.
---
 .../MergeTree/MergeTreeDataPartWriterOnDisk.cpp     |  8 --------
 .../01641_memory_tracking_insert_optimize.reference |  0
 .../01641_memory_tracking_insert_optimize.sql       | 13 +++++++++++++
 tests/queries/skip_list.json                        |  6 ++++--
 4 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 tests/queries/0_stateless/01641_memory_tracking_insert_optimize.reference
 create mode 100644 tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql

diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
index fd3338c8a70..9390180d51c 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
@@ -180,14 +180,6 @@ void MergeTreeDataPartWriterOnDisk::calculateAndSerializePrimaryIndex(const Bloc
             index_columns[i] = primary_index_block.getByPosition(i).column->cloneEmpty();
     }
 
-    /** While filling index (index_columns), disable memory tracker.
-     * Because memory is allocated here (maybe in context of INSERT query),
-     *  but then freed in completely different place (while merging parts), where query memory_tracker is not available.
-     * And otherwise it will look like excessively growing memory consumption in context of query.
-     *  (observed in long INSERT SELECTs)
-     */
-    MemoryTracker::BlockerInThread temporarily_disable_memory_tracker;
-
     /// Write index. The index contains Primary Key value for each `index_granularity` row.
     for (const auto & granule : granules_to_write)
     {
diff --git a/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.reference b/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql b/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql
new file mode 100644
index 00000000000..59b5098bbd1
--- /dev/null
+++ b/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql
@@ -0,0 +1,13 @@
+drop table if exists data_01641;
+
+create table data_01641 (key Int, value String) engine=MergeTree order by (key, repeat(value, 10)) settings old_parts_lifetime=0, min_bytes_for_wide_part=0;
+
+-- peak memory usage is 170MiB
+set max_memory_usage='200Mi';
+system stop merges data_01641;
+insert into data_01641 select number, toString(number) from numbers(toUInt64(120e6));
+
+-- FIXME: this limit does not work
+set max_memory_usage='10Mi';
+system start merges data_01641;
+optimize table data_01641 final;
diff --git a/tests/queries/skip_list.json b/tests/queries/skip_list.json
index cfbac463932..d380ab2ecf0 100644
--- a/tests/queries/skip_list.json
+++ b/tests/queries/skip_list.json
@@ -16,7 +16,8 @@
         "01474_executable_dictionary", /// informational stderr from sanitizer at start
         "functions_bad_arguments", /// Too long for TSan
         "01603_read_with_backoff_bug", /// Too long for TSan
-        "01646_system_restart_replicas_smoke" /// RESTART REPLICAS can acquire too much locks, while only 64 is possible from one thread under TSan
+        "01646_system_restart_replicas_smoke", /// RESTART REPLICAS can acquire too much locks, while only 64 is possible from one thread under TSan
+        "01641_memory_tracking_insert_optimize" /// INSERT lots of rows is too heavy for TSan
     ],
     "address-sanitizer": [
         "00877",
@@ -62,7 +63,8 @@
         "hyperscan",
         "01193_metadata_loading",
         "01473_event_time_microseconds",
-        "01396_inactive_replica_cleanup_nodes"
+        "01396_inactive_replica_cleanup_nodes",
+        "01641_memory_tracking_insert_optimize" /// INSERT lots of rows is too heavy in debug build
     ],
     "unbundled-build": [
         "00429",

From 82edbfb5816fc60df3dcc1d064834e7915531f67 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Wed, 6 Jan 2021 02:20:26 +0300
Subject: [PATCH 046/611] Account query memory limits and sampling for OPTIMIZE
 TABLE/merges

---
 src/Storages/MergeTree/MergeList.cpp                 | 12 ++++++++++++
 .../01641_memory_tracking_insert_optimize.sql        | 12 ++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/Storages/MergeTree/MergeList.cpp b/src/Storages/MergeTree/MergeList.cpp
index ba6c2a3d462..dbdfe650713 100644
--- a/src/Storages/MergeTree/MergeList.cpp
+++ b/src/Storages/MergeTree/MergeList.cpp
@@ -40,6 +40,18 @@ MergeListElement::MergeListElement(const std::string & database_, const std::str
     background_thread_memory_tracker = CurrentThread::getMemoryTracker();
     if (background_thread_memory_tracker)
     {
+        /// From the query context it will be ("for thread") memory tracker with VariableContext::Thread level,
+        /// which does not have any limits and sampling settings configured.
+        /// And parent for this memory tracker should be ("(for query)") with VariableContext::Process level,
+        /// that has limits and sampling configured.
+        MemoryTracker * parent;
+        if (background_thread_memory_tracker->level == VariableContext::Thread &&
+            (parent = background_thread_memory_tracker->getParent()) &&
+            parent != &total_memory_tracker)
+        {
+            background_thread_memory_tracker = parent;
+        }
+
         background_thread_memory_tracker_prev_parent = background_thread_memory_tracker->getParent();
         background_thread_memory_tracker->setParent(&memory_tracker);
     }
diff --git a/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql b/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql
index 59b5098bbd1..f059da20755 100644
--- a/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql
+++ b/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql
@@ -7,7 +7,15 @@ set max_memory_usage='200Mi';
 system stop merges data_01641;
 insert into data_01641 select number, toString(number) from numbers(toUInt64(120e6));
 
--- FIXME: this limit does not work
-set max_memory_usage='10Mi';
+-- peak:
+-- - is 21MiB if background merges already scheduled
+-- - is ~60MiB otherwise
+set max_memory_usage='80Mi';
 system start merges data_01641;
 optimize table data_01641 final;
+
+-- definitely should fail
+set max_memory_usage='1Mi';
+optimize table data_01641 final; -- { serverError 241 }
+
+drop table data_01641;

From 05608687d6e3f188bb26f6e576b414f8f64fee99 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Tue, 12 Jan 2021 00:50:37 +0300
Subject: [PATCH 047/611] Get back memory tracking blocker in
 calculateAndSerializePrimaryIndex()

But reduce scope, to avoid leaking too much memory, since there are old
values in last_block_index_columns.

The scope of the MemoryTracker::BlockerInThread has been increased in #8290
---
 .../MergeTreeDataPartWriterOnDisk.cpp         | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
index 9390180d51c..1339127e660 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
@@ -180,19 +180,30 @@ void MergeTreeDataPartWriterOnDisk::calculateAndSerializePrimaryIndex(const Bloc
             index_columns[i] = primary_index_block.getByPosition(i).column->cloneEmpty();
     }
 
-    /// Write index. The index contains Primary Key value for each `index_granularity` row.
-    for (const auto & granule : granules_to_write)
     {
-        if (metadata_snapshot->hasPrimaryKey() && granule.mark_on_start)
+        /** While filling index (index_columns), disable memory tracker.
+         * Because memory is allocated here (maybe in context of INSERT query),
+         *  but then freed in completely different place (while merging parts), where query memory_tracker is not available.
+         * And otherwise it will look like excessively growing memory consumption in context of query.
+         *  (observed in long INSERT SELECTs)
+         */
+        MemoryTracker::BlockerInThread temporarily_disable_memory_tracker;
+
+        /// Write index. The index contains Primary Key value for each `index_granularity` row.
+        for (const auto & granule : granules_to_write)
         {
-            for (size_t j = 0; j < primary_columns_num; ++j)
+            if (metadata_snapshot->hasPrimaryKey() && granule.mark_on_start)
             {
-                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);
+                for (size_t j = 0; j < primary_columns_num; ++j)
+                {
+                    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);
+                }
             }
         }
     }
+
     /// store last index row to write final mark at the end of column
     for (size_t j = 0; j < primary_columns_num; ++j)
         last_block_index_columns[j] = primary_index_block.getByPosition(j).column;

From e6c2d0219de4a4020eb0ff50a01adcf6f119603e Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Tue, 12 Jan 2021 21:34:35 +0300
Subject: [PATCH 048/611] window clause tmp

---
 src/Parsers/ASTSelectQuery.h             |   2 +
 src/Parsers/ASTWindowDefinition.cpp      |  46 ++++++
 src/Parsers/ASTWindowDefinition.h        |  32 ++++
 src/Parsers/ExpressionElementParsers.cpp | 180 +++++++++++++++++------
 src/Parsers/ExpressionElementParsers.h   |  17 ++-
 src/Parsers/ParserSelectQuery.cpp        |  13 ++
 6 files changed, 248 insertions(+), 42 deletions(-)
 create mode 100644 src/Parsers/ASTWindowDefinition.cpp
 create mode 100644 src/Parsers/ASTWindowDefinition.h

diff --git a/src/Parsers/ASTSelectQuery.h b/src/Parsers/ASTSelectQuery.h
index 9690b51ff2f..e9aaa4ab83b 100644
--- a/src/Parsers/ASTSelectQuery.h
+++ b/src/Parsers/ASTSelectQuery.h
@@ -25,6 +25,7 @@ public:
         WHERE,
         GROUP_BY,
         HAVING,
+        WINDOW,
         ORDER_BY,
         LIMIT_BY_OFFSET,
         LIMIT_BY_LENGTH,
@@ -58,6 +59,7 @@ public:
     const ASTPtr where()          const { return getExpression(Expression::WHERE); }
     const ASTPtr groupBy()        const { return getExpression(Expression::GROUP_BY); }
     const ASTPtr having()         const { return getExpression(Expression::HAVING); }
+    const ASTPtr window() const { return getExpression(Expression::WINDOW); }
     const ASTPtr orderBy()        const { return getExpression(Expression::ORDER_BY); }
     const ASTPtr limitByOffset()  const { return getExpression(Expression::LIMIT_BY_OFFSET); }
     const ASTPtr limitByLength()  const { return getExpression(Expression::LIMIT_BY_LENGTH); }
diff --git a/src/Parsers/ASTWindowDefinition.cpp b/src/Parsers/ASTWindowDefinition.cpp
new file mode 100644
index 00000000000..d8b8016ef70
--- /dev/null
+++ b/src/Parsers/ASTWindowDefinition.cpp
@@ -0,0 +1,46 @@
+#include <Parsers/ASTWindowDefinition.h>
+
+namespace DB
+{
+
+ASTPtr ASTWindowDefinition::clone() const
+{
+    auto result = std::make_shared<ASTWindowDefinition>();
+
+    if (partition_by)
+    {
+        result->partition_by = partition_by->clone();
+        result->children.push_back(result->partition_by);
+    }
+
+    if (order_by)
+    {
+        result->order_by = order_by->clone();
+        result->children.push_back(result->order_by);
+    }
+
+    return result;
+}
+
+String ASTWindowDefinition::getID(char) const
+{
+    return "WindowDefinition";
+}
+
+ASTPtr ASTWindowListElement::clone() const
+{
+    auto result = std::make_shared<ASTWindowListElement>();
+
+    result->name = name;
+    result->definition = definition->clone();
+    result->children.push_back(result->definition);
+
+    return result;
+}
+
+String ASTWindowListElement::getID(char) const
+{
+    return "WindowListElement";
+}
+
+}
diff --git a/src/Parsers/ASTWindowDefinition.h b/src/Parsers/ASTWindowDefinition.h
new file mode 100644
index 00000000000..504d2a05b96
--- /dev/null
+++ b/src/Parsers/ASTWindowDefinition.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <Parsers/IAST.h>
+
+
+namespace DB
+{
+
+struct ASTWindowDefinition : public IAST
+{
+    ASTPtr partition_by;
+
+    ASTPtr order_by;
+
+    ASTPtr clone() const override;
+
+    String getID(char delimiter) const override;
+};
+
+struct ASTWindowListElement : public IAST
+{
+    String name;
+
+    // ASTWindowDefinition
+    ASTPtr definition;
+
+    ASTPtr clone() const override;
+
+    String getID(char delimiter) const override;
+};
+
+}
diff --git a/src/Parsers/ExpressionElementParsers.cpp b/src/Parsers/ExpressionElementParsers.cpp
index 649be7e8fa7..84140fb1cd0 100644
--- a/src/Parsers/ExpressionElementParsers.cpp
+++ b/src/Parsers/ExpressionElementParsers.cpp
@@ -8,21 +8,22 @@
 #include <Common/typeid_cast.h>
 #include <Parsers/DumpASTNode.h>
 
-#include <Parsers/IAST.h>
+#include <Parsers/ASTAsterisk.h>
+#include <Parsers/ASTColumnsTransformers.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTFunctionWithKeyValueArguments.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTAsterisk.h>
+#include <Parsers/ASTOrderByElement.h>
 #include <Parsers/ASTQualifiedAsterisk.h>
 #include <Parsers/ASTQueryParameter.h>
-#include <Parsers/ASTTTLElement.h>
-#include <Parsers/ASTOrderByElement.h>
-#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTSubquery.h>
-#include <Parsers/ASTFunctionWithKeyValueArguments.h>
-#include <Parsers/ASTColumnsTransformers.h>
+#include <Parsers/ASTTTLElement.h>
+#include <Parsers/ASTWindowDefinition.h>
+#include <Parsers/IAST.h>
 
 #include <Parsers/parseIdentifierOrStringLiteral.h>
 #include <Parsers/parseIntervalKind.h>
@@ -413,8 +414,8 @@ bool ParserFunction::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
         // of a different type, hence this workaround with a temporary pointer.
         ASTPtr function_node_as_iast = function_node;
 
-        ParserWindowDefinition window_definition;
-        if (!window_definition.parse(pos, function_node_as_iast, expected))
+        ParserWindowReference window_reference;
+        if (!window_reference.parse(pos, function_node_as_iast, expected))
         {
             return false;
         }
@@ -424,7 +425,7 @@ bool ParserFunction::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     return true;
 }
 
-bool ParserWindowDefinition::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
+bool ParserWindowReference::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     ASTFunction * function = dynamic_cast<ASTFunction *>(node.get());
 
@@ -496,6 +497,102 @@ bool ParserWindowDefinition::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
     return true;
 }
 
+bool ParserWindowDefinition::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
+{
+    auto result = std::make_shared<ASTWindowDefinition>();
+
+    ParserToken parser_openging_bracket(TokenType::OpeningRoundBracket);
+    if (!parser_openging_bracket.ignore(pos, expected))
+    {
+        return false;
+    }
+
+    ParserKeyword keyword_partition_by("PARTITION BY");
+    ParserNotEmptyExpressionList columns_partition_by(
+        false /* we don't allow declaring aliases here*/);
+    ParserKeyword keyword_order_by("ORDER BY");
+    ParserOrderByExpressionList columns_order_by;
+
+    if (keyword_partition_by.ignore(pos, expected))
+    {
+        ASTPtr partition_by_ast;
+        if (columns_partition_by.parse(pos, partition_by_ast, expected))
+        {
+            result->children.push_back(partition_by_ast);
+            result->partition_by = partition_by_ast;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    if (keyword_order_by.ignore(pos, expected))
+    {
+        ASTPtr order_by_ast;
+        if (columns_order_by.parse(pos, order_by_ast, expected))
+        {
+            result->children.push_back(order_by_ast);
+            result->order_by = order_by_ast;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    ParserToken parser_closing_bracket(TokenType::ClosingRoundBracket);
+    if (!parser_closing_bracket.ignore(pos, expected))
+    {
+        return false;
+    }
+
+    node = result;
+    return true;
+}
+
+bool ParserWindowList::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
+{
+    auto result = std::make_shared<ASTExpressionList>();
+
+    for (;;)
+    {
+        auto elem = std::make_shared<ASTWindowListElement>();
+
+        ParserIdentifier parser_window_name;
+        ASTPtr window_name_identifier;
+        if (!parser_window_name.parse(pos, window_name_identifier, expected))
+        {
+            return false;
+        }
+        elem->name = getIdentifierName(window_name_identifier);
+
+        ParserKeyword keyword_as("AS");
+        if (!keyword_as.ignore(pos, expected))
+        {
+            return false;
+        }
+
+        ParserWindowDefinition parser_window_definition;
+        if (!parser_window_definition.parse(pos, elem->definition, expected))
+        {
+            return false;
+        }
+
+        result->children.push_back(elem);
+
+        // If the list countinues, there should be a comma.
+        ParserToken parser_comma(TokenType::Comma);
+        if (!parser_comma.ignore(pos))
+        {
+            break;
+        }
+    }
+
+    node = result;
+    return true;
+}
+
 bool ParserCodecDeclarationList::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     return ParserList(std::make_unique<ParserIdentifierWithOptionalParameters>(),
@@ -1267,41 +1364,42 @@ bool ParserLiteral::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
 const char * ParserAlias::restricted_keywords[] =
 {
-    "FROM",
-    "FINAL",
-    "SAMPLE",
-    "ARRAY",
-    "LEFT",
-    "RIGHT",
-    "INNER",
-    "FULL",
-    "CROSS",
-    "JOIN",
-    "GLOBAL",
-    "ANY",
     "ALL",
-    "ASOF",
-    "SEMI",
     "ANTI",
-    "ONLY", /// YQL synonym for ANTI. Note: YQL is the name of one of Yandex proprietary languages, completely unrelated to ClickHouse.
-    "ON",
-    "USING",
-    "PREWHERE",
-    "WHERE",
-    "GROUP",
-    "WITH",
-    "HAVING",
-    "ORDER",
-    "LIMIT",
-    "OFFSET",
-    "SETTINGS",
-    "FORMAT",
-    "UNION",
-    "INTO",
-    "NOT",
+    "ANY",
+    "ARRAY",
+    "ASOF",
     "BETWEEN",
-    "LIKE",
+    "CROSS",
+    "FINAL",
+    "FORMAT",
+    "FROM",
+    "FULL",
+    "GLOBAL",
+    "GROUP",
+    "HAVING",
     "ILIKE",
+    "INNER",
+    "INTO",
+    "JOIN",
+    "LEFT",
+    "LIKE",
+    "LIMIT",
+    "NOT",
+    "OFFSET",
+    "ON",
+    "ONLY", /// YQL synonym for ANTI. Note: YQL is the name of one of Yandex proprietary languages, completely unrelated to ClickHouse.
+    "ORDER",
+    "PREWHERE",
+    "RIGHT",
+    "SAMPLE",
+    "SEMI",
+    "SETTINGS",
+    "UNION",
+    "USING",
+    "WHERE",
+    "WINDOW",
+    "WITH",
     nullptr
 };
 
diff --git a/src/Parsers/ExpressionElementParsers.h b/src/Parsers/ExpressionElementParsers.h
index 917f084a700..6369e14aa58 100644
--- a/src/Parsers/ExpressionElementParsers.h
+++ b/src/Parsers/ExpressionElementParsers.h
@@ -156,13 +156,28 @@ protected:
     bool allow_function_parameters;
 };
 
-// Window definition (the thing that goes after OVER) for window function.
+// Window reference (the thing that goes after OVER) for window function.
+// Can be either window name or window definition.
+class ParserWindowReference : public IParserBase
+{
+    const char * getName() const override { return "window reference"; }
+    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
+};
+
 class ParserWindowDefinition : public IParserBase
 {
     const char * getName() const override { return "window definition"; }
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
 };
 
+// The WINDOW clause of a SELECT query that defines a list of named windows.
+// Returns an ASTExpressionList of ASTWindowListElement's.
+class ParserWindowList : public IParserBase
+{
+    const char * getName() const override { return "WINDOW clause"; }
+    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
+};
+
 class ParserCodecDeclarationList : public IParserBase
 {
 protected:
diff --git a/src/Parsers/ParserSelectQuery.cpp b/src/Parsers/ParserSelectQuery.cpp
index 91c48fc362d..f30851a5717 100644
--- a/src/Parsers/ParserSelectQuery.cpp
+++ b/src/Parsers/ParserSelectQuery.cpp
@@ -38,6 +38,7 @@ bool ParserSelectQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     ParserKeyword s_with("WITH");
     ParserKeyword s_totals("TOTALS");
     ParserKeyword s_having("HAVING");
+    ParserKeyword s_window("WINDOW");
     ParserKeyword s_order_by("ORDER BY");
     ParserKeyword s_limit("LIMIT");
     ParserKeyword s_settings("SETTINGS");
@@ -70,6 +71,7 @@ bool ParserSelectQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     ASTPtr where_expression;
     ASTPtr group_expression_list;
     ASTPtr having_expression;
+    ASTPtr window_list;
     ASTPtr order_expression_list;
     ASTPtr limit_by_length;
     ASTPtr limit_by_offset;
@@ -192,6 +194,16 @@ bool ParserSelectQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
             return false;
     }
 
+    /// WINDOW clause
+    if (s_window.ignore(pos, expected))
+    {
+        ParserWindowList window_list_parser;
+        if (!window_list_parser.parse(pos, window_list, expected))
+        {
+            return false;
+        }
+    }
+
     /// ORDER BY expr ASC|DESC COLLATE 'locale' list
     if (s_order_by.ignore(pos, expected))
     {
@@ -363,6 +375,7 @@ bool ParserSelectQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     select_query->setExpression(ASTSelectQuery::Expression::WHERE, std::move(where_expression));
     select_query->setExpression(ASTSelectQuery::Expression::GROUP_BY, std::move(group_expression_list));
     select_query->setExpression(ASTSelectQuery::Expression::HAVING, std::move(having_expression));
+    select_query->setExpression(ASTSelectQuery::Expression::WINDOW, std::move(window_list));
     select_query->setExpression(ASTSelectQuery::Expression::ORDER_BY, std::move(order_expression_list));
     select_query->setExpression(ASTSelectQuery::Expression::LIMIT_BY_OFFSET, std::move(limit_by_offset));
     select_query->setExpression(ASTSelectQuery::Expression::LIMIT_BY_LENGTH, std::move(limit_by_length));

From d3b7fa1a77ff58a4e503d9591e9d84d450e042de Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Wed, 13 Jan 2021 02:05:09 +0300
Subject: [PATCH 049/611] Docs in En

---
 docs/en/operations/settings/index.md             |  1 +
 docs/en/sql-reference/statements/select/index.md | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/docs/en/operations/settings/index.md b/docs/en/operations/settings/index.md
index cd483694521..87c8a9bf1b9 100644
--- a/docs/en/operations/settings/index.md
+++ b/docs/en/operations/settings/index.md
@@ -25,6 +25,7 @@ Ways to configure settings, in order of priority:
 
     -   When starting the ClickHouse console client in non-interactive mode, set the startup parameter `--setting=value`.
     -   When using the HTTP API, pass CGI parameters (`URL?setting_1=value&setting_2=value...`).
+    -   Make settings right in the query, in the `SETTINGS` clause. The setting value is applied only to that query and is reset to default or previous value after the query is executed.
 
 Settings that can only be made in the server config file are not covered in this section.
 
diff --git a/docs/en/sql-reference/statements/select/index.md b/docs/en/sql-reference/statements/select/index.md
index ed69198ed4d..73ae1392350 100644
--- a/docs/en/sql-reference/statements/select/index.md
+++ b/docs/en/sql-reference/statements/select/index.md
@@ -25,6 +25,7 @@ SELECT [DISTINCT] expr_list
 [ORDER BY expr_list] [WITH FILL] [FROM expr] [TO expr] [STEP expr]
 [LIMIT [offset_value, ]n BY columns]
 [LIMIT [n, ]m] [WITH TIES]
+[SETTINGS ...]
 [UNION  ...]
 [INTO OUTFILE filename]
 [FORMAT format]
@@ -265,5 +266,15 @@ SELECT * REPLACE(i + 1 AS i) EXCEPT (j) APPLY(sum) from columns_transformers;
 └─────────────────┴────────┘
 ```
 
+## SETTINGS in SELECT Query {#settings-in-select}
+
+There are multiple ways to make settings, see [here](../../../operations/settings/index.md). One of them is to specify necessary settings right in the SELECT query. The setting value is applied only to this query and is reset to default or previous value after the query is executed.
+
+**Example**
+
+``` sql
+SELECT * FROM some_table SETTINGS optimize_read_in_order=1 SETTINGS cast_keep_nullable=1;
+```
+
 [Original article](https://clickhouse.tech/docs/en/sql-reference/statements/select/)
 <!--hide-->

From 360721763cac79494ecca99ec8f20cfdda320702 Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Wed, 13 Jan 2021 02:25:21 +0300
Subject: [PATCH 050/611] Docs in En

---
 docs/en/operations/settings/settings.md           | 15 +++++++++++++++
 .../sql-reference/statements/select/group-by.md   |  4 ++++
 2 files changed, 19 insertions(+)

diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index d3a4d50d21c..1dd947b1b19 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -2134,6 +2134,21 @@ Default value: `1`.
 
 -   [ORDER BY Clause](../../sql-reference/statements/select/order-by.md#optimize_read_in_order)
 
+## optimize_aggregation_in_order {#optimize_aggregation_in_order}
+
+Enables [GROUP BY](../../sql-reference/statements/select/group-by.md) optimization in [SELECT](../../sql-reference/statements/select/index.md) queries for aggregating data in corresponding order in [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) tables.
+
+Possible values:
+
+-   0 — `GROUP BY` optimization is disabled.
+-   1 — `GROUP BY` optimization is enabled.
+
+Default value: `0`.
+
+**See Also**
+
+-   [GROUP BY optimization](../../sql-reference/statements/select/group-by.md#aggregation-in-order)
+
 ## mutations_sync {#mutations_sync}
 
 Allows to execute `ALTER TABLE ... UPDATE|DELETE` queries ([mutations](../../sql-reference/statements/alter/index.md#mutations)) synchronously.
diff --git a/docs/en/sql-reference/statements/select/group-by.md b/docs/en/sql-reference/statements/select/group-by.md
index 500a09dcbef..6ebcfc1edf1 100644
--- a/docs/en/sql-reference/statements/select/group-by.md
+++ b/docs/en/sql-reference/statements/select/group-by.md
@@ -255,6 +255,10 @@ For every different key value encountered, `GROUP BY` calculates a set of aggreg
 
 Aggregation is one of the most important features of a column-oriented DBMS, and thus it’s implementation is one of the most heavily optimized parts of ClickHouse. By default, aggregation is done in memory using a hash-table. It has 40+ specializations that are chosen automatically depending on “grouping key” data types.
 
+### GROUP BY Optimization Depending on Table Sorting Key {#aggregation-in-order}
+
+If a table is sorted by some key, and `GROUP BY` expression contains at least prefix of sorting key or injective functions, the in-between result of aggreagtion can be finalized and sent to client when a new key is read from table. This behaviour is switched on with the [optimize_aggregation_in_order](../../../operations/settings/settings.md#optimize_aggregation_in_order) setting.
+
 ### GROUP BY in External Memory {#select-group-by-in-external-memory}
 
 You can enable dumping temporary data to the disk to restrict memory usage during `GROUP BY`.

From 703731c547613f96bf09958431127ec53366febf Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Wed, 13 Jan 2021 22:29:52 +0300
Subject: [PATCH 051/611] something works

---
 programs/client/QueryFuzzer.cpp               |   8 +-
 src/IO/Operators.h                            |   1 +
 src/Interpreters/ActionsVisitor.cpp           |   8 +-
 src/Interpreters/ExpressionAnalyzer.cpp       | 194 ++++++++++++------
 src/Interpreters/ExpressionAnalyzer.h         |   7 +-
 src/Interpreters/QueryNormalizer.cpp          |   9 +-
 src/Interpreters/TreeRewriter.cpp             |  17 +-
 src/Parsers/ASTFunction.cpp                   |  81 +++-----
 src/Parsers/ASTFunction.h                     |  13 +-
 src/Parsers/ASTSelectQuery.cpp                |   8 +
 src/Parsers/ASTWindowDefinition.cpp           |  43 ++++
 src/Parsers/ASTWindowDefinition.h             |   8 +
 src/Parsers/ExpressionElementParsers.cpp      |  48 +----
 src/Parsers/parseQuery.cpp                    |   4 +
 .../01591_window_functions.reference          |  60 +++++-
 .../0_stateless/01591_window_functions.sql    |  22 ++
 16 files changed, 316 insertions(+), 215 deletions(-)

diff --git a/programs/client/QueryFuzzer.cpp b/programs/client/QueryFuzzer.cpp
index fe0b6a975ce..3892e8e5732 100644
--- a/programs/client/QueryFuzzer.cpp
+++ b/programs/client/QueryFuzzer.cpp
@@ -22,6 +22,7 @@
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/ASTUseQuery.h>
+#include <Parsers/ASTWindowDefinition.h>
 #include <Parsers/ParserQuery.h>
 #include <Parsers/formatAST.h>
 #include <Parsers/parseQuery.h>
@@ -403,10 +404,11 @@ void QueryFuzzer::fuzz(ASTPtr & ast)
         fuzzColumnLikeExpressionList(fn->arguments.get());
         fuzzColumnLikeExpressionList(fn->parameters.get());
 
-        if (fn->is_window_function)
+        if (fn->is_window_function && fn->window_definition)
         {
-            fuzzColumnLikeExpressionList(fn->window_partition_by.get());
-            fuzzOrderByList(fn->window_order_by.get());
+            auto & def = fn->window_definition->as<ASTWindowDefinition &>();
+            fuzzColumnLikeExpressionList(def.partition_by.get());
+            fuzzOrderByList(def.order_by.get());
         }
 
         fuzz(fn->children);
diff --git a/src/IO/Operators.h b/src/IO/Operators.h
index d1500aedd22..fadadfc66a8 100644
--- a/src/IO/Operators.h
+++ b/src/IO/Operators.h
@@ -46,6 +46,7 @@ template <typename T>     WriteBuffer & operator<< (WriteBuffer & buf, const T &
 /// If you do not use the manipulators, the string is displayed without an escape, as is.
 template <> inline        WriteBuffer & operator<< (WriteBuffer & buf, const String & x)   { writeString(x, buf);   return buf; }
 template <> inline        WriteBuffer & operator<< (WriteBuffer & buf, const std::string_view & x)   { writeString(StringRef(x), buf);   return buf; }
+template <> inline WriteBuffer & operator<< (WriteBuffer & buf, const StringRef & x) { writeString(x, buf); return buf; }
 template <> inline        WriteBuffer & operator<< (WriteBuffer & buf, const char & x)     { writeChar(x, buf);     return buf; }
 template <> inline        WriteBuffer & operator<< (WriteBuffer & buf, const pcg32_fast & x) { PcgSerializer::serializePcg32(x, buf); return buf; }
 
diff --git a/src/Interpreters/ActionsVisitor.cpp b/src/Interpreters/ActionsVisitor.cpp
index 00600bebf07..ca78c370834 100644
--- a/src/Interpreters/ActionsVisitor.cpp
+++ b/src/Interpreters/ActionsVisitor.cpp
@@ -738,13 +738,9 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
     if (node.is_window_function)
     {
         // Also add columns from PARTITION BY and ORDER BY of window functions.
-        if (node.window_partition_by)
+        if (node.window_definition)
         {
-            visit(node.window_partition_by, data);
-        }
-        if (node.window_order_by)
-        {
-            visit(node.window_order_by, data);
+            visit(node.window_definition, data);
         }
 
         // Also manually add columns for arguments of the window function itself.
diff --git a/src/Interpreters/ExpressionAnalyzer.cpp b/src/Interpreters/ExpressionAnalyzer.cpp
index a80b7799a98..b6b8d95e332 100644
--- a/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/src/Interpreters/ExpressionAnalyzer.cpp
@@ -1,12 +1,13 @@
 #include <Core/Block.h>
 
+#include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTOrderByElement.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSubquery.h>
-#include <Parsers/ASTOrderByElement.h>
+#include <Parsers/ASTWindowDefinition.h>
 #include <Parsers/DumpASTNode.h>
 
 #include <DataTypes/DataTypeNullable.h>
@@ -289,7 +290,7 @@ void ExpressionAnalyzer::analyzeAggregation()
         aggregated_columns = temp_actions->getNamesAndTypesList();
     }
 
-    has_window = makeWindowDescriptions(temp_actions);
+    fmt::print(stderr, "aggregated columns: {}\n", aggregated_columns.toString());
 }
 
 
@@ -471,8 +472,52 @@ bool ExpressionAnalyzer::makeAggregateDescriptions(ActionsDAGPtr & actions)
     return !aggregates().empty();
 }
 
+void makeWindowDescription(WindowDescription & desc, const IAST * ast)
+{
+    const auto & definition = ast->as<const ASTWindowDefinition &>();
 
-bool ExpressionAnalyzer::makeWindowDescriptions(ActionsDAGPtr & actions)
+    if (definition.partition_by)
+    {
+        for (const auto & column_ast : definition.partition_by->children)
+        {
+            const auto * with_alias = dynamic_cast<const ASTWithAlias *>(
+                column_ast.get());
+            if (!with_alias)
+            {
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "Expected a column in PARTITION BY in window definition,"
+                    " got '{}'",
+                    column_ast->formatForErrorMessage());
+            }
+            desc.partition_by.push_back(SortColumnDescription(
+                    with_alias->getColumnName(), 1 /* direction */,
+                    1 /* nulls_direction */));
+        }
+    }
+
+    if (definition.order_by)
+    {
+        for (const auto & column_ast
+            : definition.order_by->children)
+        {
+            // Parser should have checked that we have a proper element here.
+            const auto & order_by_element
+                = column_ast->as<ASTOrderByElement &>();
+            // Ignore collation for now.
+            desc.order_by.push_back(
+                SortColumnDescription(
+                    order_by_element.children.front()->getColumnName(),
+                    order_by_element.direction,
+                    order_by_element.nulls_direction));
+        }
+    }
+
+    desc.full_sort_description = desc.partition_by;
+    desc.full_sort_description.insert(desc.full_sort_description.end(),
+        desc.order_by.begin(), desc.order_by.end());
+}
+
+void ExpressionAnalyzer::makeWindowDescriptions(ActionsDAGPtr actions)
 {
     // Convenient to check here because at least we have the Context.
     if (!syntax->window_function_asts.empty() &&
@@ -483,57 +528,34 @@ bool ExpressionAnalyzer::makeWindowDescriptions(ActionsDAGPtr & actions)
             syntax->window_function_asts[0]->formatForErrorMessage());
     }
 
+    // Window definitions from the WINDOW clause
+    const auto * select_query = query->as<ASTSelectQuery>();
+    if (select_query && select_query->window())
+    {
+        for (const auto & ptr : select_query->window()->children)
+        {
+            const auto & elem = ptr->as<const ASTWindowListElement &>();
+            WindowDescription desc;
+            desc.window_name = elem.name;
+            makeWindowDescription(desc, elem.definition.get());
+
+            auto [it, inserted] = window_descriptions.insert(
+                {desc.window_name, desc});
+
+            if (!inserted)
+            {
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "Window '{}' is defined twice in the WINDOW clause",
+                    desc.window_name);
+            }
+        }
+    }
+
+    // Window functions
     for (const ASTFunction * function_node : syntax->window_function_asts)
     {
         assert(function_node->is_window_function);
 
-        WindowDescription window_description;
-        window_description.window_name = function_node->getWindowDescription();
-
-        if (function_node->window_partition_by)
-        {
-            for (const auto & column_ast
-                : function_node->window_partition_by->children)
-            {
-                const auto * with_alias = dynamic_cast<const ASTWithAlias *>(
-                    column_ast.get());
-                if (!with_alias)
-                {
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                        "Expected a column in PARTITION BY for window '{}',"
-                        " got '{}'", window_description.window_name,
-                        column_ast->formatForErrorMessage());
-                }
-                window_description.partition_by.push_back(
-                    SortColumnDescription(
-                        with_alias->getColumnName(), 1 /* direction */,
-                        1 /* nulls_direction */));
-            }
-        }
-
-        if (function_node->window_order_by)
-        {
-            for (const auto & column_ast
-                : function_node->window_order_by->children)
-            {
-                // Parser should have checked that we have a proper element here.
-                const auto & order_by_element
-                    = column_ast->as<ASTOrderByElement &>();
-                // Ignore collation for now.
-                window_description.order_by.push_back(
-                    SortColumnDescription(
-                        order_by_element.children.front()->getColumnName(),
-                        order_by_element.direction,
-                        order_by_element.nulls_direction));
-            }
-        }
-
-        window_description.full_sort_description = window_description.partition_by;
-        window_description.full_sort_description.insert(
-            window_description.full_sort_description.end(),
-            window_description.order_by.begin(),
-            window_description.order_by.end());
-
         WindowFunctionDescription window_function;
         window_function.function_node = function_node;
         window_function.column_name
@@ -578,19 +600,43 @@ bool ExpressionAnalyzer::makeWindowDescriptions(ActionsDAGPtr & actions)
                 window_function.argument_types,
                 window_function.function_parameters, properties);
 
-        auto [it, inserted] = window_descriptions.insert(
-            {window_description.window_name, window_description});
 
-        if (!inserted)
+        // Find the window corresponding to this function. It may be either
+        // referenced by name and previously defined in WINDOW clause, or it
+        // may be defined inline.
+        if (!function_node->window_name.empty())
         {
-            assert(it->second.full_sort_description
-                == window_description.full_sort_description);
+            auto it = window_descriptions.find(function_node->window_name);
+            if (it == std::end(window_descriptions))
+            {
+                throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER,
+                    "Window '{}' is not defined (referenced by '{}')",
+                    function_node->window_name,
+                    function_node->formatForErrorMessage());
+            }
+
+            it->second.window_functions.push_back(window_function);
         }
+        else
+        {
+            const auto & definition = function_node->window_definition->as<
+                const ASTWindowDefinition &>();
+            WindowDescription desc;
+            desc.window_name = definition.getDefaultWindowName();
+            makeWindowDescription(desc, &definition);
 
-        it->second.window_functions.push_back(window_function);
+            auto [it, inserted] = window_descriptions.insert(
+                {desc.window_name, desc});
+
+            if (!inserted)
+            {
+                assert(it->second.full_sort_description
+                    == desc.full_sort_description);
+            }
+
+            it->second.window_functions.push_back(window_function);
+        }
     }
-
-    return !syntax->window_function_asts.empty();
 }
 
 
@@ -969,28 +1015,42 @@ void SelectQueryExpressionAnalyzer::appendWindowFunctionsArguments(
 {
     ExpressionActionsChain::Step & step = chain.lastStep(aggregated_columns);
 
-    // 1) Add actions for window functions and their arguments;
-    // 2) Mark the columns that are really required. We have to mark them as
-    //    required because we finish the expression chain before processing the
-    //    window functions.
+    // (1) Add actions for window functions and the columns they require.
+    // (2) Mark the columns that are really required. We have to mark them as
+    //     required because we finish the expression chain before processing the
+    //     window functions.
+    // The required columns are:
+    //  (a) window function arguments,
+    //  (b) the columns from PARTITION BY and ORDER BY.
+
+    // (1a) Actions for PARTITION BY and ORDER BY for windows defined in the
+    // WINDOW clause. The inline window definitions will be processed
+    // recursively together with (1b) as ASTFunction::window_definition.
+    if (getSelectQuery()->window())
+    {
+        getRootActionsNoMakeSet(getSelectQuery()->window(),
+            true /* no_subqueries */, step.actions());
+    }
+
     for (const auto & [_, w] : window_descriptions)
     {
         for (const auto & f : w.window_functions)
         {
-            // 1.1) arguments of window functions;
+            // (1b) Actions for function arguments, and also the inline window
+            // definitions (1a).
             // Requiring a constant reference to a shared pointer to non-const AST
             // doesn't really look sane, but the visitor does indeed require it.
             getRootActionsNoMakeSet(f.function_node->clone(),
                 true /* no_subqueries */, step.actions());
 
-            // 2.1) function arguments;
+            // (2b) Required function argument columns.
             for (const auto & a : f.function_node->arguments->children)
             {
                 step.required_output.push_back(a->getColumnName());
             }
         }
 
-        // 2.1) PARTITION BY and ORDER BY columns.
+        // (2a) Required PARTITION BY and ORDER BY columns.
         for (const auto & c : w.full_sort_description)
         {
             step.required_output.push_back(c.column_name);
@@ -1409,6 +1469,8 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
         // the main SELECT, similar to what we do for aggregate functions.
         if (has_window)
         {
+            query_analyzer.makeWindowDescriptions(chain.getLastActions());
+
             query_analyzer.appendWindowFunctionsArguments(chain, only_types || !first_stage);
 
             // Build a list of output columns of the window step.
diff --git a/src/Interpreters/ExpressionAnalyzer.h b/src/Interpreters/ExpressionAnalyzer.h
index ea43efa6036..71301ad64a2 100644
--- a/src/Interpreters/ExpressionAnalyzer.h
+++ b/src/Interpreters/ExpressionAnalyzer.h
@@ -62,7 +62,6 @@ struct ExpressionAnalyzerData
     NamesAndTypesList aggregation_keys;
     AggregateDescriptions aggregate_descriptions;
 
-    bool has_window = false;
     WindowDescriptions window_descriptions;
     NamesAndTypesList window_columns;
 
@@ -125,6 +124,8 @@ public:
     /// A list of windows for window functions.
     const WindowDescriptions & windowDescriptions() const { return window_descriptions; }
 
+    void makeWindowDescriptions(ActionsDAGPtr actions);
+
 protected:
     ExpressionAnalyzer(
         const ASTPtr & query_,
@@ -168,8 +169,6 @@ protected:
     void analyzeAggregation();
     bool makeAggregateDescriptions(ActionsDAGPtr & actions);
 
-    bool makeWindowDescriptions(ActionsDAGPtr & actions);
-
     const ASTSelectQuery * getSelectQuery() const;
 
     bool isRemoteStorage() const { return syntax->is_remote_storage; }
@@ -272,7 +271,7 @@ public:
 
     /// Does the expression have aggregate functions or a GROUP BY or HAVING section.
     bool hasAggregation() const { return has_aggregation; }
-    bool hasWindow() const { return has_window; }
+    bool hasWindow() const { return !syntax->window_function_asts.empty(); }
     bool hasGlobalSubqueries() { return has_global_subqueries; }
     bool hasTableJoin() const { return syntax->ast_join; }
 
diff --git a/src/Interpreters/QueryNormalizer.cpp b/src/Interpreters/QueryNormalizer.cpp
index 38b54de2130..33d2e8d1ba1 100644
--- a/src/Interpreters/QueryNormalizer.cpp
+++ b/src/Interpreters/QueryNormalizer.cpp
@@ -177,14 +177,9 @@ void QueryNormalizer::visitChildren(IAST * node, Data & data)
             }
         }
 
-        if (func_node->window_partition_by)
+        if (func_node->window_definition)
         {
-            visitChildren(func_node->window_partition_by.get(), data);
-        }
-
-        if (func_node->window_order_by)
-        {
-            visitChildren(func_node->window_order_by.get(), data);
+            visitChildren(func_node->window_definition.get(), data);
         }
     }
     else if (!node->as<ASTSelectQuery>())
diff --git a/src/Interpreters/TreeRewriter.cpp b/src/Interpreters/TreeRewriter.cpp
index 2b801500958..930f7b3facc 100644
--- a/src/Interpreters/TreeRewriter.cpp
+++ b/src/Interpreters/TreeRewriter.cpp
@@ -464,6 +464,8 @@ std::vector<const ASTFunction *> getWindowFunctions(ASTPtr & query, const ASTSel
         assertNoWindows(select_query.where(), "in WHERE");
     if (select_query.prewhere())
         assertNoWindows(select_query.prewhere(), "in PREWHERE");
+    if (select_query.window())
+        assertNoWindows(select_query.window(), "in WINDOW");
 
     GetAggregatesVisitor::Data data;
     GetAggregatesVisitor(data).visit(query);
@@ -481,20 +483,9 @@ std::vector<const ASTFunction *> getWindowFunctions(ASTPtr & query, const ASTSel
             }
         }
 
-        if (node->window_partition_by)
+        if (node->window_definition)
         {
-            for (auto & arg : node->window_partition_by->children)
-            {
-                assertNoWindows(arg, "inside PARTITION BY of a window");
-            }
-        }
-
-        if (node->window_order_by)
-        {
-            for (auto & arg : node->window_order_by->children)
-            {
-                assertNoWindows(arg, "inside ORDER BY of a window");
-            }
+            assertNoWindows(node->window_definition, "inside window definition");
         }
     }
 
diff --git a/src/Parsers/ASTFunction.cpp b/src/Parsers/ASTFunction.cpp
index d9159117b2d..806b8e6c5b9 100644
--- a/src/Parsers/ASTFunction.cpp
+++ b/src/Parsers/ASTFunction.cpp
@@ -1,5 +1,6 @@
 #include <Parsers/ASTFunction.h>
 
+#include <Common/quoteString.h>
 #include <Common/SipHash.h>
 #include <Common/typeid_cast.h>
 #include <IO/Operators.h>
@@ -42,12 +43,20 @@ void ASTFunction::appendColumnNameImpl(WriteBuffer & ostr) const
 
     if (is_window_function)
     {
-        writeCString(" OVER (", ostr);
-        FormatSettings settings{ostr, true /* one_line */};
-        FormatState state;
-        FormatStateStacked frame;
-        appendWindowDescription(settings, state, frame);
-        writeCString(")", ostr);
+        writeCString(" OVER ", ostr);
+        if (!window_name.empty())
+        {
+            ostr << window_name;
+        }
+        else
+        {
+            FormatSettings settings{ostr, true /* one_line */};
+            FormatState state;
+            FormatStateStacked frame;
+            writeCString("(", ostr);
+            window_definition->formatImpl(settings, state, frame);
+            writeCString(")", ostr);
+        }
     }
 }
 
@@ -65,22 +74,10 @@ ASTPtr ASTFunction::clone() const
     if (arguments) { res->arguments = arguments->clone(); res->children.push_back(res->arguments); }
     if (parameters) { res->parameters = parameters->clone(); res->children.push_back(res->parameters); }
 
-    if (window_name)
+    if (window_definition)
     {
-        res->window_name = window_name->clone();
-        res->children.push_back(res->window_name);
-    }
-
-    if (window_partition_by)
-    {
-        res->window_partition_by = window_partition_by->clone();
-        res->children.push_back(res->window_partition_by);
-    }
-
-    if (window_order_by)
-    {
-        res->window_order_by = window_order_by->clone();
-        res->children.push_back(res->window_order_by);
+        res->window_definition = window_definition->clone();
+        res->children.push_back(res->window_definition);
     }
 
     return res;
@@ -487,44 +484,16 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
         return;
     }
 
-    settings.ostr << " OVER (";
-    appendWindowDescription(settings, state, nested_dont_need_parens);
-    settings.ostr << ")";
-}
-
-std::string ASTFunction::getWindowDescription() const
-{
-    WriteBufferFromOwnString ostr;
-    FormatSettings settings{ostr, true /* one_line */};
-    FormatState state;
-    FormatStateStacked frame;
-    appendWindowDescription(settings, state, frame);
-    return ostr.str();
-}
-
-void ASTFunction::appendWindowDescription(const FormatSettings & settings,
-    FormatState & state, FormatStateStacked frame) const
-{
-    if (!is_window_function)
+    settings.ostr << " OVER ";
+    if (!window_name.empty())
     {
-        return;
+        settings.ostr << backQuoteIfNeed(window_name);
     }
-
-    if (window_partition_by)
+    else
     {
-        settings.ostr << "PARTITION BY ";
-        window_partition_by->formatImpl(settings, state, frame);
-    }
-
-    if (window_partition_by && window_order_by)
-    {
-        settings.ostr << " ";
-    }
-
-    if (window_order_by)
-    {
-        settings.ostr << "ORDER BY ";
-        window_order_by->formatImpl(settings, state, frame);
+        settings.ostr << "(";
+        window_definition->formatImpl(settings, state, frame);
+        settings.ostr << ")";
     }
 }
 
diff --git a/src/Parsers/ASTFunction.h b/src/Parsers/ASTFunction.h
index 4c20309fcb9..685aaaadd26 100644
--- a/src/Parsers/ASTFunction.h
+++ b/src/Parsers/ASTFunction.h
@@ -32,14 +32,8 @@ public:
     // pointers of proper type (see e.g. IAST::set), but this is not compatible
     // with the visitor interface.
 
-    // ASTIdentifier
-    ASTPtr window_name;
-
-    // ASTExpressionList
-    ASTPtr window_partition_by;
-
-    // ASTExpressionList of
-    ASTPtr window_order_by;
+    String window_name;
+    ASTPtr window_definition;
 
     /// do not print empty parentheses if there are no args - compatibility with new AST for data types and engine names.
     bool no_empty_args = false;
@@ -55,9 +49,6 @@ public:
 
     ASTPtr toLiteral() const;  // Try to convert functions like Array or Tuple to a literal form.
 
-    void appendWindowDescription(const FormatSettings & settings,
-        FormatState & state, FormatStateStacked frame) const;
-
     std::string getWindowDescription() const;
 
 protected:
diff --git a/src/Parsers/ASTSelectQuery.cpp b/src/Parsers/ASTSelectQuery.cpp
index 915d1f71925..42bea0107d1 100644
--- a/src/Parsers/ASTSelectQuery.cpp
+++ b/src/Parsers/ASTSelectQuery.cpp
@@ -44,6 +44,7 @@ ASTPtr ASTSelectQuery::clone() const
     CLONE(Expression::WHERE);
     CLONE(Expression::GROUP_BY);
     CLONE(Expression::HAVING);
+    CLONE(Expression::WINDOW);
     CLONE(Expression::ORDER_BY);
     CLONE(Expression::LIMIT_BY_OFFSET);
     CLONE(Expression::LIMIT_BY_LENGTH);
@@ -133,6 +134,13 @@ void ASTSelectQuery::formatImpl(const FormatSettings & s, FormatState & state, F
         having()->formatImpl(s, state, frame);
     }
 
+    if (window())
+    {
+        s.ostr << (s.hilite ? hilite_keyword : "") << s.nl_or_ws << indent_str <<
+            "WINDOW " << (s.hilite ? hilite_none : "");
+        window()->formatImpl(s, state, frame);
+    }
+
     if (orderBy())
     {
         s.ostr << (s.hilite ? hilite_keyword : "") << s.nl_or_ws << indent_str << "ORDER BY" << (s.hilite ? hilite_none : "");
diff --git a/src/Parsers/ASTWindowDefinition.cpp b/src/Parsers/ASTWindowDefinition.cpp
index d8b8016ef70..79a4b4bf1c6 100644
--- a/src/Parsers/ASTWindowDefinition.cpp
+++ b/src/Parsers/ASTWindowDefinition.cpp
@@ -1,5 +1,8 @@
 #include <Parsers/ASTWindowDefinition.h>
 
+#include <Common/quoteString.h>
+#include <IO/Operators.h>
+
 namespace DB
 {
 
@@ -27,6 +30,37 @@ String ASTWindowDefinition::getID(char) const
     return "WindowDefinition";
 }
 
+void ASTWindowDefinition::formatImpl(const FormatSettings & settings,
+    FormatState & state, FormatStateStacked frame) const
+{
+    if (partition_by)
+    {
+        settings.ostr << "PARTITION BY ";
+        partition_by->formatImpl(settings, state, frame);
+    }
+
+    if (partition_by && order_by)
+    {
+        settings.ostr << " ";
+    }
+
+    if (order_by)
+    {
+        settings.ostr << "ORDER BY ";
+        order_by->formatImpl(settings, state, frame);
+    }
+}
+
+std::string ASTWindowDefinition::getDefaultWindowName() const
+{
+    WriteBufferFromOwnString ostr;
+    FormatSettings settings{ostr, true /* one_line */};
+    FormatState state;
+    FormatStateStacked frame;
+    formatImpl(settings, state, frame);
+    return ostr.str();
+}
+
 ASTPtr ASTWindowListElement::clone() const
 {
     auto result = std::make_shared<ASTWindowListElement>();
@@ -43,4 +77,13 @@ String ASTWindowListElement::getID(char) const
     return "WindowListElement";
 }
 
+void ASTWindowListElement::formatImpl(const FormatSettings & settings,
+    FormatState & state, FormatStateStacked frame) const
+{
+    settings.ostr << backQuoteIfNeed(name);
+    settings.ostr << " AS (";
+    definition->formatImpl(settings, state, frame);
+    settings.ostr << ")";
+}
+
 }
diff --git a/src/Parsers/ASTWindowDefinition.h b/src/Parsers/ASTWindowDefinition.h
index 504d2a05b96..bf74cf809f9 100644
--- a/src/Parsers/ASTWindowDefinition.h
+++ b/src/Parsers/ASTWindowDefinition.h
@@ -12,9 +12,14 @@ struct ASTWindowDefinition : public IAST
 
     ASTPtr order_by;
 
+
     ASTPtr clone() const override;
 
     String getID(char delimiter) const override;
+
+    void formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override;
+
+    std::string getDefaultWindowName() const;
 };
 
 struct ASTWindowListElement : public IAST
@@ -24,9 +29,12 @@ struct ASTWindowListElement : public IAST
     // ASTWindowDefinition
     ASTPtr definition;
 
+
     ASTPtr clone() const override;
 
     String getID(char delimiter) const override;
+
+    void formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override;
 };
 
 }
diff --git a/src/Parsers/ExpressionElementParsers.cpp b/src/Parsers/ExpressionElementParsers.cpp
index 84140fb1cd0..baf5157d653 100644
--- a/src/Parsers/ExpressionElementParsers.cpp
+++ b/src/Parsers/ExpressionElementParsers.cpp
@@ -440,8 +440,7 @@ bool ParserWindowReference::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
         ParserIdentifier window_name_parser;
         if (window_name_parser.parse(pos, window_name_ast, expected))
         {
-            function->children.push_back(window_name_ast);
-            function->window_name = window_name_ast;
+            function->window_name = getIdentifierName(window_name_ast);
             return true;
         }
         else
@@ -449,52 +448,11 @@ bool ParserWindowReference::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
             return false;
         }
     }
-    ++pos;
 
     // Variant 2:
     // function_name ( * ) OVER ( window_definition )
-    ParserKeyword keyword_partition_by("PARTITION BY");
-    ParserNotEmptyExpressionList columns_partition_by(
-        false /* we don't allow declaring aliases here*/);
-    ParserKeyword keyword_order_by("ORDER BY");
-    ParserOrderByExpressionList columns_order_by;
-
-    if (keyword_partition_by.ignore(pos, expected))
-    {
-        ASTPtr partition_by_ast;
-        if (columns_partition_by.parse(pos, partition_by_ast, expected))
-        {
-            function->children.push_back(partition_by_ast);
-            function->window_partition_by = partition_by_ast;
-        }
-        else
-        {
-            return false;
-        }
-    }
-
-    if (keyword_order_by.ignore(pos, expected))
-    {
-        ASTPtr order_by_ast;
-        if (columns_order_by.parse(pos, order_by_ast, expected))
-        {
-            function->children.push_back(order_by_ast);
-            function->window_order_by = order_by_ast;
-        }
-        else
-        {
-            return false;
-        }
-    }
-
-    if (pos->type != TokenType::ClosingRoundBracket)
-    {
-        expected.add(pos, "')'");
-        return false;
-    }
-    ++pos;
-
-    return true;
+    ParserWindowDefinition parser_definition;
+    return parser_definition.parse(pos, function->window_definition, expected);
 }
 
 bool ParserWindowDefinition::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
diff --git a/src/Parsers/parseQuery.cpp b/src/Parsers/parseQuery.cpp
index 2dc1c4c8c71..912ec482875 100644
--- a/src/Parsers/parseQuery.cpp
+++ b/src/Parsers/parseQuery.cpp
@@ -189,6 +189,10 @@ std::string getLexicalErrorMessage(
     writeQueryAroundTheError(out, begin, end, hilite, &last_token, 1);
 
     out << getErrorTokenDescription(last_token.type);
+    if (last_token.size())
+    {
+       out << ": '" << StringRef{last_token.begin, last_token.size()} << "'";
+    }
 
     return out.str();
 }
diff --git a/tests/queries/0_stateless/01591_window_functions.reference b/tests/queries/0_stateless/01591_window_functions.reference
index ce56860ed8b..76fdff98328 100644
--- a/tests/queries/0_stateless/01591_window_functions.reference
+++ b/tests/queries/0_stateless/01591_window_functions.reference
@@ -123,16 +123,26 @@ select * from (select * from numbers(5) order by rand()) order by count() over (
 3
 4
 select * from (select * from numbers(5) order by rand()) group by number order by sum(any(number + 1)) over (order by min(number) desc) desc;
-
--- different windows
--- an explain test would also be helpful, but it's too immature now and I don't
--- want to change reference all the time
+-- some more simple cases w/aggregate functions
 
 0
 1
 2
 3
 4
+select sum(any(number)) over () from numbers(1);
+
+0
+select sum(any(number) + 1) over () from numbers(1);
+
+1
+select sum(any(number + 1)) over () from numbers(1);
+
+-- different windows
+-- an explain test would also be helpful, but it's too immature now and I don't
+-- want to change reference all the time
+
+1
 select number, max(number) over (partition by intDiv(number, 3) order by number desc), count(number) over (partition by intDiv(number, 5) order by number) as m from numbers(31) order by number settings max_block_size = 2;
 
 -- two functions over the same window
@@ -210,6 +220,8 @@ select distinct any(number) over () from numbers(2);
 0
 with number + 1 as x select intDiv(number, 3) as y, sum(x + y) over (partition by y order by x) from numbers(7);
 
+-- WINDOW clause
+
 0	1
 0	3
 0	6
@@ -217,3 +229,43 @@ with number + 1 as x select intDiv(number, 3) as y, sum(x + y) over (partition b
 1	11
 1	18
 2	9
+select 1 window w1 as ();
+
+
+1
+select sum(number) over w1, sum(number) over w2
+from numbers(10)
+window
+    w1 as (),
+    w2 as (partition by intDiv(number, 3))
+;
+
+
+0	0
+1	1
+3	3
+6	3
+10	7
+15	12
+21	6
+28	13
+36	21
+45	9
+select
+    sum(number) over w1,
+    sum(number) over (partition by intDiv(number, 3))
+from numbers(10)
+window
+    w1 as (partition by intDiv(number, 3))
+;
+
+0	0
+1	1
+3	3
+3	3
+7	7
+12	12
+6	6
+13	13
+21	21
+9	9
diff --git a/tests/queries/0_stateless/01591_window_functions.sql b/tests/queries/0_stateless/01591_window_functions.sql
index 082a6652a65..95afb9be408 100644
--- a/tests/queries/0_stateless/01591_window_functions.sql
+++ b/tests/queries/0_stateless/01591_window_functions.sql
@@ -42,6 +42,10 @@ select * from (select * from numbers(5) order by rand()) order by count() over (
 -- the same as the above one, only we replace `number` with
 -- `any(number) group by number` and so on.
 select * from (select * from numbers(5) order by rand()) group by number order by sum(any(number + 1)) over (order by min(number) desc) desc;
+-- some more simple cases w/aggregate functions
+select sum(any(number)) over () from numbers(1);
+select sum(any(number) + 1) over () from numbers(1);
+select sum(any(number + 1)) over () from numbers(1);
 
 -- different windows
 -- an explain test would also be helpful, but it's too immature now and I don't
@@ -70,3 +74,21 @@ select distinct any(number) over () from numbers(2);
 -- Various kinds of aliases are properly substituted into various parts of window
 -- function definition.
 with number + 1 as x select intDiv(number, 3) as y, sum(x + y) over (partition by y order by x) from numbers(7);
+
+-- WINDOW clause
+select 1 window w1 as ();
+
+select sum(number) over w1, sum(number) over w2
+from numbers(10)
+window
+    w1 as (),
+    w2 as (partition by intDiv(number, 3))
+;
+
+select
+    sum(number) over w1,
+    sum(number) over (partition by intDiv(number, 3))
+from numbers(10)
+window
+    w1 as (partition by intDiv(number, 3))
+;

From eda9ca82030a2e74cd808899316090ddf3fdf1e6 Mon Sep 17 00:00:00 2001
From: Dmitriy <sevirov@yandex-team.ru>
Date: Wed, 13 Jan 2021 22:52:09 +0300
Subject: [PATCH 052/611] Creating multiword-types.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Создал страницу multiword-types.md и обновил таблицу соответствия типов данных.
---
 docs/en/sql-reference/ansi.md                   |  4 ++--
 .../sql-reference/data-types/multiword-types.md | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 docs/en/sql-reference/data-types/multiword-types.md

diff --git a/docs/en/sql-reference/ansi.md b/docs/en/sql-reference/ansi.md
index fc759f9f79a..eb6e0152fb0 100644
--- a/docs/en/sql-reference/ansi.md
+++ b/docs/en/sql-reference/ansi.md
@@ -25,14 +25,14 @@ The following table lists cases when query feature works in ClickHouse, but beha
 |------------|--------------------------------------------------------------------------------------------------------------------------|----------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **E011**   | **Numeric data types**                                                                                                   | **Partial**{.text-warning} |                                                                                                                                                                                           |
 | E011-01    | INTEGER and SMALLINT data types                                                                                          | Yes {.text-success}         |                                                                                                                                                                                           |
-| E011-02    | REAL, DOUBLE PRECISION and FLOAT data types data types                                                                   | Partial {.text-warning}     | `FLOAT(<binary_precision>)`, `REAL` and `DOUBLE PRECISION` are not supported                                                                                                              |
+| E011-02    | REAL, DOUBLE PRECISION and FLOAT data types data types                                                                   | Partial {.text-warning}     | `FLOAT(<binary_precision>)` and `REAL` are not supported                                                                                                                                  |
 | E011-03    | DECIMAL and NUMERIC data types                                                                                           | Partial {.text-warning}     | Only `DECIMAL(p,s)` is supported, not `NUMERIC`                                                                                                                                           |
 | E011-04    | Arithmetic operators                                                                                                     | Yes {.text-success}         |                                                                                                                                                                                           |
 | E011-05    | Numeric comparison                                                                                                       | Yes {.text-success}         |                                                                                                                                                                                           |
 | E011-06    | Implicit casting among the numeric data types                                                                            | No {.text-danger}           | ANSI SQL allows arbitrary implicit cast between numeric types, while ClickHouse relies on functions having multiple overloads instead of implicit cast                                    |
 | **E021**   | **Character string types**                                                                                               | **Partial**{.text-warning} |                                                                                                                                                                                           |
 | E021-01    | CHARACTER data type                                                                                                      | No {.text-danger}           |                                                                                                                                                                                           |
-| E021-02    | CHARACTER VARYING data type                                                                                              | No {.text-danger}           | `String` behaves similarly, but without length limit in parentheses                                                                                                                       |
+| E021-02    | CHARACTER VARYING data type                                                                                              | Yes {.text-danger}          |                                                                                                                                                                                           |
 | E021-03    | Character literals                                                                                                       | Partial {.text-warning}     | No automatic concatenation of consecutive literals and character set support                                                                                                              |
 | E021-04    | CHARACTER_LENGTH function                                                                                               | Partial {.text-warning}     | No `USING` clause                                                                                                                                                                         |
 | E021-05    | OCTET_LENGTH function                                                                                                   | No {.text-danger}           | `LENGTH` behaves similarly                                                                                                                                                                |
diff --git a/docs/en/sql-reference/data-types/multiword-types.md b/docs/en/sql-reference/data-types/multiword-types.md
new file mode 100644
index 00000000000..ea6a12ac82e
--- /dev/null
+++ b/docs/en/sql-reference/data-types/multiword-types.md
@@ -0,0 +1,17 @@
+---
+toc_priority: 61
+toc_title: Multiword Type Names
+---
+
+# Multiword Types {#multiword-types}
+
+When creating tables, you can also use data types with a name consisting of several words. This is necessary for better SQL compatibility.
+
+## Multiword Types Support {#multiword-types-support}
+
+| Multiword types                  | Simple types                                                 |
+|----------------------------------|--------------------------------------------------------------|
+| DOUBLE PRECISION                 | [Float64](../../sql-reference/data-types/float.md)           |
+| CHAR VARYING                     | [String](../../sql-reference/data-types/string.md)           |
+
+[Original article](https://clickhouse.tech/docs/en/sql-reference/data-types/multiword-types/) <!--hide-->

From 48509a85d35c3a5482ff54ec3b01b45d9316f57a Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Thu, 14 Jan 2021 01:04:19 +0300
Subject: [PATCH 053/611] comment woes

---
 programs/client/Client.cpp                    |  36 ++---
 src/Interpreters/ExpressionAnalyzer.cpp       |   2 -
 src/Parsers/parseQuery.cpp                    |  22 ++-
 .../01591_window_functions.reference          | 147 +++++++++---------
 4 files changed, 109 insertions(+), 98 deletions(-)

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index ca2a3db193f..9ebb9e2c923 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -871,24 +871,14 @@ private:
 
         while (this_query_begin < all_queries_end)
         {
-            // Use the token iterator to skip any whitespace, semicolons and
-            // comments at the beginning of the query. An example from regression
-            // tests:
-            //      insert into table t values ('invalid'); -- { serverError 469 }
-            //      select 1
-            // Here the test hint comment gets parsed as a part of second query.
-            // We parse the `INSERT VALUES` up to the semicolon, and the rest
-            // looks like a two-line query:
-            //      -- { serverError 469 }
-            //      select 1
-            // and we expect it to fail with error 469, but this hint is actually
-            // for the previous query. Test hints should go after the query, so
-            // we can fix this by skipping leading comments. Token iterator skips
-            // comments and whitespace by itself, so we only have to check for
-            // semicolons.
-            // The code block is to limit visibility of `tokens` because we have
-            // another such variable further down the code, and get warnings for
-            // that.
+            // The query parser doesn't skip all the trailing whitespace and
+            // comments, because they are also the leading comments for the
+            // next queries, and it makes more sense to treat them as such.
+            // There is one special case -- trailing whitespace + comments at
+            // end of file. The parser interface doesn't really allow it to work
+            // with an empty query, so we have to handle this case ourselves.
+            // If it's all whitespace and comments up to the end of file, we
+            // just stop.
             {
                 Tokens tokens(this_query_begin, all_queries_end);
                 IParser::Pos token_iterator(tokens,
@@ -898,8 +888,7 @@ private:
                 {
                     ++token_iterator;
                 }
-                this_query_begin = token_iterator->begin;
-                if (this_query_begin >= all_queries_end)
+                if (token_iterator->begin >= all_queries_end)
                 {
                     break;
                 }
@@ -917,8 +906,11 @@ private:
                     throw;
 
                 /// Try find test hint for syntax error
-                const char * end_of_line = find_first_symbols<'\n'>(this_query_begin,all_queries_end);
-                TestHint hint(true, String(this_query_end, end_of_line - this_query_end));
+                const char * end_of_line =
+                    find_first_symbols<'\n'>(this_query_begin,all_queries_end);
+                TestHint hint(true /* enabled */,
+                    String(this_query_begin, end_of_line - this_query_begin));
+
                 if (hint.serverError()) /// Syntax errors are considered as client errors
                     throw;
                 if (hint.clientError() != e.code())
diff --git a/src/Interpreters/ExpressionAnalyzer.cpp b/src/Interpreters/ExpressionAnalyzer.cpp
index c5d9b866039..9ddd62f028f 100644
--- a/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/src/Interpreters/ExpressionAnalyzer.cpp
@@ -289,8 +289,6 @@ void ExpressionAnalyzer::analyzeAggregation()
     {
         aggregated_columns = temp_actions->getNamesAndTypesList();
     }
-
-    fmt::print(stderr, "aggregated columns: {}\n", aggregated_columns.toString());
 }
 
 
diff --git a/src/Parsers/parseQuery.cpp b/src/Parsers/parseQuery.cpp
index 912ec482875..9daedc732e2 100644
--- a/src/Parsers/parseQuery.cpp
+++ b/src/Parsers/parseQuery.cpp
@@ -255,6 +255,27 @@ ASTPtr tryParseQuery(
     bool parse_res = parser.parse(token_iterator, res, expected);
     Token last_token = token_iterator.max();
 
+    pos = last_token.end;
+
+    // The query may also contain a test hint comment in the same line, e.g.
+    // select nonexistent_column; -- { serverError 12345 }.
+    // We must add this comment to the query text, so that it is handled by the
+    // test hint parser.
+    // The token iterator skips comments and whitespace, so we have to find the
+    // newline in the string manually. If it's earlier than the next significant
+    // token, it means that the text before newline is some trailing whitespace
+    // or comment, and we should add it to our query.
+    const auto newline = find_first_symbols<'\n'>(pos, end);
+    TokenIterator next_token_iterator = token_iterator;
+    const auto next_token_begin =
+        (next_token_iterator.isValid()
+            && (++next_token_iterator).isValid())
+            ? (*next_token_iterator).begin : end;
+    if (newline < next_token_begin)
+    {
+        pos = newline;
+    }
+
     /// If parsed query ends at data for insertion. Data for insertion could be in any format and not necessary be lexical correct.
     ASTInsertQuery * insert = nullptr;
     if (parse_res)
@@ -308,7 +329,6 @@ ASTPtr tryParseQuery(
         return nullptr;
     }
 
-    pos = token_iterator->begin;
     return res;
 }
 
diff --git a/tests/queries/0_stateless/01591_window_functions.reference b/tests/queries/0_stateless/01591_window_functions.reference
index 76fdff98328..d51555ee872 100644
--- a/tests/queries/0_stateless/01591_window_functions.reference
+++ b/tests/queries/0_stateless/01591_window_functions.reference
@@ -1,11 +1,10 @@
+-- { echo }
+
 set allow_experimental_window_functions = 1;
 
+
 -- just something basic
-
 select number, count() over (partition by intDiv(number, 3) order by number) from numbers(10);
-
--- proper calculation across blocks
-
 0	1
 1	2
 2	3
@@ -16,10 +15,10 @@ select number, count() over (partition by intDiv(number, 3) order by number) fro
 7	2
 8	3
 9	1
+
+
+-- proper calculation across blocks
 select number, max(number) over (partition by intDiv(number, 3) order by number desc) from numbers(10) settings max_block_size = 2;
-
--- not a window function
-
 2	2
 1	2
 0	2
@@ -30,14 +29,14 @@ select number, max(number) over (partition by intDiv(number, 3) order by number
 7	8
 6	8
 9	9
+
+
+-- not a window function
 select number, abs(number) over (partition by toString(intDiv(number, 3))) from numbers(10); -- { serverError 63 }
 
+
 -- no partition by
-
 select number, avg(number) over (order by number) from numbers(10);
-
--- no order by
-
 0	0
 1	0.5
 2	1
@@ -48,10 +47,10 @@ select number, avg(number) over (order by number) from numbers(10);
 7	3.5
 8	4
 9	4.5
+
+
+-- no order by
 select number, quantileExact(number) over (partition by intDiv(number, 3)) from numbers(10);
-
--- can add an alias after window spec
-
 0	0
 1	1
 2	1
@@ -62,36 +61,36 @@ select number, quantileExact(number) over (partition by intDiv(number, 3)) from
 7	7
 8	7
 9	9
+
+
+-- can add an alias after window spec
 select number, quantileExact(number) over (partition by intDiv(number, 3)) q from numbers(10);
+0	0
+1	1
+2	1
+3	3
+4	4
+5	4
+6	6
+7	7
+8	7
+9	9
+
 
 -- can't reference it yet -- the window functions are calculated at the
 -- last stage of select, after all other functions.
-
-0	0
-1	1
-2	1
-3	3
-4	4
-5	4
-6	6
-7	7
-8	7
-9	9
 select q * 10, quantileExact(number) over (partition by intDiv(number, 3)) q from numbers(10); -- { serverError 47 }
 
+
 -- must work in WHERE if you wrap it in a subquery
-
 select * from (select count(*) over () c from numbers(3)) where c > 0;
-
--- should work in ORDER BY
-
 1
 2
 3
+
+
+-- should work in ORDER BY
 select number, max(number) over (partition by intDiv(number, 3) order by number desc) m from numbers(10) order by m desc, number;
-
--- also works in ORDER BY if you wrap it in a subquery
-
 9	9
 6	8
 7	8
@@ -102,53 +101,51 @@ select number, max(number) over (partition by intDiv(number, 3) order by number
 0	2
 1	2
 2	2
+
+
+-- also works in ORDER BY if you wrap it in a subquery
 select * from (select count(*) over () c from numbers(3)) order by c;
+1
+2
+3
+
 
 -- Example with window function only in ORDER BY. Here we make a rank of all
 -- numbers sorted descending, and then sort by this rank descending, and must get
 -- the ascending order.
-
+select * from (select * from numbers(5) order by rand()) order by count() over (order by number desc) desc;
+0
 1
 2
 3
-select * from (select * from numbers(5) order by rand()) order by count() over (order by number desc) desc;
+4
+
 
 -- Aggregate functions as window function arguments. This query is semantically
 -- the same as the above one, only we replace `number` with
 -- `any(number) group by number` and so on.
-
-0
-1
-2
-3
-4
 select * from (select * from numbers(5) order by rand()) group by number order by sum(any(number + 1)) over (order by min(number) desc) desc;
--- some more simple cases w/aggregate functions
-
 0
 1
 2
 3
 4
+
+-- some more simple cases w/aggregate functions
 select sum(any(number)) over () from numbers(1);
-
 0
-select sum(any(number) + 1) over () from numbers(1);
 
+select sum(any(number) + 1) over () from numbers(1);
 1
+
 select sum(any(number + 1)) over () from numbers(1);
+1
+
 
 -- different windows
 -- an explain test would also be helpful, but it's too immature now and I don't
 -- want to change reference all the time
-
-1
 select number, max(number) over (partition by intDiv(number, 3) order by number desc), count(number) over (partition by intDiv(number, 5) order by number) as m from numbers(31) order by number settings max_block_size = 2;
-
--- two functions over the same window
--- an explain test would also be helpful, but it's too immature now and I don't
--- want to change reference all the time
-
 0	2	1
 1	2	2
 2	2	3
@@ -180,10 +177,12 @@ select number, max(number) over (partition by intDiv(number, 3) order by number
 28	29	4
 29	29	5
 30	30	1
+
+
+-- two functions over the same window
+-- an explain test would also be helpful, but it's too immature now and I don't
+-- want to change reference all the time
 select number, max(number) over (partition by intDiv(number, 3) order by number desc), count(number) over (partition by intDiv(number, 3) order by number desc) as m from numbers(7) order by number settings max_block_size = 2;
-
--- check that we can work with constant columns
-
 0	2	3
 1	2	2
 2	2	1
@@ -191,37 +190,37 @@ select number, max(number) over (partition by intDiv(number, 3) order by number
 4	5	2
 5	5	1
 6	6	1
+
+
+-- check that we can work with constant columns
 select median(x) over (partition by x) from (select 1 x);
+1
+
 
 -- an empty window definition is valid as well
-
-1
 select groupArray(number) over () from numbers(3);
-
--- This one tests we properly process the window  function arguments.
--- Seen errors like 'column `1` not found' from count(1).
-
 [0]
 [0,1]
 [0,1,2]
+
+
+-- This one tests we properly process the window  function arguments.
+-- Seen errors like 'column `1` not found' from count(1).
 select count(1) over (), max(number + 1) over () from numbers(3);
+1	3
+
 
 -- Should work in DISTINCT
-
-1	3
 select distinct sum(0) over () from numbers(2);
-
 0
+
 select distinct any(number) over () from numbers(2);
+0
+
 
 -- Various kinds of aliases are properly substituted into various parts of window
 -- function definition.
-
-0
 with number + 1 as x select intDiv(number, 3) as y, sum(x + y) over (partition by y order by x) from numbers(7);
-
--- WINDOW clause
-
 0	1
 0	3
 0	6
@@ -229,18 +228,19 @@ with number + 1 as x select intDiv(number, 3) as y, sum(x + y) over (partition b
 1	11
 1	18
 2	9
+
+
+-- WINDOW clause
 select 1 window w1 as ();
-
-
 1
+
+
 select sum(number) over w1, sum(number) over w2
 from numbers(10)
 window
     w1 as (),
     w2 as (partition by intDiv(number, 3))
 ;
-
-
 0	0
 1	1
 3	3
@@ -251,6 +251,8 @@ window
 28	13
 36	21
 45	9
+
+
 select
     sum(number) over w1,
     sum(number) over (partition by intDiv(number, 3))
@@ -258,7 +260,6 @@ from numbers(10)
 window
     w1 as (partition by intDiv(number, 3))
 ;
-
 0	0
 1	1
 3	3

From d1feb2f7616ab758a9712cbe5465810a15b711b6 Mon Sep 17 00:00:00 2001
From: George <gyuton@yandex-team.ru>
Date: Thu, 14 Jan 2021 02:16:40 +0300
Subject: [PATCH 054/611] minor fixes

---
 .../utilities/clickhouse-benchmark.md         | 10 +++++-----
 .../utilities/clickhouse-benchmark.md         | 20 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/docs/en/operations/utilities/clickhouse-benchmark.md b/docs/en/operations/utilities/clickhouse-benchmark.md
index f7ea0aa1302..49c18b02e2d 100644
--- a/docs/en/operations/utilities/clickhouse-benchmark.md
+++ b/docs/en/operations/utilities/clickhouse-benchmark.md
@@ -41,14 +41,14 @@ clickhouse-benchmark [keys] < queries_file;
 ## Keys {#clickhouse-benchmark-keys}
 
 -   `--query=WORD` — Query to execute. If this parameter is not passed, `clickhouse-benchmark` will read queries from standard input. 
--   `-c N`, `--concurrency=N` — Number of queries that `clickhouse-benchmark` sends simultaneously. Default value: `1`.
--   `-d N`, `--delay=N` — Interval in seconds between intermediate reports (to disable reports set `0`). Default value: `1`.
+-   `-c N`, `--concurrency=N` — Number of queries that `clickhouse-benchmark` sends simultaneously. Default value: 1.
+-   `-d N`, `--delay=N` — Interval in seconds between intermediate reports (to disable reports set 0). Default value: 1.
 -   `-h WORD`, `--host=WORD` — Server host. Default value: `localhost`. For the [comparison mode](#clickhouse-benchmark-comparison-mode) you can use multiple `-h` keys.
--   `-p N`, `--port=N` — Server port. Default value: `9000`. For the [comparison mode](#clickhouse-benchmark-comparison-mode) you can use multiple `-p` keys.
--   `-i N`, `--iterations=N` — Total number of queries. Default value: `0` (repeat forever).
+-   `-p N`, `--port=N` — Server port. Default value: 9000. For the [comparison mode](#clickhouse-benchmark-comparison-mode) you can use multiple `-p` keys.
+-   `-i N`, `--iterations=N` — Total number of queries. Default value: 0 (repeat forever).
 -   `-r`, `--randomize` — Random order of queries execution if there is more than one input query.
 -   `-s`, `--secure` — Using `TLS` connection.
--   `-t N`, `--timelimit=N` — Time limit in seconds. `clickhouse-benchmark` stops sending queries when the specified time limit is reached. Default value: `0` (time limit disabled).
+-   `-t N`, `--timelimit=N` — Time limit in seconds. `clickhouse-benchmark` stops sending queries when the specified time limit is reached. Default value: 0 (time limit disabled).
 -   `--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 [comparison mode](#clickhouse-benchmark-comparison-mode) `clickhouse-benchmark` performs the [Independent two-sample Student’s t-test](https://en.wikipedia.org/wiki/Student%27s_t-test#Independent_two-sample_t-test) to determine whether the two distributions aren’t different with the selected level of confidence.
 -   `--cumulative` — Printing cumulative data instead of data per interval.
 -   `--database=DATABASE_NAME` — ClickHouse database name. Default value: `default`.
diff --git a/docs/ru/operations/utilities/clickhouse-benchmark.md b/docs/ru/operations/utilities/clickhouse-benchmark.md
index 218e41c6a72..392ed859d58 100644
--- a/docs/ru/operations/utilities/clickhouse-benchmark.md
+++ b/docs/ru/operations/utilities/clickhouse-benchmark.md
@@ -41,25 +41,25 @@ clickhouse-benchmark [keys] < queries_file;
 ## Ключи {#clickhouse-benchmark-keys}
 
 -   `--query=WORD` — запрос для исполнения. Если параметр не передан, `clickhouse-benchmark` будет считывать запросы из стандартного ввода. 
--   `-c N`, `--concurrency=N` — количество запросов, которые `clickhouse-benchmark` отправляет одновременно. Значение по умолчанию: `1`.
--   `-d N`, `--delay=N` — интервал в секундах между промежуточными сообщениями (чтобы отлючить сообщения, установите `0`). Значение по умолчанию: `1`.
+-   `-c N`, `--concurrency=N` — количество запросов, которые `clickhouse-benchmark` отправляет одновременно. Значение по умолчанию: 1.
+-   `-d N`, `--delay=N` — интервал в секундах между промежуточными сообщениями (чтобы отключить сообщения, установите 0). Значение по умолчанию: 1.
 -   `-h WORD`, `--host=WORD` — хост сервера. Значение по умолчанию: `localhost`. Для [сравнительного режима](#clickhouse-benchmark-comparison-mode) можно использовать несколько `-h` ключей. 
--   `-p N`, `--port=N` — порт сервера. Значение по умолчанию: `9000`. Для [сравнительного режима](#clickhouse-benchmark-comparison-mode) можно использовать несколько `-p` ключей. 
--   `-i N`, `--iterations=N` — общее число запросов. Значение по умолчанию: `0` (вечно будет повторяться).
+-   `-p N`, `--port=N` — порт сервера. Значение по умолчанию: 9000. Для [сравнительного режима](#clickhouse-benchmark-comparison-mode) можно использовать несколько `-p` ключей. 
+-   `-i N`, `--iterations=N` — общее число запросов. Значение по умолчанию: 0 (вечно будет повторяться).
 -   `-r`, `--randomize` — случайный порядок выполнения запросов при наличии более одного входного запроса.
--   `-s`, `--secure` — использование `TLS` соединения.
--   `-t N`, `--timelimit=N` — лимит по времени в секундах. `clickhouse-benchmark` перестает отправлять запросы при достижении лимита по времени. Значение по умолчанию: `0` (лимит отключен).
--   `--confidence=N` — уровень доверия для  T-критерия. Возможные значения: 0 (80%), 1 (90%), 2 (95%), 3 (98%), 4 (99%), 5 (99.5%). Значение по умолчанию: `5`. В [сравнительном режиме](#clickhouse-benchmark-comparison-mode) `clickhouse-benchmark` проверяет [двухвыборочный  t-критерий Стьюдента для независимых выборок](https://en.wikipedia.org/wiki/Student%27s_t-test#Independent_two-sample_t-test) чтобы определить, различны ли две выборки при выбранном уровне доверия.
+-   `-s`, `--secure` — используется `TLS` соединения.
+-   `-t N`, `--timelimit=N` — лимит по времени в секундах. `clickhouse-benchmark` перестает отправлять запросы при достижении лимита по времени. Значение по умолчанию: 0 (лимит отключен).
+-   `--confidence=N` — уровень доверия для  T-критерия. Возможные значения: 0 (80%), 1 (90%), 2 (95%), 3 (98%), 4 (99%), 5 (99.5%). Значение по умолчанию: 5. В [сравнительном режиме](#clickhouse-benchmark-comparison-mode) `clickhouse-benchmark` проверяет [двухвыборочный  t-критерий Стьюдента для независимых выборок](https://en.wikipedia.org/wiki/Student%27s_t-test#Independent_two-sample_t-test) чтобы определить, различны ли две выборки при выбранном уровне доверия.
 -   `--cumulative` — выводит совокупность данных, а не данные за интервал.
 -   `--database=DATABASE_NAME` — имя базы данных ClickHouse. Значение по умолчанию: `default`. 
 -   `--json=FILEPATH` — формат вывода `JSON`. Когда этот ключ указан, `clickhouse-benchmark` выводит сообщение в указанный JSON-файл.
 -   `--user=USERNAME` — имя пользователя ClickHouse. Значение по умолчанию: `default`.
 -   `--password=PSWD` — пароль пользователя ClickHouse. Значение по умолчанию: пустая строка.
--   `--stacktrace` — вывод трассировки стека. Когда этот ключ указан, `clickhouse-bencmark` выводит трассировку стека исключений.
+-   `--stacktrace` — вывод трассировки стека исключений.
 -   `--stage=WORD` — стадия обработки запроса на сервере. ClickHouse останавливает обработку запроса и возвращает ответ `clickhouse-benchmark` на заданной стадии. Возможные значения: `complete`, `fetch_columns`, `with_mergeable_state`. Значение по умолчанию: `complete`. 
--   `--help` — показывает help-сообщение.
+-   `--help` — показывает справку.
 
-Если нужно применить какие-нибудь [настройки](../../operations/settings/index.md) для запросов, их можно передать как ключ `--<session setting name>= SETTING_VALUE`. Например, `--max_memory_usage=1048576`.
+Если нужно применить [настройки](../../operations/settings/index.md) для запросов, их можно передать как ключ `--<session setting name>= SETTING_VALUE`. Например, `--max_memory_usage=1048576`.
 
 ## Вывод {#clickhouse-benchmark-output}
 

From 9c9e2a593654fcfa45deac708ea4b64b18ce6159 Mon Sep 17 00:00:00 2001
From: Anton Popov <pad11rus@gmail.com>
Date: Thu, 14 Jan 2021 14:54:03 +0300
Subject: [PATCH 055/611] support operations with views in antlr parser

---
 src/Interpreters/InterpreterExistsQuery.cpp   |    6 +-
 src/Parsers/New/AST/DropQuery.cpp             |   20 +
 src/Parsers/New/AST/DropQuery.h               |    3 +
 src/Parsers/New/AST/ExistsQuery.cpp           |   46 +-
 src/Parsers/New/AST/ExistsQuery.h             |    9 +-
 src/Parsers/New/ClickHouseParser.cpp          | 4284 +++++++++--------
 src/Parsers/New/ClickHouseParser.g4           |    7 +-
 src/Parsers/New/ClickHouseParser.h            |  212 +-
 src/Parsers/New/ClickHouseParserVisitor.h     |    4 +-
 src/Parsers/New/ParseTreeVisitor.h            |    3 +-
 src/Parsers/TablePropertiesQueriesASTs.h      |   11 +-
 .../0_stateless/01048_exists_query.sql        |    2 +-
 tests/queries/skip_list.json                  |    3 -
 13 files changed, 2577 insertions(+), 2033 deletions(-)

diff --git a/src/Interpreters/InterpreterExistsQuery.cpp b/src/Interpreters/InterpreterExistsQuery.cpp
index aeb5c0f9bcf..335ee452e39 100644
--- a/src/Interpreters/InterpreterExistsQuery.cpp
+++ b/src/Interpreters/InterpreterExistsQuery.cpp
@@ -10,7 +10,6 @@
 #include <Access/AccessFlags.h>
 #include <Common/typeid_cast.h>
 
-
 namespace DB
 {
 
@@ -40,6 +39,7 @@ BlockInputStreamPtr InterpreterExistsQuery::executeImpl()
 {
     ASTQueryWithTableAndOutput * exists_query;
     bool result = false;
+
     if ((exists_query = query_ptr->as<ASTExistsTableQuery>()))
     {
         if (exists_query->temporary)
@@ -57,8 +57,8 @@ BlockInputStreamPtr InterpreterExistsQuery::executeImpl()
     {
         String database = context.resolveDatabase(exists_query->database);
         context.checkAccess(AccessType::SHOW_TABLES, database, exists_query->table);
-        auto tbl = DatabaseCatalog::instance().tryGetTable({database, exists_query->table}, context);
-        result =  tbl != nullptr && tbl->isView();
+        auto table = DatabaseCatalog::instance().tryGetTable({database, exists_query->table}, context);
+        result = table && table->isView();
     }
     else if ((exists_query = query_ptr->as<ASTExistsDatabaseQuery>()))
     {
diff --git a/src/Parsers/New/AST/DropQuery.cpp b/src/Parsers/New/AST/DropQuery.cpp
index dc9657b3e8b..59a417a6fa9 100644
--- a/src/Parsers/New/AST/DropQuery.cpp
+++ b/src/Parsers/New/AST/DropQuery.cpp
@@ -41,6 +41,16 @@ DropQuery::createDropTable(bool detach, bool if_exists, bool temporary, PtrTo<Ta
     return query;
 }
 
+// static
+PtrTo<DropQuery>
+DropQuery::createDropView(bool detach, bool if_exists, PtrTo<TableIdentifier> identifier, PtrTo<ClusterClause> cluster)
+{
+    auto query = PtrTo<DropQuery>(new DropQuery(cluster, QueryType::VIEW, {identifier}));
+    query->detach = detach;
+    query->if_exists = if_exists;
+    return query;
+}
+
 DropQuery::DropQuery(PtrTo<ClusterClause> cluster, QueryType type, PtrList exprs) : DDLQuery(cluster, exprs), query_type(type)
 {
 }
@@ -73,6 +83,14 @@ ASTPtr DropQuery::convertToOld() const
                 query->database = database->getName();
             break;
         }
+        case QueryType::VIEW:
+        {
+            query->is_view = true;
+            query->table = get<TableIdentifier>(NAME)->getName();
+            if (auto database = get<TableIdentifier>(NAME)->getDatabase())
+                query->database = database->getName();
+            break;
+        }
     }
 
     convertToOldPartially(query);
@@ -100,6 +118,8 @@ antlrcpp::Any ParseTreeVisitor::visitDropTableStmt(ClickHouseParser::DropTableSt
         return DropQuery::createDropTable(!!ctx->DETACH(), !!ctx->EXISTS(), !!ctx->TEMPORARY(), visit(ctx->tableIdentifier()), cluster);
     if (ctx->DICTIONARY())
         return DropQuery::createDropDictionary(!!ctx->DETACH(), !!ctx->EXISTS(), visit(ctx->tableIdentifier()), cluster);
+    if (ctx->VIEW())
+        return DropQuery::createDropView(!!ctx->DETACH(), !!ctx->EXISTS(), visit(ctx->tableIdentifier()), cluster);
     __builtin_unreachable();
 }
 
diff --git a/src/Parsers/New/AST/DropQuery.h b/src/Parsers/New/AST/DropQuery.h
index 2aff85779eb..cc70561e90f 100644
--- a/src/Parsers/New/AST/DropQuery.h
+++ b/src/Parsers/New/AST/DropQuery.h
@@ -15,6 +15,8 @@ class DropQuery : public DDLQuery
         createDropTable(bool detach, bool if_exists, bool temporary, PtrTo<TableIdentifier> identifier, PtrTo<ClusterClause> cluster);
         static PtrTo<DropQuery>
         createDropDictionary(bool detach, bool if_exists, PtrTo<TableIdentifier> identifier, PtrTo<ClusterClause> cluster);
+        static PtrTo<DropQuery>
+        createDropView(bool detach, bool if_exists, PtrTo<TableIdentifier> identifier, PtrTo<ClusterClause> cluster);
 
         ASTPtr convertToOld() const override;
 
@@ -29,6 +31,7 @@ class DropQuery : public DDLQuery
             DATABASE,
             DICTIONARY,
             TABLE,
+            VIEW,
         };
 
         const QueryType query_type;
diff --git a/src/Parsers/New/AST/ExistsQuery.cpp b/src/Parsers/New/AST/ExistsQuery.cpp
index 0a91ea01d36..c3c4f35e828 100644
--- a/src/Parsers/New/AST/ExistsQuery.cpp
+++ b/src/Parsers/New/AST/ExistsQuery.cpp
@@ -10,31 +10,51 @@
 namespace DB::AST
 {
 
-ExistsQuery::ExistsQuery(QueryType type, bool temporary_, PtrTo<TableIdentifier> identifier)
-    : Query{identifier}, query_type(type), temporary(temporary_)
+ExistsQuery::ExistsQuery(QueryType type, bool temporary_, PtrList exprs)
+    : Query(exprs), query_type(type), temporary(temporary_)
 {
 }
 
+// static
+PtrTo<ExistsQuery> ExistsQuery::createTable(QueryType type, bool temporary, PtrTo<TableIdentifier> identifier)
+{
+    return PtrTo<ExistsQuery>(new ExistsQuery(type, temporary, {identifier}));
+}
+
+// static
+PtrTo<ExistsQuery> ExistsQuery::createDatabase(PtrTo<DatabaseIdentifier> identifier)
+{
+    return PtrTo<ExistsQuery>(new ExistsQuery(QueryType::DATABASE, false, {identifier}));
+}
+
 ASTPtr ExistsQuery::convertToOld() const
 {
     std::shared_ptr<ASTQueryWithTableAndOutput> query;
 
     switch(query_type)
     {
+        case QueryType::DATABASE:
+            query = std::make_shared<ASTExistsDatabaseQuery>();
+            tryGetIdentifierNameInto(get<DatabaseIdentifier>(IDENTIFIER)->convertToOld(), query->database);
+            return query;
+
         case QueryType::DICTIONARY:
             query = std::make_shared<ASTExistsDictionaryQuery>();
             break;
         case QueryType::TABLE:
             query = std::make_shared<ASTExistsTableQuery>();
-            query->temporary = temporary;
+            break;
+        case QueryType::VIEW:
+            query = std::make_shared<ASTExistsViewQuery>();
             break;
     }
 
     // FIXME: this won't work if table doesn't exist
-    auto table_id = getTableIdentifier(get(TABLE)->convertToOld());
+    auto table_id = getTableIdentifier(get<TableIdentifier>(IDENTIFIER)->convertToOld());
     query->database = table_id.database_name;
     query->table = table_id.table_name;
     query->uuid = table_id.uuid;
+    query->temporary = temporary;
 
     return query;
 }
@@ -46,10 +66,22 @@ namespace DB
 
 using namespace AST;
 
-antlrcpp::Any ParseTreeVisitor::visitExistsStmt(ClickHouseParser::ExistsStmtContext *ctx)
+antlrcpp::Any ParseTreeVisitor::visitExistsTableStmt(ClickHouseParser::ExistsTableStmtContext *ctx)
 {
-    auto type = ctx->TABLE() ? ExistsQuery::QueryType::TABLE : ExistsQuery::QueryType::DICTIONARY;
-    return std::make_shared<ExistsQuery>(type, !!ctx->TEMPORARY(), visit(ctx->tableIdentifier()));
+    ExistsQuery::QueryType type;
+    if (ctx->DICTIONARY())
+        type = ExistsQuery::QueryType::DICTIONARY;
+    else if (ctx->VIEW())
+        type = ExistsQuery::QueryType::VIEW;
+    else // Query 'EXISTS <table_name>' is interptered as 'EXISTS TABLE <table_name>'
+        type = ExistsQuery::QueryType::TABLE;
+
+    return ExistsQuery::createTable(type, !!ctx->TEMPORARY(), visit(ctx->tableIdentifier()));
+}
+
+antlrcpp::Any ParseTreeVisitor::visitExistsDatabaseStmt(ClickHouseParser::ExistsDatabaseStmtContext *ctx)
+{
+    return ExistsQuery::createDatabase(visit(ctx->databaseIdentifier()));
 }
 
 }
diff --git a/src/Parsers/New/AST/ExistsQuery.h b/src/Parsers/New/AST/ExistsQuery.h
index 47a93d2b82c..5afe076b580 100644
--- a/src/Parsers/New/AST/ExistsQuery.h
+++ b/src/Parsers/New/AST/ExistsQuery.h
@@ -13,16 +13,21 @@ class ExistsQuery : public Query
         {
             DICTIONARY,
             TABLE,
+            VIEW,
+            DATABASE,
         };
 
-        ExistsQuery(QueryType type, bool temporary, PtrTo<TableIdentifier> identifier);
+        static PtrTo<ExistsQuery> createTable(QueryType type, bool temporary, PtrTo<TableIdentifier> identifier);
+        static PtrTo<ExistsQuery> createDatabase(PtrTo<DatabaseIdentifier> identifier);
+
+        ExistsQuery(QueryType type, bool temporary, PtrList exprs);
 
         ASTPtr convertToOld() const override;
 
     private:
         enum ChildIndex : UInt8
         {
-            TABLE = 0,  // TableIdentifier
+            IDENTIFIER = 0,  // DatabaseIdentifier or TableIdentifier
         };
 
         const QueryType query_type;
diff --git a/src/Parsers/New/ClickHouseParser.cpp b/src/Parsers/New/ClickHouseParser.cpp
index 45985422161..91cf1e47f96 100644
--- a/src/Parsers/New/ClickHouseParser.cpp
+++ b/src/Parsers/New/ClickHouseParser.cpp
@@ -75,6 +75,7 @@ size_t ClickHouseParser::QueryStmtContext::getRuleIndex() const {
   return ClickHouseParser::RuleQueryStmt;
 }
 
+
 antlrcpp::Any ClickHouseParser::QueryStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitQueryStmt(this);
@@ -256,6 +257,7 @@ size_t ClickHouseParser::QueryContext::getRuleIndex() const {
   return ClickHouseParser::RuleQuery;
 }
 
+
 antlrcpp::Any ClickHouseParser::QueryContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitQuery(this);
@@ -463,6 +465,7 @@ tree::TerminalNode* ClickHouseParser::AlterTableStmtContext::COMMA(size_t i) {
 
 ClickHouseParser::AlterTableStmtContext::AlterTableStmtContext(AlterStmtContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AlterTableStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlterTableStmt(this);
@@ -554,6 +557,7 @@ ClickHouseParser::TableIdentifierContext* ClickHouseParser::AlterTableClauseRepl
 
 ClickHouseParser::AlterTableClauseReplaceContext::AlterTableClauseReplaceContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AlterTableClauseReplaceContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlterTableClauseReplace(this);
@@ -592,6 +596,7 @@ tree::TerminalNode* ClickHouseParser::AlterTableClauseRenameContext::EXISTS() {
 
 ClickHouseParser::AlterTableClauseRenameContext::AlterTableClauseRenameContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AlterTableClauseRenameContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlterTableClauseRename(this);
@@ -610,6 +615,7 @@ ClickHouseParser::PartitionClauseContext* ClickHouseParser::AlterTableClauseFree
 
 ClickHouseParser::AlterTableClauseFreezePartitionContext::AlterTableClauseFreezePartitionContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AlterTableClauseFreezePartitionContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlterTableClauseFreezePartition(this);
@@ -640,6 +646,7 @@ tree::TerminalNode* ClickHouseParser::AlterTableClauseModifyContext::EXISTS() {
 
 ClickHouseParser::AlterTableClauseModifyContext::AlterTableClauseModifyContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AlterTableClauseModifyContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlterTableClauseModify(this);
@@ -666,6 +673,7 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::AlterTableClauseModifyOrd
 
 ClickHouseParser::AlterTableClauseModifyOrderByContext::AlterTableClauseModifyOrderByContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AlterTableClauseModifyOrderByContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlterTableClauseModifyOrderBy(this);
@@ -684,6 +692,7 @@ tree::TerminalNode* ClickHouseParser::AlterTableClauseRemoveTTLContext::TTL() {
 
 ClickHouseParser::AlterTableClauseRemoveTTLContext::AlterTableClauseRemoveTTLContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AlterTableClauseRemoveTTLContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlterTableClauseRemoveTTL(this);
@@ -706,6 +715,7 @@ ClickHouseParser::WhereClauseContext* ClickHouseParser::AlterTableClauseUpdateCo
 
 ClickHouseParser::AlterTableClauseUpdateContext::AlterTableClauseUpdateContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AlterTableClauseUpdateContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlterTableClauseUpdate(this);
@@ -744,6 +754,7 @@ tree::TerminalNode* ClickHouseParser::AlterTableClauseModifyRemoveContext::EXIST
 
 ClickHouseParser::AlterTableClauseModifyRemoveContext::AlterTableClauseModifyRemoveContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AlterTableClauseModifyRemoveContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlterTableClauseModifyRemove(this);
@@ -766,6 +777,7 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::AlterTableClauseDeleteCon
 
 ClickHouseParser::AlterTableClauseDeleteContext::AlterTableClauseDeleteContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AlterTableClauseDeleteContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlterTableClauseDelete(this);
@@ -800,6 +812,7 @@ tree::TerminalNode* ClickHouseParser::AlterTableClauseModifyCodecContext::EXISTS
 
 ClickHouseParser::AlterTableClauseModifyCodecContext::AlterTableClauseModifyCodecContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AlterTableClauseModifyCodecContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlterTableClauseModifyCodec(this);
@@ -834,6 +847,7 @@ tree::TerminalNode* ClickHouseParser::AlterTableClauseCommentContext::EXISTS() {
 
 ClickHouseParser::AlterTableClauseCommentContext::AlterTableClauseCommentContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AlterTableClauseCommentContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlterTableClauseComment(this);
@@ -860,6 +874,7 @@ ClickHouseParser::TableIdentifierContext* ClickHouseParser::AlterTableClauseAtta
 
 ClickHouseParser::AlterTableClauseAttachContext::AlterTableClauseAttachContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AlterTableClauseAttachContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlterTableClauseAttach(this);
@@ -890,6 +905,7 @@ tree::TerminalNode* ClickHouseParser::AlterTableClauseDropColumnContext::EXISTS(
 
 ClickHouseParser::AlterTableClauseDropColumnContext::AlterTableClauseDropColumnContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AlterTableClauseDropColumnContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlterTableClauseDropColumn(this);
@@ -928,6 +944,7 @@ ClickHouseParser::PartitionClauseContext* ClickHouseParser::AlterTableClauseClea
 
 ClickHouseParser::AlterTableClauseClearContext::AlterTableClauseClearContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AlterTableClauseClearContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlterTableClauseClear(this);
@@ -946,6 +963,7 @@ ClickHouseParser::PartitionClauseContext* ClickHouseParser::AlterTableClauseDeta
 
 ClickHouseParser::AlterTableClauseDetachContext::AlterTableClauseDetachContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AlterTableClauseDetachContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlterTableClauseDetach(this);
@@ -976,6 +994,7 @@ tree::TerminalNode* ClickHouseParser::AlterTableClauseDropIndexContext::EXISTS()
 
 ClickHouseParser::AlterTableClauseDropIndexContext::AlterTableClauseDropIndexContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AlterTableClauseDropIndexContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlterTableClauseDropIndex(this);
@@ -1018,6 +1037,7 @@ ClickHouseParser::NestedIdentifierContext* ClickHouseParser::AlterTableClauseAdd
 
 ClickHouseParser::AlterTableClauseAddIndexContext::AlterTableClauseAddIndexContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AlterTableClauseAddIndexContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlterTableClauseAddIndex(this);
@@ -1036,6 +1056,7 @@ ClickHouseParser::PartitionClauseContext* ClickHouseParser::AlterTableClauseDrop
 
 ClickHouseParser::AlterTableClauseDropPartitionContext::AlterTableClauseDropPartitionContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AlterTableClauseDropPartitionContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlterTableClauseDropPartition(this);
@@ -1074,6 +1095,7 @@ tree::TerminalNode* ClickHouseParser::AlterTableClauseModifyCommentContext::EXIS
 
 ClickHouseParser::AlterTableClauseModifyCommentContext::AlterTableClauseModifyCommentContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AlterTableClauseModifyCommentContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlterTableClauseModifyComment(this);
@@ -1092,6 +1114,7 @@ ClickHouseParser::TtlClauseContext* ClickHouseParser::AlterTableClauseModifyTTLC
 
 ClickHouseParser::AlterTableClauseModifyTTLContext::AlterTableClauseModifyTTLContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AlterTableClauseModifyTTLContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlterTableClauseModifyTTL(this);
@@ -1134,6 +1157,7 @@ ClickHouseParser::TableIdentifierContext* ClickHouseParser::AlterTableClauseMove
 
 ClickHouseParser::AlterTableClauseMovePartitionContext::AlterTableClauseMovePartitionContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AlterTableClauseMovePartitionContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlterTableClauseMovePartition(this);
@@ -1176,6 +1200,7 @@ ClickHouseParser::NestedIdentifierContext* ClickHouseParser::AlterTableClauseAdd
 
 ClickHouseParser::AlterTableClauseAddColumnContext::AlterTableClauseAddColumnContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AlterTableClauseAddColumnContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlterTableClauseAddColumn(this);
@@ -1730,6 +1755,7 @@ size_t ClickHouseParser::AssignmentExprListContext::getRuleIndex() const {
   return ClickHouseParser::RuleAssignmentExprList;
 }
 
+
 antlrcpp::Any ClickHouseParser::AssignmentExprListContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAssignmentExprList(this);
@@ -1795,6 +1821,7 @@ size_t ClickHouseParser::AssignmentExprContext::getRuleIndex() const {
   return ClickHouseParser::RuleAssignmentExpr;
 }
 
+
 antlrcpp::Any ClickHouseParser::AssignmentExprContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAssignmentExpr(this);
@@ -1863,6 +1890,7 @@ size_t ClickHouseParser::TableColumnPropertyTypeContext::getRuleIndex() const {
   return ClickHouseParser::RuleTableColumnPropertyType;
 }
 
+
 antlrcpp::Any ClickHouseParser::TableColumnPropertyTypeContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitTableColumnPropertyType(this);
@@ -1931,6 +1959,7 @@ size_t ClickHouseParser::PartitionClauseContext::getRuleIndex() const {
   return ClickHouseParser::RulePartitionClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::PartitionClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitPartitionClause(this);
@@ -2016,6 +2045,7 @@ ClickHouseParser::ClusterClauseContext* ClickHouseParser::AttachDictionaryStmtCo
 
 ClickHouseParser::AttachDictionaryStmtContext::AttachDictionaryStmtContext(AttachStmtContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::AttachDictionaryStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAttachDictionaryStmt(this);
@@ -2085,6 +2115,7 @@ size_t ClickHouseParser::CheckStmtContext::getRuleIndex() const {
   return ClickHouseParser::RuleCheckStmt;
 }
 
+
 antlrcpp::Any ClickHouseParser::CheckStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitCheckStmt(this);
@@ -2198,6 +2229,7 @@ ClickHouseParser::TableSchemaClauseContext* ClickHouseParser::CreateViewStmtCont
 
 ClickHouseParser::CreateViewStmtContext::CreateViewStmtContext(CreateStmtContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::CreateViewStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitCreateViewStmt(this);
@@ -2252,6 +2284,7 @@ ClickHouseParser::ClusterClauseContext* ClickHouseParser::CreateDictionaryStmtCo
 
 ClickHouseParser::CreateDictionaryStmtContext::CreateDictionaryStmtContext(CreateStmtContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::CreateDictionaryStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitCreateDictionaryStmt(this);
@@ -2298,6 +2331,7 @@ ClickHouseParser::EngineExprContext* ClickHouseParser::CreateDatabaseStmtContext
 
 ClickHouseParser::CreateDatabaseStmtContext::CreateDatabaseStmtContext(CreateStmtContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::CreateDatabaseStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitCreateDatabaseStmt(this);
@@ -2372,6 +2406,7 @@ tree::TerminalNode* ClickHouseParser::CreateLiveViewStmtContext::DECIMAL_LITERAL
 
 ClickHouseParser::CreateLiveViewStmtContext::CreateLiveViewStmtContext(CreateStmtContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::CreateLiveViewStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitCreateLiveViewStmt(this);
@@ -2442,6 +2477,7 @@ tree::TerminalNode* ClickHouseParser::CreateMaterializedViewStmtContext::POPULAT
 
 ClickHouseParser::CreateMaterializedViewStmtContext::CreateMaterializedViewStmtContext(CreateStmtContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::CreateMaterializedViewStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitCreateMaterializedViewStmt(this);
@@ -2504,6 +2540,7 @@ ClickHouseParser::SubqueryClauseContext* ClickHouseParser::CreateTableStmtContex
 
 ClickHouseParser::CreateTableStmtContext::CreateTableStmtContext(CreateStmtContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::CreateTableStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitCreateTableStmt(this);
@@ -3022,6 +3059,7 @@ size_t ClickHouseParser::DictionarySchemaClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleDictionarySchemaClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::DictionarySchemaClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitDictionarySchemaClause(this);
@@ -3143,6 +3181,7 @@ size_t ClickHouseParser::DictionaryAttrDfntContext::getRuleIndex() const {
   return ClickHouseParser::RuleDictionaryAttrDfnt;
 }
 
+
 antlrcpp::Any ClickHouseParser::DictionaryAttrDfntContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitDictionaryAttrDfnt(this);
@@ -3298,6 +3337,7 @@ size_t ClickHouseParser::DictionaryEngineClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleDictionaryEngineClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::DictionaryEngineClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitDictionaryEngineClause(this);
@@ -3424,6 +3464,7 @@ size_t ClickHouseParser::DictionaryPrimaryKeyClauseContext::getRuleIndex() const
   return ClickHouseParser::RuleDictionaryPrimaryKeyClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::DictionaryPrimaryKeyClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitDictionaryPrimaryKeyClause(this);
@@ -3488,6 +3529,7 @@ size_t ClickHouseParser::DictionaryArgExprContext::getRuleIndex() const {
   return ClickHouseParser::RuleDictionaryArgExpr;
 }
 
+
 antlrcpp::Any ClickHouseParser::DictionaryArgExprContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitDictionaryArgExpr(this);
@@ -3775,6 +3817,7 @@ size_t ClickHouseParser::SourceClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleSourceClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::SourceClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitSourceClause(this);
@@ -4041,6 +4084,7 @@ size_t ClickHouseParser::LifetimeClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleLifetimeClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::LifetimeClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitLifetimeClause(this);
@@ -4153,6 +4197,7 @@ size_t ClickHouseParser::LayoutClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleLayoutClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::LayoutClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitLayoutClause(this);
@@ -4419,6 +4464,7 @@ size_t ClickHouseParser::RangeClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleRangeClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::RangeClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitRangeClause(this);
@@ -4509,6 +4555,7 @@ size_t ClickHouseParser::DictionarySettingsClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleDictionarySettingsClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::DictionarySettingsClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitDictionarySettingsClause(this);
@@ -4571,6 +4618,7 @@ size_t ClickHouseParser::ClusterClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleClusterClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::ClusterClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitClusterClause(this);
@@ -4815,6 +4863,7 @@ size_t ClickHouseParser::UuidClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleUuidClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::UuidClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitUuidClause(this);
@@ -4865,6 +4914,7 @@ size_t ClickHouseParser::DestinationClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleDestinationClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::DestinationClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitDestinationClause(this);
@@ -4915,6 +4965,7 @@ size_t ClickHouseParser::SubqueryClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleSubqueryClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::SubqueryClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitSubqueryClause(this);
@@ -4973,6 +5024,7 @@ ClickHouseParser::TableIdentifierContext* ClickHouseParser::SchemaAsTableClauseC
 
 ClickHouseParser::SchemaAsTableClauseContext::SchemaAsTableClauseContext(TableSchemaClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::SchemaAsTableClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitSchemaAsTableClause(this);
@@ -4991,6 +5043,7 @@ ClickHouseParser::TableFunctionExprContext* ClickHouseParser::SchemaAsFunctionCl
 
 ClickHouseParser::SchemaAsFunctionClauseContext::SchemaAsFunctionClauseContext(TableSchemaClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::SchemaAsFunctionClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitSchemaAsFunctionClause(this);
@@ -5025,6 +5078,7 @@ tree::TerminalNode* ClickHouseParser::SchemaDescriptionClauseContext::COMMA(size
 
 ClickHouseParser::SchemaDescriptionClauseContext::SchemaDescriptionClauseContext(TableSchemaClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::SchemaDescriptionClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitSchemaDescriptionClause(this);
@@ -5162,6 +5216,7 @@ size_t ClickHouseParser::EngineClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleEngineClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::EngineClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitEngineClause(this);
@@ -5289,6 +5344,7 @@ size_t ClickHouseParser::PartitionByClauseContext::getRuleIndex() const {
   return ClickHouseParser::RulePartitionByClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::PartitionByClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitPartitionByClause(this);
@@ -5345,6 +5401,7 @@ size_t ClickHouseParser::PrimaryKeyClauseContext::getRuleIndex() const {
   return ClickHouseParser::RulePrimaryKeyClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::PrimaryKeyClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitPrimaryKeyClause(this);
@@ -5401,6 +5458,7 @@ size_t ClickHouseParser::SampleByClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleSampleByClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::SampleByClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitSampleByClause(this);
@@ -5465,6 +5523,7 @@ size_t ClickHouseParser::TtlClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleTtlClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::TtlClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitTtlClause(this);
@@ -5546,6 +5605,7 @@ size_t ClickHouseParser::EngineExprContext::getRuleIndex() const {
   return ClickHouseParser::RuleEngineExpr;
 }
 
+
 antlrcpp::Any ClickHouseParser::EngineExprContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitEngineExpr(this);
@@ -5833,6 +5893,7 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::TableElementExprConstrain
 
 ClickHouseParser::TableElementExprConstraintContext::TableElementExprConstraintContext(TableElementExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::TableElementExprConstraintContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitTableElementExprConstraint(this);
@@ -5847,6 +5908,7 @@ ClickHouseParser::TableColumnDfntContext* ClickHouseParser::TableElementExprColu
 
 ClickHouseParser::TableElementExprColumnContext::TableElementExprColumnContext(TableElementExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::TableElementExprColumnContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitTableElementExprColumn(this);
@@ -5865,6 +5927,7 @@ ClickHouseParser::TableIndexDfntContext* ClickHouseParser::TableElementExprIndex
 
 ClickHouseParser::TableElementExprIndexContext::TableElementExprIndexContext(TableElementExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::TableElementExprIndexContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitTableElementExprIndex(this);
@@ -5969,6 +6032,7 @@ size_t ClickHouseParser::TableColumnDfntContext::getRuleIndex() const {
   return ClickHouseParser::RuleTableColumnDfnt;
 }
 
+
 antlrcpp::Any ClickHouseParser::TableColumnDfntContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitTableColumnDfnt(this);
@@ -6122,6 +6186,7 @@ size_t ClickHouseParser::TableColumnPropertyExprContext::getRuleIndex() const {
   return ClickHouseParser::RuleTableColumnPropertyExpr;
 }
 
+
 antlrcpp::Any ClickHouseParser::TableColumnPropertyExprContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitTableColumnPropertyExpr(this);
@@ -6198,6 +6263,7 @@ size_t ClickHouseParser::TableIndexDfntContext::getRuleIndex() const {
   return ClickHouseParser::RuleTableIndexDfnt;
 }
 
+
 antlrcpp::Any ClickHouseParser::TableIndexDfntContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitTableIndexDfnt(this);
@@ -6276,6 +6342,7 @@ size_t ClickHouseParser::CodecExprContext::getRuleIndex() const {
   return ClickHouseParser::RuleCodecExpr;
 }
 
+
 antlrcpp::Any ClickHouseParser::CodecExprContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitCodecExpr(this);
@@ -6351,6 +6418,7 @@ size_t ClickHouseParser::CodecArgExprContext::getRuleIndex() const {
   return ClickHouseParser::RuleCodecArgExpr;
 }
 
+
 antlrcpp::Any ClickHouseParser::CodecArgExprContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitCodecArgExpr(this);
@@ -6625,6 +6693,7 @@ size_t ClickHouseParser::TtlExprContext::getRuleIndex() const {
   return ClickHouseParser::RuleTtlExpr;
 }
 
+
 antlrcpp::Any ClickHouseParser::TtlExprContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitTtlExpr(this);
@@ -6712,6 +6781,7 @@ size_t ClickHouseParser::DescribeStmtContext::getRuleIndex() const {
   return ClickHouseParser::RuleDescribeStmt;
 }
 
+
 antlrcpp::Any ClickHouseParser::DescribeStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitDescribeStmt(this);
@@ -6811,6 +6881,7 @@ ClickHouseParser::ClusterClauseContext* ClickHouseParser::DropDatabaseStmtContex
 
 ClickHouseParser::DropDatabaseStmtContext::DropDatabaseStmtContext(DropStmtContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::DropDatabaseStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitDropDatabaseStmt(this);
@@ -6839,6 +6910,10 @@ tree::TerminalNode* ClickHouseParser::DropTableStmtContext::TABLE() {
   return getToken(ClickHouseParser::TABLE, 0);
 }
 
+tree::TerminalNode* ClickHouseParser::DropTableStmtContext::VIEW() {
+  return getToken(ClickHouseParser::VIEW, 0);
+}
+
 tree::TerminalNode* ClickHouseParser::DropTableStmtContext::IF() {
   return getToken(ClickHouseParser::IF, 0);
 }
@@ -6865,6 +6940,7 @@ tree::TerminalNode* ClickHouseParser::DropTableStmtContext::TEMPORARY() {
 
 ClickHouseParser::DropTableStmtContext::DropTableStmtContext(DropStmtContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::DropTableStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitDropTableStmt(this);
@@ -6880,7 +6956,7 @@ ClickHouseParser::DropStmtContext* ClickHouseParser::dropStmt() {
     exitRule();
   });
   try {
-    setState(942);
+    setState(943);
     _errHandler->sync(this);
     switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 104, _ctx)) {
     case 1: {
@@ -6939,7 +7015,7 @@ ClickHouseParser::DropStmtContext* ClickHouseParser::dropStmt() {
         _errHandler->reportMatch(this);
         consume();
       }
-      setState(928);
+      setState(929);
       _errHandler->sync(this);
       switch (_input->LA(1)) {
         case ClickHouseParser::DICTIONARY: {
@@ -6963,40 +7039,46 @@ ClickHouseParser::DropStmtContext* ClickHouseParser::dropStmt() {
           break;
         }
 
+        case ClickHouseParser::VIEW: {
+          setState(928);
+          match(ClickHouseParser::VIEW);
+          break;
+        }
+
       default:
         throw NoViableAltException(this);
       }
-      setState(932);
+      setState(933);
       _errHandler->sync(this);
 
       switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 101, _ctx)) {
       case 1: {
-        setState(930);
-        match(ClickHouseParser::IF);
         setState(931);
+        match(ClickHouseParser::IF);
+        setState(932);
         match(ClickHouseParser::EXISTS);
         break;
       }
 
       }
-      setState(934);
+      setState(935);
       tableIdentifier();
-      setState(936);
+      setState(937);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::ON) {
-        setState(935);
+        setState(936);
         clusterClause();
       }
-      setState(940);
+      setState(941);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::NO) {
-        setState(938);
-        match(ClickHouseParser::NO);
         setState(939);
+        match(ClickHouseParser::NO);
+        setState(940);
         match(ClickHouseParser::DELAY);
       }
       break;
@@ -7020,38 +7102,73 @@ ClickHouseParser::ExistsStmtContext::ExistsStmtContext(ParserRuleContext *parent
   : ParserRuleContext(parent, invokingState) {
 }
 
-tree::TerminalNode* ClickHouseParser::ExistsStmtContext::EXISTS() {
-  return getToken(ClickHouseParser::EXISTS, 0);
-}
-
-ClickHouseParser::TableIdentifierContext* ClickHouseParser::ExistsStmtContext::tableIdentifier() {
-  return getRuleContext<ClickHouseParser::TableIdentifierContext>(0);
-}
-
-tree::TerminalNode* ClickHouseParser::ExistsStmtContext::DICTIONARY() {
-  return getToken(ClickHouseParser::DICTIONARY, 0);
-}
-
-tree::TerminalNode* ClickHouseParser::ExistsStmtContext::TABLE() {
-  return getToken(ClickHouseParser::TABLE, 0);
-}
-
-tree::TerminalNode* ClickHouseParser::ExistsStmtContext::TEMPORARY() {
-  return getToken(ClickHouseParser::TEMPORARY, 0);
-}
-
 
 size_t ClickHouseParser::ExistsStmtContext::getRuleIndex() const {
   return ClickHouseParser::RuleExistsStmt;
 }
 
-antlrcpp::Any ClickHouseParser::ExistsStmtContext::accept(tree::ParseTreeVisitor *visitor) {
+void ClickHouseParser::ExistsStmtContext::copyFrom(ExistsStmtContext *ctx) {
+  ParserRuleContext::copyFrom(ctx);
+}
+
+//----------------- ExistsTableStmtContext ------------------------------------------------------------------
+
+tree::TerminalNode* ClickHouseParser::ExistsTableStmtContext::EXISTS() {
+  return getToken(ClickHouseParser::EXISTS, 0);
+}
+
+ClickHouseParser::TableIdentifierContext* ClickHouseParser::ExistsTableStmtContext::tableIdentifier() {
+  return getRuleContext<ClickHouseParser::TableIdentifierContext>(0);
+}
+
+tree::TerminalNode* ClickHouseParser::ExistsTableStmtContext::DICTIONARY() {
+  return getToken(ClickHouseParser::DICTIONARY, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::ExistsTableStmtContext::TABLE() {
+  return getToken(ClickHouseParser::TABLE, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::ExistsTableStmtContext::VIEW() {
+  return getToken(ClickHouseParser::VIEW, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::ExistsTableStmtContext::TEMPORARY() {
+  return getToken(ClickHouseParser::TEMPORARY, 0);
+}
+
+ClickHouseParser::ExistsTableStmtContext::ExistsTableStmtContext(ExistsStmtContext *ctx) { copyFrom(ctx); }
+
+
+antlrcpp::Any ClickHouseParser::ExistsTableStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
-    return parserVisitor->visitExistsStmt(this);
+    return parserVisitor->visitExistsTableStmt(this);
   else
     return visitor->visitChildren(this);
 }
+//----------------- ExistsDatabaseStmtContext ------------------------------------------------------------------
 
+tree::TerminalNode* ClickHouseParser::ExistsDatabaseStmtContext::EXISTS() {
+  return getToken(ClickHouseParser::EXISTS, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::ExistsDatabaseStmtContext::DATABASE() {
+  return getToken(ClickHouseParser::DATABASE, 0);
+}
+
+ClickHouseParser::DatabaseIdentifierContext* ClickHouseParser::ExistsDatabaseStmtContext::databaseIdentifier() {
+  return getRuleContext<ClickHouseParser::DatabaseIdentifierContext>(0);
+}
+
+ClickHouseParser::ExistsDatabaseStmtContext::ExistsDatabaseStmtContext(ExistsStmtContext *ctx) { copyFrom(ctx); }
+
+
+antlrcpp::Any ClickHouseParser::ExistsDatabaseStmtContext::accept(tree::ParseTreeVisitor *visitor) {
+  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
+    return parserVisitor->visitExistsDatabaseStmt(this);
+  else
+    return visitor->visitChildren(this);
+}
 ClickHouseParser::ExistsStmtContext* ClickHouseParser::existsStmt() {
   ExistsStmtContext *_localctx = _tracker.createInstance<ExistsStmtContext>(_ctx, getState());
   enterRule(_localctx, 82, ClickHouseParser::RuleExistsStmt);
@@ -7061,36 +7178,63 @@ ClickHouseParser::ExistsStmtContext* ClickHouseParser::existsStmt() {
     exitRule();
   });
   try {
-    enterOuterAlt(_localctx, 1);
-    setState(944);
-    match(ClickHouseParser::EXISTS);
-    setState(950);
+    setState(958);
     _errHandler->sync(this);
-
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 106, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 107, _ctx)) {
     case 1: {
+      _localctx = dynamic_cast<ExistsStmtContext *>(_tracker.createInstance<ClickHouseParser::ExistsDatabaseStmtContext>(_localctx));
+      enterOuterAlt(_localctx, 1);
       setState(945);
-      match(ClickHouseParser::DICTIONARY);
+      match(ClickHouseParser::EXISTS);
+      setState(946);
+      match(ClickHouseParser::DATABASE);
+      setState(947);
+      databaseIdentifier();
       break;
     }
 
     case 2: {
-      setState(947);
+      _localctx = dynamic_cast<ExistsStmtContext *>(_tracker.createInstance<ClickHouseParser::ExistsTableStmtContext>(_localctx));
+      enterOuterAlt(_localctx, 2);
+      setState(948);
+      match(ClickHouseParser::EXISTS);
+      setState(955);
       _errHandler->sync(this);
 
-      _la = _input->LA(1);
-      if (_la == ClickHouseParser::TEMPORARY) {
-        setState(946);
-        match(ClickHouseParser::TEMPORARY);
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 106, _ctx)) {
+      case 1: {
+        setState(949);
+        match(ClickHouseParser::DICTIONARY);
+        break;
       }
-      setState(949);
-      match(ClickHouseParser::TABLE);
+
+      case 2: {
+        setState(951);
+        _errHandler->sync(this);
+
+        _la = _input->LA(1);
+        if (_la == ClickHouseParser::TEMPORARY) {
+          setState(950);
+          match(ClickHouseParser::TEMPORARY);
+        }
+        setState(953);
+        match(ClickHouseParser::TABLE);
+        break;
+      }
+
+      case 3: {
+        setState(954);
+        match(ClickHouseParser::VIEW);
+        break;
+      }
+
+      }
+      setState(957);
+      tableIdentifier();
       break;
     }
 
     }
-    setState(952);
-    tableIdentifier();
    
   }
   catch (RecognitionException &e) {
@@ -7125,6 +7269,7 @@ size_t ClickHouseParser::ExplainStmtContext::getRuleIndex() const {
   return ClickHouseParser::RuleExplainStmt;
 }
 
+
 antlrcpp::Any ClickHouseParser::ExplainStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitExplainStmt(this);
@@ -7141,11 +7286,11 @@ ClickHouseParser::ExplainStmtContext* ClickHouseParser::explainStmt() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(954);
+    setState(960);
     match(ClickHouseParser::EXPLAIN);
-    setState(955);
+    setState(961);
     match(ClickHouseParser::SYNTAX);
-    setState(956);
+    setState(962);
     query();
    
   }
@@ -7201,6 +7346,7 @@ size_t ClickHouseParser::InsertStmtContext::getRuleIndex() const {
   return ClickHouseParser::RuleInsertStmt;
 }
 
+
 antlrcpp::Any ClickHouseParser::InsertStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitInsertStmt(this);
@@ -7217,51 +7363,51 @@ ClickHouseParser::InsertStmtContext* ClickHouseParser::insertStmt() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(958);
+    setState(964);
     match(ClickHouseParser::INSERT);
-    setState(959);
+    setState(965);
     match(ClickHouseParser::INTO);
-    setState(961);
+    setState(967);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 107, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 108, _ctx)) {
     case 1: {
-      setState(960);
+      setState(966);
       match(ClickHouseParser::TABLE);
       break;
     }
 
     }
-    setState(966);
+    setState(972);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 108, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 109, _ctx)) {
     case 1: {
-      setState(963);
+      setState(969);
       tableIdentifier();
       break;
     }
 
     case 2: {
-      setState(964);
+      setState(970);
       match(ClickHouseParser::FUNCTION);
-      setState(965);
+      setState(971);
       tableFunctionExpr();
       break;
     }
 
     }
-    setState(969);
+    setState(975);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 109, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 110, _ctx)) {
     case 1: {
-      setState(968);
+      setState(974);
       columnsClause();
       break;
     }
 
     }
-    setState(971);
+    setState(977);
     dataClause();
    
   }
@@ -7309,6 +7455,7 @@ size_t ClickHouseParser::ColumnsClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleColumnsClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::ColumnsClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnsClause(this);
@@ -7326,23 +7473,23 @@ ClickHouseParser::ColumnsClauseContext* ClickHouseParser::columnsClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(973);
-    match(ClickHouseParser::LPAREN);
-    setState(974);
-    nestedIdentifier();
     setState(979);
+    match(ClickHouseParser::LPAREN);
+    setState(980);
+    nestedIdentifier();
+    setState(985);
     _errHandler->sync(this);
     _la = _input->LA(1);
     while (_la == ClickHouseParser::COMMA) {
-      setState(975);
-      match(ClickHouseParser::COMMA);
-      setState(976);
-      nestedIdentifier();
       setState(981);
+      match(ClickHouseParser::COMMA);
+      setState(982);
+      nestedIdentifier();
+      setState(987);
       _errHandler->sync(this);
       _la = _input->LA(1);
     }
-    setState(982);
+    setState(988);
     match(ClickHouseParser::RPAREN);
    
   }
@@ -7378,6 +7525,7 @@ tree::TerminalNode* ClickHouseParser::DataClauseValuesContext::VALUES() {
 
 ClickHouseParser::DataClauseValuesContext::DataClauseValuesContext(DataClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::DataClauseValuesContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitDataClauseValues(this);
@@ -7396,6 +7544,7 @@ ClickHouseParser::IdentifierContext* ClickHouseParser::DataClauseFormatContext::
 
 ClickHouseParser::DataClauseFormatContext::DataClauseFormatContext(DataClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::DataClauseFormatContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitDataClauseFormat(this);
@@ -7418,6 +7567,7 @@ tree::TerminalNode* ClickHouseParser::DataClauseSelectContext::SEMICOLON() {
 
 ClickHouseParser::DataClauseSelectContext::DataClauseSelectContext(DataClauseContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::DataClauseSelectContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitDataClauseSelect(this);
@@ -7433,15 +7583,15 @@ ClickHouseParser::DataClauseContext* ClickHouseParser::dataClause() {
     exitRule();
   });
   try {
-    setState(993);
+    setState(999);
     _errHandler->sync(this);
     switch (_input->LA(1)) {
       case ClickHouseParser::FORMAT: {
         _localctx = dynamic_cast<DataClauseContext *>(_tracker.createInstance<ClickHouseParser::DataClauseFormatContext>(_localctx));
         enterOuterAlt(_localctx, 1);
-        setState(984);
+        setState(990);
         match(ClickHouseParser::FORMAT);
-        setState(985);
+        setState(991);
         identifier();
         break;
       }
@@ -7449,7 +7599,7 @@ ClickHouseParser::DataClauseContext* ClickHouseParser::dataClause() {
       case ClickHouseParser::VALUES: {
         _localctx = dynamic_cast<DataClauseContext *>(_tracker.createInstance<ClickHouseParser::DataClauseValuesContext>(_localctx));
         enterOuterAlt(_localctx, 2);
-        setState(986);
+        setState(992);
         match(ClickHouseParser::VALUES);
         break;
       }
@@ -7459,17 +7609,17 @@ ClickHouseParser::DataClauseContext* ClickHouseParser::dataClause() {
       case ClickHouseParser::LPAREN: {
         _localctx = dynamic_cast<DataClauseContext *>(_tracker.createInstance<ClickHouseParser::DataClauseSelectContext>(_localctx));
         enterOuterAlt(_localctx, 3);
-        setState(987);
+        setState(993);
         selectUnionStmt();
-        setState(989);
+        setState(995);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
         if (_la == ClickHouseParser::SEMICOLON) {
-          setState(988);
+          setState(994);
           match(ClickHouseParser::SEMICOLON);
         }
-        setState(991);
+        setState(997);
         match(ClickHouseParser::EOF);
         break;
       }
@@ -7535,6 +7685,7 @@ tree::TerminalNode* ClickHouseParser::KillMutationStmtContext::TEST() {
 
 ClickHouseParser::KillMutationStmtContext::KillMutationStmtContext(KillStmtContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::KillMutationStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitKillMutationStmt(this);
@@ -7552,28 +7703,28 @@ ClickHouseParser::KillStmtContext* ClickHouseParser::killStmt() {
   try {
     _localctx = dynamic_cast<KillStmtContext *>(_tracker.createInstance<ClickHouseParser::KillMutationStmtContext>(_localctx));
     enterOuterAlt(_localctx, 1);
-    setState(995);
+    setState(1001);
     match(ClickHouseParser::KILL);
-    setState(996);
+    setState(1002);
     match(ClickHouseParser::MUTATION);
-    setState(998);
+    setState(1004);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::ON) {
-      setState(997);
+      setState(1003);
       clusterClause();
     }
-    setState(1000);
+    setState(1006);
     whereClause();
-    setState(1002);
+    setState(1008);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::ASYNC || _la == ClickHouseParser::SYNC
 
     || _la == ClickHouseParser::TEST) {
-      setState(1001);
+      setState(1007);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::ASYNC || _la == ClickHouseParser::SYNC
 
@@ -7635,6 +7786,7 @@ size_t ClickHouseParser::OptimizeStmtContext::getRuleIndex() const {
   return ClickHouseParser::RuleOptimizeStmt;
 }
 
+
 antlrcpp::Any ClickHouseParser::OptimizeStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitOptimizeStmt(this);
@@ -7652,42 +7804,42 @@ ClickHouseParser::OptimizeStmtContext* ClickHouseParser::optimizeStmt() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1004);
+    setState(1010);
     match(ClickHouseParser::OPTIMIZE);
-    setState(1005);
-    match(ClickHouseParser::TABLE);
-    setState(1006);
-    tableIdentifier();
-    setState(1008);
-    _errHandler->sync(this);
-
-    _la = _input->LA(1);
-    if (_la == ClickHouseParser::ON) {
-      setState(1007);
-      clusterClause();
-    }
     setState(1011);
-    _errHandler->sync(this);
-
-    _la = _input->LA(1);
-    if (_la == ClickHouseParser::PARTITION) {
-      setState(1010);
-      partitionClause();
-    }
+    match(ClickHouseParser::TABLE);
+    setState(1012);
+    tableIdentifier();
     setState(1014);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
-    if (_la == ClickHouseParser::FINAL) {
+    if (_la == ClickHouseParser::ON) {
       setState(1013);
-      match(ClickHouseParser::FINAL);
+      clusterClause();
     }
     setState(1017);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
-    if (_la == ClickHouseParser::DEDUPLICATE) {
+    if (_la == ClickHouseParser::PARTITION) {
       setState(1016);
+      partitionClause();
+    }
+    setState(1020);
+    _errHandler->sync(this);
+
+    _la = _input->LA(1);
+    if (_la == ClickHouseParser::FINAL) {
+      setState(1019);
+      match(ClickHouseParser::FINAL);
+    }
+    setState(1023);
+    _errHandler->sync(this);
+
+    _la = _input->LA(1);
+    if (_la == ClickHouseParser::DEDUPLICATE) {
+      setState(1022);
       match(ClickHouseParser::DEDUPLICATE);
     }
    
@@ -7748,6 +7900,7 @@ size_t ClickHouseParser::RenameStmtContext::getRuleIndex() const {
   return ClickHouseParser::RuleRenameStmt;
 }
 
+
 antlrcpp::Any ClickHouseParser::RenameStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitRenameStmt(this);
@@ -7765,38 +7918,38 @@ ClickHouseParser::RenameStmtContext* ClickHouseParser::renameStmt() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1019);
+    setState(1025);
     match(ClickHouseParser::RENAME);
-    setState(1020);
+    setState(1026);
     match(ClickHouseParser::TABLE);
-    setState(1021);
+    setState(1027);
     tableIdentifier();
-    setState(1022);
+    setState(1028);
     match(ClickHouseParser::TO);
-    setState(1023);
+    setState(1029);
     tableIdentifier();
-    setState(1031);
+    setState(1037);
     _errHandler->sync(this);
     _la = _input->LA(1);
     while (_la == ClickHouseParser::COMMA) {
-      setState(1024);
+      setState(1030);
       match(ClickHouseParser::COMMA);
-      setState(1025);
+      setState(1031);
       tableIdentifier();
-      setState(1026);
+      setState(1032);
       match(ClickHouseParser::TO);
-      setState(1027);
-      tableIdentifier();
       setState(1033);
+      tableIdentifier();
+      setState(1039);
       _errHandler->sync(this);
       _la = _input->LA(1);
     }
-    setState(1035);
+    setState(1041);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::ON) {
-      setState(1034);
+      setState(1040);
       clusterClause();
     }
    
@@ -7845,6 +7998,7 @@ size_t ClickHouseParser::SelectUnionStmtContext::getRuleIndex() const {
   return ClickHouseParser::RuleSelectUnionStmt;
 }
 
+
 antlrcpp::Any ClickHouseParser::SelectUnionStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitSelectUnionStmt(this);
@@ -7862,19 +8016,19 @@ ClickHouseParser::SelectUnionStmtContext* ClickHouseParser::selectUnionStmt() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1037);
-    selectStmtWithParens();
     setState(1043);
+    selectStmtWithParens();
+    setState(1049);
     _errHandler->sync(this);
     _la = _input->LA(1);
     while (_la == ClickHouseParser::UNION) {
-      setState(1038);
+      setState(1044);
       match(ClickHouseParser::UNION);
-      setState(1039);
-      match(ClickHouseParser::ALL);
-      setState(1040);
-      selectStmtWithParens();
       setState(1045);
+      match(ClickHouseParser::ALL);
+      setState(1046);
+      selectStmtWithParens();
+      setState(1051);
       _errHandler->sync(this);
       _la = _input->LA(1);
     }
@@ -7916,6 +8070,7 @@ size_t ClickHouseParser::SelectStmtWithParensContext::getRuleIndex() const {
   return ClickHouseParser::RuleSelectStmtWithParens;
 }
 
+
 antlrcpp::Any ClickHouseParser::SelectStmtWithParensContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitSelectStmtWithParens(this);
@@ -7931,24 +8086,24 @@ ClickHouseParser::SelectStmtWithParensContext* ClickHouseParser::selectStmtWithP
     exitRule();
   });
   try {
-    setState(1051);
+    setState(1057);
     _errHandler->sync(this);
     switch (_input->LA(1)) {
       case ClickHouseParser::SELECT:
       case ClickHouseParser::WITH: {
         enterOuterAlt(_localctx, 1);
-        setState(1046);
+        setState(1052);
         selectStmt();
         break;
       }
 
       case ClickHouseParser::LPAREN: {
         enterOuterAlt(_localctx, 2);
-        setState(1047);
+        setState(1053);
         match(ClickHouseParser::LPAREN);
-        setState(1048);
+        setState(1054);
         selectUnionStmt();
-        setState(1049);
+        setState(1055);
         match(ClickHouseParser::RPAREN);
         break;
       }
@@ -8058,6 +8213,7 @@ size_t ClickHouseParser::SelectStmtContext::getRuleIndex() const {
   return ClickHouseParser::RuleSelectStmt;
 }
 
+
 antlrcpp::Any ClickHouseParser::SelectStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitSelectStmt(this);
@@ -8075,90 +8231,90 @@ ClickHouseParser::SelectStmtContext* ClickHouseParser::selectStmt() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1054);
+    setState(1060);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::WITH) {
-      setState(1053);
+      setState(1059);
       withClause();
     }
-    setState(1056);
+    setState(1062);
     match(ClickHouseParser::SELECT);
-    setState(1058);
+    setState(1064);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 124, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 125, _ctx)) {
     case 1: {
-      setState(1057);
+      setState(1063);
       match(ClickHouseParser::DISTINCT);
       break;
     }
 
     }
-    setState(1061);
+    setState(1067);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 125, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 126, _ctx)) {
     case 1: {
-      setState(1060);
+      setState(1066);
       topClause();
       break;
     }
 
     }
-    setState(1063);
+    setState(1069);
     columnExprList();
-    setState(1065);
+    setState(1071);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::FROM) {
-      setState(1064);
+      setState(1070);
       fromClause();
     }
-    setState(1068);
+    setState(1074);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::ARRAY || _la == ClickHouseParser::INNER
 
     || _la == ClickHouseParser::LEFT) {
-      setState(1067);
-      arrayJoinClause();
-    }
-    setState(1071);
-    _errHandler->sync(this);
-
-    _la = _input->LA(1);
-    if (_la == ClickHouseParser::PREWHERE) {
-      setState(1070);
-      prewhereClause();
-    }
-    setState(1074);
-    _errHandler->sync(this);
-
-    _la = _input->LA(1);
-    if (_la == ClickHouseParser::WHERE) {
       setState(1073);
-      whereClause();
+      arrayJoinClause();
     }
     setState(1077);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
-    if (_la == ClickHouseParser::GROUP) {
+    if (_la == ClickHouseParser::PREWHERE) {
       setState(1076);
-      groupByClause();
+      prewhereClause();
     }
-    setState(1081);
+    setState(1080);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 131, _ctx)) {
-    case 1: {
+    _la = _input->LA(1);
+    if (_la == ClickHouseParser::WHERE) {
       setState(1079);
+      whereClause();
+    }
+    setState(1083);
+    _errHandler->sync(this);
+
+    _la = _input->LA(1);
+    if (_la == ClickHouseParser::GROUP) {
+      setState(1082);
+      groupByClause();
+    }
+    setState(1087);
+    _errHandler->sync(this);
+
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 132, _ctx)) {
+    case 1: {
+      setState(1085);
       match(ClickHouseParser::WITH);
-      setState(1080);
+      setState(1086);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::CUBE || _la == ClickHouseParser::ROLLUP)) {
       _errHandler->recoverInline(this);
@@ -8170,58 +8326,58 @@ ClickHouseParser::SelectStmtContext* ClickHouseParser::selectStmt() {
       break;
     }
 
-    }
-    setState(1085);
-    _errHandler->sync(this);
-
-    _la = _input->LA(1);
-    if (_la == ClickHouseParser::WITH) {
-      setState(1083);
-      match(ClickHouseParser::WITH);
-      setState(1084);
-      match(ClickHouseParser::TOTALS);
-    }
-    setState(1088);
-    _errHandler->sync(this);
-
-    _la = _input->LA(1);
-    if (_la == ClickHouseParser::HAVING) {
-      setState(1087);
-      havingClause();
     }
     setState(1091);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
-    if (_la == ClickHouseParser::ORDER) {
+    if (_la == ClickHouseParser::WITH) {
+      setState(1089);
+      match(ClickHouseParser::WITH);
       setState(1090);
-      orderByClause();
+      match(ClickHouseParser::TOTALS);
     }
     setState(1094);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 135, _ctx)) {
-    case 1: {
+    _la = _input->LA(1);
+    if (_la == ClickHouseParser::HAVING) {
       setState(1093);
-      limitByClause();
-      break;
-    }
-
+      havingClause();
     }
     setState(1097);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
-    if (_la == ClickHouseParser::LIMIT) {
+    if (_la == ClickHouseParser::ORDER) {
       setState(1096);
-      limitClause();
+      orderByClause();
     }
     setState(1100);
     _errHandler->sync(this);
 
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 136, _ctx)) {
+    case 1: {
+      setState(1099);
+      limitByClause();
+      break;
+    }
+
+    }
+    setState(1103);
+    _errHandler->sync(this);
+
+    _la = _input->LA(1);
+    if (_la == ClickHouseParser::LIMIT) {
+      setState(1102);
+      limitClause();
+    }
+    setState(1106);
+    _errHandler->sync(this);
+
     _la = _input->LA(1);
     if (_la == ClickHouseParser::SETTINGS) {
-      setState(1099);
+      setState(1105);
       settingsClause();
     }
    
@@ -8254,6 +8410,7 @@ size_t ClickHouseParser::WithClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleWithClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::WithClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitWithClause(this);
@@ -8270,9 +8427,9 @@ ClickHouseParser::WithClauseContext* ClickHouseParser::withClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1102);
+    setState(1108);
     match(ClickHouseParser::WITH);
-    setState(1103);
+    setState(1109);
     columnExprList();
    
   }
@@ -8312,6 +8469,7 @@ size_t ClickHouseParser::TopClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleTopClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::TopClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitTopClause(this);
@@ -8328,18 +8486,18 @@ ClickHouseParser::TopClauseContext* ClickHouseParser::topClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1105);
+    setState(1111);
     match(ClickHouseParser::TOP);
-    setState(1106);
+    setState(1112);
     match(ClickHouseParser::DECIMAL_LITERAL);
-    setState(1109);
+    setState(1115);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 138, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 139, _ctx)) {
     case 1: {
-      setState(1107);
+      setState(1113);
       match(ClickHouseParser::WITH);
-      setState(1108);
+      setState(1114);
       match(ClickHouseParser::TIES);
       break;
     }
@@ -8375,6 +8533,7 @@ size_t ClickHouseParser::FromClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleFromClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::FromClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitFromClause(this);
@@ -8391,9 +8550,9 @@ ClickHouseParser::FromClauseContext* ClickHouseParser::fromClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1111);
+    setState(1117);
     match(ClickHouseParser::FROM);
-    setState(1112);
+    setState(1118);
     joinExpr(0);
    
   }
@@ -8437,6 +8596,7 @@ size_t ClickHouseParser::ArrayJoinClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleArrayJoinClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::ArrayJoinClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitArrayJoinClause(this);
@@ -8454,14 +8614,14 @@ ClickHouseParser::ArrayJoinClauseContext* ClickHouseParser::arrayJoinClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1115);
+    setState(1121);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::INNER
 
     || _la == ClickHouseParser::LEFT) {
-      setState(1114);
+      setState(1120);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::INNER
 
@@ -8473,11 +8633,11 @@ ClickHouseParser::ArrayJoinClauseContext* ClickHouseParser::arrayJoinClause() {
         consume();
       }
     }
-    setState(1117);
+    setState(1123);
     match(ClickHouseParser::ARRAY);
-    setState(1118);
+    setState(1124);
     match(ClickHouseParser::JOIN);
-    setState(1119);
+    setState(1125);
     columnExprList();
    
   }
@@ -8509,6 +8669,7 @@ size_t ClickHouseParser::PrewhereClauseContext::getRuleIndex() const {
   return ClickHouseParser::RulePrewhereClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::PrewhereClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitPrewhereClause(this);
@@ -8525,9 +8686,9 @@ ClickHouseParser::PrewhereClauseContext* ClickHouseParser::prewhereClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1121);
+    setState(1127);
     match(ClickHouseParser::PREWHERE);
-    setState(1122);
+    setState(1128);
     columnExpr(0);
    
   }
@@ -8559,6 +8720,7 @@ size_t ClickHouseParser::WhereClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleWhereClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::WhereClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitWhereClause(this);
@@ -8575,9 +8737,9 @@ ClickHouseParser::WhereClauseContext* ClickHouseParser::whereClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1124);
+    setState(1130);
     match(ClickHouseParser::WHERE);
-    setState(1125);
+    setState(1131);
     columnExpr(0);
    
   }
@@ -8629,6 +8791,7 @@ size_t ClickHouseParser::GroupByClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleGroupByClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::GroupByClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitGroupByClause(this);
@@ -8646,15 +8809,15 @@ ClickHouseParser::GroupByClauseContext* ClickHouseParser::groupByClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1127);
+    setState(1133);
     match(ClickHouseParser::GROUP);
-    setState(1128);
+    setState(1134);
     match(ClickHouseParser::BY);
-    setState(1135);
+    setState(1141);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 140, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 141, _ctx)) {
     case 1: {
-      setState(1129);
+      setState(1135);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::CUBE || _la == ClickHouseParser::ROLLUP)) {
       _errHandler->recoverInline(this);
@@ -8663,17 +8826,17 @@ ClickHouseParser::GroupByClauseContext* ClickHouseParser::groupByClause() {
         _errHandler->reportMatch(this);
         consume();
       }
-      setState(1130);
+      setState(1136);
       match(ClickHouseParser::LPAREN);
-      setState(1131);
+      setState(1137);
       columnExprList();
-      setState(1132);
+      setState(1138);
       match(ClickHouseParser::RPAREN);
       break;
     }
 
     case 2: {
-      setState(1134);
+      setState(1140);
       columnExprList();
       break;
     }
@@ -8709,6 +8872,7 @@ size_t ClickHouseParser::HavingClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleHavingClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::HavingClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitHavingClause(this);
@@ -8725,9 +8889,9 @@ ClickHouseParser::HavingClauseContext* ClickHouseParser::havingClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1137);
+    setState(1143);
     match(ClickHouseParser::HAVING);
-    setState(1138);
+    setState(1144);
     columnExpr(0);
    
   }
@@ -8763,6 +8927,7 @@ size_t ClickHouseParser::OrderByClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleOrderByClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::OrderByClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitOrderByClause(this);
@@ -8779,11 +8944,11 @@ ClickHouseParser::OrderByClauseContext* ClickHouseParser::orderByClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1140);
+    setState(1146);
     match(ClickHouseParser::ORDER);
-    setState(1141);
+    setState(1147);
     match(ClickHouseParser::BY);
-    setState(1142);
+    setState(1148);
     orderExprList();
    
   }
@@ -8823,6 +8988,7 @@ size_t ClickHouseParser::LimitByClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleLimitByClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::LimitByClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitLimitByClause(this);
@@ -8839,13 +9005,13 @@ ClickHouseParser::LimitByClauseContext* ClickHouseParser::limitByClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1144);
+    setState(1150);
     match(ClickHouseParser::LIMIT);
-    setState(1145);
+    setState(1151);
     limitExpr();
-    setState(1146);
+    setState(1152);
     match(ClickHouseParser::BY);
-    setState(1147);
+    setState(1153);
     columnExprList();
    
   }
@@ -8885,6 +9051,7 @@ size_t ClickHouseParser::LimitClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleLimitClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::LimitClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitLimitClause(this);
@@ -8902,18 +9069,18 @@ ClickHouseParser::LimitClauseContext* ClickHouseParser::limitClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1149);
+    setState(1155);
     match(ClickHouseParser::LIMIT);
-    setState(1150);
+    setState(1156);
     limitExpr();
-    setState(1153);
+    setState(1159);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::WITH) {
-      setState(1151);
+      setState(1157);
       match(ClickHouseParser::WITH);
-      setState(1152);
+      setState(1158);
       match(ClickHouseParser::TIES);
     }
    
@@ -8946,6 +9113,7 @@ size_t ClickHouseParser::SettingsClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleSettingsClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::SettingsClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitSettingsClause(this);
@@ -8962,9 +9130,9 @@ ClickHouseParser::SettingsClauseContext* ClickHouseParser::settingsClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1155);
+    setState(1161);
     match(ClickHouseParser::SETTINGS);
-    setState(1156);
+    setState(1162);
     settingExprList();
    
   }
@@ -9024,6 +9192,7 @@ tree::TerminalNode* ClickHouseParser::JoinExprOpContext::LOCAL() {
 
 ClickHouseParser::JoinExprOpContext::JoinExprOpContext(JoinExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::JoinExprOpContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitJoinExprOp(this);
@@ -9046,6 +9215,7 @@ ClickHouseParser::SampleClauseContext* ClickHouseParser::JoinExprTableContext::s
 
 ClickHouseParser::JoinExprTableContext::JoinExprTableContext(JoinExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::JoinExprTableContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitJoinExprTable(this);
@@ -9068,6 +9238,7 @@ tree::TerminalNode* ClickHouseParser::JoinExprParensContext::RPAREN() {
 
 ClickHouseParser::JoinExprParensContext::JoinExprParensContext(JoinExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::JoinExprParensContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitJoinExprParens(this);
@@ -9090,6 +9261,7 @@ ClickHouseParser::JoinOpCrossContext* ClickHouseParser::JoinExprCrossOpContext::
 
 ClickHouseParser::JoinExprCrossOpContext::JoinExprCrossOpContext(JoinExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::JoinExprCrossOpContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitJoinExprCrossOp(this);
@@ -9118,33 +9290,33 @@ ClickHouseParser::JoinExprContext* ClickHouseParser::joinExpr(int precedence) {
   try {
     size_t alt;
     enterOuterAlt(_localctx, 1);
-    setState(1170);
+    setState(1176);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 144, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 145, _ctx)) {
     case 1: {
       _localctx = _tracker.createInstance<JoinExprTableContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
 
-      setState(1159);
+      setState(1165);
       tableExpr(0);
-      setState(1161);
+      setState(1167);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 142, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 143, _ctx)) {
       case 1: {
-        setState(1160);
+        setState(1166);
         match(ClickHouseParser::FINAL);
         break;
       }
 
       }
-      setState(1164);
+      setState(1170);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 143, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 144, _ctx)) {
       case 1: {
-        setState(1163);
+        setState(1169);
         sampleClause();
         break;
       }
@@ -9157,38 +9329,38 @@ ClickHouseParser::JoinExprContext* ClickHouseParser::joinExpr(int precedence) {
       _localctx = _tracker.createInstance<JoinExprParensContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1166);
+      setState(1172);
       match(ClickHouseParser::LPAREN);
-      setState(1167);
+      setState(1173);
       joinExpr(0);
-      setState(1168);
+      setState(1174);
       match(ClickHouseParser::RPAREN);
       break;
     }
 
     }
     _ctx->stop = _input->LT(-1);
-    setState(1189);
+    setState(1195);
     _errHandler->sync(this);
-    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 148, _ctx);
+    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 149, _ctx);
     while (alt != 2 && alt != atn::ATN::INVALID_ALT_NUMBER) {
       if (alt == 1) {
         if (!_parseListeners.empty())
           triggerExitRuleEvent();
         previousContext = _localctx;
-        setState(1187);
+        setState(1193);
         _errHandler->sync(this);
-        switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 147, _ctx)) {
+        switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 148, _ctx)) {
         case 1: {
           auto newContext = _tracker.createInstance<JoinExprCrossOpContext>(_tracker.createInstance<JoinExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleJoinExpr);
-          setState(1172);
+          setState(1178);
 
           if (!(precpred(_ctx, 3))) throw FailedPredicateException(this, "precpred(_ctx, 3)");
-          setState(1173);
+          setState(1179);
           joinOpCross();
-          setState(1174);
+          setState(1180);
           joinExpr(4);
           break;
         }
@@ -9197,17 +9369,17 @@ ClickHouseParser::JoinExprContext* ClickHouseParser::joinExpr(int precedence) {
           auto newContext = _tracker.createInstance<JoinExprOpContext>(_tracker.createInstance<JoinExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleJoinExpr);
-          setState(1176);
+          setState(1182);
 
           if (!(precpred(_ctx, 4))) throw FailedPredicateException(this, "precpred(_ctx, 4)");
-          setState(1178);
+          setState(1184);
           _errHandler->sync(this);
 
           _la = _input->LA(1);
           if (_la == ClickHouseParser::GLOBAL
 
           || _la == ClickHouseParser::LOCAL) {
-            setState(1177);
+            setState(1183);
             _la = _input->LA(1);
             if (!(_la == ClickHouseParser::GLOBAL
 
@@ -9219,7 +9391,7 @@ ClickHouseParser::JoinExprContext* ClickHouseParser::joinExpr(int precedence) {
               consume();
             }
           }
-          setState(1181);
+          setState(1187);
           _errHandler->sync(this);
 
           _la = _input->LA(1);
@@ -9233,23 +9405,23 @@ ClickHouseParser::JoinExprContext* ClickHouseParser::joinExpr(int precedence) {
             | (1ULL << (ClickHouseParser::LEFT - 80))
             | (1ULL << (ClickHouseParser::RIGHT - 80))
             | (1ULL << (ClickHouseParser::SEMI - 80)))) != 0)) {
-            setState(1180);
+            setState(1186);
             joinOp();
           }
-          setState(1183);
+          setState(1189);
           match(ClickHouseParser::JOIN);
-          setState(1184);
+          setState(1190);
           joinExpr(0);
-          setState(1185);
+          setState(1191);
           joinConstraintClause();
           break;
         }
 
         } 
       }
-      setState(1191);
+      setState(1197);
       _errHandler->sync(this);
-      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 148, _ctx);
+      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 149, _ctx);
     }
   }
   catch (RecognitionException &e) {
@@ -9295,6 +9467,7 @@ tree::TerminalNode* ClickHouseParser::JoinOpFullContext::ANY() {
 
 ClickHouseParser::JoinOpFullContext::JoinOpFullContext(JoinOpContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::JoinOpFullContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitJoinOpFull(this);
@@ -9321,6 +9494,7 @@ tree::TerminalNode* ClickHouseParser::JoinOpInnerContext::ASOF() {
 
 ClickHouseParser::JoinOpInnerContext::JoinOpInnerContext(JoinOpContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::JoinOpInnerContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitJoinOpInner(this);
@@ -9363,6 +9537,7 @@ tree::TerminalNode* ClickHouseParser::JoinOpLeftRightContext::ASOF() {
 
 ClickHouseParser::JoinOpLeftRightContext::JoinOpLeftRightContext(JoinOpContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::JoinOpLeftRightContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitJoinOpLeftRight(this);
@@ -9378,17 +9553,17 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
     exitRule();
   });
   try {
-    setState(1235);
+    setState(1241);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 162, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 163, _ctx)) {
     case 1: {
       _localctx = dynamic_cast<JoinOpContext *>(_tracker.createInstance<ClickHouseParser::JoinOpInnerContext>(_localctx));
       enterOuterAlt(_localctx, 1);
-      setState(1201);
+      setState(1207);
       _errHandler->sync(this);
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 151, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 152, _ctx)) {
       case 1: {
-        setState(1193);
+        setState(1199);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
@@ -9396,7 +9571,7 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
           ((1ULL << _la) & ((1ULL << ClickHouseParser::ALL)
           | (1ULL << ClickHouseParser::ANY)
           | (1ULL << ClickHouseParser::ASOF))) != 0)) {
-          setState(1192);
+          setState(1198);
           _la = _input->LA(1);
           if (!((((_la & ~ 0x3fULL) == 0) &&
             ((1ULL << _la) & ((1ULL << ClickHouseParser::ALL)
@@ -9409,15 +9584,15 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
             consume();
           }
         }
-        setState(1195);
+        setState(1201);
         match(ClickHouseParser::INNER);
         break;
       }
 
       case 2: {
-        setState(1196);
+        setState(1202);
         match(ClickHouseParser::INNER);
-        setState(1198);
+        setState(1204);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
@@ -9425,7 +9600,7 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
           ((1ULL << _la) & ((1ULL << ClickHouseParser::ALL)
           | (1ULL << ClickHouseParser::ANY)
           | (1ULL << ClickHouseParser::ASOF))) != 0)) {
-          setState(1197);
+          setState(1203);
           _la = _input->LA(1);
           if (!((((_la & ~ 0x3fULL) == 0) &&
             ((1ULL << _la) & ((1ULL << ClickHouseParser::ALL)
@@ -9442,7 +9617,7 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
       }
 
       case 3: {
-        setState(1200);
+        setState(1206);
         _la = _input->LA(1);
         if (!((((_la & ~ 0x3fULL) == 0) &&
           ((1ULL << _la) & ((1ULL << ClickHouseParser::ALL)
@@ -9464,11 +9639,11 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
     case 2: {
       _localctx = dynamic_cast<JoinOpContext *>(_tracker.createInstance<ClickHouseParser::JoinOpLeftRightContext>(_localctx));
       enterOuterAlt(_localctx, 2);
-      setState(1217);
+      setState(1223);
       _errHandler->sync(this);
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 156, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 157, _ctx)) {
       case 1: {
-        setState(1204);
+        setState(1210);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
@@ -9477,7 +9652,7 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
           | (1ULL << ClickHouseParser::ANTI)
           | (1ULL << ClickHouseParser::ANY)
           | (1ULL << ClickHouseParser::ASOF))) != 0) || _la == ClickHouseParser::SEMI) {
-          setState(1203);
+          setState(1209);
           _la = _input->LA(1);
           if (!((((_la & ~ 0x3fULL) == 0) &&
             ((1ULL << _la) & ((1ULL << ClickHouseParser::ALL)
@@ -9491,7 +9666,7 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
             consume();
           }
         }
-        setState(1206);
+        setState(1212);
         _la = _input->LA(1);
         if (!(_la == ClickHouseParser::LEFT
 
@@ -9502,19 +9677,19 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
           _errHandler->reportMatch(this);
           consume();
         }
-        setState(1208);
+        setState(1214);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
         if (_la == ClickHouseParser::OUTER) {
-          setState(1207);
+          setState(1213);
           match(ClickHouseParser::OUTER);
         }
         break;
       }
 
       case 2: {
-        setState(1210);
+        setState(1216);
         _la = _input->LA(1);
         if (!(_la == ClickHouseParser::LEFT
 
@@ -9525,15 +9700,15 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
           _errHandler->reportMatch(this);
           consume();
         }
-        setState(1212);
+        setState(1218);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
         if (_la == ClickHouseParser::OUTER) {
-          setState(1211);
+          setState(1217);
           match(ClickHouseParser::OUTER);
         }
-        setState(1215);
+        setState(1221);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
@@ -9542,7 +9717,7 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
           | (1ULL << ClickHouseParser::ANTI)
           | (1ULL << ClickHouseParser::ANY)
           | (1ULL << ClickHouseParser::ASOF))) != 0) || _la == ClickHouseParser::SEMI) {
-          setState(1214);
+          setState(1220);
           _la = _input->LA(1);
           if (!((((_la & ~ 0x3fULL) == 0) &&
             ((1ULL << _la) & ((1ULL << ClickHouseParser::ALL)
@@ -9566,18 +9741,18 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
     case 3: {
       _localctx = dynamic_cast<JoinOpContext *>(_tracker.createInstance<ClickHouseParser::JoinOpFullContext>(_localctx));
       enterOuterAlt(_localctx, 3);
-      setState(1233);
+      setState(1239);
       _errHandler->sync(this);
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 161, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 162, _ctx)) {
       case 1: {
-        setState(1220);
+        setState(1226);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
         if (_la == ClickHouseParser::ALL
 
         || _la == ClickHouseParser::ANY) {
-          setState(1219);
+          setState(1225);
           _la = _input->LA(1);
           if (!(_la == ClickHouseParser::ALL
 
@@ -9589,38 +9764,38 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
             consume();
           }
         }
-        setState(1222);
+        setState(1228);
         match(ClickHouseParser::FULL);
-        setState(1224);
+        setState(1230);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
         if (_la == ClickHouseParser::OUTER) {
-          setState(1223);
+          setState(1229);
           match(ClickHouseParser::OUTER);
         }
         break;
       }
 
       case 2: {
-        setState(1226);
+        setState(1232);
         match(ClickHouseParser::FULL);
-        setState(1228);
+        setState(1234);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
         if (_la == ClickHouseParser::OUTER) {
-          setState(1227);
+          setState(1233);
           match(ClickHouseParser::OUTER);
         }
-        setState(1231);
+        setState(1237);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
         if (_la == ClickHouseParser::ALL
 
         || _la == ClickHouseParser::ANY) {
-          setState(1230);
+          setState(1236);
           _la = _input->LA(1);
           if (!(_la == ClickHouseParser::ALL
 
@@ -9682,6 +9857,7 @@ size_t ClickHouseParser::JoinOpCrossContext::getRuleIndex() const {
   return ClickHouseParser::RuleJoinOpCross;
 }
 
+
 antlrcpp::Any ClickHouseParser::JoinOpCrossContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitJoinOpCross(this);
@@ -9698,21 +9874,21 @@ ClickHouseParser::JoinOpCrossContext* ClickHouseParser::joinOpCross() {
     exitRule();
   });
   try {
-    setState(1243);
+    setState(1249);
     _errHandler->sync(this);
     switch (_input->LA(1)) {
       case ClickHouseParser::CROSS:
       case ClickHouseParser::GLOBAL:
       case ClickHouseParser::LOCAL: {
         enterOuterAlt(_localctx, 1);
-        setState(1238);
+        setState(1244);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
         if (_la == ClickHouseParser::GLOBAL
 
         || _la == ClickHouseParser::LOCAL) {
-          setState(1237);
+          setState(1243);
           _la = _input->LA(1);
           if (!(_la == ClickHouseParser::GLOBAL
 
@@ -9724,16 +9900,16 @@ ClickHouseParser::JoinOpCrossContext* ClickHouseParser::joinOpCross() {
             consume();
           }
         }
-        setState(1240);
+        setState(1246);
         match(ClickHouseParser::CROSS);
-        setState(1241);
+        setState(1247);
         match(ClickHouseParser::JOIN);
         break;
       }
 
       case ClickHouseParser::COMMA: {
         enterOuterAlt(_localctx, 2);
-        setState(1242);
+        setState(1248);
         match(ClickHouseParser::COMMA);
         break;
       }
@@ -9783,6 +9959,7 @@ size_t ClickHouseParser::JoinConstraintClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleJoinConstraintClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::JoinConstraintClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitJoinConstraintClause(this);
@@ -9798,36 +9975,36 @@ ClickHouseParser::JoinConstraintClauseContext* ClickHouseParser::joinConstraintC
     exitRule();
   });
   try {
-    setState(1254);
+    setState(1260);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 165, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 166, _ctx)) {
     case 1: {
       enterOuterAlt(_localctx, 1);
-      setState(1245);
+      setState(1251);
       match(ClickHouseParser::ON);
-      setState(1246);
+      setState(1252);
       columnExprList();
       break;
     }
 
     case 2: {
       enterOuterAlt(_localctx, 2);
-      setState(1247);
+      setState(1253);
       match(ClickHouseParser::USING);
-      setState(1248);
+      setState(1254);
       match(ClickHouseParser::LPAREN);
-      setState(1249);
+      setState(1255);
       columnExprList();
-      setState(1250);
+      setState(1256);
       match(ClickHouseParser::RPAREN);
       break;
     }
 
     case 3: {
       enterOuterAlt(_localctx, 3);
-      setState(1252);
+      setState(1258);
       match(ClickHouseParser::USING);
-      setState(1253);
+      setState(1259);
       columnExprList();
       break;
     }
@@ -9871,6 +10048,7 @@ size_t ClickHouseParser::SampleClauseContext::getRuleIndex() const {
   return ClickHouseParser::RuleSampleClause;
 }
 
+
 antlrcpp::Any ClickHouseParser::SampleClauseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitSampleClause(this);
@@ -9887,18 +10065,18 @@ ClickHouseParser::SampleClauseContext* ClickHouseParser::sampleClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1256);
+    setState(1262);
     match(ClickHouseParser::SAMPLE);
-    setState(1257);
+    setState(1263);
     ratioExpr();
-    setState(1260);
+    setState(1266);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 166, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 167, _ctx)) {
     case 1: {
-      setState(1258);
+      setState(1264);
       match(ClickHouseParser::OFFSET);
-      setState(1259);
+      setState(1265);
       ratioExpr();
       break;
     }
@@ -9942,6 +10120,7 @@ size_t ClickHouseParser::LimitExprContext::getRuleIndex() const {
   return ClickHouseParser::RuleLimitExpr;
 }
 
+
 antlrcpp::Any ClickHouseParser::LimitExprContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitLimitExpr(this);
@@ -9959,14 +10138,14 @@ ClickHouseParser::LimitExprContext* ClickHouseParser::limitExpr() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1262);
+    setState(1268);
     columnExpr(0);
-    setState(1265);
+    setState(1271);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::OFFSET || _la == ClickHouseParser::COMMA) {
-      setState(1263);
+      setState(1269);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::OFFSET || _la == ClickHouseParser::COMMA)) {
       _errHandler->recoverInline(this);
@@ -9975,7 +10154,7 @@ ClickHouseParser::LimitExprContext* ClickHouseParser::limitExpr() {
         _errHandler->reportMatch(this);
         consume();
       }
-      setState(1264);
+      setState(1270);
       columnExpr(0);
     }
    
@@ -10016,6 +10195,7 @@ size_t ClickHouseParser::OrderExprListContext::getRuleIndex() const {
   return ClickHouseParser::RuleOrderExprList;
 }
 
+
 antlrcpp::Any ClickHouseParser::OrderExprListContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitOrderExprList(this);
@@ -10033,21 +10213,21 @@ ClickHouseParser::OrderExprListContext* ClickHouseParser::orderExprList() {
   try {
     size_t alt;
     enterOuterAlt(_localctx, 1);
-    setState(1267);
+    setState(1273);
     orderExpr();
-    setState(1272);
+    setState(1278);
     _errHandler->sync(this);
-    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 168, _ctx);
+    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 169, _ctx);
     while (alt != 2 && alt != atn::ATN::INVALID_ALT_NUMBER) {
       if (alt == 1) {
-        setState(1268);
+        setState(1274);
         match(ClickHouseParser::COMMA);
-        setState(1269);
+        setState(1275);
         orderExpr(); 
       }
-      setState(1274);
+      setState(1280);
       _errHandler->sync(this);
-      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 168, _ctx);
+      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 169, _ctx);
     }
    
   }
@@ -10107,6 +10287,7 @@ size_t ClickHouseParser::OrderExprContext::getRuleIndex() const {
   return ClickHouseParser::RuleOrderExpr;
 }
 
+
 antlrcpp::Any ClickHouseParser::OrderExprContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitOrderExpr(this);
@@ -10124,14 +10305,14 @@ ClickHouseParser::OrderExprContext* ClickHouseParser::orderExpr() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1275);
+    setState(1281);
     columnExpr(0);
-    setState(1277);
+    setState(1283);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 169, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 170, _ctx)) {
     case 1: {
-      setState(1276);
+      setState(1282);
       _la = _input->LA(1);
       if (!((((_la & ~ 0x3fULL) == 0) &&
         ((1ULL << _la) & ((1ULL << ClickHouseParser::ASCENDING)
@@ -10147,14 +10328,14 @@ ClickHouseParser::OrderExprContext* ClickHouseParser::orderExpr() {
     }
 
     }
-    setState(1281);
+    setState(1287);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 170, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 171, _ctx)) {
     case 1: {
-      setState(1279);
+      setState(1285);
       match(ClickHouseParser::NULLS);
-      setState(1280);
+      setState(1286);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::FIRST
 
@@ -10169,14 +10350,14 @@ ClickHouseParser::OrderExprContext* ClickHouseParser::orderExpr() {
     }
 
     }
-    setState(1285);
+    setState(1291);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 171, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 172, _ctx)) {
     case 1: {
-      setState(1283);
+      setState(1289);
       match(ClickHouseParser::COLLATE);
-      setState(1284);
+      setState(1290);
       match(ClickHouseParser::STRING_LITERAL);
       break;
     }
@@ -10216,6 +10397,7 @@ size_t ClickHouseParser::RatioExprContext::getRuleIndex() const {
   return ClickHouseParser::RuleRatioExpr;
 }
 
+
 antlrcpp::Any ClickHouseParser::RatioExprContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitRatioExpr(this);
@@ -10232,16 +10414,16 @@ ClickHouseParser::RatioExprContext* ClickHouseParser::ratioExpr() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1287);
+    setState(1293);
     numberLiteral();
-    setState(1290);
+    setState(1296);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 172, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 173, _ctx)) {
     case 1: {
-      setState(1288);
+      setState(1294);
       match(ClickHouseParser::SLASH);
-      setState(1289);
+      setState(1295);
       numberLiteral();
       break;
     }
@@ -10285,6 +10467,7 @@ size_t ClickHouseParser::SettingExprListContext::getRuleIndex() const {
   return ClickHouseParser::RuleSettingExprList;
 }
 
+
 antlrcpp::Any ClickHouseParser::SettingExprListContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitSettingExprList(this);
@@ -10302,21 +10485,21 @@ ClickHouseParser::SettingExprListContext* ClickHouseParser::settingExprList() {
   try {
     size_t alt;
     enterOuterAlt(_localctx, 1);
-    setState(1292);
+    setState(1298);
     settingExpr();
-    setState(1297);
+    setState(1303);
     _errHandler->sync(this);
-    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 173, _ctx);
+    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 174, _ctx);
     while (alt != 2 && alt != atn::ATN::INVALID_ALT_NUMBER) {
       if (alt == 1) {
-        setState(1293);
+        setState(1299);
         match(ClickHouseParser::COMMA);
-        setState(1294);
+        setState(1300);
         settingExpr(); 
       }
-      setState(1299);
+      setState(1305);
       _errHandler->sync(this);
-      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 173, _ctx);
+      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 174, _ctx);
     }
    
   }
@@ -10352,6 +10535,7 @@ size_t ClickHouseParser::SettingExprContext::getRuleIndex() const {
   return ClickHouseParser::RuleSettingExpr;
 }
 
+
 antlrcpp::Any ClickHouseParser::SettingExprContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitSettingExpr(this);
@@ -10368,11 +10552,11 @@ ClickHouseParser::SettingExprContext* ClickHouseParser::settingExpr() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1300);
+    setState(1306);
     identifier();
-    setState(1301);
+    setState(1307);
     match(ClickHouseParser::EQ_SINGLE);
-    setState(1302);
+    setState(1308);
     literal();
    
   }
@@ -10404,6 +10588,7 @@ size_t ClickHouseParser::SetStmtContext::getRuleIndex() const {
   return ClickHouseParser::RuleSetStmt;
 }
 
+
 antlrcpp::Any ClickHouseParser::SetStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitSetStmt(this);
@@ -10420,9 +10605,9 @@ ClickHouseParser::SetStmtContext* ClickHouseParser::setStmt() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1304);
+    setState(1310);
     match(ClickHouseParser::SET);
-    setState(1305);
+    setState(1311);
     settingExprList();
    
   }
@@ -10470,6 +10655,7 @@ ClickHouseParser::DatabaseIdentifierContext* ClickHouseParser::ShowCreateDatabas
 
 ClickHouseParser::ShowCreateDatabaseStmtContext::ShowCreateDatabaseStmtContext(ShowStmtContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ShowCreateDatabaseStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitShowCreateDatabaseStmt(this);
@@ -10488,6 +10674,7 @@ tree::TerminalNode* ClickHouseParser::ShowDatabasesStmtContext::DATABASES() {
 
 ClickHouseParser::ShowDatabasesStmtContext::ShowDatabasesStmtContext(ShowStmtContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ShowDatabasesStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitShowDatabasesStmt(this);
@@ -10518,6 +10705,7 @@ tree::TerminalNode* ClickHouseParser::ShowCreateTableStmtContext::TABLE() {
 
 ClickHouseParser::ShowCreateTableStmtContext::ShowCreateTableStmtContext(ShowStmtContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ShowCreateTableStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitShowCreateTableStmt(this);
@@ -10568,6 +10756,7 @@ tree::TerminalNode* ClickHouseParser::ShowTablesStmtContext::IN() {
 
 ClickHouseParser::ShowTablesStmtContext::ShowTablesStmtContext(ShowStmtContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ShowTablesStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitShowTablesStmt(this);
@@ -10594,6 +10783,7 @@ ClickHouseParser::DatabaseIdentifierContext* ClickHouseParser::ShowDictionariesS
 
 ClickHouseParser::ShowDictionariesStmtContext::ShowDictionariesStmtContext(ShowStmtContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ShowDictionariesStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitShowDictionariesStmt(this);
@@ -10620,6 +10810,7 @@ ClickHouseParser::TableIdentifierContext* ClickHouseParser::ShowCreateDictionary
 
 ClickHouseParser::ShowCreateDictionaryStmtContext::ShowCreateDictionaryStmtContext(ShowStmtContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ShowCreateDictionaryStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitShowCreateDictionaryStmt(this);
@@ -10635,19 +10826,19 @@ ClickHouseParser::ShowStmtContext* ClickHouseParser::showStmt() {
     exitRule();
   });
   try {
-    setState(1349);
+    setState(1355);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 181, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 182, _ctx)) {
     case 1: {
       _localctx = dynamic_cast<ShowStmtContext *>(_tracker.createInstance<ClickHouseParser::ShowCreateDatabaseStmtContext>(_localctx));
       enterOuterAlt(_localctx, 1);
-      setState(1307);
+      setState(1313);
       match(ClickHouseParser::SHOW);
-      setState(1308);
+      setState(1314);
       match(ClickHouseParser::CREATE);
-      setState(1309);
+      setState(1315);
       match(ClickHouseParser::DATABASE);
-      setState(1310);
+      setState(1316);
       databaseIdentifier();
       break;
     }
@@ -10655,13 +10846,13 @@ ClickHouseParser::ShowStmtContext* ClickHouseParser::showStmt() {
     case 2: {
       _localctx = dynamic_cast<ShowStmtContext *>(_tracker.createInstance<ClickHouseParser::ShowCreateDictionaryStmtContext>(_localctx));
       enterOuterAlt(_localctx, 2);
-      setState(1311);
+      setState(1317);
       match(ClickHouseParser::SHOW);
-      setState(1312);
+      setState(1318);
       match(ClickHouseParser::CREATE);
-      setState(1313);
+      setState(1319);
       match(ClickHouseParser::DICTIONARY);
-      setState(1314);
+      setState(1320);
       tableIdentifier();
       break;
     }
@@ -10669,33 +10860,33 @@ ClickHouseParser::ShowStmtContext* ClickHouseParser::showStmt() {
     case 3: {
       _localctx = dynamic_cast<ShowStmtContext *>(_tracker.createInstance<ClickHouseParser::ShowCreateTableStmtContext>(_localctx));
       enterOuterAlt(_localctx, 3);
-      setState(1315);
+      setState(1321);
       match(ClickHouseParser::SHOW);
-      setState(1316);
+      setState(1322);
       match(ClickHouseParser::CREATE);
-      setState(1318);
+      setState(1324);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 174, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 175, _ctx)) {
       case 1: {
-        setState(1317);
+        setState(1323);
         match(ClickHouseParser::TEMPORARY);
         break;
       }
 
       }
-      setState(1321);
+      setState(1327);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 175, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 176, _ctx)) {
       case 1: {
-        setState(1320);
+        setState(1326);
         match(ClickHouseParser::TABLE);
         break;
       }
 
       }
-      setState(1323);
+      setState(1329);
       tableIdentifier();
       break;
     }
@@ -10703,9 +10894,9 @@ ClickHouseParser::ShowStmtContext* ClickHouseParser::showStmt() {
     case 4: {
       _localctx = dynamic_cast<ShowStmtContext *>(_tracker.createInstance<ClickHouseParser::ShowDatabasesStmtContext>(_localctx));
       enterOuterAlt(_localctx, 4);
-      setState(1324);
+      setState(1330);
       match(ClickHouseParser::SHOW);
-      setState(1325);
+      setState(1331);
       match(ClickHouseParser::DATABASES);
       break;
     }
@@ -10713,18 +10904,18 @@ ClickHouseParser::ShowStmtContext* ClickHouseParser::showStmt() {
     case 5: {
       _localctx = dynamic_cast<ShowStmtContext *>(_tracker.createInstance<ClickHouseParser::ShowDictionariesStmtContext>(_localctx));
       enterOuterAlt(_localctx, 5);
-      setState(1326);
+      setState(1332);
       match(ClickHouseParser::SHOW);
-      setState(1327);
+      setState(1333);
       match(ClickHouseParser::DICTIONARIES);
-      setState(1330);
+      setState(1336);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::FROM) {
-        setState(1328);
+        setState(1334);
         match(ClickHouseParser::FROM);
-        setState(1329);
+        setState(1335);
         databaseIdentifier();
       }
       break;
@@ -10733,26 +10924,26 @@ ClickHouseParser::ShowStmtContext* ClickHouseParser::showStmt() {
     case 6: {
       _localctx = dynamic_cast<ShowStmtContext *>(_tracker.createInstance<ClickHouseParser::ShowTablesStmtContext>(_localctx));
       enterOuterAlt(_localctx, 6);
-      setState(1332);
+      setState(1338);
       match(ClickHouseParser::SHOW);
-      setState(1334);
+      setState(1340);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::TEMPORARY) {
-        setState(1333);
+        setState(1339);
         match(ClickHouseParser::TEMPORARY);
       }
-      setState(1336);
+      setState(1342);
       match(ClickHouseParser::TABLES);
-      setState(1339);
+      setState(1345);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::FROM
 
       || _la == ClickHouseParser::IN) {
-        setState(1337);
+        setState(1343);
         _la = _input->LA(1);
         if (!(_la == ClickHouseParser::FROM
 
@@ -10763,22 +10954,22 @@ ClickHouseParser::ShowStmtContext* ClickHouseParser::showStmt() {
           _errHandler->reportMatch(this);
           consume();
         }
-        setState(1338);
+        setState(1344);
         databaseIdentifier();
       }
-      setState(1344);
+      setState(1350);
       _errHandler->sync(this);
       switch (_input->LA(1)) {
         case ClickHouseParser::LIKE: {
-          setState(1341);
+          setState(1347);
           match(ClickHouseParser::LIKE);
-          setState(1342);
+          setState(1348);
           match(ClickHouseParser::STRING_LITERAL);
           break;
         }
 
         case ClickHouseParser::WHERE: {
-          setState(1343);
+          setState(1349);
           whereClause();
           break;
         }
@@ -10794,12 +10985,12 @@ ClickHouseParser::ShowStmtContext* ClickHouseParser::showStmt() {
       default:
         break;
       }
-      setState(1347);
+      setState(1353);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::LIMIT) {
-        setState(1346);
+        setState(1352);
         limitClause();
       }
       break;
@@ -10896,6 +11087,7 @@ size_t ClickHouseParser::SystemStmtContext::getRuleIndex() const {
   return ClickHouseParser::RuleSystemStmt;
 }
 
+
 antlrcpp::Any ClickHouseParser::SystemStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitSystemStmt(this);
@@ -10912,62 +11104,62 @@ ClickHouseParser::SystemStmtContext* ClickHouseParser::systemStmt() {
     exitRule();
   });
   try {
-    setState(1385);
+    setState(1391);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 184, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 185, _ctx)) {
     case 1: {
       enterOuterAlt(_localctx, 1);
-      setState(1351);
+      setState(1357);
       match(ClickHouseParser::SYSTEM);
-      setState(1352);
+      setState(1358);
       match(ClickHouseParser::FLUSH);
-      setState(1353);
+      setState(1359);
       match(ClickHouseParser::DISTRIBUTED);
-      setState(1354);
+      setState(1360);
       tableIdentifier();
       break;
     }
 
     case 2: {
       enterOuterAlt(_localctx, 2);
-      setState(1355);
+      setState(1361);
       match(ClickHouseParser::SYSTEM);
-      setState(1356);
+      setState(1362);
       match(ClickHouseParser::FLUSH);
-      setState(1357);
+      setState(1363);
       match(ClickHouseParser::LOGS);
       break;
     }
 
     case 3: {
       enterOuterAlt(_localctx, 3);
-      setState(1358);
+      setState(1364);
       match(ClickHouseParser::SYSTEM);
-      setState(1359);
+      setState(1365);
       match(ClickHouseParser::RELOAD);
-      setState(1360);
+      setState(1366);
       match(ClickHouseParser::DICTIONARIES);
       break;
     }
 
     case 4: {
       enterOuterAlt(_localctx, 4);
-      setState(1361);
+      setState(1367);
       match(ClickHouseParser::SYSTEM);
-      setState(1362);
+      setState(1368);
       match(ClickHouseParser::RELOAD);
-      setState(1363);
+      setState(1369);
       match(ClickHouseParser::DICTIONARY);
-      setState(1364);
+      setState(1370);
       tableIdentifier();
       break;
     }
 
     case 5: {
       enterOuterAlt(_localctx, 5);
-      setState(1365);
+      setState(1371);
       match(ClickHouseParser::SYSTEM);
-      setState(1366);
+      setState(1372);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::START
 
@@ -10978,34 +11170,34 @@ ClickHouseParser::SystemStmtContext* ClickHouseParser::systemStmt() {
         _errHandler->reportMatch(this);
         consume();
       }
-      setState(1374);
+      setState(1380);
       _errHandler->sync(this);
       switch (_input->LA(1)) {
         case ClickHouseParser::DISTRIBUTED: {
-          setState(1367);
+          setState(1373);
           match(ClickHouseParser::DISTRIBUTED);
-          setState(1368);
+          setState(1374);
           match(ClickHouseParser::SENDS);
           break;
         }
 
         case ClickHouseParser::FETCHES: {
-          setState(1369);
+          setState(1375);
           match(ClickHouseParser::FETCHES);
           break;
         }
 
         case ClickHouseParser::MERGES:
         case ClickHouseParser::TTL: {
-          setState(1371);
+          setState(1377);
           _errHandler->sync(this);
 
           _la = _input->LA(1);
           if (_la == ClickHouseParser::TTL) {
-            setState(1370);
+            setState(1376);
             match(ClickHouseParser::TTL);
           }
-          setState(1373);
+          setState(1379);
           match(ClickHouseParser::MERGES);
           break;
         }
@@ -11013,16 +11205,16 @@ ClickHouseParser::SystemStmtContext* ClickHouseParser::systemStmt() {
       default:
         throw NoViableAltException(this);
       }
-      setState(1376);
+      setState(1382);
       tableIdentifier();
       break;
     }
 
     case 6: {
       enterOuterAlt(_localctx, 6);
-      setState(1377);
+      setState(1383);
       match(ClickHouseParser::SYSTEM);
-      setState(1378);
+      setState(1384);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::START
 
@@ -11033,22 +11225,22 @@ ClickHouseParser::SystemStmtContext* ClickHouseParser::systemStmt() {
         _errHandler->reportMatch(this);
         consume();
       }
-      setState(1379);
+      setState(1385);
       match(ClickHouseParser::REPLICATED);
-      setState(1380);
+      setState(1386);
       match(ClickHouseParser::SENDS);
       break;
     }
 
     case 7: {
       enterOuterAlt(_localctx, 7);
-      setState(1381);
+      setState(1387);
       match(ClickHouseParser::SYSTEM);
-      setState(1382);
+      setState(1388);
       match(ClickHouseParser::SYNC);
-      setState(1383);
+      setState(1389);
       match(ClickHouseParser::REPLICA);
-      setState(1384);
+      setState(1390);
       tableIdentifier();
       break;
     }
@@ -11104,6 +11296,7 @@ size_t ClickHouseParser::TruncateStmtContext::getRuleIndex() const {
   return ClickHouseParser::RuleTruncateStmt;
 }
 
+
 antlrcpp::Any ClickHouseParser::TruncateStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitTruncateStmt(this);
@@ -11121,51 +11314,51 @@ ClickHouseParser::TruncateStmtContext* ClickHouseParser::truncateStmt() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1387);
+    setState(1393);
     match(ClickHouseParser::TRUNCATE);
-    setState(1389);
+    setState(1395);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 185, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 186, _ctx)) {
     case 1: {
-      setState(1388);
+      setState(1394);
       match(ClickHouseParser::TEMPORARY);
       break;
     }
 
     }
-    setState(1392);
+    setState(1398);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 186, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 187, _ctx)) {
     case 1: {
-      setState(1391);
+      setState(1397);
       match(ClickHouseParser::TABLE);
       break;
     }
 
     }
-    setState(1396);
+    setState(1402);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 187, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 188, _ctx)) {
     case 1: {
-      setState(1394);
+      setState(1400);
       match(ClickHouseParser::IF);
-      setState(1395);
+      setState(1401);
       match(ClickHouseParser::EXISTS);
       break;
     }
 
     }
-    setState(1398);
+    setState(1404);
     tableIdentifier();
-    setState(1400);
+    setState(1406);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::ON) {
-      setState(1399);
+      setState(1405);
       clusterClause();
     }
    
@@ -11198,6 +11391,7 @@ size_t ClickHouseParser::UseStmtContext::getRuleIndex() const {
   return ClickHouseParser::RuleUseStmt;
 }
 
+
 antlrcpp::Any ClickHouseParser::UseStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitUseStmt(this);
@@ -11214,9 +11408,9 @@ ClickHouseParser::UseStmtContext* ClickHouseParser::useStmt() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1402);
+    setState(1408);
     match(ClickHouseParser::USE);
-    setState(1403);
+    setState(1409);
     databaseIdentifier();
    
   }
@@ -11260,6 +11454,7 @@ size_t ClickHouseParser::WatchStmtContext::getRuleIndex() const {
   return ClickHouseParser::RuleWatchStmt;
 }
 
+
 antlrcpp::Any ClickHouseParser::WatchStmtContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitWatchStmt(this);
@@ -11277,26 +11472,26 @@ ClickHouseParser::WatchStmtContext* ClickHouseParser::watchStmt() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1405);
+    setState(1411);
     match(ClickHouseParser::WATCH);
-    setState(1406);
+    setState(1412);
     tableIdentifier();
-    setState(1408);
+    setState(1414);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::EVENTS) {
-      setState(1407);
+      setState(1413);
       match(ClickHouseParser::EVENTS);
     }
-    setState(1412);
+    setState(1418);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::LIMIT) {
-      setState(1410);
+      setState(1416);
       match(ClickHouseParser::LIMIT);
-      setState(1411);
+      setState(1417);
       match(ClickHouseParser::DECIMAL_LITERAL);
     }
    
@@ -11361,6 +11556,7 @@ tree::TerminalNode* ClickHouseParser::ColumnTypeExprNestedContext::COMMA(size_t
 
 ClickHouseParser::ColumnTypeExprNestedContext::ColumnTypeExprNestedContext(ColumnTypeExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnTypeExprNestedContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnTypeExprNested(this);
@@ -11387,6 +11583,7 @@ ClickHouseParser::ColumnExprListContext* ClickHouseParser::ColumnTypeExprParamCo
 
 ClickHouseParser::ColumnTypeExprParamContext::ColumnTypeExprParamContext(ColumnTypeExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnTypeExprParamContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnTypeExprParam(this);
@@ -11401,6 +11598,7 @@ ClickHouseParser::IdentifierContext* ClickHouseParser::ColumnTypeExprSimpleConte
 
 ClickHouseParser::ColumnTypeExprSimpleContext::ColumnTypeExprSimpleContext(ColumnTypeExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnTypeExprSimpleContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnTypeExprSimple(this);
@@ -11439,6 +11637,7 @@ tree::TerminalNode* ClickHouseParser::ColumnTypeExprComplexContext::COMMA(size_t
 
 ClickHouseParser::ColumnTypeExprComplexContext::ColumnTypeExprComplexContext(ColumnTypeExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnTypeExprComplexContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnTypeExprComplex(this);
@@ -11477,6 +11676,7 @@ tree::TerminalNode* ClickHouseParser::ColumnTypeExprEnumContext::COMMA(size_t i)
 
 ClickHouseParser::ColumnTypeExprEnumContext::ColumnTypeExprEnumContext(ColumnTypeExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnTypeExprEnumContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnTypeExprEnum(this);
@@ -11492,13 +11692,13 @@ ClickHouseParser::ColumnTypeExprContext* ClickHouseParser::columnTypeExpr() {
     exitRule();
   });
   try {
-    setState(1461);
+    setState(1467);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 195, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 196, _ctx)) {
     case 1: {
       _localctx = dynamic_cast<ColumnTypeExprContext *>(_tracker.createInstance<ClickHouseParser::ColumnTypeExprSimpleContext>(_localctx));
       enterOuterAlt(_localctx, 1);
-      setState(1414);
+      setState(1420);
       identifier();
       break;
     }
@@ -11506,29 +11706,29 @@ ClickHouseParser::ColumnTypeExprContext* ClickHouseParser::columnTypeExpr() {
     case 2: {
       _localctx = dynamic_cast<ColumnTypeExprContext *>(_tracker.createInstance<ClickHouseParser::ColumnTypeExprNestedContext>(_localctx));
       enterOuterAlt(_localctx, 2);
-      setState(1415);
+      setState(1421);
       identifier();
-      setState(1416);
+      setState(1422);
       match(ClickHouseParser::LPAREN);
-      setState(1417);
+      setState(1423);
       identifier();
-      setState(1418);
+      setState(1424);
       columnTypeExpr();
-      setState(1425);
+      setState(1431);
       _errHandler->sync(this);
       _la = _input->LA(1);
       while (_la == ClickHouseParser::COMMA) {
-        setState(1419);
+        setState(1425);
         match(ClickHouseParser::COMMA);
-        setState(1420);
+        setState(1426);
         identifier();
-        setState(1421);
-        columnTypeExpr();
         setState(1427);
+        columnTypeExpr();
+        setState(1433);
         _errHandler->sync(this);
         _la = _input->LA(1);
       }
-      setState(1428);
+      setState(1434);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -11536,25 +11736,25 @@ ClickHouseParser::ColumnTypeExprContext* ClickHouseParser::columnTypeExpr() {
     case 3: {
       _localctx = dynamic_cast<ColumnTypeExprContext *>(_tracker.createInstance<ClickHouseParser::ColumnTypeExprEnumContext>(_localctx));
       enterOuterAlt(_localctx, 3);
-      setState(1430);
+      setState(1436);
       identifier();
-      setState(1431);
-      match(ClickHouseParser::LPAREN);
-      setState(1432);
-      enumValue();
       setState(1437);
+      match(ClickHouseParser::LPAREN);
+      setState(1438);
+      enumValue();
+      setState(1443);
       _errHandler->sync(this);
       _la = _input->LA(1);
       while (_la == ClickHouseParser::COMMA) {
-        setState(1433);
-        match(ClickHouseParser::COMMA);
-        setState(1434);
-        enumValue();
         setState(1439);
+        match(ClickHouseParser::COMMA);
+        setState(1440);
+        enumValue();
+        setState(1445);
         _errHandler->sync(this);
         _la = _input->LA(1);
       }
-      setState(1440);
+      setState(1446);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -11562,25 +11762,25 @@ ClickHouseParser::ColumnTypeExprContext* ClickHouseParser::columnTypeExpr() {
     case 4: {
       _localctx = dynamic_cast<ColumnTypeExprContext *>(_tracker.createInstance<ClickHouseParser::ColumnTypeExprComplexContext>(_localctx));
       enterOuterAlt(_localctx, 4);
-      setState(1442);
+      setState(1448);
       identifier();
-      setState(1443);
-      match(ClickHouseParser::LPAREN);
-      setState(1444);
-      columnTypeExpr();
       setState(1449);
+      match(ClickHouseParser::LPAREN);
+      setState(1450);
+      columnTypeExpr();
+      setState(1455);
       _errHandler->sync(this);
       _la = _input->LA(1);
       while (_la == ClickHouseParser::COMMA) {
-        setState(1445);
-        match(ClickHouseParser::COMMA);
-        setState(1446);
-        columnTypeExpr();
         setState(1451);
+        match(ClickHouseParser::COMMA);
+        setState(1452);
+        columnTypeExpr();
+        setState(1457);
         _errHandler->sync(this);
         _la = _input->LA(1);
       }
-      setState(1452);
+      setState(1458);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -11588,11 +11788,11 @@ ClickHouseParser::ColumnTypeExprContext* ClickHouseParser::columnTypeExpr() {
     case 5: {
       _localctx = dynamic_cast<ColumnTypeExprContext *>(_tracker.createInstance<ClickHouseParser::ColumnTypeExprParamContext>(_localctx));
       enterOuterAlt(_localctx, 5);
-      setState(1454);
+      setState(1460);
       identifier();
-      setState(1455);
+      setState(1461);
       match(ClickHouseParser::LPAREN);
-      setState(1457);
+      setState(1463);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
@@ -11788,10 +11988,10 @@ ClickHouseParser::ColumnTypeExprContext* ClickHouseParser::columnTypeExpr() {
         | (1ULL << (ClickHouseParser::LBRACKET - 194))
         | (1ULL << (ClickHouseParser::LPAREN - 194))
         | (1ULL << (ClickHouseParser::PLUS - 194)))) != 0)) {
-        setState(1456);
+        setState(1462);
         columnExprList();
       }
-      setState(1459);
+      setState(1465);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -11835,6 +12035,7 @@ size_t ClickHouseParser::ColumnExprListContext::getRuleIndex() const {
   return ClickHouseParser::RuleColumnExprList;
 }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprListContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprList(this);
@@ -11852,21 +12053,21 @@ ClickHouseParser::ColumnExprListContext* ClickHouseParser::columnExprList() {
   try {
     size_t alt;
     enterOuterAlt(_localctx, 1);
-    setState(1463);
+    setState(1469);
     columnsExpr();
-    setState(1468);
+    setState(1474);
     _errHandler->sync(this);
-    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 196, _ctx);
+    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 197, _ctx);
     while (alt != 2 && alt != atn::ATN::INVALID_ALT_NUMBER) {
       if (alt == 1) {
-        setState(1464);
+        setState(1470);
         match(ClickHouseParser::COMMA);
-        setState(1465);
+        setState(1471);
         columnsExpr(); 
       }
-      setState(1470);
+      setState(1476);
       _errHandler->sync(this);
-      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 196, _ctx);
+      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 197, _ctx);
     }
    
   }
@@ -11902,6 +12103,7 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::ColumnsExprColumnContext:
 
 ClickHouseParser::ColumnsExprColumnContext::ColumnsExprColumnContext(ColumnsExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnsExprColumnContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnsExprColumn(this);
@@ -11924,6 +12126,7 @@ tree::TerminalNode* ClickHouseParser::ColumnsExprAsteriskContext::DOT() {
 
 ClickHouseParser::ColumnsExprAsteriskContext::ColumnsExprAsteriskContext(ColumnsExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnsExprAsteriskContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnsExprAsterisk(this);
@@ -11946,6 +12149,7 @@ tree::TerminalNode* ClickHouseParser::ColumnsExprSubqueryContext::RPAREN() {
 
 ClickHouseParser::ColumnsExprSubqueryContext::ColumnsExprSubqueryContext(ColumnsExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnsExprSubqueryContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnsExprSubquery(this);
@@ -11961,13 +12165,13 @@ ClickHouseParser::ColumnsExprContext* ClickHouseParser::columnsExpr() {
     exitRule();
   });
   try {
-    setState(1482);
+    setState(1488);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 198, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 199, _ctx)) {
     case 1: {
       _localctx = dynamic_cast<ColumnsExprContext *>(_tracker.createInstance<ClickHouseParser::ColumnsExprAsteriskContext>(_localctx));
       enterOuterAlt(_localctx, 1);
-      setState(1474);
+      setState(1480);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
@@ -12149,12 +12353,12 @@ ClickHouseParser::ColumnsExprContext* ClickHouseParser::columnsExpr() {
         | (1ULL << (ClickHouseParser::JSON_FALSE - 128))
         | (1ULL << (ClickHouseParser::JSON_TRUE - 128))
         | (1ULL << (ClickHouseParser::IDENTIFIER - 128)))) != 0)) {
-        setState(1471);
+        setState(1477);
         tableIdentifier();
-        setState(1472);
+        setState(1478);
         match(ClickHouseParser::DOT);
       }
-      setState(1476);
+      setState(1482);
       match(ClickHouseParser::ASTERISK);
       break;
     }
@@ -12162,11 +12366,11 @@ ClickHouseParser::ColumnsExprContext* ClickHouseParser::columnsExpr() {
     case 2: {
       _localctx = dynamic_cast<ColumnsExprContext *>(_tracker.createInstance<ClickHouseParser::ColumnsExprSubqueryContext>(_localctx));
       enterOuterAlt(_localctx, 2);
-      setState(1477);
+      setState(1483);
       match(ClickHouseParser::LPAREN);
-      setState(1478);
+      setState(1484);
       selectUnionStmt();
-      setState(1479);
+      setState(1485);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -12174,7 +12378,7 @@ ClickHouseParser::ColumnsExprContext* ClickHouseParser::columnsExpr() {
     case 3: {
       _localctx = dynamic_cast<ColumnsExprContext *>(_tracker.createInstance<ClickHouseParser::ColumnsExprColumnContext>(_localctx));
       enterOuterAlt(_localctx, 3);
-      setState(1481);
+      setState(1487);
       columnExpr(0);
       break;
     }
@@ -12226,6 +12430,7 @@ tree::TerminalNode* ClickHouseParser::ColumnExprTernaryOpContext::COLON() {
 
 ClickHouseParser::ColumnExprTernaryOpContext::ColumnExprTernaryOpContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprTernaryOpContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprTernaryOp(this);
@@ -12252,6 +12457,7 @@ ClickHouseParser::IdentifierContext* ClickHouseParser::ColumnExprAliasContext::i
 
 ClickHouseParser::ColumnExprAliasContext::ColumnExprAliasContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprAliasContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprAlias(this);
@@ -12286,6 +12492,7 @@ tree::TerminalNode* ClickHouseParser::ColumnExprExtractContext::RPAREN() {
 
 ClickHouseParser::ColumnExprExtractContext::ColumnExprExtractContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprExtractContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprExtract(this);
@@ -12304,6 +12511,7 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::ColumnExprNegateContext::
 
 ClickHouseParser::ColumnExprNegateContext::ColumnExprNegateContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprNegateContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprNegate(this);
@@ -12326,6 +12534,7 @@ tree::TerminalNode* ClickHouseParser::ColumnExprSubqueryContext::RPAREN() {
 
 ClickHouseParser::ColumnExprSubqueryContext::ColumnExprSubqueryContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprSubqueryContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprSubquery(this);
@@ -12340,6 +12549,7 @@ ClickHouseParser::LiteralContext* ClickHouseParser::ColumnExprLiteralContext::li
 
 ClickHouseParser::ColumnExprLiteralContext::ColumnExprLiteralContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprLiteralContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprLiteral(this);
@@ -12362,6 +12572,7 @@ ClickHouseParser::ColumnExprListContext* ClickHouseParser::ColumnExprArrayContex
 
 ClickHouseParser::ColumnExprArrayContext::ColumnExprArrayContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprArrayContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprArray(this);
@@ -12400,6 +12611,7 @@ tree::TerminalNode* ClickHouseParser::ColumnExprSubstringContext::FOR() {
 
 ClickHouseParser::ColumnExprSubstringContext::ColumnExprSubstringContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprSubstringContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprSubstring(this);
@@ -12434,6 +12646,7 @@ tree::TerminalNode* ClickHouseParser::ColumnExprCastContext::RPAREN() {
 
 ClickHouseParser::ColumnExprCastContext::ColumnExprCastContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprCastContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprCast(this);
@@ -12456,6 +12669,7 @@ tree::TerminalNode* ClickHouseParser::ColumnExprOrContext::OR() {
 
 ClickHouseParser::ColumnExprOrContext::ColumnExprOrContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprOrContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprOr(this);
@@ -12486,6 +12700,7 @@ tree::TerminalNode* ClickHouseParser::ColumnExprPrecedence1Context::PERCENT() {
 
 ClickHouseParser::ColumnExprPrecedence1Context::ColumnExprPrecedence1Context(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprPrecedence1Context::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprPrecedence1(this);
@@ -12516,6 +12731,7 @@ tree::TerminalNode* ClickHouseParser::ColumnExprPrecedence2Context::CONCAT() {
 
 ClickHouseParser::ColumnExprPrecedence2Context::ColumnExprPrecedence2Context(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprPrecedence2Context::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprPrecedence2(this);
@@ -12582,6 +12798,7 @@ tree::TerminalNode* ClickHouseParser::ColumnExprPrecedence3Context::NOT() {
 
 ClickHouseParser::ColumnExprPrecedence3Context::ColumnExprPrecedence3Context(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprPrecedence3Context::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprPrecedence3(this);
@@ -12604,6 +12821,7 @@ ClickHouseParser::IntervalContext* ClickHouseParser::ColumnExprIntervalContext::
 
 ClickHouseParser::ColumnExprIntervalContext::ColumnExprIntervalContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprIntervalContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprInterval(this);
@@ -12630,6 +12848,7 @@ tree::TerminalNode* ClickHouseParser::ColumnExprIsNullContext::NOT() {
 
 ClickHouseParser::ColumnExprIsNullContext::ColumnExprIsNullContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprIsNullContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprIsNull(this);
@@ -12676,6 +12895,7 @@ tree::TerminalNode* ClickHouseParser::ColumnExprTrimContext::TRAILING() {
 
 ClickHouseParser::ColumnExprTrimContext::ColumnExprTrimContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprTrimContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprTrim(this);
@@ -12698,6 +12918,7 @@ tree::TerminalNode* ClickHouseParser::ColumnExprTupleContext::RPAREN() {
 
 ClickHouseParser::ColumnExprTupleContext::ColumnExprTupleContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprTupleContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprTuple(this);
@@ -12724,6 +12945,7 @@ tree::TerminalNode* ClickHouseParser::ColumnExprArrayAccessContext::RBRACKET() {
 
 ClickHouseParser::ColumnExprArrayAccessContext::ColumnExprArrayAccessContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprArrayAccessContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprArrayAccess(this);
@@ -12754,6 +12976,7 @@ tree::TerminalNode* ClickHouseParser::ColumnExprBetweenContext::NOT() {
 
 ClickHouseParser::ColumnExprBetweenContext::ColumnExprBetweenContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprBetweenContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprBetween(this);
@@ -12776,6 +12999,7 @@ tree::TerminalNode* ClickHouseParser::ColumnExprParensContext::RPAREN() {
 
 ClickHouseParser::ColumnExprParensContext::ColumnExprParensContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprParensContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprParens(this);
@@ -12794,6 +13018,7 @@ tree::TerminalNode* ClickHouseParser::ColumnExprTimestampContext::STRING_LITERAL
 
 ClickHouseParser::ColumnExprTimestampContext::ColumnExprTimestampContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprTimestampContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprTimestamp(this);
@@ -12816,6 +13041,7 @@ tree::TerminalNode* ClickHouseParser::ColumnExprAndContext::AND() {
 
 ClickHouseParser::ColumnExprAndContext::ColumnExprAndContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprAndContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprAnd(this);
@@ -12838,6 +13064,7 @@ tree::TerminalNode* ClickHouseParser::ColumnExprTupleAccessContext::DECIMAL_LITE
 
 ClickHouseParser::ColumnExprTupleAccessContext::ColumnExprTupleAccessContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprTupleAccessContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprTupleAccess(this);
@@ -12884,6 +13111,7 @@ tree::TerminalNode* ClickHouseParser::ColumnExprCaseContext::ELSE() {
 
 ClickHouseParser::ColumnExprCaseContext::ColumnExprCaseContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprCaseContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprCase(this);
@@ -12902,6 +13130,7 @@ tree::TerminalNode* ClickHouseParser::ColumnExprDateContext::STRING_LITERAL() {
 
 ClickHouseParser::ColumnExprDateContext::ColumnExprDateContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprDateContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprDate(this);
@@ -12920,6 +13149,7 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::ColumnExprNotContext::col
 
 ClickHouseParser::ColumnExprNotContext::ColumnExprNotContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprNotContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprNot(this);
@@ -12934,6 +13164,7 @@ ClickHouseParser::ColumnIdentifierContext* ClickHouseParser::ColumnExprIdentifie
 
 ClickHouseParser::ColumnExprIdentifierContext::ColumnExprIdentifierContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprIdentifierContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprIdentifier(this);
@@ -12976,6 +13207,7 @@ ClickHouseParser::ColumnExprListContext* ClickHouseParser::ColumnExprFunctionCon
 
 ClickHouseParser::ColumnExprFunctionContext::ColumnExprFunctionContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprFunctionContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprFunction(this);
@@ -12998,6 +13230,7 @@ tree::TerminalNode* ClickHouseParser::ColumnExprAsteriskContext::DOT() {
 
 ClickHouseParser::ColumnExprAsteriskContext::ColumnExprAsteriskContext(ColumnExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::ColumnExprAsteriskContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnExprAsterisk(this);
@@ -13026,54 +13259,54 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
   try {
     size_t alt;
     enterOuterAlt(_localctx, 1);
-    setState(1591);
+    setState(1597);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 209, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 210, _ctx)) {
     case 1: {
       _localctx = _tracker.createInstance<ColumnExprCaseContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
 
-      setState(1485);
+      setState(1491);
       match(ClickHouseParser::CASE);
-      setState(1487);
+      setState(1493);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 199, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 200, _ctx)) {
       case 1: {
-        setState(1486);
+        setState(1492);
         columnExpr(0);
         break;
       }
 
       }
-      setState(1494); 
+      setState(1500); 
       _errHandler->sync(this);
       _la = _input->LA(1);
       do {
-        setState(1489);
+        setState(1495);
         match(ClickHouseParser::WHEN);
-        setState(1490);
+        setState(1496);
         columnExpr(0);
-        setState(1491);
+        setState(1497);
         match(ClickHouseParser::THEN);
-        setState(1492);
+        setState(1498);
         columnExpr(0);
-        setState(1496); 
+        setState(1502); 
         _errHandler->sync(this);
         _la = _input->LA(1);
       } while (_la == ClickHouseParser::WHEN);
-      setState(1500);
+      setState(1506);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::ELSE) {
-        setState(1498);
+        setState(1504);
         match(ClickHouseParser::ELSE);
-        setState(1499);
+        setState(1505);
         columnExpr(0);
       }
-      setState(1502);
+      setState(1508);
       match(ClickHouseParser::END);
       break;
     }
@@ -13082,17 +13315,17 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprCastContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1504);
+      setState(1510);
       match(ClickHouseParser::CAST);
-      setState(1505);
+      setState(1511);
       match(ClickHouseParser::LPAREN);
-      setState(1506);
+      setState(1512);
       columnExpr(0);
-      setState(1507);
+      setState(1513);
       match(ClickHouseParser::AS);
-      setState(1508);
+      setState(1514);
       columnTypeExpr();
-      setState(1509);
+      setState(1515);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -13101,9 +13334,9 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprDateContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1511);
+      setState(1517);
       match(ClickHouseParser::DATE);
-      setState(1512);
+      setState(1518);
       match(ClickHouseParser::STRING_LITERAL);
       break;
     }
@@ -13112,17 +13345,17 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprExtractContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1513);
+      setState(1519);
       match(ClickHouseParser::EXTRACT);
-      setState(1514);
+      setState(1520);
       match(ClickHouseParser::LPAREN);
-      setState(1515);
+      setState(1521);
       interval();
-      setState(1516);
+      setState(1522);
       match(ClickHouseParser::FROM);
-      setState(1517);
+      setState(1523);
       columnExpr(0);
-      setState(1518);
+      setState(1524);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -13131,11 +13364,11 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprIntervalContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1520);
+      setState(1526);
       match(ClickHouseParser::INTERVAL);
-      setState(1521);
+      setState(1527);
       columnExpr(0);
-      setState(1522);
+      setState(1528);
       interval();
       break;
     }
@@ -13144,27 +13377,27 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprSubstringContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1524);
+      setState(1530);
       match(ClickHouseParser::SUBSTRING);
-      setState(1525);
-      match(ClickHouseParser::LPAREN);
-      setState(1526);
-      columnExpr(0);
-      setState(1527);
-      match(ClickHouseParser::FROM);
-      setState(1528);
-      columnExpr(0);
       setState(1531);
+      match(ClickHouseParser::LPAREN);
+      setState(1532);
+      columnExpr(0);
+      setState(1533);
+      match(ClickHouseParser::FROM);
+      setState(1534);
+      columnExpr(0);
+      setState(1537);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::FOR) {
-        setState(1529);
+        setState(1535);
         match(ClickHouseParser::FOR);
-        setState(1530);
+        setState(1536);
         columnExpr(0);
       }
-      setState(1533);
+      setState(1539);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -13173,9 +13406,9 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprTimestampContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1535);
+      setState(1541);
       match(ClickHouseParser::TIMESTAMP);
-      setState(1536);
+      setState(1542);
       match(ClickHouseParser::STRING_LITERAL);
       break;
     }
@@ -13184,11 +13417,11 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprTrimContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1537);
+      setState(1543);
       match(ClickHouseParser::TRIM);
-      setState(1538);
+      setState(1544);
       match(ClickHouseParser::LPAREN);
-      setState(1539);
+      setState(1545);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::BOTH || _la == ClickHouseParser::LEADING || _la == ClickHouseParser::TRAILING)) {
       _errHandler->recoverInline(this);
@@ -13197,13 +13430,13 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
         _errHandler->reportMatch(this);
         consume();
       }
-      setState(1540);
+      setState(1546);
       match(ClickHouseParser::STRING_LITERAL);
-      setState(1541);
+      setState(1547);
       match(ClickHouseParser::FROM);
-      setState(1542);
+      setState(1548);
       columnExpr(0);
-      setState(1543);
+      setState(1549);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -13212,16 +13445,16 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprFunctionContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1545);
-      identifier();
       setState(1551);
+      identifier();
+      setState(1557);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 204, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 205, _ctx)) {
       case 1: {
-        setState(1546);
+        setState(1552);
         match(ClickHouseParser::LPAREN);
-        setState(1548);
+        setState(1554);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
@@ -13417,29 +13650,29 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           | (1ULL << (ClickHouseParser::LBRACKET - 194))
           | (1ULL << (ClickHouseParser::LPAREN - 194))
           | (1ULL << (ClickHouseParser::PLUS - 194)))) != 0)) {
-          setState(1547);
+          setState(1553);
           columnExprList();
         }
-        setState(1550);
+        setState(1556);
         match(ClickHouseParser::RPAREN);
         break;
       }
 
       }
-      setState(1553);
+      setState(1559);
       match(ClickHouseParser::LPAREN);
-      setState(1555);
+      setState(1561);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 205, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 206, _ctx)) {
       case 1: {
-        setState(1554);
+        setState(1560);
         match(ClickHouseParser::DISTINCT);
         break;
       }
 
       }
-      setState(1558);
+      setState(1564);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
@@ -13635,10 +13868,10 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
         | (1ULL << (ClickHouseParser::LBRACKET - 194))
         | (1ULL << (ClickHouseParser::LPAREN - 194))
         | (1ULL << (ClickHouseParser::PLUS - 194)))) != 0)) {
-        setState(1557);
+        setState(1563);
         columnArgList();
       }
-      setState(1560);
+      setState(1566);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -13647,7 +13880,7 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprLiteralContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1562);
+      setState(1568);
       literal();
       break;
     }
@@ -13656,9 +13889,9 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprNegateContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1563);
+      setState(1569);
       match(ClickHouseParser::DASH);
-      setState(1564);
+      setState(1570);
       columnExpr(17);
       break;
     }
@@ -13667,9 +13900,9 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprNotContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1565);
+      setState(1571);
       match(ClickHouseParser::NOT);
-      setState(1566);
+      setState(1572);
       columnExpr(12);
       break;
     }
@@ -13678,7 +13911,7 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprAsteriskContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1570);
+      setState(1576);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
@@ -13860,12 +14093,12 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
         | (1ULL << (ClickHouseParser::JSON_FALSE - 128))
         | (1ULL << (ClickHouseParser::JSON_TRUE - 128))
         | (1ULL << (ClickHouseParser::IDENTIFIER - 128)))) != 0)) {
-        setState(1567);
+        setState(1573);
         tableIdentifier();
-        setState(1568);
+        setState(1574);
         match(ClickHouseParser::DOT);
       }
-      setState(1572);
+      setState(1578);
       match(ClickHouseParser::ASTERISK);
       break;
     }
@@ -13874,11 +14107,11 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprSubqueryContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1573);
+      setState(1579);
       match(ClickHouseParser::LPAREN);
-      setState(1574);
+      setState(1580);
       selectUnionStmt();
-      setState(1575);
+      setState(1581);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -13887,11 +14120,11 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprParensContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1577);
+      setState(1583);
       match(ClickHouseParser::LPAREN);
-      setState(1578);
+      setState(1584);
       columnExpr(0);
-      setState(1579);
+      setState(1585);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -13900,11 +14133,11 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprTupleContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1581);
+      setState(1587);
       match(ClickHouseParser::LPAREN);
-      setState(1582);
+      setState(1588);
       columnExprList();
-      setState(1583);
+      setState(1589);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -13913,9 +14146,9 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprArrayContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1585);
+      setState(1591);
       match(ClickHouseParser::LBRACKET);
-      setState(1587);
+      setState(1593);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
@@ -14111,10 +14344,10 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
         | (1ULL << (ClickHouseParser::LBRACKET - 194))
         | (1ULL << (ClickHouseParser::LPAREN - 194))
         | (1ULL << (ClickHouseParser::PLUS - 194)))) != 0)) {
-        setState(1586);
+        setState(1592);
         columnExprList();
       }
-      setState(1589);
+      setState(1595);
       match(ClickHouseParser::RBRACKET);
       break;
     }
@@ -14123,32 +14356,32 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprIdentifierContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1590);
+      setState(1596);
       columnIdentifier();
       break;
     }
 
     }
     _ctx->stop = _input->LT(-1);
-    setState(1664);
+    setState(1670);
     _errHandler->sync(this);
-    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 218, _ctx);
+    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 219, _ctx);
     while (alt != 2 && alt != atn::ATN::INVALID_ALT_NUMBER) {
       if (alt == 1) {
         if (!_parseListeners.empty())
           triggerExitRuleEvent();
         previousContext = _localctx;
-        setState(1662);
+        setState(1668);
         _errHandler->sync(this);
-        switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 217, _ctx)) {
+        switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 218, _ctx)) {
         case 1: {
           auto newContext = _tracker.createInstance<ColumnExprPrecedence1Context>(_tracker.createInstance<ColumnExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleColumnExpr);
-          setState(1593);
+          setState(1599);
 
           if (!(precpred(_ctx, 16))) throw FailedPredicateException(this, "precpred(_ctx, 16)");
-          setState(1594);
+          setState(1600);
           _la = _input->LA(1);
           if (!(((((_la - 188) & ~ 0x3fULL) == 0) &&
             ((1ULL << (_la - 188)) & ((1ULL << (ClickHouseParser::ASTERISK - 188))
@@ -14160,7 +14393,7 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
             _errHandler->reportMatch(this);
             consume();
           }
-          setState(1595);
+          setState(1601);
           columnExpr(17);
           break;
         }
@@ -14169,10 +14402,10 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           auto newContext = _tracker.createInstance<ColumnExprPrecedence2Context>(_tracker.createInstance<ColumnExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleColumnExpr);
-          setState(1596);
+          setState(1602);
 
           if (!(precpred(_ctx, 15))) throw FailedPredicateException(this, "precpred(_ctx, 15)");
-          setState(1597);
+          setState(1603);
           _la = _input->LA(1);
           if (!(((((_la - 193) & ~ 0x3fULL) == 0) &&
             ((1ULL << (_la - 193)) & ((1ULL << (ClickHouseParser::CONCAT - 193))
@@ -14184,7 +14417,7 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
             _errHandler->reportMatch(this);
             consume();
           }
-          setState(1598);
+          setState(1604);
           columnExpr(16);
           break;
         }
@@ -14193,86 +14426,86 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           auto newContext = _tracker.createInstance<ColumnExprPrecedence3Context>(_tracker.createInstance<ColumnExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleColumnExpr);
-          setState(1599);
+          setState(1605);
 
           if (!(precpred(_ctx, 14))) throw FailedPredicateException(this, "precpred(_ctx, 14)");
-          setState(1618);
+          setState(1624);
           _errHandler->sync(this);
-          switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 213, _ctx)) {
+          switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 214, _ctx)) {
           case 1: {
-            setState(1600);
+            setState(1606);
             match(ClickHouseParser::EQ_DOUBLE);
             break;
           }
 
           case 2: {
-            setState(1601);
+            setState(1607);
             match(ClickHouseParser::EQ_SINGLE);
             break;
           }
 
           case 3: {
-            setState(1602);
+            setState(1608);
             match(ClickHouseParser::NOT_EQ);
             break;
           }
 
           case 4: {
-            setState(1603);
+            setState(1609);
             match(ClickHouseParser::LE);
             break;
           }
 
           case 5: {
-            setState(1604);
+            setState(1610);
             match(ClickHouseParser::GE);
             break;
           }
 
           case 6: {
-            setState(1605);
+            setState(1611);
             match(ClickHouseParser::LT);
             break;
           }
 
           case 7: {
-            setState(1606);
+            setState(1612);
             match(ClickHouseParser::GT);
             break;
           }
 
           case 8: {
-            setState(1608);
+            setState(1614);
             _errHandler->sync(this);
 
             _la = _input->LA(1);
             if (_la == ClickHouseParser::GLOBAL) {
-              setState(1607);
+              setState(1613);
               match(ClickHouseParser::GLOBAL);
             }
-            setState(1611);
+            setState(1617);
             _errHandler->sync(this);
 
             _la = _input->LA(1);
             if (_la == ClickHouseParser::NOT) {
-              setState(1610);
+              setState(1616);
               match(ClickHouseParser::NOT);
             }
-            setState(1613);
+            setState(1619);
             match(ClickHouseParser::IN);
             break;
           }
 
           case 9: {
-            setState(1615);
+            setState(1621);
             _errHandler->sync(this);
 
             _la = _input->LA(1);
             if (_la == ClickHouseParser::NOT) {
-              setState(1614);
+              setState(1620);
               match(ClickHouseParser::NOT);
             }
-            setState(1617);
+            setState(1623);
             _la = _input->LA(1);
             if (!(_la == ClickHouseParser::ILIKE
 
@@ -14287,7 +14520,7 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           }
 
           }
-          setState(1620);
+          setState(1626);
           columnExpr(15);
           break;
         }
@@ -14296,12 +14529,12 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           auto newContext = _tracker.createInstance<ColumnExprAndContext>(_tracker.createInstance<ColumnExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleColumnExpr);
-          setState(1621);
+          setState(1627);
 
           if (!(precpred(_ctx, 11))) throw FailedPredicateException(this, "precpred(_ctx, 11)");
-          setState(1622);
+          setState(1628);
           match(ClickHouseParser::AND);
-          setState(1623);
+          setState(1629);
           columnExpr(12);
           break;
         }
@@ -14310,12 +14543,12 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           auto newContext = _tracker.createInstance<ColumnExprOrContext>(_tracker.createInstance<ColumnExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleColumnExpr);
-          setState(1624);
+          setState(1630);
 
           if (!(precpred(_ctx, 10))) throw FailedPredicateException(this, "precpred(_ctx, 10)");
-          setState(1625);
+          setState(1631);
           match(ClickHouseParser::OR);
-          setState(1626);
+          setState(1632);
           columnExpr(11);
           break;
         }
@@ -14324,24 +14557,24 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           auto newContext = _tracker.createInstance<ColumnExprBetweenContext>(_tracker.createInstance<ColumnExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleColumnExpr);
-          setState(1627);
+          setState(1633);
 
           if (!(precpred(_ctx, 9))) throw FailedPredicateException(this, "precpred(_ctx, 9)");
-          setState(1629);
+          setState(1635);
           _errHandler->sync(this);
 
           _la = _input->LA(1);
           if (_la == ClickHouseParser::NOT) {
-            setState(1628);
+            setState(1634);
             match(ClickHouseParser::NOT);
           }
-          setState(1631);
+          setState(1637);
           match(ClickHouseParser::BETWEEN);
-          setState(1632);
+          setState(1638);
           columnExpr(0);
-          setState(1633);
+          setState(1639);
           match(ClickHouseParser::AND);
-          setState(1634);
+          setState(1640);
           columnExpr(10);
           break;
         }
@@ -14350,16 +14583,16 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           auto newContext = _tracker.createInstance<ColumnExprTernaryOpContext>(_tracker.createInstance<ColumnExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleColumnExpr);
-          setState(1636);
+          setState(1642);
 
           if (!(precpred(_ctx, 8))) throw FailedPredicateException(this, "precpred(_ctx, 8)");
-          setState(1637);
+          setState(1643);
           match(ClickHouseParser::QUERY);
-          setState(1638);
+          setState(1644);
           columnExpr(0);
-          setState(1639);
+          setState(1645);
           match(ClickHouseParser::COLON);
-          setState(1640);
+          setState(1646);
           columnExpr(8);
           break;
         }
@@ -14368,14 +14601,14 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           auto newContext = _tracker.createInstance<ColumnExprArrayAccessContext>(_tracker.createInstance<ColumnExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleColumnExpr);
-          setState(1642);
+          setState(1648);
 
           if (!(precpred(_ctx, 19))) throw FailedPredicateException(this, "precpred(_ctx, 19)");
-          setState(1643);
+          setState(1649);
           match(ClickHouseParser::LBRACKET);
-          setState(1644);
+          setState(1650);
           columnExpr(0);
-          setState(1645);
+          setState(1651);
           match(ClickHouseParser::RBRACKET);
           break;
         }
@@ -14384,12 +14617,12 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           auto newContext = _tracker.createInstance<ColumnExprTupleAccessContext>(_tracker.createInstance<ColumnExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleColumnExpr);
-          setState(1647);
+          setState(1653);
 
           if (!(precpred(_ctx, 18))) throw FailedPredicateException(this, "precpred(_ctx, 18)");
-          setState(1648);
+          setState(1654);
           match(ClickHouseParser::DOT);
-          setState(1649);
+          setState(1655);
           match(ClickHouseParser::DECIMAL_LITERAL);
           break;
         }
@@ -14398,20 +14631,20 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           auto newContext = _tracker.createInstance<ColumnExprIsNullContext>(_tracker.createInstance<ColumnExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleColumnExpr);
-          setState(1650);
+          setState(1656);
 
           if (!(precpred(_ctx, 13))) throw FailedPredicateException(this, "precpred(_ctx, 13)");
-          setState(1651);
+          setState(1657);
           match(ClickHouseParser::IS);
-          setState(1653);
+          setState(1659);
           _errHandler->sync(this);
 
           _la = _input->LA(1);
           if (_la == ClickHouseParser::NOT) {
-            setState(1652);
+            setState(1658);
             match(ClickHouseParser::NOT);
           }
-          setState(1655);
+          setState(1661);
           match(ClickHouseParser::NULL_SQL);
           break;
         }
@@ -14420,10 +14653,10 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           auto newContext = _tracker.createInstance<ColumnExprAliasContext>(_tracker.createInstance<ColumnExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleColumnExpr);
-          setState(1656);
+          setState(1662);
 
           if (!(precpred(_ctx, 7))) throw FailedPredicateException(this, "precpred(_ctx, 7)");
-          setState(1660);
+          setState(1666);
           _errHandler->sync(this);
           switch (_input->LA(1)) {
             case ClickHouseParser::DATE:
@@ -14431,15 +14664,15 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
             case ClickHouseParser::ID:
             case ClickHouseParser::KEY:
             case ClickHouseParser::IDENTIFIER: {
-              setState(1657);
+              setState(1663);
               alias();
               break;
             }
 
             case ClickHouseParser::AS: {
-              setState(1658);
+              setState(1664);
               match(ClickHouseParser::AS);
-              setState(1659);
+              setState(1665);
               identifier();
               break;
             }
@@ -14452,9 +14685,9 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
 
         } 
       }
-      setState(1666);
+      setState(1672);
       _errHandler->sync(this);
-      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 218, _ctx);
+      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 219, _ctx);
     }
   }
   catch (RecognitionException &e) {
@@ -14492,6 +14725,7 @@ size_t ClickHouseParser::ColumnArgListContext::getRuleIndex() const {
   return ClickHouseParser::RuleColumnArgList;
 }
 
+
 antlrcpp::Any ClickHouseParser::ColumnArgListContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnArgList(this);
@@ -14509,17 +14743,17 @@ ClickHouseParser::ColumnArgListContext* ClickHouseParser::columnArgList() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1667);
+    setState(1673);
     columnArgExpr();
-    setState(1672);
+    setState(1678);
     _errHandler->sync(this);
     _la = _input->LA(1);
     while (_la == ClickHouseParser::COMMA) {
-      setState(1668);
-      match(ClickHouseParser::COMMA);
-      setState(1669);
-      columnArgExpr();
       setState(1674);
+      match(ClickHouseParser::COMMA);
+      setState(1675);
+      columnArgExpr();
+      setState(1680);
       _errHandler->sync(this);
       _la = _input->LA(1);
     }
@@ -14553,6 +14787,7 @@ size_t ClickHouseParser::ColumnArgExprContext::getRuleIndex() const {
   return ClickHouseParser::RuleColumnArgExpr;
 }
 
+
 antlrcpp::Any ClickHouseParser::ColumnArgExprContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnArgExpr(this);
@@ -14568,19 +14803,19 @@ ClickHouseParser::ColumnArgExprContext* ClickHouseParser::columnArgExpr() {
     exitRule();
   });
   try {
-    setState(1677);
+    setState(1683);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 220, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 221, _ctx)) {
     case 1: {
       enterOuterAlt(_localctx, 1);
-      setState(1675);
+      setState(1681);
       columnLambdaExpr();
       break;
     }
 
     case 2: {
       enterOuterAlt(_localctx, 2);
-      setState(1676);
+      setState(1682);
       columnExpr(0);
       break;
     }
@@ -14640,6 +14875,7 @@ size_t ClickHouseParser::ColumnLambdaExprContext::getRuleIndex() const {
   return ClickHouseParser::RuleColumnLambdaExpr;
 }
 
+
 antlrcpp::Any ClickHouseParser::ColumnLambdaExprContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnLambdaExpr(this);
@@ -14657,27 +14893,27 @@ ClickHouseParser::ColumnLambdaExprContext* ClickHouseParser::columnLambdaExpr()
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1698);
+    setState(1704);
     _errHandler->sync(this);
     switch (_input->LA(1)) {
       case ClickHouseParser::LPAREN: {
-        setState(1679);
-        match(ClickHouseParser::LPAREN);
-        setState(1680);
-        identifier();
         setState(1685);
+        match(ClickHouseParser::LPAREN);
+        setState(1686);
+        identifier();
+        setState(1691);
         _errHandler->sync(this);
         _la = _input->LA(1);
         while (_la == ClickHouseParser::COMMA) {
-          setState(1681);
-          match(ClickHouseParser::COMMA);
-          setState(1682);
-          identifier();
           setState(1687);
+          match(ClickHouseParser::COMMA);
+          setState(1688);
+          identifier();
+          setState(1693);
           _errHandler->sync(this);
           _la = _input->LA(1);
         }
-        setState(1688);
+        setState(1694);
         match(ClickHouseParser::RPAREN);
         break;
       }
@@ -14859,17 +15095,17 @@ ClickHouseParser::ColumnLambdaExprContext* ClickHouseParser::columnLambdaExpr()
       case ClickHouseParser::JSON_FALSE:
       case ClickHouseParser::JSON_TRUE:
       case ClickHouseParser::IDENTIFIER: {
-        setState(1690);
+        setState(1696);
         identifier();
-        setState(1695);
+        setState(1701);
         _errHandler->sync(this);
         _la = _input->LA(1);
         while (_la == ClickHouseParser::COMMA) {
-          setState(1691);
-          match(ClickHouseParser::COMMA);
-          setState(1692);
-          identifier();
           setState(1697);
+          match(ClickHouseParser::COMMA);
+          setState(1698);
+          identifier();
+          setState(1703);
           _errHandler->sync(this);
           _la = _input->LA(1);
         }
@@ -14879,9 +15115,9 @@ ClickHouseParser::ColumnLambdaExprContext* ClickHouseParser::columnLambdaExpr()
     default:
       throw NoViableAltException(this);
     }
-    setState(1700);
+    setState(1706);
     match(ClickHouseParser::ARROW);
-    setState(1701);
+    setState(1707);
     columnExpr(0);
    
   }
@@ -14917,6 +15153,7 @@ size_t ClickHouseParser::ColumnIdentifierContext::getRuleIndex() const {
   return ClickHouseParser::RuleColumnIdentifier;
 }
 
+
 antlrcpp::Any ClickHouseParser::ColumnIdentifierContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitColumnIdentifier(this);
@@ -14933,20 +15170,20 @@ ClickHouseParser::ColumnIdentifierContext* ClickHouseParser::columnIdentifier()
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1706);
+    setState(1712);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 224, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 225, _ctx)) {
     case 1: {
-      setState(1703);
+      setState(1709);
       tableIdentifier();
-      setState(1704);
+      setState(1710);
       match(ClickHouseParser::DOT);
       break;
     }
 
     }
-    setState(1708);
+    setState(1714);
     nestedIdentifier();
    
   }
@@ -14982,6 +15219,7 @@ size_t ClickHouseParser::NestedIdentifierContext::getRuleIndex() const {
   return ClickHouseParser::RuleNestedIdentifier;
 }
 
+
 antlrcpp::Any ClickHouseParser::NestedIdentifierContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitNestedIdentifier(this);
@@ -14998,16 +15236,16 @@ ClickHouseParser::NestedIdentifierContext* ClickHouseParser::nestedIdentifier()
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1710);
+    setState(1716);
     identifier();
-    setState(1713);
+    setState(1719);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 225, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 226, _ctx)) {
     case 1: {
-      setState(1711);
+      setState(1717);
       match(ClickHouseParser::DOT);
-      setState(1712);
+      setState(1718);
       identifier();
       break;
     }
@@ -15047,6 +15285,7 @@ ClickHouseParser::TableIdentifierContext* ClickHouseParser::TableExprIdentifierC
 
 ClickHouseParser::TableExprIdentifierContext::TableExprIdentifierContext(TableExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::TableExprIdentifierContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitTableExprIdentifier(this);
@@ -15069,6 +15308,7 @@ tree::TerminalNode* ClickHouseParser::TableExprSubqueryContext::RPAREN() {
 
 ClickHouseParser::TableExprSubqueryContext::TableExprSubqueryContext(TableExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::TableExprSubqueryContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitTableExprSubquery(this);
@@ -15095,6 +15335,7 @@ ClickHouseParser::IdentifierContext* ClickHouseParser::TableExprAliasContext::id
 
 ClickHouseParser::TableExprAliasContext::TableExprAliasContext(TableExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::TableExprAliasContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitTableExprAlias(this);
@@ -15109,6 +15350,7 @@ ClickHouseParser::TableFunctionExprContext* ClickHouseParser::TableExprFunctionC
 
 ClickHouseParser::TableExprFunctionContext::TableExprFunctionContext(TableExprContext *ctx) { copyFrom(ctx); }
 
+
 antlrcpp::Any ClickHouseParser::TableExprFunctionContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitTableExprFunction(this);
@@ -15137,15 +15379,15 @@ ClickHouseParser::TableExprContext* ClickHouseParser::tableExpr(int precedence)
   try {
     size_t alt;
     enterOuterAlt(_localctx, 1);
-    setState(1722);
+    setState(1728);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 226, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 227, _ctx)) {
     case 1: {
       _localctx = _tracker.createInstance<TableExprIdentifierContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
 
-      setState(1716);
+      setState(1722);
       tableIdentifier();
       break;
     }
@@ -15154,7 +15396,7 @@ ClickHouseParser::TableExprContext* ClickHouseParser::tableExpr(int precedence)
       _localctx = _tracker.createInstance<TableExprFunctionContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1717);
+      setState(1723);
       tableFunctionExpr();
       break;
     }
@@ -15163,20 +15405,20 @@ ClickHouseParser::TableExprContext* ClickHouseParser::tableExpr(int precedence)
       _localctx = _tracker.createInstance<TableExprSubqueryContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1718);
+      setState(1724);
       match(ClickHouseParser::LPAREN);
-      setState(1719);
+      setState(1725);
       selectUnionStmt();
-      setState(1720);
+      setState(1726);
       match(ClickHouseParser::RPAREN);
       break;
     }
 
     }
     _ctx->stop = _input->LT(-1);
-    setState(1732);
+    setState(1738);
     _errHandler->sync(this);
-    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 228, _ctx);
+    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 229, _ctx);
     while (alt != 2 && alt != atn::ATN::INVALID_ALT_NUMBER) {
       if (alt == 1) {
         if (!_parseListeners.empty())
@@ -15185,10 +15427,10 @@ ClickHouseParser::TableExprContext* ClickHouseParser::tableExpr(int precedence)
         auto newContext = _tracker.createInstance<TableExprAliasContext>(_tracker.createInstance<TableExprContext>(parentContext, parentState));
         _localctx = newContext;
         pushNewRecursionContext(newContext, startState, RuleTableExpr);
-        setState(1724);
+        setState(1730);
 
         if (!(precpred(_ctx, 1))) throw FailedPredicateException(this, "precpred(_ctx, 1)");
-        setState(1728);
+        setState(1734);
         _errHandler->sync(this);
         switch (_input->LA(1)) {
           case ClickHouseParser::DATE:
@@ -15196,15 +15438,15 @@ ClickHouseParser::TableExprContext* ClickHouseParser::tableExpr(int precedence)
           case ClickHouseParser::ID:
           case ClickHouseParser::KEY:
           case ClickHouseParser::IDENTIFIER: {
-            setState(1725);
+            setState(1731);
             alias();
             break;
           }
 
           case ClickHouseParser::AS: {
-            setState(1726);
+            setState(1732);
             match(ClickHouseParser::AS);
-            setState(1727);
+            setState(1733);
             identifier();
             break;
           }
@@ -15213,9 +15455,9 @@ ClickHouseParser::TableExprContext* ClickHouseParser::tableExpr(int precedence)
           throw NoViableAltException(this);
         } 
       }
-      setState(1734);
+      setState(1740);
       _errHandler->sync(this);
-      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 228, _ctx);
+      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 229, _ctx);
     }
   }
   catch (RecognitionException &e) {
@@ -15253,6 +15495,7 @@ size_t ClickHouseParser::TableFunctionExprContext::getRuleIndex() const {
   return ClickHouseParser::RuleTableFunctionExpr;
 }
 
+
 antlrcpp::Any ClickHouseParser::TableFunctionExprContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitTableFunctionExpr(this);
@@ -15270,11 +15513,11 @@ ClickHouseParser::TableFunctionExprContext* ClickHouseParser::tableFunctionExpr(
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1735);
+    setState(1741);
     identifier();
-    setState(1736);
+    setState(1742);
     match(ClickHouseParser::LPAREN);
-    setState(1738);
+    setState(1744);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
@@ -15467,10 +15710,10 @@ ClickHouseParser::TableFunctionExprContext* ClickHouseParser::tableFunctionExpr(
       ((1ULL << (_la - 194)) & ((1ULL << (ClickHouseParser::DASH - 194))
       | (1ULL << (ClickHouseParser::DOT - 194))
       | (1ULL << (ClickHouseParser::PLUS - 194)))) != 0)) {
-      setState(1737);
+      setState(1743);
       tableArgList();
     }
-    setState(1740);
+    setState(1746);
     match(ClickHouseParser::RPAREN);
    
   }
@@ -15506,6 +15749,7 @@ size_t ClickHouseParser::TableIdentifierContext::getRuleIndex() const {
   return ClickHouseParser::RuleTableIdentifier;
 }
 
+
 antlrcpp::Any ClickHouseParser::TableIdentifierContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitTableIdentifier(this);
@@ -15522,20 +15766,20 @@ ClickHouseParser::TableIdentifierContext* ClickHouseParser::tableIdentifier() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1745);
+    setState(1751);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 230, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 231, _ctx)) {
     case 1: {
-      setState(1742);
+      setState(1748);
       databaseIdentifier();
-      setState(1743);
+      setState(1749);
       match(ClickHouseParser::DOT);
       break;
     }
 
     }
-    setState(1747);
+    setState(1753);
     identifier();
    
   }
@@ -15575,6 +15819,7 @@ size_t ClickHouseParser::TableArgListContext::getRuleIndex() const {
   return ClickHouseParser::RuleTableArgList;
 }
 
+
 antlrcpp::Any ClickHouseParser::TableArgListContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitTableArgList(this);
@@ -15592,17 +15837,17 @@ ClickHouseParser::TableArgListContext* ClickHouseParser::tableArgList() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1749);
+    setState(1755);
     tableArgExpr();
-    setState(1754);
+    setState(1760);
     _errHandler->sync(this);
     _la = _input->LA(1);
     while (_la == ClickHouseParser::COMMA) {
-      setState(1750);
-      match(ClickHouseParser::COMMA);
-      setState(1751);
-      tableArgExpr();
       setState(1756);
+      match(ClickHouseParser::COMMA);
+      setState(1757);
+      tableArgExpr();
+      setState(1762);
       _errHandler->sync(this);
       _la = _input->LA(1);
     }
@@ -15640,6 +15885,7 @@ size_t ClickHouseParser::TableArgExprContext::getRuleIndex() const {
   return ClickHouseParser::RuleTableArgExpr;
 }
 
+
 antlrcpp::Any ClickHouseParser::TableArgExprContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitTableArgExpr(this);
@@ -15655,26 +15901,26 @@ ClickHouseParser::TableArgExprContext* ClickHouseParser::tableArgExpr() {
     exitRule();
   });
   try {
-    setState(1760);
+    setState(1766);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 232, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 233, _ctx)) {
     case 1: {
       enterOuterAlt(_localctx, 1);
-      setState(1757);
+      setState(1763);
       tableIdentifier();
       break;
     }
 
     case 2: {
       enterOuterAlt(_localctx, 2);
-      setState(1758);
+      setState(1764);
       tableFunctionExpr();
       break;
     }
 
     case 3: {
       enterOuterAlt(_localctx, 3);
-      setState(1759);
+      setState(1765);
       literal();
       break;
     }
@@ -15706,6 +15952,7 @@ size_t ClickHouseParser::DatabaseIdentifierContext::getRuleIndex() const {
   return ClickHouseParser::RuleDatabaseIdentifier;
 }
 
+
 antlrcpp::Any ClickHouseParser::DatabaseIdentifierContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitDatabaseIdentifier(this);
@@ -15722,7 +15969,7 @@ ClickHouseParser::DatabaseIdentifierContext* ClickHouseParser::databaseIdentifie
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1762);
+    setState(1768);
     identifier();
    
   }
@@ -15766,6 +16013,7 @@ size_t ClickHouseParser::FloatingLiteralContext::getRuleIndex() const {
   return ClickHouseParser::RuleFloatingLiteral;
 }
 
+
 antlrcpp::Any ClickHouseParser::FloatingLiteralContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitFloatingLiteral(this);
@@ -15782,21 +16030,21 @@ ClickHouseParser::FloatingLiteralContext* ClickHouseParser::floatingLiteral() {
     exitRule();
   });
   try {
-    setState(1772);
+    setState(1778);
     _errHandler->sync(this);
     switch (_input->LA(1)) {
       case ClickHouseParser::FLOATING_LITERAL: {
         enterOuterAlt(_localctx, 1);
-        setState(1764);
+        setState(1770);
         match(ClickHouseParser::FLOATING_LITERAL);
         break;
       }
 
       case ClickHouseParser::DOT: {
         enterOuterAlt(_localctx, 2);
-        setState(1765);
+        setState(1771);
         match(ClickHouseParser::DOT);
-        setState(1766);
+        setState(1772);
         _la = _input->LA(1);
         if (!(_la == ClickHouseParser::OCTAL_LITERAL
 
@@ -15812,16 +16060,16 @@ ClickHouseParser::FloatingLiteralContext* ClickHouseParser::floatingLiteral() {
 
       case ClickHouseParser::DECIMAL_LITERAL: {
         enterOuterAlt(_localctx, 3);
-        setState(1767);
+        setState(1773);
         match(ClickHouseParser::DECIMAL_LITERAL);
-        setState(1768);
+        setState(1774);
         match(ClickHouseParser::DOT);
-        setState(1770);
+        setState(1776);
         _errHandler->sync(this);
 
-        switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 233, _ctx)) {
+        switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 234, _ctx)) {
         case 1: {
-          setState(1769);
+          setState(1775);
           _la = _input->LA(1);
           if (!(_la == ClickHouseParser::OCTAL_LITERAL
 
@@ -15896,6 +16144,7 @@ size_t ClickHouseParser::NumberLiteralContext::getRuleIndex() const {
   return ClickHouseParser::RuleNumberLiteral;
 }
 
+
 antlrcpp::Any ClickHouseParser::NumberLiteralContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitNumberLiteral(this);
@@ -15913,14 +16162,14 @@ ClickHouseParser::NumberLiteralContext* ClickHouseParser::numberLiteral() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1775);
+    setState(1781);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::DASH
 
     || _la == ClickHouseParser::PLUS) {
-      setState(1774);
+      setState(1780);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::DASH
 
@@ -15932,41 +16181,41 @@ ClickHouseParser::NumberLiteralContext* ClickHouseParser::numberLiteral() {
         consume();
       }
     }
-    setState(1783);
+    setState(1789);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 236, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 237, _ctx)) {
     case 1: {
-      setState(1777);
+      setState(1783);
       floatingLiteral();
       break;
     }
 
     case 2: {
-      setState(1778);
+      setState(1784);
       match(ClickHouseParser::OCTAL_LITERAL);
       break;
     }
 
     case 3: {
-      setState(1779);
+      setState(1785);
       match(ClickHouseParser::DECIMAL_LITERAL);
       break;
     }
 
     case 4: {
-      setState(1780);
+      setState(1786);
       match(ClickHouseParser::HEXADECIMAL_LITERAL);
       break;
     }
 
     case 5: {
-      setState(1781);
+      setState(1787);
       match(ClickHouseParser::INF);
       break;
     }
 
     case 6: {
-      setState(1782);
+      setState(1788);
       match(ClickHouseParser::NAN_SQL);
       break;
     }
@@ -16006,6 +16255,7 @@ size_t ClickHouseParser::LiteralContext::getRuleIndex() const {
   return ClickHouseParser::RuleLiteral;
 }
 
+
 antlrcpp::Any ClickHouseParser::LiteralContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitLiteral(this);
@@ -16021,7 +16271,7 @@ ClickHouseParser::LiteralContext* ClickHouseParser::literal() {
     exitRule();
   });
   try {
-    setState(1788);
+    setState(1794);
     _errHandler->sync(this);
     switch (_input->LA(1)) {
       case ClickHouseParser::INF:
@@ -16034,21 +16284,21 @@ ClickHouseParser::LiteralContext* ClickHouseParser::literal() {
       case ClickHouseParser::DOT:
       case ClickHouseParser::PLUS: {
         enterOuterAlt(_localctx, 1);
-        setState(1785);
+        setState(1791);
         numberLiteral();
         break;
       }
 
       case ClickHouseParser::STRING_LITERAL: {
         enterOuterAlt(_localctx, 2);
-        setState(1786);
+        setState(1792);
         match(ClickHouseParser::STRING_LITERAL);
         break;
       }
 
       case ClickHouseParser::NULL_SQL: {
         enterOuterAlt(_localctx, 3);
-        setState(1787);
+        setState(1793);
         match(ClickHouseParser::NULL_SQL);
         break;
       }
@@ -16110,6 +16360,7 @@ size_t ClickHouseParser::IntervalContext::getRuleIndex() const {
   return ClickHouseParser::RuleInterval;
 }
 
+
 antlrcpp::Any ClickHouseParser::IntervalContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitInterval(this);
@@ -16127,7 +16378,7 @@ ClickHouseParser::IntervalContext* ClickHouseParser::interval() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1790);
+    setState(1796);
     _la = _input->LA(1);
     if (!(_la == ClickHouseParser::DAY || ((((_la - 72) & ~ 0x3fULL) == 0) &&
       ((1ULL << (_la - 72)) & ((1ULL << (ClickHouseParser::HOUR - 72))
@@ -16837,6 +17088,7 @@ size_t ClickHouseParser::KeywordContext::getRuleIndex() const {
   return ClickHouseParser::RuleKeyword;
 }
 
+
 antlrcpp::Any ClickHouseParser::KeywordContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitKeyword(this);
@@ -16854,7 +17106,7 @@ ClickHouseParser::KeywordContext* ClickHouseParser::keyword() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1792);
+    setState(1798);
     _la = _input->LA(1);
     if (!((((_la & ~ 0x3fULL) == 0) &&
       ((1ULL << _la) & ((1ULL << ClickHouseParser::AFTER)
@@ -17069,6 +17321,7 @@ size_t ClickHouseParser::KeywordForAliasContext::getRuleIndex() const {
   return ClickHouseParser::RuleKeywordForAlias;
 }
 
+
 antlrcpp::Any ClickHouseParser::KeywordForAliasContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitKeywordForAlias(this);
@@ -17086,7 +17339,7 @@ ClickHouseParser::KeywordForAliasContext* ClickHouseParser::keywordForAlias() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1794);
+    setState(1800);
     _la = _input->LA(1);
     if (!(((((_la - 33) & ~ 0x3fULL) == 0) &&
       ((1ULL << (_la - 33)) & ((1ULL << (ClickHouseParser::DATE - 33))
@@ -17129,6 +17382,7 @@ size_t ClickHouseParser::AliasContext::getRuleIndex() const {
   return ClickHouseParser::RuleAlias;
 }
 
+
 antlrcpp::Any ClickHouseParser::AliasContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitAlias(this);
@@ -17144,12 +17398,12 @@ ClickHouseParser::AliasContext* ClickHouseParser::alias() {
     exitRule();
   });
   try {
-    setState(1798);
+    setState(1804);
     _errHandler->sync(this);
     switch (_input->LA(1)) {
       case ClickHouseParser::IDENTIFIER: {
         enterOuterAlt(_localctx, 1);
-        setState(1796);
+        setState(1802);
         match(ClickHouseParser::IDENTIFIER);
         break;
       }
@@ -17159,7 +17413,7 @@ ClickHouseParser::AliasContext* ClickHouseParser::alias() {
       case ClickHouseParser::ID:
       case ClickHouseParser::KEY: {
         enterOuterAlt(_localctx, 2);
-        setState(1797);
+        setState(1803);
         keywordForAlias();
         break;
       }
@@ -17201,6 +17455,7 @@ size_t ClickHouseParser::IdentifierContext::getRuleIndex() const {
   return ClickHouseParser::RuleIdentifier;
 }
 
+
 antlrcpp::Any ClickHouseParser::IdentifierContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitIdentifier(this);
@@ -17216,12 +17471,12 @@ ClickHouseParser::IdentifierContext* ClickHouseParser::identifier() {
     exitRule();
   });
   try {
-    setState(1803);
+    setState(1809);
     _errHandler->sync(this);
     switch (_input->LA(1)) {
       case ClickHouseParser::IDENTIFIER: {
         enterOuterAlt(_localctx, 1);
-        setState(1800);
+        setState(1806);
         match(ClickHouseParser::IDENTIFIER);
         break;
       }
@@ -17235,7 +17490,7 @@ ClickHouseParser::IdentifierContext* ClickHouseParser::identifier() {
       case ClickHouseParser::WEEK:
       case ClickHouseParser::YEAR: {
         enterOuterAlt(_localctx, 2);
-        setState(1801);
+        setState(1807);
         interval();
         break;
       }
@@ -17409,7 +17664,7 @@ ClickHouseParser::IdentifierContext* ClickHouseParser::identifier() {
       case ClickHouseParser::JSON_FALSE:
       case ClickHouseParser::JSON_TRUE: {
         enterOuterAlt(_localctx, 3);
-        setState(1802);
+        setState(1808);
         keyword();
         break;
       }
@@ -17447,6 +17702,7 @@ size_t ClickHouseParser::IdentifierOrNullContext::getRuleIndex() const {
   return ClickHouseParser::RuleIdentifierOrNull;
 }
 
+
 antlrcpp::Any ClickHouseParser::IdentifierOrNullContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitIdentifierOrNull(this);
@@ -17462,7 +17718,7 @@ ClickHouseParser::IdentifierOrNullContext* ClickHouseParser::identifierOrNull()
     exitRule();
   });
   try {
-    setState(1807);
+    setState(1813);
     _errHandler->sync(this);
     switch (_input->LA(1)) {
       case ClickHouseParser::AFTER:
@@ -17643,14 +17899,14 @@ ClickHouseParser::IdentifierOrNullContext* ClickHouseParser::identifierOrNull()
       case ClickHouseParser::JSON_TRUE:
       case ClickHouseParser::IDENTIFIER: {
         enterOuterAlt(_localctx, 1);
-        setState(1805);
+        setState(1811);
         identifier();
         break;
       }
 
       case ClickHouseParser::NULL_SQL: {
         enterOuterAlt(_localctx, 2);
-        setState(1806);
+        setState(1812);
         match(ClickHouseParser::NULL_SQL);
         break;
       }
@@ -17692,6 +17948,7 @@ size_t ClickHouseParser::EnumValueContext::getRuleIndex() const {
   return ClickHouseParser::RuleEnumValue;
 }
 
+
 antlrcpp::Any ClickHouseParser::EnumValueContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
     return parserVisitor->visitEnumValue(this);
@@ -17708,11 +17965,11 @@ ClickHouseParser::EnumValueContext* ClickHouseParser::enumValue() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1809);
+    setState(1815);
     match(ClickHouseParser::STRING_LITERAL);
-    setState(1810);
+    setState(1816);
     match(ClickHouseParser::EQ_SINGLE);
-    setState(1811);
+    setState(1817);
     numberLiteral();
    
   }
@@ -17928,7 +18185,7 @@ ClickHouseParser::Initializer::Initializer() {
 
   _serializedATN = {
     0x3, 0x608b, 0xa72a, 0x8133, 0xb9ed, 0x417c, 0x3be7, 0x7786, 0x5964, 
-    0x3, 0xdd, 0x718, 0x4, 0x2, 0x9, 0x2, 0x4, 0x3, 0x9, 0x3, 0x4, 0x4, 
+    0x3, 0xdd, 0x71e, 0x4, 0x2, 0x9, 0x2, 0x4, 0x3, 0x9, 0x3, 0x4, 0x4, 
     0x9, 0x4, 0x4, 0x5, 0x9, 0x5, 0x4, 0x6, 0x9, 0x6, 0x4, 0x7, 0x9, 0x7, 
     0x4, 0x8, 0x9, 0x8, 0x4, 0x9, 0x9, 0x9, 0x4, 0xa, 0x9, 0xa, 0x4, 0xb, 
     0x9, 0xb, 0x4, 0xc, 0x9, 0xc, 0x4, 0xd, 0x9, 0xd, 0x4, 0xe, 0x9, 0xe, 
@@ -18075,1233 +18332,1238 @@ ClickHouseParser::Initializer::Initializer() {
     0x3, 0x29, 0x5, 0x29, 0x38f, 0xa, 0x29, 0x3, 0x29, 0x3, 0x29, 0x3, 0x2a, 
     0x3, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 0x5, 0x2a, 0x397, 0xa, 0x2a, 0x3, 0x2a, 
     0x3, 0x2a, 0x5, 0x2a, 0x39b, 0xa, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 
-    0x5, 0x2a, 0x3a0, 0xa, 0x2a, 0x3, 0x2a, 0x5, 0x2a, 0x3a3, 0xa, 0x2a, 
-    0x3, 0x2a, 0x3, 0x2a, 0x5, 0x2a, 0x3a7, 0xa, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 
-    0x5, 0x2a, 0x3ab, 0xa, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 0x5, 0x2a, 0x3af, 
-    0xa, 0x2a, 0x5, 0x2a, 0x3b1, 0xa, 0x2a, 0x3, 0x2b, 0x3, 0x2b, 0x3, 0x2b, 
-    0x5, 0x2b, 0x3b6, 0xa, 0x2b, 0x3, 0x2b, 0x5, 0x2b, 0x3b9, 0xa, 0x2b, 
-    0x3, 0x2b, 0x3, 0x2b, 0x3, 0x2c, 0x3, 0x2c, 0x3, 0x2c, 0x3, 0x2c, 0x3, 
-    0x2d, 0x3, 0x2d, 0x3, 0x2d, 0x5, 0x2d, 0x3c4, 0xa, 0x2d, 0x3, 0x2d, 
-    0x3, 0x2d, 0x3, 0x2d, 0x5, 0x2d, 0x3c9, 0xa, 0x2d, 0x3, 0x2d, 0x5, 0x2d, 
-    0x3cc, 0xa, 0x2d, 0x3, 0x2d, 0x3, 0x2d, 0x3, 0x2e, 0x3, 0x2e, 0x3, 0x2e, 
-    0x3, 0x2e, 0x7, 0x2e, 0x3d4, 0xa, 0x2e, 0xc, 0x2e, 0xe, 0x2e, 0x3d7, 
-    0xb, 0x2e, 0x3, 0x2e, 0x3, 0x2e, 0x3, 0x2f, 0x3, 0x2f, 0x3, 0x2f, 0x3, 
-    0x2f, 0x3, 0x2f, 0x5, 0x2f, 0x3e0, 0xa, 0x2f, 0x3, 0x2f, 0x3, 0x2f, 
-    0x5, 0x2f, 0x3e4, 0xa, 0x2f, 0x3, 0x30, 0x3, 0x30, 0x3, 0x30, 0x5, 0x30, 
-    0x3e9, 0xa, 0x30, 0x3, 0x30, 0x3, 0x30, 0x5, 0x30, 0x3ed, 0xa, 0x30, 
-    0x3, 0x31, 0x3, 0x31, 0x3, 0x31, 0x3, 0x31, 0x5, 0x31, 0x3f3, 0xa, 0x31, 
-    0x3, 0x31, 0x5, 0x31, 0x3f6, 0xa, 0x31, 0x3, 0x31, 0x5, 0x31, 0x3f9, 
-    0xa, 0x31, 0x3, 0x31, 0x5, 0x31, 0x3fc, 0xa, 0x31, 0x3, 0x32, 0x3, 0x32, 
+    0x5, 0x2a, 0x3a0, 0xa, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 0x5, 0x2a, 0x3a4, 
+    0xa, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 0x5, 0x2a, 0x3a8, 0xa, 0x2a, 0x3, 0x2a, 
+    0x3, 0x2a, 0x5, 0x2a, 0x3ac, 0xa, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 0x5, 0x2a, 
+    0x3b0, 0xa, 0x2a, 0x5, 0x2a, 0x3b2, 0xa, 0x2a, 0x3, 0x2b, 0x3, 0x2b, 
+    0x3, 0x2b, 0x3, 0x2b, 0x3, 0x2b, 0x3, 0x2b, 0x5, 0x2b, 0x3ba, 0xa, 0x2b, 
+    0x3, 0x2b, 0x3, 0x2b, 0x5, 0x2b, 0x3be, 0xa, 0x2b, 0x3, 0x2b, 0x5, 0x2b, 
+    0x3c1, 0xa, 0x2b, 0x3, 0x2c, 0x3, 0x2c, 0x3, 0x2c, 0x3, 0x2c, 0x3, 0x2d, 
+    0x3, 0x2d, 0x3, 0x2d, 0x5, 0x2d, 0x3ca, 0xa, 0x2d, 0x3, 0x2d, 0x3, 0x2d, 
+    0x3, 0x2d, 0x5, 0x2d, 0x3cf, 0xa, 0x2d, 0x3, 0x2d, 0x5, 0x2d, 0x3d2, 
+    0xa, 0x2d, 0x3, 0x2d, 0x3, 0x2d, 0x3, 0x2e, 0x3, 0x2e, 0x3, 0x2e, 0x3, 
+    0x2e, 0x7, 0x2e, 0x3da, 0xa, 0x2e, 0xc, 0x2e, 0xe, 0x2e, 0x3dd, 0xb, 
+    0x2e, 0x3, 0x2e, 0x3, 0x2e, 0x3, 0x2f, 0x3, 0x2f, 0x3, 0x2f, 0x3, 0x2f, 
+    0x3, 0x2f, 0x5, 0x2f, 0x3e6, 0xa, 0x2f, 0x3, 0x2f, 0x3, 0x2f, 0x5, 0x2f, 
+    0x3ea, 0xa, 0x2f, 0x3, 0x30, 0x3, 0x30, 0x3, 0x30, 0x5, 0x30, 0x3ef, 
+    0xa, 0x30, 0x3, 0x30, 0x3, 0x30, 0x5, 0x30, 0x3f3, 0xa, 0x30, 0x3, 0x31, 
+    0x3, 0x31, 0x3, 0x31, 0x3, 0x31, 0x5, 0x31, 0x3f9, 0xa, 0x31, 0x3, 0x31, 
+    0x5, 0x31, 0x3fc, 0xa, 0x31, 0x3, 0x31, 0x5, 0x31, 0x3ff, 0xa, 0x31, 
+    0x3, 0x31, 0x5, 0x31, 0x402, 0xa, 0x31, 0x3, 0x32, 0x3, 0x32, 0x3, 0x32, 
     0x3, 0x32, 0x3, 0x32, 0x3, 0x32, 0x3, 0x32, 0x3, 0x32, 0x3, 0x32, 0x3, 
-    0x32, 0x3, 0x32, 0x7, 0x32, 0x408, 0xa, 0x32, 0xc, 0x32, 0xe, 0x32, 
-    0x40b, 0xb, 0x32, 0x3, 0x32, 0x5, 0x32, 0x40e, 0xa, 0x32, 0x3, 0x33, 
-    0x3, 0x33, 0x3, 0x33, 0x3, 0x33, 0x7, 0x33, 0x414, 0xa, 0x33, 0xc, 0x33, 
-    0xe, 0x33, 0x417, 0xb, 0x33, 0x3, 0x34, 0x3, 0x34, 0x3, 0x34, 0x3, 0x34, 
-    0x3, 0x34, 0x5, 0x34, 0x41e, 0xa, 0x34, 0x3, 0x35, 0x5, 0x35, 0x421, 
-    0xa, 0x35, 0x3, 0x35, 0x3, 0x35, 0x5, 0x35, 0x425, 0xa, 0x35, 0x3, 0x35, 
-    0x5, 0x35, 0x428, 0xa, 0x35, 0x3, 0x35, 0x3, 0x35, 0x5, 0x35, 0x42c, 
-    0xa, 0x35, 0x3, 0x35, 0x5, 0x35, 0x42f, 0xa, 0x35, 0x3, 0x35, 0x5, 0x35, 
-    0x432, 0xa, 0x35, 0x3, 0x35, 0x5, 0x35, 0x435, 0xa, 0x35, 0x3, 0x35, 
-    0x5, 0x35, 0x438, 0xa, 0x35, 0x3, 0x35, 0x3, 0x35, 0x5, 0x35, 0x43c, 
-    0xa, 0x35, 0x3, 0x35, 0x3, 0x35, 0x5, 0x35, 0x440, 0xa, 0x35, 0x3, 0x35, 
-    0x5, 0x35, 0x443, 0xa, 0x35, 0x3, 0x35, 0x5, 0x35, 0x446, 0xa, 0x35, 
-    0x3, 0x35, 0x5, 0x35, 0x449, 0xa, 0x35, 0x3, 0x35, 0x5, 0x35, 0x44c, 
-    0xa, 0x35, 0x3, 0x35, 0x5, 0x35, 0x44f, 0xa, 0x35, 0x3, 0x36, 0x3, 0x36, 
-    0x3, 0x36, 0x3, 0x37, 0x3, 0x37, 0x3, 0x37, 0x3, 0x37, 0x5, 0x37, 0x458, 
-    0xa, 0x37, 0x3, 0x38, 0x3, 0x38, 0x3, 0x38, 0x3, 0x39, 0x5, 0x39, 0x45e, 
-    0xa, 0x39, 0x3, 0x39, 0x3, 0x39, 0x3, 0x39, 0x3, 0x39, 0x3, 0x3a, 0x3, 
-    0x3a, 0x3, 0x3a, 0x3, 0x3b, 0x3, 0x3b, 0x3, 0x3b, 0x3, 0x3c, 0x3, 0x3c, 
-    0x3, 0x3c, 0x3, 0x3c, 0x3, 0x3c, 0x3, 0x3c, 0x3, 0x3c, 0x3, 0x3c, 0x5, 
-    0x3c, 0x472, 0xa, 0x3c, 0x3, 0x3d, 0x3, 0x3d, 0x3, 0x3d, 0x3, 0x3e, 
-    0x3, 0x3e, 0x3, 0x3e, 0x3, 0x3e, 0x3, 0x3f, 0x3, 0x3f, 0x3, 0x3f, 0x3, 
-    0x3f, 0x3, 0x3f, 0x3, 0x40, 0x3, 0x40, 0x3, 0x40, 0x3, 0x40, 0x5, 0x40, 
-    0x484, 0xa, 0x40, 0x3, 0x41, 0x3, 0x41, 0x3, 0x41, 0x3, 0x42, 0x3, 0x42, 
-    0x3, 0x42, 0x5, 0x42, 0x48c, 0xa, 0x42, 0x3, 0x42, 0x5, 0x42, 0x48f, 
-    0xa, 0x42, 0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x5, 0x42, 0x495, 
-    0xa, 0x42, 0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x3, 
-    0x42, 0x5, 0x42, 0x49d, 0xa, 0x42, 0x3, 0x42, 0x5, 0x42, 0x4a0, 0xa, 
-    0x42, 0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x7, 0x42, 0x4a6, 
-    0xa, 0x42, 0xc, 0x42, 0xe, 0x42, 0x4a9, 0xb, 0x42, 0x3, 0x43, 0x5, 0x43, 
-    0x4ac, 0xa, 0x43, 0x3, 0x43, 0x3, 0x43, 0x3, 0x43, 0x5, 0x43, 0x4b1, 
-    0xa, 0x43, 0x3, 0x43, 0x5, 0x43, 0x4b4, 0xa, 0x43, 0x3, 0x43, 0x5, 0x43, 
-    0x4b7, 0xa, 0x43, 0x3, 0x43, 0x3, 0x43, 0x5, 0x43, 0x4bb, 0xa, 0x43, 
-    0x3, 0x43, 0x3, 0x43, 0x5, 0x43, 0x4bf, 0xa, 0x43, 0x3, 0x43, 0x5, 0x43, 
-    0x4c2, 0xa, 0x43, 0x5, 0x43, 0x4c4, 0xa, 0x43, 0x3, 0x43, 0x5, 0x43, 
-    0x4c7, 0xa, 0x43, 0x3, 0x43, 0x3, 0x43, 0x5, 0x43, 0x4cb, 0xa, 0x43, 
-    0x3, 0x43, 0x3, 0x43, 0x5, 0x43, 0x4cf, 0xa, 0x43, 0x3, 0x43, 0x5, 0x43, 
-    0x4d2, 0xa, 0x43, 0x5, 0x43, 0x4d4, 0xa, 0x43, 0x5, 0x43, 0x4d6, 0xa, 
-    0x43, 0x3, 0x44, 0x5, 0x44, 0x4d9, 0xa, 0x44, 0x3, 0x44, 0x3, 0x44, 
-    0x3, 0x44, 0x5, 0x44, 0x4de, 0xa, 0x44, 0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 
-    0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 0x5, 
-    0x45, 0x4e9, 0xa, 0x45, 0x3, 0x46, 0x3, 0x46, 0x3, 0x46, 0x3, 0x46, 
-    0x5, 0x46, 0x4ef, 0xa, 0x46, 0x3, 0x47, 0x3, 0x47, 0x3, 0x47, 0x5, 0x47, 
-    0x4f4, 0xa, 0x47, 0x3, 0x48, 0x3, 0x48, 0x3, 0x48, 0x7, 0x48, 0x4f9, 
-    0xa, 0x48, 0xc, 0x48, 0xe, 0x48, 0x4fc, 0xb, 0x48, 0x3, 0x49, 0x3, 0x49, 
-    0x5, 0x49, 0x500, 0xa, 0x49, 0x3, 0x49, 0x3, 0x49, 0x5, 0x49, 0x504, 
-    0xa, 0x49, 0x3, 0x49, 0x3, 0x49, 0x5, 0x49, 0x508, 0xa, 0x49, 0x3, 0x4a, 
-    0x3, 0x4a, 0x3, 0x4a, 0x5, 0x4a, 0x50d, 0xa, 0x4a, 0x3, 0x4b, 0x3, 0x4b, 
-    0x3, 0x4b, 0x7, 0x4b, 0x512, 0xa, 0x4b, 0xc, 0x4b, 0xe, 0x4b, 0x515, 
-    0xb, 0x4b, 0x3, 0x4c, 0x3, 0x4c, 0x3, 0x4c, 0x3, 0x4c, 0x3, 0x4d, 0x3, 
-    0x4d, 0x3, 0x4d, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 
-    0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x5, 
-    0x4e, 0x529, 0xa, 0x4e, 0x3, 0x4e, 0x5, 0x4e, 0x52c, 0xa, 0x4e, 0x3, 
+    0x32, 0x7, 0x32, 0x40e, 0xa, 0x32, 0xc, 0x32, 0xe, 0x32, 0x411, 0xb, 
+    0x32, 0x3, 0x32, 0x5, 0x32, 0x414, 0xa, 0x32, 0x3, 0x33, 0x3, 0x33, 
+    0x3, 0x33, 0x3, 0x33, 0x7, 0x33, 0x41a, 0xa, 0x33, 0xc, 0x33, 0xe, 0x33, 
+    0x41d, 0xb, 0x33, 0x3, 0x34, 0x3, 0x34, 0x3, 0x34, 0x3, 0x34, 0x3, 0x34, 
+    0x5, 0x34, 0x424, 0xa, 0x34, 0x3, 0x35, 0x5, 0x35, 0x427, 0xa, 0x35, 
+    0x3, 0x35, 0x3, 0x35, 0x5, 0x35, 0x42b, 0xa, 0x35, 0x3, 0x35, 0x5, 0x35, 
+    0x42e, 0xa, 0x35, 0x3, 0x35, 0x3, 0x35, 0x5, 0x35, 0x432, 0xa, 0x35, 
+    0x3, 0x35, 0x5, 0x35, 0x435, 0xa, 0x35, 0x3, 0x35, 0x5, 0x35, 0x438, 
+    0xa, 0x35, 0x3, 0x35, 0x5, 0x35, 0x43b, 0xa, 0x35, 0x3, 0x35, 0x5, 0x35, 
+    0x43e, 0xa, 0x35, 0x3, 0x35, 0x3, 0x35, 0x5, 0x35, 0x442, 0xa, 0x35, 
+    0x3, 0x35, 0x3, 0x35, 0x5, 0x35, 0x446, 0xa, 0x35, 0x3, 0x35, 0x5, 0x35, 
+    0x449, 0xa, 0x35, 0x3, 0x35, 0x5, 0x35, 0x44c, 0xa, 0x35, 0x3, 0x35, 
+    0x5, 0x35, 0x44f, 0xa, 0x35, 0x3, 0x35, 0x5, 0x35, 0x452, 0xa, 0x35, 
+    0x3, 0x35, 0x5, 0x35, 0x455, 0xa, 0x35, 0x3, 0x36, 0x3, 0x36, 0x3, 0x36, 
+    0x3, 0x37, 0x3, 0x37, 0x3, 0x37, 0x3, 0x37, 0x5, 0x37, 0x45e, 0xa, 0x37, 
+    0x3, 0x38, 0x3, 0x38, 0x3, 0x38, 0x3, 0x39, 0x5, 0x39, 0x464, 0xa, 0x39, 
+    0x3, 0x39, 0x3, 0x39, 0x3, 0x39, 0x3, 0x39, 0x3, 0x3a, 0x3, 0x3a, 0x3, 
+    0x3a, 0x3, 0x3b, 0x3, 0x3b, 0x3, 0x3b, 0x3, 0x3c, 0x3, 0x3c, 0x3, 0x3c, 
+    0x3, 0x3c, 0x3, 0x3c, 0x3, 0x3c, 0x3, 0x3c, 0x3, 0x3c, 0x5, 0x3c, 0x478, 
+    0xa, 0x3c, 0x3, 0x3d, 0x3, 0x3d, 0x3, 0x3d, 0x3, 0x3e, 0x3, 0x3e, 0x3, 
+    0x3e, 0x3, 0x3e, 0x3, 0x3f, 0x3, 0x3f, 0x3, 0x3f, 0x3, 0x3f, 0x3, 0x3f, 
+    0x3, 0x40, 0x3, 0x40, 0x3, 0x40, 0x3, 0x40, 0x5, 0x40, 0x48a, 0xa, 0x40, 
+    0x3, 0x41, 0x3, 0x41, 0x3, 0x41, 0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x5, 
+    0x42, 0x492, 0xa, 0x42, 0x3, 0x42, 0x5, 0x42, 0x495, 0xa, 0x42, 0x3, 
+    0x42, 0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x5, 0x42, 0x49b, 0xa, 0x42, 
+    0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x5, 
+    0x42, 0x4a3, 0xa, 0x42, 0x3, 0x42, 0x5, 0x42, 0x4a6, 0xa, 0x42, 0x3, 
+    0x42, 0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x7, 0x42, 0x4ac, 0xa, 0x42, 
+    0xc, 0x42, 0xe, 0x42, 0x4af, 0xb, 0x42, 0x3, 0x43, 0x5, 0x43, 0x4b2, 
+    0xa, 0x43, 0x3, 0x43, 0x3, 0x43, 0x3, 0x43, 0x5, 0x43, 0x4b7, 0xa, 0x43, 
+    0x3, 0x43, 0x5, 0x43, 0x4ba, 0xa, 0x43, 0x3, 0x43, 0x5, 0x43, 0x4bd, 
+    0xa, 0x43, 0x3, 0x43, 0x3, 0x43, 0x5, 0x43, 0x4c1, 0xa, 0x43, 0x3, 0x43, 
+    0x3, 0x43, 0x5, 0x43, 0x4c5, 0xa, 0x43, 0x3, 0x43, 0x5, 0x43, 0x4c8, 
+    0xa, 0x43, 0x5, 0x43, 0x4ca, 0xa, 0x43, 0x3, 0x43, 0x5, 0x43, 0x4cd, 
+    0xa, 0x43, 0x3, 0x43, 0x3, 0x43, 0x5, 0x43, 0x4d1, 0xa, 0x43, 0x3, 0x43, 
+    0x3, 0x43, 0x5, 0x43, 0x4d5, 0xa, 0x43, 0x3, 0x43, 0x5, 0x43, 0x4d8, 
+    0xa, 0x43, 0x5, 0x43, 0x4da, 0xa, 0x43, 0x5, 0x43, 0x4dc, 0xa, 0x43, 
+    0x3, 0x44, 0x5, 0x44, 0x4df, 0xa, 0x44, 0x3, 0x44, 0x3, 0x44, 0x3, 0x44, 
+    0x5, 0x44, 0x4e4, 0xa, 0x44, 0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 
+    0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 0x5, 0x45, 0x4ef, 
+    0xa, 0x45, 0x3, 0x46, 0x3, 0x46, 0x3, 0x46, 0x3, 0x46, 0x5, 0x46, 0x4f5, 
+    0xa, 0x46, 0x3, 0x47, 0x3, 0x47, 0x3, 0x47, 0x5, 0x47, 0x4fa, 0xa, 0x47, 
+    0x3, 0x48, 0x3, 0x48, 0x3, 0x48, 0x7, 0x48, 0x4ff, 0xa, 0x48, 0xc, 0x48, 
+    0xe, 0x48, 0x502, 0xb, 0x48, 0x3, 0x49, 0x3, 0x49, 0x5, 0x49, 0x506, 
+    0xa, 0x49, 0x3, 0x49, 0x3, 0x49, 0x5, 0x49, 0x50a, 0xa, 0x49, 0x3, 0x49, 
+    0x3, 0x49, 0x5, 0x49, 0x50e, 0xa, 0x49, 0x3, 0x4a, 0x3, 0x4a, 0x3, 0x4a, 
+    0x5, 0x4a, 0x513, 0xa, 0x4a, 0x3, 0x4b, 0x3, 0x4b, 0x3, 0x4b, 0x7, 0x4b, 
+    0x518, 0xa, 0x4b, 0xc, 0x4b, 0xe, 0x4b, 0x51b, 0xb, 0x4b, 0x3, 0x4c, 
+    0x3, 0x4c, 0x3, 0x4c, 0x3, 0x4c, 0x3, 0x4d, 0x3, 0x4d, 0x3, 0x4d, 0x3, 
     0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 
-    0x5, 0x4e, 0x535, 0xa, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x5, 0x4e, 0x539, 
-    0xa, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x5, 0x4e, 0x53e, 0xa, 0x4e, 
-    0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x5, 0x4e, 0x543, 0xa, 0x4e, 0x3, 0x4e, 
-    0x5, 0x4e, 0x546, 0xa, 0x4e, 0x5, 0x4e, 0x548, 0xa, 0x4e, 0x3, 0x4f, 
+    0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x5, 0x4e, 0x52f, 0xa, 0x4e, 
+    0x3, 0x4e, 0x5, 0x4e, 0x532, 0xa, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 
+    0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x5, 0x4e, 0x53b, 0xa, 0x4e, 
+    0x3, 0x4e, 0x3, 0x4e, 0x5, 0x4e, 0x53f, 0xa, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 
+    0x3, 0x4e, 0x5, 0x4e, 0x544, 0xa, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 
+    0x5, 0x4e, 0x549, 0xa, 0x4e, 0x3, 0x4e, 0x5, 0x4e, 0x54c, 0xa, 0x4e, 
+    0x5, 0x4e, 0x54e, 0xa, 0x4e, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 
     0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 
     0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 
-    0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x5, 
-    0x4f, 0x55e, 0xa, 0x4f, 0x3, 0x4f, 0x5, 0x4f, 0x561, 0xa, 0x4f, 0x3, 
-    0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 
-    0x3, 0x4f, 0x3, 0x4f, 0x5, 0x4f, 0x56c, 0xa, 0x4f, 0x3, 0x50, 0x3, 0x50, 
-    0x5, 0x50, 0x570, 0xa, 0x50, 0x3, 0x50, 0x5, 0x50, 0x573, 0xa, 0x50, 
-    0x3, 0x50, 0x3, 0x50, 0x5, 0x50, 0x577, 0xa, 0x50, 0x3, 0x50, 0x3, 0x50, 
-    0x5, 0x50, 0x57b, 0xa, 0x50, 0x3, 0x51, 0x3, 0x51, 0x3, 0x51, 0x3, 0x52, 
-    0x3, 0x52, 0x3, 0x52, 0x5, 0x52, 0x583, 0xa, 0x52, 0x3, 0x52, 0x3, 0x52, 
-    0x5, 0x52, 0x587, 0xa, 0x52, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 
-    0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x7, 0x53, 0x592, 
-    0xa, 0x53, 0xc, 0x53, 0xe, 0x53, 0x595, 0xb, 0x53, 0x3, 0x53, 0x3, 0x53, 
-    0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x7, 0x53, 0x59e, 
-    0xa, 0x53, 0xc, 0x53, 0xe, 0x53, 0x5a1, 0xb, 0x53, 0x3, 0x53, 0x3, 0x53, 
-    0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x7, 0x53, 0x5aa, 
-    0xa, 0x53, 0xc, 0x53, 0xe, 0x53, 0x5ad, 0xb, 0x53, 0x3, 0x53, 0x3, 0x53, 
-    0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x5, 0x53, 0x5b4, 0xa, 0x53, 0x3, 0x53, 
-    0x3, 0x53, 0x5, 0x53, 0x5b8, 0xa, 0x53, 0x3, 0x54, 0x3, 0x54, 0x3, 0x54, 
-    0x7, 0x54, 0x5bd, 0xa, 0x54, 0xc, 0x54, 0xe, 0x54, 0x5c0, 0xb, 0x54, 
-    0x3, 0x55, 0x3, 0x55, 0x3, 0x55, 0x5, 0x55, 0x5c5, 0xa, 0x55, 0x3, 0x55, 
-    0x3, 0x55, 0x3, 0x55, 0x3, 0x55, 0x3, 0x55, 0x3, 0x55, 0x5, 0x55, 0x5cd, 
-    0xa, 0x55, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x5d2, 0xa, 0x56, 
-    0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x6, 0x56, 0x5d9, 
-    0xa, 0x56, 0xd, 0x56, 0xe, 0x56, 0x5da, 0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 
-    0x5df, 0xa, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 
+    0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x5, 0x4f, 0x564, 0xa, 0x4f, 0x3, 0x4f, 
+    0x5, 0x4f, 0x567, 0xa, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 
+    0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x5, 0x4f, 0x572, 
+    0xa, 0x4f, 0x3, 0x50, 0x3, 0x50, 0x5, 0x50, 0x576, 0xa, 0x50, 0x3, 0x50, 
+    0x5, 0x50, 0x579, 0xa, 0x50, 0x3, 0x50, 0x3, 0x50, 0x5, 0x50, 0x57d, 
+    0xa, 0x50, 0x3, 0x50, 0x3, 0x50, 0x5, 0x50, 0x581, 0xa, 0x50, 0x3, 0x51, 
+    0x3, 0x51, 0x3, 0x51, 0x3, 0x52, 0x3, 0x52, 0x3, 0x52, 0x5, 0x52, 0x589, 
+    0xa, 0x52, 0x3, 0x52, 0x3, 0x52, 0x5, 0x52, 0x58d, 0xa, 0x52, 0x3, 0x53, 
+    0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 
+    0x53, 0x3, 0x53, 0x7, 0x53, 0x598, 0xa, 0x53, 0xc, 0x53, 0xe, 0x53, 
+    0x59b, 0xb, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 
+    0x3, 0x53, 0x3, 0x53, 0x7, 0x53, 0x5a4, 0xa, 0x53, 0xc, 0x53, 0xe, 0x53, 
+    0x5a7, 0xb, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 
+    0x3, 0x53, 0x3, 0x53, 0x7, 0x53, 0x5b0, 0xa, 0x53, 0xc, 0x53, 0xe, 0x53, 
+    0x5b3, 0xb, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 
+    0x5, 0x53, 0x5ba, 0xa, 0x53, 0x3, 0x53, 0x3, 0x53, 0x5, 0x53, 0x5be, 
+    0xa, 0x53, 0x3, 0x54, 0x3, 0x54, 0x3, 0x54, 0x7, 0x54, 0x5c3, 0xa, 0x54, 
+    0xc, 0x54, 0xe, 0x54, 0x5c6, 0xb, 0x54, 0x3, 0x55, 0x3, 0x55, 0x3, 0x55, 
+    0x5, 0x55, 0x5cb, 0xa, 0x55, 0x3, 0x55, 0x3, 0x55, 0x3, 0x55, 0x3, 0x55, 
+    0x3, 0x55, 0x3, 0x55, 0x5, 0x55, 0x5d3, 0xa, 0x55, 0x3, 0x56, 0x3, 0x56, 
+    0x3, 0x56, 0x5, 0x56, 0x5d8, 0xa, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 
+    0x3, 0x56, 0x3, 0x56, 0x6, 0x56, 0x5df, 0xa, 0x56, 0xd, 0x56, 0xe, 0x56, 
+    0x5e0, 0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x5e5, 0xa, 0x56, 0x3, 0x56, 
     0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 
     0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 
     0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 
-    0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x5fe, 
+    0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 
+    0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x604, 0xa, 0x56, 0x3, 0x56, 0x3, 0x56, 
+    0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 
+    0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 
+    0x5, 0x56, 0x615, 0xa, 0x56, 0x3, 0x56, 0x5, 0x56, 0x618, 0xa, 0x56, 
+    0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x61c, 0xa, 0x56, 0x3, 0x56, 0x5, 0x56, 
+    0x61f, 0xa, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 
+    0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x62b, 
     0xa, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 
     0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 
-    0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x60f, 0xa, 0x56, 0x3, 0x56, 
-    0x5, 0x56, 0x612, 0xa, 0x56, 0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x616, 
-    0xa, 0x56, 0x3, 0x56, 0x5, 0x56, 0x619, 0xa, 0x56, 0x3, 0x56, 0x3, 0x56, 
+    0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x63c, 0xa, 0x56, 0x3, 0x56, 
+    0x3, 0x56, 0x5, 0x56, 0x640, 0xa, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 
     0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 
-    0x56, 0x3, 0x56, 0x5, 0x56, 0x625, 0xa, 0x56, 0x3, 0x56, 0x3, 0x56, 
-    0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 
-    0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 
-    0x5, 0x56, 0x636, 0xa, 0x56, 0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x63a, 
+    0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 
+    0x651, 0xa, 0x56, 0x3, 0x56, 0x5, 0x56, 0x654, 0xa, 0x56, 0x3, 0x56, 
+    0x3, 0x56, 0x5, 0x56, 0x658, 0xa, 0x56, 0x3, 0x56, 0x5, 0x56, 0x65b, 
     0xa, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 
-    0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 
-    0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x64b, 0xa, 0x56, 0x3, 0x56, 
-    0x5, 0x56, 0x64e, 0xa, 0x56, 0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x652, 
-    0xa, 0x56, 0x3, 0x56, 0x5, 0x56, 0x655, 0xa, 0x56, 0x3, 0x56, 0x3, 0x56, 
-    0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 
-    0x56, 0x5, 0x56, 0x660, 0xa, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 
+    0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x666, 0xa, 0x56, 
     0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 
     0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 
-    0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x5, 
-    0x56, 0x678, 0xa, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 
-    0x3, 0x56, 0x5, 0x56, 0x67f, 0xa, 0x56, 0x7, 0x56, 0x681, 0xa, 0x56, 
-    0xc, 0x56, 0xe, 0x56, 0x684, 0xb, 0x56, 0x3, 0x57, 0x3, 0x57, 0x3, 0x57, 
-    0x7, 0x57, 0x689, 0xa, 0x57, 0xc, 0x57, 0xe, 0x57, 0x68c, 0xb, 0x57, 
-    0x3, 0x58, 0x3, 0x58, 0x5, 0x58, 0x690, 0xa, 0x58, 0x3, 0x59, 0x3, 0x59, 
-    0x3, 0x59, 0x3, 0x59, 0x7, 0x59, 0x696, 0xa, 0x59, 0xc, 0x59, 0xe, 0x59, 
-    0x699, 0xb, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 
-    0x7, 0x59, 0x6a0, 0xa, 0x59, 0xc, 0x59, 0xe, 0x59, 0x6a3, 0xb, 0x59, 
-    0x5, 0x59, 0x6a5, 0xa, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x5a, 
-    0x3, 0x5a, 0x3, 0x5a, 0x5, 0x5a, 0x6ad, 0xa, 0x5a, 0x3, 0x5a, 0x3, 0x5a, 
-    0x3, 0x5b, 0x3, 0x5b, 0x3, 0x5b, 0x5, 0x5b, 0x6b4, 0xa, 0x5b, 0x3, 0x5c, 
-    0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 0x5, 
-    0x5c, 0x6bd, 0xa, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 
-    0x5, 0x5c, 0x6c3, 0xa, 0x5c, 0x7, 0x5c, 0x6c5, 0xa, 0x5c, 0xc, 0x5c, 
-    0xe, 0x5c, 0x6c8, 0xb, 0x5c, 0x3, 0x5d, 0x3, 0x5d, 0x3, 0x5d, 0x5, 0x5d, 
-    0x6cd, 0xa, 0x5d, 0x3, 0x5d, 0x3, 0x5d, 0x3, 0x5e, 0x3, 0x5e, 0x3, 0x5e, 
-    0x5, 0x5e, 0x6d4, 0xa, 0x5e, 0x3, 0x5e, 0x3, 0x5e, 0x3, 0x5f, 0x3, 0x5f, 
-    0x3, 0x5f, 0x7, 0x5f, 0x6db, 0xa, 0x5f, 0xc, 0x5f, 0xe, 0x5f, 0x6de, 
-    0xb, 0x5f, 0x3, 0x60, 0x3, 0x60, 0x3, 0x60, 0x5, 0x60, 0x6e3, 0xa, 0x60, 
-    0x3, 0x61, 0x3, 0x61, 0x3, 0x62, 0x3, 0x62, 0x3, 0x62, 0x3, 0x62, 0x3, 
-    0x62, 0x3, 0x62, 0x5, 0x62, 0x6ed, 0xa, 0x62, 0x5, 0x62, 0x6ef, 0xa, 
-    0x62, 0x3, 0x63, 0x5, 0x63, 0x6f2, 0xa, 0x63, 0x3, 0x63, 0x3, 0x63, 
-    0x3, 0x63, 0x3, 0x63, 0x3, 0x63, 0x3, 0x63, 0x5, 0x63, 0x6fa, 0xa, 0x63, 
-    0x3, 0x64, 0x3, 0x64, 0x3, 0x64, 0x5, 0x64, 0x6ff, 0xa, 0x64, 0x3, 0x65, 
-    0x3, 0x65, 0x3, 0x66, 0x3, 0x66, 0x3, 0x67, 0x3, 0x67, 0x3, 0x68, 0x3, 
-    0x68, 0x5, 0x68, 0x709, 0xa, 0x68, 0x3, 0x69, 0x3, 0x69, 0x3, 0x69, 
-    0x5, 0x69, 0x70e, 0xa, 0x69, 0x3, 0x6a, 0x3, 0x6a, 0x5, 0x6a, 0x712, 
-    0xa, 0x6a, 0x3, 0x6b, 0x3, 0x6b, 0x3, 0x6b, 0x3, 0x6b, 0x3, 0x6b, 0x2, 
-    0x5, 0x82, 0xaa, 0xb6, 0x6c, 0x2, 0x4, 0x6, 0x8, 0xa, 0xc, 0xe, 0x10, 
-    0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e, 0x20, 0x22, 0x24, 0x26, 0x28, 
-    0x2a, 0x2c, 0x2e, 0x30, 0x32, 0x34, 0x36, 0x38, 0x3a, 0x3c, 0x3e, 0x40, 
-    0x42, 0x44, 0x46, 0x48, 0x4a, 0x4c, 0x4e, 0x50, 0x52, 0x54, 0x56, 0x58, 
-    0x5a, 0x5c, 0x5e, 0x60, 0x62, 0x64, 0x66, 0x68, 0x6a, 0x6c, 0x6e, 0x70, 
-    0x72, 0x74, 0x76, 0x78, 0x7a, 0x7c, 0x7e, 0x80, 0x82, 0x84, 0x86, 0x88, 
-    0x8a, 0x8c, 0x8e, 0x90, 0x92, 0x94, 0x96, 0x98, 0x9a, 0x9c, 0x9e, 0xa0, 
-    0xa2, 0xa4, 0xa6, 0xa8, 0xaa, 0xac, 0xae, 0xb0, 0xb2, 0xb4, 0xb6, 0xb8, 
-    0xba, 0xbc, 0xbe, 0xc0, 0xc2, 0xc4, 0xc6, 0xc8, 0xca, 0xcc, 0xce, 0xd0, 
-    0xd2, 0xd4, 0x2, 0x1d, 0x8, 0x2, 0x5, 0x5, 0x19, 0x19, 0x1c, 0x1c, 0x26, 
-    0x26, 0x65, 0x65, 0xa5, 0xa5, 0x4, 0x2, 0x10, 0x10, 0x1e, 0x1e, 0x5, 
-    0x2, 0x5, 0x5, 0x26, 0x26, 0x65, 0x65, 0x4, 0x2, 0x29, 0x29, 0x2b, 0x2b, 
-    0x4, 0x2, 0x2c, 0x2c, 0x32, 0x32, 0x5, 0x2, 0xf, 0xf, 0x94, 0x94, 0x9a, 
-    0x9a, 0x4, 0x2, 0x20, 0x20, 0x87, 0x87, 0x4, 0x2, 0x52, 0x52, 0x5e, 
-    0x5e, 0x4, 0x2, 0x45, 0x45, 0x63, 0x63, 0x5, 0x2, 0x6, 0x6, 0xa, 0xa, 
-    0xe, 0xe, 0x6, 0x2, 0x6, 0x6, 0x9, 0xa, 0xe, 0xe, 0x8b, 0x8b, 0x4, 0x2, 
-    0x5e, 0x5e, 0x86, 0x86, 0x4, 0x2, 0x6, 0x6, 0xa, 0xa, 0x4, 0x2, 0x73, 
-    0x73, 0xc2, 0xc2, 0x4, 0x2, 0xd, 0xd, 0x29, 0x2a, 0x4, 0x2, 0x3d, 0x3d, 
-    0x5b, 0x5b, 0x4, 0x2, 0x42, 0x42, 0x4e, 0x4e, 0x3, 0x2, 0x91, 0x92, 
-    0x5, 0x2, 0x12, 0x12, 0x5d, 0x5d, 0xa2, 0xa2, 0x5, 0x2, 0xbe, 0xbe, 
-    0xd0, 0xd0, 0xd9, 0xd9, 0x4, 0x2, 0xc3, 0xc4, 0xd1, 0xd1, 0x4, 0x2, 
-    0x4d, 0x4d, 0x60, 0x60, 0x3, 0x2, 0xb9, 0xba, 0x4, 0x2, 0xc4, 0xc4, 
-    0xd1, 0xd1, 0xa, 0x2, 0x24, 0x24, 0x4a, 0x4a, 0x69, 0x69, 0x6b, 0x6b, 
-    0x7e, 0x7e, 0x89, 0x89, 0xb0, 0xb0, 0xb4, 0xb4, 0xe, 0x2, 0x4, 0x23, 
-    0x25, 0x49, 0x4b, 0x4f, 0x51, 0x68, 0x6a, 0x6a, 0x6c, 0x6d, 0x6f, 0x70, 
-    0x72, 0x7d, 0x7f, 0x88, 0x8a, 0xaf, 0xb1, 0xb3, 0xb5, 0xb6, 0x6, 0x2, 
-    0x23, 0x23, 0x3d, 0x3d, 0x4b, 0x4b, 0x59, 0x59, 0x2, 0x813, 0x2, 0xe4, 
-    0x3, 0x2, 0x2, 0x2, 0x4, 0xf8, 0x3, 0x2, 0x2, 0x2, 0x6, 0xfa, 0x3, 0x2, 
-    0x2, 0x2, 0x8, 0x19f, 0x3, 0x2, 0x2, 0x2, 0xa, 0x1a1, 0x3, 0x2, 0x2, 
-    0x2, 0xc, 0x1a9, 0x3, 0x2, 0x2, 0x2, 0xe, 0x1ad, 0x3, 0x2, 0x2, 0x2, 
-    0x10, 0x1b4, 0x3, 0x2, 0x2, 0x2, 0x12, 0x1b6, 0x3, 0x2, 0x2, 0x2, 0x14, 
-    0x1bc, 0x3, 0x2, 0x2, 0x2, 0x16, 0x24b, 0x3, 0x2, 0x2, 0x2, 0x18, 0x24d, 
-    0x3, 0x2, 0x2, 0x2, 0x1a, 0x258, 0x3, 0x2, 0x2, 0x2, 0x1c, 0x273, 0x3, 
-    0x2, 0x2, 0x2, 0x1e, 0x28e, 0x3, 0x2, 0x2, 0x2, 0x20, 0x292, 0x3, 0x2, 
-    0x2, 0x2, 0x22, 0x29b, 0x3, 0x2, 0x2, 0x2, 0x24, 0x2a8, 0x3, 0x2, 0x2, 
-    0x2, 0x26, 0x2b7, 0x3, 0x2, 0x2, 0x2, 0x28, 0x2c4, 0x3, 0x2, 0x2, 0x2, 
-    0x2a, 0x2d4, 0x3, 0x2, 0x2, 0x2, 0x2c, 0x2d9, 0x3, 0x2, 0x2, 0x2, 0x2e, 
-    0x2df, 0x3, 0x2, 0x2, 0x2, 0x30, 0x2e2, 0x3, 0x2, 0x2, 0x2, 0x32, 0x2e5, 
-    0x3, 0x2, 0x2, 0x2, 0x34, 0x2f7, 0x3, 0x2, 0x2, 0x2, 0x36, 0x2f9, 0x3, 
-    0x2, 0x2, 0x2, 0x38, 0x317, 0x3, 0x2, 0x2, 0x2, 0x3a, 0x31b, 0x3, 0x2, 
-    0x2, 0x2, 0x3c, 0x31f, 0x3, 0x2, 0x2, 0x2, 0x3e, 0x323, 0x3, 0x2, 0x2, 
-    0x2, 0x40, 0x32c, 0x3, 0x2, 0x2, 0x2, 0x42, 0x340, 0x3, 0x2, 0x2, 0x2, 
-    0x44, 0x362, 0x3, 0x2, 0x2, 0x2, 0x46, 0x364, 0x3, 0x2, 0x2, 0x2, 0x48, 
-    0x367, 0x3, 0x2, 0x2, 0x2, 0x4a, 0x36e, 0x3, 0x2, 0x2, 0x2, 0x4c, 0x37a, 
-    0x3, 0x2, 0x2, 0x2, 0x4e, 0x382, 0x3, 0x2, 0x2, 0x2, 0x50, 0x38c, 0x3, 
-    0x2, 0x2, 0x2, 0x52, 0x3b0, 0x3, 0x2, 0x2, 0x2, 0x54, 0x3b2, 0x3, 0x2, 
-    0x2, 0x2, 0x56, 0x3bc, 0x3, 0x2, 0x2, 0x2, 0x58, 0x3c0, 0x3, 0x2, 0x2, 
-    0x2, 0x5a, 0x3cf, 0x3, 0x2, 0x2, 0x2, 0x5c, 0x3e3, 0x3, 0x2, 0x2, 0x2, 
-    0x5e, 0x3e5, 0x3, 0x2, 0x2, 0x2, 0x60, 0x3ee, 0x3, 0x2, 0x2, 0x2, 0x62, 
-    0x3fd, 0x3, 0x2, 0x2, 0x2, 0x64, 0x40f, 0x3, 0x2, 0x2, 0x2, 0x66, 0x41d, 
-    0x3, 0x2, 0x2, 0x2, 0x68, 0x420, 0x3, 0x2, 0x2, 0x2, 0x6a, 0x450, 0x3, 
-    0x2, 0x2, 0x2, 0x6c, 0x453, 0x3, 0x2, 0x2, 0x2, 0x6e, 0x459, 0x3, 0x2, 
-    0x2, 0x2, 0x70, 0x45d, 0x3, 0x2, 0x2, 0x2, 0x72, 0x463, 0x3, 0x2, 0x2, 
-    0x2, 0x74, 0x466, 0x3, 0x2, 0x2, 0x2, 0x76, 0x469, 0x3, 0x2, 0x2, 0x2, 
-    0x78, 0x473, 0x3, 0x2, 0x2, 0x2, 0x7a, 0x476, 0x3, 0x2, 0x2, 0x2, 0x7c, 
-    0x47a, 0x3, 0x2, 0x2, 0x2, 0x7e, 0x47f, 0x3, 0x2, 0x2, 0x2, 0x80, 0x485, 
-    0x3, 0x2, 0x2, 0x2, 0x82, 0x494, 0x3, 0x2, 0x2, 0x2, 0x84, 0x4d5, 0x3, 
-    0x2, 0x2, 0x2, 0x86, 0x4dd, 0x3, 0x2, 0x2, 0x2, 0x88, 0x4e8, 0x3, 0x2, 
-    0x2, 0x2, 0x8a, 0x4ea, 0x3, 0x2, 0x2, 0x2, 0x8c, 0x4f0, 0x3, 0x2, 0x2, 
-    0x2, 0x8e, 0x4f5, 0x3, 0x2, 0x2, 0x2, 0x90, 0x4fd, 0x3, 0x2, 0x2, 0x2, 
-    0x92, 0x509, 0x3, 0x2, 0x2, 0x2, 0x94, 0x50e, 0x3, 0x2, 0x2, 0x2, 0x96, 
-    0x516, 0x3, 0x2, 0x2, 0x2, 0x98, 0x51a, 0x3, 0x2, 0x2, 0x2, 0x9a, 0x547, 
-    0x3, 0x2, 0x2, 0x2, 0x9c, 0x56b, 0x3, 0x2, 0x2, 0x2, 0x9e, 0x56d, 0x3, 
-    0x2, 0x2, 0x2, 0xa0, 0x57c, 0x3, 0x2, 0x2, 0x2, 0xa2, 0x57f, 0x3, 0x2, 
-    0x2, 0x2, 0xa4, 0x5b7, 0x3, 0x2, 0x2, 0x2, 0xa6, 0x5b9, 0x3, 0x2, 0x2, 
-    0x2, 0xa8, 0x5cc, 0x3, 0x2, 0x2, 0x2, 0xaa, 0x639, 0x3, 0x2, 0x2, 0x2, 
-    0xac, 0x685, 0x3, 0x2, 0x2, 0x2, 0xae, 0x68f, 0x3, 0x2, 0x2, 0x2, 0xb0, 
-    0x6a4, 0x3, 0x2, 0x2, 0x2, 0xb2, 0x6ac, 0x3, 0x2, 0x2, 0x2, 0xb4, 0x6b0, 
-    0x3, 0x2, 0x2, 0x2, 0xb6, 0x6bc, 0x3, 0x2, 0x2, 0x2, 0xb8, 0x6c9, 0x3, 
-    0x2, 0x2, 0x2, 0xba, 0x6d3, 0x3, 0x2, 0x2, 0x2, 0xbc, 0x6d7, 0x3, 0x2, 
-    0x2, 0x2, 0xbe, 0x6e2, 0x3, 0x2, 0x2, 0x2, 0xc0, 0x6e4, 0x3, 0x2, 0x2, 
-    0x2, 0xc2, 0x6ee, 0x3, 0x2, 0x2, 0x2, 0xc4, 0x6f1, 0x3, 0x2, 0x2, 0x2, 
-    0xc6, 0x6fe, 0x3, 0x2, 0x2, 0x2, 0xc8, 0x700, 0x3, 0x2, 0x2, 0x2, 0xca, 
-    0x702, 0x3, 0x2, 0x2, 0x2, 0xcc, 0x704, 0x3, 0x2, 0x2, 0x2, 0xce, 0x708, 
-    0x3, 0x2, 0x2, 0x2, 0xd0, 0x70d, 0x3, 0x2, 0x2, 0x2, 0xd2, 0x711, 0x3, 
-    0x2, 0x2, 0x2, 0xd4, 0x713, 0x3, 0x2, 0x2, 0x2, 0xd6, 0xda, 0x5, 0x4, 
-    0x3, 0x2, 0xd7, 0xd8, 0x7, 0x55, 0x2, 0x2, 0xd8, 0xd9, 0x7, 0x79, 0x2, 
-    0x2, 0xd9, 0xdb, 0x7, 0xbc, 0x2, 0x2, 0xda, 0xd7, 0x3, 0x2, 0x2, 0x2, 
-    0xda, 0xdb, 0x3, 0x2, 0x2, 0x2, 0xdb, 0xde, 0x3, 0x2, 0x2, 0x2, 0xdc, 
-    0xdd, 0x7, 0x40, 0x2, 0x2, 0xdd, 0xdf, 0x5, 0xd2, 0x6a, 0x2, 0xde, 0xdc, 
-    0x3, 0x2, 0x2, 0x2, 0xde, 0xdf, 0x3, 0x2, 0x2, 0x2, 0xdf, 0xe1, 0x3, 
-    0x2, 0x2, 0x2, 0xe0, 0xe2, 0x7, 0xd8, 0x2, 0x2, 0xe1, 0xe0, 0x3, 0x2, 
-    0x2, 0x2, 0xe1, 0xe2, 0x3, 0x2, 0x2, 0x2, 0xe2, 0xe5, 0x3, 0x2, 0x2, 
-    0x2, 0xe3, 0xe5, 0x5, 0x58, 0x2d, 0x2, 0xe4, 0xd6, 0x3, 0x2, 0x2, 0x2, 
-    0xe4, 0xe3, 0x3, 0x2, 0x2, 0x2, 0xe5, 0x3, 0x3, 0x2, 0x2, 0x2, 0xe6, 
-    0xf9, 0x5, 0x6, 0x4, 0x2, 0xe7, 0xf9, 0x5, 0x12, 0xa, 0x2, 0xe8, 0xf9, 
-    0x5, 0x14, 0xb, 0x2, 0xe9, 0xf9, 0x5, 0x16, 0xc, 0x2, 0xea, 0xf9, 0x5, 
-    0x50, 0x29, 0x2, 0xeb, 0xf9, 0x5, 0x52, 0x2a, 0x2, 0xec, 0xf9, 0x5, 
-    0x54, 0x2b, 0x2, 0xed, 0xf9, 0x5, 0x56, 0x2c, 0x2, 0xee, 0xf9, 0x5, 
-    0x5e, 0x30, 0x2, 0xef, 0xf9, 0x5, 0x60, 0x31, 0x2, 0xf0, 0xf9, 0x5, 
-    0x62, 0x32, 0x2, 0xf1, 0xf9, 0x5, 0x64, 0x33, 0x2, 0xf2, 0xf9, 0x5, 
-    0x98, 0x4d, 0x2, 0xf3, 0xf9, 0x5, 0x9a, 0x4e, 0x2, 0xf4, 0xf9, 0x5, 
-    0x9c, 0x4f, 0x2, 0xf5, 0xf9, 0x5, 0x9e, 0x50, 0x2, 0xf6, 0xf9, 0x5, 
-    0xa0, 0x51, 0x2, 0xf7, 0xf9, 0x5, 0xa2, 0x52, 0x2, 0xf8, 0xe6, 0x3, 
-    0x2, 0x2, 0x2, 0xf8, 0xe7, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xe8, 0x3, 0x2, 
-    0x2, 0x2, 0xf8, 0xe9, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xea, 0x3, 0x2, 0x2, 
-    0x2, 0xf8, 0xeb, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xec, 0x3, 0x2, 0x2, 0x2, 
-    0xf8, 0xed, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xee, 0x3, 0x2, 0x2, 0x2, 0xf8, 
-    0xef, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xf0, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xf1, 
-    0x3, 0x2, 0x2, 0x2, 0xf8, 0xf2, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xf3, 0x3, 
-    0x2, 0x2, 0x2, 0xf8, 0xf4, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xf5, 0x3, 0x2, 
-    0x2, 0x2, 0xf8, 0xf6, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xf7, 0x3, 0x2, 0x2, 
-    0x2, 0xf9, 0x5, 0x3, 0x2, 0x2, 0x2, 0xfa, 0xfb, 0x7, 0x7, 0x2, 0x2, 
-    0xfb, 0xfc, 0x7, 0x97, 0x2, 0x2, 0xfc, 0xfe, 0x5, 0xba, 0x5e, 0x2, 0xfd, 
-    0xff, 0x5, 0x2c, 0x17, 0x2, 0xfe, 0xfd, 0x3, 0x2, 0x2, 0x2, 0xfe, 0xff, 
-    0x3, 0x2, 0x2, 0x2, 0xff, 0x100, 0x3, 0x2, 0x2, 0x2, 0x100, 0x105, 0x5, 
-    0x8, 0x5, 0x2, 0x101, 0x102, 0x7, 0xc2, 0x2, 0x2, 0x102, 0x104, 0x5, 
-    0x8, 0x5, 0x2, 0x103, 0x101, 0x3, 0x2, 0x2, 0x2, 0x104, 0x107, 0x3, 
-    0x2, 0x2, 0x2, 0x105, 0x103, 0x3, 0x2, 0x2, 0x2, 0x105, 0x106, 0x3, 
-    0x2, 0x2, 0x2, 0x106, 0x7, 0x3, 0x2, 0x2, 0x2, 0x107, 0x105, 0x3, 0x2, 
-    0x2, 0x2, 0x108, 0x109, 0x7, 0x3, 0x2, 0x2, 0x109, 0x10d, 0x7, 0x1b, 
-    0x2, 0x2, 0x10a, 0x10b, 0x7, 0x4c, 0x2, 0x2, 0x10b, 0x10c, 0x7, 0x70, 
-    0x2, 0x2, 0x10c, 0x10e, 0x7, 0x37, 0x2, 0x2, 0x10d, 0x10a, 0x3, 0x2, 
-    0x2, 0x2, 0x10d, 0x10e, 0x3, 0x2, 0x2, 0x2, 0x10e, 0x10f, 0x3, 0x2, 
-    0x2, 0x2, 0x10f, 0x112, 0x5, 0x44, 0x23, 0x2, 0x110, 0x111, 0x7, 0x4, 
-    0x2, 0x2, 0x111, 0x113, 0x5, 0xb4, 0x5b, 0x2, 0x112, 0x110, 0x3, 0x2, 
-    0x2, 0x2, 0x112, 0x113, 0x3, 0x2, 0x2, 0x2, 0x113, 0x1a0, 0x3, 0x2, 
-    0x2, 0x2, 0x114, 0x115, 0x7, 0x3, 0x2, 0x2, 0x115, 0x119, 0x7, 0x4f, 
-    0x2, 0x2, 0x116, 0x117, 0x7, 0x4c, 0x2, 0x2, 0x117, 0x118, 0x7, 0x70, 
-    0x2, 0x2, 0x118, 0x11a, 0x7, 0x37, 0x2, 0x2, 0x119, 0x116, 0x3, 0x2, 
-    0x2, 0x2, 0x119, 0x11a, 0x3, 0x2, 0x2, 0x2, 0x11a, 0x11b, 0x3, 0x2, 
-    0x2, 0x2, 0x11b, 0x11e, 0x5, 0x48, 0x25, 0x2, 0x11c, 0x11d, 0x7, 0x4, 
-    0x2, 0x2, 0x11d, 0x11f, 0x5, 0xb4, 0x5b, 0x2, 0x11e, 0x11c, 0x3, 0x2, 
-    0x2, 0x2, 0x11e, 0x11f, 0x3, 0x2, 0x2, 0x2, 0x11f, 0x1a0, 0x3, 0x2, 
-    0x2, 0x2, 0x120, 0x121, 0x7, 0x10, 0x2, 0x2, 0x121, 0x124, 0x5, 0x10, 
-    0x9, 0x2, 0x122, 0x123, 0x7, 0x42, 0x2, 0x2, 0x123, 0x125, 0x5, 0xba, 
-    0x5e, 0x2, 0x124, 0x122, 0x3, 0x2, 0x2, 0x2, 0x124, 0x125, 0x3, 0x2, 
-    0x2, 0x2, 0x125, 0x1a0, 0x3, 0x2, 0x2, 0x2, 0x126, 0x127, 0x7, 0x17, 
-    0x2, 0x2, 0x127, 0x12a, 0x7, 0x1b, 0x2, 0x2, 0x128, 0x129, 0x7, 0x4c, 
-    0x2, 0x2, 0x129, 0x12b, 0x7, 0x37, 0x2, 0x2, 0x12a, 0x128, 0x3, 0x2, 
-    0x2, 0x2, 0x12a, 0x12b, 0x3, 0x2, 0x2, 0x2, 0x12b, 0x12c, 0x3, 0x2, 
-    0x2, 0x2, 0x12c, 0x12f, 0x5, 0xb4, 0x5b, 0x2, 0x12d, 0x12e, 0x7, 0x4e, 
-    0x2, 0x2, 0x12e, 0x130, 0x5, 0x10, 0x9, 0x2, 0x12f, 0x12d, 0x3, 0x2, 
-    0x2, 0x2, 0x12f, 0x130, 0x3, 0x2, 0x2, 0x2, 0x130, 0x1a0, 0x3, 0x2, 
-    0x2, 0x2, 0x131, 0x132, 0x7, 0x1c, 0x2, 0x2, 0x132, 0x135, 0x7, 0x1b, 
-    0x2, 0x2, 0x133, 0x134, 0x7, 0x4c, 0x2, 0x2, 0x134, 0x136, 0x7, 0x37, 
-    0x2, 0x2, 0x135, 0x133, 0x3, 0x2, 0x2, 0x2, 0x135, 0x136, 0x3, 0x2, 
-    0x2, 0x2, 0x136, 0x137, 0x3, 0x2, 0x2, 0x2, 0x137, 0x138, 0x5, 0xb4, 
-    0x5b, 0x2, 0x138, 0x139, 0x7, 0xbc, 0x2, 0x2, 0x139, 0x1a0, 0x3, 0x2, 
-    0x2, 0x2, 0x13a, 0x13b, 0x7, 0x28, 0x2, 0x2, 0x13b, 0x13c, 0x7, 0xb2, 
-    0x2, 0x2, 0x13c, 0x1a0, 0x5, 0xaa, 0x56, 0x2, 0x13d, 0x13e, 0x7, 0x2c, 
-    0x2, 0x2, 0x13e, 0x1a0, 0x5, 0x10, 0x9, 0x2, 0x13f, 0x140, 0x7, 0x32, 
-    0x2, 0x2, 0x140, 0x143, 0x7, 0x1b, 0x2, 0x2, 0x141, 0x142, 0x7, 0x4c, 
-    0x2, 0x2, 0x142, 0x144, 0x7, 0x37, 0x2, 0x2, 0x143, 0x141, 0x3, 0x2, 
-    0x2, 0x2, 0x143, 0x144, 0x3, 0x2, 0x2, 0x2, 0x144, 0x145, 0x3, 0x2, 
-    0x2, 0x2, 0x145, 0x1a0, 0x5, 0xb4, 0x5b, 0x2, 0x146, 0x147, 0x7, 0x32, 
-    0x2, 0x2, 0x147, 0x14a, 0x7, 0x4f, 0x2, 0x2, 0x148, 0x149, 0x7, 0x4c, 
-    0x2, 0x2, 0x149, 0x14b, 0x7, 0x37, 0x2, 0x2, 0x14a, 0x148, 0x3, 0x2, 
-    0x2, 0x2, 0x14a, 0x14b, 0x3, 0x2, 0x2, 0x2, 0x14b, 0x14c, 0x3, 0x2, 
-    0x2, 0x2, 0x14c, 0x1a0, 0x5, 0xb4, 0x5b, 0x2, 0x14d, 0x14e, 0x7, 0x32, 
-    0x2, 0x2, 0x14e, 0x1a0, 0x5, 0x10, 0x9, 0x2, 0x14f, 0x151, 0x7, 0x41, 
-    0x2, 0x2, 0x150, 0x152, 0x5, 0x10, 0x9, 0x2, 0x151, 0x150, 0x3, 0x2, 
-    0x2, 0x2, 0x151, 0x152, 0x3, 0x2, 0x2, 0x2, 0x152, 0x1a0, 0x3, 0x2, 
-    0x2, 0x2, 0x153, 0x154, 0x7, 0x6a, 0x2, 0x2, 0x154, 0x157, 0x7, 0x1b, 
-    0x2, 0x2, 0x155, 0x156, 0x7, 0x4c, 0x2, 0x2, 0x156, 0x158, 0x7, 0x37, 
-    0x2, 0x2, 0x157, 0x155, 0x3, 0x2, 0x2, 0x2, 0x157, 0x158, 0x3, 0x2, 
-    0x2, 0x2, 0x158, 0x159, 0x3, 0x2, 0x2, 0x2, 0x159, 0x15a, 0x5, 0xb4, 
-    0x5b, 0x2, 0x15a, 0x15b, 0x5, 0x4a, 0x26, 0x2, 0x15b, 0x1a0, 0x3, 0x2, 
-    0x2, 0x2, 0x15c, 0x15d, 0x7, 0x6a, 0x2, 0x2, 0x15d, 0x160, 0x7, 0x1b, 
-    0x2, 0x2, 0x15e, 0x15f, 0x7, 0x4c, 0x2, 0x2, 0x15f, 0x161, 0x7, 0x37, 
-    0x2, 0x2, 0x160, 0x15e, 0x3, 0x2, 0x2, 0x2, 0x160, 0x161, 0x3, 0x2, 
-    0x2, 0x2, 0x161, 0x162, 0x3, 0x2, 0x2, 0x2, 0x162, 0x163, 0x5, 0xb4, 
-    0x5b, 0x2, 0x163, 0x164, 0x7, 0x1c, 0x2, 0x2, 0x164, 0x165, 0x7, 0xbc, 
-    0x2, 0x2, 0x165, 0x1a0, 0x3, 0x2, 0x2, 0x2, 0x166, 0x167, 0x7, 0x6a, 
-    0x2, 0x2, 0x167, 0x16a, 0x7, 0x1b, 0x2, 0x2, 0x168, 0x169, 0x7, 0x4c, 
-    0x2, 0x2, 0x169, 0x16b, 0x7, 0x37, 0x2, 0x2, 0x16a, 0x168, 0x3, 0x2, 
-    0x2, 0x2, 0x16a, 0x16b, 0x3, 0x2, 0x2, 0x2, 0x16b, 0x16c, 0x3, 0x2, 
-    0x2, 0x2, 0x16c, 0x16d, 0x5, 0xb4, 0x5b, 0x2, 0x16d, 0x16e, 0x7, 0x81, 
-    0x2, 0x2, 0x16e, 0x16f, 0x5, 0xe, 0x8, 0x2, 0x16f, 0x1a0, 0x3, 0x2, 
-    0x2, 0x2, 0x170, 0x171, 0x7, 0x6a, 0x2, 0x2, 0x171, 0x174, 0x7, 0x1b, 
-    0x2, 0x2, 0x172, 0x173, 0x7, 0x4c, 0x2, 0x2, 0x173, 0x175, 0x7, 0x37, 
-    0x2, 0x2, 0x174, 0x172, 0x3, 0x2, 0x2, 0x2, 0x174, 0x175, 0x3, 0x2, 
-    0x2, 0x2, 0x175, 0x176, 0x3, 0x2, 0x2, 0x2, 0x176, 0x1a0, 0x5, 0x44, 
-    0x23, 0x2, 0x177, 0x178, 0x7, 0x6a, 0x2, 0x2, 0x178, 0x179, 0x7, 0x77, 
-    0x2, 0x2, 0x179, 0x17a, 0x7, 0x13, 0x2, 0x2, 0x17a, 0x1a0, 0x5, 0xaa, 
-    0x56, 0x2, 0x17b, 0x17c, 0x7, 0x6a, 0x2, 0x2, 0x17c, 0x1a0, 0x5, 0x3e, 
-    0x20, 0x2, 0x17d, 0x17e, 0x7, 0x6c, 0x2, 0x2, 0x17e, 0x188, 0x5, 0x10, 
-    0x9, 0x2, 0x17f, 0x180, 0x7, 0x9f, 0x2, 0x2, 0x180, 0x181, 0x7, 0x2f, 
-    0x2, 0x2, 0x181, 0x189, 0x7, 0xbc, 0x2, 0x2, 0x182, 0x183, 0x7, 0x9f, 
-    0x2, 0x2, 0x183, 0x184, 0x7, 0xae, 0x2, 0x2, 0x184, 0x189, 0x7, 0xbc, 
-    0x2, 0x2, 0x185, 0x186, 0x7, 0x9f, 0x2, 0x2, 0x186, 0x187, 0x7, 0x97, 
-    0x2, 0x2, 0x187, 0x189, 0x5, 0xba, 0x5e, 0x2, 0x188, 0x17f, 0x3, 0x2, 
-    0x2, 0x2, 0x188, 0x182, 0x3, 0x2, 0x2, 0x2, 0x188, 0x185, 0x3, 0x2, 
-    0x2, 0x2, 0x189, 0x1a0, 0x3, 0x2, 0x2, 0x2, 0x18a, 0x18b, 0x7, 0x81, 
-    0x2, 0x2, 0x18b, 0x1a0, 0x7, 0xa5, 0x2, 0x2, 0x18c, 0x18d, 0x7, 0x82, 
-    0x2, 0x2, 0x18d, 0x190, 0x7, 0x1b, 0x2, 0x2, 0x18e, 0x18f, 0x7, 0x4c, 
-    0x2, 0x2, 0x18f, 0x191, 0x7, 0x37, 0x2, 0x2, 0x190, 0x18e, 0x3, 0x2, 
-    0x2, 0x2, 0x190, 0x191, 0x3, 0x2, 0x2, 0x2, 0x191, 0x192, 0x3, 0x2, 
-    0x2, 0x2, 0x192, 0x193, 0x5, 0xb4, 0x5b, 0x2, 0x193, 0x194, 0x7, 0x9f, 
-    0x2, 0x2, 0x194, 0x195, 0x5, 0xb4, 0x5b, 0x2, 0x195, 0x1a0, 0x3, 0x2, 
-    0x2, 0x2, 0x196, 0x197, 0x7, 0x83, 0x2, 0x2, 0x197, 0x198, 0x5, 0x10, 
-    0x9, 0x2, 0x198, 0x199, 0x7, 0x42, 0x2, 0x2, 0x199, 0x19a, 0x5, 0xba, 
-    0x5e, 0x2, 0x19a, 0x1a0, 0x3, 0x2, 0x2, 0x2, 0x19b, 0x19c, 0x7, 0xa8, 
-    0x2, 0x2, 0x19c, 0x19d, 0x5, 0xa, 0x6, 0x2, 0x19d, 0x19e, 0x5, 0x74, 
-    0x3b, 0x2, 0x19e, 0x1a0, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x108, 0x3, 0x2, 
-    0x2, 0x2, 0x19f, 0x114, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x120, 0x3, 0x2, 
-    0x2, 0x2, 0x19f, 0x126, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x131, 0x3, 0x2, 
-    0x2, 0x2, 0x19f, 0x13a, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x13d, 0x3, 0x2, 
-    0x2, 0x2, 0x19f, 0x13f, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x146, 0x3, 0x2, 
-    0x2, 0x2, 0x19f, 0x14d, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x14f, 0x3, 0x2, 
-    0x2, 0x2, 0x19f, 0x153, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x15c, 0x3, 0x2, 
-    0x2, 0x2, 0x19f, 0x166, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x170, 0x3, 0x2, 
-    0x2, 0x2, 0x19f, 0x177, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x17b, 0x3, 0x2, 
-    0x2, 0x2, 0x19f, 0x17d, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x18a, 0x3, 0x2, 
-    0x2, 0x2, 0x19f, 0x18c, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x196, 0x3, 0x2, 
-    0x2, 0x2, 0x19f, 0x19b, 0x3, 0x2, 0x2, 0x2, 0x1a0, 0x9, 0x3, 0x2, 0x2, 
-    0x2, 0x1a1, 0x1a6, 0x5, 0xc, 0x7, 0x2, 0x1a2, 0x1a3, 0x7, 0xc2, 0x2, 
-    0x2, 0x1a3, 0x1a5, 0x5, 0xc, 0x7, 0x2, 0x1a4, 0x1a2, 0x3, 0x2, 0x2, 
-    0x2, 0x1a5, 0x1a8, 0x3, 0x2, 0x2, 0x2, 0x1a6, 0x1a4, 0x3, 0x2, 0x2, 
-    0x2, 0x1a6, 0x1a7, 0x3, 0x2, 0x2, 0x2, 0x1a7, 0xb, 0x3, 0x2, 0x2, 0x2, 
-    0x1a8, 0x1a6, 0x3, 0x2, 0x2, 0x2, 0x1a9, 0x1aa, 0x5, 0xb4, 0x5b, 0x2, 
-    0x1aa, 0x1ab, 0x7, 0xc7, 0x2, 0x2, 0x1ab, 0x1ac, 0x5, 0xaa, 0x56, 0x2, 
-    0x1ac, 0xd, 0x3, 0x2, 0x2, 0x2, 0x1ad, 0x1ae, 0x9, 0x2, 0x2, 0x2, 0x1ae, 
-    0xf, 0x3, 0x2, 0x2, 0x2, 0x1af, 0x1b0, 0x7, 0x7a, 0x2, 0x2, 0x1b0, 0x1b5, 
-    0x5, 0xaa, 0x56, 0x2, 0x1b1, 0x1b2, 0x7, 0x7a, 0x2, 0x2, 0x1b2, 0x1b3, 
-    0x7, 0x4b, 0x2, 0x2, 0x1b3, 0x1b5, 0x7, 0xbc, 0x2, 0x2, 0x1b4, 0x1af, 
-    0x3, 0x2, 0x2, 0x2, 0x1b4, 0x1b1, 0x3, 0x2, 0x2, 0x2, 0x1b5, 0x11, 0x3, 
-    0x2, 0x2, 0x2, 0x1b6, 0x1b7, 0x7, 0x10, 0x2, 0x2, 0x1b7, 0x1b8, 0x7, 
-    0x2e, 0x2, 0x2, 0x1b8, 0x1ba, 0x5, 0xba, 0x5e, 0x2, 0x1b9, 0x1bb, 0x5, 
-    0x2c, 0x17, 0x2, 0x1ba, 0x1b9, 0x3, 0x2, 0x2, 0x2, 0x1ba, 0x1bb, 0x3, 
-    0x2, 0x2, 0x2, 0x1bb, 0x13, 0x3, 0x2, 0x2, 0x2, 0x1bc, 0x1bd, 0x7, 0x16, 
-    0x2, 0x2, 0x1bd, 0x1be, 0x7, 0x97, 0x2, 0x2, 0x1be, 0x1c0, 0x5, 0xba, 
-    0x5e, 0x2, 0x1bf, 0x1c1, 0x5, 0x10, 0x9, 0x2, 0x1c0, 0x1bf, 0x3, 0x2, 
-    0x2, 0x2, 0x1c0, 0x1c1, 0x3, 0x2, 0x2, 0x2, 0x1c1, 0x15, 0x3, 0x2, 0x2, 
-    0x2, 0x1c2, 0x1c3, 0x9, 0x3, 0x2, 0x2, 0x1c3, 0x1c7, 0x7, 0x21, 0x2, 
-    0x2, 0x1c4, 0x1c5, 0x7, 0x4c, 0x2, 0x2, 0x1c5, 0x1c6, 0x7, 0x70, 0x2, 
-    0x2, 0x1c6, 0x1c8, 0x7, 0x37, 0x2, 0x2, 0x1c7, 0x1c4, 0x3, 0x2, 0x2, 
-    0x2, 0x1c7, 0x1c8, 0x3, 0x2, 0x2, 0x2, 0x1c8, 0x1c9, 0x3, 0x2, 0x2, 
-    0x2, 0x1c9, 0x1cb, 0x5, 0xc0, 0x61, 0x2, 0x1ca, 0x1cc, 0x5, 0x2c, 0x17, 
-    0x2, 0x1cb, 0x1ca, 0x3, 0x2, 0x2, 0x2, 0x1cb, 0x1cc, 0x3, 0x2, 0x2, 
-    0x2, 0x1cc, 0x1ce, 0x3, 0x2, 0x2, 0x2, 0x1cd, 0x1cf, 0x5, 0x40, 0x21, 
-    0x2, 0x1ce, 0x1cd, 0x3, 0x2, 0x2, 0x2, 0x1ce, 0x1cf, 0x3, 0x2, 0x2, 
-    0x2, 0x1cf, 0x24c, 0x3, 0x2, 0x2, 0x2, 0x1d0, 0x1d1, 0x9, 0x3, 0x2, 
-    0x2, 0x1d1, 0x1d5, 0x7, 0x2e, 0x2, 0x2, 0x1d2, 0x1d3, 0x7, 0x4c, 0x2, 
-    0x2, 0x1d3, 0x1d4, 0x7, 0x70, 0x2, 0x2, 0x1d4, 0x1d6, 0x7, 0x37, 0x2, 
-    0x2, 0x1d5, 0x1d2, 0x3, 0x2, 0x2, 0x2, 0x1d5, 0x1d6, 0x3, 0x2, 0x2, 
-    0x2, 0x1d6, 0x1d7, 0x3, 0x2, 0x2, 0x2, 0x1d7, 0x1d9, 0x5, 0xba, 0x5e, 
-    0x2, 0x1d8, 0x1da, 0x5, 0x2e, 0x18, 0x2, 0x1d9, 0x1d8, 0x3, 0x2, 0x2, 
-    0x2, 0x1d9, 0x1da, 0x3, 0x2, 0x2, 0x2, 0x1da, 0x1dc, 0x3, 0x2, 0x2, 
-    0x2, 0x1db, 0x1dd, 0x5, 0x2c, 0x17, 0x2, 0x1dc, 0x1db, 0x3, 0x2, 0x2, 
-    0x2, 0x1dc, 0x1dd, 0x3, 0x2, 0x2, 0x2, 0x1dd, 0x1de, 0x3, 0x2, 0x2, 
-    0x2, 0x1de, 0x1df, 0x5, 0x18, 0xd, 0x2, 0x1df, 0x1e0, 0x5, 0x1c, 0xf, 
-    0x2, 0x1e0, 0x24c, 0x3, 0x2, 0x2, 0x2, 0x1e1, 0x1e2, 0x9, 0x3, 0x2, 
-    0x2, 0x1e2, 0x1e3, 0x7, 0x62, 0x2, 0x2, 0x1e3, 0x1e7, 0x7, 0xad, 0x2, 
-    0x2, 0x1e4, 0x1e5, 0x7, 0x4c, 0x2, 0x2, 0x1e5, 0x1e6, 0x7, 0x70, 0x2, 
-    0x2, 0x1e6, 0x1e8, 0x7, 0x37, 0x2, 0x2, 0x1e7, 0x1e4, 0x3, 0x2, 0x2, 
-    0x2, 0x1e7, 0x1e8, 0x3, 0x2, 0x2, 0x2, 0x1e8, 0x1e9, 0x3, 0x2, 0x2, 
-    0x2, 0x1e9, 0x1eb, 0x5, 0xba, 0x5e, 0x2, 0x1ea, 0x1ec, 0x5, 0x2e, 0x18, 
-    0x2, 0x1eb, 0x1ea, 0x3, 0x2, 0x2, 0x2, 0x1eb, 0x1ec, 0x3, 0x2, 0x2, 
-    0x2, 0x1ec, 0x1ee, 0x3, 0x2, 0x2, 0x2, 0x1ed, 0x1ef, 0x5, 0x2c, 0x17, 
-    0x2, 0x1ee, 0x1ed, 0x3, 0x2, 0x2, 0x2, 0x1ee, 0x1ef, 0x3, 0x2, 0x2, 
-    0x2, 0x1ef, 0x1f5, 0x3, 0x2, 0x2, 0x2, 0x1f0, 0x1f1, 0x7, 0xb3, 0x2, 
-    0x2, 0x1f1, 0x1f3, 0x7, 0x9d, 0x2, 0x2, 0x1f2, 0x1f4, 0x7, 0xba, 0x2, 
-    0x2, 0x1f3, 0x1f2, 0x3, 0x2, 0x2, 0x2, 0x1f3, 0x1f4, 0x3, 0x2, 0x2, 
-    0x2, 0x1f4, 0x1f6, 0x3, 0x2, 0x2, 0x2, 0x1f5, 0x1f0, 0x3, 0x2, 0x2, 
-    0x2, 0x1f5, 0x1f6, 0x3, 0x2, 0x2, 0x2, 0x1f6, 0x1f8, 0x3, 0x2, 0x2, 
-    0x2, 0x1f7, 0x1f9, 0x5, 0x30, 0x19, 0x2, 0x1f8, 0x1f7, 0x3, 0x2, 0x2, 
-    0x2, 0x1f8, 0x1f9, 0x3, 0x2, 0x2, 0x2, 0x1f9, 0x1fb, 0x3, 0x2, 0x2, 
-    0x2, 0x1fa, 0x1fc, 0x5, 0x34, 0x1b, 0x2, 0x1fb, 0x1fa, 0x3, 0x2, 0x2, 
-    0x2, 0x1fb, 0x1fc, 0x3, 0x2, 0x2, 0x2, 0x1fc, 0x1fd, 0x3, 0x2, 0x2, 
-    0x2, 0x1fd, 0x1fe, 0x5, 0x32, 0x1a, 0x2, 0x1fe, 0x24c, 0x3, 0x2, 0x2, 
-    0x2, 0x1ff, 0x200, 0x9, 0x3, 0x2, 0x2, 0x200, 0x201, 0x7, 0x65, 0x2, 
-    0x2, 0x201, 0x205, 0x7, 0xad, 0x2, 0x2, 0x202, 0x203, 0x7, 0x4c, 0x2, 
-    0x2, 0x203, 0x204, 0x7, 0x70, 0x2, 0x2, 0x204, 0x206, 0x7, 0x37, 0x2, 
-    0x2, 0x205, 0x202, 0x3, 0x2, 0x2, 0x2, 0x205, 0x206, 0x3, 0x2, 0x2, 
-    0x2, 0x206, 0x207, 0x3, 0x2, 0x2, 0x2, 0x207, 0x209, 0x5, 0xba, 0x5e, 
-    0x2, 0x208, 0x20a, 0x5, 0x2e, 0x18, 0x2, 0x209, 0x208, 0x3, 0x2, 0x2, 
-    0x2, 0x209, 0x20a, 0x3, 0x2, 0x2, 0x2, 0x20a, 0x20c, 0x3, 0x2, 0x2, 
-    0x2, 0x20b, 0x20d, 0x5, 0x2c, 0x17, 0x2, 0x20c, 0x20b, 0x3, 0x2, 0x2, 
-    0x2, 0x20c, 0x20d, 0x3, 0x2, 0x2, 0x2, 0x20d, 0x20f, 0x3, 0x2, 0x2, 
-    0x2, 0x20e, 0x210, 0x5, 0x34, 0x1b, 0x2, 0x20f, 0x20e, 0x3, 0x2, 0x2, 
-    0x2, 0x20f, 0x210, 0x3, 0x2, 0x2, 0x2, 0x210, 0x216, 0x3, 0x2, 0x2, 
-    0x2, 0x211, 0x217, 0x5, 0x30, 0x19, 0x2, 0x212, 0x214, 0x5, 0x36, 0x1c, 
-    0x2, 0x213, 0x215, 0x7, 0x7b, 0x2, 0x2, 0x214, 0x213, 0x3, 0x2, 0x2, 
-    0x2, 0x214, 0x215, 0x3, 0x2, 0x2, 0x2, 0x215, 0x217, 0x3, 0x2, 0x2, 
-    0x2, 0x216, 0x211, 0x3, 0x2, 0x2, 0x2, 0x216, 0x212, 0x3, 0x2, 0x2, 
-    0x2, 0x217, 0x218, 0x3, 0x2, 0x2, 0x2, 0x218, 0x219, 0x5, 0x32, 0x1a, 
-    0x2, 0x219, 0x24c, 0x3, 0x2, 0x2, 0x2, 0x21a, 0x21c, 0x9, 0x3, 0x2, 
-    0x2, 0x21b, 0x21d, 0x7, 0x99, 0x2, 0x2, 0x21c, 0x21b, 0x3, 0x2, 0x2, 
-    0x2, 0x21c, 0x21d, 0x3, 0x2, 0x2, 0x2, 0x21d, 0x21e, 0x3, 0x2, 0x2, 
-    0x2, 0x21e, 0x222, 0x7, 0x97, 0x2, 0x2, 0x21f, 0x220, 0x7, 0x4c, 0x2, 
-    0x2, 0x220, 0x221, 0x7, 0x70, 0x2, 0x2, 0x221, 0x223, 0x7, 0x37, 0x2, 
-    0x2, 0x222, 0x21f, 0x3, 0x2, 0x2, 0x2, 0x222, 0x223, 0x3, 0x2, 0x2, 
-    0x2, 0x223, 0x224, 0x3, 0x2, 0x2, 0x2, 0x224, 0x226, 0x5, 0xba, 0x5e, 
-    0x2, 0x225, 0x227, 0x5, 0x2e, 0x18, 0x2, 0x226, 0x225, 0x3, 0x2, 0x2, 
-    0x2, 0x226, 0x227, 0x3, 0x2, 0x2, 0x2, 0x227, 0x229, 0x3, 0x2, 0x2, 
-    0x2, 0x228, 0x22a, 0x5, 0x2c, 0x17, 0x2, 0x229, 0x228, 0x3, 0x2, 0x2, 
-    0x2, 0x229, 0x22a, 0x3, 0x2, 0x2, 0x2, 0x22a, 0x22c, 0x3, 0x2, 0x2, 
-    0x2, 0x22b, 0x22d, 0x5, 0x34, 0x1b, 0x2, 0x22c, 0x22b, 0x3, 0x2, 0x2, 
-    0x2, 0x22c, 0x22d, 0x3, 0x2, 0x2, 0x2, 0x22d, 0x22f, 0x3, 0x2, 0x2, 
-    0x2, 0x22e, 0x230, 0x5, 0x36, 0x1c, 0x2, 0x22f, 0x22e, 0x3, 0x2, 0x2, 
-    0x2, 0x22f, 0x230, 0x3, 0x2, 0x2, 0x2, 0x230, 0x232, 0x3, 0x2, 0x2, 
-    0x2, 0x231, 0x233, 0x5, 0x32, 0x1a, 0x2, 0x232, 0x231, 0x3, 0x2, 0x2, 
-    0x2, 0x232, 0x233, 0x3, 0x2, 0x2, 0x2, 0x233, 0x24c, 0x3, 0x2, 0x2, 
-    0x2, 0x234, 0x237, 0x9, 0x3, 0x2, 0x2, 0x235, 0x236, 0x7, 0x76, 0x2, 
-    0x2, 0x236, 0x238, 0x7, 0x83, 0x2, 0x2, 0x237, 0x235, 0x3, 0x2, 0x2, 
-    0x2, 0x237, 0x238, 0x3, 0x2, 0x2, 0x2, 0x238, 0x239, 0x3, 0x2, 0x2, 
-    0x2, 0x239, 0x23d, 0x7, 0xad, 0x2, 0x2, 0x23a, 0x23b, 0x7, 0x4c, 0x2, 
-    0x2, 0x23b, 0x23c, 0x7, 0x70, 0x2, 0x2, 0x23c, 0x23e, 0x7, 0x37, 0x2, 
-    0x2, 0x23d, 0x23a, 0x3, 0x2, 0x2, 0x2, 0x23d, 0x23e, 0x3, 0x2, 0x2, 
-    0x2, 0x23e, 0x23f, 0x3, 0x2, 0x2, 0x2, 0x23f, 0x241, 0x5, 0xba, 0x5e, 
-    0x2, 0x240, 0x242, 0x5, 0x2e, 0x18, 0x2, 0x241, 0x240, 0x3, 0x2, 0x2, 
-    0x2, 0x241, 0x242, 0x3, 0x2, 0x2, 0x2, 0x242, 0x244, 0x3, 0x2, 0x2, 
-    0x2, 0x243, 0x245, 0x5, 0x2c, 0x17, 0x2, 0x244, 0x243, 0x3, 0x2, 0x2, 
-    0x2, 0x244, 0x245, 0x3, 0x2, 0x2, 0x2, 0x245, 0x247, 0x3, 0x2, 0x2, 
-    0x2, 0x246, 0x248, 0x5, 0x34, 0x1b, 0x2, 0x247, 0x246, 0x3, 0x2, 0x2, 
-    0x2, 0x247, 0x248, 0x3, 0x2, 0x2, 0x2, 0x248, 0x249, 0x3, 0x2, 0x2, 
-    0x2, 0x249, 0x24a, 0x5, 0x32, 0x1a, 0x2, 0x24a, 0x24c, 0x3, 0x2, 0x2, 
-    0x2, 0x24b, 0x1c2, 0x3, 0x2, 0x2, 0x2, 0x24b, 0x1d0, 0x3, 0x2, 0x2, 
-    0x2, 0x24b, 0x1e1, 0x3, 0x2, 0x2, 0x2, 0x24b, 0x1ff, 0x3, 0x2, 0x2, 
-    0x2, 0x24b, 0x21a, 0x3, 0x2, 0x2, 0x2, 0x24b, 0x234, 0x3, 0x2, 0x2, 
-    0x2, 0x24c, 0x17, 0x3, 0x2, 0x2, 0x2, 0x24d, 0x24e, 0x7, 0xcd, 0x2, 
-    0x2, 0x24e, 0x253, 0x5, 0x1a, 0xe, 0x2, 0x24f, 0x250, 0x7, 0xc2, 0x2, 
-    0x2, 0x250, 0x252, 0x5, 0x1a, 0xe, 0x2, 0x251, 0x24f, 0x3, 0x2, 0x2, 
-    0x2, 0x252, 0x255, 0x3, 0x2, 0x2, 0x2, 0x253, 0x251, 0x3, 0x2, 0x2, 
-    0x2, 0x253, 0x254, 0x3, 0x2, 0x2, 0x2, 0x254, 0x256, 0x3, 0x2, 0x2, 
-    0x2, 0x255, 0x253, 0x3, 0x2, 0x2, 0x2, 0x256, 0x257, 0x7, 0xd7, 0x2, 
-    0x2, 0x257, 0x19, 0x3, 0x2, 0x2, 0x2, 0x258, 0x259, 0x5, 0xd0, 0x69, 
-    0x2, 0x259, 0x26f, 0x5, 0xa4, 0x53, 0x2, 0x25a, 0x25b, 0x6, 0xe, 0x2, 
-    0x3, 0x25b, 0x25c, 0x7, 0x26, 0x2, 0x2, 0x25c, 0x25d, 0x5, 0xc6, 0x64, 
-    0x2, 0x25d, 0x25e, 0x8, 0xe, 0x1, 0x2, 0x25e, 0x26e, 0x3, 0x2, 0x2, 
-    0x2, 0x25f, 0x260, 0x6, 0xe, 0x3, 0x3, 0x260, 0x261, 0x7, 0x39, 0x2, 
-    0x2, 0x261, 0x262, 0x5, 0xaa, 0x56, 0x2, 0x262, 0x263, 0x8, 0xe, 0x1, 
-    0x2, 0x263, 0x26e, 0x3, 0x2, 0x2, 0x2, 0x264, 0x265, 0x6, 0xe, 0x4, 
-    0x3, 0x265, 0x266, 0x7, 0x49, 0x2, 0x2, 0x266, 0x26e, 0x8, 0xe, 0x1, 
-    0x2, 0x267, 0x268, 0x6, 0xe, 0x5, 0x3, 0x268, 0x269, 0x7, 0x51, 0x2, 
-    0x2, 0x269, 0x26e, 0x8, 0xe, 0x1, 0x2, 0x26a, 0x26b, 0x6, 0xe, 0x6, 
-    0x3, 0x26b, 0x26c, 0x7, 0x57, 0x2, 0x2, 0x26c, 0x26e, 0x8, 0xe, 0x1, 
-    0x2, 0x26d, 0x25a, 0x3, 0x2, 0x2, 0x2, 0x26d, 0x25f, 0x3, 0x2, 0x2, 
-    0x2, 0x26d, 0x264, 0x3, 0x2, 0x2, 0x2, 0x26d, 0x267, 0x3, 0x2, 0x2, 
-    0x2, 0x26d, 0x26a, 0x3, 0x2, 0x2, 0x2, 0x26e, 0x271, 0x3, 0x2, 0x2, 
-    0x2, 0x26f, 0x26d, 0x3, 0x2, 0x2, 0x2, 0x26f, 0x270, 0x3, 0x2, 0x2, 
-    0x2, 0x270, 0x1b, 0x3, 0x2, 0x2, 0x2, 0x271, 0x26f, 0x3, 0x2, 0x2, 0x2, 
-    0x272, 0x274, 0x5, 0x1e, 0x10, 0x2, 0x273, 0x272, 0x3, 0x2, 0x2, 0x2, 
-    0x273, 0x274, 0x3, 0x2, 0x2, 0x2, 0x274, 0x28b, 0x3, 0x2, 0x2, 0x2, 
-    0x275, 0x276, 0x6, 0xf, 0x7, 0x3, 0x276, 0x277, 0x5, 0x22, 0x12, 0x2, 
-    0x277, 0x278, 0x8, 0xf, 0x1, 0x2, 0x278, 0x28a, 0x3, 0x2, 0x2, 0x2, 
-    0x279, 0x27a, 0x6, 0xf, 0x8, 0x3, 0x27a, 0x27b, 0x5, 0x24, 0x13, 0x2, 
-    0x27b, 0x27c, 0x8, 0xf, 0x1, 0x2, 0x27c, 0x28a, 0x3, 0x2, 0x2, 0x2, 
-    0x27d, 0x27e, 0x6, 0xf, 0x9, 0x3, 0x27e, 0x27f, 0x5, 0x26, 0x14, 0x2, 
-    0x27f, 0x280, 0x8, 0xf, 0x1, 0x2, 0x280, 0x28a, 0x3, 0x2, 0x2, 0x2, 
-    0x281, 0x282, 0x6, 0xf, 0xa, 0x3, 0x282, 0x283, 0x5, 0x28, 0x15, 0x2, 
-    0x283, 0x284, 0x8, 0xf, 0x1, 0x2, 0x284, 0x28a, 0x3, 0x2, 0x2, 0x2, 
-    0x285, 0x286, 0x6, 0xf, 0xb, 0x3, 0x286, 0x287, 0x5, 0x2a, 0x16, 0x2, 
-    0x287, 0x288, 0x8, 0xf, 0x1, 0x2, 0x288, 0x28a, 0x3, 0x2, 0x2, 0x2, 
-    0x289, 0x275, 0x3, 0x2, 0x2, 0x2, 0x289, 0x279, 0x3, 0x2, 0x2, 0x2, 
-    0x289, 0x27d, 0x3, 0x2, 0x2, 0x2, 0x289, 0x281, 0x3, 0x2, 0x2, 0x2, 
-    0x289, 0x285, 0x3, 0x2, 0x2, 0x2, 0x28a, 0x28d, 0x3, 0x2, 0x2, 0x2, 
-    0x28b, 0x289, 0x3, 0x2, 0x2, 0x2, 0x28b, 0x28c, 0x3, 0x2, 0x2, 0x2, 
-    0x28c, 0x1d, 0x3, 0x2, 0x2, 0x2, 0x28d, 0x28b, 0x3, 0x2, 0x2, 0x2, 0x28e, 
-    0x28f, 0x7, 0x7d, 0x2, 0x2, 0x28f, 0x290, 0x7, 0x59, 0x2, 0x2, 0x290, 
-    0x291, 0x5, 0xa6, 0x54, 0x2, 0x291, 0x1f, 0x3, 0x2, 0x2, 0x2, 0x292, 
-    0x299, 0x5, 0xd0, 0x69, 0x2, 0x293, 0x296, 0x5, 0xd0, 0x69, 0x2, 0x294, 
-    0x295, 0x7, 0xcd, 0x2, 0x2, 0x295, 0x297, 0x7, 0xd7, 0x2, 0x2, 0x296, 
-    0x294, 0x3, 0x2, 0x2, 0x2, 0x296, 0x297, 0x3, 0x2, 0x2, 0x2, 0x297, 
-    0x29a, 0x3, 0x2, 0x2, 0x2, 0x298, 0x29a, 0x5, 0xc6, 0x64, 0x2, 0x299, 
-    0x293, 0x3, 0x2, 0x2, 0x2, 0x299, 0x298, 0x3, 0x2, 0x2, 0x2, 0x29a, 
-    0x21, 0x3, 0x2, 0x2, 0x2, 0x29b, 0x29c, 0x7, 0x90, 0x2, 0x2, 0x29c, 
-    0x29d, 0x7, 0xcd, 0x2, 0x2, 0x29d, 0x29e, 0x5, 0xd0, 0x69, 0x2, 0x29e, 
-    0x2a2, 0x7, 0xcd, 0x2, 0x2, 0x29f, 0x2a1, 0x5, 0x20, 0x11, 0x2, 0x2a0, 
-    0x29f, 0x3, 0x2, 0x2, 0x2, 0x2a1, 0x2a4, 0x3, 0x2, 0x2, 0x2, 0x2a2, 
-    0x2a0, 0x3, 0x2, 0x2, 0x2, 0x2a2, 0x2a3, 0x3, 0x2, 0x2, 0x2, 0x2a3, 
-    0x2a5, 0x3, 0x2, 0x2, 0x2, 0x2a4, 0x2a2, 0x3, 0x2, 0x2, 0x2, 0x2a5, 
-    0x2a6, 0x7, 0xd7, 0x2, 0x2, 0x2a6, 0x2a7, 0x7, 0xd7, 0x2, 0x2, 0x2a7, 
-    0x23, 0x3, 0x2, 0x2, 0x2, 0x2a8, 0x2a9, 0x7, 0x5f, 0x2, 0x2, 0x2a9, 
-    0x2b3, 0x7, 0xcd, 0x2, 0x2, 0x2aa, 0x2b4, 0x7, 0xba, 0x2, 0x2, 0x2ab, 
-    0x2ac, 0x7, 0x68, 0x2, 0x2, 0x2ac, 0x2ad, 0x7, 0xba, 0x2, 0x2, 0x2ad, 
-    0x2ae, 0x7, 0x66, 0x2, 0x2, 0x2ae, 0x2b4, 0x7, 0xba, 0x2, 0x2, 0x2af, 
-    0x2b0, 0x7, 0x66, 0x2, 0x2, 0x2b0, 0x2b1, 0x7, 0xba, 0x2, 0x2, 0x2b1, 
-    0x2b2, 0x7, 0x68, 0x2, 0x2, 0x2b2, 0x2b4, 0x7, 0xba, 0x2, 0x2, 0x2b3, 
-    0x2aa, 0x3, 0x2, 0x2, 0x2, 0x2b3, 0x2ab, 0x3, 0x2, 0x2, 0x2, 0x2b3, 
-    0x2af, 0x3, 0x2, 0x2, 0x2, 0x2b4, 0x2b5, 0x3, 0x2, 0x2, 0x2, 0x2b5, 
-    0x2b6, 0x7, 0xd7, 0x2, 0x2, 0x2b6, 0x25, 0x3, 0x2, 0x2, 0x2, 0x2b7, 
-    0x2b8, 0x7, 0x5c, 0x2, 0x2, 0x2b8, 0x2b9, 0x7, 0xcd, 0x2, 0x2, 0x2b9, 
-    0x2ba, 0x5, 0xd0, 0x69, 0x2, 0x2ba, 0x2be, 0x7, 0xcd, 0x2, 0x2, 0x2bb, 
-    0x2bd, 0x5, 0x20, 0x11, 0x2, 0x2bc, 0x2bb, 0x3, 0x2, 0x2, 0x2, 0x2bd, 
-    0x2c0, 0x3, 0x2, 0x2, 0x2, 0x2be, 0x2bc, 0x3, 0x2, 0x2, 0x2, 0x2be, 
-    0x2bf, 0x3, 0x2, 0x2, 0x2, 0x2bf, 0x2c1, 0x3, 0x2, 0x2, 0x2, 0x2c0, 
-    0x2be, 0x3, 0x2, 0x2, 0x2, 0x2c1, 0x2c2, 0x7, 0xd7, 0x2, 0x2, 0x2c2, 
-    0x2c3, 0x7, 0xd7, 0x2, 0x2, 0x2c3, 0x27, 0x3, 0x2, 0x2, 0x2, 0x2c4, 
-    0x2c5, 0x7, 0x7f, 0x2, 0x2, 0x2c5, 0x2d0, 0x7, 0xcd, 0x2, 0x2, 0x2c6, 
-    0x2c7, 0x7, 0x68, 0x2, 0x2, 0x2c7, 0x2c8, 0x5, 0xd0, 0x69, 0x2, 0x2c8, 
-    0x2c9, 0x7, 0x66, 0x2, 0x2, 0x2c9, 0x2ca, 0x5, 0xd0, 0x69, 0x2, 0x2ca, 
-    0x2d1, 0x3, 0x2, 0x2, 0x2, 0x2cb, 0x2cc, 0x7, 0x66, 0x2, 0x2, 0x2cc, 
-    0x2cd, 0x5, 0xd0, 0x69, 0x2, 0x2cd, 0x2ce, 0x7, 0x68, 0x2, 0x2, 0x2ce, 
-    0x2cf, 0x5, 0xd0, 0x69, 0x2, 0x2cf, 0x2d1, 0x3, 0x2, 0x2, 0x2, 0x2d0, 
-    0x2c6, 0x3, 0x2, 0x2, 0x2, 0x2d0, 0x2cb, 0x3, 0x2, 0x2, 0x2, 0x2d1, 
-    0x2d2, 0x3, 0x2, 0x2, 0x2, 0x2d2, 0x2d3, 0x7, 0xd7, 0x2, 0x2, 0x2d3, 
-    0x29, 0x3, 0x2, 0x2, 0x2, 0x2d4, 0x2d5, 0x7, 0x8e, 0x2, 0x2, 0x2d5, 
-    0x2d6, 0x7, 0xcd, 0x2, 0x2, 0x2d6, 0x2d7, 0x5, 0x94, 0x4b, 0x2, 0x2d7, 
-    0x2d8, 0x7, 0xd7, 0x2, 0x2, 0x2d8, 0x2b, 0x3, 0x2, 0x2, 0x2, 0x2d9, 
-    0x2da, 0x7, 0x74, 0x2, 0x2, 0x2da, 0x2dd, 0x7, 0x18, 0x2, 0x2, 0x2db, 
-    0x2de, 0x5, 0xd0, 0x69, 0x2, 0x2dc, 0x2de, 0x7, 0xbc, 0x2, 0x2, 0x2dd, 
-    0x2db, 0x3, 0x2, 0x2, 0x2, 0x2dd, 0x2dc, 0x3, 0x2, 0x2, 0x2, 0x2de, 
-    0x2d, 0x3, 0x2, 0x2, 0x2, 0x2df, 0x2e0, 0x7, 0xab, 0x2, 0x2, 0x2e0, 
-    0x2e1, 0x7, 0xbc, 0x2, 0x2, 0x2e1, 0x2f, 0x3, 0x2, 0x2, 0x2, 0x2e2, 
-    0x2e3, 0x7, 0x9f, 0x2, 0x2, 0x2e3, 0x2e4, 0x5, 0xba, 0x5e, 0x2, 0x2e4, 
-    0x31, 0x3, 0x2, 0x2, 0x2, 0x2e5, 0x2e6, 0x7, 0xc, 0x2, 0x2, 0x2e6, 0x2e7, 
-    0x5, 0x64, 0x33, 0x2, 0x2e7, 0x33, 0x3, 0x2, 0x2, 0x2, 0x2e8, 0x2e9, 
-    0x7, 0xcd, 0x2, 0x2, 0x2e9, 0x2ee, 0x5, 0x42, 0x22, 0x2, 0x2ea, 0x2eb, 
-    0x7, 0xc2, 0x2, 0x2, 0x2eb, 0x2ed, 0x5, 0x42, 0x22, 0x2, 0x2ec, 0x2ea, 
-    0x3, 0x2, 0x2, 0x2, 0x2ed, 0x2f0, 0x3, 0x2, 0x2, 0x2, 0x2ee, 0x2ec, 
-    0x3, 0x2, 0x2, 0x2, 0x2ee, 0x2ef, 0x3, 0x2, 0x2, 0x2, 0x2ef, 0x2f1, 
-    0x3, 0x2, 0x2, 0x2, 0x2f0, 0x2ee, 0x3, 0x2, 0x2, 0x2, 0x2f1, 0x2f2, 
-    0x7, 0xd7, 0x2, 0x2, 0x2f2, 0x2f8, 0x3, 0x2, 0x2, 0x2, 0x2f3, 0x2f4, 
-    0x7, 0xc, 0x2, 0x2, 0x2f4, 0x2f8, 0x5, 0xba, 0x5e, 0x2, 0x2f5, 0x2f6, 
-    0x7, 0xc, 0x2, 0x2, 0x2f6, 0x2f8, 0x5, 0xb8, 0x5d, 0x2, 0x2f7, 0x2e8, 
-    0x3, 0x2, 0x2, 0x2, 0x2f7, 0x2f3, 0x3, 0x2, 0x2, 0x2, 0x2f7, 0x2f5, 
-    0x3, 0x2, 0x2, 0x2, 0x2f8, 0x35, 0x3, 0x2, 0x2, 0x2, 0x2f9, 0x314, 0x5, 
-    0x40, 0x21, 0x2, 0x2fa, 0x2fb, 0x6, 0x1c, 0xc, 0x3, 0x2fb, 0x2fc, 0x5, 
-    0x7a, 0x3e, 0x2, 0x2fc, 0x2fd, 0x8, 0x1c, 0x1, 0x2, 0x2fd, 0x313, 0x3, 
-    0x2, 0x2, 0x2, 0x2fe, 0x2ff, 0x6, 0x1c, 0xd, 0x3, 0x2ff, 0x300, 0x5, 
-    0x38, 0x1d, 0x2, 0x300, 0x301, 0x8, 0x1c, 0x1, 0x2, 0x301, 0x313, 0x3, 
-    0x2, 0x2, 0x2, 0x302, 0x303, 0x6, 0x1c, 0xe, 0x3, 0x303, 0x304, 0x5, 
-    0x3a, 0x1e, 0x2, 0x304, 0x305, 0x8, 0x1c, 0x1, 0x2, 0x305, 0x313, 0x3, 
-    0x2, 0x2, 0x2, 0x306, 0x307, 0x6, 0x1c, 0xf, 0x3, 0x307, 0x308, 0x5, 
-    0x3c, 0x1f, 0x2, 0x308, 0x309, 0x8, 0x1c, 0x1, 0x2, 0x309, 0x313, 0x3, 
-    0x2, 0x2, 0x2, 0x30a, 0x30b, 0x6, 0x1c, 0x10, 0x3, 0x30b, 0x30c, 0x5, 
-    0x3e, 0x20, 0x2, 0x30c, 0x30d, 0x8, 0x1c, 0x1, 0x2, 0x30d, 0x313, 0x3, 
-    0x2, 0x2, 0x2, 0x30e, 0x30f, 0x6, 0x1c, 0x11, 0x3, 0x30f, 0x310, 0x5, 
-    0x80, 0x41, 0x2, 0x310, 0x311, 0x8, 0x1c, 0x1, 0x2, 0x311, 0x313, 0x3, 
-    0x2, 0x2, 0x2, 0x312, 0x2fa, 0x3, 0x2, 0x2, 0x2, 0x312, 0x2fe, 0x3, 
-    0x2, 0x2, 0x2, 0x312, 0x302, 0x3, 0x2, 0x2, 0x2, 0x312, 0x306, 0x3, 
-    0x2, 0x2, 0x2, 0x312, 0x30a, 0x3, 0x2, 0x2, 0x2, 0x312, 0x30e, 0x3, 
-    0x2, 0x2, 0x2, 0x313, 0x316, 0x3, 0x2, 0x2, 0x2, 0x314, 0x312, 0x3, 
-    0x2, 0x2, 0x2, 0x314, 0x315, 0x3, 0x2, 0x2, 0x2, 0x315, 0x37, 0x3, 0x2, 
-    0x2, 0x2, 0x316, 0x314, 0x3, 0x2, 0x2, 0x2, 0x317, 0x318, 0x7, 0x7a, 
-    0x2, 0x2, 0x318, 0x319, 0x7, 0x13, 0x2, 0x2, 0x319, 0x31a, 0x5, 0xaa, 
-    0x56, 0x2, 0x31a, 0x39, 0x3, 0x2, 0x2, 0x2, 0x31b, 0x31c, 0x7, 0x7d, 
-    0x2, 0x2, 0x31c, 0x31d, 0x7, 0x59, 0x2, 0x2, 0x31d, 0x31e, 0x5, 0xaa, 
-    0x56, 0x2, 0x31e, 0x3b, 0x3, 0x2, 0x2, 0x2, 0x31f, 0x320, 0x7, 0x88, 
-    0x2, 0x2, 0x320, 0x321, 0x7, 0x13, 0x2, 0x2, 0x321, 0x322, 0x5, 0xaa, 
-    0x56, 0x2, 0x322, 0x3d, 0x3, 0x2, 0x2, 0x2, 0x323, 0x324, 0x7, 0xa5, 
-    0x2, 0x2, 0x324, 0x329, 0x5, 0x4e, 0x28, 0x2, 0x325, 0x326, 0x7, 0xc2, 
-    0x2, 0x2, 0x326, 0x328, 0x5, 0x4e, 0x28, 0x2, 0x327, 0x325, 0x3, 0x2, 
-    0x2, 0x2, 0x328, 0x32b, 0x3, 0x2, 0x2, 0x2, 0x329, 0x327, 0x3, 0x2, 
-    0x2, 0x2, 0x329, 0x32a, 0x3, 0x2, 0x2, 0x2, 0x32a, 0x3f, 0x3, 0x2, 0x2, 
-    0x2, 0x32b, 0x329, 0x3, 0x2, 0x2, 0x2, 0x32c, 0x32e, 0x7, 0x35, 0x2, 
-    0x2, 0x32d, 0x32f, 0x7, 0xc7, 0x2, 0x2, 0x32e, 0x32d, 0x3, 0x2, 0x2, 
-    0x2, 0x32e, 0x32f, 0x3, 0x2, 0x2, 0x2, 0x32f, 0x330, 0x3, 0x2, 0x2, 
-    0x2, 0x330, 0x336, 0x5, 0xd2, 0x6a, 0x2, 0x331, 0x333, 0x7, 0xcd, 0x2, 
-    0x2, 0x332, 0x334, 0x5, 0xa6, 0x54, 0x2, 0x333, 0x332, 0x3, 0x2, 0x2, 
-    0x2, 0x333, 0x334, 0x3, 0x2, 0x2, 0x2, 0x334, 0x335, 0x3, 0x2, 0x2, 
-    0x2, 0x335, 0x337, 0x7, 0xd7, 0x2, 0x2, 0x336, 0x331, 0x3, 0x2, 0x2, 
-    0x2, 0x336, 0x337, 0x3, 0x2, 0x2, 0x2, 0x337, 0x41, 0x3, 0x2, 0x2, 0x2, 
-    0x338, 0x341, 0x5, 0x44, 0x23, 0x2, 0x339, 0x33a, 0x7, 0x1d, 0x2, 0x2, 
-    0x33a, 0x33b, 0x5, 0xd0, 0x69, 0x2, 0x33b, 0x33c, 0x7, 0x16, 0x2, 0x2, 
-    0x33c, 0x33d, 0x5, 0xaa, 0x56, 0x2, 0x33d, 0x341, 0x3, 0x2, 0x2, 0x2, 
-    0x33e, 0x33f, 0x7, 0x4f, 0x2, 0x2, 0x33f, 0x341, 0x5, 0x48, 0x25, 0x2, 
-    0x340, 0x338, 0x3, 0x2, 0x2, 0x2, 0x340, 0x339, 0x3, 0x2, 0x2, 0x2, 
-    0x340, 0x33e, 0x3, 0x2, 0x2, 0x2, 0x341, 0x43, 0x3, 0x2, 0x2, 0x2, 0x342, 
-    0x343, 0x5, 0xb4, 0x5b, 0x2, 0x343, 0x345, 0x5, 0xa4, 0x53, 0x2, 0x344, 
-    0x346, 0x5, 0x46, 0x24, 0x2, 0x345, 0x344, 0x3, 0x2, 0x2, 0x2, 0x345, 
-    0x346, 0x3, 0x2, 0x2, 0x2, 0x346, 0x349, 0x3, 0x2, 0x2, 0x2, 0x347, 
-    0x348, 0x7, 0x1c, 0x2, 0x2, 0x348, 0x34a, 0x7, 0xbc, 0x2, 0x2, 0x349, 
-    0x347, 0x3, 0x2, 0x2, 0x2, 0x349, 0x34a, 0x3, 0x2, 0x2, 0x2, 0x34a, 
-    0x34c, 0x3, 0x2, 0x2, 0x2, 0x34b, 0x34d, 0x5, 0x4a, 0x26, 0x2, 0x34c, 
-    0x34b, 0x3, 0x2, 0x2, 0x2, 0x34c, 0x34d, 0x3, 0x2, 0x2, 0x2, 0x34d, 
-    0x350, 0x3, 0x2, 0x2, 0x2, 0x34e, 0x34f, 0x7, 0xa5, 0x2, 0x2, 0x34f, 
-    0x351, 0x5, 0xaa, 0x56, 0x2, 0x350, 0x34e, 0x3, 0x2, 0x2, 0x2, 0x350, 
-    0x351, 0x3, 0x2, 0x2, 0x2, 0x351, 0x363, 0x3, 0x2, 0x2, 0x2, 0x352, 
-    0x354, 0x5, 0xb4, 0x5b, 0x2, 0x353, 0x355, 0x5, 0xa4, 0x53, 0x2, 0x354, 
-    0x353, 0x3, 0x2, 0x2, 0x2, 0x354, 0x355, 0x3, 0x2, 0x2, 0x2, 0x355, 
-    0x356, 0x3, 0x2, 0x2, 0x2, 0x356, 0x359, 0x5, 0x46, 0x24, 0x2, 0x357, 
-    0x358, 0x7, 0x1c, 0x2, 0x2, 0x358, 0x35a, 0x7, 0xbc, 0x2, 0x2, 0x359, 
-    0x357, 0x3, 0x2, 0x2, 0x2, 0x359, 0x35a, 0x3, 0x2, 0x2, 0x2, 0x35a, 
-    0x35c, 0x3, 0x2, 0x2, 0x2, 0x35b, 0x35d, 0x5, 0x4a, 0x26, 0x2, 0x35c, 
-    0x35b, 0x3, 0x2, 0x2, 0x2, 0x35c, 0x35d, 0x3, 0x2, 0x2, 0x2, 0x35d, 
-    0x360, 0x3, 0x2, 0x2, 0x2, 0x35e, 0x35f, 0x7, 0xa5, 0x2, 0x2, 0x35f, 
-    0x361, 0x5, 0xaa, 0x56, 0x2, 0x360, 0x35e, 0x3, 0x2, 0x2, 0x2, 0x360, 
-    0x361, 0x3, 0x2, 0x2, 0x2, 0x361, 0x363, 0x3, 0x2, 0x2, 0x2, 0x362, 
-    0x342, 0x3, 0x2, 0x2, 0x2, 0x362, 0x352, 0x3, 0x2, 0x2, 0x2, 0x363, 
-    0x45, 0x3, 0x2, 0x2, 0x2, 0x364, 0x365, 0x9, 0x4, 0x2, 0x2, 0x365, 0x366, 
-    0x5, 0xaa, 0x56, 0x2, 0x366, 0x47, 0x3, 0x2, 0x2, 0x2, 0x367, 0x368, 
-    0x5, 0xb4, 0x5b, 0x2, 0x368, 0x369, 0x5, 0xaa, 0x56, 0x2, 0x369, 0x36a, 
-    0x7, 0xa6, 0x2, 0x2, 0x36a, 0x36b, 0x5, 0xa4, 0x53, 0x2, 0x36b, 0x36c, 
-    0x7, 0x46, 0x2, 0x2, 0x36c, 0x36d, 0x7, 0xba, 0x2, 0x2, 0x36d, 0x49, 
-    0x3, 0x2, 0x2, 0x2, 0x36e, 0x36f, 0x7, 0x19, 0x2, 0x2, 0x36f, 0x370, 
-    0x7, 0xcd, 0x2, 0x2, 0x370, 0x375, 0x5, 0x4c, 0x27, 0x2, 0x371, 0x372, 
-    0x7, 0xc2, 0x2, 0x2, 0x372, 0x374, 0x5, 0x4c, 0x27, 0x2, 0x373, 0x371, 
-    0x3, 0x2, 0x2, 0x2, 0x374, 0x377, 0x3, 0x2, 0x2, 0x2, 0x375, 0x373, 
-    0x3, 0x2, 0x2, 0x2, 0x375, 0x376, 0x3, 0x2, 0x2, 0x2, 0x376, 0x378, 
-    0x3, 0x2, 0x2, 0x2, 0x377, 0x375, 0x3, 0x2, 0x2, 0x2, 0x378, 0x379, 
-    0x7, 0xd7, 0x2, 0x2, 0x379, 0x4b, 0x3, 0x2, 0x2, 0x2, 0x37a, 0x380, 
-    0x5, 0xd0, 0x69, 0x2, 0x37b, 0x37d, 0x7, 0xcd, 0x2, 0x2, 0x37c, 0x37e, 
-    0x5, 0xa6, 0x54, 0x2, 0x37d, 0x37c, 0x3, 0x2, 0x2, 0x2, 0x37d, 0x37e, 
-    0x3, 0x2, 0x2, 0x2, 0x37e, 0x37f, 0x3, 0x2, 0x2, 0x2, 0x37f, 0x381, 
-    0x7, 0xd7, 0x2, 0x2, 0x380, 0x37b, 0x3, 0x2, 0x2, 0x2, 0x380, 0x381, 
-    0x3, 0x2, 0x2, 0x2, 0x381, 0x4d, 0x3, 0x2, 0x2, 0x2, 0x382, 0x38a, 0x5, 
-    0xaa, 0x56, 0x2, 0x383, 0x38b, 0x7, 0x28, 0x2, 0x2, 0x384, 0x385, 0x7, 
-    0x9f, 0x2, 0x2, 0x385, 0x386, 0x7, 0x2f, 0x2, 0x2, 0x386, 0x38b, 0x7, 
-    0xbc, 0x2, 0x2, 0x387, 0x388, 0x7, 0x9f, 0x2, 0x2, 0x388, 0x389, 0x7, 
-    0xae, 0x2, 0x2, 0x389, 0x38b, 0x7, 0xbc, 0x2, 0x2, 0x38a, 0x383, 0x3, 
-    0x2, 0x2, 0x2, 0x38a, 0x384, 0x3, 0x2, 0x2, 0x2, 0x38a, 0x387, 0x3, 
-    0x2, 0x2, 0x2, 0x38a, 0x38b, 0x3, 0x2, 0x2, 0x2, 0x38b, 0x4f, 0x3, 0x2, 
-    0x2, 0x2, 0x38c, 0x38e, 0x9, 0x5, 0x2, 0x2, 0x38d, 0x38f, 0x7, 0x97, 
-    0x2, 0x2, 0x38e, 0x38d, 0x3, 0x2, 0x2, 0x2, 0x38e, 0x38f, 0x3, 0x2, 
-    0x2, 0x2, 0x38f, 0x390, 0x3, 0x2, 0x2, 0x2, 0x390, 0x391, 0x5, 0xb6, 
-    0x5c, 0x2, 0x391, 0x51, 0x3, 0x2, 0x2, 0x2, 0x392, 0x393, 0x9, 0x6, 
-    0x2, 0x2, 0x393, 0x396, 0x7, 0x21, 0x2, 0x2, 0x394, 0x395, 0x7, 0x4c, 
-    0x2, 0x2, 0x395, 0x397, 0x7, 0x37, 0x2, 0x2, 0x396, 0x394, 0x3, 0x2, 
-    0x2, 0x2, 0x396, 0x397, 0x3, 0x2, 0x2, 0x2, 0x397, 0x398, 0x3, 0x2, 
-    0x2, 0x2, 0x398, 0x39a, 0x5, 0xc0, 0x61, 0x2, 0x399, 0x39b, 0x5, 0x2c, 
-    0x17, 0x2, 0x39a, 0x399, 0x3, 0x2, 0x2, 0x2, 0x39a, 0x39b, 0x3, 0x2, 
-    0x2, 0x2, 0x39b, 0x3b1, 0x3, 0x2, 0x2, 0x2, 0x39c, 0x3a2, 0x9, 0x6, 
-    0x2, 0x2, 0x39d, 0x3a3, 0x7, 0x2e, 0x2, 0x2, 0x39e, 0x3a0, 0x7, 0x99, 
-    0x2, 0x2, 0x39f, 0x39e, 0x3, 0x2, 0x2, 0x2, 0x39f, 0x3a0, 0x3, 0x2, 
-    0x2, 0x2, 0x3a0, 0x3a1, 0x3, 0x2, 0x2, 0x2, 0x3a1, 0x3a3, 0x7, 0x97, 
-    0x2, 0x2, 0x3a2, 0x39d, 0x3, 0x2, 0x2, 0x2, 0x3a2, 0x39f, 0x3, 0x2, 
-    0x2, 0x2, 0x3a3, 0x3a6, 0x3, 0x2, 0x2, 0x2, 0x3a4, 0x3a5, 0x7, 0x4c, 
-    0x2, 0x2, 0x3a5, 0x3a7, 0x7, 0x37, 0x2, 0x2, 0x3a6, 0x3a4, 0x3, 0x2, 
-    0x2, 0x2, 0x3a6, 0x3a7, 0x3, 0x2, 0x2, 0x2, 0x3a7, 0x3a8, 0x3, 0x2, 
-    0x2, 0x2, 0x3a8, 0x3aa, 0x5, 0xba, 0x5e, 0x2, 0x3a9, 0x3ab, 0x5, 0x2c, 
-    0x17, 0x2, 0x3aa, 0x3a9, 0x3, 0x2, 0x2, 0x2, 0x3aa, 0x3ab, 0x3, 0x2, 
-    0x2, 0x2, 0x3ab, 0x3ae, 0x3, 0x2, 0x2, 0x2, 0x3ac, 0x3ad, 0x7, 0x6f, 
-    0x2, 0x2, 0x3ad, 0x3af, 0x7, 0x27, 0x2, 0x2, 0x3ae, 0x3ac, 0x3, 0x2, 
-    0x2, 0x2, 0x3ae, 0x3af, 0x3, 0x2, 0x2, 0x2, 0x3af, 0x3b1, 0x3, 0x2, 
-    0x2, 0x2, 0x3b0, 0x392, 0x3, 0x2, 0x2, 0x2, 0x3b0, 0x39c, 0x3, 0x2, 
-    0x2, 0x2, 0x3b1, 0x53, 0x3, 0x2, 0x2, 0x2, 0x3b2, 0x3b8, 0x7, 0x37, 
-    0x2, 0x2, 0x3b3, 0x3b9, 0x7, 0x2e, 0x2, 0x2, 0x3b4, 0x3b6, 0x7, 0x99, 
-    0x2, 0x2, 0x3b5, 0x3b4, 0x3, 0x2, 0x2, 0x2, 0x3b5, 0x3b6, 0x3, 0x2, 
-    0x2, 0x2, 0x3b6, 0x3b7, 0x3, 0x2, 0x2, 0x2, 0x3b7, 0x3b9, 0x7, 0x97, 
-    0x2, 0x2, 0x3b8, 0x3b3, 0x3, 0x2, 0x2, 0x2, 0x3b8, 0x3b5, 0x3, 0x2, 
-    0x2, 0x2, 0x3b8, 0x3b9, 0x3, 0x2, 0x2, 0x2, 0x3b9, 0x3ba, 0x3, 0x2, 
-    0x2, 0x2, 0x3ba, 0x3bb, 0x5, 0xba, 0x5e, 0x2, 0x3bb, 0x55, 0x3, 0x2, 
-    0x2, 0x2, 0x3bc, 0x3bd, 0x7, 0x38, 0x2, 0x2, 0x3bd, 0x3be, 0x7, 0x95, 
-    0x2, 0x2, 0x3be, 0x3bf, 0x5, 0x4, 0x3, 0x2, 0x3bf, 0x57, 0x3, 0x2, 0x2, 
-    0x2, 0x3c0, 0x3c1, 0x7, 0x53, 0x2, 0x2, 0x3c1, 0x3c3, 0x7, 0x55, 0x2, 
-    0x2, 0x3c2, 0x3c4, 0x7, 0x97, 0x2, 0x2, 0x3c3, 0x3c2, 0x3, 0x2, 0x2, 
-    0x2, 0x3c3, 0x3c4, 0x3, 0x2, 0x2, 0x2, 0x3c4, 0x3c8, 0x3, 0x2, 0x2, 
-    0x2, 0x3c5, 0x3c9, 0x5, 0xba, 0x5e, 0x2, 0x3c6, 0x3c7, 0x7, 0x44, 0x2, 
-    0x2, 0x3c7, 0x3c9, 0x5, 0xb8, 0x5d, 0x2, 0x3c8, 0x3c5, 0x3, 0x2, 0x2, 
-    0x2, 0x3c8, 0x3c6, 0x3, 0x2, 0x2, 0x2, 0x3c9, 0x3cb, 0x3, 0x2, 0x2, 
-    0x2, 0x3ca, 0x3cc, 0x5, 0x5a, 0x2e, 0x2, 0x3cb, 0x3ca, 0x3, 0x2, 0x2, 
-    0x2, 0x3cb, 0x3cc, 0x3, 0x2, 0x2, 0x2, 0x3cc, 0x3cd, 0x3, 0x2, 0x2, 
-    0x2, 0x3cd, 0x3ce, 0x5, 0x5c, 0x2f, 0x2, 0x3ce, 0x59, 0x3, 0x2, 0x2, 
-    0x2, 0x3cf, 0x3d0, 0x7, 0xcd, 0x2, 0x2, 0x3d0, 0x3d5, 0x5, 0xb4, 0x5b, 
-    0x2, 0x3d1, 0x3d2, 0x7, 0xc2, 0x2, 0x2, 0x3d2, 0x3d4, 0x5, 0xb4, 0x5b, 
-    0x2, 0x3d3, 0x3d1, 0x3, 0x2, 0x2, 0x2, 0x3d4, 0x3d7, 0x3, 0x2, 0x2, 
-    0x2, 0x3d5, 0x3d3, 0x3, 0x2, 0x2, 0x2, 0x3d5, 0x3d6, 0x3, 0x2, 0x2, 
-    0x2, 0x3d6, 0x3d8, 0x3, 0x2, 0x2, 0x2, 0x3d7, 0x3d5, 0x3, 0x2, 0x2, 
-    0x2, 0x3d8, 0x3d9, 0x7, 0xd7, 0x2, 0x2, 0x3d9, 0x5b, 0x3, 0x2, 0x2, 
-    0x2, 0x3da, 0x3db, 0x7, 0x40, 0x2, 0x2, 0x3db, 0x3e4, 0x5, 0xd0, 0x69, 
-    0x2, 0x3dc, 0x3e4, 0x7, 0xac, 0x2, 0x2, 0x3dd, 0x3df, 0x5, 0x64, 0x33, 
-    0x2, 0x3de, 0x3e0, 0x7, 0xd8, 0x2, 0x2, 0x3df, 0x3de, 0x3, 0x2, 0x2, 
-    0x2, 0x3df, 0x3e0, 0x3, 0x2, 0x2, 0x2, 0x3e0, 0x3e1, 0x3, 0x2, 0x2, 
-    0x2, 0x3e1, 0x3e2, 0x7, 0x2, 0x2, 0x3, 0x3e2, 0x3e4, 0x3, 0x2, 0x2, 
-    0x2, 0x3e3, 0x3da, 0x3, 0x2, 0x2, 0x2, 0x3e3, 0x3dc, 0x3, 0x2, 0x2, 
-    0x2, 0x3e3, 0x3dd, 0x3, 0x2, 0x2, 0x2, 0x3e4, 0x5d, 0x3, 0x2, 0x2, 0x2, 
-    0x3e5, 0x3e6, 0x7, 0x5a, 0x2, 0x2, 0x3e6, 0x3e8, 0x7, 0x6d, 0x2, 0x2, 
-    0x3e7, 0x3e9, 0x5, 0x2c, 0x17, 0x2, 0x3e8, 0x3e7, 0x3, 0x2, 0x2, 0x2, 
-    0x3e8, 0x3e9, 0x3, 0x2, 0x2, 0x2, 0x3e9, 0x3ea, 0x3, 0x2, 0x2, 0x2, 
-    0x3ea, 0x3ec, 0x5, 0x74, 0x3b, 0x2, 0x3eb, 0x3ed, 0x9, 0x7, 0x2, 0x2, 
-    0x3ec, 0x3eb, 0x3, 0x2, 0x2, 0x2, 0x3ec, 0x3ed, 0x3, 0x2, 0x2, 0x2, 
-    0x3ed, 0x5f, 0x3, 0x2, 0x2, 0x2, 0x3ee, 0x3ef, 0x7, 0x75, 0x2, 0x2, 
-    0x3ef, 0x3f0, 0x7, 0x97, 0x2, 0x2, 0x3f0, 0x3f2, 0x5, 0xba, 0x5e, 0x2, 
-    0x3f1, 0x3f3, 0x5, 0x2c, 0x17, 0x2, 0x3f2, 0x3f1, 0x3, 0x2, 0x2, 0x2, 
-    0x3f2, 0x3f3, 0x3, 0x2, 0x2, 0x2, 0x3f3, 0x3f5, 0x3, 0x2, 0x2, 0x2, 
-    0x3f4, 0x3f6, 0x5, 0x10, 0x9, 0x2, 0x3f5, 0x3f4, 0x3, 0x2, 0x2, 0x2, 
-    0x3f5, 0x3f6, 0x3, 0x2, 0x2, 0x2, 0x3f6, 0x3f8, 0x3, 0x2, 0x2, 0x2, 
-    0x3f7, 0x3f9, 0x7, 0x3c, 0x2, 0x2, 0x3f8, 0x3f7, 0x3, 0x2, 0x2, 0x2, 
-    0x3f8, 0x3f9, 0x3, 0x2, 0x2, 0x2, 0x3f9, 0x3fb, 0x3, 0x2, 0x2, 0x2, 
-    0x3fa, 0x3fc, 0x7, 0x25, 0x2, 0x2, 0x3fb, 0x3fa, 0x3, 0x2, 0x2, 0x2, 
-    0x3fb, 0x3fc, 0x3, 0x2, 0x2, 0x2, 0x3fc, 0x61, 0x3, 0x2, 0x2, 0x2, 0x3fd, 
-    0x3fe, 0x7, 0x82, 0x2, 0x2, 0x3fe, 0x3ff, 0x7, 0x97, 0x2, 0x2, 0x3ff, 
-    0x400, 0x5, 0xba, 0x5e, 0x2, 0x400, 0x401, 0x7, 0x9f, 0x2, 0x2, 0x401, 
-    0x409, 0x5, 0xba, 0x5e, 0x2, 0x402, 0x403, 0x7, 0xc2, 0x2, 0x2, 0x403, 
-    0x404, 0x5, 0xba, 0x5e, 0x2, 0x404, 0x405, 0x7, 0x9f, 0x2, 0x2, 0x405, 
-    0x406, 0x5, 0xba, 0x5e, 0x2, 0x406, 0x408, 0x3, 0x2, 0x2, 0x2, 0x407, 
-    0x402, 0x3, 0x2, 0x2, 0x2, 0x408, 0x40b, 0x3, 0x2, 0x2, 0x2, 0x409, 
-    0x407, 0x3, 0x2, 0x2, 0x2, 0x409, 0x40a, 0x3, 0x2, 0x2, 0x2, 0x40a, 
-    0x40d, 0x3, 0x2, 0x2, 0x2, 0x40b, 0x409, 0x3, 0x2, 0x2, 0x2, 0x40c, 
-    0x40e, 0x5, 0x2c, 0x17, 0x2, 0x40d, 0x40c, 0x3, 0x2, 0x2, 0x2, 0x40d, 
-    0x40e, 0x3, 0x2, 0x2, 0x2, 0x40e, 0x63, 0x3, 0x2, 0x2, 0x2, 0x40f, 0x415, 
-    0x5, 0x66, 0x34, 0x2, 0x410, 0x411, 0x7, 0xa7, 0x2, 0x2, 0x411, 0x412, 
-    0x7, 0x6, 0x2, 0x2, 0x412, 0x414, 0x5, 0x66, 0x34, 0x2, 0x413, 0x410, 
-    0x3, 0x2, 0x2, 0x2, 0x414, 0x417, 0x3, 0x2, 0x2, 0x2, 0x415, 0x413, 
-    0x3, 0x2, 0x2, 0x2, 0x415, 0x416, 0x3, 0x2, 0x2, 0x2, 0x416, 0x65, 0x3, 
-    0x2, 0x2, 0x2, 0x417, 0x415, 0x3, 0x2, 0x2, 0x2, 0x418, 0x41e, 0x5, 
-    0x68, 0x35, 0x2, 0x419, 0x41a, 0x7, 0xcd, 0x2, 0x2, 0x41a, 0x41b, 0x5, 
-    0x64, 0x33, 0x2, 0x41b, 0x41c, 0x7, 0xd7, 0x2, 0x2, 0x41c, 0x41e, 0x3, 
-    0x2, 0x2, 0x2, 0x41d, 0x418, 0x3, 0x2, 0x2, 0x2, 0x41d, 0x419, 0x3, 
-    0x2, 0x2, 0x2, 0x41e, 0x67, 0x3, 0x2, 0x2, 0x2, 0x41f, 0x421, 0x5, 0x6a, 
-    0x36, 0x2, 0x420, 0x41f, 0x3, 0x2, 0x2, 0x2, 0x420, 0x421, 0x3, 0x2, 
-    0x2, 0x2, 0x421, 0x422, 0x3, 0x2, 0x2, 0x2, 0x422, 0x424, 0x7, 0x8a, 
-    0x2, 0x2, 0x423, 0x425, 0x7, 0x30, 0x2, 0x2, 0x424, 0x423, 0x3, 0x2, 
-    0x2, 0x2, 0x424, 0x425, 0x3, 0x2, 0x2, 0x2, 0x425, 0x427, 0x3, 0x2, 
-    0x2, 0x2, 0x426, 0x428, 0x5, 0x6c, 0x37, 0x2, 0x427, 0x426, 0x3, 0x2, 
-    0x2, 0x2, 0x427, 0x428, 0x3, 0x2, 0x2, 0x2, 0x428, 0x429, 0x3, 0x2, 
-    0x2, 0x2, 0x429, 0x42b, 0x5, 0xa6, 0x54, 0x2, 0x42a, 0x42c, 0x5, 0x6e, 
-    0x38, 0x2, 0x42b, 0x42a, 0x3, 0x2, 0x2, 0x2, 0x42b, 0x42c, 0x3, 0x2, 
-    0x2, 0x2, 0x42c, 0x42e, 0x3, 0x2, 0x2, 0x2, 0x42d, 0x42f, 0x5, 0x70, 
-    0x39, 0x2, 0x42e, 0x42d, 0x3, 0x2, 0x2, 0x2, 0x42e, 0x42f, 0x3, 0x2, 
-    0x2, 0x2, 0x42f, 0x431, 0x3, 0x2, 0x2, 0x2, 0x430, 0x432, 0x5, 0x72, 
-    0x3a, 0x2, 0x431, 0x430, 0x3, 0x2, 0x2, 0x2, 0x431, 0x432, 0x3, 0x2, 
-    0x2, 0x2, 0x432, 0x434, 0x3, 0x2, 0x2, 0x2, 0x433, 0x435, 0x5, 0x74, 
-    0x3b, 0x2, 0x434, 0x433, 0x3, 0x2, 0x2, 0x2, 0x434, 0x435, 0x3, 0x2, 
-    0x2, 0x2, 0x435, 0x437, 0x3, 0x2, 0x2, 0x2, 0x436, 0x438, 0x5, 0x76, 
-    0x3c, 0x2, 0x437, 0x436, 0x3, 0x2, 0x2, 0x2, 0x437, 0x438, 0x3, 0x2, 
-    0x2, 0x2, 0x438, 0x43b, 0x3, 0x2, 0x2, 0x2, 0x439, 0x43a, 0x7, 0xb3, 
-    0x2, 0x2, 0x43a, 0x43c, 0x9, 0x8, 0x2, 0x2, 0x43b, 0x439, 0x3, 0x2, 
-    0x2, 0x2, 0x43b, 0x43c, 0x3, 0x2, 0x2, 0x2, 0x43c, 0x43f, 0x3, 0x2, 
-    0x2, 0x2, 0x43d, 0x43e, 0x7, 0xb3, 0x2, 0x2, 0x43e, 0x440, 0x7, 0xa1, 
-    0x2, 0x2, 0x43f, 0x43d, 0x3, 0x2, 0x2, 0x2, 0x43f, 0x440, 0x3, 0x2, 
-    0x2, 0x2, 0x440, 0x442, 0x3, 0x2, 0x2, 0x2, 0x441, 0x443, 0x5, 0x78, 
-    0x3d, 0x2, 0x442, 0x441, 0x3, 0x2, 0x2, 0x2, 0x442, 0x443, 0x3, 0x2, 
-    0x2, 0x2, 0x443, 0x445, 0x3, 0x2, 0x2, 0x2, 0x444, 0x446, 0x5, 0x7a, 
-    0x3e, 0x2, 0x445, 0x444, 0x3, 0x2, 0x2, 0x2, 0x445, 0x446, 0x3, 0x2, 
-    0x2, 0x2, 0x446, 0x448, 0x3, 0x2, 0x2, 0x2, 0x447, 0x449, 0x5, 0x7c, 
-    0x3f, 0x2, 0x448, 0x447, 0x3, 0x2, 0x2, 0x2, 0x448, 0x449, 0x3, 0x2, 
-    0x2, 0x2, 0x449, 0x44b, 0x3, 0x2, 0x2, 0x2, 0x44a, 0x44c, 0x5, 0x7e, 
-    0x40, 0x2, 0x44b, 0x44a, 0x3, 0x2, 0x2, 0x2, 0x44b, 0x44c, 0x3, 0x2, 
-    0x2, 0x2, 0x44c, 0x44e, 0x3, 0x2, 0x2, 0x2, 0x44d, 0x44f, 0x5, 0x80, 
-    0x41, 0x2, 0x44e, 0x44d, 0x3, 0x2, 0x2, 0x2, 0x44e, 0x44f, 0x3, 0x2, 
-    0x2, 0x2, 0x44f, 0x69, 0x3, 0x2, 0x2, 0x2, 0x450, 0x451, 0x7, 0xb3, 
-    0x2, 0x2, 0x451, 0x452, 0x5, 0xa6, 0x54, 0x2, 0x452, 0x6b, 0x3, 0x2, 
-    0x2, 0x2, 0x453, 0x454, 0x7, 0xa0, 0x2, 0x2, 0x454, 0x457, 0x7, 0xba, 
-    0x2, 0x2, 0x455, 0x456, 0x7, 0xb3, 0x2, 0x2, 0x456, 0x458, 0x7, 0x9c, 
-    0x2, 0x2, 0x457, 0x455, 0x3, 0x2, 0x2, 0x2, 0x457, 0x458, 0x3, 0x2, 
-    0x2, 0x2, 0x458, 0x6d, 0x3, 0x2, 0x2, 0x2, 0x459, 0x45a, 0x7, 0x42, 
-    0x2, 0x2, 0x45a, 0x45b, 0x5, 0x82, 0x42, 0x2, 0x45b, 0x6f, 0x3, 0x2, 
-    0x2, 0x2, 0x45c, 0x45e, 0x9, 0x9, 0x2, 0x2, 0x45d, 0x45c, 0x3, 0x2, 
-    0x2, 0x2, 0x45d, 0x45e, 0x3, 0x2, 0x2, 0x2, 0x45e, 0x45f, 0x3, 0x2, 
-    0x2, 0x2, 0x45f, 0x460, 0x7, 0xb, 0x2, 0x2, 0x460, 0x461, 0x7, 0x58, 
-    0x2, 0x2, 0x461, 0x462, 0x5, 0xa6, 0x54, 0x2, 0x462, 0x71, 0x3, 0x2, 
-    0x2, 0x2, 0x463, 0x464, 0x7, 0x7c, 0x2, 0x2, 0x464, 0x465, 0x5, 0xaa, 
-    0x56, 0x2, 0x465, 0x73, 0x3, 0x2, 0x2, 0x2, 0x466, 0x467, 0x7, 0xb2, 
-    0x2, 0x2, 0x467, 0x468, 0x5, 0xaa, 0x56, 0x2, 0x468, 0x75, 0x3, 0x2, 
-    0x2, 0x2, 0x469, 0x46a, 0x7, 0x47, 0x2, 0x2, 0x46a, 0x471, 0x7, 0x13, 
-    0x2, 0x2, 0x46b, 0x46c, 0x9, 0x8, 0x2, 0x2, 0x46c, 0x46d, 0x7, 0xcd, 
-    0x2, 0x2, 0x46d, 0x46e, 0x5, 0xa6, 0x54, 0x2, 0x46e, 0x46f, 0x7, 0xd7, 
-    0x2, 0x2, 0x46f, 0x472, 0x3, 0x2, 0x2, 0x2, 0x470, 0x472, 0x5, 0xa6, 
-    0x54, 0x2, 0x471, 0x46b, 0x3, 0x2, 0x2, 0x2, 0x471, 0x470, 0x3, 0x2, 
-    0x2, 0x2, 0x472, 0x77, 0x3, 0x2, 0x2, 0x2, 0x473, 0x474, 0x7, 0x48, 
-    0x2, 0x2, 0x474, 0x475, 0x5, 0xaa, 0x56, 0x2, 0x475, 0x79, 0x3, 0x2, 
-    0x2, 0x2, 0x476, 0x477, 0x7, 0x77, 0x2, 0x2, 0x477, 0x478, 0x7, 0x13, 
-    0x2, 0x2, 0x478, 0x479, 0x5, 0x8e, 0x48, 0x2, 0x479, 0x7b, 0x3, 0x2, 
-    0x2, 0x2, 0x47a, 0x47b, 0x7, 0x61, 0x2, 0x2, 0x47b, 0x47c, 0x5, 0x8c, 
-    0x47, 0x2, 0x47c, 0x47d, 0x7, 0x13, 0x2, 0x2, 0x47d, 0x47e, 0x5, 0xa6, 
-    0x54, 0x2, 0x47e, 0x7d, 0x3, 0x2, 0x2, 0x2, 0x47f, 0x480, 0x7, 0x61, 
-    0x2, 0x2, 0x480, 0x483, 0x5, 0x8c, 0x47, 0x2, 0x481, 0x482, 0x7, 0xb3, 
-    0x2, 0x2, 0x482, 0x484, 0x7, 0x9c, 0x2, 0x2, 0x483, 0x481, 0x3, 0x2, 
-    0x2, 0x2, 0x483, 0x484, 0x3, 0x2, 0x2, 0x2, 0x484, 0x7f, 0x3, 0x2, 0x2, 
-    0x2, 0x485, 0x486, 0x7, 0x8e, 0x2, 0x2, 0x486, 0x487, 0x5, 0x94, 0x4b, 
-    0x2, 0x487, 0x81, 0x3, 0x2, 0x2, 0x2, 0x488, 0x489, 0x8, 0x42, 0x1, 
-    0x2, 0x489, 0x48b, 0x5, 0xb6, 0x5c, 0x2, 0x48a, 0x48c, 0x7, 0x3c, 0x2, 
-    0x2, 0x48b, 0x48a, 0x3, 0x2, 0x2, 0x2, 0x48b, 0x48c, 0x3, 0x2, 0x2, 
-    0x2, 0x48c, 0x48e, 0x3, 0x2, 0x2, 0x2, 0x48d, 0x48f, 0x5, 0x8a, 0x46, 
-    0x2, 0x48e, 0x48d, 0x3, 0x2, 0x2, 0x2, 0x48e, 0x48f, 0x3, 0x2, 0x2, 
-    0x2, 0x48f, 0x495, 0x3, 0x2, 0x2, 0x2, 0x490, 0x491, 0x7, 0xcd, 0x2, 
-    0x2, 0x491, 0x492, 0x5, 0x82, 0x42, 0x2, 0x492, 0x493, 0x7, 0xd7, 0x2, 
-    0x2, 0x493, 0x495, 0x3, 0x2, 0x2, 0x2, 0x494, 0x488, 0x3, 0x2, 0x2, 
-    0x2, 0x494, 0x490, 0x3, 0x2, 0x2, 0x2, 0x495, 0x4a7, 0x3, 0x2, 0x2, 
-    0x2, 0x496, 0x497, 0xc, 0x5, 0x2, 0x2, 0x497, 0x498, 0x5, 0x86, 0x44, 
-    0x2, 0x498, 0x499, 0x5, 0x82, 0x42, 0x6, 0x499, 0x4a6, 0x3, 0x2, 0x2, 
-    0x2, 0x49a, 0x49c, 0xc, 0x6, 0x2, 0x2, 0x49b, 0x49d, 0x9, 0xa, 0x2, 
-    0x2, 0x49c, 0x49b, 0x3, 0x2, 0x2, 0x2, 0x49c, 0x49d, 0x3, 0x2, 0x2, 
-    0x2, 0x49d, 0x49f, 0x3, 0x2, 0x2, 0x2, 0x49e, 0x4a0, 0x5, 0x84, 0x43, 
-    0x2, 0x49f, 0x49e, 0x3, 0x2, 0x2, 0x2, 0x49f, 0x4a0, 0x3, 0x2, 0x2, 
-    0x2, 0x4a0, 0x4a1, 0x3, 0x2, 0x2, 0x2, 0x4a1, 0x4a2, 0x7, 0x58, 0x2, 
-    0x2, 0x4a2, 0x4a3, 0x5, 0x82, 0x42, 0x2, 0x4a3, 0x4a4, 0x5, 0x88, 0x45, 
-    0x2, 0x4a4, 0x4a6, 0x3, 0x2, 0x2, 0x2, 0x4a5, 0x496, 0x3, 0x2, 0x2, 
-    0x2, 0x4a5, 0x49a, 0x3, 0x2, 0x2, 0x2, 0x4a6, 0x4a9, 0x3, 0x2, 0x2, 
-    0x2, 0x4a7, 0x4a5, 0x3, 0x2, 0x2, 0x2, 0x4a7, 0x4a8, 0x3, 0x2, 0x2, 
-    0x2, 0x4a8, 0x83, 0x3, 0x2, 0x2, 0x2, 0x4a9, 0x4a7, 0x3, 0x2, 0x2, 0x2, 
-    0x4aa, 0x4ac, 0x9, 0xb, 0x2, 0x2, 0x4ab, 0x4aa, 0x3, 0x2, 0x2, 0x2, 
-    0x4ab, 0x4ac, 0x3, 0x2, 0x2, 0x2, 0x4ac, 0x4ad, 0x3, 0x2, 0x2, 0x2, 
-    0x4ad, 0x4b4, 0x7, 0x52, 0x2, 0x2, 0x4ae, 0x4b0, 0x7, 0x52, 0x2, 0x2, 
-    0x4af, 0x4b1, 0x9, 0xb, 0x2, 0x2, 0x4b0, 0x4af, 0x3, 0x2, 0x2, 0x2, 
-    0x4b0, 0x4b1, 0x3, 0x2, 0x2, 0x2, 0x4b1, 0x4b4, 0x3, 0x2, 0x2, 0x2, 
-    0x4b2, 0x4b4, 0x9, 0xb, 0x2, 0x2, 0x4b3, 0x4ab, 0x3, 0x2, 0x2, 0x2, 
-    0x4b3, 0x4ae, 0x3, 0x2, 0x2, 0x2, 0x4b3, 0x4b2, 0x3, 0x2, 0x2, 0x2, 
-    0x4b4, 0x4d6, 0x3, 0x2, 0x2, 0x2, 0x4b5, 0x4b7, 0x9, 0xc, 0x2, 0x2, 
-    0x4b6, 0x4b5, 0x3, 0x2, 0x2, 0x2, 0x4b6, 0x4b7, 0x3, 0x2, 0x2, 0x2, 
-    0x4b7, 0x4b8, 0x3, 0x2, 0x2, 0x2, 0x4b8, 0x4ba, 0x9, 0xd, 0x2, 0x2, 
-    0x4b9, 0x4bb, 0x7, 0x78, 0x2, 0x2, 0x4ba, 0x4b9, 0x3, 0x2, 0x2, 0x2, 
-    0x4ba, 0x4bb, 0x3, 0x2, 0x2, 0x2, 0x4bb, 0x4c4, 0x3, 0x2, 0x2, 0x2, 
-    0x4bc, 0x4be, 0x9, 0xd, 0x2, 0x2, 0x4bd, 0x4bf, 0x7, 0x78, 0x2, 0x2, 
-    0x4be, 0x4bd, 0x3, 0x2, 0x2, 0x2, 0x4be, 0x4bf, 0x3, 0x2, 0x2, 0x2, 
-    0x4bf, 0x4c1, 0x3, 0x2, 0x2, 0x2, 0x4c0, 0x4c2, 0x9, 0xc, 0x2, 0x2, 
-    0x4c1, 0x4c0, 0x3, 0x2, 0x2, 0x2, 0x4c1, 0x4c2, 0x3, 0x2, 0x2, 0x2, 
-    0x4c2, 0x4c4, 0x3, 0x2, 0x2, 0x2, 0x4c3, 0x4b6, 0x3, 0x2, 0x2, 0x2, 
-    0x4c3, 0x4bc, 0x3, 0x2, 0x2, 0x2, 0x4c4, 0x4d6, 0x3, 0x2, 0x2, 0x2, 
-    0x4c5, 0x4c7, 0x9, 0xe, 0x2, 0x2, 0x4c6, 0x4c5, 0x3, 0x2, 0x2, 0x2, 
-    0x4c6, 0x4c7, 0x3, 0x2, 0x2, 0x2, 0x4c7, 0x4c8, 0x3, 0x2, 0x2, 0x2, 
-    0x4c8, 0x4ca, 0x7, 0x43, 0x2, 0x2, 0x4c9, 0x4cb, 0x7, 0x78, 0x2, 0x2, 
-    0x4ca, 0x4c9, 0x3, 0x2, 0x2, 0x2, 0x4ca, 0x4cb, 0x3, 0x2, 0x2, 0x2, 
-    0x4cb, 0x4d4, 0x3, 0x2, 0x2, 0x2, 0x4cc, 0x4ce, 0x7, 0x43, 0x2, 0x2, 
-    0x4cd, 0x4cf, 0x7, 0x78, 0x2, 0x2, 0x4ce, 0x4cd, 0x3, 0x2, 0x2, 0x2, 
-    0x4ce, 0x4cf, 0x3, 0x2, 0x2, 0x2, 0x4cf, 0x4d1, 0x3, 0x2, 0x2, 0x2, 
-    0x4d0, 0x4d2, 0x9, 0xe, 0x2, 0x2, 0x4d1, 0x4d0, 0x3, 0x2, 0x2, 0x2, 
-    0x4d1, 0x4d2, 0x3, 0x2, 0x2, 0x2, 0x4d2, 0x4d4, 0x3, 0x2, 0x2, 0x2, 
-    0x4d3, 0x4c6, 0x3, 0x2, 0x2, 0x2, 0x4d3, 0x4cc, 0x3, 0x2, 0x2, 0x2, 
-    0x4d4, 0x4d6, 0x3, 0x2, 0x2, 0x2, 0x4d5, 0x4b3, 0x3, 0x2, 0x2, 0x2, 
-    0x4d5, 0x4c3, 0x3, 0x2, 0x2, 0x2, 0x4d5, 0x4d3, 0x3, 0x2, 0x2, 0x2, 
-    0x4d6, 0x85, 0x3, 0x2, 0x2, 0x2, 0x4d7, 0x4d9, 0x9, 0xa, 0x2, 0x2, 0x4d8, 
-    0x4d7, 0x3, 0x2, 0x2, 0x2, 0x4d8, 0x4d9, 0x3, 0x2, 0x2, 0x2, 0x4d9, 
-    0x4da, 0x3, 0x2, 0x2, 0x2, 0x4da, 0x4db, 0x7, 0x1f, 0x2, 0x2, 0x4db, 
-    0x4de, 0x7, 0x58, 0x2, 0x2, 0x4dc, 0x4de, 0x7, 0xc2, 0x2, 0x2, 0x4dd, 
-    0x4d8, 0x3, 0x2, 0x2, 0x2, 0x4dd, 0x4dc, 0x3, 0x2, 0x2, 0x2, 0x4de, 
-    0x87, 0x3, 0x2, 0x2, 0x2, 0x4df, 0x4e0, 0x7, 0x74, 0x2, 0x2, 0x4e0, 
-    0x4e9, 0x5, 0xa6, 0x54, 0x2, 0x4e1, 0x4e2, 0x7, 0xaa, 0x2, 0x2, 0x4e2, 
-    0x4e3, 0x7, 0xcd, 0x2, 0x2, 0x4e3, 0x4e4, 0x5, 0xa6, 0x54, 0x2, 0x4e4, 
-    0x4e5, 0x7, 0xd7, 0x2, 0x2, 0x4e5, 0x4e9, 0x3, 0x2, 0x2, 0x2, 0x4e6, 
-    0x4e7, 0x7, 0xaa, 0x2, 0x2, 0x4e7, 0x4e9, 0x5, 0xa6, 0x54, 0x2, 0x4e8, 
-    0x4df, 0x3, 0x2, 0x2, 0x2, 0x4e8, 0x4e1, 0x3, 0x2, 0x2, 0x2, 0x4e8, 
-    0x4e6, 0x3, 0x2, 0x2, 0x2, 0x4e9, 0x89, 0x3, 0x2, 0x2, 0x2, 0x4ea, 0x4eb, 
-    0x7, 0x88, 0x2, 0x2, 0x4eb, 0x4ee, 0x5, 0x92, 0x4a, 0x2, 0x4ec, 0x4ed, 
-    0x7, 0x73, 0x2, 0x2, 0x4ed, 0x4ef, 0x5, 0x92, 0x4a, 0x2, 0x4ee, 0x4ec, 
-    0x3, 0x2, 0x2, 0x2, 0x4ee, 0x4ef, 0x3, 0x2, 0x2, 0x2, 0x4ef, 0x8b, 0x3, 
-    0x2, 0x2, 0x2, 0x4f0, 0x4f3, 0x5, 0xaa, 0x56, 0x2, 0x4f1, 0x4f2, 0x9, 
-    0xf, 0x2, 0x2, 0x4f2, 0x4f4, 0x5, 0xaa, 0x56, 0x2, 0x4f3, 0x4f1, 0x3, 
-    0x2, 0x2, 0x2, 0x4f3, 0x4f4, 0x3, 0x2, 0x2, 0x2, 0x4f4, 0x8d, 0x3, 0x2, 
-    0x2, 0x2, 0x4f5, 0x4fa, 0x5, 0x90, 0x49, 0x2, 0x4f6, 0x4f7, 0x7, 0xc2, 
-    0x2, 0x2, 0x4f7, 0x4f9, 0x5, 0x90, 0x49, 0x2, 0x4f8, 0x4f6, 0x3, 0x2, 
-    0x2, 0x2, 0x4f9, 0x4fc, 0x3, 0x2, 0x2, 0x2, 0x4fa, 0x4f8, 0x3, 0x2, 
-    0x2, 0x2, 0x4fa, 0x4fb, 0x3, 0x2, 0x2, 0x2, 0x4fb, 0x8f, 0x3, 0x2, 0x2, 
-    0x2, 0x4fc, 0x4fa, 0x3, 0x2, 0x2, 0x2, 0x4fd, 0x4ff, 0x5, 0xaa, 0x56, 
-    0x2, 0x4fe, 0x500, 0x9, 0x10, 0x2, 0x2, 0x4ff, 0x4fe, 0x3, 0x2, 0x2, 
-    0x2, 0x4ff, 0x500, 0x3, 0x2, 0x2, 0x2, 0x500, 0x503, 0x3, 0x2, 0x2, 
-    0x2, 0x501, 0x502, 0x7, 0x72, 0x2, 0x2, 0x502, 0x504, 0x9, 0x11, 0x2, 
-    0x2, 0x503, 0x501, 0x3, 0x2, 0x2, 0x2, 0x503, 0x504, 0x3, 0x2, 0x2, 
-    0x2, 0x504, 0x507, 0x3, 0x2, 0x2, 0x2, 0x505, 0x506, 0x7, 0x1a, 0x2, 
-    0x2, 0x506, 0x508, 0x7, 0xbc, 0x2, 0x2, 0x507, 0x505, 0x3, 0x2, 0x2, 
-    0x2, 0x507, 0x508, 0x3, 0x2, 0x2, 0x2, 0x508, 0x91, 0x3, 0x2, 0x2, 0x2, 
-    0x509, 0x50c, 0x5, 0xc4, 0x63, 0x2, 0x50a, 0x50b, 0x7, 0xd9, 0x2, 0x2, 
-    0x50b, 0x50d, 0x5, 0xc4, 0x63, 0x2, 0x50c, 0x50a, 0x3, 0x2, 0x2, 0x2, 
-    0x50c, 0x50d, 0x3, 0x2, 0x2, 0x2, 0x50d, 0x93, 0x3, 0x2, 0x2, 0x2, 0x50e, 
-    0x513, 0x5, 0x96, 0x4c, 0x2, 0x50f, 0x510, 0x7, 0xc2, 0x2, 0x2, 0x510, 
-    0x512, 0x5, 0x96, 0x4c, 0x2, 0x511, 0x50f, 0x3, 0x2, 0x2, 0x2, 0x512, 
-    0x515, 0x3, 0x2, 0x2, 0x2, 0x513, 0x511, 0x3, 0x2, 0x2, 0x2, 0x513, 
-    0x514, 0x3, 0x2, 0x2, 0x2, 0x514, 0x95, 0x3, 0x2, 0x2, 0x2, 0x515, 0x513, 
-    0x3, 0x2, 0x2, 0x2, 0x516, 0x517, 0x5, 0xd0, 0x69, 0x2, 0x517, 0x518, 
-    0x7, 0xc7, 0x2, 0x2, 0x518, 0x519, 0x5, 0xc6, 0x64, 0x2, 0x519, 0x97, 
-    0x3, 0x2, 0x2, 0x2, 0x51a, 0x51b, 0x7, 0x8d, 0x2, 0x2, 0x51b, 0x51c, 
-    0x5, 0x94, 0x4b, 0x2, 0x51c, 0x99, 0x3, 0x2, 0x2, 0x2, 0x51d, 0x51e, 
-    0x7, 0x8f, 0x2, 0x2, 0x51e, 0x51f, 0x7, 0x1e, 0x2, 0x2, 0x51f, 0x520, 
-    0x7, 0x21, 0x2, 0x2, 0x520, 0x548, 0x5, 0xc0, 0x61, 0x2, 0x521, 0x522, 
-    0x7, 0x8f, 0x2, 0x2, 0x522, 0x523, 0x7, 0x1e, 0x2, 0x2, 0x523, 0x524, 
-    0x7, 0x2e, 0x2, 0x2, 0x524, 0x548, 0x5, 0xba, 0x5e, 0x2, 0x525, 0x526, 
-    0x7, 0x8f, 0x2, 0x2, 0x526, 0x528, 0x7, 0x1e, 0x2, 0x2, 0x527, 0x529, 
-    0x7, 0x99, 0x2, 0x2, 0x528, 0x527, 0x3, 0x2, 0x2, 0x2, 0x528, 0x529, 
-    0x3, 0x2, 0x2, 0x2, 0x529, 0x52b, 0x3, 0x2, 0x2, 0x2, 0x52a, 0x52c, 
-    0x7, 0x97, 0x2, 0x2, 0x52b, 0x52a, 0x3, 0x2, 0x2, 0x2, 0x52b, 0x52c, 
-    0x3, 0x2, 0x2, 0x2, 0x52c, 0x52d, 0x3, 0x2, 0x2, 0x2, 0x52d, 0x548, 
-    0x5, 0xba, 0x5e, 0x2, 0x52e, 0x52f, 0x7, 0x8f, 0x2, 0x2, 0x52f, 0x548, 
-    0x7, 0x22, 0x2, 0x2, 0x530, 0x531, 0x7, 0x8f, 0x2, 0x2, 0x531, 0x534, 
-    0x7, 0x2d, 0x2, 0x2, 0x532, 0x533, 0x7, 0x42, 0x2, 0x2, 0x533, 0x535, 
-    0x5, 0xc0, 0x61, 0x2, 0x534, 0x532, 0x3, 0x2, 0x2, 0x2, 0x534, 0x535, 
-    0x3, 0x2, 0x2, 0x2, 0x535, 0x548, 0x3, 0x2, 0x2, 0x2, 0x536, 0x538, 
-    0x7, 0x8f, 0x2, 0x2, 0x537, 0x539, 0x7, 0x99, 0x2, 0x2, 0x538, 0x537, 
-    0x3, 0x2, 0x2, 0x2, 0x538, 0x539, 0x3, 0x2, 0x2, 0x2, 0x539, 0x53a, 
-    0x3, 0x2, 0x2, 0x2, 0x53a, 0x53d, 0x7, 0x98, 0x2, 0x2, 0x53b, 0x53c, 
-    0x9, 0x12, 0x2, 0x2, 0x53c, 0x53e, 0x5, 0xc0, 0x61, 0x2, 0x53d, 0x53b, 
-    0x3, 0x2, 0x2, 0x2, 0x53d, 0x53e, 0x3, 0x2, 0x2, 0x2, 0x53e, 0x542, 
-    0x3, 0x2, 0x2, 0x2, 0x53f, 0x540, 0x7, 0x60, 0x2, 0x2, 0x540, 0x543, 
-    0x7, 0xbc, 0x2, 0x2, 0x541, 0x543, 0x5, 0x74, 0x3b, 0x2, 0x542, 0x53f, 
-    0x3, 0x2, 0x2, 0x2, 0x542, 0x541, 0x3, 0x2, 0x2, 0x2, 0x542, 0x543, 
-    0x3, 0x2, 0x2, 0x2, 0x543, 0x545, 0x3, 0x2, 0x2, 0x2, 0x544, 0x546, 
-    0x5, 0x7e, 0x40, 0x2, 0x545, 0x544, 0x3, 0x2, 0x2, 0x2, 0x545, 0x546, 
-    0x3, 0x2, 0x2, 0x2, 0x546, 0x548, 0x3, 0x2, 0x2, 0x2, 0x547, 0x51d, 
-    0x3, 0x2, 0x2, 0x2, 0x547, 0x521, 0x3, 0x2, 0x2, 0x2, 0x547, 0x525, 
-    0x3, 0x2, 0x2, 0x2, 0x547, 0x52e, 0x3, 0x2, 0x2, 0x2, 0x547, 0x530, 
-    0x3, 0x2, 0x2, 0x2, 0x547, 0x536, 0x3, 0x2, 0x2, 0x2, 0x548, 0x9b, 0x3, 
-    0x2, 0x2, 0x2, 0x549, 0x54a, 0x7, 0x96, 0x2, 0x2, 0x54a, 0x54b, 0x7, 
-    0x3e, 0x2, 0x2, 0x54b, 0x54c, 0x7, 0x31, 0x2, 0x2, 0x54c, 0x56c, 0x5, 
-    0xba, 0x5e, 0x2, 0x54d, 0x54e, 0x7, 0x96, 0x2, 0x2, 0x54e, 0x54f, 0x7, 
-    0x3e, 0x2, 0x2, 0x54f, 0x56c, 0x7, 0x64, 0x2, 0x2, 0x550, 0x551, 0x7, 
-    0x96, 0x2, 0x2, 0x551, 0x552, 0x7, 0x80, 0x2, 0x2, 0x552, 0x56c, 0x7, 
-    0x2d, 0x2, 0x2, 0x553, 0x554, 0x7, 0x96, 0x2, 0x2, 0x554, 0x555, 0x7, 
-    0x80, 0x2, 0x2, 0x555, 0x556, 0x7, 0x2e, 0x2, 0x2, 0x556, 0x56c, 0x5, 
-    0xba, 0x5e, 0x2, 0x557, 0x558, 0x7, 0x96, 0x2, 0x2, 0x558, 0x560, 0x9, 
-    0x13, 0x2, 0x2, 0x559, 0x55a, 0x7, 0x31, 0x2, 0x2, 0x55a, 0x561, 0x7, 
-    0x8c, 0x2, 0x2, 0x55b, 0x561, 0x7, 0x3b, 0x2, 0x2, 0x55c, 0x55e, 0x7, 
-    0xa5, 0x2, 0x2, 0x55d, 0x55c, 0x3, 0x2, 0x2, 0x2, 0x55d, 0x55e, 0x3, 
-    0x2, 0x2, 0x2, 0x55e, 0x55f, 0x3, 0x2, 0x2, 0x2, 0x55f, 0x561, 0x7, 
-    0x67, 0x2, 0x2, 0x560, 0x559, 0x3, 0x2, 0x2, 0x2, 0x560, 0x55b, 0x3, 
-    0x2, 0x2, 0x2, 0x560, 0x55d, 0x3, 0x2, 0x2, 0x2, 0x561, 0x562, 0x3, 
-    0x2, 0x2, 0x2, 0x562, 0x56c, 0x5, 0xba, 0x5e, 0x2, 0x563, 0x564, 0x7, 
-    0x96, 0x2, 0x2, 0x564, 0x565, 0x9, 0x13, 0x2, 0x2, 0x565, 0x566, 0x7, 
-    0x85, 0x2, 0x2, 0x566, 0x56c, 0x7, 0x8c, 0x2, 0x2, 0x567, 0x568, 0x7, 
-    0x96, 0x2, 0x2, 0x568, 0x569, 0x7, 0x94, 0x2, 0x2, 0x569, 0x56a, 0x7, 
-    0x84, 0x2, 0x2, 0x56a, 0x56c, 0x5, 0xba, 0x5e, 0x2, 0x56b, 0x549, 0x3, 
-    0x2, 0x2, 0x2, 0x56b, 0x54d, 0x3, 0x2, 0x2, 0x2, 0x56b, 0x550, 0x3, 
-    0x2, 0x2, 0x2, 0x56b, 0x553, 0x3, 0x2, 0x2, 0x2, 0x56b, 0x557, 0x3, 
-    0x2, 0x2, 0x2, 0x56b, 0x563, 0x3, 0x2, 0x2, 0x2, 0x56b, 0x567, 0x3, 
-    0x2, 0x2, 0x2, 0x56c, 0x9d, 0x3, 0x2, 0x2, 0x2, 0x56d, 0x56f, 0x7, 0xa4, 
-    0x2, 0x2, 0x56e, 0x570, 0x7, 0x99, 0x2, 0x2, 0x56f, 0x56e, 0x3, 0x2, 
-    0x2, 0x2, 0x56f, 0x570, 0x3, 0x2, 0x2, 0x2, 0x570, 0x572, 0x3, 0x2, 
-    0x2, 0x2, 0x571, 0x573, 0x7, 0x97, 0x2, 0x2, 0x572, 0x571, 0x3, 0x2, 
-    0x2, 0x2, 0x572, 0x573, 0x3, 0x2, 0x2, 0x2, 0x573, 0x576, 0x3, 0x2, 
-    0x2, 0x2, 0x574, 0x575, 0x7, 0x4c, 0x2, 0x2, 0x575, 0x577, 0x7, 0x37, 
-    0x2, 0x2, 0x576, 0x574, 0x3, 0x2, 0x2, 0x2, 0x576, 0x577, 0x3, 0x2, 
-    0x2, 0x2, 0x577, 0x578, 0x3, 0x2, 0x2, 0x2, 0x578, 0x57a, 0x5, 0xba, 
-    0x5e, 0x2, 0x579, 0x57b, 0x5, 0x2c, 0x17, 0x2, 0x57a, 0x579, 0x3, 0x2, 
-    0x2, 0x2, 0x57a, 0x57b, 0x3, 0x2, 0x2, 0x2, 0x57b, 0x9f, 0x3, 0x2, 0x2, 
-    0x2, 0x57c, 0x57d, 0x7, 0xa9, 0x2, 0x2, 0x57d, 0x57e, 0x5, 0xc0, 0x61, 
-    0x2, 0x57e, 0xa1, 0x3, 0x2, 0x2, 0x2, 0x57f, 0x580, 0x7, 0xaf, 0x2, 
-    0x2, 0x580, 0x582, 0x5, 0xba, 0x5e, 0x2, 0x581, 0x583, 0x7, 0x36, 0x2, 
-    0x2, 0x582, 0x581, 0x3, 0x2, 0x2, 0x2, 0x582, 0x583, 0x3, 0x2, 0x2, 
-    0x2, 0x583, 0x586, 0x3, 0x2, 0x2, 0x2, 0x584, 0x585, 0x7, 0x61, 0x2, 
-    0x2, 0x585, 0x587, 0x7, 0xba, 0x2, 0x2, 0x586, 0x584, 0x3, 0x2, 0x2, 
-    0x2, 0x586, 0x587, 0x3, 0x2, 0x2, 0x2, 0x587, 0xa3, 0x3, 0x2, 0x2, 0x2, 
-    0x588, 0x5b8, 0x5, 0xd0, 0x69, 0x2, 0x589, 0x58a, 0x5, 0xd0, 0x69, 0x2, 
-    0x58a, 0x58b, 0x7, 0xcd, 0x2, 0x2, 0x58b, 0x58c, 0x5, 0xd0, 0x69, 0x2, 
-    0x58c, 0x593, 0x5, 0xa4, 0x53, 0x2, 0x58d, 0x58e, 0x7, 0xc2, 0x2, 0x2, 
-    0x58e, 0x58f, 0x5, 0xd0, 0x69, 0x2, 0x58f, 0x590, 0x5, 0xa4, 0x53, 0x2, 
-    0x590, 0x592, 0x3, 0x2, 0x2, 0x2, 0x591, 0x58d, 0x3, 0x2, 0x2, 0x2, 
-    0x592, 0x595, 0x3, 0x2, 0x2, 0x2, 0x593, 0x591, 0x3, 0x2, 0x2, 0x2, 
-    0x593, 0x594, 0x3, 0x2, 0x2, 0x2, 0x594, 0x596, 0x3, 0x2, 0x2, 0x2, 
-    0x595, 0x593, 0x3, 0x2, 0x2, 0x2, 0x596, 0x597, 0x7, 0xd7, 0x2, 0x2, 
-    0x597, 0x5b8, 0x3, 0x2, 0x2, 0x2, 0x598, 0x599, 0x5, 0xd0, 0x69, 0x2, 
-    0x599, 0x59a, 0x7, 0xcd, 0x2, 0x2, 0x59a, 0x59f, 0x5, 0xd4, 0x6b, 0x2, 
-    0x59b, 0x59c, 0x7, 0xc2, 0x2, 0x2, 0x59c, 0x59e, 0x5, 0xd4, 0x6b, 0x2, 
-    0x59d, 0x59b, 0x3, 0x2, 0x2, 0x2, 0x59e, 0x5a1, 0x3, 0x2, 0x2, 0x2, 
-    0x59f, 0x59d, 0x3, 0x2, 0x2, 0x2, 0x59f, 0x5a0, 0x3, 0x2, 0x2, 0x2, 
-    0x5a0, 0x5a2, 0x3, 0x2, 0x2, 0x2, 0x5a1, 0x59f, 0x3, 0x2, 0x2, 0x2, 
-    0x5a2, 0x5a3, 0x7, 0xd7, 0x2, 0x2, 0x5a3, 0x5b8, 0x3, 0x2, 0x2, 0x2, 
-    0x5a4, 0x5a5, 0x5, 0xd0, 0x69, 0x2, 0x5a5, 0x5a6, 0x7, 0xcd, 0x2, 0x2, 
-    0x5a6, 0x5ab, 0x5, 0xa4, 0x53, 0x2, 0x5a7, 0x5a8, 0x7, 0xc2, 0x2, 0x2, 
-    0x5a8, 0x5aa, 0x5, 0xa4, 0x53, 0x2, 0x5a9, 0x5a7, 0x3, 0x2, 0x2, 0x2, 
-    0x5aa, 0x5ad, 0x3, 0x2, 0x2, 0x2, 0x5ab, 0x5a9, 0x3, 0x2, 0x2, 0x2, 
-    0x5ab, 0x5ac, 0x3, 0x2, 0x2, 0x2, 0x5ac, 0x5ae, 0x3, 0x2, 0x2, 0x2, 
-    0x5ad, 0x5ab, 0x3, 0x2, 0x2, 0x2, 0x5ae, 0x5af, 0x7, 0xd7, 0x2, 0x2, 
-    0x5af, 0x5b8, 0x3, 0x2, 0x2, 0x2, 0x5b0, 0x5b1, 0x5, 0xd0, 0x69, 0x2, 
-    0x5b1, 0x5b3, 0x7, 0xcd, 0x2, 0x2, 0x5b2, 0x5b4, 0x5, 0xa6, 0x54, 0x2, 
-    0x5b3, 0x5b2, 0x3, 0x2, 0x2, 0x2, 0x5b3, 0x5b4, 0x3, 0x2, 0x2, 0x2, 
-    0x5b4, 0x5b5, 0x3, 0x2, 0x2, 0x2, 0x5b5, 0x5b6, 0x7, 0xd7, 0x2, 0x2, 
-    0x5b6, 0x5b8, 0x3, 0x2, 0x2, 0x2, 0x5b7, 0x588, 0x3, 0x2, 0x2, 0x2, 
-    0x5b7, 0x589, 0x3, 0x2, 0x2, 0x2, 0x5b7, 0x598, 0x3, 0x2, 0x2, 0x2, 
-    0x5b7, 0x5a4, 0x3, 0x2, 0x2, 0x2, 0x5b7, 0x5b0, 0x3, 0x2, 0x2, 0x2, 
-    0x5b8, 0xa5, 0x3, 0x2, 0x2, 0x2, 0x5b9, 0x5be, 0x5, 0xa8, 0x55, 0x2, 
-    0x5ba, 0x5bb, 0x7, 0xc2, 0x2, 0x2, 0x5bb, 0x5bd, 0x5, 0xa8, 0x55, 0x2, 
-    0x5bc, 0x5ba, 0x3, 0x2, 0x2, 0x2, 0x5bd, 0x5c0, 0x3, 0x2, 0x2, 0x2, 
-    0x5be, 0x5bc, 0x3, 0x2, 0x2, 0x2, 0x5be, 0x5bf, 0x3, 0x2, 0x2, 0x2, 
-    0x5bf, 0xa7, 0x3, 0x2, 0x2, 0x2, 0x5c0, 0x5be, 0x3, 0x2, 0x2, 0x2, 0x5c1, 
-    0x5c2, 0x5, 0xba, 0x5e, 0x2, 0x5c2, 0x5c3, 0x7, 0xc5, 0x2, 0x2, 0x5c3, 
-    0x5c5, 0x3, 0x2, 0x2, 0x2, 0x5c4, 0x5c1, 0x3, 0x2, 0x2, 0x2, 0x5c4, 
-    0x5c5, 0x3, 0x2, 0x2, 0x2, 0x5c5, 0x5c6, 0x3, 0x2, 0x2, 0x2, 0x5c6, 
-    0x5cd, 0x7, 0xbe, 0x2, 0x2, 0x5c7, 0x5c8, 0x7, 0xcd, 0x2, 0x2, 0x5c8, 
-    0x5c9, 0x5, 0x64, 0x33, 0x2, 0x5c9, 0x5ca, 0x7, 0xd7, 0x2, 0x2, 0x5ca, 
-    0x5cd, 0x3, 0x2, 0x2, 0x2, 0x5cb, 0x5cd, 0x5, 0xaa, 0x56, 0x2, 0x5cc, 
-    0x5c4, 0x3, 0x2, 0x2, 0x2, 0x5cc, 0x5c7, 0x3, 0x2, 0x2, 0x2, 0x5cc, 
-    0x5cb, 0x3, 0x2, 0x2, 0x2, 0x5cd, 0xa9, 0x3, 0x2, 0x2, 0x2, 0x5ce, 0x5cf, 
-    0x8, 0x56, 0x1, 0x2, 0x5cf, 0x5d1, 0x7, 0x14, 0x2, 0x2, 0x5d0, 0x5d2, 
-    0x5, 0xaa, 0x56, 0x2, 0x5d1, 0x5d0, 0x3, 0x2, 0x2, 0x2, 0x5d1, 0x5d2, 
-    0x3, 0x2, 0x2, 0x2, 0x5d2, 0x5d8, 0x3, 0x2, 0x2, 0x2, 0x5d3, 0x5d4, 
-    0x7, 0xb1, 0x2, 0x2, 0x5d4, 0x5d5, 0x5, 0xaa, 0x56, 0x2, 0x5d5, 0x5d6, 
-    0x7, 0x9b, 0x2, 0x2, 0x5d6, 0x5d7, 0x5, 0xaa, 0x56, 0x2, 0x5d7, 0x5d9, 
-    0x3, 0x2, 0x2, 0x2, 0x5d8, 0x5d3, 0x3, 0x2, 0x2, 0x2, 0x5d9, 0x5da, 
-    0x3, 0x2, 0x2, 0x2, 0x5da, 0x5d8, 0x3, 0x2, 0x2, 0x2, 0x5da, 0x5db, 
-    0x3, 0x2, 0x2, 0x2, 0x5db, 0x5de, 0x3, 0x2, 0x2, 0x2, 0x5dc, 0x5dd, 
-    0x7, 0x33, 0x2, 0x2, 0x5dd, 0x5df, 0x5, 0xaa, 0x56, 0x2, 0x5de, 0x5dc, 
-    0x3, 0x2, 0x2, 0x2, 0x5de, 0x5df, 0x3, 0x2, 0x2, 0x2, 0x5df, 0x5e0, 
-    0x3, 0x2, 0x2, 0x2, 0x5e0, 0x5e1, 0x7, 0x34, 0x2, 0x2, 0x5e1, 0x63a, 
-    0x3, 0x2, 0x2, 0x2, 0x5e2, 0x5e3, 0x7, 0x15, 0x2, 0x2, 0x5e3, 0x5e4, 
-    0x7, 0xcd, 0x2, 0x2, 0x5e4, 0x5e5, 0x5, 0xaa, 0x56, 0x2, 0x5e5, 0x5e6, 
-    0x7, 0xc, 0x2, 0x2, 0x5e6, 0x5e7, 0x5, 0xa4, 0x53, 0x2, 0x5e7, 0x5e8, 
-    0x7, 0xd7, 0x2, 0x2, 0x5e8, 0x63a, 0x3, 0x2, 0x2, 0x2, 0x5e9, 0x5ea, 
-    0x7, 0x23, 0x2, 0x2, 0x5ea, 0x63a, 0x7, 0xbc, 0x2, 0x2, 0x5eb, 0x5ec, 
-    0x7, 0x3a, 0x2, 0x2, 0x5ec, 0x5ed, 0x7, 0xcd, 0x2, 0x2, 0x5ed, 0x5ee, 
-    0x5, 0xc8, 0x65, 0x2, 0x5ee, 0x5ef, 0x7, 0x42, 0x2, 0x2, 0x5ef, 0x5f0, 
-    0x5, 0xaa, 0x56, 0x2, 0x5f0, 0x5f1, 0x7, 0xd7, 0x2, 0x2, 0x5f1, 0x63a, 
-    0x3, 0x2, 0x2, 0x2, 0x5f2, 0x5f3, 0x7, 0x54, 0x2, 0x2, 0x5f3, 0x5f4, 
-    0x5, 0xaa, 0x56, 0x2, 0x5f4, 0x5f5, 0x5, 0xc8, 0x65, 0x2, 0x5f5, 0x63a, 
-    0x3, 0x2, 0x2, 0x2, 0x5f6, 0x5f7, 0x7, 0x93, 0x2, 0x2, 0x5f7, 0x5f8, 
-    0x7, 0xcd, 0x2, 0x2, 0x5f8, 0x5f9, 0x5, 0xaa, 0x56, 0x2, 0x5f9, 0x5fa, 
-    0x7, 0x42, 0x2, 0x2, 0x5fa, 0x5fd, 0x5, 0xaa, 0x56, 0x2, 0x5fb, 0x5fc, 
-    0x7, 0x3f, 0x2, 0x2, 0x5fc, 0x5fe, 0x5, 0xaa, 0x56, 0x2, 0x5fd, 0x5fb, 
-    0x3, 0x2, 0x2, 0x2, 0x5fd, 0x5fe, 0x3, 0x2, 0x2, 0x2, 0x5fe, 0x5ff, 
-    0x3, 0x2, 0x2, 0x2, 0x5ff, 0x600, 0x7, 0xd7, 0x2, 0x2, 0x600, 0x63a, 
-    0x3, 0x2, 0x2, 0x2, 0x601, 0x602, 0x7, 0x9e, 0x2, 0x2, 0x602, 0x63a, 
-    0x7, 0xbc, 0x2, 0x2, 0x603, 0x604, 0x7, 0xa3, 0x2, 0x2, 0x604, 0x605, 
-    0x7, 0xcd, 0x2, 0x2, 0x605, 0x606, 0x9, 0x14, 0x2, 0x2, 0x606, 0x607, 
-    0x7, 0xbc, 0x2, 0x2, 0x607, 0x608, 0x7, 0x42, 0x2, 0x2, 0x608, 0x609, 
-    0x5, 0xaa, 0x56, 0x2, 0x609, 0x60a, 0x7, 0xd7, 0x2, 0x2, 0x60a, 0x63a, 
-    0x3, 0x2, 0x2, 0x2, 0x60b, 0x611, 0x5, 0xd0, 0x69, 0x2, 0x60c, 0x60e, 
-    0x7, 0xcd, 0x2, 0x2, 0x60d, 0x60f, 0x5, 0xa6, 0x54, 0x2, 0x60e, 0x60d, 
-    0x3, 0x2, 0x2, 0x2, 0x60e, 0x60f, 0x3, 0x2, 0x2, 0x2, 0x60f, 0x610, 
-    0x3, 0x2, 0x2, 0x2, 0x610, 0x612, 0x7, 0xd7, 0x2, 0x2, 0x611, 0x60c, 
-    0x3, 0x2, 0x2, 0x2, 0x611, 0x612, 0x3, 0x2, 0x2, 0x2, 0x612, 0x613, 
-    0x3, 0x2, 0x2, 0x2, 0x613, 0x615, 0x7, 0xcd, 0x2, 0x2, 0x614, 0x616, 
-    0x7, 0x30, 0x2, 0x2, 0x615, 0x614, 0x3, 0x2, 0x2, 0x2, 0x615, 0x616, 
-    0x3, 0x2, 0x2, 0x2, 0x616, 0x618, 0x3, 0x2, 0x2, 0x2, 0x617, 0x619, 
-    0x5, 0xac, 0x57, 0x2, 0x618, 0x617, 0x3, 0x2, 0x2, 0x2, 0x618, 0x619, 
-    0x3, 0x2, 0x2, 0x2, 0x619, 0x61a, 0x3, 0x2, 0x2, 0x2, 0x61a, 0x61b, 
-    0x7, 0xd7, 0x2, 0x2, 0x61b, 0x63a, 0x3, 0x2, 0x2, 0x2, 0x61c, 0x63a, 
-    0x5, 0xc6, 0x64, 0x2, 0x61d, 0x61e, 0x7, 0xc4, 0x2, 0x2, 0x61e, 0x63a, 
-    0x5, 0xaa, 0x56, 0x13, 0x61f, 0x620, 0x7, 0x70, 0x2, 0x2, 0x620, 0x63a, 
-    0x5, 0xaa, 0x56, 0xe, 0x621, 0x622, 0x5, 0xba, 0x5e, 0x2, 0x622, 0x623, 
-    0x7, 0xc5, 0x2, 0x2, 0x623, 0x625, 0x3, 0x2, 0x2, 0x2, 0x624, 0x621, 
-    0x3, 0x2, 0x2, 0x2, 0x624, 0x625, 0x3, 0x2, 0x2, 0x2, 0x625, 0x626, 
-    0x3, 0x2, 0x2, 0x2, 0x626, 0x63a, 0x7, 0xbe, 0x2, 0x2, 0x627, 0x628, 
-    0x7, 0xcd, 0x2, 0x2, 0x628, 0x629, 0x5, 0x64, 0x33, 0x2, 0x629, 0x62a, 
-    0x7, 0xd7, 0x2, 0x2, 0x62a, 0x63a, 0x3, 0x2, 0x2, 0x2, 0x62b, 0x62c, 
-    0x7, 0xcd, 0x2, 0x2, 0x62c, 0x62d, 0x5, 0xaa, 0x56, 0x2, 0x62d, 0x62e, 
-    0x7, 0xd7, 0x2, 0x2, 0x62e, 0x63a, 0x3, 0x2, 0x2, 0x2, 0x62f, 0x630, 
-    0x7, 0xcd, 0x2, 0x2, 0x630, 0x631, 0x5, 0xa6, 0x54, 0x2, 0x631, 0x632, 
-    0x7, 0xd7, 0x2, 0x2, 0x632, 0x63a, 0x3, 0x2, 0x2, 0x2, 0x633, 0x635, 
-    0x7, 0xcb, 0x2, 0x2, 0x634, 0x636, 0x5, 0xa6, 0x54, 0x2, 0x635, 0x634, 
-    0x3, 0x2, 0x2, 0x2, 0x635, 0x636, 0x3, 0x2, 0x2, 0x2, 0x636, 0x637, 
-    0x3, 0x2, 0x2, 0x2, 0x637, 0x63a, 0x7, 0xd6, 0x2, 0x2, 0x638, 0x63a, 
-    0x5, 0xb2, 0x5a, 0x2, 0x639, 0x5ce, 0x3, 0x2, 0x2, 0x2, 0x639, 0x5e2, 
-    0x3, 0x2, 0x2, 0x2, 0x639, 0x5e9, 0x3, 0x2, 0x2, 0x2, 0x639, 0x5eb, 
-    0x3, 0x2, 0x2, 0x2, 0x639, 0x5f2, 0x3, 0x2, 0x2, 0x2, 0x639, 0x5f6, 
-    0x3, 0x2, 0x2, 0x2, 0x639, 0x601, 0x3, 0x2, 0x2, 0x2, 0x639, 0x603, 
-    0x3, 0x2, 0x2, 0x2, 0x639, 0x60b, 0x3, 0x2, 0x2, 0x2, 0x639, 0x61c, 
-    0x3, 0x2, 0x2, 0x2, 0x639, 0x61d, 0x3, 0x2, 0x2, 0x2, 0x639, 0x61f, 
-    0x3, 0x2, 0x2, 0x2, 0x639, 0x624, 0x3, 0x2, 0x2, 0x2, 0x639, 0x627, 
-    0x3, 0x2, 0x2, 0x2, 0x639, 0x62b, 0x3, 0x2, 0x2, 0x2, 0x639, 0x62f, 
-    0x3, 0x2, 0x2, 0x2, 0x639, 0x633, 0x3, 0x2, 0x2, 0x2, 0x639, 0x638, 
-    0x3, 0x2, 0x2, 0x2, 0x63a, 0x682, 0x3, 0x2, 0x2, 0x2, 0x63b, 0x63c, 
-    0xc, 0x12, 0x2, 0x2, 0x63c, 0x63d, 0x9, 0x15, 0x2, 0x2, 0x63d, 0x681, 
-    0x5, 0xaa, 0x56, 0x13, 0x63e, 0x63f, 0xc, 0x11, 0x2, 0x2, 0x63f, 0x640, 
-    0x9, 0x16, 0x2, 0x2, 0x640, 0x681, 0x5, 0xaa, 0x56, 0x12, 0x641, 0x654, 
-    0xc, 0x10, 0x2, 0x2, 0x642, 0x655, 0x7, 0xc6, 0x2, 0x2, 0x643, 0x655, 
-    0x7, 0xc7, 0x2, 0x2, 0x644, 0x655, 0x7, 0xcf, 0x2, 0x2, 0x645, 0x655, 
-    0x7, 0xcc, 0x2, 0x2, 0x646, 0x655, 0x7, 0xc8, 0x2, 0x2, 0x647, 0x655, 
-    0x7, 0xce, 0x2, 0x2, 0x648, 0x655, 0x7, 0xc9, 0x2, 0x2, 0x649, 0x64b, 
-    0x7, 0x45, 0x2, 0x2, 0x64a, 0x649, 0x3, 0x2, 0x2, 0x2, 0x64a, 0x64b, 
-    0x3, 0x2, 0x2, 0x2, 0x64b, 0x64d, 0x3, 0x2, 0x2, 0x2, 0x64c, 0x64e, 
-    0x7, 0x70, 0x2, 0x2, 0x64d, 0x64c, 0x3, 0x2, 0x2, 0x2, 0x64d, 0x64e, 
-    0x3, 0x2, 0x2, 0x2, 0x64e, 0x64f, 0x3, 0x2, 0x2, 0x2, 0x64f, 0x655, 
-    0x7, 0x4e, 0x2, 0x2, 0x650, 0x652, 0x7, 0x70, 0x2, 0x2, 0x651, 0x650, 
-    0x3, 0x2, 0x2, 0x2, 0x651, 0x652, 0x3, 0x2, 0x2, 0x2, 0x652, 0x653, 
-    0x3, 0x2, 0x2, 0x2, 0x653, 0x655, 0x9, 0x17, 0x2, 0x2, 0x654, 0x642, 
-    0x3, 0x2, 0x2, 0x2, 0x654, 0x643, 0x3, 0x2, 0x2, 0x2, 0x654, 0x644, 
-    0x3, 0x2, 0x2, 0x2, 0x654, 0x645, 0x3, 0x2, 0x2, 0x2, 0x654, 0x646, 
-    0x3, 0x2, 0x2, 0x2, 0x654, 0x647, 0x3, 0x2, 0x2, 0x2, 0x654, 0x648, 
-    0x3, 0x2, 0x2, 0x2, 0x654, 0x64a, 0x3, 0x2, 0x2, 0x2, 0x654, 0x651, 
-    0x3, 0x2, 0x2, 0x2, 0x655, 0x656, 0x3, 0x2, 0x2, 0x2, 0x656, 0x681, 
-    0x5, 0xaa, 0x56, 0x11, 0x657, 0x658, 0xc, 0xd, 0x2, 0x2, 0x658, 0x659, 
-    0x7, 0x8, 0x2, 0x2, 0x659, 0x681, 0x5, 0xaa, 0x56, 0xe, 0x65a, 0x65b, 
-    0xc, 0xc, 0x2, 0x2, 0x65b, 0x65c, 0x7, 0x76, 0x2, 0x2, 0x65c, 0x681, 
-    0x5, 0xaa, 0x56, 0xd, 0x65d, 0x65f, 0xc, 0xb, 0x2, 0x2, 0x65e, 0x660, 
-    0x7, 0x70, 0x2, 0x2, 0x65f, 0x65e, 0x3, 0x2, 0x2, 0x2, 0x65f, 0x660, 
-    0x3, 0x2, 0x2, 0x2, 0x660, 0x661, 0x3, 0x2, 0x2, 0x2, 0x661, 0x662, 
-    0x7, 0x11, 0x2, 0x2, 0x662, 0x663, 0x5, 0xaa, 0x56, 0x2, 0x663, 0x664, 
-    0x7, 0x8, 0x2, 0x2, 0x664, 0x665, 0x5, 0xaa, 0x56, 0xc, 0x665, 0x681, 
-    0x3, 0x2, 0x2, 0x2, 0x666, 0x667, 0xc, 0xa, 0x2, 0x2, 0x667, 0x668, 
-    0x7, 0xd2, 0x2, 0x2, 0x668, 0x669, 0x5, 0xaa, 0x56, 0x2, 0x669, 0x66a, 
-    0x7, 0xc1, 0x2, 0x2, 0x66a, 0x66b, 0x5, 0xaa, 0x56, 0xa, 0x66b, 0x681, 
-    0x3, 0x2, 0x2, 0x2, 0x66c, 0x66d, 0xc, 0x15, 0x2, 0x2, 0x66d, 0x66e, 
-    0x7, 0xcb, 0x2, 0x2, 0x66e, 0x66f, 0x5, 0xaa, 0x56, 0x2, 0x66f, 0x670, 
-    0x7, 0xd6, 0x2, 0x2, 0x670, 0x681, 0x3, 0x2, 0x2, 0x2, 0x671, 0x672, 
-    0xc, 0x14, 0x2, 0x2, 0x672, 0x673, 0x7, 0xc5, 0x2, 0x2, 0x673, 0x681, 
-    0x7, 0xba, 0x2, 0x2, 0x674, 0x675, 0xc, 0xf, 0x2, 0x2, 0x675, 0x677, 
-    0x7, 0x56, 0x2, 0x2, 0x676, 0x678, 0x7, 0x70, 0x2, 0x2, 0x677, 0x676, 
-    0x3, 0x2, 0x2, 0x2, 0x677, 0x678, 0x3, 0x2, 0x2, 0x2, 0x678, 0x679, 
-    0x3, 0x2, 0x2, 0x2, 0x679, 0x681, 0x7, 0x71, 0x2, 0x2, 0x67a, 0x67e, 
-    0xc, 0x9, 0x2, 0x2, 0x67b, 0x67f, 0x5, 0xce, 0x68, 0x2, 0x67c, 0x67d, 
-    0x7, 0xc, 0x2, 0x2, 0x67d, 0x67f, 0x5, 0xd0, 0x69, 0x2, 0x67e, 0x67b, 
-    0x3, 0x2, 0x2, 0x2, 0x67e, 0x67c, 0x3, 0x2, 0x2, 0x2, 0x67f, 0x681, 
-    0x3, 0x2, 0x2, 0x2, 0x680, 0x63b, 0x3, 0x2, 0x2, 0x2, 0x680, 0x63e, 
-    0x3, 0x2, 0x2, 0x2, 0x680, 0x641, 0x3, 0x2, 0x2, 0x2, 0x680, 0x657, 
-    0x3, 0x2, 0x2, 0x2, 0x680, 0x65a, 0x3, 0x2, 0x2, 0x2, 0x680, 0x65d, 
-    0x3, 0x2, 0x2, 0x2, 0x680, 0x666, 0x3, 0x2, 0x2, 0x2, 0x680, 0x66c, 
-    0x3, 0x2, 0x2, 0x2, 0x680, 0x671, 0x3, 0x2, 0x2, 0x2, 0x680, 0x674, 
-    0x3, 0x2, 0x2, 0x2, 0x680, 0x67a, 0x3, 0x2, 0x2, 0x2, 0x681, 0x684, 
-    0x3, 0x2, 0x2, 0x2, 0x682, 0x680, 0x3, 0x2, 0x2, 0x2, 0x682, 0x683, 
-    0x3, 0x2, 0x2, 0x2, 0x683, 0xab, 0x3, 0x2, 0x2, 0x2, 0x684, 0x682, 0x3, 
-    0x2, 0x2, 0x2, 0x685, 0x68a, 0x5, 0xae, 0x58, 0x2, 0x686, 0x687, 0x7, 
-    0xc2, 0x2, 0x2, 0x687, 0x689, 0x5, 0xae, 0x58, 0x2, 0x688, 0x686, 0x3, 
-    0x2, 0x2, 0x2, 0x689, 0x68c, 0x3, 0x2, 0x2, 0x2, 0x68a, 0x688, 0x3, 
-    0x2, 0x2, 0x2, 0x68a, 0x68b, 0x3, 0x2, 0x2, 0x2, 0x68b, 0xad, 0x3, 0x2, 
-    0x2, 0x2, 0x68c, 0x68a, 0x3, 0x2, 0x2, 0x2, 0x68d, 0x690, 0x5, 0xb0, 
-    0x59, 0x2, 0x68e, 0x690, 0x5, 0xaa, 0x56, 0x2, 0x68f, 0x68d, 0x3, 0x2, 
-    0x2, 0x2, 0x68f, 0x68e, 0x3, 0x2, 0x2, 0x2, 0x690, 0xaf, 0x3, 0x2, 0x2, 
-    0x2, 0x691, 0x692, 0x7, 0xcd, 0x2, 0x2, 0x692, 0x697, 0x5, 0xd0, 0x69, 
-    0x2, 0x693, 0x694, 0x7, 0xc2, 0x2, 0x2, 0x694, 0x696, 0x5, 0xd0, 0x69, 
-    0x2, 0x695, 0x693, 0x3, 0x2, 0x2, 0x2, 0x696, 0x699, 0x3, 0x2, 0x2, 
-    0x2, 0x697, 0x695, 0x3, 0x2, 0x2, 0x2, 0x697, 0x698, 0x3, 0x2, 0x2, 
-    0x2, 0x698, 0x69a, 0x3, 0x2, 0x2, 0x2, 0x699, 0x697, 0x3, 0x2, 0x2, 
-    0x2, 0x69a, 0x69b, 0x7, 0xd7, 0x2, 0x2, 0x69b, 0x6a5, 0x3, 0x2, 0x2, 
-    0x2, 0x69c, 0x6a1, 0x5, 0xd0, 0x69, 0x2, 0x69d, 0x69e, 0x7, 0xc2, 0x2, 
-    0x2, 0x69e, 0x6a0, 0x5, 0xd0, 0x69, 0x2, 0x69f, 0x69d, 0x3, 0x2, 0x2, 
-    0x2, 0x6a0, 0x6a3, 0x3, 0x2, 0x2, 0x2, 0x6a1, 0x69f, 0x3, 0x2, 0x2, 
-    0x2, 0x6a1, 0x6a2, 0x3, 0x2, 0x2, 0x2, 0x6a2, 0x6a5, 0x3, 0x2, 0x2, 
-    0x2, 0x6a3, 0x6a1, 0x3, 0x2, 0x2, 0x2, 0x6a4, 0x691, 0x3, 0x2, 0x2, 
-    0x2, 0x6a4, 0x69c, 0x3, 0x2, 0x2, 0x2, 0x6a5, 0x6a6, 0x3, 0x2, 0x2, 
-    0x2, 0x6a6, 0x6a7, 0x7, 0xbd, 0x2, 0x2, 0x6a7, 0x6a8, 0x5, 0xaa, 0x56, 
-    0x2, 0x6a8, 0xb1, 0x3, 0x2, 0x2, 0x2, 0x6a9, 0x6aa, 0x5, 0xba, 0x5e, 
-    0x2, 0x6aa, 0x6ab, 0x7, 0xc5, 0x2, 0x2, 0x6ab, 0x6ad, 0x3, 0x2, 0x2, 
-    0x2, 0x6ac, 0x6a9, 0x3, 0x2, 0x2, 0x2, 0x6ac, 0x6ad, 0x3, 0x2, 0x2, 
-    0x2, 0x6ad, 0x6ae, 0x3, 0x2, 0x2, 0x2, 0x6ae, 0x6af, 0x5, 0xb4, 0x5b, 
-    0x2, 0x6af, 0xb3, 0x3, 0x2, 0x2, 0x2, 0x6b0, 0x6b3, 0x5, 0xd0, 0x69, 
-    0x2, 0x6b1, 0x6b2, 0x7, 0xc5, 0x2, 0x2, 0x6b2, 0x6b4, 0x5, 0xd0, 0x69, 
-    0x2, 0x6b3, 0x6b1, 0x3, 0x2, 0x2, 0x2, 0x6b3, 0x6b4, 0x3, 0x2, 0x2, 
-    0x2, 0x6b4, 0xb5, 0x3, 0x2, 0x2, 0x2, 0x6b5, 0x6b6, 0x8, 0x5c, 0x1, 
-    0x2, 0x6b6, 0x6bd, 0x5, 0xba, 0x5e, 0x2, 0x6b7, 0x6bd, 0x5, 0xb8, 0x5d, 
-    0x2, 0x6b8, 0x6b9, 0x7, 0xcd, 0x2, 0x2, 0x6b9, 0x6ba, 0x5, 0x64, 0x33, 
-    0x2, 0x6ba, 0x6bb, 0x7, 0xd7, 0x2, 0x2, 0x6bb, 0x6bd, 0x3, 0x2, 0x2, 
-    0x2, 0x6bc, 0x6b5, 0x3, 0x2, 0x2, 0x2, 0x6bc, 0x6b7, 0x3, 0x2, 0x2, 
-    0x2, 0x6bc, 0x6b8, 0x3, 0x2, 0x2, 0x2, 0x6bd, 0x6c6, 0x3, 0x2, 0x2, 
-    0x2, 0x6be, 0x6c2, 0xc, 0x3, 0x2, 0x2, 0x6bf, 0x6c3, 0x5, 0xce, 0x68, 
-    0x2, 0x6c0, 0x6c1, 0x7, 0xc, 0x2, 0x2, 0x6c1, 0x6c3, 0x5, 0xd0, 0x69, 
-    0x2, 0x6c2, 0x6bf, 0x3, 0x2, 0x2, 0x2, 0x6c2, 0x6c0, 0x3, 0x2, 0x2, 
-    0x2, 0x6c3, 0x6c5, 0x3, 0x2, 0x2, 0x2, 0x6c4, 0x6be, 0x3, 0x2, 0x2, 
-    0x2, 0x6c5, 0x6c8, 0x3, 0x2, 0x2, 0x2, 0x6c6, 0x6c4, 0x3, 0x2, 0x2, 
-    0x2, 0x6c6, 0x6c7, 0x3, 0x2, 0x2, 0x2, 0x6c7, 0xb7, 0x3, 0x2, 0x2, 0x2, 
-    0x6c8, 0x6c6, 0x3, 0x2, 0x2, 0x2, 0x6c9, 0x6ca, 0x5, 0xd0, 0x69, 0x2, 
-    0x6ca, 0x6cc, 0x7, 0xcd, 0x2, 0x2, 0x6cb, 0x6cd, 0x5, 0xbc, 0x5f, 0x2, 
-    0x6cc, 0x6cb, 0x3, 0x2, 0x2, 0x2, 0x6cc, 0x6cd, 0x3, 0x2, 0x2, 0x2, 
-    0x6cd, 0x6ce, 0x3, 0x2, 0x2, 0x2, 0x6ce, 0x6cf, 0x7, 0xd7, 0x2, 0x2, 
-    0x6cf, 0xb9, 0x3, 0x2, 0x2, 0x2, 0x6d0, 0x6d1, 0x5, 0xc0, 0x61, 0x2, 
-    0x6d1, 0x6d2, 0x7, 0xc5, 0x2, 0x2, 0x6d2, 0x6d4, 0x3, 0x2, 0x2, 0x2, 
-    0x6d3, 0x6d0, 0x3, 0x2, 0x2, 0x2, 0x6d3, 0x6d4, 0x3, 0x2, 0x2, 0x2, 
-    0x6d4, 0x6d5, 0x3, 0x2, 0x2, 0x2, 0x6d5, 0x6d6, 0x5, 0xd0, 0x69, 0x2, 
-    0x6d6, 0xbb, 0x3, 0x2, 0x2, 0x2, 0x6d7, 0x6dc, 0x5, 0xbe, 0x60, 0x2, 
-    0x6d8, 0x6d9, 0x7, 0xc2, 0x2, 0x2, 0x6d9, 0x6db, 0x5, 0xbe, 0x60, 0x2, 
-    0x6da, 0x6d8, 0x3, 0x2, 0x2, 0x2, 0x6db, 0x6de, 0x3, 0x2, 0x2, 0x2, 
-    0x6dc, 0x6da, 0x3, 0x2, 0x2, 0x2, 0x6dc, 0x6dd, 0x3, 0x2, 0x2, 0x2, 
-    0x6dd, 0xbd, 0x3, 0x2, 0x2, 0x2, 0x6de, 0x6dc, 0x3, 0x2, 0x2, 0x2, 0x6df, 
-    0x6e3, 0x5, 0xba, 0x5e, 0x2, 0x6e0, 0x6e3, 0x5, 0xb8, 0x5d, 0x2, 0x6e1, 
-    0x6e3, 0x5, 0xc6, 0x64, 0x2, 0x6e2, 0x6df, 0x3, 0x2, 0x2, 0x2, 0x6e2, 
-    0x6e0, 0x3, 0x2, 0x2, 0x2, 0x6e2, 0x6e1, 0x3, 0x2, 0x2, 0x2, 0x6e3, 
-    0xbf, 0x3, 0x2, 0x2, 0x2, 0x6e4, 0x6e5, 0x5, 0xd0, 0x69, 0x2, 0x6e5, 
-    0xc1, 0x3, 0x2, 0x2, 0x2, 0x6e6, 0x6ef, 0x7, 0xb8, 0x2, 0x2, 0x6e7, 
-    0x6e8, 0x7, 0xc5, 0x2, 0x2, 0x6e8, 0x6ef, 0x9, 0x18, 0x2, 0x2, 0x6e9, 
-    0x6ea, 0x7, 0xba, 0x2, 0x2, 0x6ea, 0x6ec, 0x7, 0xc5, 0x2, 0x2, 0x6eb, 
-    0x6ed, 0x9, 0x18, 0x2, 0x2, 0x6ec, 0x6eb, 0x3, 0x2, 0x2, 0x2, 0x6ec, 
-    0x6ed, 0x3, 0x2, 0x2, 0x2, 0x6ed, 0x6ef, 0x3, 0x2, 0x2, 0x2, 0x6ee, 
-    0x6e6, 0x3, 0x2, 0x2, 0x2, 0x6ee, 0x6e7, 0x3, 0x2, 0x2, 0x2, 0x6ee, 
-    0x6e9, 0x3, 0x2, 0x2, 0x2, 0x6ef, 0xc3, 0x3, 0x2, 0x2, 0x2, 0x6f0, 0x6f2, 
-    0x9, 0x19, 0x2, 0x2, 0x6f1, 0x6f0, 0x3, 0x2, 0x2, 0x2, 0x6f1, 0x6f2, 
-    0x3, 0x2, 0x2, 0x2, 0x6f2, 0x6f9, 0x3, 0x2, 0x2, 0x2, 0x6f3, 0x6fa, 
-    0x5, 0xc2, 0x62, 0x2, 0x6f4, 0x6fa, 0x7, 0xb9, 0x2, 0x2, 0x6f5, 0x6fa, 
-    0x7, 0xba, 0x2, 0x2, 0x6f6, 0x6fa, 0x7, 0xbb, 0x2, 0x2, 0x6f7, 0x6fa, 
-    0x7, 0x50, 0x2, 0x2, 0x6f8, 0x6fa, 0x7, 0x6e, 0x2, 0x2, 0x6f9, 0x6f3, 
-    0x3, 0x2, 0x2, 0x2, 0x6f9, 0x6f4, 0x3, 0x2, 0x2, 0x2, 0x6f9, 0x6f5, 
-    0x3, 0x2, 0x2, 0x2, 0x6f9, 0x6f6, 0x3, 0x2, 0x2, 0x2, 0x6f9, 0x6f7, 
-    0x3, 0x2, 0x2, 0x2, 0x6f9, 0x6f8, 0x3, 0x2, 0x2, 0x2, 0x6fa, 0xc5, 0x3, 
-    0x2, 0x2, 0x2, 0x6fb, 0x6ff, 0x5, 0xc4, 0x63, 0x2, 0x6fc, 0x6ff, 0x7, 
-    0xbc, 0x2, 0x2, 0x6fd, 0x6ff, 0x7, 0x71, 0x2, 0x2, 0x6fe, 0x6fb, 0x3, 
-    0x2, 0x2, 0x2, 0x6fe, 0x6fc, 0x3, 0x2, 0x2, 0x2, 0x6fe, 0x6fd, 0x3, 
-    0x2, 0x2, 0x2, 0x6ff, 0xc7, 0x3, 0x2, 0x2, 0x2, 0x700, 0x701, 0x9, 0x1a, 
-    0x2, 0x2, 0x701, 0xc9, 0x3, 0x2, 0x2, 0x2, 0x702, 0x703, 0x9, 0x1b, 
-    0x2, 0x2, 0x703, 0xcb, 0x3, 0x2, 0x2, 0x2, 0x704, 0x705, 0x9, 0x1c, 
-    0x2, 0x2, 0x705, 0xcd, 0x3, 0x2, 0x2, 0x2, 0x706, 0x709, 0x7, 0xb7, 
-    0x2, 0x2, 0x707, 0x709, 0x5, 0xcc, 0x67, 0x2, 0x708, 0x706, 0x3, 0x2, 
-    0x2, 0x2, 0x708, 0x707, 0x3, 0x2, 0x2, 0x2, 0x709, 0xcf, 0x3, 0x2, 0x2, 
-    0x2, 0x70a, 0x70e, 0x7, 0xb7, 0x2, 0x2, 0x70b, 0x70e, 0x5, 0xc8, 0x65, 
-    0x2, 0x70c, 0x70e, 0x5, 0xca, 0x66, 0x2, 0x70d, 0x70a, 0x3, 0x2, 0x2, 
-    0x2, 0x70d, 0x70b, 0x3, 0x2, 0x2, 0x2, 0x70d, 0x70c, 0x3, 0x2, 0x2, 
-    0x2, 0x70e, 0xd1, 0x3, 0x2, 0x2, 0x2, 0x70f, 0x712, 0x5, 0xd0, 0x69, 
-    0x2, 0x710, 0x712, 0x7, 0x71, 0x2, 0x2, 0x711, 0x70f, 0x3, 0x2, 0x2, 
-    0x2, 0x711, 0x710, 0x3, 0x2, 0x2, 0x2, 0x712, 0xd3, 0x3, 0x2, 0x2, 0x2, 
-    0x713, 0x714, 0x7, 0xbc, 0x2, 0x2, 0x714, 0x715, 0x7, 0xc7, 0x2, 0x2, 
-    0x715, 0x716, 0x5, 0xc4, 0x63, 0x2, 0x716, 0xd5, 0x3, 0x2, 0x2, 0x2, 
-    0xf3, 0xda, 0xde, 0xe1, 0xe4, 0xf8, 0xfe, 0x105, 0x10d, 0x112, 0x119, 
-    0x11e, 0x124, 0x12a, 0x12f, 0x135, 0x143, 0x14a, 0x151, 0x157, 0x160, 
-    0x16a, 0x174, 0x188, 0x190, 0x19f, 0x1a6, 0x1b4, 0x1ba, 0x1c0, 0x1c7, 
-    0x1cb, 0x1ce, 0x1d5, 0x1d9, 0x1dc, 0x1e7, 0x1eb, 0x1ee, 0x1f3, 0x1f5, 
-    0x1f8, 0x1fb, 0x205, 0x209, 0x20c, 0x20f, 0x214, 0x216, 0x21c, 0x222, 
-    0x226, 0x229, 0x22c, 0x22f, 0x232, 0x237, 0x23d, 0x241, 0x244, 0x247, 
-    0x24b, 0x253, 0x26d, 0x26f, 0x273, 0x289, 0x28b, 0x296, 0x299, 0x2a2, 
-    0x2b3, 0x2be, 0x2d0, 0x2dd, 0x2ee, 0x2f7, 0x312, 0x314, 0x329, 0x32e, 
-    0x333, 0x336, 0x340, 0x345, 0x349, 0x34c, 0x350, 0x354, 0x359, 0x35c, 
-    0x360, 0x362, 0x375, 0x37d, 0x380, 0x38a, 0x38e, 0x396, 0x39a, 0x39f, 
-    0x3a2, 0x3a6, 0x3aa, 0x3ae, 0x3b0, 0x3b5, 0x3b8, 0x3c3, 0x3c8, 0x3cb, 
-    0x3d5, 0x3df, 0x3e3, 0x3e8, 0x3ec, 0x3f2, 0x3f5, 0x3f8, 0x3fb, 0x409, 
-    0x40d, 0x415, 0x41d, 0x420, 0x424, 0x427, 0x42b, 0x42e, 0x431, 0x434, 
-    0x437, 0x43b, 0x43f, 0x442, 0x445, 0x448, 0x44b, 0x44e, 0x457, 0x45d, 
-    0x471, 0x483, 0x48b, 0x48e, 0x494, 0x49c, 0x49f, 0x4a5, 0x4a7, 0x4ab, 
-    0x4b0, 0x4b3, 0x4b6, 0x4ba, 0x4be, 0x4c1, 0x4c3, 0x4c6, 0x4ca, 0x4ce, 
-    0x4d1, 0x4d3, 0x4d5, 0x4d8, 0x4dd, 0x4e8, 0x4ee, 0x4f3, 0x4fa, 0x4ff, 
-    0x503, 0x507, 0x50c, 0x513, 0x528, 0x52b, 0x534, 0x538, 0x53d, 0x542, 
-    0x545, 0x547, 0x55d, 0x560, 0x56b, 0x56f, 0x572, 0x576, 0x57a, 0x582, 
-    0x586, 0x593, 0x59f, 0x5ab, 0x5b3, 0x5b7, 0x5be, 0x5c4, 0x5cc, 0x5d1, 
-    0x5da, 0x5de, 0x5fd, 0x60e, 0x611, 0x615, 0x618, 0x624, 0x635, 0x639, 
-    0x64a, 0x64d, 0x651, 0x654, 0x65f, 0x677, 0x67e, 0x680, 0x682, 0x68a, 
-    0x68f, 0x697, 0x6a1, 0x6a4, 0x6ac, 0x6b3, 0x6bc, 0x6c2, 0x6c6, 0x6cc, 
-    0x6d3, 0x6dc, 0x6e2, 0x6ec, 0x6ee, 0x6f1, 0x6f9, 0x6fe, 0x708, 0x70d, 
-    0x711, 
+    0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 
+    0x56, 0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x67e, 0xa, 0x56, 0x3, 0x56, 
+    0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x685, 0xa, 0x56, 
+    0x7, 0x56, 0x687, 0xa, 0x56, 0xc, 0x56, 0xe, 0x56, 0x68a, 0xb, 0x56, 
+    0x3, 0x57, 0x3, 0x57, 0x3, 0x57, 0x7, 0x57, 0x68f, 0xa, 0x57, 0xc, 0x57, 
+    0xe, 0x57, 0x692, 0xb, 0x57, 0x3, 0x58, 0x3, 0x58, 0x5, 0x58, 0x696, 
+    0xa, 0x58, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x7, 0x59, 0x69c, 
+    0xa, 0x59, 0xc, 0x59, 0xe, 0x59, 0x69f, 0xb, 0x59, 0x3, 0x59, 0x3, 0x59, 
+    0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x7, 0x59, 0x6a6, 0xa, 0x59, 0xc, 0x59, 
+    0xe, 0x59, 0x6a9, 0xb, 0x59, 0x5, 0x59, 0x6ab, 0xa, 0x59, 0x3, 0x59, 
+    0x3, 0x59, 0x3, 0x59, 0x3, 0x5a, 0x3, 0x5a, 0x3, 0x5a, 0x5, 0x5a, 0x6b3, 
+    0xa, 0x5a, 0x3, 0x5a, 0x3, 0x5a, 0x3, 0x5b, 0x3, 0x5b, 0x3, 0x5b, 0x5, 
+    0x5b, 0x6ba, 0xa, 0x5b, 0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 
+    0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 0x5, 0x5c, 0x6c3, 0xa, 0x5c, 0x3, 0x5c, 
+    0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 0x5, 0x5c, 0x6c9, 0xa, 0x5c, 0x7, 0x5c, 
+    0x6cb, 0xa, 0x5c, 0xc, 0x5c, 0xe, 0x5c, 0x6ce, 0xb, 0x5c, 0x3, 0x5d, 
+    0x3, 0x5d, 0x3, 0x5d, 0x5, 0x5d, 0x6d3, 0xa, 0x5d, 0x3, 0x5d, 0x3, 0x5d, 
+    0x3, 0x5e, 0x3, 0x5e, 0x3, 0x5e, 0x5, 0x5e, 0x6da, 0xa, 0x5e, 0x3, 0x5e, 
+    0x3, 0x5e, 0x3, 0x5f, 0x3, 0x5f, 0x3, 0x5f, 0x7, 0x5f, 0x6e1, 0xa, 0x5f, 
+    0xc, 0x5f, 0xe, 0x5f, 0x6e4, 0xb, 0x5f, 0x3, 0x60, 0x3, 0x60, 0x3, 0x60, 
+    0x5, 0x60, 0x6e9, 0xa, 0x60, 0x3, 0x61, 0x3, 0x61, 0x3, 0x62, 0x3, 0x62, 
+    0x3, 0x62, 0x3, 0x62, 0x3, 0x62, 0x3, 0x62, 0x5, 0x62, 0x6f3, 0xa, 0x62, 
+    0x5, 0x62, 0x6f5, 0xa, 0x62, 0x3, 0x63, 0x5, 0x63, 0x6f8, 0xa, 0x63, 
+    0x3, 0x63, 0x3, 0x63, 0x3, 0x63, 0x3, 0x63, 0x3, 0x63, 0x3, 0x63, 0x5, 
+    0x63, 0x700, 0xa, 0x63, 0x3, 0x64, 0x3, 0x64, 0x3, 0x64, 0x5, 0x64, 
+    0x705, 0xa, 0x64, 0x3, 0x65, 0x3, 0x65, 0x3, 0x66, 0x3, 0x66, 0x3, 0x67, 
+    0x3, 0x67, 0x3, 0x68, 0x3, 0x68, 0x5, 0x68, 0x70f, 0xa, 0x68, 0x3, 0x69, 
+    0x3, 0x69, 0x3, 0x69, 0x5, 0x69, 0x714, 0xa, 0x69, 0x3, 0x6a, 0x3, 0x6a, 
+    0x5, 0x6a, 0x718, 0xa, 0x6a, 0x3, 0x6b, 0x3, 0x6b, 0x3, 0x6b, 0x3, 0x6b, 
+    0x3, 0x6b, 0x2, 0x5, 0x82, 0xaa, 0xb6, 0x6c, 0x2, 0x4, 0x6, 0x8, 0xa, 
+    0xc, 0xe, 0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e, 0x20, 0x22, 
+    0x24, 0x26, 0x28, 0x2a, 0x2c, 0x2e, 0x30, 0x32, 0x34, 0x36, 0x38, 0x3a, 
+    0x3c, 0x3e, 0x40, 0x42, 0x44, 0x46, 0x48, 0x4a, 0x4c, 0x4e, 0x50, 0x52, 
+    0x54, 0x56, 0x58, 0x5a, 0x5c, 0x5e, 0x60, 0x62, 0x64, 0x66, 0x68, 0x6a, 
+    0x6c, 0x6e, 0x70, 0x72, 0x74, 0x76, 0x78, 0x7a, 0x7c, 0x7e, 0x80, 0x82, 
+    0x84, 0x86, 0x88, 0x8a, 0x8c, 0x8e, 0x90, 0x92, 0x94, 0x96, 0x98, 0x9a, 
+    0x9c, 0x9e, 0xa0, 0xa2, 0xa4, 0xa6, 0xa8, 0xaa, 0xac, 0xae, 0xb0, 0xb2, 
+    0xb4, 0xb6, 0xb8, 0xba, 0xbc, 0xbe, 0xc0, 0xc2, 0xc4, 0xc6, 0xc8, 0xca, 
+    0xcc, 0xce, 0xd0, 0xd2, 0xd4, 0x2, 0x1d, 0x8, 0x2, 0x5, 0x5, 0x19, 0x19, 
+    0x1c, 0x1c, 0x26, 0x26, 0x65, 0x65, 0xa5, 0xa5, 0x4, 0x2, 0x10, 0x10, 
+    0x1e, 0x1e, 0x5, 0x2, 0x5, 0x5, 0x26, 0x26, 0x65, 0x65, 0x4, 0x2, 0x29, 
+    0x29, 0x2b, 0x2b, 0x4, 0x2, 0x2c, 0x2c, 0x32, 0x32, 0x5, 0x2, 0xf, 0xf, 
+    0x94, 0x94, 0x9a, 0x9a, 0x4, 0x2, 0x20, 0x20, 0x87, 0x87, 0x4, 0x2, 
+    0x52, 0x52, 0x5e, 0x5e, 0x4, 0x2, 0x45, 0x45, 0x63, 0x63, 0x5, 0x2, 
+    0x6, 0x6, 0xa, 0xa, 0xe, 0xe, 0x6, 0x2, 0x6, 0x6, 0x9, 0xa, 0xe, 0xe, 
+    0x8b, 0x8b, 0x4, 0x2, 0x5e, 0x5e, 0x86, 0x86, 0x4, 0x2, 0x6, 0x6, 0xa, 
+    0xa, 0x4, 0x2, 0x73, 0x73, 0xc2, 0xc2, 0x4, 0x2, 0xd, 0xd, 0x29, 0x2a, 
+    0x4, 0x2, 0x3d, 0x3d, 0x5b, 0x5b, 0x4, 0x2, 0x42, 0x42, 0x4e, 0x4e, 
+    0x3, 0x2, 0x91, 0x92, 0x5, 0x2, 0x12, 0x12, 0x5d, 0x5d, 0xa2, 0xa2, 
+    0x5, 0x2, 0xbe, 0xbe, 0xd0, 0xd0, 0xd9, 0xd9, 0x4, 0x2, 0xc3, 0xc4, 
+    0xd1, 0xd1, 0x4, 0x2, 0x4d, 0x4d, 0x60, 0x60, 0x3, 0x2, 0xb9, 0xba, 
+    0x4, 0x2, 0xc4, 0xc4, 0xd1, 0xd1, 0xa, 0x2, 0x24, 0x24, 0x4a, 0x4a, 
+    0x69, 0x69, 0x6b, 0x6b, 0x7e, 0x7e, 0x89, 0x89, 0xb0, 0xb0, 0xb4, 0xb4, 
+    0xe, 0x2, 0x4, 0x23, 0x25, 0x49, 0x4b, 0x4f, 0x51, 0x68, 0x6a, 0x6a, 
+    0x6c, 0x6d, 0x6f, 0x70, 0x72, 0x7d, 0x7f, 0x88, 0x8a, 0xaf, 0xb1, 0xb3, 
+    0xb5, 0xb6, 0x6, 0x2, 0x23, 0x23, 0x3d, 0x3d, 0x4b, 0x4b, 0x59, 0x59, 
+    0x2, 0x81c, 0x2, 0xe4, 0x3, 0x2, 0x2, 0x2, 0x4, 0xf8, 0x3, 0x2, 0x2, 
+    0x2, 0x6, 0xfa, 0x3, 0x2, 0x2, 0x2, 0x8, 0x19f, 0x3, 0x2, 0x2, 0x2, 
+    0xa, 0x1a1, 0x3, 0x2, 0x2, 0x2, 0xc, 0x1a9, 0x3, 0x2, 0x2, 0x2, 0xe, 
+    0x1ad, 0x3, 0x2, 0x2, 0x2, 0x10, 0x1b4, 0x3, 0x2, 0x2, 0x2, 0x12, 0x1b6, 
+    0x3, 0x2, 0x2, 0x2, 0x14, 0x1bc, 0x3, 0x2, 0x2, 0x2, 0x16, 0x24b, 0x3, 
+    0x2, 0x2, 0x2, 0x18, 0x24d, 0x3, 0x2, 0x2, 0x2, 0x1a, 0x258, 0x3, 0x2, 
+    0x2, 0x2, 0x1c, 0x273, 0x3, 0x2, 0x2, 0x2, 0x1e, 0x28e, 0x3, 0x2, 0x2, 
+    0x2, 0x20, 0x292, 0x3, 0x2, 0x2, 0x2, 0x22, 0x29b, 0x3, 0x2, 0x2, 0x2, 
+    0x24, 0x2a8, 0x3, 0x2, 0x2, 0x2, 0x26, 0x2b7, 0x3, 0x2, 0x2, 0x2, 0x28, 
+    0x2c4, 0x3, 0x2, 0x2, 0x2, 0x2a, 0x2d4, 0x3, 0x2, 0x2, 0x2, 0x2c, 0x2d9, 
+    0x3, 0x2, 0x2, 0x2, 0x2e, 0x2df, 0x3, 0x2, 0x2, 0x2, 0x30, 0x2e2, 0x3, 
+    0x2, 0x2, 0x2, 0x32, 0x2e5, 0x3, 0x2, 0x2, 0x2, 0x34, 0x2f7, 0x3, 0x2, 
+    0x2, 0x2, 0x36, 0x2f9, 0x3, 0x2, 0x2, 0x2, 0x38, 0x317, 0x3, 0x2, 0x2, 
+    0x2, 0x3a, 0x31b, 0x3, 0x2, 0x2, 0x2, 0x3c, 0x31f, 0x3, 0x2, 0x2, 0x2, 
+    0x3e, 0x323, 0x3, 0x2, 0x2, 0x2, 0x40, 0x32c, 0x3, 0x2, 0x2, 0x2, 0x42, 
+    0x340, 0x3, 0x2, 0x2, 0x2, 0x44, 0x362, 0x3, 0x2, 0x2, 0x2, 0x46, 0x364, 
+    0x3, 0x2, 0x2, 0x2, 0x48, 0x367, 0x3, 0x2, 0x2, 0x2, 0x4a, 0x36e, 0x3, 
+    0x2, 0x2, 0x2, 0x4c, 0x37a, 0x3, 0x2, 0x2, 0x2, 0x4e, 0x382, 0x3, 0x2, 
+    0x2, 0x2, 0x50, 0x38c, 0x3, 0x2, 0x2, 0x2, 0x52, 0x3b1, 0x3, 0x2, 0x2, 
+    0x2, 0x54, 0x3c0, 0x3, 0x2, 0x2, 0x2, 0x56, 0x3c2, 0x3, 0x2, 0x2, 0x2, 
+    0x58, 0x3c6, 0x3, 0x2, 0x2, 0x2, 0x5a, 0x3d5, 0x3, 0x2, 0x2, 0x2, 0x5c, 
+    0x3e9, 0x3, 0x2, 0x2, 0x2, 0x5e, 0x3eb, 0x3, 0x2, 0x2, 0x2, 0x60, 0x3f4, 
+    0x3, 0x2, 0x2, 0x2, 0x62, 0x403, 0x3, 0x2, 0x2, 0x2, 0x64, 0x415, 0x3, 
+    0x2, 0x2, 0x2, 0x66, 0x423, 0x3, 0x2, 0x2, 0x2, 0x68, 0x426, 0x3, 0x2, 
+    0x2, 0x2, 0x6a, 0x456, 0x3, 0x2, 0x2, 0x2, 0x6c, 0x459, 0x3, 0x2, 0x2, 
+    0x2, 0x6e, 0x45f, 0x3, 0x2, 0x2, 0x2, 0x70, 0x463, 0x3, 0x2, 0x2, 0x2, 
+    0x72, 0x469, 0x3, 0x2, 0x2, 0x2, 0x74, 0x46c, 0x3, 0x2, 0x2, 0x2, 0x76, 
+    0x46f, 0x3, 0x2, 0x2, 0x2, 0x78, 0x479, 0x3, 0x2, 0x2, 0x2, 0x7a, 0x47c, 
+    0x3, 0x2, 0x2, 0x2, 0x7c, 0x480, 0x3, 0x2, 0x2, 0x2, 0x7e, 0x485, 0x3, 
+    0x2, 0x2, 0x2, 0x80, 0x48b, 0x3, 0x2, 0x2, 0x2, 0x82, 0x49a, 0x3, 0x2, 
+    0x2, 0x2, 0x84, 0x4db, 0x3, 0x2, 0x2, 0x2, 0x86, 0x4e3, 0x3, 0x2, 0x2, 
+    0x2, 0x88, 0x4ee, 0x3, 0x2, 0x2, 0x2, 0x8a, 0x4f0, 0x3, 0x2, 0x2, 0x2, 
+    0x8c, 0x4f6, 0x3, 0x2, 0x2, 0x2, 0x8e, 0x4fb, 0x3, 0x2, 0x2, 0x2, 0x90, 
+    0x503, 0x3, 0x2, 0x2, 0x2, 0x92, 0x50f, 0x3, 0x2, 0x2, 0x2, 0x94, 0x514, 
+    0x3, 0x2, 0x2, 0x2, 0x96, 0x51c, 0x3, 0x2, 0x2, 0x2, 0x98, 0x520, 0x3, 
+    0x2, 0x2, 0x2, 0x9a, 0x54d, 0x3, 0x2, 0x2, 0x2, 0x9c, 0x571, 0x3, 0x2, 
+    0x2, 0x2, 0x9e, 0x573, 0x3, 0x2, 0x2, 0x2, 0xa0, 0x582, 0x3, 0x2, 0x2, 
+    0x2, 0xa2, 0x585, 0x3, 0x2, 0x2, 0x2, 0xa4, 0x5bd, 0x3, 0x2, 0x2, 0x2, 
+    0xa6, 0x5bf, 0x3, 0x2, 0x2, 0x2, 0xa8, 0x5d2, 0x3, 0x2, 0x2, 0x2, 0xaa, 
+    0x63f, 0x3, 0x2, 0x2, 0x2, 0xac, 0x68b, 0x3, 0x2, 0x2, 0x2, 0xae, 0x695, 
+    0x3, 0x2, 0x2, 0x2, 0xb0, 0x6aa, 0x3, 0x2, 0x2, 0x2, 0xb2, 0x6b2, 0x3, 
+    0x2, 0x2, 0x2, 0xb4, 0x6b6, 0x3, 0x2, 0x2, 0x2, 0xb6, 0x6c2, 0x3, 0x2, 
+    0x2, 0x2, 0xb8, 0x6cf, 0x3, 0x2, 0x2, 0x2, 0xba, 0x6d9, 0x3, 0x2, 0x2, 
+    0x2, 0xbc, 0x6dd, 0x3, 0x2, 0x2, 0x2, 0xbe, 0x6e8, 0x3, 0x2, 0x2, 0x2, 
+    0xc0, 0x6ea, 0x3, 0x2, 0x2, 0x2, 0xc2, 0x6f4, 0x3, 0x2, 0x2, 0x2, 0xc4, 
+    0x6f7, 0x3, 0x2, 0x2, 0x2, 0xc6, 0x704, 0x3, 0x2, 0x2, 0x2, 0xc8, 0x706, 
+    0x3, 0x2, 0x2, 0x2, 0xca, 0x708, 0x3, 0x2, 0x2, 0x2, 0xcc, 0x70a, 0x3, 
+    0x2, 0x2, 0x2, 0xce, 0x70e, 0x3, 0x2, 0x2, 0x2, 0xd0, 0x713, 0x3, 0x2, 
+    0x2, 0x2, 0xd2, 0x717, 0x3, 0x2, 0x2, 0x2, 0xd4, 0x719, 0x3, 0x2, 0x2, 
+    0x2, 0xd6, 0xda, 0x5, 0x4, 0x3, 0x2, 0xd7, 0xd8, 0x7, 0x55, 0x2, 0x2, 
+    0xd8, 0xd9, 0x7, 0x79, 0x2, 0x2, 0xd9, 0xdb, 0x7, 0xbc, 0x2, 0x2, 0xda, 
+    0xd7, 0x3, 0x2, 0x2, 0x2, 0xda, 0xdb, 0x3, 0x2, 0x2, 0x2, 0xdb, 0xde, 
+    0x3, 0x2, 0x2, 0x2, 0xdc, 0xdd, 0x7, 0x40, 0x2, 0x2, 0xdd, 0xdf, 0x5, 
+    0xd2, 0x6a, 0x2, 0xde, 0xdc, 0x3, 0x2, 0x2, 0x2, 0xde, 0xdf, 0x3, 0x2, 
+    0x2, 0x2, 0xdf, 0xe1, 0x3, 0x2, 0x2, 0x2, 0xe0, 0xe2, 0x7, 0xd8, 0x2, 
+    0x2, 0xe1, 0xe0, 0x3, 0x2, 0x2, 0x2, 0xe1, 0xe2, 0x3, 0x2, 0x2, 0x2, 
+    0xe2, 0xe5, 0x3, 0x2, 0x2, 0x2, 0xe3, 0xe5, 0x5, 0x58, 0x2d, 0x2, 0xe4, 
+    0xd6, 0x3, 0x2, 0x2, 0x2, 0xe4, 0xe3, 0x3, 0x2, 0x2, 0x2, 0xe5, 0x3, 
+    0x3, 0x2, 0x2, 0x2, 0xe6, 0xf9, 0x5, 0x6, 0x4, 0x2, 0xe7, 0xf9, 0x5, 
+    0x12, 0xa, 0x2, 0xe8, 0xf9, 0x5, 0x14, 0xb, 0x2, 0xe9, 0xf9, 0x5, 0x16, 
+    0xc, 0x2, 0xea, 0xf9, 0x5, 0x50, 0x29, 0x2, 0xeb, 0xf9, 0x5, 0x52, 0x2a, 
+    0x2, 0xec, 0xf9, 0x5, 0x54, 0x2b, 0x2, 0xed, 0xf9, 0x5, 0x56, 0x2c, 
+    0x2, 0xee, 0xf9, 0x5, 0x5e, 0x30, 0x2, 0xef, 0xf9, 0x5, 0x60, 0x31, 
+    0x2, 0xf0, 0xf9, 0x5, 0x62, 0x32, 0x2, 0xf1, 0xf9, 0x5, 0x64, 0x33, 
+    0x2, 0xf2, 0xf9, 0x5, 0x98, 0x4d, 0x2, 0xf3, 0xf9, 0x5, 0x9a, 0x4e, 
+    0x2, 0xf4, 0xf9, 0x5, 0x9c, 0x4f, 0x2, 0xf5, 0xf9, 0x5, 0x9e, 0x50, 
+    0x2, 0xf6, 0xf9, 0x5, 0xa0, 0x51, 0x2, 0xf7, 0xf9, 0x5, 0xa2, 0x52, 
+    0x2, 0xf8, 0xe6, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xe7, 0x3, 0x2, 0x2, 0x2, 
+    0xf8, 0xe8, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xe9, 0x3, 0x2, 0x2, 0x2, 0xf8, 
+    0xea, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xeb, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xec, 
+    0x3, 0x2, 0x2, 0x2, 0xf8, 0xed, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xee, 0x3, 
+    0x2, 0x2, 0x2, 0xf8, 0xef, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xf0, 0x3, 0x2, 
+    0x2, 0x2, 0xf8, 0xf1, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xf2, 0x3, 0x2, 0x2, 
+    0x2, 0xf8, 0xf3, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xf4, 0x3, 0x2, 0x2, 0x2, 
+    0xf8, 0xf5, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xf6, 0x3, 0x2, 0x2, 0x2, 0xf8, 
+    0xf7, 0x3, 0x2, 0x2, 0x2, 0xf9, 0x5, 0x3, 0x2, 0x2, 0x2, 0xfa, 0xfb, 
+    0x7, 0x7, 0x2, 0x2, 0xfb, 0xfc, 0x7, 0x97, 0x2, 0x2, 0xfc, 0xfe, 0x5, 
+    0xba, 0x5e, 0x2, 0xfd, 0xff, 0x5, 0x2c, 0x17, 0x2, 0xfe, 0xfd, 0x3, 
+    0x2, 0x2, 0x2, 0xfe, 0xff, 0x3, 0x2, 0x2, 0x2, 0xff, 0x100, 0x3, 0x2, 
+    0x2, 0x2, 0x100, 0x105, 0x5, 0x8, 0x5, 0x2, 0x101, 0x102, 0x7, 0xc2, 
+    0x2, 0x2, 0x102, 0x104, 0x5, 0x8, 0x5, 0x2, 0x103, 0x101, 0x3, 0x2, 
+    0x2, 0x2, 0x104, 0x107, 0x3, 0x2, 0x2, 0x2, 0x105, 0x103, 0x3, 0x2, 
+    0x2, 0x2, 0x105, 0x106, 0x3, 0x2, 0x2, 0x2, 0x106, 0x7, 0x3, 0x2, 0x2, 
+    0x2, 0x107, 0x105, 0x3, 0x2, 0x2, 0x2, 0x108, 0x109, 0x7, 0x3, 0x2, 
+    0x2, 0x109, 0x10d, 0x7, 0x1b, 0x2, 0x2, 0x10a, 0x10b, 0x7, 0x4c, 0x2, 
+    0x2, 0x10b, 0x10c, 0x7, 0x70, 0x2, 0x2, 0x10c, 0x10e, 0x7, 0x37, 0x2, 
+    0x2, 0x10d, 0x10a, 0x3, 0x2, 0x2, 0x2, 0x10d, 0x10e, 0x3, 0x2, 0x2, 
+    0x2, 0x10e, 0x10f, 0x3, 0x2, 0x2, 0x2, 0x10f, 0x112, 0x5, 0x44, 0x23, 
+    0x2, 0x110, 0x111, 0x7, 0x4, 0x2, 0x2, 0x111, 0x113, 0x5, 0xb4, 0x5b, 
+    0x2, 0x112, 0x110, 0x3, 0x2, 0x2, 0x2, 0x112, 0x113, 0x3, 0x2, 0x2, 
+    0x2, 0x113, 0x1a0, 0x3, 0x2, 0x2, 0x2, 0x114, 0x115, 0x7, 0x3, 0x2, 
+    0x2, 0x115, 0x119, 0x7, 0x4f, 0x2, 0x2, 0x116, 0x117, 0x7, 0x4c, 0x2, 
+    0x2, 0x117, 0x118, 0x7, 0x70, 0x2, 0x2, 0x118, 0x11a, 0x7, 0x37, 0x2, 
+    0x2, 0x119, 0x116, 0x3, 0x2, 0x2, 0x2, 0x119, 0x11a, 0x3, 0x2, 0x2, 
+    0x2, 0x11a, 0x11b, 0x3, 0x2, 0x2, 0x2, 0x11b, 0x11e, 0x5, 0x48, 0x25, 
+    0x2, 0x11c, 0x11d, 0x7, 0x4, 0x2, 0x2, 0x11d, 0x11f, 0x5, 0xb4, 0x5b, 
+    0x2, 0x11e, 0x11c, 0x3, 0x2, 0x2, 0x2, 0x11e, 0x11f, 0x3, 0x2, 0x2, 
+    0x2, 0x11f, 0x1a0, 0x3, 0x2, 0x2, 0x2, 0x120, 0x121, 0x7, 0x10, 0x2, 
+    0x2, 0x121, 0x124, 0x5, 0x10, 0x9, 0x2, 0x122, 0x123, 0x7, 0x42, 0x2, 
+    0x2, 0x123, 0x125, 0x5, 0xba, 0x5e, 0x2, 0x124, 0x122, 0x3, 0x2, 0x2, 
+    0x2, 0x124, 0x125, 0x3, 0x2, 0x2, 0x2, 0x125, 0x1a0, 0x3, 0x2, 0x2, 
+    0x2, 0x126, 0x127, 0x7, 0x17, 0x2, 0x2, 0x127, 0x12a, 0x7, 0x1b, 0x2, 
+    0x2, 0x128, 0x129, 0x7, 0x4c, 0x2, 0x2, 0x129, 0x12b, 0x7, 0x37, 0x2, 
+    0x2, 0x12a, 0x128, 0x3, 0x2, 0x2, 0x2, 0x12a, 0x12b, 0x3, 0x2, 0x2, 
+    0x2, 0x12b, 0x12c, 0x3, 0x2, 0x2, 0x2, 0x12c, 0x12f, 0x5, 0xb4, 0x5b, 
+    0x2, 0x12d, 0x12e, 0x7, 0x4e, 0x2, 0x2, 0x12e, 0x130, 0x5, 0x10, 0x9, 
+    0x2, 0x12f, 0x12d, 0x3, 0x2, 0x2, 0x2, 0x12f, 0x130, 0x3, 0x2, 0x2, 
+    0x2, 0x130, 0x1a0, 0x3, 0x2, 0x2, 0x2, 0x131, 0x132, 0x7, 0x1c, 0x2, 
+    0x2, 0x132, 0x135, 0x7, 0x1b, 0x2, 0x2, 0x133, 0x134, 0x7, 0x4c, 0x2, 
+    0x2, 0x134, 0x136, 0x7, 0x37, 0x2, 0x2, 0x135, 0x133, 0x3, 0x2, 0x2, 
+    0x2, 0x135, 0x136, 0x3, 0x2, 0x2, 0x2, 0x136, 0x137, 0x3, 0x2, 0x2, 
+    0x2, 0x137, 0x138, 0x5, 0xb4, 0x5b, 0x2, 0x138, 0x139, 0x7, 0xbc, 0x2, 
+    0x2, 0x139, 0x1a0, 0x3, 0x2, 0x2, 0x2, 0x13a, 0x13b, 0x7, 0x28, 0x2, 
+    0x2, 0x13b, 0x13c, 0x7, 0xb2, 0x2, 0x2, 0x13c, 0x1a0, 0x5, 0xaa, 0x56, 
+    0x2, 0x13d, 0x13e, 0x7, 0x2c, 0x2, 0x2, 0x13e, 0x1a0, 0x5, 0x10, 0x9, 
+    0x2, 0x13f, 0x140, 0x7, 0x32, 0x2, 0x2, 0x140, 0x143, 0x7, 0x1b, 0x2, 
+    0x2, 0x141, 0x142, 0x7, 0x4c, 0x2, 0x2, 0x142, 0x144, 0x7, 0x37, 0x2, 
+    0x2, 0x143, 0x141, 0x3, 0x2, 0x2, 0x2, 0x143, 0x144, 0x3, 0x2, 0x2, 
+    0x2, 0x144, 0x145, 0x3, 0x2, 0x2, 0x2, 0x145, 0x1a0, 0x5, 0xb4, 0x5b, 
+    0x2, 0x146, 0x147, 0x7, 0x32, 0x2, 0x2, 0x147, 0x14a, 0x7, 0x4f, 0x2, 
+    0x2, 0x148, 0x149, 0x7, 0x4c, 0x2, 0x2, 0x149, 0x14b, 0x7, 0x37, 0x2, 
+    0x2, 0x14a, 0x148, 0x3, 0x2, 0x2, 0x2, 0x14a, 0x14b, 0x3, 0x2, 0x2, 
+    0x2, 0x14b, 0x14c, 0x3, 0x2, 0x2, 0x2, 0x14c, 0x1a0, 0x5, 0xb4, 0x5b, 
+    0x2, 0x14d, 0x14e, 0x7, 0x32, 0x2, 0x2, 0x14e, 0x1a0, 0x5, 0x10, 0x9, 
+    0x2, 0x14f, 0x151, 0x7, 0x41, 0x2, 0x2, 0x150, 0x152, 0x5, 0x10, 0x9, 
+    0x2, 0x151, 0x150, 0x3, 0x2, 0x2, 0x2, 0x151, 0x152, 0x3, 0x2, 0x2, 
+    0x2, 0x152, 0x1a0, 0x3, 0x2, 0x2, 0x2, 0x153, 0x154, 0x7, 0x6a, 0x2, 
+    0x2, 0x154, 0x157, 0x7, 0x1b, 0x2, 0x2, 0x155, 0x156, 0x7, 0x4c, 0x2, 
+    0x2, 0x156, 0x158, 0x7, 0x37, 0x2, 0x2, 0x157, 0x155, 0x3, 0x2, 0x2, 
+    0x2, 0x157, 0x158, 0x3, 0x2, 0x2, 0x2, 0x158, 0x159, 0x3, 0x2, 0x2, 
+    0x2, 0x159, 0x15a, 0x5, 0xb4, 0x5b, 0x2, 0x15a, 0x15b, 0x5, 0x4a, 0x26, 
+    0x2, 0x15b, 0x1a0, 0x3, 0x2, 0x2, 0x2, 0x15c, 0x15d, 0x7, 0x6a, 0x2, 
+    0x2, 0x15d, 0x160, 0x7, 0x1b, 0x2, 0x2, 0x15e, 0x15f, 0x7, 0x4c, 0x2, 
+    0x2, 0x15f, 0x161, 0x7, 0x37, 0x2, 0x2, 0x160, 0x15e, 0x3, 0x2, 0x2, 
+    0x2, 0x160, 0x161, 0x3, 0x2, 0x2, 0x2, 0x161, 0x162, 0x3, 0x2, 0x2, 
+    0x2, 0x162, 0x163, 0x5, 0xb4, 0x5b, 0x2, 0x163, 0x164, 0x7, 0x1c, 0x2, 
+    0x2, 0x164, 0x165, 0x7, 0xbc, 0x2, 0x2, 0x165, 0x1a0, 0x3, 0x2, 0x2, 
+    0x2, 0x166, 0x167, 0x7, 0x6a, 0x2, 0x2, 0x167, 0x16a, 0x7, 0x1b, 0x2, 
+    0x2, 0x168, 0x169, 0x7, 0x4c, 0x2, 0x2, 0x169, 0x16b, 0x7, 0x37, 0x2, 
+    0x2, 0x16a, 0x168, 0x3, 0x2, 0x2, 0x2, 0x16a, 0x16b, 0x3, 0x2, 0x2, 
+    0x2, 0x16b, 0x16c, 0x3, 0x2, 0x2, 0x2, 0x16c, 0x16d, 0x5, 0xb4, 0x5b, 
+    0x2, 0x16d, 0x16e, 0x7, 0x81, 0x2, 0x2, 0x16e, 0x16f, 0x5, 0xe, 0x8, 
+    0x2, 0x16f, 0x1a0, 0x3, 0x2, 0x2, 0x2, 0x170, 0x171, 0x7, 0x6a, 0x2, 
+    0x2, 0x171, 0x174, 0x7, 0x1b, 0x2, 0x2, 0x172, 0x173, 0x7, 0x4c, 0x2, 
+    0x2, 0x173, 0x175, 0x7, 0x37, 0x2, 0x2, 0x174, 0x172, 0x3, 0x2, 0x2, 
+    0x2, 0x174, 0x175, 0x3, 0x2, 0x2, 0x2, 0x175, 0x176, 0x3, 0x2, 0x2, 
+    0x2, 0x176, 0x1a0, 0x5, 0x44, 0x23, 0x2, 0x177, 0x178, 0x7, 0x6a, 0x2, 
+    0x2, 0x178, 0x179, 0x7, 0x77, 0x2, 0x2, 0x179, 0x17a, 0x7, 0x13, 0x2, 
+    0x2, 0x17a, 0x1a0, 0x5, 0xaa, 0x56, 0x2, 0x17b, 0x17c, 0x7, 0x6a, 0x2, 
+    0x2, 0x17c, 0x1a0, 0x5, 0x3e, 0x20, 0x2, 0x17d, 0x17e, 0x7, 0x6c, 0x2, 
+    0x2, 0x17e, 0x188, 0x5, 0x10, 0x9, 0x2, 0x17f, 0x180, 0x7, 0x9f, 0x2, 
+    0x2, 0x180, 0x181, 0x7, 0x2f, 0x2, 0x2, 0x181, 0x189, 0x7, 0xbc, 0x2, 
+    0x2, 0x182, 0x183, 0x7, 0x9f, 0x2, 0x2, 0x183, 0x184, 0x7, 0xae, 0x2, 
+    0x2, 0x184, 0x189, 0x7, 0xbc, 0x2, 0x2, 0x185, 0x186, 0x7, 0x9f, 0x2, 
+    0x2, 0x186, 0x187, 0x7, 0x97, 0x2, 0x2, 0x187, 0x189, 0x5, 0xba, 0x5e, 
+    0x2, 0x188, 0x17f, 0x3, 0x2, 0x2, 0x2, 0x188, 0x182, 0x3, 0x2, 0x2, 
+    0x2, 0x188, 0x185, 0x3, 0x2, 0x2, 0x2, 0x189, 0x1a0, 0x3, 0x2, 0x2, 
+    0x2, 0x18a, 0x18b, 0x7, 0x81, 0x2, 0x2, 0x18b, 0x1a0, 0x7, 0xa5, 0x2, 
+    0x2, 0x18c, 0x18d, 0x7, 0x82, 0x2, 0x2, 0x18d, 0x190, 0x7, 0x1b, 0x2, 
+    0x2, 0x18e, 0x18f, 0x7, 0x4c, 0x2, 0x2, 0x18f, 0x191, 0x7, 0x37, 0x2, 
+    0x2, 0x190, 0x18e, 0x3, 0x2, 0x2, 0x2, 0x190, 0x191, 0x3, 0x2, 0x2, 
+    0x2, 0x191, 0x192, 0x3, 0x2, 0x2, 0x2, 0x192, 0x193, 0x5, 0xb4, 0x5b, 
+    0x2, 0x193, 0x194, 0x7, 0x9f, 0x2, 0x2, 0x194, 0x195, 0x5, 0xb4, 0x5b, 
+    0x2, 0x195, 0x1a0, 0x3, 0x2, 0x2, 0x2, 0x196, 0x197, 0x7, 0x83, 0x2, 
+    0x2, 0x197, 0x198, 0x5, 0x10, 0x9, 0x2, 0x198, 0x199, 0x7, 0x42, 0x2, 
+    0x2, 0x199, 0x19a, 0x5, 0xba, 0x5e, 0x2, 0x19a, 0x1a0, 0x3, 0x2, 0x2, 
+    0x2, 0x19b, 0x19c, 0x7, 0xa8, 0x2, 0x2, 0x19c, 0x19d, 0x5, 0xa, 0x6, 
+    0x2, 0x19d, 0x19e, 0x5, 0x74, 0x3b, 0x2, 0x19e, 0x1a0, 0x3, 0x2, 0x2, 
+    0x2, 0x19f, 0x108, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x114, 0x3, 0x2, 0x2, 
+    0x2, 0x19f, 0x120, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x126, 0x3, 0x2, 0x2, 
+    0x2, 0x19f, 0x131, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x13a, 0x3, 0x2, 0x2, 
+    0x2, 0x19f, 0x13d, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x13f, 0x3, 0x2, 0x2, 
+    0x2, 0x19f, 0x146, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x14d, 0x3, 0x2, 0x2, 
+    0x2, 0x19f, 0x14f, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x153, 0x3, 0x2, 0x2, 
+    0x2, 0x19f, 0x15c, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x166, 0x3, 0x2, 0x2, 
+    0x2, 0x19f, 0x170, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x177, 0x3, 0x2, 0x2, 
+    0x2, 0x19f, 0x17b, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x17d, 0x3, 0x2, 0x2, 
+    0x2, 0x19f, 0x18a, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x18c, 0x3, 0x2, 0x2, 
+    0x2, 0x19f, 0x196, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x19b, 0x3, 0x2, 0x2, 
+    0x2, 0x1a0, 0x9, 0x3, 0x2, 0x2, 0x2, 0x1a1, 0x1a6, 0x5, 0xc, 0x7, 0x2, 
+    0x1a2, 0x1a3, 0x7, 0xc2, 0x2, 0x2, 0x1a3, 0x1a5, 0x5, 0xc, 0x7, 0x2, 
+    0x1a4, 0x1a2, 0x3, 0x2, 0x2, 0x2, 0x1a5, 0x1a8, 0x3, 0x2, 0x2, 0x2, 
+    0x1a6, 0x1a4, 0x3, 0x2, 0x2, 0x2, 0x1a6, 0x1a7, 0x3, 0x2, 0x2, 0x2, 
+    0x1a7, 0xb, 0x3, 0x2, 0x2, 0x2, 0x1a8, 0x1a6, 0x3, 0x2, 0x2, 0x2, 0x1a9, 
+    0x1aa, 0x5, 0xb4, 0x5b, 0x2, 0x1aa, 0x1ab, 0x7, 0xc7, 0x2, 0x2, 0x1ab, 
+    0x1ac, 0x5, 0xaa, 0x56, 0x2, 0x1ac, 0xd, 0x3, 0x2, 0x2, 0x2, 0x1ad, 
+    0x1ae, 0x9, 0x2, 0x2, 0x2, 0x1ae, 0xf, 0x3, 0x2, 0x2, 0x2, 0x1af, 0x1b0, 
+    0x7, 0x7a, 0x2, 0x2, 0x1b0, 0x1b5, 0x5, 0xaa, 0x56, 0x2, 0x1b1, 0x1b2, 
+    0x7, 0x7a, 0x2, 0x2, 0x1b2, 0x1b3, 0x7, 0x4b, 0x2, 0x2, 0x1b3, 0x1b5, 
+    0x7, 0xbc, 0x2, 0x2, 0x1b4, 0x1af, 0x3, 0x2, 0x2, 0x2, 0x1b4, 0x1b1, 
+    0x3, 0x2, 0x2, 0x2, 0x1b5, 0x11, 0x3, 0x2, 0x2, 0x2, 0x1b6, 0x1b7, 0x7, 
+    0x10, 0x2, 0x2, 0x1b7, 0x1b8, 0x7, 0x2e, 0x2, 0x2, 0x1b8, 0x1ba, 0x5, 
+    0xba, 0x5e, 0x2, 0x1b9, 0x1bb, 0x5, 0x2c, 0x17, 0x2, 0x1ba, 0x1b9, 0x3, 
+    0x2, 0x2, 0x2, 0x1ba, 0x1bb, 0x3, 0x2, 0x2, 0x2, 0x1bb, 0x13, 0x3, 0x2, 
+    0x2, 0x2, 0x1bc, 0x1bd, 0x7, 0x16, 0x2, 0x2, 0x1bd, 0x1be, 0x7, 0x97, 
+    0x2, 0x2, 0x1be, 0x1c0, 0x5, 0xba, 0x5e, 0x2, 0x1bf, 0x1c1, 0x5, 0x10, 
+    0x9, 0x2, 0x1c0, 0x1bf, 0x3, 0x2, 0x2, 0x2, 0x1c0, 0x1c1, 0x3, 0x2, 
+    0x2, 0x2, 0x1c1, 0x15, 0x3, 0x2, 0x2, 0x2, 0x1c2, 0x1c3, 0x9, 0x3, 0x2, 
+    0x2, 0x1c3, 0x1c7, 0x7, 0x21, 0x2, 0x2, 0x1c4, 0x1c5, 0x7, 0x4c, 0x2, 
+    0x2, 0x1c5, 0x1c6, 0x7, 0x70, 0x2, 0x2, 0x1c6, 0x1c8, 0x7, 0x37, 0x2, 
+    0x2, 0x1c7, 0x1c4, 0x3, 0x2, 0x2, 0x2, 0x1c7, 0x1c8, 0x3, 0x2, 0x2, 
+    0x2, 0x1c8, 0x1c9, 0x3, 0x2, 0x2, 0x2, 0x1c9, 0x1cb, 0x5, 0xc0, 0x61, 
+    0x2, 0x1ca, 0x1cc, 0x5, 0x2c, 0x17, 0x2, 0x1cb, 0x1ca, 0x3, 0x2, 0x2, 
+    0x2, 0x1cb, 0x1cc, 0x3, 0x2, 0x2, 0x2, 0x1cc, 0x1ce, 0x3, 0x2, 0x2, 
+    0x2, 0x1cd, 0x1cf, 0x5, 0x40, 0x21, 0x2, 0x1ce, 0x1cd, 0x3, 0x2, 0x2, 
+    0x2, 0x1ce, 0x1cf, 0x3, 0x2, 0x2, 0x2, 0x1cf, 0x24c, 0x3, 0x2, 0x2, 
+    0x2, 0x1d0, 0x1d1, 0x9, 0x3, 0x2, 0x2, 0x1d1, 0x1d5, 0x7, 0x2e, 0x2, 
+    0x2, 0x1d2, 0x1d3, 0x7, 0x4c, 0x2, 0x2, 0x1d3, 0x1d4, 0x7, 0x70, 0x2, 
+    0x2, 0x1d4, 0x1d6, 0x7, 0x37, 0x2, 0x2, 0x1d5, 0x1d2, 0x3, 0x2, 0x2, 
+    0x2, 0x1d5, 0x1d6, 0x3, 0x2, 0x2, 0x2, 0x1d6, 0x1d7, 0x3, 0x2, 0x2, 
+    0x2, 0x1d7, 0x1d9, 0x5, 0xba, 0x5e, 0x2, 0x1d8, 0x1da, 0x5, 0x2e, 0x18, 
+    0x2, 0x1d9, 0x1d8, 0x3, 0x2, 0x2, 0x2, 0x1d9, 0x1da, 0x3, 0x2, 0x2, 
+    0x2, 0x1da, 0x1dc, 0x3, 0x2, 0x2, 0x2, 0x1db, 0x1dd, 0x5, 0x2c, 0x17, 
+    0x2, 0x1dc, 0x1db, 0x3, 0x2, 0x2, 0x2, 0x1dc, 0x1dd, 0x3, 0x2, 0x2, 
+    0x2, 0x1dd, 0x1de, 0x3, 0x2, 0x2, 0x2, 0x1de, 0x1df, 0x5, 0x18, 0xd, 
+    0x2, 0x1df, 0x1e0, 0x5, 0x1c, 0xf, 0x2, 0x1e0, 0x24c, 0x3, 0x2, 0x2, 
+    0x2, 0x1e1, 0x1e2, 0x9, 0x3, 0x2, 0x2, 0x1e2, 0x1e3, 0x7, 0x62, 0x2, 
+    0x2, 0x1e3, 0x1e7, 0x7, 0xad, 0x2, 0x2, 0x1e4, 0x1e5, 0x7, 0x4c, 0x2, 
+    0x2, 0x1e5, 0x1e6, 0x7, 0x70, 0x2, 0x2, 0x1e6, 0x1e8, 0x7, 0x37, 0x2, 
+    0x2, 0x1e7, 0x1e4, 0x3, 0x2, 0x2, 0x2, 0x1e7, 0x1e8, 0x3, 0x2, 0x2, 
+    0x2, 0x1e8, 0x1e9, 0x3, 0x2, 0x2, 0x2, 0x1e9, 0x1eb, 0x5, 0xba, 0x5e, 
+    0x2, 0x1ea, 0x1ec, 0x5, 0x2e, 0x18, 0x2, 0x1eb, 0x1ea, 0x3, 0x2, 0x2, 
+    0x2, 0x1eb, 0x1ec, 0x3, 0x2, 0x2, 0x2, 0x1ec, 0x1ee, 0x3, 0x2, 0x2, 
+    0x2, 0x1ed, 0x1ef, 0x5, 0x2c, 0x17, 0x2, 0x1ee, 0x1ed, 0x3, 0x2, 0x2, 
+    0x2, 0x1ee, 0x1ef, 0x3, 0x2, 0x2, 0x2, 0x1ef, 0x1f5, 0x3, 0x2, 0x2, 
+    0x2, 0x1f0, 0x1f1, 0x7, 0xb3, 0x2, 0x2, 0x1f1, 0x1f3, 0x7, 0x9d, 0x2, 
+    0x2, 0x1f2, 0x1f4, 0x7, 0xba, 0x2, 0x2, 0x1f3, 0x1f2, 0x3, 0x2, 0x2, 
+    0x2, 0x1f3, 0x1f4, 0x3, 0x2, 0x2, 0x2, 0x1f4, 0x1f6, 0x3, 0x2, 0x2, 
+    0x2, 0x1f5, 0x1f0, 0x3, 0x2, 0x2, 0x2, 0x1f5, 0x1f6, 0x3, 0x2, 0x2, 
+    0x2, 0x1f6, 0x1f8, 0x3, 0x2, 0x2, 0x2, 0x1f7, 0x1f9, 0x5, 0x30, 0x19, 
+    0x2, 0x1f8, 0x1f7, 0x3, 0x2, 0x2, 0x2, 0x1f8, 0x1f9, 0x3, 0x2, 0x2, 
+    0x2, 0x1f9, 0x1fb, 0x3, 0x2, 0x2, 0x2, 0x1fa, 0x1fc, 0x5, 0x34, 0x1b, 
+    0x2, 0x1fb, 0x1fa, 0x3, 0x2, 0x2, 0x2, 0x1fb, 0x1fc, 0x3, 0x2, 0x2, 
+    0x2, 0x1fc, 0x1fd, 0x3, 0x2, 0x2, 0x2, 0x1fd, 0x1fe, 0x5, 0x32, 0x1a, 
+    0x2, 0x1fe, 0x24c, 0x3, 0x2, 0x2, 0x2, 0x1ff, 0x200, 0x9, 0x3, 0x2, 
+    0x2, 0x200, 0x201, 0x7, 0x65, 0x2, 0x2, 0x201, 0x205, 0x7, 0xad, 0x2, 
+    0x2, 0x202, 0x203, 0x7, 0x4c, 0x2, 0x2, 0x203, 0x204, 0x7, 0x70, 0x2, 
+    0x2, 0x204, 0x206, 0x7, 0x37, 0x2, 0x2, 0x205, 0x202, 0x3, 0x2, 0x2, 
+    0x2, 0x205, 0x206, 0x3, 0x2, 0x2, 0x2, 0x206, 0x207, 0x3, 0x2, 0x2, 
+    0x2, 0x207, 0x209, 0x5, 0xba, 0x5e, 0x2, 0x208, 0x20a, 0x5, 0x2e, 0x18, 
+    0x2, 0x209, 0x208, 0x3, 0x2, 0x2, 0x2, 0x209, 0x20a, 0x3, 0x2, 0x2, 
+    0x2, 0x20a, 0x20c, 0x3, 0x2, 0x2, 0x2, 0x20b, 0x20d, 0x5, 0x2c, 0x17, 
+    0x2, 0x20c, 0x20b, 0x3, 0x2, 0x2, 0x2, 0x20c, 0x20d, 0x3, 0x2, 0x2, 
+    0x2, 0x20d, 0x20f, 0x3, 0x2, 0x2, 0x2, 0x20e, 0x210, 0x5, 0x34, 0x1b, 
+    0x2, 0x20f, 0x20e, 0x3, 0x2, 0x2, 0x2, 0x20f, 0x210, 0x3, 0x2, 0x2, 
+    0x2, 0x210, 0x216, 0x3, 0x2, 0x2, 0x2, 0x211, 0x217, 0x5, 0x30, 0x19, 
+    0x2, 0x212, 0x214, 0x5, 0x36, 0x1c, 0x2, 0x213, 0x215, 0x7, 0x7b, 0x2, 
+    0x2, 0x214, 0x213, 0x3, 0x2, 0x2, 0x2, 0x214, 0x215, 0x3, 0x2, 0x2, 
+    0x2, 0x215, 0x217, 0x3, 0x2, 0x2, 0x2, 0x216, 0x211, 0x3, 0x2, 0x2, 
+    0x2, 0x216, 0x212, 0x3, 0x2, 0x2, 0x2, 0x217, 0x218, 0x3, 0x2, 0x2, 
+    0x2, 0x218, 0x219, 0x5, 0x32, 0x1a, 0x2, 0x219, 0x24c, 0x3, 0x2, 0x2, 
+    0x2, 0x21a, 0x21c, 0x9, 0x3, 0x2, 0x2, 0x21b, 0x21d, 0x7, 0x99, 0x2, 
+    0x2, 0x21c, 0x21b, 0x3, 0x2, 0x2, 0x2, 0x21c, 0x21d, 0x3, 0x2, 0x2, 
+    0x2, 0x21d, 0x21e, 0x3, 0x2, 0x2, 0x2, 0x21e, 0x222, 0x7, 0x97, 0x2, 
+    0x2, 0x21f, 0x220, 0x7, 0x4c, 0x2, 0x2, 0x220, 0x221, 0x7, 0x70, 0x2, 
+    0x2, 0x221, 0x223, 0x7, 0x37, 0x2, 0x2, 0x222, 0x21f, 0x3, 0x2, 0x2, 
+    0x2, 0x222, 0x223, 0x3, 0x2, 0x2, 0x2, 0x223, 0x224, 0x3, 0x2, 0x2, 
+    0x2, 0x224, 0x226, 0x5, 0xba, 0x5e, 0x2, 0x225, 0x227, 0x5, 0x2e, 0x18, 
+    0x2, 0x226, 0x225, 0x3, 0x2, 0x2, 0x2, 0x226, 0x227, 0x3, 0x2, 0x2, 
+    0x2, 0x227, 0x229, 0x3, 0x2, 0x2, 0x2, 0x228, 0x22a, 0x5, 0x2c, 0x17, 
+    0x2, 0x229, 0x228, 0x3, 0x2, 0x2, 0x2, 0x229, 0x22a, 0x3, 0x2, 0x2, 
+    0x2, 0x22a, 0x22c, 0x3, 0x2, 0x2, 0x2, 0x22b, 0x22d, 0x5, 0x34, 0x1b, 
+    0x2, 0x22c, 0x22b, 0x3, 0x2, 0x2, 0x2, 0x22c, 0x22d, 0x3, 0x2, 0x2, 
+    0x2, 0x22d, 0x22f, 0x3, 0x2, 0x2, 0x2, 0x22e, 0x230, 0x5, 0x36, 0x1c, 
+    0x2, 0x22f, 0x22e, 0x3, 0x2, 0x2, 0x2, 0x22f, 0x230, 0x3, 0x2, 0x2, 
+    0x2, 0x230, 0x232, 0x3, 0x2, 0x2, 0x2, 0x231, 0x233, 0x5, 0x32, 0x1a, 
+    0x2, 0x232, 0x231, 0x3, 0x2, 0x2, 0x2, 0x232, 0x233, 0x3, 0x2, 0x2, 
+    0x2, 0x233, 0x24c, 0x3, 0x2, 0x2, 0x2, 0x234, 0x237, 0x9, 0x3, 0x2, 
+    0x2, 0x235, 0x236, 0x7, 0x76, 0x2, 0x2, 0x236, 0x238, 0x7, 0x83, 0x2, 
+    0x2, 0x237, 0x235, 0x3, 0x2, 0x2, 0x2, 0x237, 0x238, 0x3, 0x2, 0x2, 
+    0x2, 0x238, 0x239, 0x3, 0x2, 0x2, 0x2, 0x239, 0x23d, 0x7, 0xad, 0x2, 
+    0x2, 0x23a, 0x23b, 0x7, 0x4c, 0x2, 0x2, 0x23b, 0x23c, 0x7, 0x70, 0x2, 
+    0x2, 0x23c, 0x23e, 0x7, 0x37, 0x2, 0x2, 0x23d, 0x23a, 0x3, 0x2, 0x2, 
+    0x2, 0x23d, 0x23e, 0x3, 0x2, 0x2, 0x2, 0x23e, 0x23f, 0x3, 0x2, 0x2, 
+    0x2, 0x23f, 0x241, 0x5, 0xba, 0x5e, 0x2, 0x240, 0x242, 0x5, 0x2e, 0x18, 
+    0x2, 0x241, 0x240, 0x3, 0x2, 0x2, 0x2, 0x241, 0x242, 0x3, 0x2, 0x2, 
+    0x2, 0x242, 0x244, 0x3, 0x2, 0x2, 0x2, 0x243, 0x245, 0x5, 0x2c, 0x17, 
+    0x2, 0x244, 0x243, 0x3, 0x2, 0x2, 0x2, 0x244, 0x245, 0x3, 0x2, 0x2, 
+    0x2, 0x245, 0x247, 0x3, 0x2, 0x2, 0x2, 0x246, 0x248, 0x5, 0x34, 0x1b, 
+    0x2, 0x247, 0x246, 0x3, 0x2, 0x2, 0x2, 0x247, 0x248, 0x3, 0x2, 0x2, 
+    0x2, 0x248, 0x249, 0x3, 0x2, 0x2, 0x2, 0x249, 0x24a, 0x5, 0x32, 0x1a, 
+    0x2, 0x24a, 0x24c, 0x3, 0x2, 0x2, 0x2, 0x24b, 0x1c2, 0x3, 0x2, 0x2, 
+    0x2, 0x24b, 0x1d0, 0x3, 0x2, 0x2, 0x2, 0x24b, 0x1e1, 0x3, 0x2, 0x2, 
+    0x2, 0x24b, 0x1ff, 0x3, 0x2, 0x2, 0x2, 0x24b, 0x21a, 0x3, 0x2, 0x2, 
+    0x2, 0x24b, 0x234, 0x3, 0x2, 0x2, 0x2, 0x24c, 0x17, 0x3, 0x2, 0x2, 0x2, 
+    0x24d, 0x24e, 0x7, 0xcd, 0x2, 0x2, 0x24e, 0x253, 0x5, 0x1a, 0xe, 0x2, 
+    0x24f, 0x250, 0x7, 0xc2, 0x2, 0x2, 0x250, 0x252, 0x5, 0x1a, 0xe, 0x2, 
+    0x251, 0x24f, 0x3, 0x2, 0x2, 0x2, 0x252, 0x255, 0x3, 0x2, 0x2, 0x2, 
+    0x253, 0x251, 0x3, 0x2, 0x2, 0x2, 0x253, 0x254, 0x3, 0x2, 0x2, 0x2, 
+    0x254, 0x256, 0x3, 0x2, 0x2, 0x2, 0x255, 0x253, 0x3, 0x2, 0x2, 0x2, 
+    0x256, 0x257, 0x7, 0xd7, 0x2, 0x2, 0x257, 0x19, 0x3, 0x2, 0x2, 0x2, 
+    0x258, 0x259, 0x5, 0xd0, 0x69, 0x2, 0x259, 0x26f, 0x5, 0xa4, 0x53, 0x2, 
+    0x25a, 0x25b, 0x6, 0xe, 0x2, 0x3, 0x25b, 0x25c, 0x7, 0x26, 0x2, 0x2, 
+    0x25c, 0x25d, 0x5, 0xc6, 0x64, 0x2, 0x25d, 0x25e, 0x8, 0xe, 0x1, 0x2, 
+    0x25e, 0x26e, 0x3, 0x2, 0x2, 0x2, 0x25f, 0x260, 0x6, 0xe, 0x3, 0x3, 
+    0x260, 0x261, 0x7, 0x39, 0x2, 0x2, 0x261, 0x262, 0x5, 0xaa, 0x56, 0x2, 
+    0x262, 0x263, 0x8, 0xe, 0x1, 0x2, 0x263, 0x26e, 0x3, 0x2, 0x2, 0x2, 
+    0x264, 0x265, 0x6, 0xe, 0x4, 0x3, 0x265, 0x266, 0x7, 0x49, 0x2, 0x2, 
+    0x266, 0x26e, 0x8, 0xe, 0x1, 0x2, 0x267, 0x268, 0x6, 0xe, 0x5, 0x3, 
+    0x268, 0x269, 0x7, 0x51, 0x2, 0x2, 0x269, 0x26e, 0x8, 0xe, 0x1, 0x2, 
+    0x26a, 0x26b, 0x6, 0xe, 0x6, 0x3, 0x26b, 0x26c, 0x7, 0x57, 0x2, 0x2, 
+    0x26c, 0x26e, 0x8, 0xe, 0x1, 0x2, 0x26d, 0x25a, 0x3, 0x2, 0x2, 0x2, 
+    0x26d, 0x25f, 0x3, 0x2, 0x2, 0x2, 0x26d, 0x264, 0x3, 0x2, 0x2, 0x2, 
+    0x26d, 0x267, 0x3, 0x2, 0x2, 0x2, 0x26d, 0x26a, 0x3, 0x2, 0x2, 0x2, 
+    0x26e, 0x271, 0x3, 0x2, 0x2, 0x2, 0x26f, 0x26d, 0x3, 0x2, 0x2, 0x2, 
+    0x26f, 0x270, 0x3, 0x2, 0x2, 0x2, 0x270, 0x1b, 0x3, 0x2, 0x2, 0x2, 0x271, 
+    0x26f, 0x3, 0x2, 0x2, 0x2, 0x272, 0x274, 0x5, 0x1e, 0x10, 0x2, 0x273, 
+    0x272, 0x3, 0x2, 0x2, 0x2, 0x273, 0x274, 0x3, 0x2, 0x2, 0x2, 0x274, 
+    0x28b, 0x3, 0x2, 0x2, 0x2, 0x275, 0x276, 0x6, 0xf, 0x7, 0x3, 0x276, 
+    0x277, 0x5, 0x22, 0x12, 0x2, 0x277, 0x278, 0x8, 0xf, 0x1, 0x2, 0x278, 
+    0x28a, 0x3, 0x2, 0x2, 0x2, 0x279, 0x27a, 0x6, 0xf, 0x8, 0x3, 0x27a, 
+    0x27b, 0x5, 0x24, 0x13, 0x2, 0x27b, 0x27c, 0x8, 0xf, 0x1, 0x2, 0x27c, 
+    0x28a, 0x3, 0x2, 0x2, 0x2, 0x27d, 0x27e, 0x6, 0xf, 0x9, 0x3, 0x27e, 
+    0x27f, 0x5, 0x26, 0x14, 0x2, 0x27f, 0x280, 0x8, 0xf, 0x1, 0x2, 0x280, 
+    0x28a, 0x3, 0x2, 0x2, 0x2, 0x281, 0x282, 0x6, 0xf, 0xa, 0x3, 0x282, 
+    0x283, 0x5, 0x28, 0x15, 0x2, 0x283, 0x284, 0x8, 0xf, 0x1, 0x2, 0x284, 
+    0x28a, 0x3, 0x2, 0x2, 0x2, 0x285, 0x286, 0x6, 0xf, 0xb, 0x3, 0x286, 
+    0x287, 0x5, 0x2a, 0x16, 0x2, 0x287, 0x288, 0x8, 0xf, 0x1, 0x2, 0x288, 
+    0x28a, 0x3, 0x2, 0x2, 0x2, 0x289, 0x275, 0x3, 0x2, 0x2, 0x2, 0x289, 
+    0x279, 0x3, 0x2, 0x2, 0x2, 0x289, 0x27d, 0x3, 0x2, 0x2, 0x2, 0x289, 
+    0x281, 0x3, 0x2, 0x2, 0x2, 0x289, 0x285, 0x3, 0x2, 0x2, 0x2, 0x28a, 
+    0x28d, 0x3, 0x2, 0x2, 0x2, 0x28b, 0x289, 0x3, 0x2, 0x2, 0x2, 0x28b, 
+    0x28c, 0x3, 0x2, 0x2, 0x2, 0x28c, 0x1d, 0x3, 0x2, 0x2, 0x2, 0x28d, 0x28b, 
+    0x3, 0x2, 0x2, 0x2, 0x28e, 0x28f, 0x7, 0x7d, 0x2, 0x2, 0x28f, 0x290, 
+    0x7, 0x59, 0x2, 0x2, 0x290, 0x291, 0x5, 0xa6, 0x54, 0x2, 0x291, 0x1f, 
+    0x3, 0x2, 0x2, 0x2, 0x292, 0x299, 0x5, 0xd0, 0x69, 0x2, 0x293, 0x296, 
+    0x5, 0xd0, 0x69, 0x2, 0x294, 0x295, 0x7, 0xcd, 0x2, 0x2, 0x295, 0x297, 
+    0x7, 0xd7, 0x2, 0x2, 0x296, 0x294, 0x3, 0x2, 0x2, 0x2, 0x296, 0x297, 
+    0x3, 0x2, 0x2, 0x2, 0x297, 0x29a, 0x3, 0x2, 0x2, 0x2, 0x298, 0x29a, 
+    0x5, 0xc6, 0x64, 0x2, 0x299, 0x293, 0x3, 0x2, 0x2, 0x2, 0x299, 0x298, 
+    0x3, 0x2, 0x2, 0x2, 0x29a, 0x21, 0x3, 0x2, 0x2, 0x2, 0x29b, 0x29c, 0x7, 
+    0x90, 0x2, 0x2, 0x29c, 0x29d, 0x7, 0xcd, 0x2, 0x2, 0x29d, 0x29e, 0x5, 
+    0xd0, 0x69, 0x2, 0x29e, 0x2a2, 0x7, 0xcd, 0x2, 0x2, 0x29f, 0x2a1, 0x5, 
+    0x20, 0x11, 0x2, 0x2a0, 0x29f, 0x3, 0x2, 0x2, 0x2, 0x2a1, 0x2a4, 0x3, 
+    0x2, 0x2, 0x2, 0x2a2, 0x2a0, 0x3, 0x2, 0x2, 0x2, 0x2a2, 0x2a3, 0x3, 
+    0x2, 0x2, 0x2, 0x2a3, 0x2a5, 0x3, 0x2, 0x2, 0x2, 0x2a4, 0x2a2, 0x3, 
+    0x2, 0x2, 0x2, 0x2a5, 0x2a6, 0x7, 0xd7, 0x2, 0x2, 0x2a6, 0x2a7, 0x7, 
+    0xd7, 0x2, 0x2, 0x2a7, 0x23, 0x3, 0x2, 0x2, 0x2, 0x2a8, 0x2a9, 0x7, 
+    0x5f, 0x2, 0x2, 0x2a9, 0x2b3, 0x7, 0xcd, 0x2, 0x2, 0x2aa, 0x2b4, 0x7, 
+    0xba, 0x2, 0x2, 0x2ab, 0x2ac, 0x7, 0x68, 0x2, 0x2, 0x2ac, 0x2ad, 0x7, 
+    0xba, 0x2, 0x2, 0x2ad, 0x2ae, 0x7, 0x66, 0x2, 0x2, 0x2ae, 0x2b4, 0x7, 
+    0xba, 0x2, 0x2, 0x2af, 0x2b0, 0x7, 0x66, 0x2, 0x2, 0x2b0, 0x2b1, 0x7, 
+    0xba, 0x2, 0x2, 0x2b1, 0x2b2, 0x7, 0x68, 0x2, 0x2, 0x2b2, 0x2b4, 0x7, 
+    0xba, 0x2, 0x2, 0x2b3, 0x2aa, 0x3, 0x2, 0x2, 0x2, 0x2b3, 0x2ab, 0x3, 
+    0x2, 0x2, 0x2, 0x2b3, 0x2af, 0x3, 0x2, 0x2, 0x2, 0x2b4, 0x2b5, 0x3, 
+    0x2, 0x2, 0x2, 0x2b5, 0x2b6, 0x7, 0xd7, 0x2, 0x2, 0x2b6, 0x25, 0x3, 
+    0x2, 0x2, 0x2, 0x2b7, 0x2b8, 0x7, 0x5c, 0x2, 0x2, 0x2b8, 0x2b9, 0x7, 
+    0xcd, 0x2, 0x2, 0x2b9, 0x2ba, 0x5, 0xd0, 0x69, 0x2, 0x2ba, 0x2be, 0x7, 
+    0xcd, 0x2, 0x2, 0x2bb, 0x2bd, 0x5, 0x20, 0x11, 0x2, 0x2bc, 0x2bb, 0x3, 
+    0x2, 0x2, 0x2, 0x2bd, 0x2c0, 0x3, 0x2, 0x2, 0x2, 0x2be, 0x2bc, 0x3, 
+    0x2, 0x2, 0x2, 0x2be, 0x2bf, 0x3, 0x2, 0x2, 0x2, 0x2bf, 0x2c1, 0x3, 
+    0x2, 0x2, 0x2, 0x2c0, 0x2be, 0x3, 0x2, 0x2, 0x2, 0x2c1, 0x2c2, 0x7, 
+    0xd7, 0x2, 0x2, 0x2c2, 0x2c3, 0x7, 0xd7, 0x2, 0x2, 0x2c3, 0x27, 0x3, 
+    0x2, 0x2, 0x2, 0x2c4, 0x2c5, 0x7, 0x7f, 0x2, 0x2, 0x2c5, 0x2d0, 0x7, 
+    0xcd, 0x2, 0x2, 0x2c6, 0x2c7, 0x7, 0x68, 0x2, 0x2, 0x2c7, 0x2c8, 0x5, 
+    0xd0, 0x69, 0x2, 0x2c8, 0x2c9, 0x7, 0x66, 0x2, 0x2, 0x2c9, 0x2ca, 0x5, 
+    0xd0, 0x69, 0x2, 0x2ca, 0x2d1, 0x3, 0x2, 0x2, 0x2, 0x2cb, 0x2cc, 0x7, 
+    0x66, 0x2, 0x2, 0x2cc, 0x2cd, 0x5, 0xd0, 0x69, 0x2, 0x2cd, 0x2ce, 0x7, 
+    0x68, 0x2, 0x2, 0x2ce, 0x2cf, 0x5, 0xd0, 0x69, 0x2, 0x2cf, 0x2d1, 0x3, 
+    0x2, 0x2, 0x2, 0x2d0, 0x2c6, 0x3, 0x2, 0x2, 0x2, 0x2d0, 0x2cb, 0x3, 
+    0x2, 0x2, 0x2, 0x2d1, 0x2d2, 0x3, 0x2, 0x2, 0x2, 0x2d2, 0x2d3, 0x7, 
+    0xd7, 0x2, 0x2, 0x2d3, 0x29, 0x3, 0x2, 0x2, 0x2, 0x2d4, 0x2d5, 0x7, 
+    0x8e, 0x2, 0x2, 0x2d5, 0x2d6, 0x7, 0xcd, 0x2, 0x2, 0x2d6, 0x2d7, 0x5, 
+    0x94, 0x4b, 0x2, 0x2d7, 0x2d8, 0x7, 0xd7, 0x2, 0x2, 0x2d8, 0x2b, 0x3, 
+    0x2, 0x2, 0x2, 0x2d9, 0x2da, 0x7, 0x74, 0x2, 0x2, 0x2da, 0x2dd, 0x7, 
+    0x18, 0x2, 0x2, 0x2db, 0x2de, 0x5, 0xd0, 0x69, 0x2, 0x2dc, 0x2de, 0x7, 
+    0xbc, 0x2, 0x2, 0x2dd, 0x2db, 0x3, 0x2, 0x2, 0x2, 0x2dd, 0x2dc, 0x3, 
+    0x2, 0x2, 0x2, 0x2de, 0x2d, 0x3, 0x2, 0x2, 0x2, 0x2df, 0x2e0, 0x7, 0xab, 
+    0x2, 0x2, 0x2e0, 0x2e1, 0x7, 0xbc, 0x2, 0x2, 0x2e1, 0x2f, 0x3, 0x2, 
+    0x2, 0x2, 0x2e2, 0x2e3, 0x7, 0x9f, 0x2, 0x2, 0x2e3, 0x2e4, 0x5, 0xba, 
+    0x5e, 0x2, 0x2e4, 0x31, 0x3, 0x2, 0x2, 0x2, 0x2e5, 0x2e6, 0x7, 0xc, 
+    0x2, 0x2, 0x2e6, 0x2e7, 0x5, 0x64, 0x33, 0x2, 0x2e7, 0x33, 0x3, 0x2, 
+    0x2, 0x2, 0x2e8, 0x2e9, 0x7, 0xcd, 0x2, 0x2, 0x2e9, 0x2ee, 0x5, 0x42, 
+    0x22, 0x2, 0x2ea, 0x2eb, 0x7, 0xc2, 0x2, 0x2, 0x2eb, 0x2ed, 0x5, 0x42, 
+    0x22, 0x2, 0x2ec, 0x2ea, 0x3, 0x2, 0x2, 0x2, 0x2ed, 0x2f0, 0x3, 0x2, 
+    0x2, 0x2, 0x2ee, 0x2ec, 0x3, 0x2, 0x2, 0x2, 0x2ee, 0x2ef, 0x3, 0x2, 
+    0x2, 0x2, 0x2ef, 0x2f1, 0x3, 0x2, 0x2, 0x2, 0x2f0, 0x2ee, 0x3, 0x2, 
+    0x2, 0x2, 0x2f1, 0x2f2, 0x7, 0xd7, 0x2, 0x2, 0x2f2, 0x2f8, 0x3, 0x2, 
+    0x2, 0x2, 0x2f3, 0x2f4, 0x7, 0xc, 0x2, 0x2, 0x2f4, 0x2f8, 0x5, 0xba, 
+    0x5e, 0x2, 0x2f5, 0x2f6, 0x7, 0xc, 0x2, 0x2, 0x2f6, 0x2f8, 0x5, 0xb8, 
+    0x5d, 0x2, 0x2f7, 0x2e8, 0x3, 0x2, 0x2, 0x2, 0x2f7, 0x2f3, 0x3, 0x2, 
+    0x2, 0x2, 0x2f7, 0x2f5, 0x3, 0x2, 0x2, 0x2, 0x2f8, 0x35, 0x3, 0x2, 0x2, 
+    0x2, 0x2f9, 0x314, 0x5, 0x40, 0x21, 0x2, 0x2fa, 0x2fb, 0x6, 0x1c, 0xc, 
+    0x3, 0x2fb, 0x2fc, 0x5, 0x7a, 0x3e, 0x2, 0x2fc, 0x2fd, 0x8, 0x1c, 0x1, 
+    0x2, 0x2fd, 0x313, 0x3, 0x2, 0x2, 0x2, 0x2fe, 0x2ff, 0x6, 0x1c, 0xd, 
+    0x3, 0x2ff, 0x300, 0x5, 0x38, 0x1d, 0x2, 0x300, 0x301, 0x8, 0x1c, 0x1, 
+    0x2, 0x301, 0x313, 0x3, 0x2, 0x2, 0x2, 0x302, 0x303, 0x6, 0x1c, 0xe, 
+    0x3, 0x303, 0x304, 0x5, 0x3a, 0x1e, 0x2, 0x304, 0x305, 0x8, 0x1c, 0x1, 
+    0x2, 0x305, 0x313, 0x3, 0x2, 0x2, 0x2, 0x306, 0x307, 0x6, 0x1c, 0xf, 
+    0x3, 0x307, 0x308, 0x5, 0x3c, 0x1f, 0x2, 0x308, 0x309, 0x8, 0x1c, 0x1, 
+    0x2, 0x309, 0x313, 0x3, 0x2, 0x2, 0x2, 0x30a, 0x30b, 0x6, 0x1c, 0x10, 
+    0x3, 0x30b, 0x30c, 0x5, 0x3e, 0x20, 0x2, 0x30c, 0x30d, 0x8, 0x1c, 0x1, 
+    0x2, 0x30d, 0x313, 0x3, 0x2, 0x2, 0x2, 0x30e, 0x30f, 0x6, 0x1c, 0x11, 
+    0x3, 0x30f, 0x310, 0x5, 0x80, 0x41, 0x2, 0x310, 0x311, 0x8, 0x1c, 0x1, 
+    0x2, 0x311, 0x313, 0x3, 0x2, 0x2, 0x2, 0x312, 0x2fa, 0x3, 0x2, 0x2, 
+    0x2, 0x312, 0x2fe, 0x3, 0x2, 0x2, 0x2, 0x312, 0x302, 0x3, 0x2, 0x2, 
+    0x2, 0x312, 0x306, 0x3, 0x2, 0x2, 0x2, 0x312, 0x30a, 0x3, 0x2, 0x2, 
+    0x2, 0x312, 0x30e, 0x3, 0x2, 0x2, 0x2, 0x313, 0x316, 0x3, 0x2, 0x2, 
+    0x2, 0x314, 0x312, 0x3, 0x2, 0x2, 0x2, 0x314, 0x315, 0x3, 0x2, 0x2, 
+    0x2, 0x315, 0x37, 0x3, 0x2, 0x2, 0x2, 0x316, 0x314, 0x3, 0x2, 0x2, 0x2, 
+    0x317, 0x318, 0x7, 0x7a, 0x2, 0x2, 0x318, 0x319, 0x7, 0x13, 0x2, 0x2, 
+    0x319, 0x31a, 0x5, 0xaa, 0x56, 0x2, 0x31a, 0x39, 0x3, 0x2, 0x2, 0x2, 
+    0x31b, 0x31c, 0x7, 0x7d, 0x2, 0x2, 0x31c, 0x31d, 0x7, 0x59, 0x2, 0x2, 
+    0x31d, 0x31e, 0x5, 0xaa, 0x56, 0x2, 0x31e, 0x3b, 0x3, 0x2, 0x2, 0x2, 
+    0x31f, 0x320, 0x7, 0x88, 0x2, 0x2, 0x320, 0x321, 0x7, 0x13, 0x2, 0x2, 
+    0x321, 0x322, 0x5, 0xaa, 0x56, 0x2, 0x322, 0x3d, 0x3, 0x2, 0x2, 0x2, 
+    0x323, 0x324, 0x7, 0xa5, 0x2, 0x2, 0x324, 0x329, 0x5, 0x4e, 0x28, 0x2, 
+    0x325, 0x326, 0x7, 0xc2, 0x2, 0x2, 0x326, 0x328, 0x5, 0x4e, 0x28, 0x2, 
+    0x327, 0x325, 0x3, 0x2, 0x2, 0x2, 0x328, 0x32b, 0x3, 0x2, 0x2, 0x2, 
+    0x329, 0x327, 0x3, 0x2, 0x2, 0x2, 0x329, 0x32a, 0x3, 0x2, 0x2, 0x2, 
+    0x32a, 0x3f, 0x3, 0x2, 0x2, 0x2, 0x32b, 0x329, 0x3, 0x2, 0x2, 0x2, 0x32c, 
+    0x32e, 0x7, 0x35, 0x2, 0x2, 0x32d, 0x32f, 0x7, 0xc7, 0x2, 0x2, 0x32e, 
+    0x32d, 0x3, 0x2, 0x2, 0x2, 0x32e, 0x32f, 0x3, 0x2, 0x2, 0x2, 0x32f, 
+    0x330, 0x3, 0x2, 0x2, 0x2, 0x330, 0x336, 0x5, 0xd2, 0x6a, 0x2, 0x331, 
+    0x333, 0x7, 0xcd, 0x2, 0x2, 0x332, 0x334, 0x5, 0xa6, 0x54, 0x2, 0x333, 
+    0x332, 0x3, 0x2, 0x2, 0x2, 0x333, 0x334, 0x3, 0x2, 0x2, 0x2, 0x334, 
+    0x335, 0x3, 0x2, 0x2, 0x2, 0x335, 0x337, 0x7, 0xd7, 0x2, 0x2, 0x336, 
+    0x331, 0x3, 0x2, 0x2, 0x2, 0x336, 0x337, 0x3, 0x2, 0x2, 0x2, 0x337, 
+    0x41, 0x3, 0x2, 0x2, 0x2, 0x338, 0x341, 0x5, 0x44, 0x23, 0x2, 0x339, 
+    0x33a, 0x7, 0x1d, 0x2, 0x2, 0x33a, 0x33b, 0x5, 0xd0, 0x69, 0x2, 0x33b, 
+    0x33c, 0x7, 0x16, 0x2, 0x2, 0x33c, 0x33d, 0x5, 0xaa, 0x56, 0x2, 0x33d, 
+    0x341, 0x3, 0x2, 0x2, 0x2, 0x33e, 0x33f, 0x7, 0x4f, 0x2, 0x2, 0x33f, 
+    0x341, 0x5, 0x48, 0x25, 0x2, 0x340, 0x338, 0x3, 0x2, 0x2, 0x2, 0x340, 
+    0x339, 0x3, 0x2, 0x2, 0x2, 0x340, 0x33e, 0x3, 0x2, 0x2, 0x2, 0x341, 
+    0x43, 0x3, 0x2, 0x2, 0x2, 0x342, 0x343, 0x5, 0xb4, 0x5b, 0x2, 0x343, 
+    0x345, 0x5, 0xa4, 0x53, 0x2, 0x344, 0x346, 0x5, 0x46, 0x24, 0x2, 0x345, 
+    0x344, 0x3, 0x2, 0x2, 0x2, 0x345, 0x346, 0x3, 0x2, 0x2, 0x2, 0x346, 
+    0x349, 0x3, 0x2, 0x2, 0x2, 0x347, 0x348, 0x7, 0x1c, 0x2, 0x2, 0x348, 
+    0x34a, 0x7, 0xbc, 0x2, 0x2, 0x349, 0x347, 0x3, 0x2, 0x2, 0x2, 0x349, 
+    0x34a, 0x3, 0x2, 0x2, 0x2, 0x34a, 0x34c, 0x3, 0x2, 0x2, 0x2, 0x34b, 
+    0x34d, 0x5, 0x4a, 0x26, 0x2, 0x34c, 0x34b, 0x3, 0x2, 0x2, 0x2, 0x34c, 
+    0x34d, 0x3, 0x2, 0x2, 0x2, 0x34d, 0x350, 0x3, 0x2, 0x2, 0x2, 0x34e, 
+    0x34f, 0x7, 0xa5, 0x2, 0x2, 0x34f, 0x351, 0x5, 0xaa, 0x56, 0x2, 0x350, 
+    0x34e, 0x3, 0x2, 0x2, 0x2, 0x350, 0x351, 0x3, 0x2, 0x2, 0x2, 0x351, 
+    0x363, 0x3, 0x2, 0x2, 0x2, 0x352, 0x354, 0x5, 0xb4, 0x5b, 0x2, 0x353, 
+    0x355, 0x5, 0xa4, 0x53, 0x2, 0x354, 0x353, 0x3, 0x2, 0x2, 0x2, 0x354, 
+    0x355, 0x3, 0x2, 0x2, 0x2, 0x355, 0x356, 0x3, 0x2, 0x2, 0x2, 0x356, 
+    0x359, 0x5, 0x46, 0x24, 0x2, 0x357, 0x358, 0x7, 0x1c, 0x2, 0x2, 0x358, 
+    0x35a, 0x7, 0xbc, 0x2, 0x2, 0x359, 0x357, 0x3, 0x2, 0x2, 0x2, 0x359, 
+    0x35a, 0x3, 0x2, 0x2, 0x2, 0x35a, 0x35c, 0x3, 0x2, 0x2, 0x2, 0x35b, 
+    0x35d, 0x5, 0x4a, 0x26, 0x2, 0x35c, 0x35b, 0x3, 0x2, 0x2, 0x2, 0x35c, 
+    0x35d, 0x3, 0x2, 0x2, 0x2, 0x35d, 0x360, 0x3, 0x2, 0x2, 0x2, 0x35e, 
+    0x35f, 0x7, 0xa5, 0x2, 0x2, 0x35f, 0x361, 0x5, 0xaa, 0x56, 0x2, 0x360, 
+    0x35e, 0x3, 0x2, 0x2, 0x2, 0x360, 0x361, 0x3, 0x2, 0x2, 0x2, 0x361, 
+    0x363, 0x3, 0x2, 0x2, 0x2, 0x362, 0x342, 0x3, 0x2, 0x2, 0x2, 0x362, 
+    0x352, 0x3, 0x2, 0x2, 0x2, 0x363, 0x45, 0x3, 0x2, 0x2, 0x2, 0x364, 0x365, 
+    0x9, 0x4, 0x2, 0x2, 0x365, 0x366, 0x5, 0xaa, 0x56, 0x2, 0x366, 0x47, 
+    0x3, 0x2, 0x2, 0x2, 0x367, 0x368, 0x5, 0xb4, 0x5b, 0x2, 0x368, 0x369, 
+    0x5, 0xaa, 0x56, 0x2, 0x369, 0x36a, 0x7, 0xa6, 0x2, 0x2, 0x36a, 0x36b, 
+    0x5, 0xa4, 0x53, 0x2, 0x36b, 0x36c, 0x7, 0x46, 0x2, 0x2, 0x36c, 0x36d, 
+    0x7, 0xba, 0x2, 0x2, 0x36d, 0x49, 0x3, 0x2, 0x2, 0x2, 0x36e, 0x36f, 
+    0x7, 0x19, 0x2, 0x2, 0x36f, 0x370, 0x7, 0xcd, 0x2, 0x2, 0x370, 0x375, 
+    0x5, 0x4c, 0x27, 0x2, 0x371, 0x372, 0x7, 0xc2, 0x2, 0x2, 0x372, 0x374, 
+    0x5, 0x4c, 0x27, 0x2, 0x373, 0x371, 0x3, 0x2, 0x2, 0x2, 0x374, 0x377, 
+    0x3, 0x2, 0x2, 0x2, 0x375, 0x373, 0x3, 0x2, 0x2, 0x2, 0x375, 0x376, 
+    0x3, 0x2, 0x2, 0x2, 0x376, 0x378, 0x3, 0x2, 0x2, 0x2, 0x377, 0x375, 
+    0x3, 0x2, 0x2, 0x2, 0x378, 0x379, 0x7, 0xd7, 0x2, 0x2, 0x379, 0x4b, 
+    0x3, 0x2, 0x2, 0x2, 0x37a, 0x380, 0x5, 0xd0, 0x69, 0x2, 0x37b, 0x37d, 
+    0x7, 0xcd, 0x2, 0x2, 0x37c, 0x37e, 0x5, 0xa6, 0x54, 0x2, 0x37d, 0x37c, 
+    0x3, 0x2, 0x2, 0x2, 0x37d, 0x37e, 0x3, 0x2, 0x2, 0x2, 0x37e, 0x37f, 
+    0x3, 0x2, 0x2, 0x2, 0x37f, 0x381, 0x7, 0xd7, 0x2, 0x2, 0x380, 0x37b, 
+    0x3, 0x2, 0x2, 0x2, 0x380, 0x381, 0x3, 0x2, 0x2, 0x2, 0x381, 0x4d, 0x3, 
+    0x2, 0x2, 0x2, 0x382, 0x38a, 0x5, 0xaa, 0x56, 0x2, 0x383, 0x38b, 0x7, 
+    0x28, 0x2, 0x2, 0x384, 0x385, 0x7, 0x9f, 0x2, 0x2, 0x385, 0x386, 0x7, 
+    0x2f, 0x2, 0x2, 0x386, 0x38b, 0x7, 0xbc, 0x2, 0x2, 0x387, 0x388, 0x7, 
+    0x9f, 0x2, 0x2, 0x388, 0x389, 0x7, 0xae, 0x2, 0x2, 0x389, 0x38b, 0x7, 
+    0xbc, 0x2, 0x2, 0x38a, 0x383, 0x3, 0x2, 0x2, 0x2, 0x38a, 0x384, 0x3, 
+    0x2, 0x2, 0x2, 0x38a, 0x387, 0x3, 0x2, 0x2, 0x2, 0x38a, 0x38b, 0x3, 
+    0x2, 0x2, 0x2, 0x38b, 0x4f, 0x3, 0x2, 0x2, 0x2, 0x38c, 0x38e, 0x9, 0x5, 
+    0x2, 0x2, 0x38d, 0x38f, 0x7, 0x97, 0x2, 0x2, 0x38e, 0x38d, 0x3, 0x2, 
+    0x2, 0x2, 0x38e, 0x38f, 0x3, 0x2, 0x2, 0x2, 0x38f, 0x390, 0x3, 0x2, 
+    0x2, 0x2, 0x390, 0x391, 0x5, 0xb6, 0x5c, 0x2, 0x391, 0x51, 0x3, 0x2, 
+    0x2, 0x2, 0x392, 0x393, 0x9, 0x6, 0x2, 0x2, 0x393, 0x396, 0x7, 0x21, 
+    0x2, 0x2, 0x394, 0x395, 0x7, 0x4c, 0x2, 0x2, 0x395, 0x397, 0x7, 0x37, 
+    0x2, 0x2, 0x396, 0x394, 0x3, 0x2, 0x2, 0x2, 0x396, 0x397, 0x3, 0x2, 
+    0x2, 0x2, 0x397, 0x398, 0x3, 0x2, 0x2, 0x2, 0x398, 0x39a, 0x5, 0xc0, 
+    0x61, 0x2, 0x399, 0x39b, 0x5, 0x2c, 0x17, 0x2, 0x39a, 0x399, 0x3, 0x2, 
+    0x2, 0x2, 0x39a, 0x39b, 0x3, 0x2, 0x2, 0x2, 0x39b, 0x3b2, 0x3, 0x2, 
+    0x2, 0x2, 0x39c, 0x3a3, 0x9, 0x6, 0x2, 0x2, 0x39d, 0x3a4, 0x7, 0x2e, 
+    0x2, 0x2, 0x39e, 0x3a0, 0x7, 0x99, 0x2, 0x2, 0x39f, 0x39e, 0x3, 0x2, 
+    0x2, 0x2, 0x39f, 0x3a0, 0x3, 0x2, 0x2, 0x2, 0x3a0, 0x3a1, 0x3, 0x2, 
+    0x2, 0x2, 0x3a1, 0x3a4, 0x7, 0x97, 0x2, 0x2, 0x3a2, 0x3a4, 0x7, 0xad, 
+    0x2, 0x2, 0x3a3, 0x39d, 0x3, 0x2, 0x2, 0x2, 0x3a3, 0x39f, 0x3, 0x2, 
+    0x2, 0x2, 0x3a3, 0x3a2, 0x3, 0x2, 0x2, 0x2, 0x3a4, 0x3a7, 0x3, 0x2, 
+    0x2, 0x2, 0x3a5, 0x3a6, 0x7, 0x4c, 0x2, 0x2, 0x3a6, 0x3a8, 0x7, 0x37, 
+    0x2, 0x2, 0x3a7, 0x3a5, 0x3, 0x2, 0x2, 0x2, 0x3a7, 0x3a8, 0x3, 0x2, 
+    0x2, 0x2, 0x3a8, 0x3a9, 0x3, 0x2, 0x2, 0x2, 0x3a9, 0x3ab, 0x5, 0xba, 
+    0x5e, 0x2, 0x3aa, 0x3ac, 0x5, 0x2c, 0x17, 0x2, 0x3ab, 0x3aa, 0x3, 0x2, 
+    0x2, 0x2, 0x3ab, 0x3ac, 0x3, 0x2, 0x2, 0x2, 0x3ac, 0x3af, 0x3, 0x2, 
+    0x2, 0x2, 0x3ad, 0x3ae, 0x7, 0x6f, 0x2, 0x2, 0x3ae, 0x3b0, 0x7, 0x27, 
+    0x2, 0x2, 0x3af, 0x3ad, 0x3, 0x2, 0x2, 0x2, 0x3af, 0x3b0, 0x3, 0x2, 
+    0x2, 0x2, 0x3b0, 0x3b2, 0x3, 0x2, 0x2, 0x2, 0x3b1, 0x392, 0x3, 0x2, 
+    0x2, 0x2, 0x3b1, 0x39c, 0x3, 0x2, 0x2, 0x2, 0x3b2, 0x53, 0x3, 0x2, 0x2, 
+    0x2, 0x3b3, 0x3b4, 0x7, 0x37, 0x2, 0x2, 0x3b4, 0x3b5, 0x7, 0x21, 0x2, 
+    0x2, 0x3b5, 0x3c1, 0x5, 0xc0, 0x61, 0x2, 0x3b6, 0x3bd, 0x7, 0x37, 0x2, 
+    0x2, 0x3b7, 0x3be, 0x7, 0x2e, 0x2, 0x2, 0x3b8, 0x3ba, 0x7, 0x99, 0x2, 
+    0x2, 0x3b9, 0x3b8, 0x3, 0x2, 0x2, 0x2, 0x3b9, 0x3ba, 0x3, 0x2, 0x2, 
+    0x2, 0x3ba, 0x3bb, 0x3, 0x2, 0x2, 0x2, 0x3bb, 0x3be, 0x7, 0x97, 0x2, 
+    0x2, 0x3bc, 0x3be, 0x7, 0xad, 0x2, 0x2, 0x3bd, 0x3b7, 0x3, 0x2, 0x2, 
+    0x2, 0x3bd, 0x3b9, 0x3, 0x2, 0x2, 0x2, 0x3bd, 0x3bc, 0x3, 0x2, 0x2, 
+    0x2, 0x3bd, 0x3be, 0x3, 0x2, 0x2, 0x2, 0x3be, 0x3bf, 0x3, 0x2, 0x2, 
+    0x2, 0x3bf, 0x3c1, 0x5, 0xba, 0x5e, 0x2, 0x3c0, 0x3b3, 0x3, 0x2, 0x2, 
+    0x2, 0x3c0, 0x3b6, 0x3, 0x2, 0x2, 0x2, 0x3c1, 0x55, 0x3, 0x2, 0x2, 0x2, 
+    0x3c2, 0x3c3, 0x7, 0x38, 0x2, 0x2, 0x3c3, 0x3c4, 0x7, 0x95, 0x2, 0x2, 
+    0x3c4, 0x3c5, 0x5, 0x4, 0x3, 0x2, 0x3c5, 0x57, 0x3, 0x2, 0x2, 0x2, 0x3c6, 
+    0x3c7, 0x7, 0x53, 0x2, 0x2, 0x3c7, 0x3c9, 0x7, 0x55, 0x2, 0x2, 0x3c8, 
+    0x3ca, 0x7, 0x97, 0x2, 0x2, 0x3c9, 0x3c8, 0x3, 0x2, 0x2, 0x2, 0x3c9, 
+    0x3ca, 0x3, 0x2, 0x2, 0x2, 0x3ca, 0x3ce, 0x3, 0x2, 0x2, 0x2, 0x3cb, 
+    0x3cf, 0x5, 0xba, 0x5e, 0x2, 0x3cc, 0x3cd, 0x7, 0x44, 0x2, 0x2, 0x3cd, 
+    0x3cf, 0x5, 0xb8, 0x5d, 0x2, 0x3ce, 0x3cb, 0x3, 0x2, 0x2, 0x2, 0x3ce, 
+    0x3cc, 0x3, 0x2, 0x2, 0x2, 0x3cf, 0x3d1, 0x3, 0x2, 0x2, 0x2, 0x3d0, 
+    0x3d2, 0x5, 0x5a, 0x2e, 0x2, 0x3d1, 0x3d0, 0x3, 0x2, 0x2, 0x2, 0x3d1, 
+    0x3d2, 0x3, 0x2, 0x2, 0x2, 0x3d2, 0x3d3, 0x3, 0x2, 0x2, 0x2, 0x3d3, 
+    0x3d4, 0x5, 0x5c, 0x2f, 0x2, 0x3d4, 0x59, 0x3, 0x2, 0x2, 0x2, 0x3d5, 
+    0x3d6, 0x7, 0xcd, 0x2, 0x2, 0x3d6, 0x3db, 0x5, 0xb4, 0x5b, 0x2, 0x3d7, 
+    0x3d8, 0x7, 0xc2, 0x2, 0x2, 0x3d8, 0x3da, 0x5, 0xb4, 0x5b, 0x2, 0x3d9, 
+    0x3d7, 0x3, 0x2, 0x2, 0x2, 0x3da, 0x3dd, 0x3, 0x2, 0x2, 0x2, 0x3db, 
+    0x3d9, 0x3, 0x2, 0x2, 0x2, 0x3db, 0x3dc, 0x3, 0x2, 0x2, 0x2, 0x3dc, 
+    0x3de, 0x3, 0x2, 0x2, 0x2, 0x3dd, 0x3db, 0x3, 0x2, 0x2, 0x2, 0x3de, 
+    0x3df, 0x7, 0xd7, 0x2, 0x2, 0x3df, 0x5b, 0x3, 0x2, 0x2, 0x2, 0x3e0, 
+    0x3e1, 0x7, 0x40, 0x2, 0x2, 0x3e1, 0x3ea, 0x5, 0xd0, 0x69, 0x2, 0x3e2, 
+    0x3ea, 0x7, 0xac, 0x2, 0x2, 0x3e3, 0x3e5, 0x5, 0x64, 0x33, 0x2, 0x3e4, 
+    0x3e6, 0x7, 0xd8, 0x2, 0x2, 0x3e5, 0x3e4, 0x3, 0x2, 0x2, 0x2, 0x3e5, 
+    0x3e6, 0x3, 0x2, 0x2, 0x2, 0x3e6, 0x3e7, 0x3, 0x2, 0x2, 0x2, 0x3e7, 
+    0x3e8, 0x7, 0x2, 0x2, 0x3, 0x3e8, 0x3ea, 0x3, 0x2, 0x2, 0x2, 0x3e9, 
+    0x3e0, 0x3, 0x2, 0x2, 0x2, 0x3e9, 0x3e2, 0x3, 0x2, 0x2, 0x2, 0x3e9, 
+    0x3e3, 0x3, 0x2, 0x2, 0x2, 0x3ea, 0x5d, 0x3, 0x2, 0x2, 0x2, 0x3eb, 0x3ec, 
+    0x7, 0x5a, 0x2, 0x2, 0x3ec, 0x3ee, 0x7, 0x6d, 0x2, 0x2, 0x3ed, 0x3ef, 
+    0x5, 0x2c, 0x17, 0x2, 0x3ee, 0x3ed, 0x3, 0x2, 0x2, 0x2, 0x3ee, 0x3ef, 
+    0x3, 0x2, 0x2, 0x2, 0x3ef, 0x3f0, 0x3, 0x2, 0x2, 0x2, 0x3f0, 0x3f2, 
+    0x5, 0x74, 0x3b, 0x2, 0x3f1, 0x3f3, 0x9, 0x7, 0x2, 0x2, 0x3f2, 0x3f1, 
+    0x3, 0x2, 0x2, 0x2, 0x3f2, 0x3f3, 0x3, 0x2, 0x2, 0x2, 0x3f3, 0x5f, 0x3, 
+    0x2, 0x2, 0x2, 0x3f4, 0x3f5, 0x7, 0x75, 0x2, 0x2, 0x3f5, 0x3f6, 0x7, 
+    0x97, 0x2, 0x2, 0x3f6, 0x3f8, 0x5, 0xba, 0x5e, 0x2, 0x3f7, 0x3f9, 0x5, 
+    0x2c, 0x17, 0x2, 0x3f8, 0x3f7, 0x3, 0x2, 0x2, 0x2, 0x3f8, 0x3f9, 0x3, 
+    0x2, 0x2, 0x2, 0x3f9, 0x3fb, 0x3, 0x2, 0x2, 0x2, 0x3fa, 0x3fc, 0x5, 
+    0x10, 0x9, 0x2, 0x3fb, 0x3fa, 0x3, 0x2, 0x2, 0x2, 0x3fb, 0x3fc, 0x3, 
+    0x2, 0x2, 0x2, 0x3fc, 0x3fe, 0x3, 0x2, 0x2, 0x2, 0x3fd, 0x3ff, 0x7, 
+    0x3c, 0x2, 0x2, 0x3fe, 0x3fd, 0x3, 0x2, 0x2, 0x2, 0x3fe, 0x3ff, 0x3, 
+    0x2, 0x2, 0x2, 0x3ff, 0x401, 0x3, 0x2, 0x2, 0x2, 0x400, 0x402, 0x7, 
+    0x25, 0x2, 0x2, 0x401, 0x400, 0x3, 0x2, 0x2, 0x2, 0x401, 0x402, 0x3, 
+    0x2, 0x2, 0x2, 0x402, 0x61, 0x3, 0x2, 0x2, 0x2, 0x403, 0x404, 0x7, 0x82, 
+    0x2, 0x2, 0x404, 0x405, 0x7, 0x97, 0x2, 0x2, 0x405, 0x406, 0x5, 0xba, 
+    0x5e, 0x2, 0x406, 0x407, 0x7, 0x9f, 0x2, 0x2, 0x407, 0x40f, 0x5, 0xba, 
+    0x5e, 0x2, 0x408, 0x409, 0x7, 0xc2, 0x2, 0x2, 0x409, 0x40a, 0x5, 0xba, 
+    0x5e, 0x2, 0x40a, 0x40b, 0x7, 0x9f, 0x2, 0x2, 0x40b, 0x40c, 0x5, 0xba, 
+    0x5e, 0x2, 0x40c, 0x40e, 0x3, 0x2, 0x2, 0x2, 0x40d, 0x408, 0x3, 0x2, 
+    0x2, 0x2, 0x40e, 0x411, 0x3, 0x2, 0x2, 0x2, 0x40f, 0x40d, 0x3, 0x2, 
+    0x2, 0x2, 0x40f, 0x410, 0x3, 0x2, 0x2, 0x2, 0x410, 0x413, 0x3, 0x2, 
+    0x2, 0x2, 0x411, 0x40f, 0x3, 0x2, 0x2, 0x2, 0x412, 0x414, 0x5, 0x2c, 
+    0x17, 0x2, 0x413, 0x412, 0x3, 0x2, 0x2, 0x2, 0x413, 0x414, 0x3, 0x2, 
+    0x2, 0x2, 0x414, 0x63, 0x3, 0x2, 0x2, 0x2, 0x415, 0x41b, 0x5, 0x66, 
+    0x34, 0x2, 0x416, 0x417, 0x7, 0xa7, 0x2, 0x2, 0x417, 0x418, 0x7, 0x6, 
+    0x2, 0x2, 0x418, 0x41a, 0x5, 0x66, 0x34, 0x2, 0x419, 0x416, 0x3, 0x2, 
+    0x2, 0x2, 0x41a, 0x41d, 0x3, 0x2, 0x2, 0x2, 0x41b, 0x419, 0x3, 0x2, 
+    0x2, 0x2, 0x41b, 0x41c, 0x3, 0x2, 0x2, 0x2, 0x41c, 0x65, 0x3, 0x2, 0x2, 
+    0x2, 0x41d, 0x41b, 0x3, 0x2, 0x2, 0x2, 0x41e, 0x424, 0x5, 0x68, 0x35, 
+    0x2, 0x41f, 0x420, 0x7, 0xcd, 0x2, 0x2, 0x420, 0x421, 0x5, 0x64, 0x33, 
+    0x2, 0x421, 0x422, 0x7, 0xd7, 0x2, 0x2, 0x422, 0x424, 0x3, 0x2, 0x2, 
+    0x2, 0x423, 0x41e, 0x3, 0x2, 0x2, 0x2, 0x423, 0x41f, 0x3, 0x2, 0x2, 
+    0x2, 0x424, 0x67, 0x3, 0x2, 0x2, 0x2, 0x425, 0x427, 0x5, 0x6a, 0x36, 
+    0x2, 0x426, 0x425, 0x3, 0x2, 0x2, 0x2, 0x426, 0x427, 0x3, 0x2, 0x2, 
+    0x2, 0x427, 0x428, 0x3, 0x2, 0x2, 0x2, 0x428, 0x42a, 0x7, 0x8a, 0x2, 
+    0x2, 0x429, 0x42b, 0x7, 0x30, 0x2, 0x2, 0x42a, 0x429, 0x3, 0x2, 0x2, 
+    0x2, 0x42a, 0x42b, 0x3, 0x2, 0x2, 0x2, 0x42b, 0x42d, 0x3, 0x2, 0x2, 
+    0x2, 0x42c, 0x42e, 0x5, 0x6c, 0x37, 0x2, 0x42d, 0x42c, 0x3, 0x2, 0x2, 
+    0x2, 0x42d, 0x42e, 0x3, 0x2, 0x2, 0x2, 0x42e, 0x42f, 0x3, 0x2, 0x2, 
+    0x2, 0x42f, 0x431, 0x5, 0xa6, 0x54, 0x2, 0x430, 0x432, 0x5, 0x6e, 0x38, 
+    0x2, 0x431, 0x430, 0x3, 0x2, 0x2, 0x2, 0x431, 0x432, 0x3, 0x2, 0x2, 
+    0x2, 0x432, 0x434, 0x3, 0x2, 0x2, 0x2, 0x433, 0x435, 0x5, 0x70, 0x39, 
+    0x2, 0x434, 0x433, 0x3, 0x2, 0x2, 0x2, 0x434, 0x435, 0x3, 0x2, 0x2, 
+    0x2, 0x435, 0x437, 0x3, 0x2, 0x2, 0x2, 0x436, 0x438, 0x5, 0x72, 0x3a, 
+    0x2, 0x437, 0x436, 0x3, 0x2, 0x2, 0x2, 0x437, 0x438, 0x3, 0x2, 0x2, 
+    0x2, 0x438, 0x43a, 0x3, 0x2, 0x2, 0x2, 0x439, 0x43b, 0x5, 0x74, 0x3b, 
+    0x2, 0x43a, 0x439, 0x3, 0x2, 0x2, 0x2, 0x43a, 0x43b, 0x3, 0x2, 0x2, 
+    0x2, 0x43b, 0x43d, 0x3, 0x2, 0x2, 0x2, 0x43c, 0x43e, 0x5, 0x76, 0x3c, 
+    0x2, 0x43d, 0x43c, 0x3, 0x2, 0x2, 0x2, 0x43d, 0x43e, 0x3, 0x2, 0x2, 
+    0x2, 0x43e, 0x441, 0x3, 0x2, 0x2, 0x2, 0x43f, 0x440, 0x7, 0xb3, 0x2, 
+    0x2, 0x440, 0x442, 0x9, 0x8, 0x2, 0x2, 0x441, 0x43f, 0x3, 0x2, 0x2, 
+    0x2, 0x441, 0x442, 0x3, 0x2, 0x2, 0x2, 0x442, 0x445, 0x3, 0x2, 0x2, 
+    0x2, 0x443, 0x444, 0x7, 0xb3, 0x2, 0x2, 0x444, 0x446, 0x7, 0xa1, 0x2, 
+    0x2, 0x445, 0x443, 0x3, 0x2, 0x2, 0x2, 0x445, 0x446, 0x3, 0x2, 0x2, 
+    0x2, 0x446, 0x448, 0x3, 0x2, 0x2, 0x2, 0x447, 0x449, 0x5, 0x78, 0x3d, 
+    0x2, 0x448, 0x447, 0x3, 0x2, 0x2, 0x2, 0x448, 0x449, 0x3, 0x2, 0x2, 
+    0x2, 0x449, 0x44b, 0x3, 0x2, 0x2, 0x2, 0x44a, 0x44c, 0x5, 0x7a, 0x3e, 
+    0x2, 0x44b, 0x44a, 0x3, 0x2, 0x2, 0x2, 0x44b, 0x44c, 0x3, 0x2, 0x2, 
+    0x2, 0x44c, 0x44e, 0x3, 0x2, 0x2, 0x2, 0x44d, 0x44f, 0x5, 0x7c, 0x3f, 
+    0x2, 0x44e, 0x44d, 0x3, 0x2, 0x2, 0x2, 0x44e, 0x44f, 0x3, 0x2, 0x2, 
+    0x2, 0x44f, 0x451, 0x3, 0x2, 0x2, 0x2, 0x450, 0x452, 0x5, 0x7e, 0x40, 
+    0x2, 0x451, 0x450, 0x3, 0x2, 0x2, 0x2, 0x451, 0x452, 0x3, 0x2, 0x2, 
+    0x2, 0x452, 0x454, 0x3, 0x2, 0x2, 0x2, 0x453, 0x455, 0x5, 0x80, 0x41, 
+    0x2, 0x454, 0x453, 0x3, 0x2, 0x2, 0x2, 0x454, 0x455, 0x3, 0x2, 0x2, 
+    0x2, 0x455, 0x69, 0x3, 0x2, 0x2, 0x2, 0x456, 0x457, 0x7, 0xb3, 0x2, 
+    0x2, 0x457, 0x458, 0x5, 0xa6, 0x54, 0x2, 0x458, 0x6b, 0x3, 0x2, 0x2, 
+    0x2, 0x459, 0x45a, 0x7, 0xa0, 0x2, 0x2, 0x45a, 0x45d, 0x7, 0xba, 0x2, 
+    0x2, 0x45b, 0x45c, 0x7, 0xb3, 0x2, 0x2, 0x45c, 0x45e, 0x7, 0x9c, 0x2, 
+    0x2, 0x45d, 0x45b, 0x3, 0x2, 0x2, 0x2, 0x45d, 0x45e, 0x3, 0x2, 0x2, 
+    0x2, 0x45e, 0x6d, 0x3, 0x2, 0x2, 0x2, 0x45f, 0x460, 0x7, 0x42, 0x2, 
+    0x2, 0x460, 0x461, 0x5, 0x82, 0x42, 0x2, 0x461, 0x6f, 0x3, 0x2, 0x2, 
+    0x2, 0x462, 0x464, 0x9, 0x9, 0x2, 0x2, 0x463, 0x462, 0x3, 0x2, 0x2, 
+    0x2, 0x463, 0x464, 0x3, 0x2, 0x2, 0x2, 0x464, 0x465, 0x3, 0x2, 0x2, 
+    0x2, 0x465, 0x466, 0x7, 0xb, 0x2, 0x2, 0x466, 0x467, 0x7, 0x58, 0x2, 
+    0x2, 0x467, 0x468, 0x5, 0xa6, 0x54, 0x2, 0x468, 0x71, 0x3, 0x2, 0x2, 
+    0x2, 0x469, 0x46a, 0x7, 0x7c, 0x2, 0x2, 0x46a, 0x46b, 0x5, 0xaa, 0x56, 
+    0x2, 0x46b, 0x73, 0x3, 0x2, 0x2, 0x2, 0x46c, 0x46d, 0x7, 0xb2, 0x2, 
+    0x2, 0x46d, 0x46e, 0x5, 0xaa, 0x56, 0x2, 0x46e, 0x75, 0x3, 0x2, 0x2, 
+    0x2, 0x46f, 0x470, 0x7, 0x47, 0x2, 0x2, 0x470, 0x477, 0x7, 0x13, 0x2, 
+    0x2, 0x471, 0x472, 0x9, 0x8, 0x2, 0x2, 0x472, 0x473, 0x7, 0xcd, 0x2, 
+    0x2, 0x473, 0x474, 0x5, 0xa6, 0x54, 0x2, 0x474, 0x475, 0x7, 0xd7, 0x2, 
+    0x2, 0x475, 0x478, 0x3, 0x2, 0x2, 0x2, 0x476, 0x478, 0x5, 0xa6, 0x54, 
+    0x2, 0x477, 0x471, 0x3, 0x2, 0x2, 0x2, 0x477, 0x476, 0x3, 0x2, 0x2, 
+    0x2, 0x478, 0x77, 0x3, 0x2, 0x2, 0x2, 0x479, 0x47a, 0x7, 0x48, 0x2, 
+    0x2, 0x47a, 0x47b, 0x5, 0xaa, 0x56, 0x2, 0x47b, 0x79, 0x3, 0x2, 0x2, 
+    0x2, 0x47c, 0x47d, 0x7, 0x77, 0x2, 0x2, 0x47d, 0x47e, 0x7, 0x13, 0x2, 
+    0x2, 0x47e, 0x47f, 0x5, 0x8e, 0x48, 0x2, 0x47f, 0x7b, 0x3, 0x2, 0x2, 
+    0x2, 0x480, 0x481, 0x7, 0x61, 0x2, 0x2, 0x481, 0x482, 0x5, 0x8c, 0x47, 
+    0x2, 0x482, 0x483, 0x7, 0x13, 0x2, 0x2, 0x483, 0x484, 0x5, 0xa6, 0x54, 
+    0x2, 0x484, 0x7d, 0x3, 0x2, 0x2, 0x2, 0x485, 0x486, 0x7, 0x61, 0x2, 
+    0x2, 0x486, 0x489, 0x5, 0x8c, 0x47, 0x2, 0x487, 0x488, 0x7, 0xb3, 0x2, 
+    0x2, 0x488, 0x48a, 0x7, 0x9c, 0x2, 0x2, 0x489, 0x487, 0x3, 0x2, 0x2, 
+    0x2, 0x489, 0x48a, 0x3, 0x2, 0x2, 0x2, 0x48a, 0x7f, 0x3, 0x2, 0x2, 0x2, 
+    0x48b, 0x48c, 0x7, 0x8e, 0x2, 0x2, 0x48c, 0x48d, 0x5, 0x94, 0x4b, 0x2, 
+    0x48d, 0x81, 0x3, 0x2, 0x2, 0x2, 0x48e, 0x48f, 0x8, 0x42, 0x1, 0x2, 
+    0x48f, 0x491, 0x5, 0xb6, 0x5c, 0x2, 0x490, 0x492, 0x7, 0x3c, 0x2, 0x2, 
+    0x491, 0x490, 0x3, 0x2, 0x2, 0x2, 0x491, 0x492, 0x3, 0x2, 0x2, 0x2, 
+    0x492, 0x494, 0x3, 0x2, 0x2, 0x2, 0x493, 0x495, 0x5, 0x8a, 0x46, 0x2, 
+    0x494, 0x493, 0x3, 0x2, 0x2, 0x2, 0x494, 0x495, 0x3, 0x2, 0x2, 0x2, 
+    0x495, 0x49b, 0x3, 0x2, 0x2, 0x2, 0x496, 0x497, 0x7, 0xcd, 0x2, 0x2, 
+    0x497, 0x498, 0x5, 0x82, 0x42, 0x2, 0x498, 0x499, 0x7, 0xd7, 0x2, 0x2, 
+    0x499, 0x49b, 0x3, 0x2, 0x2, 0x2, 0x49a, 0x48e, 0x3, 0x2, 0x2, 0x2, 
+    0x49a, 0x496, 0x3, 0x2, 0x2, 0x2, 0x49b, 0x4ad, 0x3, 0x2, 0x2, 0x2, 
+    0x49c, 0x49d, 0xc, 0x5, 0x2, 0x2, 0x49d, 0x49e, 0x5, 0x86, 0x44, 0x2, 
+    0x49e, 0x49f, 0x5, 0x82, 0x42, 0x6, 0x49f, 0x4ac, 0x3, 0x2, 0x2, 0x2, 
+    0x4a0, 0x4a2, 0xc, 0x6, 0x2, 0x2, 0x4a1, 0x4a3, 0x9, 0xa, 0x2, 0x2, 
+    0x4a2, 0x4a1, 0x3, 0x2, 0x2, 0x2, 0x4a2, 0x4a3, 0x3, 0x2, 0x2, 0x2, 
+    0x4a3, 0x4a5, 0x3, 0x2, 0x2, 0x2, 0x4a4, 0x4a6, 0x5, 0x84, 0x43, 0x2, 
+    0x4a5, 0x4a4, 0x3, 0x2, 0x2, 0x2, 0x4a5, 0x4a6, 0x3, 0x2, 0x2, 0x2, 
+    0x4a6, 0x4a7, 0x3, 0x2, 0x2, 0x2, 0x4a7, 0x4a8, 0x7, 0x58, 0x2, 0x2, 
+    0x4a8, 0x4a9, 0x5, 0x82, 0x42, 0x2, 0x4a9, 0x4aa, 0x5, 0x88, 0x45, 0x2, 
+    0x4aa, 0x4ac, 0x3, 0x2, 0x2, 0x2, 0x4ab, 0x49c, 0x3, 0x2, 0x2, 0x2, 
+    0x4ab, 0x4a0, 0x3, 0x2, 0x2, 0x2, 0x4ac, 0x4af, 0x3, 0x2, 0x2, 0x2, 
+    0x4ad, 0x4ab, 0x3, 0x2, 0x2, 0x2, 0x4ad, 0x4ae, 0x3, 0x2, 0x2, 0x2, 
+    0x4ae, 0x83, 0x3, 0x2, 0x2, 0x2, 0x4af, 0x4ad, 0x3, 0x2, 0x2, 0x2, 0x4b0, 
+    0x4b2, 0x9, 0xb, 0x2, 0x2, 0x4b1, 0x4b0, 0x3, 0x2, 0x2, 0x2, 0x4b1, 
+    0x4b2, 0x3, 0x2, 0x2, 0x2, 0x4b2, 0x4b3, 0x3, 0x2, 0x2, 0x2, 0x4b3, 
+    0x4ba, 0x7, 0x52, 0x2, 0x2, 0x4b4, 0x4b6, 0x7, 0x52, 0x2, 0x2, 0x4b5, 
+    0x4b7, 0x9, 0xb, 0x2, 0x2, 0x4b6, 0x4b5, 0x3, 0x2, 0x2, 0x2, 0x4b6, 
+    0x4b7, 0x3, 0x2, 0x2, 0x2, 0x4b7, 0x4ba, 0x3, 0x2, 0x2, 0x2, 0x4b8, 
+    0x4ba, 0x9, 0xb, 0x2, 0x2, 0x4b9, 0x4b1, 0x3, 0x2, 0x2, 0x2, 0x4b9, 
+    0x4b4, 0x3, 0x2, 0x2, 0x2, 0x4b9, 0x4b8, 0x3, 0x2, 0x2, 0x2, 0x4ba, 
+    0x4dc, 0x3, 0x2, 0x2, 0x2, 0x4bb, 0x4bd, 0x9, 0xc, 0x2, 0x2, 0x4bc, 
+    0x4bb, 0x3, 0x2, 0x2, 0x2, 0x4bc, 0x4bd, 0x3, 0x2, 0x2, 0x2, 0x4bd, 
+    0x4be, 0x3, 0x2, 0x2, 0x2, 0x4be, 0x4c0, 0x9, 0xd, 0x2, 0x2, 0x4bf, 
+    0x4c1, 0x7, 0x78, 0x2, 0x2, 0x4c0, 0x4bf, 0x3, 0x2, 0x2, 0x2, 0x4c0, 
+    0x4c1, 0x3, 0x2, 0x2, 0x2, 0x4c1, 0x4ca, 0x3, 0x2, 0x2, 0x2, 0x4c2, 
+    0x4c4, 0x9, 0xd, 0x2, 0x2, 0x4c3, 0x4c5, 0x7, 0x78, 0x2, 0x2, 0x4c4, 
+    0x4c3, 0x3, 0x2, 0x2, 0x2, 0x4c4, 0x4c5, 0x3, 0x2, 0x2, 0x2, 0x4c5, 
+    0x4c7, 0x3, 0x2, 0x2, 0x2, 0x4c6, 0x4c8, 0x9, 0xc, 0x2, 0x2, 0x4c7, 
+    0x4c6, 0x3, 0x2, 0x2, 0x2, 0x4c7, 0x4c8, 0x3, 0x2, 0x2, 0x2, 0x4c8, 
+    0x4ca, 0x3, 0x2, 0x2, 0x2, 0x4c9, 0x4bc, 0x3, 0x2, 0x2, 0x2, 0x4c9, 
+    0x4c2, 0x3, 0x2, 0x2, 0x2, 0x4ca, 0x4dc, 0x3, 0x2, 0x2, 0x2, 0x4cb, 
+    0x4cd, 0x9, 0xe, 0x2, 0x2, 0x4cc, 0x4cb, 0x3, 0x2, 0x2, 0x2, 0x4cc, 
+    0x4cd, 0x3, 0x2, 0x2, 0x2, 0x4cd, 0x4ce, 0x3, 0x2, 0x2, 0x2, 0x4ce, 
+    0x4d0, 0x7, 0x43, 0x2, 0x2, 0x4cf, 0x4d1, 0x7, 0x78, 0x2, 0x2, 0x4d0, 
+    0x4cf, 0x3, 0x2, 0x2, 0x2, 0x4d0, 0x4d1, 0x3, 0x2, 0x2, 0x2, 0x4d1, 
+    0x4da, 0x3, 0x2, 0x2, 0x2, 0x4d2, 0x4d4, 0x7, 0x43, 0x2, 0x2, 0x4d3, 
+    0x4d5, 0x7, 0x78, 0x2, 0x2, 0x4d4, 0x4d3, 0x3, 0x2, 0x2, 0x2, 0x4d4, 
+    0x4d5, 0x3, 0x2, 0x2, 0x2, 0x4d5, 0x4d7, 0x3, 0x2, 0x2, 0x2, 0x4d6, 
+    0x4d8, 0x9, 0xe, 0x2, 0x2, 0x4d7, 0x4d6, 0x3, 0x2, 0x2, 0x2, 0x4d7, 
+    0x4d8, 0x3, 0x2, 0x2, 0x2, 0x4d8, 0x4da, 0x3, 0x2, 0x2, 0x2, 0x4d9, 
+    0x4cc, 0x3, 0x2, 0x2, 0x2, 0x4d9, 0x4d2, 0x3, 0x2, 0x2, 0x2, 0x4da, 
+    0x4dc, 0x3, 0x2, 0x2, 0x2, 0x4db, 0x4b9, 0x3, 0x2, 0x2, 0x2, 0x4db, 
+    0x4c9, 0x3, 0x2, 0x2, 0x2, 0x4db, 0x4d9, 0x3, 0x2, 0x2, 0x2, 0x4dc, 
+    0x85, 0x3, 0x2, 0x2, 0x2, 0x4dd, 0x4df, 0x9, 0xa, 0x2, 0x2, 0x4de, 0x4dd, 
+    0x3, 0x2, 0x2, 0x2, 0x4de, 0x4df, 0x3, 0x2, 0x2, 0x2, 0x4df, 0x4e0, 
+    0x3, 0x2, 0x2, 0x2, 0x4e0, 0x4e1, 0x7, 0x1f, 0x2, 0x2, 0x4e1, 0x4e4, 
+    0x7, 0x58, 0x2, 0x2, 0x4e2, 0x4e4, 0x7, 0xc2, 0x2, 0x2, 0x4e3, 0x4de, 
+    0x3, 0x2, 0x2, 0x2, 0x4e3, 0x4e2, 0x3, 0x2, 0x2, 0x2, 0x4e4, 0x87, 0x3, 
+    0x2, 0x2, 0x2, 0x4e5, 0x4e6, 0x7, 0x74, 0x2, 0x2, 0x4e6, 0x4ef, 0x5, 
+    0xa6, 0x54, 0x2, 0x4e7, 0x4e8, 0x7, 0xaa, 0x2, 0x2, 0x4e8, 0x4e9, 0x7, 
+    0xcd, 0x2, 0x2, 0x4e9, 0x4ea, 0x5, 0xa6, 0x54, 0x2, 0x4ea, 0x4eb, 0x7, 
+    0xd7, 0x2, 0x2, 0x4eb, 0x4ef, 0x3, 0x2, 0x2, 0x2, 0x4ec, 0x4ed, 0x7, 
+    0xaa, 0x2, 0x2, 0x4ed, 0x4ef, 0x5, 0xa6, 0x54, 0x2, 0x4ee, 0x4e5, 0x3, 
+    0x2, 0x2, 0x2, 0x4ee, 0x4e7, 0x3, 0x2, 0x2, 0x2, 0x4ee, 0x4ec, 0x3, 
+    0x2, 0x2, 0x2, 0x4ef, 0x89, 0x3, 0x2, 0x2, 0x2, 0x4f0, 0x4f1, 0x7, 0x88, 
+    0x2, 0x2, 0x4f1, 0x4f4, 0x5, 0x92, 0x4a, 0x2, 0x4f2, 0x4f3, 0x7, 0x73, 
+    0x2, 0x2, 0x4f3, 0x4f5, 0x5, 0x92, 0x4a, 0x2, 0x4f4, 0x4f2, 0x3, 0x2, 
+    0x2, 0x2, 0x4f4, 0x4f5, 0x3, 0x2, 0x2, 0x2, 0x4f5, 0x8b, 0x3, 0x2, 0x2, 
+    0x2, 0x4f6, 0x4f9, 0x5, 0xaa, 0x56, 0x2, 0x4f7, 0x4f8, 0x9, 0xf, 0x2, 
+    0x2, 0x4f8, 0x4fa, 0x5, 0xaa, 0x56, 0x2, 0x4f9, 0x4f7, 0x3, 0x2, 0x2, 
+    0x2, 0x4f9, 0x4fa, 0x3, 0x2, 0x2, 0x2, 0x4fa, 0x8d, 0x3, 0x2, 0x2, 0x2, 
+    0x4fb, 0x500, 0x5, 0x90, 0x49, 0x2, 0x4fc, 0x4fd, 0x7, 0xc2, 0x2, 0x2, 
+    0x4fd, 0x4ff, 0x5, 0x90, 0x49, 0x2, 0x4fe, 0x4fc, 0x3, 0x2, 0x2, 0x2, 
+    0x4ff, 0x502, 0x3, 0x2, 0x2, 0x2, 0x500, 0x4fe, 0x3, 0x2, 0x2, 0x2, 
+    0x500, 0x501, 0x3, 0x2, 0x2, 0x2, 0x501, 0x8f, 0x3, 0x2, 0x2, 0x2, 0x502, 
+    0x500, 0x3, 0x2, 0x2, 0x2, 0x503, 0x505, 0x5, 0xaa, 0x56, 0x2, 0x504, 
+    0x506, 0x9, 0x10, 0x2, 0x2, 0x505, 0x504, 0x3, 0x2, 0x2, 0x2, 0x505, 
+    0x506, 0x3, 0x2, 0x2, 0x2, 0x506, 0x509, 0x3, 0x2, 0x2, 0x2, 0x507, 
+    0x508, 0x7, 0x72, 0x2, 0x2, 0x508, 0x50a, 0x9, 0x11, 0x2, 0x2, 0x509, 
+    0x507, 0x3, 0x2, 0x2, 0x2, 0x509, 0x50a, 0x3, 0x2, 0x2, 0x2, 0x50a, 
+    0x50d, 0x3, 0x2, 0x2, 0x2, 0x50b, 0x50c, 0x7, 0x1a, 0x2, 0x2, 0x50c, 
+    0x50e, 0x7, 0xbc, 0x2, 0x2, 0x50d, 0x50b, 0x3, 0x2, 0x2, 0x2, 0x50d, 
+    0x50e, 0x3, 0x2, 0x2, 0x2, 0x50e, 0x91, 0x3, 0x2, 0x2, 0x2, 0x50f, 0x512, 
+    0x5, 0xc4, 0x63, 0x2, 0x510, 0x511, 0x7, 0xd9, 0x2, 0x2, 0x511, 0x513, 
+    0x5, 0xc4, 0x63, 0x2, 0x512, 0x510, 0x3, 0x2, 0x2, 0x2, 0x512, 0x513, 
+    0x3, 0x2, 0x2, 0x2, 0x513, 0x93, 0x3, 0x2, 0x2, 0x2, 0x514, 0x519, 0x5, 
+    0x96, 0x4c, 0x2, 0x515, 0x516, 0x7, 0xc2, 0x2, 0x2, 0x516, 0x518, 0x5, 
+    0x96, 0x4c, 0x2, 0x517, 0x515, 0x3, 0x2, 0x2, 0x2, 0x518, 0x51b, 0x3, 
+    0x2, 0x2, 0x2, 0x519, 0x517, 0x3, 0x2, 0x2, 0x2, 0x519, 0x51a, 0x3, 
+    0x2, 0x2, 0x2, 0x51a, 0x95, 0x3, 0x2, 0x2, 0x2, 0x51b, 0x519, 0x3, 0x2, 
+    0x2, 0x2, 0x51c, 0x51d, 0x5, 0xd0, 0x69, 0x2, 0x51d, 0x51e, 0x7, 0xc7, 
+    0x2, 0x2, 0x51e, 0x51f, 0x5, 0xc6, 0x64, 0x2, 0x51f, 0x97, 0x3, 0x2, 
+    0x2, 0x2, 0x520, 0x521, 0x7, 0x8d, 0x2, 0x2, 0x521, 0x522, 0x5, 0x94, 
+    0x4b, 0x2, 0x522, 0x99, 0x3, 0x2, 0x2, 0x2, 0x523, 0x524, 0x7, 0x8f, 
+    0x2, 0x2, 0x524, 0x525, 0x7, 0x1e, 0x2, 0x2, 0x525, 0x526, 0x7, 0x21, 
+    0x2, 0x2, 0x526, 0x54e, 0x5, 0xc0, 0x61, 0x2, 0x527, 0x528, 0x7, 0x8f, 
+    0x2, 0x2, 0x528, 0x529, 0x7, 0x1e, 0x2, 0x2, 0x529, 0x52a, 0x7, 0x2e, 
+    0x2, 0x2, 0x52a, 0x54e, 0x5, 0xba, 0x5e, 0x2, 0x52b, 0x52c, 0x7, 0x8f, 
+    0x2, 0x2, 0x52c, 0x52e, 0x7, 0x1e, 0x2, 0x2, 0x52d, 0x52f, 0x7, 0x99, 
+    0x2, 0x2, 0x52e, 0x52d, 0x3, 0x2, 0x2, 0x2, 0x52e, 0x52f, 0x3, 0x2, 
+    0x2, 0x2, 0x52f, 0x531, 0x3, 0x2, 0x2, 0x2, 0x530, 0x532, 0x7, 0x97, 
+    0x2, 0x2, 0x531, 0x530, 0x3, 0x2, 0x2, 0x2, 0x531, 0x532, 0x3, 0x2, 
+    0x2, 0x2, 0x532, 0x533, 0x3, 0x2, 0x2, 0x2, 0x533, 0x54e, 0x5, 0xba, 
+    0x5e, 0x2, 0x534, 0x535, 0x7, 0x8f, 0x2, 0x2, 0x535, 0x54e, 0x7, 0x22, 
+    0x2, 0x2, 0x536, 0x537, 0x7, 0x8f, 0x2, 0x2, 0x537, 0x53a, 0x7, 0x2d, 
+    0x2, 0x2, 0x538, 0x539, 0x7, 0x42, 0x2, 0x2, 0x539, 0x53b, 0x5, 0xc0, 
+    0x61, 0x2, 0x53a, 0x538, 0x3, 0x2, 0x2, 0x2, 0x53a, 0x53b, 0x3, 0x2, 
+    0x2, 0x2, 0x53b, 0x54e, 0x3, 0x2, 0x2, 0x2, 0x53c, 0x53e, 0x7, 0x8f, 
+    0x2, 0x2, 0x53d, 0x53f, 0x7, 0x99, 0x2, 0x2, 0x53e, 0x53d, 0x3, 0x2, 
+    0x2, 0x2, 0x53e, 0x53f, 0x3, 0x2, 0x2, 0x2, 0x53f, 0x540, 0x3, 0x2, 
+    0x2, 0x2, 0x540, 0x543, 0x7, 0x98, 0x2, 0x2, 0x541, 0x542, 0x9, 0x12, 
+    0x2, 0x2, 0x542, 0x544, 0x5, 0xc0, 0x61, 0x2, 0x543, 0x541, 0x3, 0x2, 
+    0x2, 0x2, 0x543, 0x544, 0x3, 0x2, 0x2, 0x2, 0x544, 0x548, 0x3, 0x2, 
+    0x2, 0x2, 0x545, 0x546, 0x7, 0x60, 0x2, 0x2, 0x546, 0x549, 0x7, 0xbc, 
+    0x2, 0x2, 0x547, 0x549, 0x5, 0x74, 0x3b, 0x2, 0x548, 0x545, 0x3, 0x2, 
+    0x2, 0x2, 0x548, 0x547, 0x3, 0x2, 0x2, 0x2, 0x548, 0x549, 0x3, 0x2, 
+    0x2, 0x2, 0x549, 0x54b, 0x3, 0x2, 0x2, 0x2, 0x54a, 0x54c, 0x5, 0x7e, 
+    0x40, 0x2, 0x54b, 0x54a, 0x3, 0x2, 0x2, 0x2, 0x54b, 0x54c, 0x3, 0x2, 
+    0x2, 0x2, 0x54c, 0x54e, 0x3, 0x2, 0x2, 0x2, 0x54d, 0x523, 0x3, 0x2, 
+    0x2, 0x2, 0x54d, 0x527, 0x3, 0x2, 0x2, 0x2, 0x54d, 0x52b, 0x3, 0x2, 
+    0x2, 0x2, 0x54d, 0x534, 0x3, 0x2, 0x2, 0x2, 0x54d, 0x536, 0x3, 0x2, 
+    0x2, 0x2, 0x54d, 0x53c, 0x3, 0x2, 0x2, 0x2, 0x54e, 0x9b, 0x3, 0x2, 0x2, 
+    0x2, 0x54f, 0x550, 0x7, 0x96, 0x2, 0x2, 0x550, 0x551, 0x7, 0x3e, 0x2, 
+    0x2, 0x551, 0x552, 0x7, 0x31, 0x2, 0x2, 0x552, 0x572, 0x5, 0xba, 0x5e, 
+    0x2, 0x553, 0x554, 0x7, 0x96, 0x2, 0x2, 0x554, 0x555, 0x7, 0x3e, 0x2, 
+    0x2, 0x555, 0x572, 0x7, 0x64, 0x2, 0x2, 0x556, 0x557, 0x7, 0x96, 0x2, 
+    0x2, 0x557, 0x558, 0x7, 0x80, 0x2, 0x2, 0x558, 0x572, 0x7, 0x2d, 0x2, 
+    0x2, 0x559, 0x55a, 0x7, 0x96, 0x2, 0x2, 0x55a, 0x55b, 0x7, 0x80, 0x2, 
+    0x2, 0x55b, 0x55c, 0x7, 0x2e, 0x2, 0x2, 0x55c, 0x572, 0x5, 0xba, 0x5e, 
+    0x2, 0x55d, 0x55e, 0x7, 0x96, 0x2, 0x2, 0x55e, 0x566, 0x9, 0x13, 0x2, 
+    0x2, 0x55f, 0x560, 0x7, 0x31, 0x2, 0x2, 0x560, 0x567, 0x7, 0x8c, 0x2, 
+    0x2, 0x561, 0x567, 0x7, 0x3b, 0x2, 0x2, 0x562, 0x564, 0x7, 0xa5, 0x2, 
+    0x2, 0x563, 0x562, 0x3, 0x2, 0x2, 0x2, 0x563, 0x564, 0x3, 0x2, 0x2, 
+    0x2, 0x564, 0x565, 0x3, 0x2, 0x2, 0x2, 0x565, 0x567, 0x7, 0x67, 0x2, 
+    0x2, 0x566, 0x55f, 0x3, 0x2, 0x2, 0x2, 0x566, 0x561, 0x3, 0x2, 0x2, 
+    0x2, 0x566, 0x563, 0x3, 0x2, 0x2, 0x2, 0x567, 0x568, 0x3, 0x2, 0x2, 
+    0x2, 0x568, 0x572, 0x5, 0xba, 0x5e, 0x2, 0x569, 0x56a, 0x7, 0x96, 0x2, 
+    0x2, 0x56a, 0x56b, 0x9, 0x13, 0x2, 0x2, 0x56b, 0x56c, 0x7, 0x85, 0x2, 
+    0x2, 0x56c, 0x572, 0x7, 0x8c, 0x2, 0x2, 0x56d, 0x56e, 0x7, 0x96, 0x2, 
+    0x2, 0x56e, 0x56f, 0x7, 0x94, 0x2, 0x2, 0x56f, 0x570, 0x7, 0x84, 0x2, 
+    0x2, 0x570, 0x572, 0x5, 0xba, 0x5e, 0x2, 0x571, 0x54f, 0x3, 0x2, 0x2, 
+    0x2, 0x571, 0x553, 0x3, 0x2, 0x2, 0x2, 0x571, 0x556, 0x3, 0x2, 0x2, 
+    0x2, 0x571, 0x559, 0x3, 0x2, 0x2, 0x2, 0x571, 0x55d, 0x3, 0x2, 0x2, 
+    0x2, 0x571, 0x569, 0x3, 0x2, 0x2, 0x2, 0x571, 0x56d, 0x3, 0x2, 0x2, 
+    0x2, 0x572, 0x9d, 0x3, 0x2, 0x2, 0x2, 0x573, 0x575, 0x7, 0xa4, 0x2, 
+    0x2, 0x574, 0x576, 0x7, 0x99, 0x2, 0x2, 0x575, 0x574, 0x3, 0x2, 0x2, 
+    0x2, 0x575, 0x576, 0x3, 0x2, 0x2, 0x2, 0x576, 0x578, 0x3, 0x2, 0x2, 
+    0x2, 0x577, 0x579, 0x7, 0x97, 0x2, 0x2, 0x578, 0x577, 0x3, 0x2, 0x2, 
+    0x2, 0x578, 0x579, 0x3, 0x2, 0x2, 0x2, 0x579, 0x57c, 0x3, 0x2, 0x2, 
+    0x2, 0x57a, 0x57b, 0x7, 0x4c, 0x2, 0x2, 0x57b, 0x57d, 0x7, 0x37, 0x2, 
+    0x2, 0x57c, 0x57a, 0x3, 0x2, 0x2, 0x2, 0x57c, 0x57d, 0x3, 0x2, 0x2, 
+    0x2, 0x57d, 0x57e, 0x3, 0x2, 0x2, 0x2, 0x57e, 0x580, 0x5, 0xba, 0x5e, 
+    0x2, 0x57f, 0x581, 0x5, 0x2c, 0x17, 0x2, 0x580, 0x57f, 0x3, 0x2, 0x2, 
+    0x2, 0x580, 0x581, 0x3, 0x2, 0x2, 0x2, 0x581, 0x9f, 0x3, 0x2, 0x2, 0x2, 
+    0x582, 0x583, 0x7, 0xa9, 0x2, 0x2, 0x583, 0x584, 0x5, 0xc0, 0x61, 0x2, 
+    0x584, 0xa1, 0x3, 0x2, 0x2, 0x2, 0x585, 0x586, 0x7, 0xaf, 0x2, 0x2, 
+    0x586, 0x588, 0x5, 0xba, 0x5e, 0x2, 0x587, 0x589, 0x7, 0x36, 0x2, 0x2, 
+    0x588, 0x587, 0x3, 0x2, 0x2, 0x2, 0x588, 0x589, 0x3, 0x2, 0x2, 0x2, 
+    0x589, 0x58c, 0x3, 0x2, 0x2, 0x2, 0x58a, 0x58b, 0x7, 0x61, 0x2, 0x2, 
+    0x58b, 0x58d, 0x7, 0xba, 0x2, 0x2, 0x58c, 0x58a, 0x3, 0x2, 0x2, 0x2, 
+    0x58c, 0x58d, 0x3, 0x2, 0x2, 0x2, 0x58d, 0xa3, 0x3, 0x2, 0x2, 0x2, 0x58e, 
+    0x5be, 0x5, 0xd0, 0x69, 0x2, 0x58f, 0x590, 0x5, 0xd0, 0x69, 0x2, 0x590, 
+    0x591, 0x7, 0xcd, 0x2, 0x2, 0x591, 0x592, 0x5, 0xd0, 0x69, 0x2, 0x592, 
+    0x599, 0x5, 0xa4, 0x53, 0x2, 0x593, 0x594, 0x7, 0xc2, 0x2, 0x2, 0x594, 
+    0x595, 0x5, 0xd0, 0x69, 0x2, 0x595, 0x596, 0x5, 0xa4, 0x53, 0x2, 0x596, 
+    0x598, 0x3, 0x2, 0x2, 0x2, 0x597, 0x593, 0x3, 0x2, 0x2, 0x2, 0x598, 
+    0x59b, 0x3, 0x2, 0x2, 0x2, 0x599, 0x597, 0x3, 0x2, 0x2, 0x2, 0x599, 
+    0x59a, 0x3, 0x2, 0x2, 0x2, 0x59a, 0x59c, 0x3, 0x2, 0x2, 0x2, 0x59b, 
+    0x599, 0x3, 0x2, 0x2, 0x2, 0x59c, 0x59d, 0x7, 0xd7, 0x2, 0x2, 0x59d, 
+    0x5be, 0x3, 0x2, 0x2, 0x2, 0x59e, 0x59f, 0x5, 0xd0, 0x69, 0x2, 0x59f, 
+    0x5a0, 0x7, 0xcd, 0x2, 0x2, 0x5a0, 0x5a5, 0x5, 0xd4, 0x6b, 0x2, 0x5a1, 
+    0x5a2, 0x7, 0xc2, 0x2, 0x2, 0x5a2, 0x5a4, 0x5, 0xd4, 0x6b, 0x2, 0x5a3, 
+    0x5a1, 0x3, 0x2, 0x2, 0x2, 0x5a4, 0x5a7, 0x3, 0x2, 0x2, 0x2, 0x5a5, 
+    0x5a3, 0x3, 0x2, 0x2, 0x2, 0x5a5, 0x5a6, 0x3, 0x2, 0x2, 0x2, 0x5a6, 
+    0x5a8, 0x3, 0x2, 0x2, 0x2, 0x5a7, 0x5a5, 0x3, 0x2, 0x2, 0x2, 0x5a8, 
+    0x5a9, 0x7, 0xd7, 0x2, 0x2, 0x5a9, 0x5be, 0x3, 0x2, 0x2, 0x2, 0x5aa, 
+    0x5ab, 0x5, 0xd0, 0x69, 0x2, 0x5ab, 0x5ac, 0x7, 0xcd, 0x2, 0x2, 0x5ac, 
+    0x5b1, 0x5, 0xa4, 0x53, 0x2, 0x5ad, 0x5ae, 0x7, 0xc2, 0x2, 0x2, 0x5ae, 
+    0x5b0, 0x5, 0xa4, 0x53, 0x2, 0x5af, 0x5ad, 0x3, 0x2, 0x2, 0x2, 0x5b0, 
+    0x5b3, 0x3, 0x2, 0x2, 0x2, 0x5b1, 0x5af, 0x3, 0x2, 0x2, 0x2, 0x5b1, 
+    0x5b2, 0x3, 0x2, 0x2, 0x2, 0x5b2, 0x5b4, 0x3, 0x2, 0x2, 0x2, 0x5b3, 
+    0x5b1, 0x3, 0x2, 0x2, 0x2, 0x5b4, 0x5b5, 0x7, 0xd7, 0x2, 0x2, 0x5b5, 
+    0x5be, 0x3, 0x2, 0x2, 0x2, 0x5b6, 0x5b7, 0x5, 0xd0, 0x69, 0x2, 0x5b7, 
+    0x5b9, 0x7, 0xcd, 0x2, 0x2, 0x5b8, 0x5ba, 0x5, 0xa6, 0x54, 0x2, 0x5b9, 
+    0x5b8, 0x3, 0x2, 0x2, 0x2, 0x5b9, 0x5ba, 0x3, 0x2, 0x2, 0x2, 0x5ba, 
+    0x5bb, 0x3, 0x2, 0x2, 0x2, 0x5bb, 0x5bc, 0x7, 0xd7, 0x2, 0x2, 0x5bc, 
+    0x5be, 0x3, 0x2, 0x2, 0x2, 0x5bd, 0x58e, 0x3, 0x2, 0x2, 0x2, 0x5bd, 
+    0x58f, 0x3, 0x2, 0x2, 0x2, 0x5bd, 0x59e, 0x3, 0x2, 0x2, 0x2, 0x5bd, 
+    0x5aa, 0x3, 0x2, 0x2, 0x2, 0x5bd, 0x5b6, 0x3, 0x2, 0x2, 0x2, 0x5be, 
+    0xa5, 0x3, 0x2, 0x2, 0x2, 0x5bf, 0x5c4, 0x5, 0xa8, 0x55, 0x2, 0x5c0, 
+    0x5c1, 0x7, 0xc2, 0x2, 0x2, 0x5c1, 0x5c3, 0x5, 0xa8, 0x55, 0x2, 0x5c2, 
+    0x5c0, 0x3, 0x2, 0x2, 0x2, 0x5c3, 0x5c6, 0x3, 0x2, 0x2, 0x2, 0x5c4, 
+    0x5c2, 0x3, 0x2, 0x2, 0x2, 0x5c4, 0x5c5, 0x3, 0x2, 0x2, 0x2, 0x5c5, 
+    0xa7, 0x3, 0x2, 0x2, 0x2, 0x5c6, 0x5c4, 0x3, 0x2, 0x2, 0x2, 0x5c7, 0x5c8, 
+    0x5, 0xba, 0x5e, 0x2, 0x5c8, 0x5c9, 0x7, 0xc5, 0x2, 0x2, 0x5c9, 0x5cb, 
+    0x3, 0x2, 0x2, 0x2, 0x5ca, 0x5c7, 0x3, 0x2, 0x2, 0x2, 0x5ca, 0x5cb, 
+    0x3, 0x2, 0x2, 0x2, 0x5cb, 0x5cc, 0x3, 0x2, 0x2, 0x2, 0x5cc, 0x5d3, 
+    0x7, 0xbe, 0x2, 0x2, 0x5cd, 0x5ce, 0x7, 0xcd, 0x2, 0x2, 0x5ce, 0x5cf, 
+    0x5, 0x64, 0x33, 0x2, 0x5cf, 0x5d0, 0x7, 0xd7, 0x2, 0x2, 0x5d0, 0x5d3, 
+    0x3, 0x2, 0x2, 0x2, 0x5d1, 0x5d3, 0x5, 0xaa, 0x56, 0x2, 0x5d2, 0x5ca, 
+    0x3, 0x2, 0x2, 0x2, 0x5d2, 0x5cd, 0x3, 0x2, 0x2, 0x2, 0x5d2, 0x5d1, 
+    0x3, 0x2, 0x2, 0x2, 0x5d3, 0xa9, 0x3, 0x2, 0x2, 0x2, 0x5d4, 0x5d5, 0x8, 
+    0x56, 0x1, 0x2, 0x5d5, 0x5d7, 0x7, 0x14, 0x2, 0x2, 0x5d6, 0x5d8, 0x5, 
+    0xaa, 0x56, 0x2, 0x5d7, 0x5d6, 0x3, 0x2, 0x2, 0x2, 0x5d7, 0x5d8, 0x3, 
+    0x2, 0x2, 0x2, 0x5d8, 0x5de, 0x3, 0x2, 0x2, 0x2, 0x5d9, 0x5da, 0x7, 
+    0xb1, 0x2, 0x2, 0x5da, 0x5db, 0x5, 0xaa, 0x56, 0x2, 0x5db, 0x5dc, 0x7, 
+    0x9b, 0x2, 0x2, 0x5dc, 0x5dd, 0x5, 0xaa, 0x56, 0x2, 0x5dd, 0x5df, 0x3, 
+    0x2, 0x2, 0x2, 0x5de, 0x5d9, 0x3, 0x2, 0x2, 0x2, 0x5df, 0x5e0, 0x3, 
+    0x2, 0x2, 0x2, 0x5e0, 0x5de, 0x3, 0x2, 0x2, 0x2, 0x5e0, 0x5e1, 0x3, 
+    0x2, 0x2, 0x2, 0x5e1, 0x5e4, 0x3, 0x2, 0x2, 0x2, 0x5e2, 0x5e3, 0x7, 
+    0x33, 0x2, 0x2, 0x5e3, 0x5e5, 0x5, 0xaa, 0x56, 0x2, 0x5e4, 0x5e2, 0x3, 
+    0x2, 0x2, 0x2, 0x5e4, 0x5e5, 0x3, 0x2, 0x2, 0x2, 0x5e5, 0x5e6, 0x3, 
+    0x2, 0x2, 0x2, 0x5e6, 0x5e7, 0x7, 0x34, 0x2, 0x2, 0x5e7, 0x640, 0x3, 
+    0x2, 0x2, 0x2, 0x5e8, 0x5e9, 0x7, 0x15, 0x2, 0x2, 0x5e9, 0x5ea, 0x7, 
+    0xcd, 0x2, 0x2, 0x5ea, 0x5eb, 0x5, 0xaa, 0x56, 0x2, 0x5eb, 0x5ec, 0x7, 
+    0xc, 0x2, 0x2, 0x5ec, 0x5ed, 0x5, 0xa4, 0x53, 0x2, 0x5ed, 0x5ee, 0x7, 
+    0xd7, 0x2, 0x2, 0x5ee, 0x640, 0x3, 0x2, 0x2, 0x2, 0x5ef, 0x5f0, 0x7, 
+    0x23, 0x2, 0x2, 0x5f0, 0x640, 0x7, 0xbc, 0x2, 0x2, 0x5f1, 0x5f2, 0x7, 
+    0x3a, 0x2, 0x2, 0x5f2, 0x5f3, 0x7, 0xcd, 0x2, 0x2, 0x5f3, 0x5f4, 0x5, 
+    0xc8, 0x65, 0x2, 0x5f4, 0x5f5, 0x7, 0x42, 0x2, 0x2, 0x5f5, 0x5f6, 0x5, 
+    0xaa, 0x56, 0x2, 0x5f6, 0x5f7, 0x7, 0xd7, 0x2, 0x2, 0x5f7, 0x640, 0x3, 
+    0x2, 0x2, 0x2, 0x5f8, 0x5f9, 0x7, 0x54, 0x2, 0x2, 0x5f9, 0x5fa, 0x5, 
+    0xaa, 0x56, 0x2, 0x5fa, 0x5fb, 0x5, 0xc8, 0x65, 0x2, 0x5fb, 0x640, 0x3, 
+    0x2, 0x2, 0x2, 0x5fc, 0x5fd, 0x7, 0x93, 0x2, 0x2, 0x5fd, 0x5fe, 0x7, 
+    0xcd, 0x2, 0x2, 0x5fe, 0x5ff, 0x5, 0xaa, 0x56, 0x2, 0x5ff, 0x600, 0x7, 
+    0x42, 0x2, 0x2, 0x600, 0x603, 0x5, 0xaa, 0x56, 0x2, 0x601, 0x602, 0x7, 
+    0x3f, 0x2, 0x2, 0x602, 0x604, 0x5, 0xaa, 0x56, 0x2, 0x603, 0x601, 0x3, 
+    0x2, 0x2, 0x2, 0x603, 0x604, 0x3, 0x2, 0x2, 0x2, 0x604, 0x605, 0x3, 
+    0x2, 0x2, 0x2, 0x605, 0x606, 0x7, 0xd7, 0x2, 0x2, 0x606, 0x640, 0x3, 
+    0x2, 0x2, 0x2, 0x607, 0x608, 0x7, 0x9e, 0x2, 0x2, 0x608, 0x640, 0x7, 
+    0xbc, 0x2, 0x2, 0x609, 0x60a, 0x7, 0xa3, 0x2, 0x2, 0x60a, 0x60b, 0x7, 
+    0xcd, 0x2, 0x2, 0x60b, 0x60c, 0x9, 0x14, 0x2, 0x2, 0x60c, 0x60d, 0x7, 
+    0xbc, 0x2, 0x2, 0x60d, 0x60e, 0x7, 0x42, 0x2, 0x2, 0x60e, 0x60f, 0x5, 
+    0xaa, 0x56, 0x2, 0x60f, 0x610, 0x7, 0xd7, 0x2, 0x2, 0x610, 0x640, 0x3, 
+    0x2, 0x2, 0x2, 0x611, 0x617, 0x5, 0xd0, 0x69, 0x2, 0x612, 0x614, 0x7, 
+    0xcd, 0x2, 0x2, 0x613, 0x615, 0x5, 0xa6, 0x54, 0x2, 0x614, 0x613, 0x3, 
+    0x2, 0x2, 0x2, 0x614, 0x615, 0x3, 0x2, 0x2, 0x2, 0x615, 0x616, 0x3, 
+    0x2, 0x2, 0x2, 0x616, 0x618, 0x7, 0xd7, 0x2, 0x2, 0x617, 0x612, 0x3, 
+    0x2, 0x2, 0x2, 0x617, 0x618, 0x3, 0x2, 0x2, 0x2, 0x618, 0x619, 0x3, 
+    0x2, 0x2, 0x2, 0x619, 0x61b, 0x7, 0xcd, 0x2, 0x2, 0x61a, 0x61c, 0x7, 
+    0x30, 0x2, 0x2, 0x61b, 0x61a, 0x3, 0x2, 0x2, 0x2, 0x61b, 0x61c, 0x3, 
+    0x2, 0x2, 0x2, 0x61c, 0x61e, 0x3, 0x2, 0x2, 0x2, 0x61d, 0x61f, 0x5, 
+    0xac, 0x57, 0x2, 0x61e, 0x61d, 0x3, 0x2, 0x2, 0x2, 0x61e, 0x61f, 0x3, 
+    0x2, 0x2, 0x2, 0x61f, 0x620, 0x3, 0x2, 0x2, 0x2, 0x620, 0x621, 0x7, 
+    0xd7, 0x2, 0x2, 0x621, 0x640, 0x3, 0x2, 0x2, 0x2, 0x622, 0x640, 0x5, 
+    0xc6, 0x64, 0x2, 0x623, 0x624, 0x7, 0xc4, 0x2, 0x2, 0x624, 0x640, 0x5, 
+    0xaa, 0x56, 0x13, 0x625, 0x626, 0x7, 0x70, 0x2, 0x2, 0x626, 0x640, 0x5, 
+    0xaa, 0x56, 0xe, 0x627, 0x628, 0x5, 0xba, 0x5e, 0x2, 0x628, 0x629, 0x7, 
+    0xc5, 0x2, 0x2, 0x629, 0x62b, 0x3, 0x2, 0x2, 0x2, 0x62a, 0x627, 0x3, 
+    0x2, 0x2, 0x2, 0x62a, 0x62b, 0x3, 0x2, 0x2, 0x2, 0x62b, 0x62c, 0x3, 
+    0x2, 0x2, 0x2, 0x62c, 0x640, 0x7, 0xbe, 0x2, 0x2, 0x62d, 0x62e, 0x7, 
+    0xcd, 0x2, 0x2, 0x62e, 0x62f, 0x5, 0x64, 0x33, 0x2, 0x62f, 0x630, 0x7, 
+    0xd7, 0x2, 0x2, 0x630, 0x640, 0x3, 0x2, 0x2, 0x2, 0x631, 0x632, 0x7, 
+    0xcd, 0x2, 0x2, 0x632, 0x633, 0x5, 0xaa, 0x56, 0x2, 0x633, 0x634, 0x7, 
+    0xd7, 0x2, 0x2, 0x634, 0x640, 0x3, 0x2, 0x2, 0x2, 0x635, 0x636, 0x7, 
+    0xcd, 0x2, 0x2, 0x636, 0x637, 0x5, 0xa6, 0x54, 0x2, 0x637, 0x638, 0x7, 
+    0xd7, 0x2, 0x2, 0x638, 0x640, 0x3, 0x2, 0x2, 0x2, 0x639, 0x63b, 0x7, 
+    0xcb, 0x2, 0x2, 0x63a, 0x63c, 0x5, 0xa6, 0x54, 0x2, 0x63b, 0x63a, 0x3, 
+    0x2, 0x2, 0x2, 0x63b, 0x63c, 0x3, 0x2, 0x2, 0x2, 0x63c, 0x63d, 0x3, 
+    0x2, 0x2, 0x2, 0x63d, 0x640, 0x7, 0xd6, 0x2, 0x2, 0x63e, 0x640, 0x5, 
+    0xb2, 0x5a, 0x2, 0x63f, 0x5d4, 0x3, 0x2, 0x2, 0x2, 0x63f, 0x5e8, 0x3, 
+    0x2, 0x2, 0x2, 0x63f, 0x5ef, 0x3, 0x2, 0x2, 0x2, 0x63f, 0x5f1, 0x3, 
+    0x2, 0x2, 0x2, 0x63f, 0x5f8, 0x3, 0x2, 0x2, 0x2, 0x63f, 0x5fc, 0x3, 
+    0x2, 0x2, 0x2, 0x63f, 0x607, 0x3, 0x2, 0x2, 0x2, 0x63f, 0x609, 0x3, 
+    0x2, 0x2, 0x2, 0x63f, 0x611, 0x3, 0x2, 0x2, 0x2, 0x63f, 0x622, 0x3, 
+    0x2, 0x2, 0x2, 0x63f, 0x623, 0x3, 0x2, 0x2, 0x2, 0x63f, 0x625, 0x3, 
+    0x2, 0x2, 0x2, 0x63f, 0x62a, 0x3, 0x2, 0x2, 0x2, 0x63f, 0x62d, 0x3, 
+    0x2, 0x2, 0x2, 0x63f, 0x631, 0x3, 0x2, 0x2, 0x2, 0x63f, 0x635, 0x3, 
+    0x2, 0x2, 0x2, 0x63f, 0x639, 0x3, 0x2, 0x2, 0x2, 0x63f, 0x63e, 0x3, 
+    0x2, 0x2, 0x2, 0x640, 0x688, 0x3, 0x2, 0x2, 0x2, 0x641, 0x642, 0xc, 
+    0x12, 0x2, 0x2, 0x642, 0x643, 0x9, 0x15, 0x2, 0x2, 0x643, 0x687, 0x5, 
+    0xaa, 0x56, 0x13, 0x644, 0x645, 0xc, 0x11, 0x2, 0x2, 0x645, 0x646, 0x9, 
+    0x16, 0x2, 0x2, 0x646, 0x687, 0x5, 0xaa, 0x56, 0x12, 0x647, 0x65a, 0xc, 
+    0x10, 0x2, 0x2, 0x648, 0x65b, 0x7, 0xc6, 0x2, 0x2, 0x649, 0x65b, 0x7, 
+    0xc7, 0x2, 0x2, 0x64a, 0x65b, 0x7, 0xcf, 0x2, 0x2, 0x64b, 0x65b, 0x7, 
+    0xcc, 0x2, 0x2, 0x64c, 0x65b, 0x7, 0xc8, 0x2, 0x2, 0x64d, 0x65b, 0x7, 
+    0xce, 0x2, 0x2, 0x64e, 0x65b, 0x7, 0xc9, 0x2, 0x2, 0x64f, 0x651, 0x7, 
+    0x45, 0x2, 0x2, 0x650, 0x64f, 0x3, 0x2, 0x2, 0x2, 0x650, 0x651, 0x3, 
+    0x2, 0x2, 0x2, 0x651, 0x653, 0x3, 0x2, 0x2, 0x2, 0x652, 0x654, 0x7, 
+    0x70, 0x2, 0x2, 0x653, 0x652, 0x3, 0x2, 0x2, 0x2, 0x653, 0x654, 0x3, 
+    0x2, 0x2, 0x2, 0x654, 0x655, 0x3, 0x2, 0x2, 0x2, 0x655, 0x65b, 0x7, 
+    0x4e, 0x2, 0x2, 0x656, 0x658, 0x7, 0x70, 0x2, 0x2, 0x657, 0x656, 0x3, 
+    0x2, 0x2, 0x2, 0x657, 0x658, 0x3, 0x2, 0x2, 0x2, 0x658, 0x659, 0x3, 
+    0x2, 0x2, 0x2, 0x659, 0x65b, 0x9, 0x17, 0x2, 0x2, 0x65a, 0x648, 0x3, 
+    0x2, 0x2, 0x2, 0x65a, 0x649, 0x3, 0x2, 0x2, 0x2, 0x65a, 0x64a, 0x3, 
+    0x2, 0x2, 0x2, 0x65a, 0x64b, 0x3, 0x2, 0x2, 0x2, 0x65a, 0x64c, 0x3, 
+    0x2, 0x2, 0x2, 0x65a, 0x64d, 0x3, 0x2, 0x2, 0x2, 0x65a, 0x64e, 0x3, 
+    0x2, 0x2, 0x2, 0x65a, 0x650, 0x3, 0x2, 0x2, 0x2, 0x65a, 0x657, 0x3, 
+    0x2, 0x2, 0x2, 0x65b, 0x65c, 0x3, 0x2, 0x2, 0x2, 0x65c, 0x687, 0x5, 
+    0xaa, 0x56, 0x11, 0x65d, 0x65e, 0xc, 0xd, 0x2, 0x2, 0x65e, 0x65f, 0x7, 
+    0x8, 0x2, 0x2, 0x65f, 0x687, 0x5, 0xaa, 0x56, 0xe, 0x660, 0x661, 0xc, 
+    0xc, 0x2, 0x2, 0x661, 0x662, 0x7, 0x76, 0x2, 0x2, 0x662, 0x687, 0x5, 
+    0xaa, 0x56, 0xd, 0x663, 0x665, 0xc, 0xb, 0x2, 0x2, 0x664, 0x666, 0x7, 
+    0x70, 0x2, 0x2, 0x665, 0x664, 0x3, 0x2, 0x2, 0x2, 0x665, 0x666, 0x3, 
+    0x2, 0x2, 0x2, 0x666, 0x667, 0x3, 0x2, 0x2, 0x2, 0x667, 0x668, 0x7, 
+    0x11, 0x2, 0x2, 0x668, 0x669, 0x5, 0xaa, 0x56, 0x2, 0x669, 0x66a, 0x7, 
+    0x8, 0x2, 0x2, 0x66a, 0x66b, 0x5, 0xaa, 0x56, 0xc, 0x66b, 0x687, 0x3, 
+    0x2, 0x2, 0x2, 0x66c, 0x66d, 0xc, 0xa, 0x2, 0x2, 0x66d, 0x66e, 0x7, 
+    0xd2, 0x2, 0x2, 0x66e, 0x66f, 0x5, 0xaa, 0x56, 0x2, 0x66f, 0x670, 0x7, 
+    0xc1, 0x2, 0x2, 0x670, 0x671, 0x5, 0xaa, 0x56, 0xa, 0x671, 0x687, 0x3, 
+    0x2, 0x2, 0x2, 0x672, 0x673, 0xc, 0x15, 0x2, 0x2, 0x673, 0x674, 0x7, 
+    0xcb, 0x2, 0x2, 0x674, 0x675, 0x5, 0xaa, 0x56, 0x2, 0x675, 0x676, 0x7, 
+    0xd6, 0x2, 0x2, 0x676, 0x687, 0x3, 0x2, 0x2, 0x2, 0x677, 0x678, 0xc, 
+    0x14, 0x2, 0x2, 0x678, 0x679, 0x7, 0xc5, 0x2, 0x2, 0x679, 0x687, 0x7, 
+    0xba, 0x2, 0x2, 0x67a, 0x67b, 0xc, 0xf, 0x2, 0x2, 0x67b, 0x67d, 0x7, 
+    0x56, 0x2, 0x2, 0x67c, 0x67e, 0x7, 0x70, 0x2, 0x2, 0x67d, 0x67c, 0x3, 
+    0x2, 0x2, 0x2, 0x67d, 0x67e, 0x3, 0x2, 0x2, 0x2, 0x67e, 0x67f, 0x3, 
+    0x2, 0x2, 0x2, 0x67f, 0x687, 0x7, 0x71, 0x2, 0x2, 0x680, 0x684, 0xc, 
+    0x9, 0x2, 0x2, 0x681, 0x685, 0x5, 0xce, 0x68, 0x2, 0x682, 0x683, 0x7, 
+    0xc, 0x2, 0x2, 0x683, 0x685, 0x5, 0xd0, 0x69, 0x2, 0x684, 0x681, 0x3, 
+    0x2, 0x2, 0x2, 0x684, 0x682, 0x3, 0x2, 0x2, 0x2, 0x685, 0x687, 0x3, 
+    0x2, 0x2, 0x2, 0x686, 0x641, 0x3, 0x2, 0x2, 0x2, 0x686, 0x644, 0x3, 
+    0x2, 0x2, 0x2, 0x686, 0x647, 0x3, 0x2, 0x2, 0x2, 0x686, 0x65d, 0x3, 
+    0x2, 0x2, 0x2, 0x686, 0x660, 0x3, 0x2, 0x2, 0x2, 0x686, 0x663, 0x3, 
+    0x2, 0x2, 0x2, 0x686, 0x66c, 0x3, 0x2, 0x2, 0x2, 0x686, 0x672, 0x3, 
+    0x2, 0x2, 0x2, 0x686, 0x677, 0x3, 0x2, 0x2, 0x2, 0x686, 0x67a, 0x3, 
+    0x2, 0x2, 0x2, 0x686, 0x680, 0x3, 0x2, 0x2, 0x2, 0x687, 0x68a, 0x3, 
+    0x2, 0x2, 0x2, 0x688, 0x686, 0x3, 0x2, 0x2, 0x2, 0x688, 0x689, 0x3, 
+    0x2, 0x2, 0x2, 0x689, 0xab, 0x3, 0x2, 0x2, 0x2, 0x68a, 0x688, 0x3, 0x2, 
+    0x2, 0x2, 0x68b, 0x690, 0x5, 0xae, 0x58, 0x2, 0x68c, 0x68d, 0x7, 0xc2, 
+    0x2, 0x2, 0x68d, 0x68f, 0x5, 0xae, 0x58, 0x2, 0x68e, 0x68c, 0x3, 0x2, 
+    0x2, 0x2, 0x68f, 0x692, 0x3, 0x2, 0x2, 0x2, 0x690, 0x68e, 0x3, 0x2, 
+    0x2, 0x2, 0x690, 0x691, 0x3, 0x2, 0x2, 0x2, 0x691, 0xad, 0x3, 0x2, 0x2, 
+    0x2, 0x692, 0x690, 0x3, 0x2, 0x2, 0x2, 0x693, 0x696, 0x5, 0xb0, 0x59, 
+    0x2, 0x694, 0x696, 0x5, 0xaa, 0x56, 0x2, 0x695, 0x693, 0x3, 0x2, 0x2, 
+    0x2, 0x695, 0x694, 0x3, 0x2, 0x2, 0x2, 0x696, 0xaf, 0x3, 0x2, 0x2, 0x2, 
+    0x697, 0x698, 0x7, 0xcd, 0x2, 0x2, 0x698, 0x69d, 0x5, 0xd0, 0x69, 0x2, 
+    0x699, 0x69a, 0x7, 0xc2, 0x2, 0x2, 0x69a, 0x69c, 0x5, 0xd0, 0x69, 0x2, 
+    0x69b, 0x699, 0x3, 0x2, 0x2, 0x2, 0x69c, 0x69f, 0x3, 0x2, 0x2, 0x2, 
+    0x69d, 0x69b, 0x3, 0x2, 0x2, 0x2, 0x69d, 0x69e, 0x3, 0x2, 0x2, 0x2, 
+    0x69e, 0x6a0, 0x3, 0x2, 0x2, 0x2, 0x69f, 0x69d, 0x3, 0x2, 0x2, 0x2, 
+    0x6a0, 0x6a1, 0x7, 0xd7, 0x2, 0x2, 0x6a1, 0x6ab, 0x3, 0x2, 0x2, 0x2, 
+    0x6a2, 0x6a7, 0x5, 0xd0, 0x69, 0x2, 0x6a3, 0x6a4, 0x7, 0xc2, 0x2, 0x2, 
+    0x6a4, 0x6a6, 0x5, 0xd0, 0x69, 0x2, 0x6a5, 0x6a3, 0x3, 0x2, 0x2, 0x2, 
+    0x6a6, 0x6a9, 0x3, 0x2, 0x2, 0x2, 0x6a7, 0x6a5, 0x3, 0x2, 0x2, 0x2, 
+    0x6a7, 0x6a8, 0x3, 0x2, 0x2, 0x2, 0x6a8, 0x6ab, 0x3, 0x2, 0x2, 0x2, 
+    0x6a9, 0x6a7, 0x3, 0x2, 0x2, 0x2, 0x6aa, 0x697, 0x3, 0x2, 0x2, 0x2, 
+    0x6aa, 0x6a2, 0x3, 0x2, 0x2, 0x2, 0x6ab, 0x6ac, 0x3, 0x2, 0x2, 0x2, 
+    0x6ac, 0x6ad, 0x7, 0xbd, 0x2, 0x2, 0x6ad, 0x6ae, 0x5, 0xaa, 0x56, 0x2, 
+    0x6ae, 0xb1, 0x3, 0x2, 0x2, 0x2, 0x6af, 0x6b0, 0x5, 0xba, 0x5e, 0x2, 
+    0x6b0, 0x6b1, 0x7, 0xc5, 0x2, 0x2, 0x6b1, 0x6b3, 0x3, 0x2, 0x2, 0x2, 
+    0x6b2, 0x6af, 0x3, 0x2, 0x2, 0x2, 0x6b2, 0x6b3, 0x3, 0x2, 0x2, 0x2, 
+    0x6b3, 0x6b4, 0x3, 0x2, 0x2, 0x2, 0x6b4, 0x6b5, 0x5, 0xb4, 0x5b, 0x2, 
+    0x6b5, 0xb3, 0x3, 0x2, 0x2, 0x2, 0x6b6, 0x6b9, 0x5, 0xd0, 0x69, 0x2, 
+    0x6b7, 0x6b8, 0x7, 0xc5, 0x2, 0x2, 0x6b8, 0x6ba, 0x5, 0xd0, 0x69, 0x2, 
+    0x6b9, 0x6b7, 0x3, 0x2, 0x2, 0x2, 0x6b9, 0x6ba, 0x3, 0x2, 0x2, 0x2, 
+    0x6ba, 0xb5, 0x3, 0x2, 0x2, 0x2, 0x6bb, 0x6bc, 0x8, 0x5c, 0x1, 0x2, 
+    0x6bc, 0x6c3, 0x5, 0xba, 0x5e, 0x2, 0x6bd, 0x6c3, 0x5, 0xb8, 0x5d, 0x2, 
+    0x6be, 0x6bf, 0x7, 0xcd, 0x2, 0x2, 0x6bf, 0x6c0, 0x5, 0x64, 0x33, 0x2, 
+    0x6c0, 0x6c1, 0x7, 0xd7, 0x2, 0x2, 0x6c1, 0x6c3, 0x3, 0x2, 0x2, 0x2, 
+    0x6c2, 0x6bb, 0x3, 0x2, 0x2, 0x2, 0x6c2, 0x6bd, 0x3, 0x2, 0x2, 0x2, 
+    0x6c2, 0x6be, 0x3, 0x2, 0x2, 0x2, 0x6c3, 0x6cc, 0x3, 0x2, 0x2, 0x2, 
+    0x6c4, 0x6c8, 0xc, 0x3, 0x2, 0x2, 0x6c5, 0x6c9, 0x5, 0xce, 0x68, 0x2, 
+    0x6c6, 0x6c7, 0x7, 0xc, 0x2, 0x2, 0x6c7, 0x6c9, 0x5, 0xd0, 0x69, 0x2, 
+    0x6c8, 0x6c5, 0x3, 0x2, 0x2, 0x2, 0x6c8, 0x6c6, 0x3, 0x2, 0x2, 0x2, 
+    0x6c9, 0x6cb, 0x3, 0x2, 0x2, 0x2, 0x6ca, 0x6c4, 0x3, 0x2, 0x2, 0x2, 
+    0x6cb, 0x6ce, 0x3, 0x2, 0x2, 0x2, 0x6cc, 0x6ca, 0x3, 0x2, 0x2, 0x2, 
+    0x6cc, 0x6cd, 0x3, 0x2, 0x2, 0x2, 0x6cd, 0xb7, 0x3, 0x2, 0x2, 0x2, 0x6ce, 
+    0x6cc, 0x3, 0x2, 0x2, 0x2, 0x6cf, 0x6d0, 0x5, 0xd0, 0x69, 0x2, 0x6d0, 
+    0x6d2, 0x7, 0xcd, 0x2, 0x2, 0x6d1, 0x6d3, 0x5, 0xbc, 0x5f, 0x2, 0x6d2, 
+    0x6d1, 0x3, 0x2, 0x2, 0x2, 0x6d2, 0x6d3, 0x3, 0x2, 0x2, 0x2, 0x6d3, 
+    0x6d4, 0x3, 0x2, 0x2, 0x2, 0x6d4, 0x6d5, 0x7, 0xd7, 0x2, 0x2, 0x6d5, 
+    0xb9, 0x3, 0x2, 0x2, 0x2, 0x6d6, 0x6d7, 0x5, 0xc0, 0x61, 0x2, 0x6d7, 
+    0x6d8, 0x7, 0xc5, 0x2, 0x2, 0x6d8, 0x6da, 0x3, 0x2, 0x2, 0x2, 0x6d9, 
+    0x6d6, 0x3, 0x2, 0x2, 0x2, 0x6d9, 0x6da, 0x3, 0x2, 0x2, 0x2, 0x6da, 
+    0x6db, 0x3, 0x2, 0x2, 0x2, 0x6db, 0x6dc, 0x5, 0xd0, 0x69, 0x2, 0x6dc, 
+    0xbb, 0x3, 0x2, 0x2, 0x2, 0x6dd, 0x6e2, 0x5, 0xbe, 0x60, 0x2, 0x6de, 
+    0x6df, 0x7, 0xc2, 0x2, 0x2, 0x6df, 0x6e1, 0x5, 0xbe, 0x60, 0x2, 0x6e0, 
+    0x6de, 0x3, 0x2, 0x2, 0x2, 0x6e1, 0x6e4, 0x3, 0x2, 0x2, 0x2, 0x6e2, 
+    0x6e0, 0x3, 0x2, 0x2, 0x2, 0x6e2, 0x6e3, 0x3, 0x2, 0x2, 0x2, 0x6e3, 
+    0xbd, 0x3, 0x2, 0x2, 0x2, 0x6e4, 0x6e2, 0x3, 0x2, 0x2, 0x2, 0x6e5, 0x6e9, 
+    0x5, 0xba, 0x5e, 0x2, 0x6e6, 0x6e9, 0x5, 0xb8, 0x5d, 0x2, 0x6e7, 0x6e9, 
+    0x5, 0xc6, 0x64, 0x2, 0x6e8, 0x6e5, 0x3, 0x2, 0x2, 0x2, 0x6e8, 0x6e6, 
+    0x3, 0x2, 0x2, 0x2, 0x6e8, 0x6e7, 0x3, 0x2, 0x2, 0x2, 0x6e9, 0xbf, 0x3, 
+    0x2, 0x2, 0x2, 0x6ea, 0x6eb, 0x5, 0xd0, 0x69, 0x2, 0x6eb, 0xc1, 0x3, 
+    0x2, 0x2, 0x2, 0x6ec, 0x6f5, 0x7, 0xb8, 0x2, 0x2, 0x6ed, 0x6ee, 0x7, 
+    0xc5, 0x2, 0x2, 0x6ee, 0x6f5, 0x9, 0x18, 0x2, 0x2, 0x6ef, 0x6f0, 0x7, 
+    0xba, 0x2, 0x2, 0x6f0, 0x6f2, 0x7, 0xc5, 0x2, 0x2, 0x6f1, 0x6f3, 0x9, 
+    0x18, 0x2, 0x2, 0x6f2, 0x6f1, 0x3, 0x2, 0x2, 0x2, 0x6f2, 0x6f3, 0x3, 
+    0x2, 0x2, 0x2, 0x6f3, 0x6f5, 0x3, 0x2, 0x2, 0x2, 0x6f4, 0x6ec, 0x3, 
+    0x2, 0x2, 0x2, 0x6f4, 0x6ed, 0x3, 0x2, 0x2, 0x2, 0x6f4, 0x6ef, 0x3, 
+    0x2, 0x2, 0x2, 0x6f5, 0xc3, 0x3, 0x2, 0x2, 0x2, 0x6f6, 0x6f8, 0x9, 0x19, 
+    0x2, 0x2, 0x6f7, 0x6f6, 0x3, 0x2, 0x2, 0x2, 0x6f7, 0x6f8, 0x3, 0x2, 
+    0x2, 0x2, 0x6f8, 0x6ff, 0x3, 0x2, 0x2, 0x2, 0x6f9, 0x700, 0x5, 0xc2, 
+    0x62, 0x2, 0x6fa, 0x700, 0x7, 0xb9, 0x2, 0x2, 0x6fb, 0x700, 0x7, 0xba, 
+    0x2, 0x2, 0x6fc, 0x700, 0x7, 0xbb, 0x2, 0x2, 0x6fd, 0x700, 0x7, 0x50, 
+    0x2, 0x2, 0x6fe, 0x700, 0x7, 0x6e, 0x2, 0x2, 0x6ff, 0x6f9, 0x3, 0x2, 
+    0x2, 0x2, 0x6ff, 0x6fa, 0x3, 0x2, 0x2, 0x2, 0x6ff, 0x6fb, 0x3, 0x2, 
+    0x2, 0x2, 0x6ff, 0x6fc, 0x3, 0x2, 0x2, 0x2, 0x6ff, 0x6fd, 0x3, 0x2, 
+    0x2, 0x2, 0x6ff, 0x6fe, 0x3, 0x2, 0x2, 0x2, 0x700, 0xc5, 0x3, 0x2, 0x2, 
+    0x2, 0x701, 0x705, 0x5, 0xc4, 0x63, 0x2, 0x702, 0x705, 0x7, 0xbc, 0x2, 
+    0x2, 0x703, 0x705, 0x7, 0x71, 0x2, 0x2, 0x704, 0x701, 0x3, 0x2, 0x2, 
+    0x2, 0x704, 0x702, 0x3, 0x2, 0x2, 0x2, 0x704, 0x703, 0x3, 0x2, 0x2, 
+    0x2, 0x705, 0xc7, 0x3, 0x2, 0x2, 0x2, 0x706, 0x707, 0x9, 0x1a, 0x2, 
+    0x2, 0x707, 0xc9, 0x3, 0x2, 0x2, 0x2, 0x708, 0x709, 0x9, 0x1b, 0x2, 
+    0x2, 0x709, 0xcb, 0x3, 0x2, 0x2, 0x2, 0x70a, 0x70b, 0x9, 0x1c, 0x2, 
+    0x2, 0x70b, 0xcd, 0x3, 0x2, 0x2, 0x2, 0x70c, 0x70f, 0x7, 0xb7, 0x2, 
+    0x2, 0x70d, 0x70f, 0x5, 0xcc, 0x67, 0x2, 0x70e, 0x70c, 0x3, 0x2, 0x2, 
+    0x2, 0x70e, 0x70d, 0x3, 0x2, 0x2, 0x2, 0x70f, 0xcf, 0x3, 0x2, 0x2, 0x2, 
+    0x710, 0x714, 0x7, 0xb7, 0x2, 0x2, 0x711, 0x714, 0x5, 0xc8, 0x65, 0x2, 
+    0x712, 0x714, 0x5, 0xca, 0x66, 0x2, 0x713, 0x710, 0x3, 0x2, 0x2, 0x2, 
+    0x713, 0x711, 0x3, 0x2, 0x2, 0x2, 0x713, 0x712, 0x3, 0x2, 0x2, 0x2, 
+    0x714, 0xd1, 0x3, 0x2, 0x2, 0x2, 0x715, 0x718, 0x5, 0xd0, 0x69, 0x2, 
+    0x716, 0x718, 0x7, 0x71, 0x2, 0x2, 0x717, 0x715, 0x3, 0x2, 0x2, 0x2, 
+    0x717, 0x716, 0x3, 0x2, 0x2, 0x2, 0x718, 0xd3, 0x3, 0x2, 0x2, 0x2, 0x719, 
+    0x71a, 0x7, 0xbc, 0x2, 0x2, 0x71a, 0x71b, 0x7, 0xc7, 0x2, 0x2, 0x71b, 
+    0x71c, 0x5, 0xc4, 0x63, 0x2, 0x71c, 0xd5, 0x3, 0x2, 0x2, 0x2, 0xf4, 
+    0xda, 0xde, 0xe1, 0xe4, 0xf8, 0xfe, 0x105, 0x10d, 0x112, 0x119, 0x11e, 
+    0x124, 0x12a, 0x12f, 0x135, 0x143, 0x14a, 0x151, 0x157, 0x160, 0x16a, 
+    0x174, 0x188, 0x190, 0x19f, 0x1a6, 0x1b4, 0x1ba, 0x1c0, 0x1c7, 0x1cb, 
+    0x1ce, 0x1d5, 0x1d9, 0x1dc, 0x1e7, 0x1eb, 0x1ee, 0x1f3, 0x1f5, 0x1f8, 
+    0x1fb, 0x205, 0x209, 0x20c, 0x20f, 0x214, 0x216, 0x21c, 0x222, 0x226, 
+    0x229, 0x22c, 0x22f, 0x232, 0x237, 0x23d, 0x241, 0x244, 0x247, 0x24b, 
+    0x253, 0x26d, 0x26f, 0x273, 0x289, 0x28b, 0x296, 0x299, 0x2a2, 0x2b3, 
+    0x2be, 0x2d0, 0x2dd, 0x2ee, 0x2f7, 0x312, 0x314, 0x329, 0x32e, 0x333, 
+    0x336, 0x340, 0x345, 0x349, 0x34c, 0x350, 0x354, 0x359, 0x35c, 0x360, 
+    0x362, 0x375, 0x37d, 0x380, 0x38a, 0x38e, 0x396, 0x39a, 0x39f, 0x3a3, 
+    0x3a7, 0x3ab, 0x3af, 0x3b1, 0x3b9, 0x3bd, 0x3c0, 0x3c9, 0x3ce, 0x3d1, 
+    0x3db, 0x3e5, 0x3e9, 0x3ee, 0x3f2, 0x3f8, 0x3fb, 0x3fe, 0x401, 0x40f, 
+    0x413, 0x41b, 0x423, 0x426, 0x42a, 0x42d, 0x431, 0x434, 0x437, 0x43a, 
+    0x43d, 0x441, 0x445, 0x448, 0x44b, 0x44e, 0x451, 0x454, 0x45d, 0x463, 
+    0x477, 0x489, 0x491, 0x494, 0x49a, 0x4a2, 0x4a5, 0x4ab, 0x4ad, 0x4b1, 
+    0x4b6, 0x4b9, 0x4bc, 0x4c0, 0x4c4, 0x4c7, 0x4c9, 0x4cc, 0x4d0, 0x4d4, 
+    0x4d7, 0x4d9, 0x4db, 0x4de, 0x4e3, 0x4ee, 0x4f4, 0x4f9, 0x500, 0x505, 
+    0x509, 0x50d, 0x512, 0x519, 0x52e, 0x531, 0x53a, 0x53e, 0x543, 0x548, 
+    0x54b, 0x54d, 0x563, 0x566, 0x571, 0x575, 0x578, 0x57c, 0x580, 0x588, 
+    0x58c, 0x599, 0x5a5, 0x5b1, 0x5b9, 0x5bd, 0x5c4, 0x5ca, 0x5d2, 0x5d7, 
+    0x5e0, 0x5e4, 0x603, 0x614, 0x617, 0x61b, 0x61e, 0x62a, 0x63b, 0x63f, 
+    0x650, 0x653, 0x657, 0x65a, 0x665, 0x67d, 0x684, 0x686, 0x688, 0x690, 
+    0x695, 0x69d, 0x6a7, 0x6aa, 0x6b2, 0x6b9, 0x6c2, 0x6c8, 0x6cc, 0x6d2, 
+    0x6d9, 0x6e2, 0x6e8, 0x6f2, 0x6f4, 0x6f7, 0x6ff, 0x704, 0x70e, 0x713, 
+    0x717, 
   };
 
   atn::ATNDeserializer deserializer;
diff --git a/src/Parsers/New/ClickHouseParser.g4 b/src/Parsers/New/ClickHouseParser.g4
index b5bdaede707..722eaf969c0 100644
--- a/src/Parsers/New/ClickHouseParser.g4
+++ b/src/Parsers/New/ClickHouseParser.g4
@@ -173,12 +173,15 @@ describeStmt: (DESCRIBE | DESC) TABLE? tableExpr;
 
 dropStmt
     : (DETACH | DROP) DATABASE (IF EXISTS)? databaseIdentifier clusterClause?                                  # DropDatabaseStmt
-    | (DETACH | DROP) (DICTIONARY | TEMPORARY? TABLE) (IF EXISTS)? tableIdentifier clusterClause? (NO DELAY)?  # DropTableStmt
+    | (DETACH | DROP) (DICTIONARY | TEMPORARY? TABLE | VIEW) (IF EXISTS)? tableIdentifier clusterClause? (NO DELAY)?  # DropTableStmt
     ;
 
 // EXISTS statement
 
-existsStmt: EXISTS (DICTIONARY | TEMPORARY? TABLE)? tableIdentifier;
+existsStmt
+    : EXISTS DATABASE databaseIdentifier                             # ExistsDatabaseStmt
+    | EXISTS (DICTIONARY | TEMPORARY? TABLE | VIEW)? tableIdentifier # ExistsTableStmt
+    ;
 
 // EXPLAIN statement
 
diff --git a/src/Parsers/New/ClickHouseParser.h b/src/Parsers/New/ClickHouseParser.h
index 7a325befe26..11beadb182e 100644
--- a/src/Parsers/New/ClickHouseParser.h
+++ b/src/Parsers/New/ClickHouseParser.h
@@ -220,6 +220,7 @@ public:
     antlr4::tree::TerminalNode *SEMICOLON();
     InsertStmtContext *insertStmt();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -249,6 +250,7 @@ public:
     UseStmtContext *useStmt();
     WatchStmtContext *watchStmt();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -280,6 +282,7 @@ public:
     ClusterClauseContext *clusterClause();
     std::vector<antlr4::tree::TerminalNode *> COMMA();
     antlr4::tree::TerminalNode* COMMA(size_t i);
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -306,6 +309,7 @@ public:
     PartitionClauseContext *partitionClause();
     antlr4::tree::TerminalNode *FROM();
     TableIdentifierContext *tableIdentifier();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -320,6 +324,7 @@ public:
     antlr4::tree::TerminalNode *TO();
     antlr4::tree::TerminalNode *IF();
     antlr4::tree::TerminalNode *EXISTS();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -329,6 +334,7 @@ public:
 
     antlr4::tree::TerminalNode *FREEZE();
     PartitionClauseContext *partitionClause();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -341,6 +347,7 @@ public:
     TableColumnDfntContext *tableColumnDfnt();
     antlr4::tree::TerminalNode *IF();
     antlr4::tree::TerminalNode *EXISTS();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -352,6 +359,7 @@ public:
     antlr4::tree::TerminalNode *ORDER();
     antlr4::tree::TerminalNode *BY();
     ColumnExprContext *columnExpr();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -361,6 +369,7 @@ public:
 
     antlr4::tree::TerminalNode *REMOVE();
     antlr4::tree::TerminalNode *TTL();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -371,6 +380,7 @@ public:
     antlr4::tree::TerminalNode *UPDATE();
     AssignmentExprListContext *assignmentExprList();
     WhereClauseContext *whereClause();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -385,6 +395,7 @@ public:
     TableColumnPropertyTypeContext *tableColumnPropertyType();
     antlr4::tree::TerminalNode *IF();
     antlr4::tree::TerminalNode *EXISTS();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -395,6 +406,7 @@ public:
     antlr4::tree::TerminalNode *DELETE();
     antlr4::tree::TerminalNode *WHERE();
     ColumnExprContext *columnExpr();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -408,6 +420,7 @@ public:
     CodecExprContext *codecExpr();
     antlr4::tree::TerminalNode *IF();
     antlr4::tree::TerminalNode *EXISTS();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -421,6 +434,7 @@ public:
     antlr4::tree::TerminalNode *STRING_LITERAL();
     antlr4::tree::TerminalNode *IF();
     antlr4::tree::TerminalNode *EXISTS();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -432,6 +446,7 @@ public:
     PartitionClauseContext *partitionClause();
     antlr4::tree::TerminalNode *FROM();
     TableIdentifierContext *tableIdentifier();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -444,6 +459,7 @@ public:
     NestedIdentifierContext *nestedIdentifier();
     antlr4::tree::TerminalNode *IF();
     antlr4::tree::TerminalNode *EXISTS();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -458,6 +474,7 @@ public:
     antlr4::tree::TerminalNode *EXISTS();
     antlr4::tree::TerminalNode *IN();
     PartitionClauseContext *partitionClause();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -467,6 +484,7 @@ public:
 
     antlr4::tree::TerminalNode *DETACH();
     PartitionClauseContext *partitionClause();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -479,6 +497,7 @@ public:
     NestedIdentifierContext *nestedIdentifier();
     antlr4::tree::TerminalNode *IF();
     antlr4::tree::TerminalNode *EXISTS();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -494,6 +513,7 @@ public:
     antlr4::tree::TerminalNode *EXISTS();
     antlr4::tree::TerminalNode *AFTER();
     NestedIdentifierContext *nestedIdentifier();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -503,6 +523,7 @@ public:
 
     antlr4::tree::TerminalNode *DROP();
     PartitionClauseContext *partitionClause();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -517,6 +538,7 @@ public:
     antlr4::tree::TerminalNode *STRING_LITERAL();
     antlr4::tree::TerminalNode *IF();
     antlr4::tree::TerminalNode *EXISTS();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -526,6 +548,7 @@ public:
 
     antlr4::tree::TerminalNode *MODIFY();
     TtlClauseContext *ttlClause();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -541,6 +564,7 @@ public:
     antlr4::tree::TerminalNode *VOLUME();
     antlr4::tree::TerminalNode *TABLE();
     TableIdentifierContext *tableIdentifier();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -556,6 +580,7 @@ public:
     antlr4::tree::TerminalNode *EXISTS();
     antlr4::tree::TerminalNode *AFTER();
     NestedIdentifierContext *nestedIdentifier();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -570,6 +595,7 @@ public:
     std::vector<antlr4::tree::TerminalNode *> COMMA();
     antlr4::tree::TerminalNode* COMMA(size_t i);
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -584,6 +610,7 @@ public:
     antlr4::tree::TerminalNode *EQ_SINGLE();
     ColumnExprContext *columnExpr();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -601,6 +628,7 @@ public:
     antlr4::tree::TerminalNode *MATERIALIZED();
     antlr4::tree::TerminalNode *TTL();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -616,6 +644,7 @@ public:
     antlr4::tree::TerminalNode *ID();
     antlr4::tree::TerminalNode *STRING_LITERAL();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -643,6 +672,7 @@ public:
     antlr4::tree::TerminalNode *DICTIONARY();
     TableIdentifierContext *tableIdentifier();
     ClusterClauseContext *clusterClause();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -657,6 +687,7 @@ public:
     TableIdentifierContext *tableIdentifier();
     PartitionClauseContext *partitionClause();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -693,6 +724,7 @@ public:
     UuidClauseContext *uuidClause();
     ClusterClauseContext *clusterClause();
     TableSchemaClauseContext *tableSchemaClause();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -711,6 +743,7 @@ public:
     antlr4::tree::TerminalNode *EXISTS();
     UuidClauseContext *uuidClause();
     ClusterClauseContext *clusterClause();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -727,6 +760,7 @@ public:
     antlr4::tree::TerminalNode *EXISTS();
     ClusterClauseContext *clusterClause();
     EngineExprContext *engineExpr();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -750,6 +784,7 @@ public:
     DestinationClauseContext *destinationClause();
     TableSchemaClauseContext *tableSchemaClause();
     antlr4::tree::TerminalNode *DECIMAL_LITERAL();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -772,6 +807,7 @@ public:
     ClusterClauseContext *clusterClause();
     TableSchemaClauseContext *tableSchemaClause();
     antlr4::tree::TerminalNode *POPULATE();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -792,6 +828,7 @@ public:
     TableSchemaClauseContext *tableSchemaClause();
     EngineClauseContext *engineClause();
     SubqueryClauseContext *subqueryClause();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -808,6 +845,7 @@ public:
     std::vector<antlr4::tree::TerminalNode *> COMMA();
     antlr4::tree::TerminalNode* COMMA(size_t i);
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -836,6 +874,7 @@ public:
     std::vector<antlr4::tree::TerminalNode *> IS_OBJECT_ID();
     antlr4::tree::TerminalNode* IS_OBJECT_ID(size_t i);
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -859,6 +898,7 @@ public:
     std::vector<DictionarySettingsClauseContext *> dictionarySettingsClause();
     DictionarySettingsClauseContext* dictionarySettingsClause(size_t i);
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -873,6 +913,7 @@ public:
     antlr4::tree::TerminalNode *KEY();
     ColumnExprListContext *columnExprList();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -889,6 +930,7 @@ public:
     antlr4::tree::TerminalNode *LPAREN();
     antlr4::tree::TerminalNode *RPAREN();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -908,6 +950,7 @@ public:
     std::vector<DictionaryArgExprContext *> dictionaryArgExpr();
     DictionaryArgExprContext* dictionaryArgExpr(size_t i);
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -926,6 +969,7 @@ public:
     antlr4::tree::TerminalNode *MIN();
     antlr4::tree::TerminalNode *MAX();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -945,6 +989,7 @@ public:
     std::vector<DictionaryArgExprContext *> dictionaryArgExpr();
     DictionaryArgExprContext* dictionaryArgExpr(size_t i);
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -963,6 +1008,7 @@ public:
     IdentifierContext* identifier(size_t i);
     antlr4::tree::TerminalNode *MAX();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -978,6 +1024,7 @@ public:
     SettingExprListContext *settingExprList();
     antlr4::tree::TerminalNode *RPAREN();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -993,6 +1040,7 @@ public:
     IdentifierContext *identifier();
     antlr4::tree::TerminalNode *STRING_LITERAL();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1006,6 +1054,7 @@ public:
     antlr4::tree::TerminalNode *UUID();
     antlr4::tree::TerminalNode *STRING_LITERAL();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1019,6 +1068,7 @@ public:
     antlr4::tree::TerminalNode *TO();
     TableIdentifierContext *tableIdentifier();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1032,6 +1082,7 @@ public:
     antlr4::tree::TerminalNode *AS();
     SelectUnionStmtContext *selectUnionStmt();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1057,6 +1108,7 @@ public:
 
     antlr4::tree::TerminalNode *AS();
     TableIdentifierContext *tableIdentifier();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -1066,6 +1118,7 @@ public:
 
     antlr4::tree::TerminalNode *AS();
     TableFunctionExprContext *tableFunctionExpr();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -1079,6 +1132,7 @@ public:
     antlr4::tree::TerminalNode *RPAREN();
     std::vector<antlr4::tree::TerminalNode *> COMMA();
     antlr4::tree::TerminalNode* COMMA(size_t i);
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -1103,6 +1157,7 @@ public:
     std::vector<SettingsClauseContext *> settingsClause();
     SettingsClauseContext* settingsClause(size_t i);
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1117,6 +1172,7 @@ public:
     antlr4::tree::TerminalNode *BY();
     ColumnExprContext *columnExpr();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1131,6 +1187,7 @@ public:
     antlr4::tree::TerminalNode *KEY();
     ColumnExprContext *columnExpr();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1145,6 +1202,7 @@ public:
     antlr4::tree::TerminalNode *BY();
     ColumnExprContext *columnExpr();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1161,6 +1219,7 @@ public:
     std::vector<antlr4::tree::TerminalNode *> COMMA();
     antlr4::tree::TerminalNode* COMMA(size_t i);
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1178,6 +1237,7 @@ public:
     antlr4::tree::TerminalNode *RPAREN();
     ColumnExprListContext *columnExprList();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1205,6 +1265,7 @@ public:
     IdentifierContext *identifier();
     antlr4::tree::TerminalNode *CHECK();
     ColumnExprContext *columnExpr();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -1213,6 +1274,7 @@ public:
     TableElementExprColumnContext(TableElementExprContext *ctx);
 
     TableColumnDfntContext *tableColumnDfnt();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -1222,6 +1284,7 @@ public:
 
     antlr4::tree::TerminalNode *INDEX();
     TableIndexDfntContext *tableIndexDfnt();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -1240,6 +1303,7 @@ public:
     antlr4::tree::TerminalNode *TTL();
     ColumnExprContext *columnExpr();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1255,6 +1319,7 @@ public:
     antlr4::tree::TerminalNode *MATERIALIZED();
     antlr4::tree::TerminalNode *ALIAS();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1272,6 +1337,7 @@ public:
     antlr4::tree::TerminalNode *GRANULARITY();
     antlr4::tree::TerminalNode *DECIMAL_LITERAL();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1290,6 +1356,7 @@ public:
     std::vector<antlr4::tree::TerminalNode *> COMMA();
     antlr4::tree::TerminalNode* COMMA(size_t i);
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1305,6 +1372,7 @@ public:
     antlr4::tree::TerminalNode *RPAREN();
     ColumnExprListContext *columnExprList();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1322,6 +1390,7 @@ public:
     antlr4::tree::TerminalNode *STRING_LITERAL();
     antlr4::tree::TerminalNode *VOLUME();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1337,6 +1406,7 @@ public:
     antlr4::tree::TerminalNode *DESC();
     antlr4::tree::TerminalNode *TABLE();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1367,6 +1437,7 @@ public:
     antlr4::tree::TerminalNode *IF();
     antlr4::tree::TerminalNode *EXISTS();
     ClusterClauseContext *clusterClause();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -1379,12 +1450,14 @@ public:
     antlr4::tree::TerminalNode *DROP();
     antlr4::tree::TerminalNode *DICTIONARY();
     antlr4::tree::TerminalNode *TABLE();
+    antlr4::tree::TerminalNode *VIEW();
     antlr4::tree::TerminalNode *IF();
     antlr4::tree::TerminalNode *EXISTS();
     ClusterClauseContext *clusterClause();
     antlr4::tree::TerminalNode *NO();
     antlr4::tree::TerminalNode *DELAY();
     antlr4::tree::TerminalNode *TEMPORARY();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -1393,15 +1466,39 @@ public:
   class  ExistsStmtContext : public antlr4::ParserRuleContext {
   public:
     ExistsStmtContext(antlr4::ParserRuleContext *parent, size_t invokingState);
+   
+    ExistsStmtContext() = default;
+    void copyFrom(ExistsStmtContext *context);
+    using antlr4::ParserRuleContext::copyFrom;
+
     virtual size_t getRuleIndex() const override;
+
+   
+  };
+
+  class  ExistsTableStmtContext : public ExistsStmtContext {
+  public:
+    ExistsTableStmtContext(ExistsStmtContext *ctx);
+
     antlr4::tree::TerminalNode *EXISTS();
     TableIdentifierContext *tableIdentifier();
     antlr4::tree::TerminalNode *DICTIONARY();
     antlr4::tree::TerminalNode *TABLE();
+    antlr4::tree::TerminalNode *VIEW();
     antlr4::tree::TerminalNode *TEMPORARY();
 
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
-   
+  };
+
+  class  ExistsDatabaseStmtContext : public ExistsStmtContext {
+  public:
+    ExistsDatabaseStmtContext(ExistsStmtContext *ctx);
+
+    antlr4::tree::TerminalNode *EXISTS();
+    antlr4::tree::TerminalNode *DATABASE();
+    DatabaseIdentifierContext *databaseIdentifier();
+
+    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
   ExistsStmtContext* existsStmt();
@@ -1414,6 +1511,7 @@ public:
     antlr4::tree::TerminalNode *SYNTAX();
     QueryContext *query();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1433,6 +1531,7 @@ public:
     antlr4::tree::TerminalNode *TABLE();
     ColumnsClauseContext *columnsClause();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1450,6 +1549,7 @@ public:
     std::vector<antlr4::tree::TerminalNode *> COMMA();
     antlr4::tree::TerminalNode* COMMA(size_t i);
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1474,6 +1574,7 @@ public:
     DataClauseValuesContext(DataClauseContext *ctx);
 
     antlr4::tree::TerminalNode *VALUES();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -1483,6 +1584,7 @@ public:
 
     antlr4::tree::TerminalNode *FORMAT();
     IdentifierContext *identifier();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -1493,6 +1595,7 @@ public:
     SelectUnionStmtContext *selectUnionStmt();
     antlr4::tree::TerminalNode *EOF();
     antlr4::tree::TerminalNode *SEMICOLON();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -1522,6 +1625,7 @@ public:
     antlr4::tree::TerminalNode *SYNC();
     antlr4::tree::TerminalNode *ASYNC();
     antlr4::tree::TerminalNode *TEST();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -1539,6 +1643,7 @@ public:
     antlr4::tree::TerminalNode *FINAL();
     antlr4::tree::TerminalNode *DEDUPLICATE();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1559,6 +1664,7 @@ public:
     antlr4::tree::TerminalNode* COMMA(size_t i);
     ClusterClauseContext *clusterClause();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1576,6 +1682,7 @@ public:
     std::vector<antlr4::tree::TerminalNode *> ALL();
     antlr4::tree::TerminalNode* ALL(size_t i);
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1591,6 +1698,7 @@ public:
     SelectUnionStmtContext *selectUnionStmt();
     antlr4::tree::TerminalNode *RPAREN();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1622,6 +1730,7 @@ public:
     antlr4::tree::TerminalNode *CUBE();
     antlr4::tree::TerminalNode *ROLLUP();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1635,6 +1744,7 @@ public:
     antlr4::tree::TerminalNode *WITH();
     ColumnExprListContext *columnExprList();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1650,6 +1760,7 @@ public:
     antlr4::tree::TerminalNode *WITH();
     antlr4::tree::TerminalNode *TIES();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1663,6 +1774,7 @@ public:
     antlr4::tree::TerminalNode *FROM();
     JoinExprContext *joinExpr();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1679,6 +1791,7 @@ public:
     antlr4::tree::TerminalNode *LEFT();
     antlr4::tree::TerminalNode *INNER();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1692,6 +1805,7 @@ public:
     antlr4::tree::TerminalNode *PREWHERE();
     ColumnExprContext *columnExpr();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1705,6 +1819,7 @@ public:
     antlr4::tree::TerminalNode *WHERE();
     ColumnExprContext *columnExpr();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1723,6 +1838,7 @@ public:
     antlr4::tree::TerminalNode *CUBE();
     antlr4::tree::TerminalNode *ROLLUP();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1736,6 +1852,7 @@ public:
     antlr4::tree::TerminalNode *HAVING();
     ColumnExprContext *columnExpr();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1750,6 +1867,7 @@ public:
     antlr4::tree::TerminalNode *BY();
     OrderExprListContext *orderExprList();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1765,6 +1883,7 @@ public:
     antlr4::tree::TerminalNode *BY();
     ColumnExprListContext *columnExprList();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1780,6 +1899,7 @@ public:
     antlr4::tree::TerminalNode *WITH();
     antlr4::tree::TerminalNode *TIES();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1793,6 +1913,7 @@ public:
     antlr4::tree::TerminalNode *SETTINGS();
     SettingExprListContext *settingExprList();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1823,6 +1944,7 @@ public:
     JoinOpContext *joinOp();
     antlr4::tree::TerminalNode *GLOBAL();
     antlr4::tree::TerminalNode *LOCAL();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -1833,6 +1955,7 @@ public:
     TableExprContext *tableExpr();
     antlr4::tree::TerminalNode *FINAL();
     SampleClauseContext *sampleClause();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -1843,6 +1966,7 @@ public:
     antlr4::tree::TerminalNode *LPAREN();
     JoinExprContext *joinExpr();
     antlr4::tree::TerminalNode *RPAREN();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -1853,6 +1977,7 @@ public:
     std::vector<JoinExprContext *> joinExpr();
     JoinExprContext* joinExpr(size_t i);
     JoinOpCrossContext *joinOpCross();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -1879,6 +2004,7 @@ public:
     antlr4::tree::TerminalNode *OUTER();
     antlr4::tree::TerminalNode *ALL();
     antlr4::tree::TerminalNode *ANY();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -1890,6 +2016,7 @@ public:
     antlr4::tree::TerminalNode *ALL();
     antlr4::tree::TerminalNode *ANY();
     antlr4::tree::TerminalNode *ASOF();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -1905,6 +2032,7 @@ public:
     antlr4::tree::TerminalNode *ANTI();
     antlr4::tree::TerminalNode *ANY();
     antlr4::tree::TerminalNode *ASOF();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -1920,6 +2048,7 @@ public:
     antlr4::tree::TerminalNode *LOCAL();
     antlr4::tree::TerminalNode *COMMA();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1936,6 +2065,7 @@ public:
     antlr4::tree::TerminalNode *LPAREN();
     antlr4::tree::TerminalNode *RPAREN();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1951,6 +2081,7 @@ public:
     RatioExprContext* ratioExpr(size_t i);
     antlr4::tree::TerminalNode *OFFSET();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1966,6 +2097,7 @@ public:
     antlr4::tree::TerminalNode *COMMA();
     antlr4::tree::TerminalNode *OFFSET();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -1981,6 +2113,7 @@ public:
     std::vector<antlr4::tree::TerminalNode *> COMMA();
     antlr4::tree::TerminalNode* COMMA(size_t i);
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2001,6 +2134,7 @@ public:
     antlr4::tree::TerminalNode *FIRST();
     antlr4::tree::TerminalNode *LAST();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2015,6 +2149,7 @@ public:
     NumberLiteralContext* numberLiteral(size_t i);
     antlr4::tree::TerminalNode *SLASH();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2030,6 +2165,7 @@ public:
     std::vector<antlr4::tree::TerminalNode *> COMMA();
     antlr4::tree::TerminalNode* COMMA(size_t i);
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2044,6 +2180,7 @@ public:
     antlr4::tree::TerminalNode *EQ_SINGLE();
     LiteralContext *literal();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2057,6 +2194,7 @@ public:
     antlr4::tree::TerminalNode *SET();
     SettingExprListContext *settingExprList();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2084,6 +2222,7 @@ public:
     antlr4::tree::TerminalNode *CREATE();
     antlr4::tree::TerminalNode *DATABASE();
     DatabaseIdentifierContext *databaseIdentifier();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2093,6 +2232,7 @@ public:
 
     antlr4::tree::TerminalNode *SHOW();
     antlr4::tree::TerminalNode *DATABASES();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2105,6 +2245,7 @@ public:
     TableIdentifierContext *tableIdentifier();
     antlr4::tree::TerminalNode *TEMPORARY();
     antlr4::tree::TerminalNode *TABLE();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2122,6 +2263,7 @@ public:
     LimitClauseContext *limitClause();
     antlr4::tree::TerminalNode *FROM();
     antlr4::tree::TerminalNode *IN();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2133,6 +2275,7 @@ public:
     antlr4::tree::TerminalNode *DICTIONARIES();
     antlr4::tree::TerminalNode *FROM();
     DatabaseIdentifierContext *databaseIdentifier();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2144,6 +2287,7 @@ public:
     antlr4::tree::TerminalNode *CREATE();
     antlr4::tree::TerminalNode *DICTIONARY();
     TableIdentifierContext *tableIdentifier();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2171,6 +2315,7 @@ public:
     antlr4::tree::TerminalNode *SYNC();
     antlr4::tree::TerminalNode *REPLICA();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2189,6 +2334,7 @@ public:
     antlr4::tree::TerminalNode *EXISTS();
     ClusterClauseContext *clusterClause();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2202,6 +2348,7 @@ public:
     antlr4::tree::TerminalNode *USE();
     DatabaseIdentifierContext *databaseIdentifier();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2218,6 +2365,7 @@ public:
     antlr4::tree::TerminalNode *LIMIT();
     antlr4::tree::TerminalNode *DECIMAL_LITERAL();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2249,6 +2397,7 @@ public:
     antlr4::tree::TerminalNode *RPAREN();
     std::vector<antlr4::tree::TerminalNode *> COMMA();
     antlr4::tree::TerminalNode* COMMA(size_t i);
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2260,6 +2409,7 @@ public:
     antlr4::tree::TerminalNode *LPAREN();
     antlr4::tree::TerminalNode *RPAREN();
     ColumnExprListContext *columnExprList();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2268,6 +2418,7 @@ public:
     ColumnTypeExprSimpleContext(ColumnTypeExprContext *ctx);
 
     IdentifierContext *identifier();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2282,6 +2433,7 @@ public:
     antlr4::tree::TerminalNode *RPAREN();
     std::vector<antlr4::tree::TerminalNode *> COMMA();
     antlr4::tree::TerminalNode* COMMA(size_t i);
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2296,6 +2448,7 @@ public:
     antlr4::tree::TerminalNode *RPAREN();
     std::vector<antlr4::tree::TerminalNode *> COMMA();
     antlr4::tree::TerminalNode* COMMA(size_t i);
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2310,6 +2463,7 @@ public:
     std::vector<antlr4::tree::TerminalNode *> COMMA();
     antlr4::tree::TerminalNode* COMMA(size_t i);
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2334,6 +2488,7 @@ public:
     ColumnsExprColumnContext(ColumnsExprContext *ctx);
 
     ColumnExprContext *columnExpr();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2344,6 +2499,7 @@ public:
     antlr4::tree::TerminalNode *ASTERISK();
     TableIdentifierContext *tableIdentifier();
     antlr4::tree::TerminalNode *DOT();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2354,6 +2510,7 @@ public:
     antlr4::tree::TerminalNode *LPAREN();
     SelectUnionStmtContext *selectUnionStmt();
     antlr4::tree::TerminalNode *RPAREN();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2380,6 +2537,7 @@ public:
     ColumnExprContext* columnExpr(size_t i);
     antlr4::tree::TerminalNode *QUERY();
     antlr4::tree::TerminalNode *COLON();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2391,6 +2549,7 @@ public:
     AliasContext *alias();
     antlr4::tree::TerminalNode *AS();
     IdentifierContext *identifier();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2404,6 +2563,7 @@ public:
     antlr4::tree::TerminalNode *FROM();
     ColumnExprContext *columnExpr();
     antlr4::tree::TerminalNode *RPAREN();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2413,6 +2573,7 @@ public:
 
     antlr4::tree::TerminalNode *DASH();
     ColumnExprContext *columnExpr();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2423,6 +2584,7 @@ public:
     antlr4::tree::TerminalNode *LPAREN();
     SelectUnionStmtContext *selectUnionStmt();
     antlr4::tree::TerminalNode *RPAREN();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2431,6 +2593,7 @@ public:
     ColumnExprLiteralContext(ColumnExprContext *ctx);
 
     LiteralContext *literal();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2441,6 +2604,7 @@ public:
     antlr4::tree::TerminalNode *LBRACKET();
     antlr4::tree::TerminalNode *RBRACKET();
     ColumnExprListContext *columnExprList();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2455,6 +2619,7 @@ public:
     antlr4::tree::TerminalNode *FROM();
     antlr4::tree::TerminalNode *RPAREN();
     antlr4::tree::TerminalNode *FOR();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2468,6 +2633,7 @@ public:
     antlr4::tree::TerminalNode *AS();
     ColumnTypeExprContext *columnTypeExpr();
     antlr4::tree::TerminalNode *RPAREN();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2478,6 +2644,7 @@ public:
     std::vector<ColumnExprContext *> columnExpr();
     ColumnExprContext* columnExpr(size_t i);
     antlr4::tree::TerminalNode *OR();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2490,6 +2657,7 @@ public:
     antlr4::tree::TerminalNode *ASTERISK();
     antlr4::tree::TerminalNode *SLASH();
     antlr4::tree::TerminalNode *PERCENT();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2502,6 +2670,7 @@ public:
     antlr4::tree::TerminalNode *PLUS();
     antlr4::tree::TerminalNode *DASH();
     antlr4::tree::TerminalNode *CONCAT();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2523,6 +2692,7 @@ public:
     antlr4::tree::TerminalNode *ILIKE();
     antlr4::tree::TerminalNode *GLOBAL();
     antlr4::tree::TerminalNode *NOT();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2533,6 +2703,7 @@ public:
     antlr4::tree::TerminalNode *INTERVAL();
     ColumnExprContext *columnExpr();
     IntervalContext *interval();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2544,6 +2715,7 @@ public:
     antlr4::tree::TerminalNode *IS();
     antlr4::tree::TerminalNode *NULL_SQL();
     antlr4::tree::TerminalNode *NOT();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2560,6 +2732,7 @@ public:
     antlr4::tree::TerminalNode *BOTH();
     antlr4::tree::TerminalNode *LEADING();
     antlr4::tree::TerminalNode *TRAILING();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2570,6 +2743,7 @@ public:
     antlr4::tree::TerminalNode *LPAREN();
     ColumnExprListContext *columnExprList();
     antlr4::tree::TerminalNode *RPAREN();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2581,6 +2755,7 @@ public:
     ColumnExprContext* columnExpr(size_t i);
     antlr4::tree::TerminalNode *LBRACKET();
     antlr4::tree::TerminalNode *RBRACKET();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2593,6 +2768,7 @@ public:
     antlr4::tree::TerminalNode *BETWEEN();
     antlr4::tree::TerminalNode *AND();
     antlr4::tree::TerminalNode *NOT();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2603,6 +2779,7 @@ public:
     antlr4::tree::TerminalNode *LPAREN();
     ColumnExprContext *columnExpr();
     antlr4::tree::TerminalNode *RPAREN();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2612,6 +2789,7 @@ public:
 
     antlr4::tree::TerminalNode *TIMESTAMP();
     antlr4::tree::TerminalNode *STRING_LITERAL();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2622,6 +2800,7 @@ public:
     std::vector<ColumnExprContext *> columnExpr();
     ColumnExprContext* columnExpr(size_t i);
     antlr4::tree::TerminalNode *AND();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2632,6 +2811,7 @@ public:
     ColumnExprContext *columnExpr();
     antlr4::tree::TerminalNode *DOT();
     antlr4::tree::TerminalNode *DECIMAL_LITERAL();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2648,6 +2828,7 @@ public:
     std::vector<antlr4::tree::TerminalNode *> THEN();
     antlr4::tree::TerminalNode* THEN(size_t i);
     antlr4::tree::TerminalNode *ELSE();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2657,6 +2838,7 @@ public:
 
     antlr4::tree::TerminalNode *DATE();
     antlr4::tree::TerminalNode *STRING_LITERAL();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2666,6 +2848,7 @@ public:
 
     antlr4::tree::TerminalNode *NOT();
     ColumnExprContext *columnExpr();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2674,6 +2857,7 @@ public:
     ColumnExprIdentifierContext(ColumnExprContext *ctx);
 
     ColumnIdentifierContext *columnIdentifier();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2689,6 +2873,7 @@ public:
     antlr4::tree::TerminalNode *DISTINCT();
     ColumnArgListContext *columnArgList();
     ColumnExprListContext *columnExprList();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2699,6 +2884,7 @@ public:
     antlr4::tree::TerminalNode *ASTERISK();
     TableIdentifierContext *tableIdentifier();
     antlr4::tree::TerminalNode *DOT();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2713,6 +2899,7 @@ public:
     std::vector<antlr4::tree::TerminalNode *> COMMA();
     antlr4::tree::TerminalNode* COMMA(size_t i);
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2726,6 +2913,7 @@ public:
     ColumnLambdaExprContext *columnLambdaExpr();
     ColumnExprContext *columnExpr();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2745,6 +2933,7 @@ public:
     std::vector<antlr4::tree::TerminalNode *> COMMA();
     antlr4::tree::TerminalNode* COMMA(size_t i);
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2759,6 +2948,7 @@ public:
     TableIdentifierContext *tableIdentifier();
     antlr4::tree::TerminalNode *DOT();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2773,6 +2963,7 @@ public:
     IdentifierContext* identifier(size_t i);
     antlr4::tree::TerminalNode *DOT();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2797,6 +2988,7 @@ public:
     TableExprIdentifierContext(TableExprContext *ctx);
 
     TableIdentifierContext *tableIdentifier();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2807,6 +2999,7 @@ public:
     antlr4::tree::TerminalNode *LPAREN();
     SelectUnionStmtContext *selectUnionStmt();
     antlr4::tree::TerminalNode *RPAREN();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2818,6 +3011,7 @@ public:
     AliasContext *alias();
     antlr4::tree::TerminalNode *AS();
     IdentifierContext *identifier();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2826,6 +3020,7 @@ public:
     TableExprFunctionContext(TableExprContext *ctx);
 
     TableFunctionExprContext *tableFunctionExpr();
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
@@ -2840,6 +3035,7 @@ public:
     antlr4::tree::TerminalNode *RPAREN();
     TableArgListContext *tableArgList();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2854,6 +3050,7 @@ public:
     DatabaseIdentifierContext *databaseIdentifier();
     antlr4::tree::TerminalNode *DOT();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2869,6 +3066,7 @@ public:
     std::vector<antlr4::tree::TerminalNode *> COMMA();
     antlr4::tree::TerminalNode* COMMA(size_t i);
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2883,6 +3081,7 @@ public:
     TableFunctionExprContext *tableFunctionExpr();
     LiteralContext *literal();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2895,6 +3094,7 @@ public:
     virtual size_t getRuleIndex() const override;
     IdentifierContext *identifier();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2911,6 +3111,7 @@ public:
     antlr4::tree::TerminalNode* DECIMAL_LITERAL(size_t i);
     antlr4::tree::TerminalNode *OCTAL_LITERAL();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2930,6 +3131,7 @@ public:
     antlr4::tree::TerminalNode *PLUS();
     antlr4::tree::TerminalNode *DASH();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2944,6 +3146,7 @@ public:
     antlr4::tree::TerminalNode *STRING_LITERAL();
     antlr4::tree::TerminalNode *NULL_SQL();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -2963,6 +3166,7 @@ public:
     antlr4::tree::TerminalNode *QUARTER();
     antlr4::tree::TerminalNode *YEAR();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -3142,6 +3346,7 @@ public:
     antlr4::tree::TerminalNode *WHERE();
     antlr4::tree::TerminalNode *WITH();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -3157,6 +3362,7 @@ public:
     antlr4::tree::TerminalNode *ID();
     antlr4::tree::TerminalNode *KEY();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -3170,6 +3376,7 @@ public:
     antlr4::tree::TerminalNode *IDENTIFIER();
     KeywordForAliasContext *keywordForAlias();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -3184,6 +3391,7 @@ public:
     IntervalContext *interval();
     KeywordContext *keyword();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -3197,6 +3405,7 @@ public:
     IdentifierContext *identifier();
     antlr4::tree::TerminalNode *NULL_SQL();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
@@ -3211,6 +3420,7 @@ public:
     antlr4::tree::TerminalNode *EQ_SINGLE();
     NumberLiteralContext *numberLiteral();
 
+
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
    
   };
diff --git a/src/Parsers/New/ClickHouseParserVisitor.h b/src/Parsers/New/ClickHouseParserVisitor.h
index d187fc21a7d..fbe50af7e9a 100644
--- a/src/Parsers/New/ClickHouseParserVisitor.h
+++ b/src/Parsers/New/ClickHouseParserVisitor.h
@@ -164,7 +164,9 @@ public:
 
     virtual antlrcpp::Any visitDropTableStmt(ClickHouseParser::DropTableStmtContext *context) = 0;
 
-    virtual antlrcpp::Any visitExistsStmt(ClickHouseParser::ExistsStmtContext *context) = 0;
+    virtual antlrcpp::Any visitExistsDatabaseStmt(ClickHouseParser::ExistsDatabaseStmtContext *context) = 0;
+
+    virtual antlrcpp::Any visitExistsTableStmt(ClickHouseParser::ExistsTableStmtContext *context) = 0;
 
     virtual antlrcpp::Any visitExplainStmt(ClickHouseParser::ExplainStmtContext *context) = 0;
 
diff --git a/src/Parsers/New/ParseTreeVisitor.h b/src/Parsers/New/ParseTreeVisitor.h
index 8301cb5c5b8..2c204ead972 100644
--- a/src/Parsers/New/ParseTreeVisitor.h
+++ b/src/Parsers/New/ParseTreeVisitor.h
@@ -136,7 +136,8 @@ public:
     antlrcpp::Any visitTtlExpr(ClickHouseParser::TtlExprContext * ctx) override;
 
     // ExistsQuery
-    antlrcpp::Any visitExistsStmt(ClickHouseParser::ExistsStmtContext * ctx) override;
+    antlrcpp::Any visitExistsTableStmt(ClickHouseParser::ExistsTableStmtContext * ctx) override;
+    antlrcpp::Any visitExistsDatabaseStmt(ClickHouseParser::ExistsDatabaseStmtContext * ctx) override;
 
     // ExplainQuery
     antlrcpp::Any visitExplainStmt(ClickHouseParser::ExplainStmtContext * ctx) override;
diff --git a/src/Parsers/TablePropertiesQueriesASTs.h b/src/Parsers/TablePropertiesQueriesASTs.h
index bfd3135aec4..edb040d72d9 100644
--- a/src/Parsers/TablePropertiesQueriesASTs.h
+++ b/src/Parsers/TablePropertiesQueriesASTs.h
@@ -76,7 +76,6 @@ struct ASTDescribeQueryExistsQueryIDAndQueryNames
     static constexpr auto QueryTemporary = "DESCRIBE TEMPORARY TABLE";
 };
 
-using ASTExistsDatabaseQuery = ASTQueryWithTableAndOutputImpl<ASTExistsDatabaseQueryIDAndQueryNames>;
 using ASTExistsTableQuery = ASTQueryWithTableAndOutputImpl<ASTExistsTableQueryIDAndQueryNames>;
 using ASTExistsViewQuery = ASTQueryWithTableAndOutputImpl<ASTExistsViewQueryIDAndQueryNames>;
 using ASTExistsDictionaryQuery = ASTQueryWithTableAndOutputImpl<ASTExistsDictionaryQueryIDAndQueryNames>;
@@ -84,6 +83,16 @@ using ASTShowCreateTableQuery = ASTQueryWithTableAndOutputImpl<ASTShowCreateTabl
 using ASTShowCreateViewQuery = ASTQueryWithTableAndOutputImpl<ASTShowCreateViewQueryIDAndQueryNames>;
 using ASTShowCreateDictionaryQuery = ASTQueryWithTableAndOutputImpl<ASTShowCreateDictionaryQueryIDAndQueryNames>;
 
+class ASTExistsDatabaseQuery : public ASTQueryWithTableAndOutputImpl<ASTExistsDatabaseQueryIDAndQueryNames>
+{
+protected:
+    void formatQueryImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override
+    {
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << ASTExistsDatabaseQueryIDAndQueryNames::Query
+                    << " " << (settings.hilite ? hilite_none : "") << backQuoteIfNeed(database);
+    }
+};
+
 class ASTShowCreateDatabaseQuery : public ASTQueryWithTableAndOutputImpl<ASTShowCreateDatabaseQueryIDAndQueryNames>
 {
 protected:
diff --git a/tests/queries/0_stateless/01048_exists_query.sql b/tests/queries/0_stateless/01048_exists_query.sql
index 239f865fa99..4e642084354 100644
--- a/tests/queries/0_stateless/01048_exists_query.sql
+++ b/tests/queries/0_stateless/01048_exists_query.sql
@@ -28,7 +28,7 @@ EXISTS t_01048; -- Does not work for temporary tables. Maybe have to fix.
 EXISTS TABLE t_01048;
 EXISTS DICTIONARY t_01048;
 
-CREATE DICTIONARY db_01048.t_01048 (k UInt64, v String) PRIMARY KEY k LAYOUT(FLAT()) SOURCE(HTTP(URL 'http://example.test/' FORMAT TSV)) LIFETIME(1000);
+CREATE DICTIONARY db_01048.t_01048 (k UInt64, v String) PRIMARY KEY k LAYOUT(FLAT()) SOURCE(HTTP(URL 'http://example.test/' FORMAT 'TSV')) LIFETIME(1000);
 EXISTS db_01048.t_01048;
 EXISTS TABLE db_01048.t_01048; -- Dictionaries are tables as well. But not all tables are dictionaries.
 EXISTS DICTIONARY db_01048.t_01048;
diff --git a/tests/queries/skip_list.json b/tests/queries/skip_list.json
index cfbac463932..f9e51c2ba57 100644
--- a/tests/queries/skip_list.json
+++ b/tests/queries/skip_list.json
@@ -162,7 +162,6 @@
         "01039_test_setting_parse",
         "01042_system_reload_dictionary_reloads_completely",
         "01045_dictionaries_restrictions",
-        "01048_exists_query",
         "01055_compact_parts_1",
         "01056_create_table_as",
         "01066_bit_count",
@@ -197,7 +196,6 @@
         "01190_full_attach_syntax",
         "01191_rename_dictionary",
         "01192_rename_database_zookeeper",
-        "01210_drop_view",
         "01213_alter_rename_column",
         "01232_untuple",
         "01244_optimize_distributed_group_by_sharding_key",
@@ -209,7 +207,6 @@
         "01269_create_with_null",
         "01271_show_privileges",
         "01272_offset_without_limit",
-        "01275_parallel_mv",
         "01277_alter_rename_column_constraint_zookeeper",
         "01278_min_insert_block_size_rows_for_materialized_views",
         "01280_min_map_max_map",

From 547c7af1b1c9b9271e1fcba3263f11951c6f8161 Mon Sep 17 00:00:00 2001
From: Alexander Tokmakov <avtokmakov@yandex-team.ru>
Date: Thu, 14 Jan 2021 17:31:35 +0300
Subject: [PATCH 056/611] fix checkpoint in PeekableReadBuffer over
 ConcatReadBuffer

---
 src/IO/PeekableReadBuffer.cpp                 | 24 +++++++++----------
 src/IO/PeekableReadBuffer.h                   |  6 ++---
 src/Interpreters/InterpreterInsertQuery.cpp   |  1 -
 src/Interpreters/executeQuery.cpp             |  1 -
 ...183_custom_separated_format_http.reference |  2 ++
 .../01183_custom_separated_format_http.sh     | 14 +++++++++++
 6 files changed, 31 insertions(+), 17 deletions(-)
 create mode 100644 tests/queries/0_stateless/01183_custom_separated_format_http.reference
 create mode 100755 tests/queries/0_stateless/01183_custom_separated_format_http.sh

diff --git a/src/IO/PeekableReadBuffer.cpp b/src/IO/PeekableReadBuffer.cpp
index 8ad0e7b572e..8d07b07ddea 100644
--- a/src/IO/PeekableReadBuffer.cpp
+++ b/src/IO/PeekableReadBuffer.cpp
@@ -25,7 +25,7 @@ void PeekableReadBuffer::reset()
     checkStateCorrect();
 
     peeked_size = 0;
-    checkpoint = nullptr;
+    checkpoint = std::nullopt;
     checkpoint_in_own_memory = false;
 
     if (!currentlyReadFromOwnMemory())
@@ -47,7 +47,7 @@ bool PeekableReadBuffer::peekNext()
     {
         /// Don't have to copy all data from sub-buffer if there is no data in own memory (checkpoint and pos are in sub-buffer)
         if (checkpoint)
-            copy_from = checkpoint;
+            copy_from = *checkpoint;
         bytes_to_copy = sub_buf.buffer().end() - copy_from;
         if (!bytes_to_copy)
         {
@@ -57,7 +57,7 @@ bool PeekableReadBuffer::peekNext()
             bool res = sub_buf.next();
             BufferBase::set(sub_buf.buffer().begin(), sub_buf.buffer().size(), sub_buf.offset());
             if (checkpoint)
-                checkpoint = pos;
+                checkpoint.emplace(pos);
 
             checkStateCorrect();
             return res;
@@ -79,7 +79,7 @@ bool PeekableReadBuffer::peekNext()
     /// Otherwise, checkpoint now at the beginning of own memory
     if (checkpoint && useSubbufferOnly())
     {
-        checkpoint = memory.data();
+        checkpoint.emplace(memory.data());
         checkpoint_in_own_memory = true;
     }
     if (currentlyReadFromOwnMemory())
@@ -115,9 +115,9 @@ void PeekableReadBuffer::rollbackToCheckpoint()
     if (!checkpoint)
         throw DB::Exception("There is no checkpoint", ErrorCodes::LOGICAL_ERROR);
     else if (checkpointInOwnMemory() == currentlyReadFromOwnMemory())
-        pos = checkpoint;
+        pos = *checkpoint;
     else /// Checkpoint is in own memory and pos is not. Switch to reading from own memory
-        BufferBase::set(memory.data(), peeked_size, checkpoint - memory.data());
+        BufferBase::set(memory.data(), peeked_size, *checkpoint - memory.data());
     checkStateCorrect();
 }
 
@@ -169,7 +169,7 @@ void PeekableReadBuffer::checkStateCorrect() const
         {
             if (!peeked_size)
                 throw DB::Exception("Checkpoint in empty own buffer", ErrorCodes::LOGICAL_ERROR);
-            if (currentlyReadFromOwnMemory() && pos < checkpoint)
+            if (currentlyReadFromOwnMemory() && pos < *checkpoint)
                 throw DB::Exception("Current position in own buffer before checkpoint in own buffer", ErrorCodes::LOGICAL_ERROR);
             if (!currentlyReadFromOwnMemory() && pos < sub_buf.position())
                 throw DB::Exception("Current position in subbuffer less than sub_buf.position()", ErrorCodes::LOGICAL_ERROR);
@@ -180,7 +180,7 @@ void PeekableReadBuffer::checkStateCorrect() const
                 throw DB::Exception("Own buffer is not empty", ErrorCodes::LOGICAL_ERROR);
             if (currentlyReadFromOwnMemory())
                 throw DB::Exception("Current position in own buffer before checkpoint in subbuffer", ErrorCodes::LOGICAL_ERROR);
-            if (pos < checkpoint)
+            if (pos < *checkpoint)
                 throw DB::Exception("Current position in subbuffer before checkpoint in subbuffer", ErrorCodes::LOGICAL_ERROR);
         }
     }
@@ -202,7 +202,7 @@ void PeekableReadBuffer::resizeOwnMemoryIfNecessary(size_t bytes_to_append)
     bool need_update_pos = currentlyReadFromOwnMemory();
     size_t offset = 0;
     if (need_update_checkpoint)
-        offset = checkpoint - memory.data();
+        offset = *checkpoint - memory.data();
     else if (need_update_pos)
         offset = this->offset();
 
@@ -216,7 +216,7 @@ void PeekableReadBuffer::resizeOwnMemoryIfNecessary(size_t bytes_to_append)
             memmove(memory.data(), memory.data() + offset, peeked_size);
 
             if (need_update_checkpoint)
-                checkpoint -= offset;
+                *checkpoint -= offset;
             if (need_update_pos)
                 pos -= offset;
         }
@@ -235,7 +235,7 @@ void PeekableReadBuffer::resizeOwnMemoryIfNecessary(size_t bytes_to_append)
             memory.resize(new_size_amortized);
 
             if (need_update_checkpoint)
-                checkpoint = memory.data() + offset;
+                checkpoint.emplace(memory.data() + offset);
             if (need_update_pos)
             {
                 BufferBase::set(memory.data(), peeked_size, pos_offset);
@@ -252,7 +252,7 @@ void PeekableReadBuffer::makeContinuousMemoryFromCheckpointToPos()
     checkStateCorrect();
 
     if (!checkpointInOwnMemory() || currentlyReadFromOwnMemory())
-        return;     /// is't already continuous
+        return;     /// it's already continuous
 
     size_t bytes_to_append = pos - sub_buf.position();
     resizeOwnMemoryIfNecessary(bytes_to_append);
diff --git a/src/IO/PeekableReadBuffer.h b/src/IO/PeekableReadBuffer.h
index 62b6f08f621..ffc80489d24 100644
--- a/src/IO/PeekableReadBuffer.h
+++ b/src/IO/PeekableReadBuffer.h
@@ -38,7 +38,7 @@ public:
             /// Don't need to store unread data anymore
             peeked_size = 0;
         }
-        checkpoint = pos;
+        checkpoint.emplace(pos);
 
         // FIXME: we are checking checkpoint existence in few places (rollbackToCheckpoint/dropCheckpoint)
         // by simple if(checkpoint) but checkpoint can be nullptr after
@@ -58,7 +58,7 @@ public:
             /// Don't need to store unread data anymore
             peeked_size = 0;
         }
-        checkpoint = nullptr;
+        checkpoint = std::nullopt;
         checkpoint_in_own_memory = false;
     }
 
@@ -97,7 +97,7 @@ private:
     ReadBuffer & sub_buf;
     const size_t unread_limit;
     size_t peeked_size = 0;
-    Position checkpoint = nullptr;
+    std::optional<Position> checkpoint = std::nullopt;
     bool checkpoint_in_own_memory = false;
 };
 
diff --git a/src/Interpreters/InterpreterInsertQuery.cpp b/src/Interpreters/InterpreterInsertQuery.cpp
index 742c9f6736f..3a76e81f1d4 100644
--- a/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/src/Interpreters/InterpreterInsertQuery.cpp
@@ -12,7 +12,6 @@
 #include <DataStreams/RemoteBlockInputStream.h>
 #include <DataStreams/SquashingBlockOutputStream.h>
 #include <DataStreams/copyData.h>
-#include <IO/ConcatReadBuffer.h>
 #include <IO/ConnectionTimeoutsContext.h>
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
 #include <Interpreters/InterpreterWatchQuery.h>
diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index 5928da156f3..16dbae37f5d 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -3,7 +3,6 @@
 #include <Common/typeid_cast.h>
 #include <Common/ThreadProfileEvents.h>
 
-#include <IO/ConcatReadBuffer.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/WriteBufferFromVector.h>
 #include <IO/LimitReadBuffer.h>
diff --git a/tests/queries/0_stateless/01183_custom_separated_format_http.reference b/tests/queries/0_stateless/01183_custom_separated_format_http.reference
new file mode 100644
index 00000000000..61f15592b64
--- /dev/null
+++ b/tests/queries/0_stateless/01183_custom_separated_format_http.reference
@@ -0,0 +1,2 @@
+2021-Jan	d1	d2
+1000000	1
diff --git a/tests/queries/0_stateless/01183_custom_separated_format_http.sh b/tests/queries/0_stateless/01183_custom_separated_format_http.sh
new file mode 100755
index 00000000000..f981ef5b890
--- /dev/null
+++ b/tests/queries/0_stateless/01183_custom_separated_format_http.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+echo 'DROP TABLE IF EXISTS mydb' | ${CLICKHOUSE_CURL} -sSg "${CLICKHOUSE_URL}" -d @-
+echo 'CREATE TABLE mydb (datetime String, d1 String, d2 String ) ENGINE=Memory' | ${CLICKHOUSE_CURL} -sSg "${CLICKHOUSE_URL}" -d @-
+echo "2021-Jan^d1^d2" | ${CLICKHOUSE_CURL} -sSg "${CLICKHOUSE_URL}&query=INSERT%20INTO%20mydb%20FORMAT%20CustomSeparated%20SETTINGS%20format_custom_escaping_rule%3D%27CSV%27%2C%20format_custom_field_delimiter%20%3D%20%27%5E%27" --data-binary @-
+echo -n "" | ${CLICKHOUSE_CURL} -sSg "${CLICKHOUSE_URL}&query=INSERT%20INTO%20mydb%20FORMAT%20CustomSeparated%20SETTINGS%20format_custom_escaping_rule%3D%27CSV%27%2C%20format_custom_field_delimiter%20%3D%20%27%5E%27" --data-binary @-
+echo 'SELECT * FROM mydb' | ${CLICKHOUSE_CURL} -sSg "${CLICKHOUSE_URL}" -d @-
+printf "2021-Jan^d1^d2\n%.0s" {1..999999} | ${CLICKHOUSE_CURL} -sSg "${CLICKHOUSE_URL}&query=INSERT%20INTO%20mydb%20FORMAT%20CustomSeparated%20SETTINGS%20format_custom_escaping_rule%3D%27CSV%27%2C%20format_custom_field_delimiter%20%3D%20%27%5E%27" --data-binary @-
+echo 'SELECT count(*), countDistinct(datetime, d1, d2) FROM mydb' | ${CLICKHOUSE_CURL} -sSg "${CLICKHOUSE_URL}" -d @-
+echo 'DROP TABLE mydb' | ${CLICKHOUSE_CURL} -sSg "${CLICKHOUSE_URL}" -d @-

From 8be081e3c0834d53c3d677685f17b5e67eee16b0 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Thu, 14 Jan 2021 18:35:52 +0300
Subject: [PATCH 057/611] with debug

---
 programs/client/Client.cpp    |  21 +++++-
 src/Parsers/TokenIterator.cpp |   5 +-
 src/Parsers/TokenIterator.h   |   2 +-
 src/Parsers/parseQuery.cpp    | 126 +++++++++++++++++++---------------
 4 files changed, 95 insertions(+), 59 deletions(-)

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 9ebb9e2c923..7accf530996 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -888,14 +888,18 @@ private:
                 {
                     ++token_iterator;
                 }
-                if (token_iterator->begin >= all_queries_end)
+
+                if (!token_iterator.isValid())
                 {
                     break;
                 }
             }
 
+
             // Try to parse the query.
             const char * this_query_end = this_query_begin;
+            fmt::print(stderr, "left to parse: '{}'\n", std::string_view(
+                this_query_end, all_queries_end - this_query_end));
             try
             {
                 parsed_query = parseQuery(this_query_end, all_queries_end, true);
@@ -925,6 +929,9 @@ private:
                 continue;
             }
 
+            fmt::print(stderr, "parsed query: '{}'\n", std::string_view(
+                this_query_begin, this_query_end - this_query_begin));
+
             if (!parsed_query)
             {
                 if (ignore_error)
@@ -995,6 +1002,18 @@ private:
                         //, where the inline data is delimited by semicolon and not
                         // by a newline.
                         this_query_end = parsed_query->as<ASTInsertQuery>()->end;
+                        // We also have to skip the trailing semicolon that might
+                        // be left after VALUES parsing.
+                        Tokens after_insert_tokens(this_query_end,
+                            all_queries_end);
+                        IParser::Pos after_insert_iterator(after_insert_tokens,
+                            context.getSettingsRef().max_parser_depth);
+                        while (after_insert_iterator.isValid()
+                           && after_insert_iterator->type == TokenType::Semicolon)
+                        {
+                            this_query_end = after_insert_iterator->end;
+                            ++after_insert_iterator;
+                        }
                     }
                 }
                 catch (...)
diff --git a/src/Parsers/TokenIterator.cpp b/src/Parsers/TokenIterator.cpp
index 50faced19c3..18360ed29ae 100644
--- a/src/Parsers/TokenIterator.cpp
+++ b/src/Parsers/TokenIterator.cpp
@@ -4,12 +4,13 @@
 namespace DB
 {
 
-UnmatchedParentheses checkUnmatchedParentheses(TokenIterator begin, Token * last)
+UnmatchedParentheses checkUnmatchedParentheses(TokenIterator begin, Token last)
 {
     /// We have just two kind of parentheses: () and [].
     UnmatchedParentheses stack;
 
-    for (TokenIterator it = begin; it.isValid() && &it.get() <= last; ++it)
+    for (TokenIterator it = begin;
+        it.isValid() && it->begin <= last.begin; ++it)
     {
         if (it->type == TokenType::OpeningRoundBracket || it->type == TokenType::OpeningSquareBracket)
         {
diff --git a/src/Parsers/TokenIterator.h b/src/Parsers/TokenIterator.h
index 078421c99c9..a95465500e0 100644
--- a/src/Parsers/TokenIterator.h
+++ b/src/Parsers/TokenIterator.h
@@ -80,6 +80,6 @@ public:
 
 /// Returns positions of unmatched parentheses.
 using UnmatchedParentheses = std::vector<Token>;
-UnmatchedParentheses checkUnmatchedParentheses(TokenIterator begin, Token * last);
+UnmatchedParentheses checkUnmatchedParentheses(TokenIterator begin, Token last);
 
 }
diff --git a/src/Parsers/parseQuery.cpp b/src/Parsers/parseQuery.cpp
index 9daedc732e2..0e8115a334b 100644
--- a/src/Parsers/parseQuery.cpp
+++ b/src/Parsers/parseQuery.cpp
@@ -249,14 +249,80 @@ ASTPtr tryParseQuery(
         return nullptr;
     }
 
+    fmt::print(stderr, "before parsing: '{}'\n",
+        std::string_view(pos, end - pos));
+
     Expected expected;
 
     ASTPtr res;
     bool parse_res = parser.parse(token_iterator, res, expected);
-    Token last_token = token_iterator.max();
+    const Token last_token = token_iterator.max();
+
+    const auto * query_begin = pos;
 
     pos = last_token.end;
 
+    fmt::print(stderr, "parse res {}, ast {}\n", parse_res,
+        static_cast<void *>(res.get()));
+
+    // If parsed query ends at data for insertion. Data for insertion could be
+    // in any format and not necessary be lexical correct, so we can't perform
+    // most of the checks.
+    ASTInsertQuery * insert = nullptr;
+    if (parse_res)
+        insert = res->as<ASTInsertQuery>();
+
+    if (insert && insert->data)
+    {
+        if (!parse_res)
+        {
+            // Generic parse error.
+            out_error_message = getSyntaxErrorMessage(pos, end, last_token, expected, hilite, query_description);
+            return nullptr;
+        }
+
+        return res;
+    }
+
+    // More granular checks for queries other than INSERT w/inline data.
+    /// Lexical error
+    if (last_token.isError())
+    {
+        out_error_message = getLexicalErrorMessage(pos, end, last_token, hilite, query_description);
+        return nullptr;
+    }
+
+    /// Unmatched parentheses
+    UnmatchedParentheses unmatched_parens = checkUnmatchedParentheses(TokenIterator(tokens), last_token);
+    if (!unmatched_parens.empty())
+    {
+        out_error_message = getUnmatchedParenthesesErrorMessage(pos, end, unmatched_parens, hilite, query_description);
+        return nullptr;
+    }
+
+    // If multi-statements are not allowed, then after semicolon, there must
+    // be no non-space characters.
+    if (!allow_multi_statements
+        && !token_iterator->isEnd())
+    {
+        out_error_message = getSyntaxErrorMessage(pos, end, last_token, {}, hilite,
+            (query_description.empty() ? std::string() : std::string(". ")) + "Multi-statements are not allowed");
+        return nullptr;
+    }
+
+    if (!parse_res)
+    {
+        /// Generic parse error.
+        out_error_message = getSyntaxErrorMessage(pos, end, last_token, expected, hilite, query_description);
+        return nullptr;
+    }
+
+    // The query was parsed correctly, but now we have to do some extra work to
+    // determine where the next query begins, preserving its leading comments.
+
+    fmt::print(stderr, "before adding newline: '{}'\n",
+        std::string_view(query_begin, pos - query_begin));
+
     // The query may also contain a test hint comment in the same line, e.g.
     // select nonexistent_column; -- { serverError 12345 }.
     // We must add this comment to the query text, so that it is handled by the
@@ -265,9 +331,9 @@ ASTPtr tryParseQuery(
     // newline in the string manually. If it's earlier than the next significant
     // token, it means that the text before newline is some trailing whitespace
     // or comment, and we should add it to our query.
-    const auto newline = find_first_symbols<'\n'>(pos, end);
+    const auto * newline = find_first_symbols<'\n'>(pos, end);
     TokenIterator next_token_iterator = token_iterator;
-    const auto next_token_begin =
+    const auto * next_token_begin =
         (next_token_iterator.isValid()
             && (++next_token_iterator).isValid())
             ? (*next_token_iterator).begin : end;
@@ -276,58 +342,8 @@ ASTPtr tryParseQuery(
         pos = newline;
     }
 
-    /// If parsed query ends at data for insertion. Data for insertion could be in any format and not necessary be lexical correct.
-    ASTInsertQuery * insert = nullptr;
-    if (parse_res)
-        insert = res->as<ASTInsertQuery>();
-
-    if (!(insert && insert->data))
-    {
-        /// Lexical error
-        if (last_token.isError())
-        {
-            out_error_message = getLexicalErrorMessage(pos, end, last_token, hilite, query_description);
-            return nullptr;
-        }
-
-        /// Unmatched parentheses
-        UnmatchedParentheses unmatched_parens = checkUnmatchedParentheses(TokenIterator(tokens), &last_token);
-        if (!unmatched_parens.empty())
-        {
-            out_error_message = getUnmatchedParenthesesErrorMessage(pos, end, unmatched_parens, hilite, query_description);
-            return nullptr;
-        }
-    }
-
-    if (!parse_res)
-    {
-        /// Parse error.
-        out_error_message = getSyntaxErrorMessage(pos, end, last_token, expected, hilite, query_description);
-        return nullptr;
-    }
-
-    /// Excessive input after query. Parsed query must end with end of data or semicolon or data for INSERT.
-    if (!token_iterator->isEnd()
-        && token_iterator->type != TokenType::Semicolon
-        && !(insert && insert->data))
-    {
-        expected.add(pos, "end of query");
-        out_error_message = getSyntaxErrorMessage(pos, end, last_token, expected, hilite, query_description);
-        return nullptr;
-    }
-
-    while (token_iterator->type == TokenType::Semicolon)
-        ++token_iterator;
-
-    /// If multi-statements are not allowed, then after semicolon, there must be no non-space characters.
-    if (!allow_multi_statements
-        && !token_iterator->isEnd()
-        && !(insert && insert->data))
-    {
-        out_error_message = getSyntaxErrorMessage(pos, end, last_token, {}, hilite,
-            (query_description.empty() ? std::string() : std::string(". ")) + "Multi-statements are not allowed");
-        return nullptr;
-    }
+    fmt::print(stderr, "final: '{}'\n",
+        std::string_view(query_begin, pos - query_begin));
 
     return res;
 }

From 8b2768fbb0135a4342fbeb9d3e4022914d02d521 Mon Sep 17 00:00:00 2001
From: Yatsishin Ilya <2159081+qoega@users.noreply.github.com>
Date: Thu, 14 Jan 2021 18:37:15 +0300
Subject: [PATCH 058/611] More tests

---
 docker/test/sqlancer/run.sh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/docker/test/sqlancer/run.sh b/docker/test/sqlancer/run.sh
index 9e1c0c547d0..1e36a4f65f0 100755
--- a/docker/test/sqlancer/run.sh
+++ b/docker/test/sqlancer/run.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+QUERIES
+
 set -e -x
 
 dpkg -i package_folder/clickhouse-common-static_*.deb
@@ -10,6 +12,15 @@ dpkg -i package_folder/clickhouse-client_*.deb
 service clickhouse-server start && sleep 5
 
 cd /sqlancer/sqlancer-master
-CLICKHOUSE_AVAILABLE=true mvn -Dtest=TestClickHouse test
 
-cp /sqlancer/sqlancer-master/target/surefire-reports/TEST-sqlancer.dbms.TestClickHouse.xml /test_output/result.xml
\ No newline at end of file
+export TIMEOUT=60
+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 /test_output/TLPWhere.log
+java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPGroupBy /test_output/TLPGroupBy.log
+java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPHaving /test_output/TLPHaving.log
+java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPWhere --oracle TLPGroupBy /test_output/TLPWhereGroupBy.log
+java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPDistinct /test_output/TLPDistinct.log
+java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPAggregate /test_output/TLPAggregate.log
+
+cp /sqlancer/sqlancer-master/target/surefire-reports/TEST-sqlancer.dbms.TestClickHouse.xml /test_output/result.xml

From d53da04e6f1dbcbb5e5ea8ce7aad47aa98961715 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Thu, 14 Jan 2021 18:37:10 +0300
Subject: [PATCH 059/611] without debug

---
 programs/client/Client.cpp |  5 -----
 src/Parsers/parseQuery.cpp | 14 --------------
 2 files changed, 19 deletions(-)

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 7accf530996..6e1049116fa 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -898,8 +898,6 @@ private:
 
             // Try to parse the query.
             const char * this_query_end = this_query_begin;
-            fmt::print(stderr, "left to parse: '{}'\n", std::string_view(
-                this_query_end, all_queries_end - this_query_end));
             try
             {
                 parsed_query = parseQuery(this_query_end, all_queries_end, true);
@@ -929,9 +927,6 @@ private:
                 continue;
             }
 
-            fmt::print(stderr, "parsed query: '{}'\n", std::string_view(
-                this_query_begin, this_query_end - this_query_begin));
-
             if (!parsed_query)
             {
                 if (ignore_error)
diff --git a/src/Parsers/parseQuery.cpp b/src/Parsers/parseQuery.cpp
index 0e8115a334b..803cd5d7d89 100644
--- a/src/Parsers/parseQuery.cpp
+++ b/src/Parsers/parseQuery.cpp
@@ -249,22 +249,14 @@ ASTPtr tryParseQuery(
         return nullptr;
     }
 
-    fmt::print(stderr, "before parsing: '{}'\n",
-        std::string_view(pos, end - pos));
-
     Expected expected;
 
     ASTPtr res;
     bool parse_res = parser.parse(token_iterator, res, expected);
     const Token last_token = token_iterator.max();
 
-    const auto * query_begin = pos;
-
     pos = last_token.end;
 
-    fmt::print(stderr, "parse res {}, ast {}\n", parse_res,
-        static_cast<void *>(res.get()));
-
     // If parsed query ends at data for insertion. Data for insertion could be
     // in any format and not necessary be lexical correct, so we can't perform
     // most of the checks.
@@ -320,9 +312,6 @@ ASTPtr tryParseQuery(
     // The query was parsed correctly, but now we have to do some extra work to
     // determine where the next query begins, preserving its leading comments.
 
-    fmt::print(stderr, "before adding newline: '{}'\n",
-        std::string_view(query_begin, pos - query_begin));
-
     // The query may also contain a test hint comment in the same line, e.g.
     // select nonexistent_column; -- { serverError 12345 }.
     // We must add this comment to the query text, so that it is handled by the
@@ -342,9 +331,6 @@ ASTPtr tryParseQuery(
         pos = newline;
     }
 
-    fmt::print(stderr, "final: '{}'\n",
-        std::string_view(query_begin, pos - query_begin));
-
     return res;
 }
 

From f5d63c23a295da85e8580b2cd9da2edd1c13f26c Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Thu, 14 Jan 2021 19:55:09 +0300
Subject: [PATCH 060/611] semicolon

---
 src/Parsers/parseQuery.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Parsers/parseQuery.cpp b/src/Parsers/parseQuery.cpp
index 803cd5d7d89..c22b0f49a54 100644
--- a/src/Parsers/parseQuery.cpp
+++ b/src/Parsers/parseQuery.cpp
@@ -292,6 +292,12 @@ ASTPtr tryParseQuery(
         return nullptr;
     }
 
+    // Skip the semicolon that might be left after parsing the VALUES format.
+    while (token_iterator->type == TokenType::Semicolon)
+    {
+        ++token_iterator;
+    }
+
     // If multi-statements are not allowed, then after semicolon, there must
     // be no non-space characters.
     if (!allow_multi_statements

From ce086197b7a711c4c84e9fc6d4bd28ba2ce32a3e Mon Sep 17 00:00:00 2001
From: romanzhukov <romanzhukov@yandex-team.ru>
Date: Thu, 14 Jan 2021 20:29:10 +0300
Subject: [PATCH 061/611] DOCSUP-5272: Fix query syntax for DOCSUP-4261

---
 docs/en/operations/settings/settings.md | 6 +-----
 docs/ru/operations/settings/settings.md | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index d3a4d50d21c..4433c27e181 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -2491,11 +2491,7 @@ Default value: 0.
 
 Consider the following query with aggregate functions:
 ```sql
-SELECT
-    SUM(-1),
-    MAX(0)
-FROM system.one
-WHERE 0
+SELECT SUM(-1), MAX(0) FROM system.one WHERE 0;
 ```
 
 With `aggregate_functions_null_for_empty = 0` it would produce:
diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index aa549fc5776..21bb58ca01c 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -2360,11 +2360,7 @@ SELECT number FROM numbers(3) FORMAT JSONEachRow;
 
 Рассмотрим запрос с агрегирующими функциями:
 ```sql
-SELECT
-    SUM(-1),
-    MAX(0)
-FROM system.one
-WHERE 0
+SELECT SUM(-1), MAX(0) FROM system.one WHERE 0;
 ```
 
 Результат запроса с настройкой `aggregate_functions_null_for_empty = 0`:

From c448542b5c83d02861e49e6fc4b49002814a1c27 Mon Sep 17 00:00:00 2001
From: romanzhukov <romanzhukov@yandex-team.ru>
Date: Thu, 14 Jan 2021 20:36:10 +0300
Subject: [PATCH 062/611] DOCSUP-5272: Fix PR 17121 mispelling in RU

---
 docs/ru/engines/table-engines/mergetree-family/replication.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/engines/table-engines/mergetree-family/replication.md b/docs/ru/engines/table-engines/mergetree-family/replication.md
index f17e1b035d4..a8a308b104f 100644
--- a/docs/ru/engines/table-engines/mergetree-family/replication.md
+++ b/docs/ru/engines/table-engines/mergetree-family/replication.md
@@ -153,7 +153,7 @@ CREATE TABLE table_name
 
 ```xml
 <default_replica_path>/clickhouse/tables/{shard}/{database}/{table}</default_replica_path>
-<default_replica_name>{replica}</default_replica_path>
+<default_replica_name>{replica}</default_replica_name>
 ```
 
 В этом случае можно опустить аргументы при создании таблиц:

From 5c97e473931f20017d496694ab3451aaf8408b15 Mon Sep 17 00:00:00 2001
From: romanzhukov <romanzhukov@yandex-team.ru>
Date: Thu, 14 Jan 2021 20:50:32 +0300
Subject: [PATCH 063/611] DOCSUP-5272: Add PR#17213 translation to RU

---
 .../sql-reference/statements/create/table.md  | 14 ++------------
 .../sql-reference/statements/create/table.md  | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/docs/en/sql-reference/statements/create/table.md b/docs/en/sql-reference/statements/create/table.md
index b1a5fdb19b5..1dd9238a9f2 100644
--- a/docs/en/sql-reference/statements/create/table.md
+++ b/docs/en/sql-reference/statements/create/table.md
@@ -114,23 +114,13 @@ You can define a [primary key](../../../engines/table-engines/mergetree-family/m
 - inside the column list
 
 ``` sql
-CREATE TABLE db.table_name 
-( 
-    name1 type1, name2 type2, ..., 
-    PRIMARY KEY(expr1[, expr2,...])]
-) 
-ENGINE = engine;
+CREATE TABLE db.table_name (name1 type1, name2 type2, ..., PRIMARY KEY (expr1[, expr2,...])]) ENGINE = engine;
 ```
 
 - outside the column list
 
 ``` sql
-CREATE TABLE db.table_name
-( 
-    name1 type1, name2 type2, ...
-) 
-ENGINE = engine
-PRIMARY KEY(expr1[, expr2,...]);
+CREATE TABLE db.table_name (name1 type1, name2 type2, ...) ENGINE = engine PRIMARY KEY(expr1[, expr2,...]);
 ```
 
 You can't combine both ways in one query.
diff --git a/docs/ru/sql-reference/statements/create/table.md b/docs/ru/sql-reference/statements/create/table.md
index d54ec189a1a..0a3e187cc3b 100644
--- a/docs/ru/sql-reference/statements/create/table.md
+++ b/docs/ru/sql-reference/statements/create/table.md
@@ -22,6 +22,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 Описание столбца, это `name type`, в простейшем случае. Пример: `RegionID UInt32`.
 Также могут быть указаны выражения для значений по умолчанию - смотрите ниже.
 
+При необходимости можно указать первичный ключ с одним или несколькими ключевыми выражениями.
 ``` sql
 CREATE TABLE [IF NOT EXISTS] [db.]table_name AS [db2.]name2 [ENGINE = engine]
 ```
@@ -80,6 +81,24 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name ENGINE = engine AS SELECT ...
 
 Отсутствует возможность задать значения по умолчанию для элементов вложенных структур данных.
 
+## Первичный ключ {#primary-key}
+
+Вы можете определить [первичный ключ](../../../engines/table-engines/mergetree-family/mergetree.md#primary-keys-and-indexes-in-queries) при создании таблицы. Первичный ключ может быть указан двумя способами:
+
+- В списке столбцов:
+
+``` sql
+CREATE TABLE db.table_name (name1 type1, name2 type2, ..., PRIMARY KEY (expr1[, expr2,...])]) ENGINE = engine;
+```
+
+- Вне списка столбцов:
+
+``` sql
+CREATE TABLE db.table_name (name1 type1, name2 type2, ...) ENGINE = engine PRIMARY KEY(expr1[, expr2,...]);
+```
+
+Вы не можете сочетать оба способа в одном запросе.
+
 ### Ограничения (constraints) {#constraints}
 
 Наряду с объявлением столбцов можно объявить ограничения на значения в столбцах таблицы:

From f2184eea5e333f6b9d1318954fa2961c5a83317e Mon Sep 17 00:00:00 2001
From: Alexander Tokmakov <avtokmakov@yandex-team.ru>
Date: Thu, 14 Jan 2021 21:05:08 +0300
Subject: [PATCH 064/611] try update cassandra driver library

---
 contrib/cassandra                                    |  2 +-
 .../test_cassandra.py                                | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/contrib/cassandra b/contrib/cassandra
index d10187efb25..8579657ce2a 160000
--- a/contrib/cassandra
+++ b/contrib/cassandra
@@ -1 +1 @@
-Subproject commit d10187efb25b26da391def077edf3c6f2f3a23dd
+Subproject commit 8579657ce2a945e27ea1ab4616c34281ca6d3845
diff --git a/tests/integration/test_dictionaries_all_layouts_separate_sources/test_cassandra.py b/tests/integration/test_dictionaries_all_layouts_separate_sources/test_cassandra.py
index 2d54d846169..0c69b7f7cbb 100644
--- a/tests/integration/test_dictionaries_all_layouts_separate_sources/test_cassandra.py
+++ b/tests/integration/test_dictionaries_all_layouts_separate_sources/test_cassandra.py
@@ -70,20 +70,14 @@ def started_cluster():
     finally:
         cluster.shutdown()
 
-# We have a lot of race conditions in cassandra library
-# https://github.com/ClickHouse/ClickHouse/issues/15754.
-# TODO fix them and enable tests as soon as possible.
 @pytest.mark.parametrize("layout_name", LAYOUTS_SIMPLE)
 def test_simple(started_cluster, layout_name):
-    if not node.is_built_with_thread_sanitizer():
-        simple_tester.execute(layout_name, node)
+    simple_tester.execute(layout_name, node)
 
 @pytest.mark.parametrize("layout_name", LAYOUTS_COMPLEX)
 def test_complex(started_cluster, layout_name):
-    if not node.is_built_with_thread_sanitizer():
-        complex_tester.execute(layout_name, node)
+    complex_tester.execute(layout_name, node)
     
 @pytest.mark.parametrize("layout_name", LAYOUTS_RANGED)
 def test_ranged(started_cluster, layout_name):
-    if not node.is_built_with_thread_sanitizer():
-        ranged_tester.execute(layout_name, node)
+    ranged_tester.execute(layout_name, node)

From 812f8ee19701e14c1d4de0d0d88b02f8cfdd2f74 Mon Sep 17 00:00:00 2001
From: romanzhukov <romanzhukov@yandex-team.ru>
Date: Thu, 14 Jan 2021 21:10:32 +0300
Subject: [PATCH 065/611] DOCSUP-5272: primary key crosslink in doc

---
 docs/en/sql-reference/statements/create/table.md | 2 +-
 docs/ru/sql-reference/statements/create/table.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/sql-reference/statements/create/table.md b/docs/en/sql-reference/statements/create/table.md
index 1dd9238a9f2..95ac0252eaa 100644
--- a/docs/en/sql-reference/statements/create/table.md
+++ b/docs/en/sql-reference/statements/create/table.md
@@ -23,7 +23,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 ```
 
 Creates a table named `name` in the `db` database or the current database if `db` is not set, with the structure specified in brackets and the `engine` engine.
-The structure of the table is a list of column descriptions, secondary indexes and constraints . If primary key is supported by the engine, it will be indicated as parameter for the table engine.
+The structure of the table is a list of column descriptions, secondary indexes and constraints . If [primary key](#primary-key) is supported by the engine, it will be indicated as parameter for the table engine.
 
 A column description is `name type` in the simplest case. Example: `RegionID UInt32`.
 
diff --git a/docs/ru/sql-reference/statements/create/table.md b/docs/ru/sql-reference/statements/create/table.md
index 0a3e187cc3b..e91a7f15903 100644
--- a/docs/ru/sql-reference/statements/create/table.md
+++ b/docs/ru/sql-reference/statements/create/table.md
@@ -22,7 +22,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 Описание столбца, это `name type`, в простейшем случае. Пример: `RegionID UInt32`.
 Также могут быть указаны выражения для значений по умолчанию - смотрите ниже.
 
-При необходимости можно указать первичный ключ с одним или несколькими ключевыми выражениями.
+При необходимости можно указать [первичный ключ](#primary-key) с одним или несколькими ключевыми выражениями.
 ``` sql
 CREATE TABLE [IF NOT EXISTS] [db.]table_name AS [db2.]name2 [ENGINE = engine]
 ```

From 1abb554d2bf1e8399f0fa598e1e97a211cd38e15 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Thu, 14 Jan 2021 23:47:52 +0300
Subject: [PATCH 066/611] test fixes

---
 programs/client/Client.cpp                    |  11 +-
 src/Parsers/parseQuery.cpp                    | 117 +++++++++++-------
 src/Parsers/queryNormalization.h              |  10 +-
 .../queries/0_stateless/01091_num_threads.sql |   6 +-
 4 files changed, 92 insertions(+), 52 deletions(-)

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 6e1049116fa..98aeb0f7f87 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -907,12 +907,11 @@ private:
                 if (!test_mode)
                     throw;
 
-                /// Try find test hint for syntax error
-                const char * end_of_line =
-                    find_first_symbols<'\n'>(this_query_begin,all_queries_end);
+                // Try find test hint for syntax error. parseQuery() would add
+                // the relevant comment to the parsed query text for us, even if
+                // the parsing failed.
                 TestHint hint(true /* enabled */,
-                    String(this_query_begin, end_of_line - this_query_begin));
-
+                    String(this_query_begin, this_query_end - this_query_begin));
                 if (hint.serverError()) /// Syntax errors are considered as client errors
                     throw;
                 if (hint.clientError() != e.code())
@@ -923,7 +922,7 @@ private:
                 }
 
                 /// It's expected syntax error, skip the line
-                this_query_begin = end_of_line;
+                this_query_begin = this_query_end;
                 continue;
             }
 
diff --git a/src/Parsers/parseQuery.cpp b/src/Parsers/parseQuery.cpp
index c22b0f49a54..53edc0eafaa 100644
--- a/src/Parsers/parseQuery.cpp
+++ b/src/Parsers/parseQuery.cpp
@@ -78,6 +78,10 @@ void writeQueryWithHighlightedErrorPositions(
     for (size_t position_to_hilite_idx = 0; position_to_hilite_idx < num_positions_to_hilite; ++position_to_hilite_idx)
     {
         const char * current_position_to_hilite = positions_to_hilite[position_to_hilite_idx].begin;
+
+        assert(current_position_to_hilite < end);
+        assert(current_position_to_hilite >= begin);
+
         out.write(pos, current_position_to_hilite - pos);
 
         if (current_position_to_hilite == end)
@@ -221,7 +225,7 @@ std::string getUnmatchedParenthesesErrorMessage(
 
 ASTPtr tryParseQuery(
     IParser & parser,
-    const char * & pos,
+    const char * & _out_query_end, /* also query begin as input parameter */
     const char * end,
     std::string & out_error_message,
     bool hilite,
@@ -230,7 +234,8 @@ ASTPtr tryParseQuery(
     size_t max_query_size,
     size_t max_parser_depth)
 {
-    Tokens tokens(pos, end, max_query_size);
+    const char * query_begin = _out_query_end;
+    Tokens tokens(query_begin, end, max_query_size);
     IParser::Pos token_iterator(tokens, max_parser_depth);
 
     if (token_iterator->isEnd()
@@ -245,17 +250,14 @@ ASTPtr tryParseQuery(
         //"
         // Advance the position, so that we can use this parser for stream parsing
         // even in presence of such queries.
-        pos = token_iterator->begin;
+        _out_query_end = token_iterator->begin;
         return nullptr;
     }
 
     Expected expected;
-
     ASTPtr res;
-    bool parse_res = parser.parse(token_iterator, res, expected);
-    const Token last_token = token_iterator.max();
-
-    pos = last_token.end;
+    const bool parse_res = parser.parse(token_iterator, res, expected);
+    const auto last_token = token_iterator.max();
 
     // If parsed query ends at data for insertion. Data for insertion could be
     // in any format and not necessary be lexical correct, so we can't perform
@@ -269,18 +271,57 @@ ASTPtr tryParseQuery(
         if (!parse_res)
         {
             // Generic parse error.
-            out_error_message = getSyntaxErrorMessage(pos, end, last_token, expected, hilite, query_description);
+            out_error_message = getSyntaxErrorMessage(query_begin, end,
+                last_token, expected, hilite, query_description);
             return nullptr;
         }
 
+        _out_query_end = last_token.end;
+
         return res;
     }
 
+    // We have to do some extra work to determine where the next query begins,
+    // preserving its leading comments.
+    // The query we just parsed may contain a test hint comment in the same line,
+    // e.g. select nonexistent_column; -- { serverError 12345 }.
+    // We must add this comment to the query text, so that it is handled by the
+    // test hint parser. It is important to do this before handling syntax errors,
+    // so that we can expect for syntax client errors in test hints.
+    // The token iterator skips comments and whitespace, so we have to find the
+    // newline in the string manually. If it's earlier than the next significant
+    // token, it means that the text before newline is some trailing whitespace
+    // or comment, and we should add it to our query.
+    const auto * newline = find_first_symbols<'\n'>(last_token.end, end);
+
+    Tokens next_query_tokens(last_token.end, end, max_query_size);
+    IParser::Pos next_query_iterator(next_query_tokens, max_parser_depth);
+
+    while (next_query_iterator.isValid()
+        && next_query_iterator->type == TokenType::Semicolon)
+    {
+        ++next_query_iterator;
+    }
+    const char * next_query_begin = next_query_iterator->begin;
+
+    // We must always include the entire line in case of parse errors, because
+    // we don't know where the query ends. OTOH, we can't always include it,
+    // because there might be several valid queries on one line.
+    if (parse_res || newline < next_query_begin)
+    {
+        _out_query_end = newline;
+    }
+    else
+    {
+        _out_query_end = last_token.end;
+    }
+
     // More granular checks for queries other than INSERT w/inline data.
     /// Lexical error
     if (last_token.isError())
     {
-        out_error_message = getLexicalErrorMessage(pos, end, last_token, hilite, query_description);
+        out_error_message = getLexicalErrorMessage(query_begin, end,
+            last_token, hilite, query_description);
         return nullptr;
     }
 
@@ -288,7 +329,26 @@ ASTPtr tryParseQuery(
     UnmatchedParentheses unmatched_parens = checkUnmatchedParentheses(TokenIterator(tokens), last_token);
     if (!unmatched_parens.empty())
     {
-        out_error_message = getUnmatchedParenthesesErrorMessage(pos, end, unmatched_parens, hilite, query_description);
+        out_error_message = getUnmatchedParenthesesErrorMessage(query_begin, end,
+            unmatched_parens, hilite, query_description);
+        return nullptr;
+    }
+
+    if (!parse_res)
+    {
+        /// Generic parse error.
+        out_error_message = getSyntaxErrorMessage(query_begin, end,
+            last_token, expected, hilite, query_description);
+        return nullptr;
+    }
+
+    /// Excessive input after query. Parsed query must end with end of data or semicolon or data for INSERT.
+    if (!token_iterator->isEnd()
+        && token_iterator->type != TokenType::Semicolon)
+    {
+        expected.add(last_token.begin, "end of query");
+        out_error_message = getSyntaxErrorMessage(query_begin, end,
+            last_token, expected, hilite, query_description);
         return nullptr;
     }
 
@@ -303,40 +363,13 @@ ASTPtr tryParseQuery(
     if (!allow_multi_statements
         && !token_iterator->isEnd())
     {
-        out_error_message = getSyntaxErrorMessage(pos, end, last_token, {}, hilite,
-            (query_description.empty() ? std::string() : std::string(". ")) + "Multi-statements are not allowed");
+        out_error_message = getSyntaxErrorMessage(query_begin, end,
+            last_token, {}, hilite,
+            (query_description.empty() ? std::string() : std::string(". "))
+                + "Multi-statements are not allowed");
         return nullptr;
     }
 
-    if (!parse_res)
-    {
-        /// Generic parse error.
-        out_error_message = getSyntaxErrorMessage(pos, end, last_token, expected, hilite, query_description);
-        return nullptr;
-    }
-
-    // The query was parsed correctly, but now we have to do some extra work to
-    // determine where the next query begins, preserving its leading comments.
-
-    // The query may also contain a test hint comment in the same line, e.g.
-    // select nonexistent_column; -- { serverError 12345 }.
-    // We must add this comment to the query text, so that it is handled by the
-    // test hint parser.
-    // The token iterator skips comments and whitespace, so we have to find the
-    // newline in the string manually. If it's earlier than the next significant
-    // token, it means that the text before newline is some trailing whitespace
-    // or comment, and we should add it to our query.
-    const auto * newline = find_first_symbols<'\n'>(pos, end);
-    TokenIterator next_token_iterator = token_iterator;
-    const auto * next_token_begin =
-        (next_token_iterator.isValid()
-            && (++next_token_iterator).isValid())
-            ? (*next_token_iterator).begin : end;
-    if (newline < next_token_begin)
-    {
-        pos = newline;
-    }
-
     return res;
 }
 
diff --git a/src/Parsers/queryNormalization.h b/src/Parsers/queryNormalization.h
index 60b807a0fe4..532be0aca7d 100644
--- a/src/Parsers/queryNormalization.h
+++ b/src/Parsers/queryNormalization.h
@@ -126,9 +126,17 @@ inline void ALWAYS_INLINE normalizeQueryToPODArray(const char * begin, const cha
             if (!prev_insignificant)
             {
                 if (0 == num_literals_in_sequence)
-                    res_data.push_back(' ');
+                {
+                    // If it's leading whitespace, ignore it altogether.
+                    if (token.begin != begin)
+                    {
+                        res_data.push_back(' ');
+                    }
+                }
                 else
+                {
                     prev_whitespace = true;
+                }
             }
             prev_insignificant = true;
             continue;
diff --git a/tests/queries/0_stateless/01091_num_threads.sql b/tests/queries/0_stateless/01091_num_threads.sql
index d7139351588..b51b8561c21 100644
--- a/tests/queries/0_stateless/01091_num_threads.sql
+++ b/tests/queries/0_stateless/01091_num_threads.sql
@@ -8,7 +8,7 @@ WITH
     (
         SELECT query_id
         FROM system.query_log
-        WHERE (query = 'WITH 01091 AS id SELECT 1;\n') AND (event_date >= (today() - 1))
+        WHERE (normalizeQuery(query) like normalizeQuery('WITH 01091 AS id SELECT 1;')) AND (event_date >= (today() - 1))
         ORDER BY event_time DESC
         LIMIT 1
     ) AS id
@@ -23,7 +23,7 @@ WITH
     (
         SELECT query_id
         FROM system.query_log
-        WHERE (query LIKE 'with 01091 as id select sum(number) from numbers(1000000);%') AND (event_date >= (today() - 1))
+        WHERE (normalizeQuery(query) = normalizeQuery('with 01091 as id select sum(number) from numbers(1000000);')) AND (event_date >= (today() - 1))
         ORDER BY event_time DESC
         LIMIT 1
     ) AS id
@@ -38,7 +38,7 @@ WITH
     (
         SELECT query_id
         FROM system.query_log
-        WHERE (query LIKE 'with 01091 as id select sum(number) from numbers_mt(1000000);%') AND (event_date >= (today() - 1))
+        WHERE (normalizeQuery(query) = normalizeQuery('with 01091 as id select sum(number) from numbers_mt(1000000);')) AND (event_date >= (today() - 1))
         ORDER BY event_time DESC
         LIMIT 1
     ) AS id

From 04da361f64ca8918e46b0b99e50adad074fba7dd Mon Sep 17 00:00:00 2001
From: Mikhail Filimonov <mfilimonov@altinity.com>
Date: Thu, 31 Dec 2020 13:46:28 +0100
Subject: [PATCH 067/611] Update librdkafka to v1.5.3

---
 contrib/librdkafka | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/librdkafka b/contrib/librdkafka
index f2f6616419d..8c8932adf8a 160000
--- a/contrib/librdkafka
+++ b/contrib/librdkafka
@@ -1 +1 @@
-Subproject commit f2f6616419d567c9198aef0d1133a2e9b4f02276
+Subproject commit 8c8932adf8a07319e51f99abacbd84df4a682563

From 4c2c0833879281e0af8ae30007e4cd07333568bf Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Fri, 15 Jan 2021 00:27:36 +0300
Subject: [PATCH 068/611] strip leading whitespace

---
 programs/client/Client.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 98aeb0f7f87..165f9969a05 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -895,6 +895,17 @@ private:
                 }
             }
 
+            // Also remove leading empty newlines because they are annoying to
+            // filter in query log. This is mostly relevant for the tests.
+            while (this_query_begin < all_queries_end
+                 && isWhitespaceASCII(*this_query_begin))
+            {
+                ++this_query_begin;
+            }
+            if (this_query_begin >= all_queries_end)
+            {
+                break;
+            }
 
             // Try to parse the query.
             const char * this_query_end = this_query_begin;

From c9628386fc3ee6bf08353cecdf1f6641d086bfce Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Fri, 15 Jan 2021 01:39:43 +0300
Subject: [PATCH 069/611] more fixes

---
 programs/client/Client.cpp                    | 60 ++++++++-------
 src/Parsers/parseQuery.cpp                    | 76 +++++++++++--------
 .../01531_query_log_query_comment.sql         |  4 +-
 .../01564_test_hint_woes.reference            | 23 ++++++
 .../0_stateless/01564_test_hint_woes.sql      | 40 ++++++++++
 5 files changed, 144 insertions(+), 59 deletions(-)
 create mode 100644 tests/queries/0_stateless/01564_test_hint_woes.reference
 create mode 100644 tests/queries/0_stateless/01564_test_hint_woes.sql

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 165f9969a05..4384364d25a 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -871,14 +871,26 @@ private:
 
         while (this_query_begin < all_queries_end)
         {
-            // The query parser doesn't skip all the trailing whitespace and
-            // comments, because they are also the leading comments for the
-            // next queries, and it makes more sense to treat them as such.
-            // There is one special case -- trailing whitespace + comments at
-            // end of file. The parser interface doesn't really allow it to work
-            // with an empty query, so we have to handle this case ourselves.
-            // If it's all whitespace and comments up to the end of file, we
-            // just stop.
+            // Remove leading empty newlines and other whitespace, because they
+            // are annoying to filter in query log. This is mostly relevant for
+            // the tests.
+            while (this_query_begin < all_queries_end
+                 && isWhitespaceASCII(*this_query_begin))
+            {
+                ++this_query_begin;
+            }
+            if (this_query_begin >= all_queries_end)
+            {
+                break;
+            }
+
+            // If there are only comments left until the end of file, we just
+            // stop. The parser can't handle this situation because it always
+            // expects that there is some query that it can parse.
+            // We can get into this situation because the parser also doesn't
+            // skip the trailing comments after parsing a query. This is because
+            // they may as well be the leading comments for the next query,
+            // and it makes more sense to treat them as such.
             {
                 Tokens tokens(this_query_begin, all_queries_end);
                 IParser::Pos token_iterator(tokens,
@@ -895,18 +907,6 @@ private:
                 }
             }
 
-            // Also remove leading empty newlines because they are annoying to
-            // filter in query log. This is mostly relevant for the tests.
-            while (this_query_begin < all_queries_end
-                 && isWhitespaceASCII(*this_query_begin))
-            {
-                ++this_query_begin;
-            }
-            if (this_query_begin >= all_queries_end)
-            {
-                break;
-            }
-
             // Try to parse the query.
             const char * this_query_end = this_query_begin;
             try
@@ -998,15 +998,21 @@ private:
                 {
                     processParsedSingleQuery();
 
-                    if (insert_ast && insert_ast->data)
+                    if (insert_ast
+                        && insert_ast->data
+                        && insert_ast->end > this_query_end)
                     {
-                        // For VALUES format: use the end of inline data as reported
-                        // by the format parser (it is saved in sendData()). This
-                        // allows us to handle queries like:
+                        // For VALUES format: use the end of inline data as
+                        // reported by the format parser (it is saved in
+                        // sendData()). This allows us to handle queries like:
                         //   insert into t values (1); select 1
-                        //, where the inline data is delimited by semicolon and not
-                        // by a newline.
-                        this_query_end = parsed_query->as<ASTInsertQuery>()->end;
+                        //, where the inline data is delimited by semicolon and
+                        // not by a newline.
+                        // We must be careful not to move the query end backwards:
+                        // it may already be set (by parseQuery()) further than
+                        // the end of data, if there is a test hint after the
+                        // VALUES.
+                        this_query_end = insert_ast->end;
                         // We also have to skip the trailing semicolon that might
                         // be left after VALUES parsing.
                         Tokens after_insert_tokens(this_query_end,
diff --git a/src/Parsers/parseQuery.cpp b/src/Parsers/parseQuery.cpp
index 53edc0eafaa..ccd4832d35e 100644
--- a/src/Parsers/parseQuery.cpp
+++ b/src/Parsers/parseQuery.cpp
@@ -226,7 +226,7 @@ std::string getUnmatchedParenthesesErrorMessage(
 ASTPtr tryParseQuery(
     IParser & parser,
     const char * & _out_query_end, /* also query begin as input parameter */
-    const char * end,
+    const char * all_queries_end,
     std::string & out_error_message,
     bool hilite,
     const std::string & query_description,
@@ -235,7 +235,7 @@ ASTPtr tryParseQuery(
     size_t max_parser_depth)
 {
     const char * query_begin = _out_query_end;
-    Tokens tokens(query_begin, end, max_query_size);
+    Tokens tokens(query_begin, all_queries_end, max_query_size);
     IParser::Pos token_iterator(tokens, max_parser_depth);
 
     if (token_iterator->isEnd()
@@ -259,28 +259,10 @@ ASTPtr tryParseQuery(
     const bool parse_res = parser.parse(token_iterator, res, expected);
     const auto last_token = token_iterator.max();
 
-    // If parsed query ends at data for insertion. Data for insertion could be
-    // in any format and not necessary be lexical correct, so we can't perform
-    // most of the checks.
     ASTInsertQuery * insert = nullptr;
     if (parse_res)
         insert = res->as<ASTInsertQuery>();
 
-    if (insert && insert->data)
-    {
-        if (!parse_res)
-        {
-            // Generic parse error.
-            out_error_message = getSyntaxErrorMessage(query_begin, end,
-                last_token, expected, hilite, query_description);
-            return nullptr;
-        }
-
-        _out_query_end = last_token.end;
-
-        return res;
-    }
-
     // We have to do some extra work to determine where the next query begins,
     // preserving its leading comments.
     // The query we just parsed may contain a test hint comment in the same line,
@@ -292,9 +274,9 @@ ASTPtr tryParseQuery(
     // newline in the string manually. If it's earlier than the next significant
     // token, it means that the text before newline is some trailing whitespace
     // or comment, and we should add it to our query.
-    const auto * newline = find_first_symbols<'\n'>(last_token.end, end);
+    const auto * newline = find_first_symbols<'\n'>(last_token.end, all_queries_end);
 
-    Tokens next_query_tokens(last_token.end, end, max_query_size);
+    Tokens next_query_tokens(last_token.end, all_queries_end, max_query_size);
     IParser::Pos next_query_iterator(next_query_tokens, max_parser_depth);
 
     while (next_query_iterator.isValid()
@@ -304,11 +286,19 @@ ASTPtr tryParseQuery(
     }
     const char * next_query_begin = next_query_iterator->begin;
 
-    // We must always include the entire line in case of parse errors, because
+    // 1) We must always include the entire line in case of parse errors, because
     // we don't know where the query ends. OTOH, we can't always include it,
     // because there might be several valid queries on one line.
-    if (parse_res || newline < next_query_begin)
+    // 2) We must include the entire line for INSERT queries with inline data.
+    // We don't know where the data ends, but there might be a test hint on the
+    // same line in case of values format.
+    // 3) We include the entire line if the next query starts after it. This is
+    // a generic case of trailing in-line comment.
+    if (!parse_res
+        || (insert && insert->data)
+        || newline < next_query_begin)
     {
+        assert(newline >= last_token.end);
         _out_query_end = newline;
     }
     else
@@ -316,11 +306,37 @@ ASTPtr tryParseQuery(
         _out_query_end = last_token.end;
     }
 
+    // Another corner case -- test hint comment that is ended by the end of data.
+    // Reproduced by test cases without newline at end, your editor may be
+    // configured to add one on save.
+    if (!next_query_iterator.isValid())
+    {
+        assert(next_query_iterator->end == all_queries_end);
+        _out_query_end = all_queries_end;
+    }
+
+    // If parsed query ends at data for insertion. Data for insertion could be
+    // in any format and not necessary be lexical correct, so we can't perform
+    // most of the checks.
+    if (insert && insert->data)
+    {
+        if (!parse_res)
+        {
+            // Generic parse error.
+            out_error_message = getSyntaxErrorMessage(query_begin, all_queries_end,
+                last_token, expected, hilite, query_description);
+            return nullptr;
+        }
+
+        return res;
+    }
+
+
     // More granular checks for queries other than INSERT w/inline data.
     /// Lexical error
     if (last_token.isError())
     {
-        out_error_message = getLexicalErrorMessage(query_begin, end,
+        out_error_message = getLexicalErrorMessage(query_begin, all_queries_end,
             last_token, hilite, query_description);
         return nullptr;
     }
@@ -329,15 +345,15 @@ ASTPtr tryParseQuery(
     UnmatchedParentheses unmatched_parens = checkUnmatchedParentheses(TokenIterator(tokens), last_token);
     if (!unmatched_parens.empty())
     {
-        out_error_message = getUnmatchedParenthesesErrorMessage(query_begin, end,
-            unmatched_parens, hilite, query_description);
+        out_error_message = getUnmatchedParenthesesErrorMessage(query_begin,
+            all_queries_end, unmatched_parens, hilite, query_description);
         return nullptr;
     }
 
     if (!parse_res)
     {
         /// Generic parse error.
-        out_error_message = getSyntaxErrorMessage(query_begin, end,
+        out_error_message = getSyntaxErrorMessage(query_begin, all_queries_end,
             last_token, expected, hilite, query_description);
         return nullptr;
     }
@@ -347,7 +363,7 @@ ASTPtr tryParseQuery(
         && token_iterator->type != TokenType::Semicolon)
     {
         expected.add(last_token.begin, "end of query");
-        out_error_message = getSyntaxErrorMessage(query_begin, end,
+        out_error_message = getSyntaxErrorMessage(query_begin, all_queries_end,
             last_token, expected, hilite, query_description);
         return nullptr;
     }
@@ -363,7 +379,7 @@ ASTPtr tryParseQuery(
     if (!allow_multi_statements
         && !token_iterator->isEnd())
     {
-        out_error_message = getSyntaxErrorMessage(query_begin, end,
+        out_error_message = getSyntaxErrorMessage(query_begin, all_queries_end,
             last_token, {}, hilite,
             (query_description.empty() ? std::string() : std::string(". "))
                 + "Multi-statements are not allowed");
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 19942669a44..81348c53589 100644
--- a/tests/queries/0_stateless/01531_query_log_query_comment.sql
+++ b/tests/queries/0_stateless/01531_query_log_query_comment.sql
@@ -4,9 +4,9 @@ set log_queries_min_type='QUERY_FINISH';
 set enable_global_with_statement=1;
 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 = 'select /* test=01531, enable_global_with_statement=0 */ 2;\n';
+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%';
 
 set enable_global_with_statement=1;
 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 = 'select /* test=01531 enable_global_with_statement=1 */ 2;\n';
+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%';
diff --git a/tests/queries/0_stateless/01564_test_hint_woes.reference b/tests/queries/0_stateless/01564_test_hint_woes.reference
new file mode 100644
index 00000000000..fbc0227b500
--- /dev/null
+++ b/tests/queries/0_stateless/01564_test_hint_woes.reference
@@ -0,0 +1,23 @@
+-- { echo }
+create table values_01564(
+    a int,
+    constraint c1 check a < 10) engine Memory;
+-- client error hint after broken insert values
+insert into values_01564 values ('f'); -- { clientError 6 }
+insert into values_01564 values ('f'); -- { clientError 6 }
+select 1;
+1
+insert into values_01564 values ('f'); -- { clientError 6 }
+select nonexistent column; -- { serverError 47 }
+select 1;
+1
+select nonexistent column; -- { serverError 47 }
+-- server error hint after broken insert values (violated constraint)
+insert into values_01564 values (11); -- { serverError 469 }
+insert into values_01564 values (11); -- { serverError 469 }
+select 1;
+1
+insert into values_01564 values (11); -- { serverError 469 }
+select nonexistent column; -- { serverError 47 }
+-- query after values on the same line
+insert into values_01564 values (1); select 1;
diff --git a/tests/queries/0_stateless/01564_test_hint_woes.sql b/tests/queries/0_stateless/01564_test_hint_woes.sql
new file mode 100644
index 00000000000..8e33d940dc6
--- /dev/null
+++ b/tests/queries/0_stateless/01564_test_hint_woes.sql
@@ -0,0 +1,40 @@
+-- { echo }
+create table values_01564(
+    a int,
+    constraint c1 check a < 10) engine Memory;
+
+-- client error hint after broken insert values
+insert into values_01564 values ('f'); -- { clientError 6 }
+
+insert into values_01564 values ('f'); -- { clientError 6 }
+select 1;
+
+insert into values_01564 values ('f'); -- { clientError 6 }
+select nonexistent column; -- { serverError 47 }
+
+-- syntax error hint after broken insert values
+insert into values_01564 this is bad syntax values ('f'); -- { clientError 62 }
+
+insert into values_01564 this is bad syntax values ('f'); -- { clientError 62 }
+select 1;
+
+insert into values_01564 this is bad syntax values ('f'); -- { clientError 62 }
+select nonexistent column; -- { serverError 47 }
+
+-- server error hint after broken insert values (violated constraint)
+insert into values_01564 values (11); -- { serverError 469 }
+
+insert into values_01564 values (11); -- { serverError 469 }
+select 1;
+
+insert into values_01564 values (11); -- { serverError 469 }
+select nonexistent column; -- { serverError 47 }
+
+-- query after values on the same line
+insert into values_01564 values (1); select 1;
+
+-- syntax error, where the last token we can parse is long before the semicolon.
+select this is too many words for an alias; -- { clientError 62 }
+--OPTIMIZE TABLE values_01564 DEDUPLICATE BY; -- { clientError 62 }
+--OPTIMIZE TABLE values_01564 DEDUPLICATE BY a EXCEPT a; -- { clientError 62 }
+--select 'a' || distinct one || 'c' from system.one; -- { clientError 62 }

From 588d9f0a5600f030a88e698e870404ec37faa263 Mon Sep 17 00:00:00 2001
From: Alexander Tokmakov <avtokmakov@yandex-team.ru>
Date: Fri, 15 Jan 2021 01:51:55 +0300
Subject: [PATCH 070/611] fix

---
 cmake/find/zlib.cmake | 1 +
 contrib/cassandra     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmake/find/zlib.cmake b/cmake/find/zlib.cmake
index 9a82699dc3a..bd96424b60d 100644
--- a/cmake/find/zlib.cmake
+++ b/cmake/find/zlib.cmake
@@ -35,6 +35,7 @@ if (NOT ZLIB_FOUND AND NOT MISSING_INTERNAL_ZLIB_LIBRARY)
     set (ZLIB_INCLUDE_DIRECTORIES ${ZLIB_INCLUDE_DIR}) # for protobuf
     set (ZLIB_FOUND 1) # for poco
     set (ZLIB_LIBRARIES zlib CACHE INTERNAL "")
+    set (ZLIB_LIBRARY_NAME ${ZLIB_LIBRARIES}) # for cassandra
     set (ZLIB_NAME "${INTERNAL_ZLIB_NAME}")
 endif ()
 
diff --git a/contrib/cassandra b/contrib/cassandra
index 8579657ce2a..fbbd9fc4c63 160000
--- a/contrib/cassandra
+++ b/contrib/cassandra
@@ -1 +1 @@
-Subproject commit 8579657ce2a945e27ea1ab4616c34281ca6d3845
+Subproject commit fbbd9fc4c634e9daad24714cd03cb390615d85ed

From 4361a5e0d668311545338327d49fecf2fc0acc0c Mon Sep 17 00:00:00 2001
From: Mikhail Filimonov <mfilimonov@altinity.com>
Date: Fri, 15 Jan 2021 11:07:35 +0100
Subject: [PATCH 071/611] Give a try for 1.6.0-RC1

---
 contrib/librdkafka | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/librdkafka b/contrib/librdkafka
index 8c8932adf8a..7074c7dcd01 160000
--- a/contrib/librdkafka
+++ b/contrib/librdkafka
@@ -1 +1 @@
-Subproject commit 8c8932adf8a07319e51f99abacbd84df4a682563
+Subproject commit 7074c7dcd01b22765314dce6a6d69d92926d2a2a

From ea853cea6c494e5e8d417233714ce858e8c65320 Mon Sep 17 00:00:00 2001
From: Yatsishin Ilya <2159081+qoega@users.noreply.github.com>
Date: Fri, 15 Jan 2021 10:11:41 +0300
Subject: [PATCH 072/611] fix

---
 docker/test/sqlancer/run.sh | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/docker/test/sqlancer/run.sh b/docker/test/sqlancer/run.sh
index 1e36a4f65f0..5ad8a4fd8a7 100755
--- a/docker/test/sqlancer/run.sh
+++ b/docker/test/sqlancer/run.sh
@@ -16,11 +16,9 @@ cd /sqlancer/sqlancer-master
 export TIMEOUT=60
 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 /test_output/TLPWhere.log
-java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPGroupBy /test_output/TLPGroupBy.log
-java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPHaving /test_output/TLPHaving.log
-java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPWhere --oracle TLPGroupBy /test_output/TLPWhereGroupBy.log
-java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPDistinct /test_output/TLPDistinct.log
-java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPAggregate /test_output/TLPAggregate.log
-
-cp /sqlancer/sqlancer-master/target/surefire-reports/TEST-sqlancer.dbms.TestClickHouse.xml /test_output/result.xml
+( 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 TLPWhere.err
+( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPGroupBy | tee /test_output/TLPGroupBy.out )  3>&1 1>&2 2>&3 | tee TLPGroupBy.err
+( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPHaving | tee /test_output/TLPHaving.out )  3>&1 1>&2 2>&3 | tee TLPHaving.err
+( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPWhere --oracle TLPGroupBy | tee /test_output/TLPWhereGroupBy.out )  3>&1 1>&2 2>&3 | tee TLPWhereGroupBy.err
+( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPDistinct | tee /test_output/TLPDistinct.out )  3>&1 1>&2 2>&3 | tee TLPDistinct.err
+( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPAggregate | tee /test_output/TLPAggregate.out )  3>&1 1>&2 2>&3 | tee TLPAggregate.err

From 28b14477381d3256509baa8ad4b52123c2e87919 Mon Sep 17 00:00:00 2001
From: Yatsishin Ilya <2159081+qoega@users.noreply.github.com>
Date: Fri, 15 Jan 2021 16:01:22 +0300
Subject: [PATCH 073/611] fix

---
 docker/test/sqlancer/run.sh | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/docker/test/sqlancer/run.sh b/docker/test/sqlancer/run.sh
index 5ad8a4fd8a7..330bd2a50c2 100755
--- a/docker/test/sqlancer/run.sh
+++ b/docker/test/sqlancer/run.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-QUERIES
-
 set -e -x
 
 dpkg -i package_folder/clickhouse-common-static_*.deb
@@ -16,9 +14,9 @@ cd /sqlancer/sqlancer-master
 export TIMEOUT=60
 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 TLPWhere.err
-( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPGroupBy | tee /test_output/TLPGroupBy.out )  3>&1 1>&2 2>&3 | tee TLPGroupBy.err
-( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPHaving | tee /test_output/TLPHaving.out )  3>&1 1>&2 2>&3 | tee TLPHaving.err
-( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPWhere --oracle TLPGroupBy | tee /test_output/TLPWhereGroupBy.out )  3>&1 1>&2 2>&3 | tee TLPWhereGroupBy.err
-( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPDistinct | tee /test_output/TLPDistinct.out )  3>&1 1>&2 2>&3 | tee TLPDistinct.err
-( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPAggregate | tee /test_output/TLPAggregate.out )  3>&1 1>&2 2>&3 | tee TLPAggregate.err
+( 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
+( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPGroupBy | tee /test_output/TLPGroupBy.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPGroupBy.err
+( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPHaving | tee /test_output/TLPHaving.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPHaving.err
+( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPWhere --oracle TLPGroupBy | tee /test_output/TLPWhereGroupBy.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPWhereGroupBy.err
+( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPDistinct | tee /test_output/TLPDistinct.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPDistinct.err
+( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPAggregate | tee /test_output/TLPAggregate.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPAggregate.err

From 83cfc08837b5638127f3a8233655d646b110c61c Mon Sep 17 00:00:00 2001
From: Mikhail Filimonov <mfilimonov@altinity.com>
Date: Fri, 15 Jan 2021 15:11:56 +0100
Subject: [PATCH 074/611] Try fix cmake scripts for librdkafka 1.6.0

---
 contrib/librdkafka-cmake/CMakeLists.txt | 18 +++++++++++-------
 contrib/librdkafka-cmake/config.h.in    |  4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/contrib/librdkafka-cmake/CMakeLists.txt b/contrib/librdkafka-cmake/CMakeLists.txt
index c8d8d2070b0..1d9e839e8cf 100644
--- a/contrib/librdkafka-cmake/CMakeLists.txt
+++ b/contrib/librdkafka-cmake/CMakeLists.txt
@@ -2,26 +2,25 @@ set(RDKAFKA_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/librdkafka/src)
 
 set(SRCS
   ${RDKAFKA_SOURCE_DIR}/crc32c.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_zstd.c
 #  ${RDKAFKA_SOURCE_DIR}/lz4.c
 #  ${RDKAFKA_SOURCE_DIR}/lz4frame.c
 #  ${RDKAFKA_SOURCE_DIR}/lz4hc.c
-  ${RDKAFKA_SOURCE_DIR}/rdxxhash.c
-#  ${RDKAFKA_SOURCE_DIR}/regexp.c
   ${RDKAFKA_SOURCE_DIR}/rdaddr.c
   ${RDKAFKA_SOURCE_DIR}/rdavl.c
   ${RDKAFKA_SOURCE_DIR}/rdbuf.c
   ${RDKAFKA_SOURCE_DIR}/rdcrc32.c
   ${RDKAFKA_SOURCE_DIR}/rddl.c
   ${RDKAFKA_SOURCE_DIR}/rdfnv1a.c
+  ${RDKAFKA_SOURCE_DIR}/rdgz.c
   ${RDKAFKA_SOURCE_DIR}/rdhdrhistogram.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_admin.c # looks optional
+  ${RDKAFKA_SOURCE_DIR}/rdkafka_assignment.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_assignor.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_aux.c # looks optional
   ${RDKAFKA_SOURCE_DIR}/rdkafka_background.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_broker.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_buf.c
+  ${RDKAFKA_SOURCE_DIR}/rdkafka.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_cert.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_cgrp.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_conf.c
@@ -29,7 +28,9 @@ set(SRCS
   ${RDKAFKA_SOURCE_DIR}/rdkafka_error.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_event.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_feature.c
+  ${RDKAFKA_SOURCE_DIR}/rdkafka_header.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_idempotence.c
+  ${RDKAFKA_SOURCE_DIR}/rdkafka_interceptor.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_lz4.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_metadata.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_metadata_cache.c
@@ -49,20 +50,22 @@ set(SRCS
   ${RDKAFKA_SOURCE_DIR}/rdkafka_request.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_roundrobin_assignor.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl.c
+#  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_cyrus.c # optionally included below
   ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_oauthbearer.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_plain.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_scram.c
 #  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_win32.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_ssl.c
+  ${RDKAFKA_SOURCE_DIR}/rdkafka_sticky_assignor.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_subscription.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_timer.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_topic.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_transport.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_interceptor.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_header.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_txnmgr.c
+  ${RDKAFKA_SOURCE_DIR}/rdkafka_zstd.c
   ${RDKAFKA_SOURCE_DIR}/rdlist.c
   ${RDKAFKA_SOURCE_DIR}/rdlog.c
+  ${RDKAFKA_SOURCE_DIR}/rdmap.c
   ${RDKAFKA_SOURCE_DIR}/rdmurmur2.c
   ${RDKAFKA_SOURCE_DIR}/rdports.c
   ${RDKAFKA_SOURCE_DIR}/rdrand.c
@@ -70,10 +73,11 @@ set(SRCS
   ${RDKAFKA_SOURCE_DIR}/rdstring.c
   ${RDKAFKA_SOURCE_DIR}/rdunittest.c
   ${RDKAFKA_SOURCE_DIR}/rdvarint.c
+  ${RDKAFKA_SOURCE_DIR}/rdxxhash.c
+  # ${RDKAFKA_SOURCE_DIR}/regexp.c
   ${RDKAFKA_SOURCE_DIR}/snappy.c
   ${RDKAFKA_SOURCE_DIR}/tinycthread.c
   ${RDKAFKA_SOURCE_DIR}/tinycthread_extra.c
-  ${RDKAFKA_SOURCE_DIR}/rdgz.c
 )
 
 if(${ENABLE_CYRUS_SASL})
diff --git a/contrib/librdkafka-cmake/config.h.in b/contrib/librdkafka-cmake/config.h.in
index e5b8ba919cf..1c9057bd794 100644
--- a/contrib/librdkafka-cmake/config.h.in
+++ b/contrib/librdkafka-cmake/config.h.in
@@ -44,9 +44,9 @@
 // atomic_64
 #define ATOMIC_OP(OP1,OP2,PTR,VAL) __atomic_ ## OP1 ## _ ## OP2(PTR, VAL, __ATOMIC_SEQ_CST)
 // parseversion
-#define RDKAFKA_VERSION_STR "0.11.4"
+#define RDKAFKA_VERSION_STR "1.6.0"
 // parseversion
-#define MKL_APP_VERSION "0.11.4"
+#define MKL_APP_VERSION "1.6.0"
 // libdl
 #define WITH_LIBDL 1
 // WITH_PLUGINS

From fd309086c6ec630a1108a4eb1cdbe22563faa1a5 Mon Sep 17 00:00:00 2001
From: Yatsishin Ilya <2159081+qoega@users.noreply.github.com>
Date: Fri, 15 Jan 2021 17:36:27 +0300
Subject: [PATCH 075/611] add logs to output

---
 docker/test/sqlancer/run.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker/test/sqlancer/run.sh b/docker/test/sqlancer/run.sh
index 330bd2a50c2..147ed1c2a9d 100755
--- a/docker/test/sqlancer/run.sh
+++ b/docker/test/sqlancer/run.sh
@@ -20,3 +20,7 @@ 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 --oracle TLPGroupBy | tee /test_output/TLPWhereGroupBy.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPWhereGroupBy.err
 ( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPDistinct | tee /test_output/TLPDistinct.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPDistinct.err
 ( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPAggregate | tee /test_output/TLPAggregate.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPAggregate.err
+
+cp /var/log/clickhouse-server/clickhouse-server.log /test_output/
+cp /var/log/clickhouse-server/stderr.log /test_output/
+cp /var/log/clickhouse-server/stdout.log /test_output/
\ No newline at end of file

From 765aa4d4e30fe0759103884cf3b6d3ffa7dda880 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Fri, 15 Jan 2021 23:30:44 +0300
Subject: [PATCH 076/611] rewrote everything again

---
 programs/client/Client.cpp                    | 428 ++++++++++++------
 programs/client/TestHint.h                    |  63 +--
 src/Parsers/parseQuery.cpp                    |  54 +--
 src/Parsers/parseQuery.h                      |   2 +-
 .../01564_test_hint_woes.reference            |   2 +
 .../0_stateless/01564_test_hint_woes.sql      |  12 +-
 .../01591_window_functions.reference          |  48 --
 7 files changed, 332 insertions(+), 277 deletions(-)

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 4384364d25a..672944a2d8b 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -193,15 +193,14 @@ private:
     /// Parsed query. Is used to determine some settings (e.g. format, output file).
     ASTPtr parsed_query;
 
-    /// The last exception that was received from the server. Is used for the return code in batch mode.
-    std::unique_ptr<Exception> last_exception_received_from_server;
+    /// The last exception that was received from the server. Is used for the
+    /// return code in batch mode.
+    std::unique_ptr<Exception> server_exception;
+    /// Likewise, the last exception that occurred on the client.
+    std::unique_ptr<Exception> client_exception;
 
     /// If the last query resulted in exception.
-    bool received_exception_from_server = false;
-    int expected_server_error = 0;
-    int expected_client_error = 0;
-    int actual_server_error = 0;
-    int actual_client_error = 0;
+    bool have_error = false;
 
     UInt64 server_revision = 0;
     String server_version;
@@ -667,19 +666,14 @@ private:
                 }
                 catch (const Exception & e)
                 {
-                    actual_client_error = e.code();
-                    if (!actual_client_error || actual_client_error != expected_client_error)
-                    {
-                        std::cerr << std::endl
-                            << "Exception on client:" << std::endl
-                            << "Code: " << e.code() << ". " << e.displayText() << std::endl;
+                    std::cerr << std::endl
+                        << "Exception on client:" << std::endl
+                        << "Code: " << e.code() << ". " << e.displayText() << std::endl;
 
-                        if (config().getBool("stacktrace", false))
-                            std::cerr << "Stack trace:" << std::endl << e.getStackTraceString() << std::endl;
+                    if (config().getBool("stacktrace", false))
+                        std::cerr << "Stack trace:" << std::endl << e.getStackTraceString() << std::endl;
 
-                        std::cerr << std::endl;
-
-                    }
+                    std::cerr << std::endl;
 
                     /// Client-side exception during query execution can result in the loss of
                     /// sync in the connection protocol.
@@ -705,9 +699,20 @@ private:
 
             nonInteractive();
 
-            /// If exception code isn't zero, we should return non-zero return code anyway.
-            if (last_exception_received_from_server)
-                return last_exception_received_from_server->code() != 0 ? last_exception_received_from_server->code() : -1;
+            // If exception code isn't zero, we should return non-zero return
+            // code anyway.
+            const auto * exception = server_exception
+                ? server_exception.get() : client_exception.get();
+            if (exception)
+            {
+                return exception->code() != 0 ? exception->code() : -1;
+            }
+            if (have_error)
+            {
+                // Shouldn't be set without an exception, but check it just in
+                // case so that at least we don't lose an error.
+                return -1;
+            }
 
             return 0;
         }
@@ -845,8 +850,59 @@ private:
         return processMultiQuery(text);
     }
 
+    // Consumes trailing semicolons and tries to consume the same-line trailing
+    // comment.
+    void adjustQueryEnd(const char *& this_query_end,
+        const char * all_queries_end, int max_parser_depth)
+    {
+        // We have to skip the trailing semicolon that might be left
+        // after VALUES parsing or just after a normal semicolon-terminated query.
+        Tokens after_query_tokens(this_query_end, all_queries_end);
+        IParser::Pos after_query_iterator(after_query_tokens, max_parser_depth);
+        while (after_query_iterator.isValid()
+           && after_query_iterator->type == TokenType::Semicolon)
+        {
+            this_query_end = after_query_iterator->end;
+            ++after_query_iterator;
+        }
+
+        // Now we have to do some extra work to add the trailing
+        // same-line comment to the query, but preserve the leading
+        // comments of the next query. The trailing comment is important
+        // because the test hints are usually written this way, e.g.:
+        // select nonexistent_column; -- { serverError 12345 }.
+        // The token iterator skips comments and whitespace, so we have
+        // to find the newline in the string manually. If it's earlier
+        // than the next significant token, it means that the text before
+        // newline is some trailing whitespace or comment, and we should
+        // add it to our query. There are also several special cases
+        // that are described below.
+        const auto * newline = find_first_symbols<'\n'>(this_query_end,
+            all_queries_end);
+        const char * next_query_begin = after_query_iterator->begin;
+
+        // We include the entire line if the next query starts after
+        // it. This is a generic case of trailing in-line comment.
+        // The "equals" condition is for case of end of input (they both equal
+        // all_queries_end);
+        if (newline <= next_query_begin)
+        {
+            assert(newline >= this_query_end);
+            this_query_end = newline;
+        }
+        else
+        {
+            // Many queries on one line, can't do anything. By the way, this
+            // syntax is probably going to work as expected:
+            // select nonexistent /* { serverError 12345 } */; select 1
+        }
+    }
+
     bool processMultiQuery(const String & all_queries_text)
     {
+        // It makes sense not to base any control flow on this, so that it is
+        // the same in tests and in normal usage. The only difference is that in
+        // normal mode we ignore the test hints.
         const bool test_mode = config().has("testmode");
 
         {
@@ -895,12 +951,6 @@ private:
                 Tokens tokens(this_query_begin, all_queries_end);
                 IParser::Pos token_iterator(tokens,
                     context.getSettingsRef().max_parser_depth);
-                while (token_iterator->type == TokenType::Semicolon
-                        && token_iterator.isValid())
-                {
-                    ++token_iterator;
-                }
-
                 if (!token_iterator.isValid())
                 {
                     break;
@@ -915,16 +965,23 @@ private:
             }
             catch (Exception & e)
             {
-                if (!test_mode)
-                    throw;
+                // Try to find test hint for syntax error. We don't know where
+                // the query ends because we failed to parse it, so we consume
+                // the entire line.
+                this_query_end = find_first_symbols<'\n'>(this_query_end,
+                    all_queries_end);
 
-                // Try find test hint for syntax error. parseQuery() would add
-                // the relevant comment to the parsed query text for us, even if
-                // the parsing failed.
-                TestHint hint(true /* enabled */,
+                TestHint hint(test_mode,
                     String(this_query_begin, this_query_end - this_query_begin));
-                if (hint.serverError()) /// Syntax errors are considered as client errors
+
+                if (hint.serverError())
+                {
+                    // Syntax errors are considered as client errors
+                    e.addMessage("\nExpected server error '{}'.",
+                        hint.serverError());
                     throw;
+                }
+
                 if (hint.clientError() != e.code())
                 {
                     if (hint.clientError())
@@ -949,7 +1006,7 @@ private:
 
                     continue;
                 }
-                return true;
+                break;
             }
 
             // INSERT queries may have the inserted data in the query text
@@ -960,10 +1017,14 @@ private:
             // The VALUES format needs even more handling -- we also allow the
             // data to be delimited by semicolon. This case is handled later by
             // the format parser itself.
+            // We can't do multiline INSERTs with inline data, because most
+            // row input formats (e.g. TSV) can't tell when the input stops,
+            // unlike VALUES.
             auto * insert_ast = parsed_query->as<ASTInsertQuery>();
             if (insert_ast && insert_ast->data)
             {
-                this_query_end = find_first_symbols<'\n'>(insert_ast->data, all_queries_end);
+                this_query_end = find_first_symbols<'\n'>(insert_ast->data,
+                    all_queries_end);
                 insert_ast->end = this_query_end;
                 query_to_send = all_queries_text.substr(
                     this_query_begin - all_queries_text.data(),
@@ -976,81 +1037,201 @@ private:
                     this_query_end - this_query_begin);
             }
 
-            // full_query is the query + inline INSERT data.
+            // Try to include the trailing comment with test hints. It is just
+            // a guess for now, because we don't yet know where the query ends
+            // if it is an INSERT query with inline data. We will do it again
+            // after we have processed the query. But even this guess is
+            // 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);
+
+            // full_query is the query + inline INSERT data + trailing comments
+            // (the latter is our best guess for now).
             full_query = all_queries_text.substr(
                 this_query_begin - all_queries_text.data(),
                 this_query_end - this_query_begin);
 
-            // Look for the hint in the text of query + insert data, if any.
-            // e.g. insert into t format CSV 'a' -- { serverError 123 }.
-            TestHint test_hint(test_mode, full_query);
-            expected_client_error = test_hint.clientError();
-            expected_server_error = test_hint.serverError();
+//            fmt::print(stderr, "parsed query '{}', left '{}'\n",
+//                std::string_view(this_query_begin,
+//                    this_query_end - this_query_begin),
+//                std::string_view(this_query_end,
+//                    all_queries_end - this_query_end));
+//
+//            fmt::print(stderr, "query_to_send '{}', full_query '{}'\n",
+//                query_to_send, full_query);
 
             if (query_fuzzer_runs)
             {
                 if (!processWithFuzzing(full_query))
                     return false;
+
+                this_query_begin = this_query_end;
+                continue;
+            }
+
+            try
+            {
+                processParsedSingleQuery();
+            }
+            catch (...)
+            {
+                // Surprisingly, this is a client error. A server error would
+                // have been reported w/o throwing (see onReceiveSeverException()).
+                client_exception = std::make_unique<Exception>(
+                    getCurrentExceptionMessage(true), getCurrentExceptionCode());
+                have_error = true;
+            }
+
+            // For INSERTs with inline data: use the end of inline data as
+            // reported by the format parser (it is saved in sendData()).
+            // This allows us to handle queries like:
+            //   insert into t values (1); select 1
+            // , where the inline data is delimited by semicolon and not by a
+            // newline.
+            if (insert_ast && insert_ast->data)
+            {
+                this_query_end = insert_ast->end;
+                adjustQueryEnd(this_query_end, all_queries_end,
+                    context.getSettingsRef().max_parser_depth);
+            }
+
+            // Now we know for sure where the query ends.
+            // Look for the hint in the text of query + insert data + trailing
+            // comments,
+            // e.g. insert into t format CSV 'a' -- { serverError 123 }.
+            // Use the updated query boundaries we just calculated.
+            TestHint test_hint(test_mode, std::string(this_query_begin,
+                this_query_end - this_query_begin));
+
+            // Check whether the error (or its absence) matches the test hints
+            // (or their absence).
+            bool error_matches_hint = true;
+            if (have_error)
+            {
+                if (test_hint.serverError())
+                {
+                    if (!server_exception)
+                    {
+                        error_matches_hint = false;
+                        fmt::print(stderr,
+                            "Expected server error code '{}' but got no server error.\n",
+                            test_hint.serverError());
+                    }
+                    else if (server_exception->code() != test_hint.serverError())
+                    {
+                        error_matches_hint = false;
+                        std::cerr << "Expected server error code: " <<
+                            test_hint.serverError() << " but got: " <<
+                            server_exception->code() << "." << std::endl;
+                    }
+                }
+
+                if (test_hint.clientError())
+                {
+                    if (!client_exception)
+                    {
+                        error_matches_hint = false;
+                        fmt::print(stderr,
+                            "Expected client error code '{}' but got no client error.\n",
+                            test_hint.clientError());
+                    }
+                    else if (client_exception->code() != test_hint.clientError())
+                    {
+                        error_matches_hint = false;
+                        fmt::print(stderr,
+                            "Expected client error code '{}' but got '{}'.\n",
+                            test_hint.clientError(),
+                            client_exception->code());
+                    }
+                }
+
+                if (!test_hint.clientError() && !test_hint.serverError())
+                {
+                    // No error was expected but it still ocurred. This is the
+                    // default case w/o test hint, doesn't need additional
+                    // diagnostics.
+                    error_matches_hint = false;
+                }
             }
             else
             {
-                try
+                if (test_hint.clientError())
                 {
-                    processParsedSingleQuery();
-
-                    if (insert_ast
-                        && insert_ast->data
-                        && insert_ast->end > this_query_end)
-                    {
-                        // For VALUES format: use the end of inline data as
-                        // reported by the format parser (it is saved in
-                        // sendData()). This allows us to handle queries like:
-                        //   insert into t values (1); select 1
-                        //, where the inline data is delimited by semicolon and
-                        // not by a newline.
-                        // We must be careful not to move the query end backwards:
-                        // it may already be set (by parseQuery()) further than
-                        // the end of data, if there is a test hint after the
-                        // VALUES.
-                        this_query_end = insert_ast->end;
-                        // We also have to skip the trailing semicolon that might
-                        // be left after VALUES parsing.
-                        Tokens after_insert_tokens(this_query_end,
-                            all_queries_end);
-                        IParser::Pos after_insert_iterator(after_insert_tokens,
-                            context.getSettingsRef().max_parser_depth);
-                        while (after_insert_iterator.isValid()
-                           && after_insert_iterator->type == TokenType::Semicolon)
-                        {
-                            this_query_end = after_insert_iterator->end;
-                            ++after_insert_iterator;
-                        }
-                    }
-                }
-                catch (...)
-                {
-                    last_exception_received_from_server = std::make_unique<Exception>(getCurrentExceptionMessage(true), getCurrentExceptionCode());
-                    actual_client_error = last_exception_received_from_server->code();
-                    if (!ignore_error && (!actual_client_error || actual_client_error != expected_client_error))
-                        std::cerr << "Error on processing query: " << full_query << std::endl << last_exception_received_from_server->message();
-                    received_exception_from_server = true;
+                    fmt::print(stderr,
+                        "The query succeeded but the client error '{}' was expected.\n",
+                        test_hint.clientError());
+                    error_matches_hint = false;
                 }
 
-                if (!test_hint.checkActual(
-                    actual_server_error, actual_client_error, received_exception_from_server, last_exception_received_from_server))
+                if (test_hint.serverError())
                 {
-                    connection->forceConnected(connection_parameters.timeouts);
-                }
-
-                if (received_exception_from_server && !ignore_error)
-                {
-                    if (is_interactive)
-                        break;
-                    else
-                        return false;
+                    fmt::print(stderr,
+                        "The query succeeded but the server error '{}' was expected.\n",
+                        test_hint.serverError());
+                    error_matches_hint = false;
                 }
             }
 
+            // If the error is expected, force reconnect and ignore it.
+            if (have_error && error_matches_hint)
+            {
+                client_exception.reset();
+                server_exception.reset();
+                have_error = false;
+                connection->forceConnected(connection_parameters.timeouts);
+            }
+
+            // Report error.
+            if (have_error)
+            {
+                // If we probably have progress bar, we should add additional
+                // newline, otherwise exception may display concatenated with
+                // the progress bar.
+                if (need_render_progress)
+                    std::cerr << '\n';
+
+                if (server_exception)
+                {
+                    std::string text = server_exception->displayText();
+                    auto embedded_stack_trace_pos = text.find("Stack trace");
+                    if (std::string::npos != embedded_stack_trace_pos
+                        && !config().getBool("stacktrace", false))
+                    {
+                        text.resize(embedded_stack_trace_pos);
+                    }
+                    std::cerr << "Received exception from server (version "
+                        << server_version << "):" << std::endl << "Code: "
+                        << server_exception->code() << ". " << text << std::endl;
+                }
+
+                if (client_exception)
+                {
+                    fmt::print(stderr,
+                        "Error on processing query '{}':\n{}",
+                        full_query, client_exception->message());
+                }
+            }
+
+            // Stop processing queries if needed.
+            if (have_error && !ignore_error)
+            {
+                if (is_interactive)
+                {
+                    break;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+
+//            fmt::print(stderr, "final query '{}', left '{}'\n",
+//                std::string_view(this_query_begin,
+//                    this_query_end - this_query_begin),
+//                std::string_view(this_query_end,
+//                    all_queries_end - this_query_end));
+
             this_query_begin = this_query_end;
         }
 
@@ -1156,15 +1337,20 @@ private:
                 // Some functions (e.g. protocol parsers) don't throw, but
                 // set last_exception instead, so we'll also do it here for
                 // uniformity.
-                last_exception_received_from_server = std::make_unique<Exception>(getCurrentExceptionMessage(true), getCurrentExceptionCode());
-                received_exception_from_server = true;
+                // Surprisingly, this is a client exception, because we get the
+                // server exception w/o throwing (see onReceiveException()).
+                client_exception = std::make_unique<Exception>(
+                    getCurrentExceptionMessage(true), getCurrentExceptionCode());
+                have_error = true;
             }
 
-            if (received_exception_from_server)
+            if (have_error)
             {
+                const auto * exception = server_exception
+                    ? server_exception.get() : client_exception.get();
                 fmt::print(stderr, "Error on processing query '{}': {}\n",
                     ast_to_process->formatForErrorMessage(),
-                    last_exception_received_from_server->message());
+                    exception->message());
             }
 
             if (!connection->isConnected())
@@ -1177,13 +1363,14 @@ private:
 
             // The server is still alive so we're going to continue fuzzing.
             // Determine what we're going to use as the starting AST.
-            if (received_exception_from_server)
+            if (have_error)
             {
                 // Query completed with error, keep the previous starting AST.
                 // Also discard the exception that we now know to be non-fatal,
                 // so that it doesn't influence the exit code.
-                last_exception_received_from_server.reset(nullptr);
-                received_exception_from_server = false;
+                server_exception.reset();
+                client_exception.reset();
+                have_error = false;
             }
             else if (ast_to_process->formatForErrorMessage().size() > 500)
             {
@@ -1237,8 +1424,9 @@ private:
     void processParsedSingleQuery()
     {
         resetOutput();
-        last_exception_received_from_server.reset();
-        received_exception_from_server = false;
+        client_exception.reset();
+        server_exception.reset();
+        have_error = false;
 
         if (echo_queries)
         {
@@ -1303,7 +1491,7 @@ private:
         }
 
         /// Do not change context (current DB, settings) in case of an exception.
-        if (!received_exception_from_server)
+        if (!have_error)
         {
             if (const auto * set_query = parsed_query->as<ASTSetQuery>())
             {
@@ -1714,8 +1902,7 @@ private:
                 return true;
 
             case Protocol::Server::Exception:
-                onReceiveExceptionFromServer(*packet.exception);
-                last_exception_received_from_server = std::move(packet.exception);
+                onReceiveExceptionFromServer(std::move(packet.exception));
                 return false;
 
             case Protocol::Server::Log:
@@ -1747,8 +1934,7 @@ private:
                     return true;
 
                 case Protocol::Server::Exception:
-                    onReceiveExceptionFromServer(*packet.exception);
-                    last_exception_received_from_server = std::move(packet.exception);
+                    onReceiveExceptionFromServer(std::move(packet.exception));
                     return false;
 
                 case Protocol::Server::Log:
@@ -1781,8 +1967,7 @@ private:
                     return true;
 
                 case Protocol::Server::Exception:
-                    onReceiveExceptionFromServer(*packet.exception);
-                    last_exception_received_from_server = std::move(packet.exception);
+                    onReceiveExceptionFromServer(std::move(packet.exception));
                     return false;
 
                 case Protocol::Server::Log:
@@ -2091,32 +2276,11 @@ private:
     }
 
 
-    void onReceiveExceptionFromServer(const Exception & e)
+    void onReceiveExceptionFromServer(std::unique_ptr<Exception> && e)
     {
+        have_error = true;
+        server_exception = std::move(e);
         resetOutput();
-        received_exception_from_server = true;
-
-        actual_server_error = e.code();
-        if (expected_server_error)
-        {
-            if (actual_server_error == expected_server_error)
-                return;
-            std::cerr << "Expected error code: " << expected_server_error << " but got: " << actual_server_error << "." << std::endl;
-        }
-
-        std::string text = e.displayText();
-
-        auto embedded_stack_trace_pos = text.find("Stack trace");
-        if (std::string::npos != embedded_stack_trace_pos && !config().getBool("stacktrace", false))
-            text.resize(embedded_stack_trace_pos);
-
-        /// If we probably have progress bar, we should add additional newline,
-        /// otherwise exception may display concatenated with the progress bar.
-        if (need_render_progress)
-            std::cerr << '\n';
-
-        std::cerr << "Received exception from server (version " << server_version << "):" << std::endl
-            << "Code: " << e.code() << ". " << text << std::endl;
     }
 
 
diff --git a/programs/client/TestHint.h b/programs/client/TestHint.h
index f1998588261..4d7c9b72a21 100644
--- a/programs/client/TestHint.h
+++ b/programs/client/TestHint.h
@@ -23,18 +23,26 @@ namespace ErrorCodes
 class TestHint
 {
 public:
-    TestHint(bool enabled_, const String & query_)
-    : enabled(enabled_)
-    , query(query_)
+    TestHint(bool enabled_, const String & query_) :
+        query(query_)
     {
         if (!enabled_)
             return;
 
+        // Don't parse error hints in leading comments, because it feels weird.
+        // Leading 'echo' hint is OK.
+        bool is_leading_hint = true;
+
         Lexer lexer(query.data(), query.data() + query.size());
 
         for (Token token = lexer.nextToken(); !token.isEnd(); token = lexer.nextToken())
         {
-            if (token.type == TokenType::Comment)
+            if (token.type != TokenType::Comment
+                && token.type != TokenType::Whitespace)
+            {
+                is_leading_hint = false;
+            }
+            else if (token.type == TokenType::Comment)
             {
                 String comment(token.begin, token.begin + token.size());
 
@@ -47,7 +55,7 @@ public:
                         if (pos_end != String::npos)
                         {
                             String hint(comment.begin() + pos_start + 1, comment.begin() + pos_end);
-                            parse(hint);
+                            parse(hint, is_leading_hint);
                         }
                     }
                 }
@@ -55,46 +63,17 @@ public:
         }
     }
 
-    /// @returns true if it's possible to continue without reconnect
-    bool checkActual(int & actual_server_error, int & actual_client_error,
-                     bool & got_exception, std::unique_ptr<Exception> & last_exception) const
-    {
-        if (!enabled)
-            return true;
-
-        if (allErrorsExpected(actual_server_error, actual_client_error))
-        {
-            got_exception = false;
-            last_exception.reset();
-            actual_server_error = 0;
-            actual_client_error = 0;
-            return false;
-        }
-
-        if (lostExpectedError(actual_server_error, actual_client_error))
-        {
-            std::cerr << "Success when error expected in query: " << query << "It expects server error "
-                << server_error << ", client error " << client_error << "." << std::endl;
-            got_exception = true;
-            last_exception = std::make_unique<Exception>("Success when error expected", ErrorCodes::UNEXPECTED_ERROR_CODE); /// return error to OS
-            return false;
-        }
-
-        return true;
-    }
-
     int serverError() const { return server_error; }
     int clientError() const { return client_error; }
     bool echoQueries() const { return echo; }
 
 private:
-    bool enabled = false;
     const String & query;
     int server_error = 0;
     int client_error = 0;
     bool echo = false;
 
-    void parse(const String & hint)
+    void parse(const String & hint, bool is_leading_hint)
     {
         std::stringstream ss;       // STYLE_CHECK_ALLOW_STD_STRING_STREAM
         ss << hint;
@@ -106,11 +85,15 @@ private:
             if (ss.eof())
                 break;
 
-            if (item == "serverError")
-                ss >> server_error;
-            else if (item == "clientError")
-                ss >> client_error;
-            else if (item == "echo")
+            if (!is_leading_hint)
+            {
+                if (item == "serverError")
+                    ss >> server_error;
+                else if (item == "clientError")
+                    ss >> client_error;
+            }
+
+            if (item == "echo")
                 echo = true;
         }
     }
diff --git a/src/Parsers/parseQuery.cpp b/src/Parsers/parseQuery.cpp
index ccd4832d35e..48a92534e74 100644
--- a/src/Parsers/parseQuery.cpp
+++ b/src/Parsers/parseQuery.cpp
@@ -258,63 +258,12 @@ ASTPtr tryParseQuery(
     ASTPtr res;
     const bool parse_res = parser.parse(token_iterator, res, expected);
     const auto last_token = token_iterator.max();
+    _out_query_end = last_token.end;
 
     ASTInsertQuery * insert = nullptr;
     if (parse_res)
         insert = res->as<ASTInsertQuery>();
 
-    // We have to do some extra work to determine where the next query begins,
-    // preserving its leading comments.
-    // The query we just parsed may contain a test hint comment in the same line,
-    // e.g. select nonexistent_column; -- { serverError 12345 }.
-    // We must add this comment to the query text, so that it is handled by the
-    // test hint parser. It is important to do this before handling syntax errors,
-    // so that we can expect for syntax client errors in test hints.
-    // The token iterator skips comments and whitespace, so we have to find the
-    // newline in the string manually. If it's earlier than the next significant
-    // token, it means that the text before newline is some trailing whitespace
-    // or comment, and we should add it to our query.
-    const auto * newline = find_first_symbols<'\n'>(last_token.end, all_queries_end);
-
-    Tokens next_query_tokens(last_token.end, all_queries_end, max_query_size);
-    IParser::Pos next_query_iterator(next_query_tokens, max_parser_depth);
-
-    while (next_query_iterator.isValid()
-        && next_query_iterator->type == TokenType::Semicolon)
-    {
-        ++next_query_iterator;
-    }
-    const char * next_query_begin = next_query_iterator->begin;
-
-    // 1) We must always include the entire line in case of parse errors, because
-    // we don't know where the query ends. OTOH, we can't always include it,
-    // because there might be several valid queries on one line.
-    // 2) We must include the entire line for INSERT queries with inline data.
-    // We don't know where the data ends, but there might be a test hint on the
-    // same line in case of values format.
-    // 3) We include the entire line if the next query starts after it. This is
-    // a generic case of trailing in-line comment.
-    if (!parse_res
-        || (insert && insert->data)
-        || newline < next_query_begin)
-    {
-        assert(newline >= last_token.end);
-        _out_query_end = newline;
-    }
-    else
-    {
-        _out_query_end = last_token.end;
-    }
-
-    // Another corner case -- test hint comment that is ended by the end of data.
-    // Reproduced by test cases without newline at end, your editor may be
-    // configured to add one on save.
-    if (!next_query_iterator.isValid())
-    {
-        assert(next_query_iterator->end == all_queries_end);
-        _out_query_end = all_queries_end;
-    }
-
     // If parsed query ends at data for insertion. Data for insertion could be
     // in any format and not necessary be lexical correct, so we can't perform
     // most of the checks.
@@ -331,7 +280,6 @@ ASTPtr tryParseQuery(
         return res;
     }
 
-
     // More granular checks for queries other than INSERT w/inline data.
     /// Lexical error
     if (last_token.isError())
diff --git a/src/Parsers/parseQuery.h b/src/Parsers/parseQuery.h
index 14a9a85b22c..e6a6b26a462 100644
--- a/src/Parsers/parseQuery.h
+++ b/src/Parsers/parseQuery.h
@@ -9,7 +9,7 @@ namespace DB
 /// Parse query or set 'out_error_message'.
 ASTPtr tryParseQuery(
     IParser & parser,
-    const char * & pos,                /// Moved to end of parsed fragment.
+    const char * & _out_query_end, // query start as input parameter, query end as output
     const char * end,
     std::string & out_error_message,
     bool hilite,
diff --git a/tests/queries/0_stateless/01564_test_hint_woes.reference b/tests/queries/0_stateless/01564_test_hint_woes.reference
index fbc0227b500..41c8bb32d0c 100644
--- a/tests/queries/0_stateless/01564_test_hint_woes.reference
+++ b/tests/queries/0_stateless/01564_test_hint_woes.reference
@@ -21,3 +21,5 @@ insert into values_01564 values (11); -- { serverError 469 }
 select nonexistent column; -- { serverError 47 }
 -- query after values on the same line
 insert into values_01564 values (1); select 1;
+select 1;
+1
diff --git a/tests/queries/0_stateless/01564_test_hint_woes.sql b/tests/queries/0_stateless/01564_test_hint_woes.sql
index 8e33d940dc6..be41a8dffaf 100644
--- a/tests/queries/0_stateless/01564_test_hint_woes.sql
+++ b/tests/queries/0_stateless/01564_test_hint_woes.sql
@@ -33,8 +33,14 @@ select nonexistent column; -- { serverError 47 }
 -- query after values on the same line
 insert into values_01564 values (1); select 1;
 
+-- even this works (not sure why we need it lol)
+-- insert into values_01564 values (11) /*{ serverError 469 }*/; select 1;
+
 -- syntax error, where the last token we can parse is long before the semicolon.
 select this is too many words for an alias; -- { clientError 62 }
---OPTIMIZE TABLE values_01564 DEDUPLICATE BY; -- { clientError 62 }
---OPTIMIZE TABLE values_01564 DEDUPLICATE BY a EXCEPT a; -- { clientError 62 }
---select 'a' || distinct one || 'c' from system.one; -- { clientError 62 }
+OPTIMIZE TABLE values_01564 DEDUPLICATE BY; -- { clientError 62 }
+OPTIMIZE TABLE values_01564 DEDUPLICATE BY a EXCEPT a; -- { clientError 62 }
+select 'a' || distinct one || 'c' from system.one; -- { clientError 62 }
+
+-- the return code must be zero after the final query has failed with expected error
+insert into values_01564 values (11); -- { serverError 469 }
diff --git a/tests/queries/0_stateless/01591_window_functions.reference b/tests/queries/0_stateless/01591_window_functions.reference
index d51555ee872..45cb4ac3994 100644
--- a/tests/queries/0_stateless/01591_window_functions.reference
+++ b/tests/queries/0_stateless/01591_window_functions.reference
@@ -1,8 +1,6 @@
 -- { echo }
 
 set allow_experimental_window_functions = 1;
-
-
 -- just something basic
 select number, count() over (partition by intDiv(number, 3) order by number) from numbers(10);
 0	1
@@ -15,8 +13,6 @@ select number, count() over (partition by intDiv(number, 3) order by number) fro
 7	2
 8	3
 9	1
-
-
 -- proper calculation across blocks
 select number, max(number) over (partition by intDiv(number, 3) order by number desc) from numbers(10) settings max_block_size = 2;
 2	2
@@ -29,12 +25,8 @@ select number, max(number) over (partition by intDiv(number, 3) order by number
 7	8
 6	8
 9	9
-
-
 -- not a window function
 select number, abs(number) over (partition by toString(intDiv(number, 3))) from numbers(10); -- { serverError 63 }
-
-
 -- no partition by
 select number, avg(number) over (order by number) from numbers(10);
 0	0
@@ -47,8 +39,6 @@ select number, avg(number) over (order by number) from numbers(10);
 7	3.5
 8	4
 9	4.5
-
-
 -- no order by
 select number, quantileExact(number) over (partition by intDiv(number, 3)) from numbers(10);
 0	0
@@ -61,8 +51,6 @@ select number, quantileExact(number) over (partition by intDiv(number, 3)) from
 7	7
 8	7
 9	9
-
-
 -- can add an alias after window spec
 select number, quantileExact(number) over (partition by intDiv(number, 3)) q from numbers(10);
 0	0
@@ -75,20 +63,14 @@ select number, quantileExact(number) over (partition by intDiv(number, 3)) q fro
 7	7
 8	7
 9	9
-
-
 -- can't reference it yet -- the window functions are calculated at the
 -- last stage of select, after all other functions.
 select q * 10, quantileExact(number) over (partition by intDiv(number, 3)) q from numbers(10); -- { serverError 47 }
-
-
 -- must work in WHERE if you wrap it in a subquery
 select * from (select count(*) over () c from numbers(3)) where c > 0;
 1
 2
 3
-
-
 -- should work in ORDER BY
 select number, max(number) over (partition by intDiv(number, 3) order by number desc) m from numbers(10) order by m desc, number;
 9	9
@@ -101,15 +83,11 @@ select number, max(number) over (partition by intDiv(number, 3) order by number
 0	2
 1	2
 2	2
-
-
 -- also works in ORDER BY if you wrap it in a subquery
 select * from (select count(*) over () c from numbers(3)) order by c;
 1
 2
 3
-
-
 -- Example with window function only in ORDER BY. Here we make a rank of all
 -- numbers sorted descending, and then sort by this rank descending, and must get
 -- the ascending order.
@@ -119,8 +97,6 @@ select * from (select * from numbers(5) order by rand()) order by count() over (
 2
 3
 4
-
-
 -- Aggregate functions as window function arguments. This query is semantically
 -- the same as the above one, only we replace `number` with
 -- `any(number) group by number` and so on.
@@ -130,18 +106,13 @@ select * from (select * from numbers(5) order by rand()) group by number order b
 2
 3
 4
-
 -- some more simple cases w/aggregate functions
 select sum(any(number)) over () from numbers(1);
 0
-
 select sum(any(number) + 1) over () from numbers(1);
 1
-
 select sum(any(number + 1)) over () from numbers(1);
 1
-
-
 -- different windows
 -- an explain test would also be helpful, but it's too immature now and I don't
 -- want to change reference all the time
@@ -177,8 +148,6 @@ select number, max(number) over (partition by intDiv(number, 3) order by number
 28	29	4
 29	29	5
 30	30	1
-
-
 -- two functions over the same window
 -- an explain test would also be helpful, but it's too immature now and I don't
 -- want to change reference all the time
@@ -190,34 +159,23 @@ select number, max(number) over (partition by intDiv(number, 3) order by number
 4	5	2
 5	5	1
 6	6	1
-
-
 -- check that we can work with constant columns
 select median(x) over (partition by x) from (select 1 x);
 1
-
-
 -- an empty window definition is valid as well
 select groupArray(number) over () from numbers(3);
 [0]
 [0,1]
 [0,1,2]
-
-
 -- This one tests we properly process the window  function arguments.
 -- Seen errors like 'column `1` not found' from count(1).
 select count(1) over (), max(number + 1) over () from numbers(3);
 1	3
-
-
 -- Should work in DISTINCT
 select distinct sum(0) over () from numbers(2);
 0
-
 select distinct any(number) over () from numbers(2);
 0
-
-
 -- Various kinds of aliases are properly substituted into various parts of window
 -- function definition.
 with number + 1 as x select intDiv(number, 3) as y, sum(x + y) over (partition by y order by x) from numbers(7);
@@ -228,13 +186,9 @@ with number + 1 as x select intDiv(number, 3) as y, sum(x + y) over (partition b
 1	11
 1	18
 2	9
-
-
 -- WINDOW clause
 select 1 window w1 as ();
 1
-
-
 select sum(number) over w1, sum(number) over w2
 from numbers(10)
 window
@@ -251,8 +205,6 @@ window
 28	13
 36	21
 45	9
-
-
 select
     sum(number) over w1,
     sum(number) over (partition by intDiv(number, 3))

From 9d6730a846cf4b048d43ce4d17086342c9b1e0e2 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Sat, 16 Jan 2021 00:33:53 +0300
Subject: [PATCH 077/611] small fixes

---
 programs/client/Client.cpp                    | 68 +++++++++++--------
 programs/client/TestHint.h                    |  6 --
 tests/clickhouse-test                         | 10 +--
 .../01564_test_hint_woes.reference            |  2 +
 4 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 672944a2d8b..6fad0d2775c 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -898,6 +898,40 @@ private:
         }
     }
 
+    void reportQueryError() const
+    {
+        // If we probably have progress bar, we should add additional
+        // newline, otherwise exception may display concatenated with
+        // the progress bar.
+        if (need_render_progress)
+            std::cerr << '\n';
+
+        if (server_exception)
+        {
+            std::string text = server_exception->displayText();
+            auto embedded_stack_trace_pos = text.find("Stack trace");
+            if (std::string::npos != embedded_stack_trace_pos
+                && !config().getBool("stacktrace", false))
+            {
+                text.resize(embedded_stack_trace_pos);
+            }
+            std::cerr << "Received exception from server (version "
+                << server_version << "):" << std::endl << "Code: "
+                << server_exception->code() << ". " << text << std::endl;
+        }
+
+        if (client_exception)
+        {
+            fmt::print(stderr,
+                "Error on processing query '{}':\n{}",
+                full_query, client_exception->message());
+        }
+
+        // A debug check -- at least some exception must be set, if the error
+        // flag is set, and vice versa.
+        assert(have_error == (client_exception || server_exception));
+    }
+
     bool processMultiQuery(const String & all_queries_text)
     {
         // It makes sense not to base any control flow on this, so that it is
@@ -1148,7 +1182,7 @@ private:
 
                 if (!test_hint.clientError() && !test_hint.serverError())
                 {
-                    // No error was expected but it still ocurred. This is the
+                    // No error was expected but it still occurred. This is the
                     // default case w/o test hint, doesn't need additional
                     // diagnostics.
                     error_matches_hint = false;
@@ -1185,32 +1219,7 @@ private:
             // Report error.
             if (have_error)
             {
-                // If we probably have progress bar, we should add additional
-                // newline, otherwise exception may display concatenated with
-                // the progress bar.
-                if (need_render_progress)
-                    std::cerr << '\n';
-
-                if (server_exception)
-                {
-                    std::string text = server_exception->displayText();
-                    auto embedded_stack_trace_pos = text.find("Stack trace");
-                    if (std::string::npos != embedded_stack_trace_pos
-                        && !config().getBool("stacktrace", false))
-                    {
-                        text.resize(embedded_stack_trace_pos);
-                    }
-                    std::cerr << "Received exception from server (version "
-                        << server_version << "):" << std::endl << "Code: "
-                        << server_exception->code() << ". " << text << std::endl;
-                }
-
-                if (client_exception)
-                {
-                    fmt::print(stderr,
-                        "Error on processing query '{}':\n{}",
-                        full_query, client_exception->message());
-                }
+                reportQueryError();
             }
 
             // Stop processing queries if needed.
@@ -1414,6 +1423,11 @@ private:
         }
 
         processParsedSingleQuery();
+
+        if (have_error)
+        {
+            reportQueryError();
+        }
     }
 
     // Parameters are in global variables:
diff --git a/programs/client/TestHint.h b/programs/client/TestHint.h
index 4d7c9b72a21..32dc1f0bc17 100644
--- a/programs/client/TestHint.h
+++ b/programs/client/TestHint.h
@@ -11,12 +11,6 @@
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int UNEXPECTED_ERROR_CODE;
-}
-
-
 /// Checks expected server and client error codes in testmode.
 /// To enable it add special comment after the query: "-- { serverError 60 }" or "-- { clientError 20 }".
 /// Also you can enable echoing all queries by writing "-- { echo }".
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index da7d055f250..95d8af854bb 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -568,7 +568,7 @@ def main(args):
     if not check_server_started(args.client, args.server_check_retries):
         raise Exception(
             "Server is not responding. Cannot execute 'SELECT 1' query. \
-            Note: if you are using unbundled mode, you also have to specify -c option.")
+            Note: if you are using split build, you may have to specify -c option.")
 
     build_flags = collect_build_flags(args.client)
     if args.antlr:
@@ -846,10 +846,10 @@ if __name__ == '__main__':
     parser.add_argument('--tmp', help='Path to tmp dir')
 
     parser.add_argument('-b', '--binary', default='clickhouse',
-        help='Path to clickhouse (if bundled, clickhouse-server otherwise) binary or name of binary in PATH')
+        help='Path to clickhouse (if monolithic build, clickhouse-server otherwise) binary or name of binary in PATH')
 
     parser.add_argument('-c', '--client',
-        help='Path to clickhouse-client (if unbundled, useless otherwise) binary of name of binary in PATH')
+        help='Path to clickhouse-client (if split build, useless otherwise) binary of name of binary in PATH')
 
     parser.add_argument('--extract_from_config', help='extract-from-config program')
     parser.add_argument('--configclient', help='Client config (if you use not default ports)')
@@ -930,11 +930,11 @@ if __name__ == '__main__':
         if find_binary(args.binary + '-client'):
             args.client = args.binary + '-client'
 
-            print("Using " + args.client + " as client program (expecting unbundled mode)")
+            print("Using " + args.client + " as client program (expecting split build)")
         elif find_binary(args.binary):
             args.client = args.binary + ' client'
 
-            print("Using " + args.client + " as client program (expecting bundled mode)")
+            print("Using " + args.client + " as client program (expecting monolithic build)")
         else:
             print("No 'clickhouse' or 'clickhouse-client' client binary found", file=sys.stderr)
             parser.print_help()
diff --git a/tests/queries/0_stateless/01564_test_hint_woes.reference b/tests/queries/0_stateless/01564_test_hint_woes.reference
index 41c8bb32d0c..2f63ed55e85 100644
--- a/tests/queries/0_stateless/01564_test_hint_woes.reference
+++ b/tests/queries/0_stateless/01564_test_hint_woes.reference
@@ -23,3 +23,5 @@ select nonexistent column; -- { serverError 47 }
 insert into values_01564 values (1); select 1;
 select 1;
 1
+-- the return code must be zero after the final query has failed with expected error
+insert into values_01564 values (11); -- { serverError 469 }

From 832d6b1fcad9689ede6865b631124184edf46f94 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Sat, 16 Jan 2021 00:49:02 +0300
Subject: [PATCH 078/611] more precise regex in fasttest

---
 docker/test/fasttest/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index dd98390cdcc..437740506e5 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -335,7 +335,7 @@ function run_tests
     time clickhouse-test -j 8 --order=random --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"
 
     # substr is to remove semicolon after test name
-    readarray -t FAILED_TESTS < <(awk '/FAIL|TIMEOUT|ERROR/ { print substr($3, 1, length($3)-1) }' "$FASTTEST_OUTPUT/test_log.txt" | tee "$FASTTEST_OUTPUT/failed-parallel-tests.txt")
+    readarray -t FAILED_TESTS < <(awk '/\[ FAIL|TIMEOUT|ERROR \]/ { print substr($3, 1, length($3)-1) }' "$FASTTEST_OUTPUT/test_log.txt" | tee "$FASTTEST_OUTPUT/failed-parallel-tests.txt")
 
     # We will rerun sequentially any tests that have failed during parallel run.
     # They might have failed because there was some interference from other tests

From 95c8018b46d5e49702f6f2462132a41f82030d7f Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Sat, 16 Jan 2021 12:58:08 +0300
Subject: [PATCH 079/611] Fixes and translation to Ru

---
 .../sql-reference/statements/select/group-by.md   |  2 +-
 docs/ru/operations/settings/settings.md           | 15 +++++++++++++++
 .../sql-reference/statements/select/group-by.md   |  4 ++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/statements/select/group-by.md b/docs/en/sql-reference/statements/select/group-by.md
index 6ebcfc1edf1..5d7201c2070 100644
--- a/docs/en/sql-reference/statements/select/group-by.md
+++ b/docs/en/sql-reference/statements/select/group-by.md
@@ -257,7 +257,7 @@ Aggregation is one of the most important features of a column-oriented DBMS, and
 
 ### GROUP BY Optimization Depending on Table Sorting Key {#aggregation-in-order}
 
-If a table is sorted by some key, and `GROUP BY` expression contains at least prefix of sorting key or injective functions, the in-between result of aggreagtion can be finalized and sent to client when a new key is read from table. This behaviour is switched on with the [optimize_aggregation_in_order](../../../operations/settings/settings.md#optimize_aggregation_in_order) setting.
+The aggregation can be performed more effectively, if a table is sorted by some key, and `GROUP BY` expression contains at least prefix of sorting key or injective functions. In this case when a new key is read from table, the in-between result of aggregation can be finalized and sent to client. This behaviour is switched on by the [optimize_aggregation_in_order](../../../operations/settings/settings.md#optimize_aggregation_in_order) setting.
 
 ### GROUP BY in External Memory {#select-group-by-in-external-memory}
 
diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index aa549fc5776..7a1257bdce6 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -1995,6 +1995,21 @@ SELECT * FROM a;
 
 -   [Оптимизация чтения данных](../../sql-reference/statements/select/order-by.md#optimize_read_in_order) в секции `ORDER BY`
 
+## optimize_aggregation_in_order {#optimize_aggregation_in_order}
+
+Включает или отключает оптимизацию в запросах [SELECT](../../sql-reference/statements/select/index.md) с секцией [GROUP BY](../../sql-reference/statements/select/group-by.md) при наличии подходящих ключей сортировки. Используется при работе с таблицами [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md).
+
+Возможные значения:
+
+-   0 — оптимизация по ключу сортировки отключена.
+-   1 — оптимизация по ключу сортировки включена.
+
+Значение по умолчанию: `0`.
+
+**См. также**
+
+-   [Оптимизация GROUP BY для отсортированных таблиц](../../sql-reference/statements/select/group-by.md#aggregation-in-order)
+
 ## mutations_sync {#mutations_sync}
 
 Позволяет выполнять запросы `ALTER TABLE ... UPDATE|DELETE` ([мутации](../../sql-reference/statements/alter/index.md#mutations)) синхронно.
diff --git a/docs/ru/sql-reference/statements/select/group-by.md b/docs/ru/sql-reference/statements/select/group-by.md
index 0c8a29d0c26..8ddca5f5e36 100644
--- a/docs/ru/sql-reference/statements/select/group-by.md
+++ b/docs/ru/sql-reference/statements/select/group-by.md
@@ -252,6 +252,10 @@ GROUP BY вычисляет для каждого встретившегося 
 
 Агрегация является одной из наиболее важных возможностей столбцовых СУБД, и поэтому её реализация является одной из наиболее сильно оптимизированных частей ClickHouse. По умолчанию агрегирование выполняется в памяти с помощью хэш-таблицы. Она имеет более 40 специализаций, которые выбираются автоматически в зависимости от типов данных ключа группировки.
 
+### Оптимизация GROUP BY для отсортированных таблиц {#aggregation-in-order}
+
+Агрегирование данных в отсортированных таблицах может выполняться более эффективно, если выражение `GROUP BY` содержит хотя бы префикс ключа сортировки или инъективную функцию с этим ключом. В таких случаях в момент считывания из таблицы нового значения ключа сортировки промежуточный результат агрегирования будет финализироваться и отправляться на клиентскую машину. Чтобы включить такой способ выполнения запроса, используйте настройку [optimize_aggregation_in_order](../../../operations/settings/settings.md#optimize_aggregation_in_order).
+
 ### Группировка во внешней памяти {#select-group-by-in-external-memory}
 
 Можно включить сброс временных данных на диск, чтобы ограничить потребление оперативной памяти при выполнении `GROUP BY`.

From 489fa1e0833cf0dfb73a1e6551930b8f949b8734 Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Sat, 16 Jan 2021 13:30:15 +0300
Subject: [PATCH 080/611] Fixes and translation to Ru

---
 docs/en/operations/settings/index.md           |  2 +-
 .../sql-reference/statements/select/index.md   |  6 +++++-
 docs/ru/operations/settings/index.md           |  1 +
 .../sql-reference/statements/select/index.md   | 18 +++++++++++++++++-
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/docs/en/operations/settings/index.md b/docs/en/operations/settings/index.md
index 87c8a9bf1b9..57d20f52899 100644
--- a/docs/en/operations/settings/index.md
+++ b/docs/en/operations/settings/index.md
@@ -25,7 +25,7 @@ Ways to configure settings, in order of priority:
 
     -   When starting the ClickHouse console client in non-interactive mode, set the startup parameter `--setting=value`.
     -   When using the HTTP API, pass CGI parameters (`URL?setting_1=value&setting_2=value...`).
-    -   Make settings right in the query, in the `SETTINGS` clause. The setting value is applied only to that query and is reset to default or previous value after the query is executed.
+    -   Make settings right in the query, in the [SETTINGS](../../sql-reference/statements/select/index.md#settings-in-select) clause. The setting value is applied only to that query and is reset to default or previous value after the query is executed.
 
 Settings that can only be made in the server config file are not covered in this section.
 
diff --git a/docs/en/sql-reference/statements/select/index.md b/docs/en/sql-reference/statements/select/index.md
index 73ae1392350..9c8ac01db35 100644
--- a/docs/en/sql-reference/statements/select/index.md
+++ b/docs/en/sql-reference/statements/select/index.md
@@ -268,7 +268,11 @@ SELECT * REPLACE(i + 1 AS i) EXCEPT (j) APPLY(sum) from columns_transformers;
 
 ## SETTINGS in SELECT Query {#settings-in-select}
 
-There are multiple ways to make settings, see [here](../../../operations/settings/index.md). One of them is to specify necessary settings right in the SELECT query. The setting value is applied only to this query and is reset to default or previous value after the query is executed.
+You can specify the necessary settings right in the `SELECT` query. The setting value is applied only to this query and is reset to default or previous value after the query is executed. 
+
+To specify several settings, use several `SETTINGS` clauses. 
+
+Other ways to make settings, see [here](../../../operations/settings/index.md). 
 
 **Example**
 
diff --git a/docs/ru/operations/settings/index.md b/docs/ru/operations/settings/index.md
index c24b7053c46..0fc76d16f7c 100644
--- a/docs/ru/operations/settings/index.md
+++ b/docs/ru/operations/settings/index.md
@@ -24,6 +24,7 @@ toc_title: Introduction
 
     -   При запуске консольного клиента ClickHouse в не интерактивном режиме установите параметр запуска `--setting=value`.
     -   При использовании HTTP API передавайте cgi-параметры (`URL?setting_1=value&setting_2=value...`).
+    -   В самом запросе укажите необходимые настройки в секции [SETTINGS](../../sql-reference/statements/select/index.md#settings-in-select). Значения таких настроек действуют только в рамках данного запроса, а после его выполнения сбрасываются до предыдущего значения или значения по умолчанию. 
 
 Настройки, которые можно задать только в конфигурационном файле сервера, в разделе не рассматриваются.
 
diff --git a/docs/ru/sql-reference/statements/select/index.md b/docs/ru/sql-reference/statements/select/index.md
index bf4ae44a6f1..9af4d051451 100644
--- a/docs/ru/sql-reference/statements/select/index.md
+++ b/docs/ru/sql-reference/statements/select/index.md
@@ -23,6 +23,7 @@ SELECT [DISTINCT] expr_list
 [ORDER BY expr_list] [WITH FILL] [FROM expr] [TO expr] [STEP expr] 
 [LIMIT [offset_value, ]n BY columns]
 [LIMIT [n, ]m] [WITH TIES]
+[SETTINGS ...]
 [UNION ALL ...]
 [INTO OUTFILE filename]
 [FORMAT format]
@@ -161,4 +162,19 @@ Code: 42. DB::Exception: Received from localhost:9000. DB::Exception: Number of
 
 Подробнее смотрите в разделе «Настройки». Присутствует возможность использовать внешнюю сортировку (с сохранением временных данных на диск) и внешнюю агрегацию.
 
-{## [Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/statements/select/) ##}
+## SETTINGS в запросе SELECT {#settings-in-select}
+
+Вы можете задать значения необходимых настроек непосредственно в запросе `SELECT`, в секции `SETTINGS`. Значение настройки действует только в рамках данного запроса, а после его выполнения сбрасывается до предыдущего значения или значения по умолчанию. 
+
+Чтобы задать значения нескольких настроек, используйте несколько отдельных секций `SETTINGS`. 
+
+Другие способы задания настроек описаны [здесь](../../../operations/settings/index.md). 
+
+**Пример**
+
+``` sql
+SELECT * FROM some_table SETTINGS optimize_read_in_order=1 SETTINGS cast_keep_nullable=1;
+```
+
+[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/select/)
+<!--hide-->

From 52a05f4b5d74b6982ae77bb0144b47f45c2e3ae2 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 16 Jan 2021 18:03:32 +0300
Subject: [PATCH 081/611] Extreme fuzzing of newly added tests

---
 docker/test/fuzzer/run-fuzzer.sh | 15 ++++++++++-----
 programs/client/Client.cpp       | 26 +++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index 889d7308ed8..4fca58ecd77 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -32,9 +32,6 @@ function clone
 
 function download
 {
-#    wget -O- -nv -nd -c "https://clickhouse-builds.s3.yandex.net/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/performance/performance.tgz" \
-#        | tar --strip-components=1 -zxv
-
     wget -nv -nd -c "https://clickhouse-builds.s3.yandex.net/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/clang-11_debug_none_bundled_unsplitted_disable_False_binary/clickhouse"
     chmod +x clickhouse
     ln -s ./clickhouse ./clickhouse-server
@@ -72,6 +69,14 @@ function watchdog
 
 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 master | grep -P 'tests/queries/0_stateless/*.sql' | sed -r -e 's!^!ch/!' | sort -R)
+    cd ..
+    if [[ -n "$NEW_TESTS" ]]; do
+        NEW_TESTS_OPT="--interleave-queries-file ${NEW_TESTS}"
+    done
+
     ./clickhouse-server --config-file db/config.xml -- --path db 2>&1 | tail -100000 > server.log &
     server_pid=$!
     kill -0 $server_pid
@@ -84,7 +89,7 @@ function fuzz
     # 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) \
+    ./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=$?
@@ -106,7 +111,7 @@ function fuzz
 
 case "$stage" in
 "")
-    ;&
+    ;&  # Did you know? This is "fallthrough" in bash. https://stackoverflow.com/questions/12010686/case-statement-fallthrough
 "clone")
     time clone
     if [ -v FUZZ_LOCAL_SCRIPT ]
diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index ca2a3db193f..2f4550d650a 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -141,6 +141,8 @@ private:
 
     /// If not empty, queries will be read from these files
     std::vector<std::string> queries_files;
+    /// If not empty, run queries from these files before processing every file from 'queries_files'.
+    std::vector<std::string> interleave_queries_files;
 
     std::unique_ptr<Connection> connection;    /// Connection to DB.
     String full_query; /// Current query as it was given to the client.
@@ -796,13 +798,22 @@ private:
 
         if (!queries_files.empty())
         {
-            for (const auto & queries_file : queries_files)
+            auto process_file = [&](const std::string & file)
             {
                 connection->setDefaultDatabase(connection_parameters.default_database);
-                ReadBufferFromFile in(queries_file);
+                ReadBufferFromFile in(file);
                 readStringUntilEOF(text, in);
-                if (!processMultiQuery(text))
-                    break;
+                return processMultiQuery(text);
+            };
+
+            for (const auto & queries_file : queries_files)
+            {
+                for (const auto & interleave_file : interleave_queries_files)
+                    if (!process_file(interleave_file))
+                        return;
+
+                if (!process_file(queries_file))
+                    return;
             }
             return;
         }
@@ -945,6 +956,7 @@ private:
 
                     continue;
                 }
+
                 return true;
             }
 
@@ -2271,7 +2283,9 @@ public:
             ("highlight", po::value<bool>()->default_value(true), "enable or disable basic syntax highlight in interactive command line")
             ("log-level", po::value<std::string>(), "client log level")
             ("server_logs_file", po::value<std::string>(), "put server logs into specified file")
-            ("query-fuzzer-runs", po::value<int>()->default_value(0), "query fuzzer runs")
+            ("query-fuzzer-runs", po::value<int>()->default_value(0), "After executing every SELECT query, do random mutations in it and run again specified number of times. This is used for testing to discover unexpected corner cases.")
+            ("interleave-queries-file", po::value<std::vector<std::string>>()->multitoken(),
+                "file path with queries to execute before every file from 'queries-file'; multiple files can be specified (--queries-file file1 file2...); this is needed to enable more aggressive fuzzing of newly added tests (see 'query-fuzzer-runs' option)")
             ("opentelemetry-traceparent", po::value<std::string>(), "OpenTelemetry traceparent header as described by W3C Trace Context recommendation")
             ("opentelemetry-tracestate", po::value<std::string>(), "OpenTelemetry tracestate header as described by W3C Trace Context recommendation")
             ("history_file", po::value<std::string>(), "path to history file")
@@ -2386,6 +2400,8 @@ public:
             config().setString("query", options["query"].as<std::string>());
         if (options.count("queries-file"))
             queries_files = options["queries-file"].as<std::vector<std::string>>();
+        if (options.count("interleave-queries-file"))
+            interleave_queries_files = options["interleave-queries-file"].as<std::vector<std::string>>();
         if (options.count("database"))
             config().setString("database", options["database"].as<std::string>());
         if (options.count("pager"))

From 950bfb3ec645a386e82c080c2fe3af09af1c9aee Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 16 Jan 2021 18:33:34 +0300
Subject: [PATCH 082/611] Allow change max_server_memory_usage without restart

---
 programs/server/Server.cpp   | 62 ++++++++++++++++++------------------
 src/Common/MemoryTracker.cpp |  6 ++++
 src/Common/MemoryTracker.h   |  2 ++
 3 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index 2f8029fc39c..94cd6854f78 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -692,6 +692,37 @@ int Server::main(const std::vector<std::string> & /*args*/)
         {
             Settings::checkNoSettingNamesAtTopLevel(*config, config_path);
 
+            /// Limit on total memory usage
+            size_t max_server_memory_usage = config->getUInt64("max_server_memory_usage", 0);
+
+            double max_server_memory_usage_to_ram_ratio = config->getDouble("max_server_memory_usage_to_ram_ratio", 0.9);
+            size_t default_max_server_memory_usage = memory_amount * max_server_memory_usage_to_ram_ratio;
+
+            if (max_server_memory_usage == 0)
+            {
+                max_server_memory_usage = default_max_server_memory_usage;
+                LOG_INFO(log, "Setting max_server_memory_usage was set to {}"
+                    " ({} available * {:.2f} max_server_memory_usage_to_ram_ratio)",
+                    formatReadableSizeWithBinarySuffix(max_server_memory_usage),
+                    formatReadableSizeWithBinarySuffix(memory_amount),
+                    max_server_memory_usage_to_ram_ratio);
+            }
+            else if (max_server_memory_usage > default_max_server_memory_usage)
+            {
+                max_server_memory_usage = default_max_server_memory_usage;
+                LOG_INFO(log, "Setting max_server_memory_usage was lowered to {}"
+                    " because the system has low amount of memory. The amount was"
+                    " calculated as {} available"
+                    " * {:.2f} max_server_memory_usage_to_ram_ratio",
+                    formatReadableSizeWithBinarySuffix(max_server_memory_usage),
+                    formatReadableSizeWithBinarySuffix(memory_amount),
+                    max_server_memory_usage_to_ram_ratio);
+            }
+
+            total_memory_tracker.setHardLimit(max_server_memory_usage);
+            total_memory_tracker.setDescription("(total)");
+            total_memory_tracker.setMetric(CurrentMetrics::MemoryTracking);
+
             // FIXME logging-related things need synchronization -- see the 'Logger * log' saved
             // in a lot of places. For now, disable updating log configuration without server restart.
             //setTextLog(global_context->getTextLog());
@@ -780,37 +811,6 @@ int Server::main(const std::vector<std::string> & /*args*/)
     global_context->getMergeTreeSettings().sanityCheck(settings);
     global_context->getReplicatedMergeTreeSettings().sanityCheck(settings);
 
-    /// Limit on total memory usage
-    size_t max_server_memory_usage = config().getUInt64("max_server_memory_usage", 0);
-
-    double max_server_memory_usage_to_ram_ratio = config().getDouble("max_server_memory_usage_to_ram_ratio", 0.9);
-    size_t default_max_server_memory_usage = memory_amount * max_server_memory_usage_to_ram_ratio;
-
-    if (max_server_memory_usage == 0)
-    {
-        max_server_memory_usage = default_max_server_memory_usage;
-        LOG_INFO(log, "Setting max_server_memory_usage was set to {}"
-            " ({} available * {:.2f} max_server_memory_usage_to_ram_ratio)",
-            formatReadableSizeWithBinarySuffix(max_server_memory_usage),
-            formatReadableSizeWithBinarySuffix(memory_amount),
-            max_server_memory_usage_to_ram_ratio);
-    }
-    else if (max_server_memory_usage > default_max_server_memory_usage)
-    {
-        max_server_memory_usage = default_max_server_memory_usage;
-        LOG_INFO(log, "Setting max_server_memory_usage was lowered to {}"
-            " because the system has low amount of memory. The amount was"
-            " calculated as {} available"
-            " * {:.2f} max_server_memory_usage_to_ram_ratio",
-            formatReadableSizeWithBinarySuffix(max_server_memory_usage),
-            formatReadableSizeWithBinarySuffix(memory_amount),
-            max_server_memory_usage_to_ram_ratio);
-    }
-
-    total_memory_tracker.setOrRaiseHardLimit(max_server_memory_usage);
-    total_memory_tracker.setDescription("(total)");
-    total_memory_tracker.setMetric(CurrentMetrics::MemoryTracking);
-
     Poco::Timespan keep_alive_timeout(config().getUInt("keep_alive_timeout", 10), 0);
 
     Poco::ThreadPool server_pool(3, config().getUInt("max_connections", 1024));
diff --git a/src/Common/MemoryTracker.cpp b/src/Common/MemoryTracker.cpp
index e5682cf37d0..d9bbf8ffa96 100644
--- a/src/Common/MemoryTracker.cpp
+++ b/src/Common/MemoryTracker.cpp
@@ -316,6 +316,12 @@ void MemoryTracker::set(Int64 to)
 }
 
 
+void MemoryTracker::setHardLimit(Int64 value)
+{
+    hard_limit.store(value, std::memory_order_relaxed);
+}
+
+
 void MemoryTracker::setOrRaiseHardLimit(Int64 value)
 {
     /// This is just atomic set to maximum.
diff --git a/src/Common/MemoryTracker.h b/src/Common/MemoryTracker.h
index 961c8722afa..641ebe238c9 100644
--- a/src/Common/MemoryTracker.h
+++ b/src/Common/MemoryTracker.h
@@ -96,6 +96,8 @@ public:
         return peak.load(std::memory_order_relaxed);
     }
 
+    void setHardLimit(Int64 value);
+
     /** Set limit if it was not set.
       * Otherwise, set limit to new value, if new value is greater than previous limit.
       */

From b226a4ed4dc81f095a1f7d9f875bf373361c0389 Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Sat, 16 Jan 2021 19:36:08 +0300
Subject: [PATCH 083/611] Update run-fuzzer.sh

---
 docker/test/fuzzer/run-fuzzer.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index 4fca58ecd77..b16fb124ae2 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -73,7 +73,8 @@ function fuzz
     cd ch
     NEW_TESTS=$(git diff --name-only master | grep -P 'tests/queries/0_stateless/*.sql' | sed -r -e 's!^!ch/!' | sort -R)
     cd ..
-    if [[ -n "$NEW_TESTS" ]]; do
+    if [[ -n "$NEW_TESTS" ]]
+    then
         NEW_TESTS_OPT="--interleave-queries-file ${NEW_TESTS}"
     done
 

From 41c77b4775aacbe26667046a47768702f36996da Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Sat, 16 Jan 2021 22:01:29 +0300
Subject: [PATCH 084/611] Update run-fuzzer.sh

---
 docker/test/fuzzer/run-fuzzer.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index b16fb124ae2..0d34abf3749 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -76,7 +76,7 @@ function fuzz
     if [[ -n "$NEW_TESTS" ]]
     then
         NEW_TESTS_OPT="--interleave-queries-file ${NEW_TESTS}"
-    done
+    fi
 
     ./clickhouse-server --config-file db/config.xml -- --path db 2>&1 | tail -100000 > server.log &
     server_pid=$!

From cd865dcf4243699c3e93250aa9091e898f94b41b Mon Sep 17 00:00:00 2001
From: olgarev <56617294+olgarev@users.noreply.github.com>
Date: Sat, 16 Jan 2021 22:34:13 +0300
Subject: [PATCH 085/611] Apply suggestions from code review

Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
---
 docs/en/operations/settings/index.md             | 2 +-
 docs/ru/operations/settings/index.md             | 2 +-
 docs/ru/sql-reference/statements/select/index.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/en/operations/settings/index.md b/docs/en/operations/settings/index.md
index 57d20f52899..d38c98f51cb 100644
--- a/docs/en/operations/settings/index.md
+++ b/docs/en/operations/settings/index.md
@@ -25,7 +25,7 @@ Ways to configure settings, in order of priority:
 
     -   When starting the ClickHouse console client in non-interactive mode, set the startup parameter `--setting=value`.
     -   When using the HTTP API, pass CGI parameters (`URL?setting_1=value&setting_2=value...`).
-    -   Make settings right in the query, in the [SETTINGS](../../sql-reference/statements/select/index.md#settings-in-select) clause. The setting value is applied only to that query and is reset to default or previous value after the query is executed.
+    -   Make settings in the [SETTINGS](../../sql-reference/statements/select/index.md#settings-in-select) clause of the SELECT query. The setting value is applied only to that query and is reset to default or previous value after the query is executed.
 
 Settings that can only be made in the server config file are not covered in this section.
 
diff --git a/docs/ru/operations/settings/index.md b/docs/ru/operations/settings/index.md
index 0fc76d16f7c..2ef1d4730a3 100644
--- a/docs/ru/operations/settings/index.md
+++ b/docs/ru/operations/settings/index.md
@@ -24,7 +24,7 @@ toc_title: Introduction
 
     -   При запуске консольного клиента ClickHouse в не интерактивном режиме установите параметр запуска `--setting=value`.
     -   При использовании HTTP API передавайте cgi-параметры (`URL?setting_1=value&setting_2=value...`).
-    -   В самом запросе укажите необходимые настройки в секции [SETTINGS](../../sql-reference/statements/select/index.md#settings-in-select). Значения таких настроек действуют только в рамках данного запроса, а после его выполнения сбрасываются до предыдущего значения или значения по умолчанию. 
+    -  Укажите необходимые настройки в секции [SETTINGS](../../sql-reference/statements/select/index.md#settings-in-select) запроса SELECT. Эти настройки действуют только в рамках данного запроса, а после его выполнения сбрасываются до предыдущего значения или значения по умолчанию. 
 
 Настройки, которые можно задать только в конфигурационном файле сервера, в разделе не рассматриваются.
 
diff --git a/docs/ru/sql-reference/statements/select/index.md b/docs/ru/sql-reference/statements/select/index.md
index 9af4d051451..d0a0c25cd96 100644
--- a/docs/ru/sql-reference/statements/select/index.md
+++ b/docs/ru/sql-reference/statements/select/index.md
@@ -164,7 +164,7 @@ Code: 42. DB::Exception: Received from localhost:9000. DB::Exception: Number of
 
 ## SETTINGS в запросе SELECT {#settings-in-select}
 
-Вы можете задать значения необходимых настроек непосредственно в запросе `SELECT`, в секции `SETTINGS`. Значение настройки действует только в рамках данного запроса, а после его выполнения сбрасывается до предыдущего значения или значения по умолчанию. 
+Вы можете задать значения необходимых настроек непосредственно в запросе `SELECT` в секции `SETTINGS`. Эти настройки действуют только в рамках данного запроса, а после его выполнения сбрасываются до предыдущего значения или значения по умолчанию. 
 
 Чтобы задать значения нескольких настроек, используйте несколько отдельных секций `SETTINGS`. 
 

From e57e2424821db11c600b4139cf1a0e050cc5f827 Mon Sep 17 00:00:00 2001
From: Alexander Tokmakov <avtokmakov@yandex-team.ru>
Date: Sat, 16 Jan 2021 22:56:07 +0300
Subject: [PATCH 086/611] fix

---
 base/harmful/harmful.c      | 4 ++--
 contrib/cassandra           | 2 +-
 tests/tsan_suppressions.txt | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/base/harmful/harmful.c b/base/harmful/harmful.c
index df625a3e4d6..4032fbf3b90 100644
--- a/base/harmful/harmful.c
+++ b/base/harmful/harmful.c
@@ -118,7 +118,7 @@ TRAP(logout)
 TRAP(logwtmp)
 TRAP(lrand48)
 TRAP(mallinfo)
-TRAP(mallopt)
+//TRAP(mallopt) // Used by tsan
 TRAP(mblen)
 TRAP(mbrlen)
 TRAP(mbrtowc)
@@ -193,7 +193,7 @@ TRAP(dbm_nextkey)
 TRAP(dbm_open)
 TRAP(dbm_store)
 TRAP(dirname)
-TRAP(dlerror)
+//TRAP(dlerror) // Used by tsan
 TRAP(ftw)
 TRAP(getc_unlocked)
 //TRAP(getenv) // Ok at program startup
diff --git a/contrib/cassandra b/contrib/cassandra
index fbbd9fc4c63..2935f6f15fe 160000
--- a/contrib/cassandra
+++ b/contrib/cassandra
@@ -1 +1 @@
-Subproject commit fbbd9fc4c634e9daad24714cd03cb390615d85ed
+Subproject commit 2935f6f15fea889899750560aa6331e9119e9dd0
diff --git a/tests/tsan_suppressions.txt b/tests/tsan_suppressions.txt
index ccc36d876f7..668710a33d7 100644
--- a/tests/tsan_suppressions.txt
+++ b/tests/tsan_suppressions.txt
@@ -1,4 +1,2 @@
 # looks like a bug in clang-11 thread sanitizer, detects normal data race with random FD in this method
 race:DB::LazyPipeFDs::close
-# races in openSSL https://github.com/openssl/openssl/issues/11974
-fun:evp_cipher_cache_constants

From 322a5e515300cef09ba52bef4f730e84dc8c1295 Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Sat, 16 Jan 2021 23:00:00 +0300
Subject: [PATCH 087/611] First draft

---
 docs/en/operations/caches.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 docs/en/operations/caches.md

diff --git a/docs/en/operations/caches.md b/docs/en/operations/caches.md
new file mode 100644
index 00000000000..0107c340019
--- /dev/null
+++ b/docs/en/operations/caches.md
@@ -0,0 +1,24 @@
+---
+toc_priority: 65
+toc_title: Caches
+---
+
+# Cache Types {#cache-types}
+
+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)
+
+Not directly used:
+- page cache OS
+
+[Original article](https://clickhouse.tech/docs/en/operations/caches/) <!--hide-->

From ea5e7d98a43bf9011a2ace205cad09799f5ae64d Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Sat, 16 Jan 2021 23:47:01 +0300
Subject: [PATCH 088/611] Update run-fuzzer.sh

---
 docker/test/fuzzer/run-fuzzer.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index 0d34abf3749..76f1d463aea 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# shellcheck disable=SC2086
+
 set -eux
 set -o pipefail
 trap "exit" INT TERM

From fe5053df95b9deacc0ab1fc29228a830b71acc52 Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Sun, 17 Jan 2021 00:35:41 +0300
Subject: [PATCH 089/611] Added note about memory usage

---
 docs/en/sql-reference/statements/select/group-by.md | 2 +-
 docs/ru/sql-reference/statements/select/group-by.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/sql-reference/statements/select/group-by.md b/docs/en/sql-reference/statements/select/group-by.md
index 5d7201c2070..a07c810fae8 100644
--- a/docs/en/sql-reference/statements/select/group-by.md
+++ b/docs/en/sql-reference/statements/select/group-by.md
@@ -257,7 +257,7 @@ Aggregation is one of the most important features of a column-oriented DBMS, and
 
 ### GROUP BY Optimization Depending on Table Sorting Key {#aggregation-in-order}
 
-The aggregation can be performed more effectively, if a table is sorted by some key, and `GROUP BY` expression contains at least prefix of sorting key or injective functions. In this case when a new key is read from table, the in-between result of aggregation can be finalized and sent to client. This behaviour is switched on by the [optimize_aggregation_in_order](../../../operations/settings/settings.md#optimize_aggregation_in_order) setting.
+The aggregation can be performed more effectively, if a table is sorted by some key, and `GROUP BY` expression contains at least prefix of sorting key or injective functions. In this case when a new key is read from table, the in-between result of aggregation can be finalized and sent to client. This behaviour is switched on by the [optimize_aggregation_in_order](../../../operations/settings/settings.md#optimize_aggregation_in_order) setting. Such optimization reduces memory usage during aggregation, but in some cases may slow down the query execution. 
 
 ### GROUP BY in External Memory {#select-group-by-in-external-memory}
 
diff --git a/docs/ru/sql-reference/statements/select/group-by.md b/docs/ru/sql-reference/statements/select/group-by.md
index 8ddca5f5e36..e94091f156d 100644
--- a/docs/ru/sql-reference/statements/select/group-by.md
+++ b/docs/ru/sql-reference/statements/select/group-by.md
@@ -254,7 +254,7 @@ GROUP BY вычисляет для каждого встретившегося 
 
 ### Оптимизация GROUP BY для отсортированных таблиц {#aggregation-in-order}
 
-Агрегирование данных в отсортированных таблицах может выполняться более эффективно, если выражение `GROUP BY` содержит хотя бы префикс ключа сортировки или инъективную функцию с этим ключом. В таких случаях в момент считывания из таблицы нового значения ключа сортировки промежуточный результат агрегирования будет финализироваться и отправляться на клиентскую машину. Чтобы включить такой способ выполнения запроса, используйте настройку [optimize_aggregation_in_order](../../../operations/settings/settings.md#optimize_aggregation_in_order).
+Агрегирование данных в отсортированных таблицах может выполняться более эффективно, если выражение `GROUP BY` содержит хотя бы префикс ключа сортировки или инъективную функцию с этим ключом. В таких случаях в момент считывания из таблицы нового значения ключа сортировки промежуточный результат агрегирования будет финализироваться и отправляться на клиентскую машину. Чтобы включить такой способ выполнения запроса, используйте настройку [optimize_aggregation_in_order](../../../operations/settings/settings.md#optimize_aggregation_in_order). Подобная оптимизация позволяет сэкономить память во время агрегации, но в некоторых случаях может привести к увеличению времени выполнения запроса. 
 
 ### Группировка во внешней памяти {#select-group-by-in-external-memory}
 

From 04dcc9523ad05abe894a1b328de4a0c340a28840 Mon Sep 17 00:00:00 2001
From: Denis Zhuravlev <denis.zhuravlev@revjet.com>
Date: Sat, 16 Jan 2021 18:26:43 -0400
Subject: [PATCH 090/611] test for #18839 Expand_macros_for_fetchPartition

---
 ...h_patition_with_macro_in_zk_path.reference |  2 ++
 ...0_fetch_patition_with_macro_in_zk_path.sql | 32 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path.reference
 create mode 100644 tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path.sql

diff --git a/tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path.reference b/tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path.reference
new file mode 100644
index 00000000000..1fcfced8b44
--- /dev/null
+++ b/tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path.reference
@@ -0,0 +1,2 @@
+202101
+202101_0_0_0	1	2021-01-01	some
diff --git a/tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path.sql b/tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path.sql
new file mode 100644
index 00000000000..2c50a7a8516
--- /dev/null
+++ b/tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path.sql
@@ -0,0 +1,32 @@
+DROP TABLE IF EXISTS test_01640;
+DROP TABLE IF EXISTS restore_01640;
+
+CREATE TABLE test_01640(i Int64, d Date, s String)
+ENGINE = ReplicatedMergeTree('/clickhouse/{shard}/tables/test_01640','{replica}') 
+PARTITION BY toYYYYMM(d) ORDER BY i;
+
+insert into test_01640 values (1, '2021-01-01','some');
+
+CREATE TABLE restore_01640(i Int64, d Date, s String)
+ENGINE = ReplicatedMergeTree('/clickhouse/{shard}/tables/restore_01640','{replica}')
+PARTITION BY toYYYYMM(d) ORDER BY i;
+
+ALTER TABLE restore_01640 FETCH PARTITION tuple(toYYYYMM(toDate('2021-01-01'))) 
+  FROM '/clickhouse/{shard}/tables/test_01640';
+
+SELECT partition_id
+FROM system.detached_parts
+WHERE (table = 'restore_01640') AND (database = currentDatabase());
+
+ALTER TABLE restore_01640 ATTACH PARTITION tuple(toYYYYMM(toDate('2021-01-01')));
+
+SELECT partition_id
+FROM system.detached_parts
+WHERE (table = 'restore_01640') AND (database = currentDatabase());
+
+SELECT _part, * FROM restore_01640;
+
+DROP TABLE test_01640;
+DROP TABLE restore_01640;
+
+

From f6d1f76b42bcc1a1161802fe961239a6ffff2f91 Mon Sep 17 00:00:00 2001
From: Dmitriy <sevirov@yandex-team.ru>
Date: Sun, 17 Jan 2021 04:30:02 +0300
Subject: [PATCH 091/611] Add some multiword types
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Обновил таблицу ANSI и добавил новые типы данных.
---
 docs/en/sql-reference/ansi.md                       |  2 +-
 docs/en/sql-reference/data-types/multiword-types.md | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/ansi.md b/docs/en/sql-reference/ansi.md
index eb6e0152fb0..5ca216d11fa 100644
--- a/docs/en/sql-reference/ansi.md
+++ b/docs/en/sql-reference/ansi.md
@@ -25,7 +25,7 @@ The following table lists cases when query feature works in ClickHouse, but beha
 |------------|--------------------------------------------------------------------------------------------------------------------------|----------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **E011**   | **Numeric data types**                                                                                                   | **Partial**{.text-warning} |                                                                                                                                                                                           |
 | E011-01    | INTEGER and SMALLINT data types                                                                                          | Yes {.text-success}         |                                                                                                                                                                                           |
-| E011-02    | REAL, DOUBLE PRECISION and FLOAT data types data types                                                                   | Partial {.text-warning}     | `FLOAT(<binary_precision>)` and `REAL` are not supported                                                                                                                                  |
+| E011-02    | REAL, DOUBLE PRECISION and FLOAT data types data types                                                                   | Yes {.text-warning}         |                                                                                                                                                                                           |
 | E011-03    | DECIMAL and NUMERIC data types                                                                                           | Partial {.text-warning}     | Only `DECIMAL(p,s)` is supported, not `NUMERIC`                                                                                                                                           |
 | E011-04    | Arithmetic operators                                                                                                     | Yes {.text-success}         |                                                                                                                                                                                           |
 | E011-05    | Numeric comparison                                                                                                       | Yes {.text-success}         |                                                                                                                                                                                           |
diff --git a/docs/en/sql-reference/data-types/multiword-types.md b/docs/en/sql-reference/data-types/multiword-types.md
index ea6a12ac82e..f55efcd7a51 100644
--- a/docs/en/sql-reference/data-types/multiword-types.md
+++ b/docs/en/sql-reference/data-types/multiword-types.md
@@ -12,6 +12,18 @@ When creating tables, you can also use data types with a name consisting of seve
 | Multiword types                  | Simple types                                                 |
 |----------------------------------|--------------------------------------------------------------|
 | DOUBLE PRECISION                 | [Float64](../../sql-reference/data-types/float.md)           |
+| CHAR LARGE OBJECT                | [String](../../sql-reference/data-types/string.md)           |
 | CHAR VARYING                     | [String](../../sql-reference/data-types/string.md)           |
+| CHARACTER LARGE OBJECT           | [String](../../sql-reference/data-types/string.md)           |
+| CHARACTER VARYING                | [String](../../sql-reference/data-types/string.md)           |
+| NCHAR LARGE OBJECT               | [String](../../sql-reference/data-types/string.md)           |
+| NCHAR VARYING                    | [String](../../sql-reference/data-types/string.md)           |
+| NATIONAL CHARACTER LARGE OBJECT  | [String](../../sql-reference/data-types/string.md)           |
+| NATIONAL CHARACTER VARYING       | [String](../../sql-reference/data-types/string.md)           |
+| NATIONAL CHAR VARYING            | [String](../../sql-reference/data-types/string.md)           |
+| NATIONAL CHARACTER               | [String](../../sql-reference/data-types/string.md)           |
+| NATIONAL CHAR                    | [String](../../sql-reference/data-types/string.md)           |
+| BINARY LARGE OBJECT              | [String](../../sql-reference/data-types/string.md)           |
+| BINARY VARYING                   | [String](../../sql-reference/data-types/string.md)           |
 
 [Original article](https://clickhouse.tech/docs/en/sql-reference/data-types/multiword-types/) <!--hide-->

From a3cc6707b40a894ab75a4488e9b6027fc9709e1f Mon Sep 17 00:00:00 2001
From: TCeason <tai_chong@foxmail.com>
Date: Sun, 17 Jan 2021 12:41:59 +0800
Subject: [PATCH 092/611] add MySQL Var check

add MySQL var check: log_bin_use_v1_row_events=OFF
---
 src/Core/MySQL/MySQLGtid.cpp                       | 6 +++---
 src/Core/MySQL/MySQLGtid.h                         | 2 +-
 src/Core/tests/mysql_protocol.cpp                  | 4 ++--
 src/Databases/MySQL/MaterializeMySQLSyncThread.cpp | 8 +++++---
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/Core/MySQL/MySQLGtid.cpp b/src/Core/MySQL/MySQLGtid.cpp
index aac3e01369a..13dc6e0fd69 100644
--- a/src/Core/MySQL/MySQLGtid.cpp
+++ b/src/Core/MySQL/MySQLGtid.cpp
@@ -85,8 +85,8 @@ void GTIDSets::update(const GTID & other)
                         ErrorCodes::LOGICAL_ERROR);
                 }
 
-                /// Try to shirnk Sequence interval.
-                GTIDSet::tryShirnk(set, i, current);
+                /// Try to shrink Sequence interval.
+                GTIDSet::tryShrink(set, i, current);
 
                 /// Sequence, extend the interval.
                 if (other.seq_no == current.end)
@@ -119,7 +119,7 @@ void GTIDSets::update(const GTID & other)
     sets.emplace_back(set);
 }
 
-void GTIDSet::tryShirnk(GTIDSet & set, unsigned int i, GTIDSet::Interval & current)
+void GTIDSet::tryShrink(GTIDSet & set, unsigned int i, GTIDSet::Interval & current)
 {
     if (i != set.intervals.size() -1)
     {
diff --git a/src/Core/MySQL/MySQLGtid.h b/src/Core/MySQL/MySQLGtid.h
index 27aabdafc11..c8a571d2569 100644
--- a/src/Core/MySQL/MySQLGtid.h
+++ b/src/Core/MySQL/MySQLGtid.h
@@ -27,7 +27,7 @@ public:
 
     void tryMerge(size_t i);
 
-    static void tryShirnk(GTIDSet & set, unsigned int i, Interval & current);
+    static void tryShrink(GTIDSet & set, unsigned int i, Interval & current);
 };
 
 class GTIDSets
diff --git a/src/Core/tests/mysql_protocol.cpp b/src/Core/tests/mysql_protocol.cpp
index 98555ddcfe0..1b81d856c9a 100644
--- a/src/Core/tests/mysql_protocol.cpp
+++ b/src/Core/tests/mysql_protocol.cpp
@@ -262,12 +262,12 @@ int main(int argc, char ** argv)
              "20662d71-9d91-11ea-bbc2-0242ac110003:9",
              "10662d71-9d91-11ea-bbc2-0242ac110003:6-7,20662d71-9d91-11ea-bbc2-0242ac110003:9"},
 
-            {"shirnk-sequence",
+            {"shrink-sequence",
               "10662d71-9d91-11ea-bbc2-0242ac110003:1-3:4-5:7",
              "10662d71-9d91-11ea-bbc2-0242ac110003:6",
              "10662d71-9d91-11ea-bbc2-0242ac110003:1-7"},
 
-            {"shirnk-sequence",
+            {"shrink-sequence",
              "10662d71-9d91-11ea-bbc2-0242ac110003:1-3:4-5:10",
              "10662d71-9d91-11ea-bbc2-0242ac110003:8",
              "10662d71-9d91-11ea-bbc2-0242ac110003:1-5:8:10"
diff --git a/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp b/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp
index 1da033fa4b3..9f4de9ea35a 100644
--- a/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp
+++ b/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp
@@ -95,18 +95,20 @@ static void checkMySQLVariables(const mysqlxx::Pool::Entry & connection)
          "(Variable_name = 'log_bin' AND upper(Value) = 'ON') "
          "OR (Variable_name = 'binlog_format' AND upper(Value) = 'ROW') "
          "OR (Variable_name = 'binlog_row_image' AND upper(Value) = 'FULL') "
-         "OR (Variable_name = 'default_authentication_plugin' AND upper(Value) = 'MYSQL_NATIVE_PASSWORD');";
+         "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);
 
     Block variables_block = variables_input.read();
-    if (!variables_block || variables_block.rows() != 4)
+    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'"}
+            {"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;
 

From e482c5ea1584e7cfaca1161d064fd5c574cd47f5 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sun, 17 Jan 2021 15:40:14 +0300
Subject: [PATCH 093/611] Fix TSan

---
 src/Common/MemoryTracker.cpp | 15 +++++++++------
 src/Common/MemoryTracker.h   |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/Common/MemoryTracker.cpp b/src/Common/MemoryTracker.cpp
index d9bbf8ffa96..d037142fbfb 100644
--- a/src/Common/MemoryTracker.cpp
+++ b/src/Common/MemoryTracker.cpp
@@ -145,8 +145,9 @@ void MemoryTracker::alloc(Int64 size)
       */
     Int64 will_be = size + amount.fetch_add(size, std::memory_order_relaxed);
 
-    if (metric != CurrentMetrics::end())
-        CurrentMetrics::add(metric, size);
+    auto metric_loaded = metric.load(std::memory_order_relaxed);
+    if (metric_loaded != CurrentMetrics::end())
+        CurrentMetrics::add(metric_loaded, size);
 
     Int64 current_hard_limit = hard_limit.load(std::memory_order_relaxed);
     Int64 current_profiler_limit = profiler_limit.load(std::memory_order_relaxed);
@@ -286,8 +287,9 @@ void MemoryTracker::free(Int64 size)
     if (auto * loaded_next = parent.load(std::memory_order_relaxed))
         loaded_next->free(size);
 
-    if (metric != CurrentMetrics::end())
-        CurrentMetrics::sub(metric, accounted_size);
+    auto metric_loaded = metric.load(std::memory_order_relaxed);
+    if (metric_loaded != CurrentMetrics::end())
+        CurrentMetrics::sub(metric_loaded, accounted_size);
 }
 
 
@@ -302,8 +304,9 @@ void MemoryTracker::resetCounters()
 
 void MemoryTracker::reset()
 {
-    if (metric != CurrentMetrics::end())
-        CurrentMetrics::sub(metric, amount.load(std::memory_order_relaxed));
+    auto metric_loaded = metric.load(std::memory_order_relaxed);
+    if (metric_loaded != CurrentMetrics::end())
+        CurrentMetrics::sub(metric_loaded, amount.load(std::memory_order_relaxed));
 
     resetCounters();
 }
diff --git a/src/Common/MemoryTracker.h b/src/Common/MemoryTracker.h
index 641ebe238c9..9475b555975 100644
--- a/src/Common/MemoryTracker.h
+++ b/src/Common/MemoryTracker.h
@@ -53,7 +53,7 @@ private:
     std::atomic<MemoryTracker *> parent {};
 
     /// You could specify custom metric to track memory usage.
-    CurrentMetrics::Metric metric = CurrentMetrics::end();
+    std::atomic<CurrentMetrics::Metric> metric = CurrentMetrics::end();
 
     /// This description will be used as prefix into log messages (if isn't nullptr)
     std::atomic<const char *> description_ptr = nullptr;
@@ -134,7 +134,7 @@ public:
     /// The memory consumption could be shown in realtime via CurrentMetrics counter
     void setMetric(CurrentMetrics::Metric metric_)
     {
-        metric = metric_;
+        metric.store(metric_, std::memory_order_relaxed);
     }
 
     void setDescription(const char * description)

From 921c39443d42ba0000ba43e1af9667e85a548111 Mon Sep 17 00:00:00 2001
From: Anna <annaconda@bk.ru>
Date: Sun, 17 Jan 2021 16:24:58 +0300
Subject: [PATCH 094/611] add examples

---
 docs/en/sql-reference/statements/show.md | 59 +++++++++++++++++++++++-
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/docs/en/sql-reference/statements/show.md b/docs/en/sql-reference/statements/show.md
index 4d18018e4d1..0e390c3822c 100644
--- a/docs/en/sql-reference/statements/show.md
+++ b/docs/en/sql-reference/statements/show.md
@@ -352,6 +352,9 @@ SHOW [CURRENT] QUOTA
 
 Returns a list of clusters. All available clusters are listed in the [system.clusters](../../operations/system-tables/clusters.md) table.
 
+!!! info "Note"
+    `SHOW CLUSTER name` query displays the contents of system.clusters table for this cluster.
+
 ### Syntax {#show-cluster-syntax}
 
 ``` sql
@@ -359,10 +362,62 @@ SHOW (CLUSTER '<name>') | (CLUSTERS [LIKE|NOT LIKE '<pattern>'] [LIMIT <N>]);
 ```
 ### Examples 
 
+Query:
+
 ``` sql
 SHOW CLUSTERS;
-SHOW CLUSTERS LIKE 'xxx';
-SHOW CLUSTER 'xxx';
+```
+
+Result:
+
+```text
+┌─cluster──────────────────────────────────────┐
+│ test_cluster_two_shards                      │
+│ test_cluster_two_shards_internal_replication │
+│ test_cluster_two_shards_localhost            │
+│ test_shard_localhost                         │
+│ test_shard_localhost_secure                  │
+│ test_unavailable_shard                       │
+└──────────────────────────────────────────────┘
+```
+
+Query:
+
+``` sql
+SHOW CLUSTERS LIKE 'test%' LIMIT 1;
+```
+
+Result:
+
+```text
+┌─cluster─────────────────┐
+│ test_cluster_two_shards │
+└─────────────────────────┘
+```
+
+Query:
+
+``` sql
+SHOW CLUSTER 'test_shard_localhost' FORMAT Vertical;
+```
+
+Result:
+
+```text
+Row 1:
+──────
+cluster:                 test_shard_localhost
+shard_num:               1
+shard_weight:            1
+replica_num:             1
+host_name:               localhost
+host_address:            127.0.0.1
+port:                    9000
+is_local:                1
+user:                    default
+default_database:
+errors_count:            0
+estimated_recovery_time: 0
 ```
 
 [Original article](https://clickhouse.tech/docs/en/query_language/show/) <!--hide-->

From 936020b381ceca5eacc62cf71b4a6c0de7842aa4 Mon Sep 17 00:00:00 2001
From: Dmitriy <sevirov@yandex-team.ru>
Date: Sun, 17 Jan 2021 16:25:20 +0300
Subject: [PATCH 095/611] Update the description of FINAL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Задокументировал настройку max_final_threads и обновил описание запросов с FINAL.
---
 docs/en/operations/settings/settings.md         | 15 +++++++++++----
 docs/en/sql-reference/statements/select/from.md |  2 ++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index d3a4d50d21c..b6c57a0a40f 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -2474,7 +2474,6 @@ Possible values:
 
 Default value: `0`.
 
-
 ## aggregate_functions_null_for_empty {#aggregate_functions_null_for_empty}
 
 Enables or disables rewriting all aggregate functions in a query, adding [-OrNull](../../sql-reference/aggregate-functions/combinators.md#agg-functions-combinator-ornull) suffix to them. Enable it for SQL standard compatibility.
@@ -2512,7 +2511,6 @@ With `aggregate_functions_null_for_empty = 1` the result would be:
 └───────────────┴──────────────┘
 ```
 
-
 ## union_default_mode {#union-default-mode}
 
 Sets a mode for combining `SELECT` query results. The setting is only used when shared with [UNION](../../sql-reference/statements/select/union.md) without explicitly specifying the `UNION ALL` or `UNION DISTINCT`.
@@ -2527,7 +2525,6 @@ Default value: `''`.
 
 See examples in [UNION](../../sql-reference/statements/select/union.md).
 
-
 ## data_type_default_nullable {#data_type_default_nullable}
 
 Allows data types without explicit modifiers [NULL or NOT NULL](../../sql-reference/statements/create/table.md#null-modifiers) in column definition will be [Nullable](../../sql-reference/data-types/nullable.md#data_type-nullable).
@@ -2539,7 +2536,6 @@ Possible values:
 
 Default value: `0`.
 
-
 ## execute_merges_on_single_replica_time_threshold {#execute-merges-on-single-replica-time-threshold}
 
 Enables special logic to perform merges on replicas.
@@ -2559,4 +2555,15 @@ High values for that threshold may lead to replication delays.
 
 It can be useful when merges are CPU bounded not IO bounded (performing heavy data compression, calculating aggregate functions or default expressions that require a large amount of calculations, or just very high number of tiny merges).
 
+## max_final_threads {#max-final-threads}
+
+Sets maximum number of threads to read from table with [FINAL](../../sql-reference\statements\select.md#select-from-final) modifier.
+
+Possible values:
+
+-   Positive integer.
+-   0 or 1 — Disabled. Executed in a single thread.
+
+Default value: `16`.
+
 [Original article](https://clickhouse.tech/docs/en/operations/settings/settings/) <!-- hide -->
diff --git a/docs/en/sql-reference/statements/select/from.md b/docs/en/sql-reference/statements/select/from.md
index 71586e15a31..b2a330a45bf 100644
--- a/docs/en/sql-reference/statements/select/from.md
+++ b/docs/en/sql-reference/statements/select/from.md
@@ -25,6 +25,8 @@ It is applicable when selecting data from tables that use the [MergeTree](../../
 -   [Replicated](../../../engines/table-engines/mergetree-family/replication.md) versions of `MergeTree` engines.
 -   [View](../../../engines/table-engines/special/view.md), [Buffer](../../../engines/table-engines/special/buffer.md), [Distributed](../../../engines/table-engines/special/distributed.md), and [MaterializedView](../../../engines/table-engines/special/materializedview.md) engines that operate over other engines, provided they were created over `MergeTree`-engine tables.
 
+`SELECT` queries with `FINAL` are executed in parallel. The [max_final_threads](../../../operations/settings/settings.md#max-final-threads) setting limits the number of threads used.
+
 ### Drawbacks {#drawbacks}
 
 Queries that use `FINAL` are executed slightly slower than similar queries that don’t, because:

From ed3c0f0dd4d214b08f06e7f664bf8ea27a74495b Mon Sep 17 00:00:00 2001
From: Dmitriy <sevirov@yandex-team.ru>
Date: Sun, 17 Jan 2021 17:35:52 +0300
Subject: [PATCH 096/611] Update settings.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Исправил ссылку.
---
 docs/en/operations/settings/settings.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index b6c57a0a40f..c8a72460eda 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -2557,7 +2557,7 @@ It can be useful when merges are CPU bounded not IO bounded (performing heavy da
 
 ## max_final_threads {#max-final-threads}
 
-Sets maximum number of threads to read from table with [FINAL](../../sql-reference\statements\select.md#select-from-final) modifier.
+Sets maximum number of threads to read from table with [FINAL](../../sql-reference\statements\select\from.md#select-from-final) modifier.
 
 Possible values:
 

From 32ffa99461656b92ae9adf1b536e5e814d1582f6 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sun, 17 Jan 2021 18:36:13 +0300
Subject: [PATCH 097/611] Disable curl for mariadb-connector-c (it is not
 required)

---
 contrib/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 20818767b99..6593eb9812f 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -120,7 +120,6 @@ if (USE_INTERNAL_LDAP_LIBRARY)
 endif ()
 
 # Should go before:
-# - mariadb-connector-c
 # - aws-s3-cmake
 # - sentry-native
 add_subdirectory (curl-cmake)
@@ -142,6 +141,7 @@ function(mysql_support)
         set(ZLIB_LIBRARY ${ZLIB_LIBRARIES})
         set(WITH_EXTERNAL_ZLIB ON)
     endif()
+    set(WITH_CURL OFF)
     add_subdirectory (mariadb-connector-c)
 endfunction()
 if (ENABLE_MYSQL AND USE_INTERNAL_MYSQL_LIBRARY)

From d61a6379fc59db7ae130a15f466b9ed9c6c91d91 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sun, 17 Jan 2021 18:38:29 +0300
Subject: [PATCH 098/611] Update comment for curl dependency for aws

It is not true since #13628
---
 contrib/CMakeLists.txt | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 6593eb9812f..20b4fad0437 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -119,11 +119,6 @@ if (USE_INTERNAL_LDAP_LIBRARY)
     add_subdirectory (openldap-cmake)
 endif ()
 
-# Should go before:
-# - aws-s3-cmake
-# - sentry-native
-add_subdirectory (curl-cmake)
-
 function(mysql_support)
     set(CLIENT_PLUGIN_CACHING_SHA2_PASSWORD STATIC)
     set(CLIENT_PLUGIN_SHA256_PASSWORD STATIC)
@@ -288,6 +283,10 @@ if (USE_CASSANDRA)
     add_subdirectory (cassandra)
 endif()
 
+# Should go before:
+# - sentry-native
+add_subdirectory (curl-cmake)
+
 if (USE_SENTRY)
     add_subdirectory (sentry-native)
 endif()

From 17b2ca2374a0b810069ee57c9e27c2b6f79f603b Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Sun, 17 Jan 2021 20:05:46 +0300
Subject: [PATCH 099/611] Fixes

---
 docs/en/sql-reference/statements/select/index.md | 6 ++----
 docs/ru/sql-reference/statements/select/index.md | 4 +---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/docs/en/sql-reference/statements/select/index.md b/docs/en/sql-reference/statements/select/index.md
index 9c8ac01db35..7c13772ffdf 100644
--- a/docs/en/sql-reference/statements/select/index.md
+++ b/docs/en/sql-reference/statements/select/index.md
@@ -270,14 +270,12 @@ SELECT * REPLACE(i + 1 AS i) EXCEPT (j) APPLY(sum) from columns_transformers;
 
 You can specify the necessary settings right in the `SELECT` query. The setting value is applied only to this query and is reset to default or previous value after the query is executed. 
 
-To specify several settings, use several `SETTINGS` clauses. 
-
-Other ways to make settings, see [here](../../../operations/settings/index.md). 
+Other ways to make settings see [here](../../../operations/settings/index.md). 
 
 **Example**
 
 ``` sql
-SELECT * FROM some_table SETTINGS optimize_read_in_order=1 SETTINGS cast_keep_nullable=1;
+SELECT * FROM some_table SETTINGS optimize_read_in_order=1, cast_keep_nullable=1;
 ```
 
 [Original article](https://clickhouse.tech/docs/en/sql-reference/statements/select/)
diff --git a/docs/ru/sql-reference/statements/select/index.md b/docs/ru/sql-reference/statements/select/index.md
index d0a0c25cd96..c37e82ae0be 100644
--- a/docs/ru/sql-reference/statements/select/index.md
+++ b/docs/ru/sql-reference/statements/select/index.md
@@ -166,14 +166,12 @@ Code: 42. DB::Exception: Received from localhost:9000. DB::Exception: Number of
 
 Вы можете задать значения необходимых настроек непосредственно в запросе `SELECT` в секции `SETTINGS`. Эти настройки действуют только в рамках данного запроса, а после его выполнения сбрасываются до предыдущего значения или значения по умолчанию. 
 
-Чтобы задать значения нескольких настроек, используйте несколько отдельных секций `SETTINGS`. 
-
 Другие способы задания настроек описаны [здесь](../../../operations/settings/index.md). 
 
 **Пример**
 
 ``` sql
-SELECT * FROM some_table SETTINGS optimize_read_in_order=1 SETTINGS cast_keep_nullable=1;
+SELECT * FROM some_table SETTINGS optimize_read_in_order=1, cast_keep_nullable=1;
 ```
 
 [Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/select/)

From 73549d72856eb03abfad754ea39598465bb6fddd Mon Sep 17 00:00:00 2001
From: Dmitriy <sevirov@yandex-team.ru>
Date: Sun, 17 Jan 2021 20:37:41 +0300
Subject: [PATCH 100/611] Update settings.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Поправил ссылку.
---
 docs/en/operations/settings/settings.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index c8a72460eda..01038d9bad5 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -2557,7 +2557,7 @@ It can be useful when merges are CPU bounded not IO bounded (performing heavy da
 
 ## max_final_threads {#max-final-threads}
 
-Sets maximum number of threads to read from table with [FINAL](../../sql-reference\statements\select\from.md#select-from-final) modifier.
+Sets maximum number of threads to read from table with [FINAL](../../sql-reference/statements/select/from.md#select-from-final) modifier.
 
 Possible values:
 

From c1b8ab1e5a583cc0448a51277124930f7611f421 Mon Sep 17 00:00:00 2001
From: Dmitriy <sevirov@yandex-team.ru>
Date: Sun, 17 Jan 2021 21:13:27 +0300
Subject: [PATCH 101/611] Edit and translate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Поправил английский вариант и перевел на русский язык.
---
 docs/en/interfaces/formats.md                 |  7 ++---
 .../operations/utilities/clickhouse-copier.md |  4 +--
 docs/ru/interfaces/formats.md                 | 28 +++++++++++++++++++
 .../operations/utilities/clickhouse-copier.md | 10 +++++++
 4 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/docs/en/interfaces/formats.md b/docs/en/interfaces/formats.md
index da8224e00d8..d84e68f427c 100644
--- a/docs/en/interfaces/formats.md
+++ b/docs/en/interfaces/formats.md
@@ -515,9 +515,9 @@ Example:
 
 ## JSONAsString {#jsonasstring}
 
-In this format, a single JSON object is interpreted as a single value. If input has several JSON objects (comma separated) they will be interpreted as a sepatate rows.
+In this format, a single JSON object is interpreted as a single value. If the input has several JSON objects (comma separated) they will be interpreted as separate rows.
 
-This format can only be parsed for table with a single field of type [String](../sql-reference/data-types/string.md). The remaining columns must be set to  [DEFAULT](../sql-reference/statements/create/table.md#default) or [MATERIALIZED](../sql-reference/statements/create/table.md#materialized), or omitted. Once you collect whole JSON object to string you can use [JSON functions](../sql-reference/functions/json-functions.md) to process it.
+This format can only be parsed for table with a single field of type [String](../sql-reference/data-types/string.md). The remaining columns must be set to [DEFAULT](../sql-reference/statements/create/table.md#default) or [MATERIALIZED](../sql-reference/statements/create/table.md#materialized), or omitted. Once you collect whole JSON object to string you can use [JSON functions](../sql-reference/functions/json-functions.md) to process it.
 
 **Example**
 
@@ -526,7 +526,7 @@ Query:
 ``` sql
 DROP TABLE IF EXISTS json_as_string;
 CREATE TABLE json_as_string (json String) ENGINE = Memory;
-INSERT INTO json_as_string FORMAT JSONAsString {"foo":{"bar":{"x":"y"},"baz":1}},{},{"any json stucture":1}
+INSERT INTO json_as_string FORMAT JSONAsString {"foo":{"bar":{"x":"y"},"baz":1}},{},{"any json stucture":1};
 SELECT * FROM json_as_string;
 ```
 
@@ -540,7 +540,6 @@ Result:
 └───────────────────────────────────┘
 ```
 
-
 ## JSONCompact {#jsoncompact}
 ## JSONCompactString {#jsoncompactstring}
 
diff --git a/docs/en/operations/utilities/clickhouse-copier.md b/docs/en/operations/utilities/clickhouse-copier.md
index 4137bd6f334..056b06271ef 100644
--- a/docs/en/operations/utilities/clickhouse-copier.md
+++ b/docs/en/operations/utilities/clickhouse-copier.md
@@ -71,8 +71,8 @@ Parameters:
     <remote_servers>
         <source_cluster>
             <!--
-                source cluster & destination clusters accepts exactly the same
-                parameters as parameters for usual Distributed table
+                source cluster & destination clusters accept exactly the same
+                parameters as parameters for the usual Distributed table
                 see https://clickhouse.tech/docs/en/engines/table-engines/special/distributed/
             --> 
             <shard>
diff --git a/docs/ru/interfaces/formats.md b/docs/ru/interfaces/formats.md
index ea8df043357..9dec8a9c36c 100644
--- a/docs/ru/interfaces/formats.md
+++ b/docs/ru/interfaces/formats.md
@@ -24,6 +24,7 @@ ClickHouse может принимать (`INSERT`) и отдавать (`SELECT
 | [Vertical](#vertical)                                                                   | ✗     | ✔      |
 | [VerticalRaw](#verticalraw)                                                             | ✗     | ✔      |
 | [JSON](#json)                                                                           | ✗     | ✔      |
+| [JSONAsString](#jsonasstring)                                                           | ✔     | ✗      |
 | [JSONString](#jsonstring)                                                               | ✗     | ✔      |
 | [JSONCompact](#jsoncompact)                                                             | ✗     | ✔      |
 | [JSONCompactString](#jsoncompactstring)                                                 | ✗     | ✔      |
@@ -490,6 +491,33 @@ ClickHouse поддерживает [NULL](../sql-reference/syntax.md), кото
 }
 ```
 
+## JSONAsString {#jsonasstring}
+
+В этом формате один объект JSON интерпретируется как одно значение. Если входные данные имеют несколько объектов JSON, разделенных запятой, то они будут интерпретироваться как отдельные строки.
+
+В этом формате парситься может только таблица с единственным полем типа [String](../sql-reference/data-types/string.md). Остальные столбцы должны быть заданы как [DEFAULT](../sql-reference/statements/create/table.md#default) или [MATERIALIZED](../sql-reference/statements/create/table.md#materialized), либо отсутствовать. Как только вы соберете весь объект JSON в строку, для его обработки вы можете использовать [функции для работы с JSON](../sql-reference/functions/json-functions.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+DROP TABLE IF EXISTS json_as_string;
+CREATE TABLE json_as_string (json String) ENGINE = Memory;
+INSERT INTO json_as_string FORMAT JSONAsString {"foo":{"bar":{"x":"y"},"baz":1}},{},{"any json stucture":1};
+SELECT * FROM json_as_string;
+```
+
+Результат:
+
+``` text
+┌─json──────────────────────────────┐
+│ {"foo":{"bar":{"x":"y"},"baz":1}} │
+│ {}                                │
+│ {"any json stucture":1}           │
+└───────────────────────────────────┘
+```
+
 ## JSONCompact {#jsoncompact}
 ## JSONCompactString {#jsoncompactstring}
 
diff --git a/docs/ru/operations/utilities/clickhouse-copier.md b/docs/ru/operations/utilities/clickhouse-copier.md
index 64e3c1eee12..243ad7f379b 100644
--- a/docs/ru/operations/utilities/clickhouse-copier.md
+++ b/docs/ru/operations/utilities/clickhouse-copier.md
@@ -67,11 +67,21 @@ $ clickhouse-copier --daemon --config zookeeper.xml --task-path /task/path --bas
     <!-- Configuration of clusters as in an ordinary server config -->
     <remote_servers>
         <source_cluster>
+		    <!--
+                source cluster & destination clusters accept exactly the same
+                parameters as parameters for the usual Distributed table
+                see https://clickhouse.tech/docs/ru/engines/table-engines/special/distributed/
+            --> 	
             <shard>
                 <internal_replication>false</internal_replication>
                     <replica>
                         <host>127.0.0.1</host>
                         <port>9000</port>
+						<!--
+                        <user>default</user>
+                        <password>default</password>
+                        <secure>1</secure>
+                        -->
                     </replica>
             </shard>
             ...

From 98a8a20b7066852ff559bd9eb660cc0d03abbe5e Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sun, 17 Jan 2021 21:30:02 +0300
Subject: [PATCH 102/611] Fix MSan error in rocksdb #19213

---
 base/glibc-compatibility/musl/sched_getcpu.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/base/glibc-compatibility/musl/sched_getcpu.c b/base/glibc-compatibility/musl/sched_getcpu.c
index 4ec5eaf6796..57b8b416043 100644
--- a/base/glibc-compatibility/musl/sched_getcpu.c
+++ b/base/glibc-compatibility/musl/sched_getcpu.c
@@ -4,6 +4,12 @@
 #include "syscall.h"
 #include "atomic.h"
 
+#if defined(__has_feature)
+#if __has_feature(memory_sanitizer)
+#include <sanitizer/msan_interface.h>
+#endif
+#endif
+
 #ifdef VDSO_GETCPU_SYM
 
 static void *volatile vdso_func;
@@ -37,6 +43,13 @@ int sched_getcpu(void)
 #endif
 
 	r = __syscall(SYS_getcpu, &cpu, 0, 0);
-	if (!r) return cpu;
+	if (!r) {
+#if defined(__has_feature)
+#if __has_feature(memory_sanitizer)
+        __msan_unpoison(&cpu, sizeof(cpu));
+#endif
+#endif
+        return cpu;
+    }
 	return __syscall_ret(r);
 }

From ce6dc40888de09919013809c34af3c59c05e87a5 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sun, 17 Jan 2021 21:35:53 +0300
Subject: [PATCH 103/611] Fix MSan report in Kerberos library

---
 contrib/krb5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/krb5 b/contrib/krb5
index 90ff6f4f8c6..5149dea4e2b 160000
--- a/contrib/krb5
+++ b/contrib/krb5
@@ -1 +1 @@
-Subproject commit 90ff6f4f8c695d6bf1aaba78a9b8942be92141c2
+Subproject commit 5149dea4e2be0f67707383d2682b897c14631374

From c5ac0762e4a483601e78f6a14b95649e4bd4ce7e Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sun, 17 Jan 2021 21:59:31 +0300
Subject: [PATCH 104/611] Speed up aggregate function sum

---
 src/AggregateFunctions/AggregateFunctionSum.h | 69 +++++++++++--------
 1 file changed, 41 insertions(+), 28 deletions(-)

diff --git a/src/AggregateFunctions/AggregateFunctionSum.h b/src/AggregateFunctions/AggregateFunctionSum.h
index ecc47eecab4..1038c8107a5 100644
--- a/src/AggregateFunctions/AggregateFunctionSum.h
+++ b/src/AggregateFunctions/AggregateFunctionSum.h
@@ -29,61 +29,74 @@ struct AggregateFunctionSumData
     template <typename Value>
     void NO_INLINE addMany(const Value * __restrict ptr, size_t count)
     {
-        /// Compiler cannot unroll this loop, do it manually.
-        /// (at least for floats, most likely due to the lack of -fassociative-math)
-
-        /// Something around the number of SSE registers * the number of elements fit in register.
-        constexpr size_t unroll_count = 128 / sizeof(T);
-        T partial_sums[unroll_count]{};
-
         const auto * end = ptr + count;
-        const auto * unrolled_end = ptr + (count / unroll_count * unroll_count);
 
-        while (ptr < unrolled_end)
+        if constexpr (std::is_floating_point_v<T>)
         {
+            /// Compiler cannot unroll this loop, do it manually.
+            /// (at least for floats, most likely due to the lack of -fassociative-math)
+
+            /// Something around the number of SSE registers * the number of elements fit in register.
+            constexpr size_t unroll_count = 128 / sizeof(T);
+            T partial_sums[unroll_count]{};
+
+            const auto * unrolled_end = ptr + (count / unroll_count * unroll_count);
+
+            while (ptr < unrolled_end)
+            {
+                for (size_t i = 0; i < unroll_count; ++i)
+                    partial_sums[i] += ptr[i];
+                ptr += unroll_count;
+            }
+
             for (size_t i = 0; i < unroll_count; ++i)
-                partial_sums[i] += ptr[i];
-            ptr += unroll_count;
+                sum += partial_sums[i];
         }
 
-        for (size_t i = 0; i < unroll_count; ++i)
-            sum += partial_sums[i];
-
+        /// clang cannot vectorize the loop if accumulator is class member instead of local variable.
+        T local_sum{};
         while (ptr < end)
         {
-            sum += *ptr;
+            local_sum += *ptr;
             ++ptr;
         }
+        sum += local_sum;
     }
 
     template <typename Value>
     void NO_INLINE addManyNotNull(const Value * __restrict ptr, const UInt8 * __restrict null_map, size_t count)
     {
-        constexpr size_t unroll_count = 128 / sizeof(T);
-        T partial_sums[unroll_count]{};
-
         const auto * end = ptr + count;
-        const auto * unrolled_end = ptr + (count / unroll_count * unroll_count);
 
-        while (ptr < unrolled_end)
+        if constexpr (std::is_floating_point_v<T>)
         {
+            constexpr size_t unroll_count = 128 / sizeof(T);
+            T partial_sums[unroll_count]{};
+
+            const auto * unrolled_end = ptr + (count / unroll_count * unroll_count);
+
+            while (ptr < unrolled_end)
+            {
+                for (size_t i = 0; i < unroll_count; ++i)
+                    if (!null_map[i])
+                        partial_sums[i] += ptr[i];
+                ptr += unroll_count;
+                null_map += unroll_count;
+            }
+
             for (size_t i = 0; i < unroll_count; ++i)
-                if (!null_map[i])
-                    partial_sums[i] += ptr[i];
-            ptr += unroll_count;
-            null_map += unroll_count;
+                sum += partial_sums[i];
         }
 
-        for (size_t i = 0; i < unroll_count; ++i)
-            sum += partial_sums[i];
-
+        T local_sum{};
         while (ptr < end)
         {
             if (!*null_map)
-                sum += *ptr;
+                local_sum += *ptr;
             ++ptr;
             ++null_map;
         }
+        sum += local_sum;
     }
 
     void merge(const AggregateFunctionSumData & rhs)

From c02f2d45ad5234c1a2815746cd958627dbd036eb Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sun, 17 Jan 2021 23:38:59 +0300
Subject: [PATCH 105/611] Update Dragonbox

---
 contrib/dragonbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/dragonbox b/contrib/dragonbox
index b2751c65c05..923705af6fd 160000
--- a/contrib/dragonbox
+++ b/contrib/dragonbox
@@ -1 +1 @@
-Subproject commit b2751c65c0592c0239aec3becd53d0ea2fde9329
+Subproject commit 923705af6fd953aa948fc175f6020b15f7359838

From d9fb9fdd2dc3522d3eaae0539c762a9cbcd2b02a Mon Sep 17 00:00:00 2001
From: Dmitriy <sevirov@yandex-team.ru>
Date: Sun, 17 Jan 2021 23:53:39 +0300
Subject: [PATCH 106/611] Update formats.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Правлю ссылки.
---
 docs/ru/interfaces/formats.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/interfaces/formats.md b/docs/ru/interfaces/formats.md
index 9dec8a9c36c..69a856a4e2d 100644
--- a/docs/ru/interfaces/formats.md
+++ b/docs/ru/interfaces/formats.md
@@ -495,7 +495,7 @@ ClickHouse поддерживает [NULL](../sql-reference/syntax.md), кото
 
 В этом формате один объект JSON интерпретируется как одно значение. Если входные данные имеют несколько объектов JSON, разделенных запятой, то они будут интерпретироваться как отдельные строки.
 
-В этом формате парситься может только таблица с единственным полем типа [String](../sql-reference/data-types/string.md). Остальные столбцы должны быть заданы как [DEFAULT](../sql-reference/statements/create/table.md#default) или [MATERIALIZED](../sql-reference/statements/create/table.md#materialized), либо отсутствовать. Как только вы соберете весь объект JSON в строку, для его обработки вы можете использовать [функции для работы с JSON](../sql-reference/functions/json-functions.md).
+В этом формате парситься может только таблица с единственным полем типа [String](../sql-reference/data-types/string.md). Остальные столбцы должны быть заданы как [DEFAULT](../sql-reference/statements/create/table.md#create-default-values) или [MATERIALIZED](../sql-reference/statements/create/table.md#create-default-values), либо отсутствовать. Как только вы соберете весь объект JSON в строку, для его обработки вы можете использовать [функции для работы с JSON](../sql-reference/functions/json-functions.md).
 
 **Пример**
 

From 2c96fc53f5ee41d35bc5371a085896ebf23b0bae Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sun, 17 Jan 2021 23:54:00 +0300
Subject: [PATCH 107/611] Make symbolizers available in fuzzer Docker image

---
 docker/test/fuzzer/Dockerfile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/docker/test/fuzzer/Dockerfile b/docker/test/fuzzer/Dockerfile
index 04d533eb601..57daba9cfd6 100644
--- a/docker/test/fuzzer/Dockerfile
+++ b/docker/test/fuzzer/Dockerfile
@@ -1,5 +1,5 @@
 # docker build -t yandex/clickhouse-fuzzer .
-FROM ubuntu:18.04
+FROM yandex/clickhouse-test-base
 
 ENV LANG=C.UTF-8
 ENV TZ=Europe/Moscow
@@ -7,11 +7,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
-            bash \
             ca-certificates \
-            curl \
-            gdb \
-            git \
             libc6-dbg \
             moreutils \
             ncdu \

From c595a3deaa4517016297a7906f65c3a5c168cf87 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sun, 17 Jan 2021 23:57:30 +0300
Subject: [PATCH 108/611] Update images.json

---
 docker/images.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/images.json b/docker/images.json
index 6ab2d287b74..303bd159ce4 100644
--- a/docker/images.json
+++ b/docker/images.json
@@ -137,7 +137,8 @@
             "docker/test/stateless",
             "docker/test/stateless_unbundled",
             "docker/test/stateless_pytest",
-            "docker/test/integration/base"
+            "docker/test/integration/base",
+            "docker/test/fuzzer"
          ]
     },
     "docker/packager/unbundled": {

From 30ad216b0f9d8982ea9b23906e1a134943b141f0 Mon Sep 17 00:00:00 2001
From: Dmitriy <sevirov@yandex-team.ru>
Date: Mon, 18 Jan 2021 00:00:54 +0300
Subject: [PATCH 109/611] Update formats.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Внес небольшие поправки.
---
 docs/en/interfaces/formats.md | 2 +-
 docs/ru/interfaces/formats.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/interfaces/formats.md b/docs/en/interfaces/formats.md
index d84e68f427c..11291d61300 100644
--- a/docs/en/interfaces/formats.md
+++ b/docs/en/interfaces/formats.md
@@ -526,7 +526,7 @@ Query:
 ``` sql
 DROP TABLE IF EXISTS json_as_string;
 CREATE TABLE json_as_string (json String) ENGINE = Memory;
-INSERT INTO json_as_string FORMAT JSONAsString {"foo":{"bar":{"x":"y"},"baz":1}},{},{"any json stucture":1};
+INSERT INTO json_as_string (json) FORMAT JSONAsString {"foo":{"bar":{"x":"y"},"baz":1}},{},{"any json stucture":1}
 SELECT * FROM json_as_string;
 ```
 
diff --git a/docs/ru/interfaces/formats.md b/docs/ru/interfaces/formats.md
index 69a856a4e2d..97b72f79c86 100644
--- a/docs/ru/interfaces/formats.md
+++ b/docs/ru/interfaces/formats.md
@@ -504,7 +504,7 @@ ClickHouse поддерживает [NULL](../sql-reference/syntax.md), кото
 ``` sql
 DROP TABLE IF EXISTS json_as_string;
 CREATE TABLE json_as_string (json String) ENGINE = Memory;
-INSERT INTO json_as_string FORMAT JSONAsString {"foo":{"bar":{"x":"y"},"baz":1}},{},{"any json stucture":1};
+INSERT INTO json_as_string (json) FORMAT JSONAsString {"foo":{"bar":{"x":"y"},"baz":1}},{},{"any json stucture":1}
 SELECT * FROM json_as_string;
 ```
 

From 158a09cfcafd6223b5b8b7671aea486026f43579 Mon Sep 17 00:00:00 2001
From: Denis Zhuravlev <denis.zhuravlev@revjet.com>
Date: Sun, 17 Jan 2021 20:08:17 -0400
Subject: [PATCH 110/611] en documentation merge-tree-settings

---
 .../settings/merge-tree-settings.md           | 189 ++++++++++++++++++
 1 file changed, 189 insertions(+)
 create mode 100644 docs/en/operations/settings/merge-tree-settings.md

diff --git a/docs/en/operations/settings/merge-tree-settings.md b/docs/en/operations/settings/merge-tree-settings.md
new file mode 100644
index 00000000000..e63a580fe91
--- /dev/null
+++ b/docs/en/operations/settings/merge-tree-settings.md
@@ -0,0 +1,189 @@
+# MergeTree tables settings {#merge-tree-settings}
+
+The values of `merge_tree` settings (for all MergeTree tables) can be viewed in the table `system.merge_tree_settings`, they can be overridden in `config.xml` in the `merge_tree` section, or set in the `SETTINGS` section of each table.
+
+Override example in `config.xml`:
+
+``` text
+<merge_tree>
+    <max_suspicious_broken_parts>5</max_suspicious_broken_parts>
+</merge_tree>
+```
+
+An example to set in `SETTINGS` for a particular table:
+
+``` sql
+CREATE TABLE foo
+(
+    `A` Int64
+)
+ENGINE = MergeTree
+ORDER BY tuple()
+SETTINGS max_suspicious_broken_parts = 500;
+```
+
+An example of changing the settings for a specific table with the `ALTER TABLE ... MODIFY SETTING` command:
+
+``` sql
+ALTER TABLE foo
+    MODIFY SETTING max_suspicious_broken_parts = 100;
+```
+
+## parts_to_throw_insert {#parts-to-throw-insert}
+
+If the number of active parts in a single partition exceeds the `parts_to_throw_insert` value, `INSERT` is interrupted with the `Too many parts (N). Merges are processing significantly slower than inserts` exception.
+
+Possible values:
+
+-   Positive integer.
+
+Default value: 300.
+
+To achieve maximum performance of `SELECT` queries, it is necessary to minimize the number of parts processed, see [Merge Tree](../../development/architecture.md#merge-tree).
+
+You can set a larger value to 600 (1200), this will reduce the probability of the `Too many parts` error, but at the same time `SELECT` performance might degrade. Also in case of a merge issue (for example, due to insufficient disk space) you will notice it later than it could be with the original 300.
+
+
+## parts_to_delay_insert {#parts-to-delay-insert}
+
+If the number of active parts in a single partition exceeds the `parts_to_delay_insert` value, an `INSERT` artificially slows down.
+
+Possible values:
+
+-   Positive integer.
+
+Default value: 150.
+
+ClickHouse artificially executes `INSERT` longer (adds ‘sleep’) so that the background merge process can merge parts faster than they are added.
+
+## 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.
+
+Possible values:
+
+-   Positive integer.
+
+Default value: 1.
+
+The delay (in milliseconds) for `INSERT` is calculated by the formula:
+
+```code
+max_k = parts_to_throw_insert - parts_to_delay_insert
+k = 1 + parts_count_in_partition - parts_to_delay_insert
+delay_milliseconds = pow(max_delay_to_insert * 1000, k / max_k)
+```
+
+For example if a partition has 299 active parts and parts_to_throw_insert = 300, parts_to_delay_insert = 150, max_delay_to_insert = 1, `INSERT` is delayed for `pow( 1 * 1000, (1 + 299 - 150) / (300 - 150) ) = 1000` milliseconds.
+
+## max_parts_in_total {#max-parts-in-total}
+
+If the total number of active parts in all partitions of a table exceeds the `max_parts_in_total` value `INSERT` is interrupted with the `Too many parts (N)` exception.
+
+Possible values:
+
+-   Positive integer.
+
+Default value: 100000.
+
+A large number of parts in a table reduces performance of ClickHouse queries and increases ClickHouse boot time. Most often this is a consequence of an incorrect design (mistakes when choosing a partitioning strategy - too small partitions).
+
+## replicated_deduplication_window {#replicated-deduplication-window}
+
+The number of most recently inserted blocks for which Zookeeper stores hashes to check for duplicates.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: 100.
+
+The `Insert` command creates one or more blocks (parts). When inserting into Replicated tables, ClickHouse for [insert deduplication](../../engines/table-engines/mergetree-family/replication/) writes the hash-sums of the created parts into Zookeeper. Hash sums are stored only for the most recent `replicated_deduplication_window` blocks. The oldest hash sums are removed from Zookeeper.
+A large number of `replicated_deduplication_window` slows down `Inserts` because it needs to compare more entries.
+The hash sum is calculated from the composition of the field names and types and the data of the inserted part (stream of bytes).
+
+## replicated_deduplication_window_seconds {#replicated-deduplication-window-seconds}
+
+The number of seconds after which the hash sums of the inserted blocks are removed from Zookeeper.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: 604800 (1 week).
+
+Similar to [replicated_deduplication_window](#replicated_deduplication_window), `replicated_deduplication_window_seconds` specifies how long to store hash-sums of blocks for insert deduplication. Hashes older than `replicated_deduplication_window_seconds` are removed from Zookeeper, even if they are less than ` replicated_deduplication_window`.
+
+## old_parts_lifetime {#old-parts-lifetime}
+
+The time (in seconds) of storing inactive parts to protect against data loss during spontaneous server reboots.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: 480.
+
+`fsync` is not called for new parts, so for some time new parts exist only in the server's RAM (OS cache). If the server is rebooted spontaneously, new parts can be lost or damaged.
+To protect data parts created by merges source parts are not deleted immediately. After merging several parts into a new part, ClickHouse marks the original parts as inactive and deletes them only after `old_parts_lifetime` seconds.
+Inactive parts are removed if they are not used by current queries, i.e. if the `refcount` of the part is zero.
+
+During startup ClickHouse checks the integrity of the parts.
+If the merged part is damaged ClickHouse returns the inactive parts to the active list, and later merges them again. Then the damaged part is renamed (the `broken_` prefix is added) and moved to the `detached` folder.
+If the merged part is not damaged, then the original inactive parts are renamed (the `ignored_` prefix is added) and moved to the `detached` folder.
+
+The default `dirty_expire_centisecs` value (a Linux kernel setting) is 30 seconds (the maximum time that written data is stored only in RAM), but under heavy loads on the disk system, data can be written much later. Experimentally, a value of 480 seconds was chosen for `old_parts_lifetime`, during which a new part is guaranteed to be written to disk.
+
+## max_bytes_to_merge_at_max_space_in_pool {#max-bytes-to-merge-at-max-space-in-pool}
+
+The maximum total parts size (in bytes) to be merged into one part, if there are enough resources available.
+`max_bytes_to_merge_at_max_space_in_pool` -- roughly corresponds to the maximum possible part size created by an automatic background merge.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: 161061273600 (150 GB).
+
+The merge scheduler periodically analyzes the sizes and number of parts in partitions, and if there is enough free resources in the pool, it starts background merges. Merges occur until the total size of the source parts is less than `max_bytes_to_merge_at_max_space_in_pool`.
+
+Merges initiated by `optimize final` ignore `max_bytes_to_merge_at_max_space_in_pool` and merge parts only taking into account available resources (free disk's space) until one part remains in the partition.
+
+## max_bytes_to_merge_at_min_space_in_pool {#max-bytes-to-merge-at-min-space-in-pool}
+
+The maximum total part size (in bytes) to be merged into one part, with the minimum available resources in the background pool.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: 1048576 (1 MB)
+
+`max_bytes_to_merge_at_min_space_in_pool` defines the maximum total size of parts which can be merged, despite the lack of available disk space. This is necessary to reduce the number of small parts and the chance of `Too many parts` errors.
+Merges book disk space by doubling the total source parts sizes in the merge. Thus, with a small amount of free disk space, a situation may happen that there is free space, but this space is already booked by ongoing merges, so other merges unable to start, and the number of small parts grows with every insert.
+
+## merge_max_block_size {#merge-max-block-size}
+
+The number of rows that are read from the merged parts into memory.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: 8192
+
+Merge reads rows from parts in blocks of `merge_max_block_size` rows, then merges and writes the result into a new part. The read block is placed in RAM, so `merge_max_block_size` affects the size of the RAM required for the merge. Thus, merges can consume a large amount of RAM for tables with very wide rows (if the average row size is 100kb, then when merging 10 parts, (100kb * 10 * 8192) = ~ 8GB of RAM). By decreasing `merge_max_block_size`, you can reduce the amount of RAM required for a merge.
+
+## max_part_loading_threads {#max-part-loading-threads}
+
+The maximum number of threads that read parts when ClickHouse starts.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: auto (number of CPU cores).
+
+During startup ClickHouse reads all parts of all tables (reads files with metadata of parts) to build a list of all parts in memory. In some systems with a large number of parts, this process can take a long time, and this time might be shortened by increasing `max_part_loading_threads` (if this process is not CPU and disk bound).
+
+[Original article](https://clickhouse.tech/docs/en/operations/settings/merge_tree_settings/) <!--hide-->

From 7671acf9e959298552d98838655398fde8daf2f1 Mon Sep 17 00:00:00 2001
From: Denny Crane <deniszhuravlov@gmail.com>
Date: Sun, 17 Jan 2021 20:30:54 -0400
Subject: [PATCH 111/611] Update merge-tree-settings.md

---
 docs/en/operations/settings/merge-tree-settings.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/en/operations/settings/merge-tree-settings.md b/docs/en/operations/settings/merge-tree-settings.md
index e63a580fe91..9e1f4bf3477 100644
--- a/docs/en/operations/settings/merge-tree-settings.md
+++ b/docs/en/operations/settings/merge-tree-settings.md
@@ -132,7 +132,7 @@ During startup ClickHouse checks the integrity of the parts.
 If the merged part is damaged ClickHouse returns the inactive parts to the active list, and later merges them again. Then the damaged part is renamed (the `broken_` prefix is added) and moved to the `detached` folder.
 If the merged part is not damaged, then the original inactive parts are renamed (the `ignored_` prefix is added) and moved to the `detached` folder.
 
-The default `dirty_expire_centisecs` value (a Linux kernel setting) is 30 seconds (the maximum time that written data is stored only in RAM), but under heavy loads on the disk system, data can be written much later. Experimentally, a value of 480 seconds was chosen for `old_parts_lifetime`, during which a new part is guaranteed to be written to disk.
+The default `dirty_expire_centisecs` value (a Linux kernel setting) is 30 seconds (the maximum time that written data is stored only in RAM), but under heavy loads on the disk system data can be written much later. Experimentally, a value of 480 seconds was chosen for `old_parts_lifetime`, during which a new part is guaranteed to be written to disk.
 
 ## max_bytes_to_merge_at_max_space_in_pool {#max-bytes-to-merge-at-max-space-in-pool}
 
@@ -159,8 +159,8 @@ Possible values:
 
 Default value: 1048576 (1 MB)
 
-`max_bytes_to_merge_at_min_space_in_pool` defines the maximum total size of parts which can be merged, despite the lack of available disk space. This is necessary to reduce the number of small parts and the chance of `Too many parts` errors.
-Merges book disk space by doubling the total source parts sizes in the merge. Thus, with a small amount of free disk space, a situation may happen that there is free space, but this space is already booked by ongoing merges, so other merges unable to start, and the number of small parts grows with every insert.
+`max_bytes_to_merge_at_min_space_in_pool` defines the maximum total size of parts which can be merged despite the lack of available disk space (in pool). This is necessary to reduce the number of small parts and the chance of `Too many parts` errors.
+Merges book disk space by doubling the total merged parts sizes. Thus, with a small amount of free disk space, a situation may happen that there is free space, but this space is already booked by ongoing merges, so other merges unable to start, and the number of small parts grows with every insert.
 
 ## merge_max_block_size {#merge-max-block-size}
 
@@ -184,6 +184,6 @@ Possible values:
 
 Default value: auto (number of CPU cores).
 
-During startup ClickHouse reads all parts of all tables (reads files with metadata of parts) to build a list of all parts in memory. In some systems with a large number of parts, this process can take a long time, and this time might be shortened by increasing `max_part_loading_threads` (if this process is not CPU and disk bound).
+During startup ClickHouse reads all parts of all tables (reads files with metadata of parts) to build a list of all parts in memory. In some systems with a large number of parts this process can take a long time, and this time might be shortened by increasing `max_part_loading_threads` (if this process is not CPU and disk I/O bound).
 
 [Original article](https://clickhouse.tech/docs/en/operations/settings/merge_tree_settings/) <!--hide-->

From 6a78b10e0b1ef3e341dfc7959ef24b7dede0dc1d Mon Sep 17 00:00:00 2001
From: hexiaoting <hewenting_ict@163.com>
Date: Mon, 18 Jan 2021 10:58:07 +0800
Subject: [PATCH 112/611] fix build error

---
 src/Functions/map.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Functions/map.cpp b/src/Functions/map.cpp
index f1c5a26ce7d..2561f06d9b8 100644
--- a/src/Functions/map.cpp
+++ b/src/Functions/map.cpp
@@ -139,15 +139,17 @@ public:
 };
 
 
+struct NameMapContains { static constexpr auto name = "mapContains"; };
+
 class FunctionMapContains : public IFunction
 {
 public:
-    static constexpr auto name = "mapContains";
+    static constexpr auto name = NameMapContains::name;
     static FunctionPtr create(const Context &) { return std::make_shared<FunctionMapContains>(); }
 
     String getName() const override
     {
-        return name;
+        return NameMapContains::name;
     }
 
     size_t getNumberOfArguments() const override { return 2; }

From c693b0294490a2c0b72b096f74e186ca50de4703 Mon Sep 17 00:00:00 2001
From: Denny Crane <deniszhuravlov@gmail.com>
Date: Sun, 17 Jan 2021 23:08:28 -0400
Subject: [PATCH 113/611] Update merge-tree-settings.md

---
 docs/en/operations/settings/merge-tree-settings.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/operations/settings/merge-tree-settings.md b/docs/en/operations/settings/merge-tree-settings.md
index 9e1f4bf3477..c5ec8f7f0dd 100644
--- a/docs/en/operations/settings/merge-tree-settings.md
+++ b/docs/en/operations/settings/merge-tree-settings.md
@@ -112,7 +112,7 @@ Possible values:
 
 Default value: 604800 (1 week).
 
-Similar to [replicated_deduplication_window](#replicated_deduplication_window), `replicated_deduplication_window_seconds` specifies how long to store hash-sums of blocks for insert deduplication. Hashes older than `replicated_deduplication_window_seconds` are removed from Zookeeper, even if they are less than ` replicated_deduplication_window`.
+Similar to [replicated_deduplication_window](#replicated-deduplication-window), `replicated_deduplication_window_seconds` specifies how long to store hash-sums of blocks for insert deduplication. Hashes older than `replicated_deduplication_window_seconds` are removed from Zookeeper, even if they are less than ` replicated_deduplication_window`.
 
 ## old_parts_lifetime {#old-parts-lifetime}
 

From e967b6bf49ff43aaaf6808b34234c2456bd24be5 Mon Sep 17 00:00:00 2001
From: jianmei zhang <zhangjmruc@sina.com>
Date: Mon, 18 Jan 2021 12:16:32 +0800
Subject: [PATCH 114/611] add a %Q replacement for formatDateTime

---
 .../sql-reference/functions/date-time-functions.md  |  3 ++-
 .../sql-reference/functions/date-time-functions.md  | 13 +++++++------
 src/Functions/formatDateTime.cpp                    | 11 +++++++++++
 ...quarter_modificator_for_formatDateTime.reference |  4 ++++
 ...01655_quarter_modificator_for_formatDateTime.sql |  4 ++++
 5 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 tests/queries/0_stateless/01655_quarter_modificator_for_formatDateTime.reference
 create mode 100644 tests/queries/0_stateless/01655_quarter_modificator_for_formatDateTime.sql

diff --git a/docs/en/sql-reference/functions/date-time-functions.md b/docs/en/sql-reference/functions/date-time-functions.md
index 628c321adee..9de780fb596 100644
--- a/docs/en/sql-reference/functions/date-time-functions.md
+++ b/docs/en/sql-reference/functions/date-time-functions.md
@@ -622,7 +622,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)                  |  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       |
@@ -633,6 +633,7 @@ Using replacement fields, you can define a pattern for the resulting string. “
 | %M       | minute (00-59)                                          | 33         |
 | %n       | new-line character (‘’)                                 |            |
 | %p       | AM or PM designation                                    | PM         |
+| %Q       | Quarter (1-4)                                           | 1          |
 | %R       | 24-hour HH:MM time, equivalent to %H:%M                 | 22:33      |
 | %S       | second (00-59)                                          | 44         |
 | %t       | horizontal-tab character (’)                            |            |
diff --git a/docs/zh/sql-reference/functions/date-time-functions.md b/docs/zh/sql-reference/functions/date-time-functions.md
index 00dab5ee680..df365ee9c1c 100644
--- a/docs/zh/sql-reference/functions/date-time-functions.md
+++ b/docs/zh/sql-reference/functions/date-time-functions.md
@@ -613,24 +613,25 @@ formatDateTime(Time, Format\[, Timezone\])
 | %C     | 年除以100并截断为整数(00-99)                                                                                                                                                                        | 20         |
 | %d     | 月中的一天，零填充（01-31)                                                                                                                                                                          | 02         |
 | %D     | 短MM/DD/YY日期，相当于%m/%d/%y                                                                                                                                                                      | 01/02/2018 |
-| %e     | 月中的一天，空格填充（1-31)                                                                                                                                                                         | 2          |
+| %e     | 月中的一天，空格填充（ 1-31)                                                                                                                                                                         |  2          |
 | %F     | 短YYYY-MM-DD日期，相当于%Y-%m-%d                                                                                                                                                                    | 2018-01-02 |
 | %G     | ISO周号的四位数年份格式， 从基于周的年份[由ISO 8601定义](https://en.wikipedia.org/wiki/ISO_8601#Week_dates) 标准计算得出，通常仅对％V有用 | 2018       |
 | %g     | 两位数的年份格式，与ISO 8601一致，四位数表示法的缩写                                                                                                                    | 18         |
 | %H     | 24小时格式（00-23)                                                                                                                                                                                  | 22         |
-| %I     | 小时12h格式（01-12)                                                                                                                                                                                 | 10         |
-| %j     | 一年(001-366)                                                                                                                                                                                       | 002        |
+| %I     | 12小时格式（01-12)                                                                                                                                                                                 | 10         |
+| %j     | 一年中的一天 (001-366)                                                                                                                                                                                       | 002        |
 | %m     | 月份为十进制数（01-12)                                                                                                                                                                              | 01         |
 | %M     | 分钟(00-59)                                                                                                                                                                                         | 33         |
 | %n     | 换行符(")                                                                                                                                                                                           |            |
 | %p     | AM或PM指定                                                                                                                                                                                          | PM         |
+| %Q     | 季度（1-4)                                                                                                                                                                          | 1          |
 | %R     | 24小时HH:MM时间，相当于%H:%M                                                                                                                                                                        | 22:33      |
-| %S     | 第二(00-59)                                                                                                                                                                                         | 44         |
+| %S     | 秒 (00-59)                                                                                                                                                                                         | 44         |
 | %t     | 水平制表符(’)                                                                                                                                                                                       |            |
 | %T     | ISO8601时间格式(HH:MM:SS)，相当于%H:%M:%S                                                                                                                                                           | 22:33:44   |
-| %u     | ISO8601平日as编号，星期一为1(1-7)                                                                                                                                                                   | 2          |
+| %u     | ISO8601工作日为数字，星期一为1(1-7)                                                                                                                                                                   | 2          |
 | %V     | ISO8601周编号(01-53)                                                                                                                                                                                | 01         |
-| %w     | 周日为十进制数，周日为0(0-6)                                                                                                                                                                        | 2          |
+| %w     | 工作日为十进制数，周日为0(0-6)                                                                                                                                                                        | 2          |
 | %y     | 年份，最后两位数字（00-99)                                                                                                                                                                          | 18         |
 | %Y     | 年                                                                                                                                                                                                  | 2018       |
 | %%     | %符号                                                                                                                                                                                               | %          |
diff --git a/src/Functions/formatDateTime.cpp b/src/Functions/formatDateTime.cpp
index 362390a2cbc..fd909ed6fce 100644
--- a/src/Functions/formatDateTime.cpp
+++ b/src/Functions/formatDateTime.cpp
@@ -272,6 +272,11 @@ private:
             writeNumber2(target + 3, ToMinuteImpl::execute(source, timezone));
             writeNumber2(target + 6, ToSecondImpl::execute(source, timezone));
         }
+
+        static void quarter(char * target, Time source, const DateLUTImpl & timezone)
+        {
+            *target += ToQuarterImpl::execute(source, timezone);
+        }
     };
 
 public:
@@ -621,6 +626,12 @@ public:
                         result.append("0000");
                         break;
 
+                    // Quarter (1-4)
+                    case 'Q':
+                        instructions.template emplace_back(&Action<T>::quarter, 1);
+                        result.append("0");
+                        break;
+
                     /// Time components. If the argument is Date, not a DateTime, then this components will have default value.
 
                     // Minute (00-59)
diff --git a/tests/queries/0_stateless/01655_quarter_modificator_for_formatDateTime.reference b/tests/queries/0_stateless/01655_quarter_modificator_for_formatDateTime.reference
new file mode 100644
index 00000000000..94ebaf90016
--- /dev/null
+++ b/tests/queries/0_stateless/01655_quarter_modificator_for_formatDateTime.reference
@@ -0,0 +1,4 @@
+1
+2
+3
+4
diff --git a/tests/queries/0_stateless/01655_quarter_modificator_for_formatDateTime.sql b/tests/queries/0_stateless/01655_quarter_modificator_for_formatDateTime.sql
new file mode 100644
index 00000000000..35a6f6e2ab7
--- /dev/null
+++ b/tests/queries/0_stateless/01655_quarter_modificator_for_formatDateTime.sql
@@ -0,0 +1,4 @@
+SELECT formatDateTime(toDate('2010-01-04'), '%Q');
+SELECT formatDateTime(toDate('2010-04-30'), '%Q');
+SELECT formatDateTime(toDate('2010-07-31'), '%Q');
+SELECT formatDateTime(toDate('2010-10-07'), '%Q');
\ No newline at end of file

From b90b38fd4ead358fdfa9da6d28b63013756abd3e Mon Sep 17 00:00:00 2001
From: jianmei zhang <zhangjmruc@sina.com>
Date: Mon, 18 Jan 2021 12:20:15 +0800
Subject: [PATCH 115/611] add a new line

---
 .../01655_quarter_modificator_for_formatDateTime.sql            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/queries/0_stateless/01655_quarter_modificator_for_formatDateTime.sql b/tests/queries/0_stateless/01655_quarter_modificator_for_formatDateTime.sql
index 35a6f6e2ab7..0d8a764082e 100644
--- a/tests/queries/0_stateless/01655_quarter_modificator_for_formatDateTime.sql
+++ b/tests/queries/0_stateless/01655_quarter_modificator_for_formatDateTime.sql
@@ -1,4 +1,4 @@
 SELECT formatDateTime(toDate('2010-01-04'), '%Q');
 SELECT formatDateTime(toDate('2010-04-30'), '%Q');
 SELECT formatDateTime(toDate('2010-07-31'), '%Q');
-SELECT formatDateTime(toDate('2010-10-07'), '%Q');
\ No newline at end of file
+SELECT formatDateTime(toDate('2010-10-07'), '%Q');

From f3e112766fe5c0dffad74190f222767194070b5e Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Mon, 18 Jan 2021 12:49:56 +0300
Subject: [PATCH 116/611] cleanup

---
 programs/client/Client.cpp                      | 17 +----------------
 ...0651_default_database_on_client_reconnect.sh |  2 +-
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 6fad0d2775c..5760150ab10 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -852,7 +852,7 @@ private:
 
     // Consumes trailing semicolons and tries to consume the same-line trailing
     // comment.
-    void adjustQueryEnd(const char *& this_query_end,
+    static void adjustQueryEnd(const char *& this_query_end,
         const char * all_queries_end, int max_parser_depth)
     {
         // We have to skip the trailing semicolon that might be left
@@ -1086,15 +1086,6 @@ private:
                 this_query_begin - all_queries_text.data(),
                 this_query_end - this_query_begin);
 
-//            fmt::print(stderr, "parsed query '{}', left '{}'\n",
-//                std::string_view(this_query_begin,
-//                    this_query_end - this_query_begin),
-//                std::string_view(this_query_end,
-//                    all_queries_end - this_query_end));
-//
-//            fmt::print(stderr, "query_to_send '{}', full_query '{}'\n",
-//                query_to_send, full_query);
-
             if (query_fuzzer_runs)
             {
                 if (!processWithFuzzing(full_query))
@@ -1235,12 +1226,6 @@ private:
                 }
             }
 
-//            fmt::print(stderr, "final query '{}', left '{}'\n",
-//                std::string_view(this_query_begin,
-//                    this_query_end - this_query_begin),
-//                std::string_view(this_query_end,
-//                    all_queries_end - this_query_end));
-
             this_query_begin = this_query_end;
         }
 
diff --git a/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh b/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh
index 23ce8bb9677..fdf6d717fb8 100755
--- a/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh
+++ b/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh
@@ -4,4 +4,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --ignore-error --multiquery --query "DROP TABLE IF EXISTS tab_00651; CREATE TABLE tab_00651 (val UInt64) engine = Memory; SHOW CREATE TABLE tab_00651 format abcd; DESC tab_00651; DROP TABLE tab_00651;" ||: 2> /dev/null
+${CLICKHOUSE_CLIENT} --ignore-error --multiquery --query "DROP TABLE IF EXISTS tab_00651; CREATE TABLE tab_00651 (val UInt64) engine = Memory; SHOW CREATE TABLE tab_00651 format abcd; DESC tab_00651; DROP TABLE tab_00651;" 2>/dev/null ||:

From 7ebe04aed0675626cbfb43bba6a6a4532a4bc4c7 Mon Sep 17 00:00:00 2001
From: Ivan Blinkov <github@blinkov.ru>
Date: Mon, 18 Jan 2021 13:59:56 +0300
Subject: [PATCH 117/611] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 97d6eb605e6..61adf4c9cc0 100644
--- a/README.md
+++ b/README.md
@@ -17,3 +17,4 @@ ClickHouse® is an open-source column-oriented database management system that a
 
 ## Upcoming Events
 * [SF Bay Area ClickHouse Virtual Office Hours (online)](https://www.meetup.com/San-Francisco-Bay-Area-ClickHouse-Meetup/events/274273549/) on 20 January 2020.
+* [Chinese ClickHouse Meetup (online)](http://hdxu.cn/8KxZE) on 6 February 2020.

From cafc6a492dd255299838a28b8095a2daab3c1344 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <36882414+akuzm@users.noreply.github.com>
Date: Mon, 18 Jan 2021 14:00:24 +0300
Subject: [PATCH 118/611] Update jit_large_requests.xml

---
 tests/performance/jit_large_requests.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/performance/jit_large_requests.xml b/tests/performance/jit_large_requests.xml
index fe7d4346152..f0e1583e5fa 100644
--- a/tests/performance/jit_large_requests.xml
+++ b/tests/performance/jit_large_requests.xml
@@ -28,8 +28,8 @@
                 number,
                 number
             FROM
-                system.numbers
-            LIMIT 100000000
+                system.numbers_mt
+            LIMIT 200000000
     </fill_query>
     <query>
         SELECT
@@ -41,7 +41,7 @@
         SETTINGS
             compile_expressions = 0;
     </query>
-    <query short="1">
+    <query>
         SELECT
             COUNT()
         FROM

From 897d51b6e707945d3c2186911cdeff1f6ac9be2b Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Mon, 18 Jan 2021 14:38:31 +0300
Subject: [PATCH 119/611] Usability improvement of clickhouse-test

---
 tests/clickhouse-test | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index da7d055f250..e095339ec76 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -293,6 +293,8 @@ def run_tests_array(all_tests_with_params):
         try:
             sys.stdout.flush()
             sys.stdout.write("{0:72}".format(name + ": "))
+            # This flush is needed so you can see the test name of the long running test before it will finish.
+            sys.stdout.flush()
 
             if args.skip and any(s in name for s in args.skip):
                 print(MSG_SKIPPED + " - skip")

From 37a17752e8bc22c7a2fc580aa052682dedb92136 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Mon, 18 Jan 2021 15:03:26 +0300
Subject: [PATCH 120/611] Add redundant test for Yandex banner system

---
 tests/queries/0_stateless/01655_agg_if_nullable.reference | 1 +
 tests/queries/0_stateless/01655_agg_if_nullable.sql       | 1 +
 tests/queries/0_stateless/arcadia_skip_list.txt           | 1 +
 3 files changed, 3 insertions(+)
 create mode 100644 tests/queries/0_stateless/01655_agg_if_nullable.reference
 create mode 100644 tests/queries/0_stateless/01655_agg_if_nullable.sql

diff --git a/tests/queries/0_stateless/01655_agg_if_nullable.reference b/tests/queries/0_stateless/01655_agg_if_nullable.reference
new file mode 100644
index 00000000000..0cfbf08886f
--- /dev/null
+++ b/tests/queries/0_stateless/01655_agg_if_nullable.reference
@@ -0,0 +1 @@
+2
diff --git a/tests/queries/0_stateless/01655_agg_if_nullable.sql b/tests/queries/0_stateless/01655_agg_if_nullable.sql
new file mode 100644
index 00000000000..313fb1af880
--- /dev/null
+++ b/tests/queries/0_stateless/01655_agg_if_nullable.sql
@@ -0,0 +1 @@
+SELECT sumIf(toNullable(1), 1) FROM remote('127.0.0.{1,2}', system.one);
diff --git a/tests/queries/0_stateless/arcadia_skip_list.txt b/tests/queries/0_stateless/arcadia_skip_list.txt
index 0fd9814d36a..c2f1ab67b4a 100644
--- a/tests/queries/0_stateless/arcadia_skip_list.txt
+++ b/tests/queries/0_stateless/arcadia_skip_list.txt
@@ -186,3 +186,4 @@
 01644_distributed_async_insert_fsync_smoke
 01552_impl_aggfunc_cloneresize
 01651_bugs_from_15889
+01655_agg_if_nullable

From c99b5a78a5bfc3f70b7dfc3df839cfcdd9c1781a Mon Sep 17 00:00:00 2001
From: robot-clickhouse <robot-clickhouse@yandex-team.ru>
Date: Mon, 18 Jan 2021 15:06:51 +0300
Subject: [PATCH 121/611] Update version_date.tsv after release 21.1.2.15

---
 utils/list-versions/version_date.tsv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/list-versions/version_date.tsv b/utils/list-versions/version_date.tsv
index cf6778317cc..fc1cf7c1b67 100644
--- a/utils/list-versions/version_date.tsv
+++ b/utils/list-versions/version_date.tsv
@@ -1,3 +1,4 @@
+v21.1.2.15-stable	2021-01-18
 v20.12.5.14-stable	2020-12-28
 v20.12.4.5-stable	2020-12-24
 v20.12.3.3-stable	2020-12-09

From 4ee96869a2500fa3e75575c767631aa9fbfef732 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Mon, 18 Jan 2021 15:15:07 +0300
Subject: [PATCH 122/611] Don't wait forever for log update after table was
 dropped

---
 src/Storages/StorageReplicatedMergeTree.cpp | 22 ++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index afa25c728a2..70e90e9706a 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -4652,7 +4652,9 @@ bool StorageReplicatedMergeTree::waitForTableReplicaToProcessLogEntry(
         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;
     };
-    constexpr auto event_wait_timeout_ms = 1000;
+
+    /// Don't recheck ZooKeeper too often
+    constexpr auto event_wait_timeout_ms = 3000;
 
     if (startsWith(entry.znode_name, "log-"))
     {
@@ -4673,10 +4675,11 @@ bool StorageReplicatedMergeTree::waitForTableReplicaToProcessLogEntry(
             if (!log_pointer.empty() && parse<UInt64>(log_pointer) > log_index)
                 break;
 
-            if (wait_for_non_active)
-                event->wait();
-            else
-                event->tryWait(event_wait_timeout_ms);
+            /// Wait with timeout because we can be already shut down, but not dropped.
+            /// So log_pointer node will exist, but we will never update it because all background threads already stopped.
+            /// It can lead to query hung because table drop query can wait for some query (alter, optimize, etc) which called this method,
+            /// but the query will never finish because the drop already shut down the table.
+            event->tryWait(event_wait_timeout_ms);
         }
     }
     else if (startsWith(entry.znode_name, "queue-"))
@@ -4721,10 +4724,11 @@ bool StorageReplicatedMergeTree::waitForTableReplicaToProcessLogEntry(
                 if (!log_pointer_new.empty() && parse<UInt64>(log_pointer_new) > log_index)
                     break;
 
-                if (wait_for_non_active)
-                    event->wait();
-                else
-                    event->tryWait(event_wait_timeout_ms);
+                /// Wait with timeout because we can be already shut down, but not dropped.
+                /// So log_pointer node will exist, but we will never update it because all background threads already stopped.
+                /// It can lead to query hung because table drop query can wait for some query (alter, optimize, etc) which called this method,
+                /// but the query will never finish because the drop already shut down the table.
+                event->tryWait(event_wait_timeout_ms);
             }
         }
     }

From c153268da746f52a2ba209e94cdc7efbe74abd15 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Mon, 18 Jan 2021 15:15:46 +0300
Subject: [PATCH 123/611] Make `-- { echo }` hint preserve leading comments.

---
 docker/test/fasttest/run.sh                   |   2 +-
 programs/client/Client.cpp                    | 232 ++++++++++++------
 programs/client/TestHint.h                    |  37 ++-
 src/IO/Operators.h                            |   1 +
 src/Parsers/TokenIterator.cpp                 |   5 +-
 src/Parsers/TokenIterator.h                   |   2 +-
 src/Parsers/parseQuery.cpp                    |  97 +++++---
 src/Parsers/parseQuery.h                      |   2 +-
 src/Parsers/queryNormalization.h              |  10 +-
 tests/clickhouse-test                         |  10 +-
 ...51_default_database_on_client_reconnect.sh |   2 +-
 .../queries/0_stateless/01091_num_threads.sql |   6 +-
 .../01531_query_log_query_comment.sql         |   4 +-
 .../01591_window_functions.reference          | 106 +++-----
 14 files changed, 303 insertions(+), 213 deletions(-)

diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index dd98390cdcc..437740506e5 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -335,7 +335,7 @@ function run_tests
     time clickhouse-test -j 8 --order=random --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"
 
     # substr is to remove semicolon after test name
-    readarray -t FAILED_TESTS < <(awk '/FAIL|TIMEOUT|ERROR/ { print substr($3, 1, length($3)-1) }' "$FASTTEST_OUTPUT/test_log.txt" | tee "$FASTTEST_OUTPUT/failed-parallel-tests.txt")
+    readarray -t FAILED_TESTS < <(awk '/\[ FAIL|TIMEOUT|ERROR \]/ { print substr($3, 1, length($3)-1) }' "$FASTTEST_OUTPUT/test_log.txt" | tee "$FASTTEST_OUTPUT/failed-parallel-tests.txt")
 
     # We will rerun sequentially any tests that have failed during parallel run.
     # They might have failed because there was some interference from other tests
diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index ca2a3db193f..a02e6d88837 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -670,14 +670,14 @@ private:
                     actual_client_error = e.code();
                     if (!actual_client_error || actual_client_error != expected_client_error)
                     {
-                        std::cerr << std::endl
-                            << "Exception on client:" << std::endl
-                            << "Code: " << e.code() << ". " << e.displayText() << std::endl;
+                    std::cerr << std::endl
+                        << "Exception on client:" << std::endl
+                        << "Code: " << e.code() << ". " << e.displayText() << std::endl;
 
-                        if (config().getBool("stacktrace", false))
-                            std::cerr << "Stack trace:" << std::endl << e.getStackTraceString() << std::endl;
+                    if (config().getBool("stacktrace", false))
+                        std::cerr << "Stack trace:" << std::endl << e.getStackTraceString() << std::endl;
 
-                        std::cerr << std::endl;
+                    std::cerr << std::endl;
 
                     }
 
@@ -845,8 +845,59 @@ private:
         return processMultiQuery(text);
     }
 
+    // Consumes trailing semicolons and tries to consume the same-line trailing
+    // comment.
+    static void adjustQueryEnd(const char *& this_query_end,
+        const char * all_queries_end, int max_parser_depth)
+    {
+        // We have to skip the trailing semicolon that might be left
+        // after VALUES parsing or just after a normal semicolon-terminated query.
+        Tokens after_query_tokens(this_query_end, all_queries_end);
+        IParser::Pos after_query_iterator(after_query_tokens, max_parser_depth);
+        while (after_query_iterator.isValid()
+           && after_query_iterator->type == TokenType::Semicolon)
+        {
+            this_query_end = after_query_iterator->end;
+            ++after_query_iterator;
+        }
+
+        // Now we have to do some extra work to add the trailing
+        // same-line comment to the query, but preserve the leading
+        // comments of the next query. The trailing comment is important
+        // because the test hints are usually written this way, e.g.:
+        // select nonexistent_column; -- { serverError 12345 }.
+        // The token iterator skips comments and whitespace, so we have
+        // to find the newline in the string manually. If it's earlier
+        // than the next significant token, it means that the text before
+        // newline is some trailing whitespace or comment, and we should
+        // add it to our query. There are also several special cases
+        // that are described below.
+        const auto * newline = find_first_symbols<'\n'>(this_query_end,
+            all_queries_end);
+        const char * next_query_begin = after_query_iterator->begin;
+
+        // We include the entire line if the next query starts after
+        // it. This is a generic case of trailing in-line comment.
+        // The "equals" condition is for case of end of input (they both equal
+        // all_queries_end);
+        if (newline <= next_query_begin)
+        {
+            assert(newline >= this_query_end);
+            this_query_end = newline;
+        }
+        else
+        {
+            // Many queries on one line, can't do anything. By the way, this
+            // syntax is probably going to work as expected:
+            // select nonexistent /* { serverError 12345 } */; select 1
+        }
+    }
+
     bool processMultiQuery(const String & all_queries_text)
     {
+        // It makes sense not to base any control flow on this, so that it is
+        // the same in tests and in normal usage. The only difference is that in
+        // normal mode we ignore the test hints.
         const bool test_mode = config().has("testmode");
 
         {
@@ -871,35 +922,31 @@ private:
 
         while (this_query_begin < all_queries_end)
         {
-            // Use the token iterator to skip any whitespace, semicolons and
-            // comments at the beginning of the query. An example from regression
-            // tests:
-            //      insert into table t values ('invalid'); -- { serverError 469 }
-            //      select 1
-            // Here the test hint comment gets parsed as a part of second query.
-            // We parse the `INSERT VALUES` up to the semicolon, and the rest
-            // looks like a two-line query:
-            //      -- { serverError 469 }
-            //      select 1
-            // and we expect it to fail with error 469, but this hint is actually
-            // for the previous query. Test hints should go after the query, so
-            // we can fix this by skipping leading comments. Token iterator skips
-            // comments and whitespace by itself, so we only have to check for
-            // semicolons.
-            // The code block is to limit visibility of `tokens` because we have
-            // another such variable further down the code, and get warnings for
-            // that.
+            // Remove leading empty newlines and other whitespace, because they
+            // are annoying to filter in query log. This is mostly relevant for
+            // the tests.
+            while (this_query_begin < all_queries_end
+                 && isWhitespaceASCII(*this_query_begin))
+            {
+                ++this_query_begin;
+            }
+            if (this_query_begin >= all_queries_end)
+            {
+                break;
+            }
+
+            // If there are only comments left until the end of file, we just
+            // stop. The parser can't handle this situation because it always
+            // expects that there is some query that it can parse.
+            // We can get into this situation because the parser also doesn't
+            // skip the trailing comments after parsing a query. This is because
+            // they may as well be the leading comments for the next query,
+            // and it makes more sense to treat them as such.
             {
                 Tokens tokens(this_query_begin, all_queries_end);
                 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->begin;
-                if (this_query_begin >= all_queries_end)
+                if (!token_iterator.isValid())
                 {
                     break;
                 }
@@ -913,14 +960,23 @@ private:
             }
             catch (Exception & e)
             {
-                if (!test_mode)
-                    throw;
+                // Try to find test hint for syntax error. We don't know where
+                // the query ends because we failed to parse it, so we consume
+                // the entire line.
+                this_query_end = find_first_symbols<'\n'>(this_query_end,
+                    all_queries_end);
 
-                /// Try find test hint for syntax error
-                const char * end_of_line = find_first_symbols<'\n'>(this_query_begin,all_queries_end);
-                TestHint hint(true, String(this_query_end, end_of_line - this_query_end));
-                if (hint.serverError()) /// Syntax errors are considered as client errors
+                TestHint hint(test_mode,
+                    String(this_query_begin, this_query_end - this_query_begin));
+
+                if (hint.serverError())
+                {
+                    // Syntax errors are considered as client errors
+                    e.addMessage("\nExpected server error '{}'.",
+                        hint.serverError());
                     throw;
+                }
+
                 if (hint.clientError() != e.code())
                 {
                     if (hint.clientError())
@@ -929,7 +985,7 @@ private:
                 }
 
                 /// It's expected syntax error, skip the line
-                this_query_begin = end_of_line;
+                this_query_begin = this_query_end;
                 continue;
             }
 
@@ -956,10 +1012,14 @@ private:
             // The VALUES format needs even more handling -- we also allow the
             // data to be delimited by semicolon. This case is handled later by
             // the format parser itself.
+            // We can't do multiline INSERTs with inline data, because most
+            // row input formats (e.g. TSV) can't tell when the input stops,
+            // unlike VALUES.
             auto * insert_ast = parsed_query->as<ASTInsertQuery>();
             if (insert_ast && insert_ast->data)
             {
-                this_query_end = find_first_symbols<'\n'>(insert_ast->data, all_queries_end);
+                this_query_end = find_first_symbols<'\n'>(insert_ast->data,
+                    all_queries_end);
                 insert_ast->end = this_query_end;
                 query_to_send = all_queries_text.substr(
                     this_query_begin - all_queries_text.data(),
@@ -972,61 +1032,75 @@ private:
                     this_query_end - this_query_begin);
             }
 
-            // full_query is the query + inline INSERT data.
+            // Try to include the trailing comment with test hints. It is just
+            // a guess for now, because we don't yet know where the query ends
+            // if it is an INSERT query with inline data. We will do it again
+            // after we have processed the query. But even this guess is
+            // 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);
+
+            // full_query is the query + inline INSERT data + trailing comments
+            // (the latter is our best guess for now).
             full_query = all_queries_text.substr(
                 this_query_begin - all_queries_text.data(),
                 this_query_end - this_query_begin);
 
+            if (query_fuzzer_runs)
+            {
+                if (!processWithFuzzing(full_query))
+                    return false;
+
+                this_query_begin = this_query_end;
+                continue;
+            }
+
             // Look for the hint in the text of query + insert data, if any.
             // e.g. insert into t format CSV 'a' -- { serverError 123 }.
             TestHint test_hint(test_mode, full_query);
             expected_client_error = test_hint.clientError();
             expected_server_error = test_hint.serverError();
 
-            if (query_fuzzer_runs)
+            try
             {
-                if (!processWithFuzzing(full_query))
-                    return false;
+                processParsedSingleQuery();
+
+                if (insert_ast && insert_ast->data)
+                {
+                    // For VALUES format: use the end of inline data as reported
+                    // by the format parser (it is saved in sendData()). This
+                    // allows us to handle queries like:
+                    //   insert into t values (1); select 1
+                    //, where the inline data is delimited by semicolon and not
+                    // by a newline.
+                    this_query_end = parsed_query->as<ASTInsertQuery>()->end;
+
+                    adjustQueryEnd(this_query_end, all_queries_end,
+                        context.getSettingsRef().max_parser_depth);
+                }
             }
-            else
+            catch (...)
             {
-                try
-                {
-                    processParsedSingleQuery();
+                last_exception_received_from_server = std::make_unique<Exception>(getCurrentExceptionMessage(true), getCurrentExceptionCode());
+                actual_client_error = last_exception_received_from_server->code();
+                if (!ignore_error && (!actual_client_error || actual_client_error != expected_client_error))
+                    std::cerr << "Error on processing query: " << full_query << std::endl << last_exception_received_from_server->message();
+                received_exception_from_server = true;
+            }
 
-                    if (insert_ast && insert_ast->data)
-                    {
-                        // For VALUES format: use the end of inline data as reported
-                        // by the format parser (it is saved in sendData()). This
-                        // allows us to handle queries like:
-                        //   insert into t values (1); select 1
-                        //, where the inline data is delimited by semicolon and not
-                        // by a newline.
-                        this_query_end = parsed_query->as<ASTInsertQuery>()->end;
-                    }
-                }
-                catch (...)
-                {
-                    last_exception_received_from_server = std::make_unique<Exception>(getCurrentExceptionMessage(true), getCurrentExceptionCode());
-                    actual_client_error = last_exception_received_from_server->code();
-                    if (!ignore_error && (!actual_client_error || actual_client_error != expected_client_error))
-                        std::cerr << "Error on processing query: " << full_query << std::endl << last_exception_received_from_server->message();
-                    received_exception_from_server = true;
-                }
+            if (!test_hint.checkActual(
+                actual_server_error, actual_client_error, received_exception_from_server, last_exception_received_from_server))
+            {
+                connection->forceConnected(connection_parameters.timeouts);
+            }
 
-                if (!test_hint.checkActual(
-                    actual_server_error, actual_client_error, received_exception_from_server, last_exception_received_from_server))
-                {
-                    connection->forceConnected(connection_parameters.timeouts);
-                }
-
-                if (received_exception_from_server && !ignore_error)
-                {
-                    if (is_interactive)
-                        break;
-                    else
-                        return false;
-                }
+            if (received_exception_from_server && !ignore_error)
+            {
+                if (is_interactive)
+                    break;
+                else
+                    return false;
             }
 
             this_query_begin = this_query_end;
diff --git a/programs/client/TestHint.h b/programs/client/TestHint.h
index f1998588261..dac7038b836 100644
--- a/programs/client/TestHint.h
+++ b/programs/client/TestHint.h
@@ -23,18 +23,27 @@ namespace ErrorCodes
 class TestHint
 {
 public:
-    TestHint(bool enabled_, const String & query_)
-    : enabled(enabled_)
-    , query(query_)
+    TestHint(bool enabled_, const String & query_) :
+        enabled(enabled_),
+        query(query_)
     {
         if (!enabled_)
             return;
 
+        // Don't parse error hints in leading comments, because it feels weird.
+        // Leading 'echo' hint is OK.
+        bool is_leading_hint = true;
+
         Lexer lexer(query.data(), query.data() + query.size());
 
         for (Token token = lexer.nextToken(); !token.isEnd(); token = lexer.nextToken())
         {
-            if (token.type == TokenType::Comment)
+            if (token.type != TokenType::Comment
+                && token.type != TokenType::Whitespace)
+            {
+                is_leading_hint = false;
+            }
+            else if (token.type == TokenType::Comment)
             {
                 String comment(token.begin, token.begin + token.size());
 
@@ -47,7 +56,7 @@ public:
                         if (pos_end != String::npos)
                         {
                             String hint(comment.begin() + pos_start + 1, comment.begin() + pos_end);
-                            parse(hint);
+                            parse(hint, is_leading_hint);
                         }
                     }
                 }
@@ -60,7 +69,9 @@ public:
                      bool & got_exception, std::unique_ptr<Exception> & last_exception) const
     {
         if (!enabled)
+        {
             return true;
+        }
 
         if (allErrorsExpected(actual_server_error, actual_client_error))
         {
@@ -94,7 +105,7 @@ private:
     int client_error = 0;
     bool echo = false;
 
-    void parse(const String & hint)
+    void parse(const String & hint, bool is_leading_hint)
     {
         std::stringstream ss;       // STYLE_CHECK_ALLOW_STD_STRING_STREAM
         ss << hint;
@@ -106,11 +117,15 @@ private:
             if (ss.eof())
                 break;
 
-            if (item == "serverError")
-                ss >> server_error;
-            else if (item == "clientError")
-                ss >> client_error;
-            else if (item == "echo")
+            if (!is_leading_hint)
+            {
+                if (item == "serverError")
+                    ss >> server_error;
+                else if (item == "clientError")
+                    ss >> client_error;
+            }
+
+            if (item == "echo")
                 echo = true;
         }
     }
diff --git a/src/IO/Operators.h b/src/IO/Operators.h
index 02a346e2f2f..9f83e656106 100644
--- a/src/IO/Operators.h
+++ b/src/IO/Operators.h
@@ -46,6 +46,7 @@ template <typename T>     WriteBuffer & operator<< (WriteBuffer & buf, const T &
 /// If you do not use the manipulators, the string is displayed without an escape, as is.
 template <> inline        WriteBuffer & operator<< (WriteBuffer & buf, const String & x)   { writeString(x, buf);   return buf; }
 template <> inline        WriteBuffer & operator<< (WriteBuffer & buf, const std::string_view & x)   { writeString(StringRef(x), buf);   return buf; }
+template <> inline WriteBuffer & operator<< (WriteBuffer & buf, const StringRef & x) { writeString(x, buf); return buf; }
 template <> inline        WriteBuffer & operator<< (WriteBuffer & buf, const char & x)     { writeChar(x, buf);     return buf; }
 template <> inline        WriteBuffer & operator<< (WriteBuffer & buf, const pcg32_fast & x) { PcgSerializer::serializePcg32(x, buf); return buf; }
 
diff --git a/src/Parsers/TokenIterator.cpp b/src/Parsers/TokenIterator.cpp
index 50faced19c3..18360ed29ae 100644
--- a/src/Parsers/TokenIterator.cpp
+++ b/src/Parsers/TokenIterator.cpp
@@ -4,12 +4,13 @@
 namespace DB
 {
 
-UnmatchedParentheses checkUnmatchedParentheses(TokenIterator begin, Token * last)
+UnmatchedParentheses checkUnmatchedParentheses(TokenIterator begin, Token last)
 {
     /// We have just two kind of parentheses: () and [].
     UnmatchedParentheses stack;
 
-    for (TokenIterator it = begin; it.isValid() && &it.get() <= last; ++it)
+    for (TokenIterator it = begin;
+        it.isValid() && it->begin <= last.begin; ++it)
     {
         if (it->type == TokenType::OpeningRoundBracket || it->type == TokenType::OpeningSquareBracket)
         {
diff --git a/src/Parsers/TokenIterator.h b/src/Parsers/TokenIterator.h
index 078421c99c9..a95465500e0 100644
--- a/src/Parsers/TokenIterator.h
+++ b/src/Parsers/TokenIterator.h
@@ -80,6 +80,6 @@ public:
 
 /// Returns positions of unmatched parentheses.
 using UnmatchedParentheses = std::vector<Token>;
-UnmatchedParentheses checkUnmatchedParentheses(TokenIterator begin, Token * last);
+UnmatchedParentheses checkUnmatchedParentheses(TokenIterator begin, Token last);
 
 }
diff --git a/src/Parsers/parseQuery.cpp b/src/Parsers/parseQuery.cpp
index 2dc1c4c8c71..48a92534e74 100644
--- a/src/Parsers/parseQuery.cpp
+++ b/src/Parsers/parseQuery.cpp
@@ -78,6 +78,10 @@ void writeQueryWithHighlightedErrorPositions(
     for (size_t position_to_hilite_idx = 0; position_to_hilite_idx < num_positions_to_hilite; ++position_to_hilite_idx)
     {
         const char * current_position_to_hilite = positions_to_hilite[position_to_hilite_idx].begin;
+
+        assert(current_position_to_hilite < end);
+        assert(current_position_to_hilite >= begin);
+
         out.write(pos, current_position_to_hilite - pos);
 
         if (current_position_to_hilite == end)
@@ -189,6 +193,10 @@ std::string getLexicalErrorMessage(
     writeQueryAroundTheError(out, begin, end, hilite, &last_token, 1);
 
     out << getErrorTokenDescription(last_token.type);
+    if (last_token.size())
+    {
+       out << ": '" << StringRef{last_token.begin, last_token.size()} << "'";
+    }
 
     return out.str();
 }
@@ -217,8 +225,8 @@ std::string getUnmatchedParenthesesErrorMessage(
 
 ASTPtr tryParseQuery(
     IParser & parser,
-    const char * & pos,
-    const char * end,
+    const char * & _out_query_end, /* also query begin as input parameter */
+    const char * all_queries_end,
     std::string & out_error_message,
     bool hilite,
     const std::string & query_description,
@@ -226,7 +234,8 @@ ASTPtr tryParseQuery(
     size_t max_query_size,
     size_t max_parser_depth)
 {
-    Tokens tokens(pos, end, max_query_size);
+    const char * query_begin = _out_query_end;
+    Tokens tokens(query_begin, all_queries_end, max_query_size);
     IParser::Pos token_iterator(tokens, max_parser_depth);
 
     if (token_iterator->isEnd()
@@ -241,70 +250,90 @@ ASTPtr tryParseQuery(
         //"
         // Advance the position, so that we can use this parser for stream parsing
         // even in presence of such queries.
-        pos = token_iterator->begin;
+        _out_query_end = token_iterator->begin;
         return nullptr;
     }
 
     Expected expected;
-
     ASTPtr res;
-    bool parse_res = parser.parse(token_iterator, res, expected);
-    Token last_token = token_iterator.max();
+    const bool parse_res = parser.parse(token_iterator, res, expected);
+    const auto last_token = token_iterator.max();
+    _out_query_end = last_token.end;
 
-    /// If parsed query ends at data for insertion. Data for insertion could be in any format and not necessary be lexical correct.
     ASTInsertQuery * insert = nullptr;
     if (parse_res)
         insert = res->as<ASTInsertQuery>();
 
-    if (!(insert && insert->data))
+    // If parsed query ends at data for insertion. Data for insertion could be
+    // in any format and not necessary be lexical correct, so we can't perform
+    // most of the checks.
+    if (insert && insert->data)
     {
-        /// Lexical error
-        if (last_token.isError())
+        if (!parse_res)
         {
-            out_error_message = getLexicalErrorMessage(pos, end, last_token, hilite, query_description);
+            // Generic parse error.
+            out_error_message = getSyntaxErrorMessage(query_begin, all_queries_end,
+                last_token, expected, hilite, query_description);
             return nullptr;
         }
 
-        /// Unmatched parentheses
-        UnmatchedParentheses unmatched_parens = checkUnmatchedParentheses(TokenIterator(tokens), &last_token);
-        if (!unmatched_parens.empty())
-        {
-            out_error_message = getUnmatchedParenthesesErrorMessage(pos, end, unmatched_parens, hilite, query_description);
-            return nullptr;
-        }
+        return res;
+    }
+
+    // More granular checks for queries other than INSERT w/inline data.
+    /// Lexical error
+    if (last_token.isError())
+    {
+        out_error_message = getLexicalErrorMessage(query_begin, all_queries_end,
+            last_token, hilite, query_description);
+        return nullptr;
+    }
+
+    /// Unmatched parentheses
+    UnmatchedParentheses unmatched_parens = checkUnmatchedParentheses(TokenIterator(tokens), last_token);
+    if (!unmatched_parens.empty())
+    {
+        out_error_message = getUnmatchedParenthesesErrorMessage(query_begin,
+            all_queries_end, unmatched_parens, hilite, query_description);
+        return nullptr;
     }
 
     if (!parse_res)
     {
-        /// Parse error.
-        out_error_message = getSyntaxErrorMessage(pos, end, last_token, expected, hilite, query_description);
+        /// Generic parse error.
+        out_error_message = getSyntaxErrorMessage(query_begin, all_queries_end,
+            last_token, expected, hilite, query_description);
         return nullptr;
     }
 
     /// Excessive input after query. Parsed query must end with end of data or semicolon or data for INSERT.
     if (!token_iterator->isEnd()
-        && token_iterator->type != TokenType::Semicolon
-        && !(insert && insert->data))
+        && token_iterator->type != TokenType::Semicolon)
     {
-        expected.add(pos, "end of query");
-        out_error_message = getSyntaxErrorMessage(pos, end, last_token, expected, hilite, query_description);
+        expected.add(last_token.begin, "end of query");
+        out_error_message = getSyntaxErrorMessage(query_begin, all_queries_end,
+            last_token, expected, hilite, query_description);
         return nullptr;
     }
 
+    // Skip the semicolon that might be left after parsing the VALUES format.
     while (token_iterator->type == TokenType::Semicolon)
-        ++token_iterator;
-
-    /// If multi-statements are not allowed, then after semicolon, there must be no non-space characters.
-    if (!allow_multi_statements
-        && !token_iterator->isEnd()
-        && !(insert && insert->data))
     {
-        out_error_message = getSyntaxErrorMessage(pos, end, last_token, {}, hilite,
-            (query_description.empty() ? std::string() : std::string(". ")) + "Multi-statements are not allowed");
+        ++token_iterator;
+    }
+
+    // If multi-statements are not allowed, then after semicolon, there must
+    // be no non-space characters.
+    if (!allow_multi_statements
+        && !token_iterator->isEnd())
+    {
+        out_error_message = getSyntaxErrorMessage(query_begin, all_queries_end,
+            last_token, {}, hilite,
+            (query_description.empty() ? std::string() : std::string(". "))
+                + "Multi-statements are not allowed");
         return nullptr;
     }
 
-    pos = token_iterator->begin;
     return res;
 }
 
diff --git a/src/Parsers/parseQuery.h b/src/Parsers/parseQuery.h
index 14a9a85b22c..e6a6b26a462 100644
--- a/src/Parsers/parseQuery.h
+++ b/src/Parsers/parseQuery.h
@@ -9,7 +9,7 @@ namespace DB
 /// Parse query or set 'out_error_message'.
 ASTPtr tryParseQuery(
     IParser & parser,
-    const char * & pos,                /// Moved to end of parsed fragment.
+    const char * & _out_query_end, // query start as input parameter, query end as output
     const char * end,
     std::string & out_error_message,
     bool hilite,
diff --git a/src/Parsers/queryNormalization.h b/src/Parsers/queryNormalization.h
index 60b807a0fe4..532be0aca7d 100644
--- a/src/Parsers/queryNormalization.h
+++ b/src/Parsers/queryNormalization.h
@@ -126,9 +126,17 @@ inline void ALWAYS_INLINE normalizeQueryToPODArray(const char * begin, const cha
             if (!prev_insignificant)
             {
                 if (0 == num_literals_in_sequence)
-                    res_data.push_back(' ');
+                {
+                    // If it's leading whitespace, ignore it altogether.
+                    if (token.begin != begin)
+                    {
+                        res_data.push_back(' ');
+                    }
+                }
                 else
+                {
                     prev_whitespace = true;
+                }
             }
             prev_insignificant = true;
             continue;
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index da7d055f250..95d8af854bb 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -568,7 +568,7 @@ def main(args):
     if not check_server_started(args.client, args.server_check_retries):
         raise Exception(
             "Server is not responding. Cannot execute 'SELECT 1' query. \
-            Note: if you are using unbundled mode, you also have to specify -c option.")
+            Note: if you are using split build, you may have to specify -c option.")
 
     build_flags = collect_build_flags(args.client)
     if args.antlr:
@@ -846,10 +846,10 @@ if __name__ == '__main__':
     parser.add_argument('--tmp', help='Path to tmp dir')
 
     parser.add_argument('-b', '--binary', default='clickhouse',
-        help='Path to clickhouse (if bundled, clickhouse-server otherwise) binary or name of binary in PATH')
+        help='Path to clickhouse (if monolithic build, clickhouse-server otherwise) binary or name of binary in PATH')
 
     parser.add_argument('-c', '--client',
-        help='Path to clickhouse-client (if unbundled, useless otherwise) binary of name of binary in PATH')
+        help='Path to clickhouse-client (if split build, useless otherwise) binary of name of binary in PATH')
 
     parser.add_argument('--extract_from_config', help='extract-from-config program')
     parser.add_argument('--configclient', help='Client config (if you use not default ports)')
@@ -930,11 +930,11 @@ if __name__ == '__main__':
         if find_binary(args.binary + '-client'):
             args.client = args.binary + '-client'
 
-            print("Using " + args.client + " as client program (expecting unbundled mode)")
+            print("Using " + args.client + " as client program (expecting split build)")
         elif find_binary(args.binary):
             args.client = args.binary + ' client'
 
-            print("Using " + args.client + " as client program (expecting bundled mode)")
+            print("Using " + args.client + " as client program (expecting monolithic build)")
         else:
             print("No 'clickhouse' or 'clickhouse-client' client binary found", file=sys.stderr)
             parser.print_help()
diff --git a/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh b/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh
index 23ce8bb9677..fdf6d717fb8 100755
--- a/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh
+++ b/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh
@@ -4,4 +4,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CLIENT} --ignore-error --multiquery --query "DROP TABLE IF EXISTS tab_00651; CREATE TABLE tab_00651 (val UInt64) engine = Memory; SHOW CREATE TABLE tab_00651 format abcd; DESC tab_00651; DROP TABLE tab_00651;" ||: 2> /dev/null
+${CLICKHOUSE_CLIENT} --ignore-error --multiquery --query "DROP TABLE IF EXISTS tab_00651; CREATE TABLE tab_00651 (val UInt64) engine = Memory; SHOW CREATE TABLE tab_00651 format abcd; DESC tab_00651; DROP TABLE tab_00651;" 2>/dev/null ||:
diff --git a/tests/queries/0_stateless/01091_num_threads.sql b/tests/queries/0_stateless/01091_num_threads.sql
index d7139351588..b51b8561c21 100644
--- a/tests/queries/0_stateless/01091_num_threads.sql
+++ b/tests/queries/0_stateless/01091_num_threads.sql
@@ -8,7 +8,7 @@ WITH
     (
         SELECT query_id
         FROM system.query_log
-        WHERE (query = 'WITH 01091 AS id SELECT 1;\n') AND (event_date >= (today() - 1))
+        WHERE (normalizeQuery(query) like normalizeQuery('WITH 01091 AS id SELECT 1;')) AND (event_date >= (today() - 1))
         ORDER BY event_time DESC
         LIMIT 1
     ) AS id
@@ -23,7 +23,7 @@ WITH
     (
         SELECT query_id
         FROM system.query_log
-        WHERE (query LIKE 'with 01091 as id select sum(number) from numbers(1000000);%') AND (event_date >= (today() - 1))
+        WHERE (normalizeQuery(query) = normalizeQuery('with 01091 as id select sum(number) from numbers(1000000);')) AND (event_date >= (today() - 1))
         ORDER BY event_time DESC
         LIMIT 1
     ) AS id
@@ -38,7 +38,7 @@ WITH
     (
         SELECT query_id
         FROM system.query_log
-        WHERE (query LIKE 'with 01091 as id select sum(number) from numbers_mt(1000000);%') AND (event_date >= (today() - 1))
+        WHERE (normalizeQuery(query) = normalizeQuery('with 01091 as id select sum(number) from numbers_mt(1000000);')) AND (event_date >= (today() - 1))
         ORDER BY event_time DESC
         LIMIT 1
     ) AS id
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 19942669a44..81348c53589 100644
--- a/tests/queries/0_stateless/01531_query_log_query_comment.sql
+++ b/tests/queries/0_stateless/01531_query_log_query_comment.sql
@@ -4,9 +4,9 @@ set log_queries_min_type='QUERY_FINISH';
 set enable_global_with_statement=1;
 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 = 'select /* test=01531, enable_global_with_statement=0 */ 2;\n';
+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%';
 
 set enable_global_with_statement=1;
 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 = 'select /* test=01531 enable_global_with_statement=1 */ 2;\n';
+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%';
diff --git a/tests/queries/0_stateless/01591_window_functions.reference b/tests/queries/0_stateless/01591_window_functions.reference
index aad784b1ac1..201784edc9f 100644
--- a/tests/queries/0_stateless/01591_window_functions.reference
+++ b/tests/queries/0_stateless/01591_window_functions.reference
@@ -1,11 +1,8 @@
+-- { echo }
+
 set allow_experimental_window_functions = 1;
-
 -- just something basic
-
 select number, count() over (partition by intDiv(number, 3) order by number) from numbers(10);
-
--- proper calculation across blocks
-
 0	1
 1	2
 2	3
@@ -16,10 +13,8 @@ select number, count() over (partition by intDiv(number, 3) order by number) fro
 7	2
 8	3
 9	1
+-- proper calculation across blocks
 select number, max(number) over (partition by intDiv(number, 3) order by number desc) from numbers(10) settings max_block_size = 2;
-
--- not a window function
-
 2	2
 1	2
 0	2
@@ -30,14 +25,10 @@ select number, max(number) over (partition by intDiv(number, 3) order by number
 7	8
 6	8
 9	9
+-- not a window function
 select number, abs(number) over (partition by toString(intDiv(number, 3))) from numbers(10); -- { serverError 63 }
-
 -- no partition by
-
 select number, avg(number) over (order by number) from numbers(10);
-
--- no order by
-
 0	0
 1	0.5
 2	1
@@ -48,10 +39,8 @@ select number, avg(number) over (order by number) from numbers(10);
 7	3.5
 8	4
 9	4.5
+-- no order by
 select number, quantileExact(number) over (partition by intDiv(number, 3)) from numbers(10);
-
--- can add an alias after window spec
-
 0	0
 1	1
 2	1
@@ -62,36 +51,28 @@ select number, quantileExact(number) over (partition by intDiv(number, 3)) from
 7	7
 8	7
 9	9
+-- can add an alias after window spec
 select number, quantileExact(number) over (partition by intDiv(number, 3)) q from numbers(10);
-
+0	0
+1	1
+2	1
+3	3
+4	4
+5	4
+6	6
+7	7
+8	7
+9	9
 -- can't reference it yet -- the window functions are calculated at the
 -- last stage of select, after all other functions.
-
-0	0
-1	1
-2	1
-3	3
-4	4
-5	4
-6	6
-7	7
-8	7
-9	9
 select q * 10, quantileExact(number) over (partition by intDiv(number, 3)) q from numbers(10); -- { serverError 47 }
-
 -- must work in WHERE if you wrap it in a subquery
-
 select * from (select count(*) over () c from numbers(3)) where c > 0;
-
--- should work in ORDER BY
-
 1
 2
 3
+-- should work in ORDER BY
 select number, max(number) over (partition by intDiv(number, 3) order by number desc) m from numbers(10) order by m desc, number;
-
--- also works in ORDER BY if you wrap it in a subquery
-
 9	9
 6	8
 7	8
@@ -102,43 +83,33 @@ select number, max(number) over (partition by intDiv(number, 3) order by number
 0	2
 1	2
 2	2
+-- also works in ORDER BY if you wrap it in a subquery
 select * from (select count(*) over () c from numbers(3)) order by c;
-
+1
+2
+3
 -- Example with window function only in ORDER BY. Here we make a rank of all
 -- numbers sorted descending, and then sort by this rank descending, and must get
 -- the ascending order.
-
+select * from (select * from numbers(5) order by rand()) order by count() over (order by number desc) desc;
+0
 1
 2
 3
-select * from (select * from numbers(5) order by rand()) order by count() over (order by number desc) desc;
-
+4
 -- Aggregate functions as window function arguments. This query is semantically
 -- the same as the above one, only we replace `number` with
 -- `any(number) group by number` and so on.
-
+select * from (select * from numbers(5) order by rand()) group by number order by sum(any(number) + 1) over (order by min(number) desc) desc;
 0
 1
 2
 3
 4
-select * from (select * from numbers(5) order by rand()) group by number order by sum(any(number) + 1) over (order by min(number) desc) desc;
-
 -- different windows
 -- an explain test would also be helpful, but it's too immature now and I don't
 -- want to change reference all the time
-
-0
-1
-2
-3
-4
 select number, max(number) over (partition by intDiv(number, 3) order by number desc), count(number) over (partition by intDiv(number, 5) order by number) as m from numbers(31) order by number settings max_block_size = 2;
-
--- two functions over the same window
--- an explain test would also be helpful, but it's too immature now and I don't
--- want to change reference all the time
-
 0	2	1
 1	2	2
 2	2	3
@@ -170,10 +141,10 @@ select number, max(number) over (partition by intDiv(number, 3) order by number
 28	29	4
 29	29	5
 30	30	1
+-- two functions over the same window
+-- an explain test would also be helpful, but it's too immature now and I don't
+-- want to change reference all the time
 select number, max(number) over (partition by intDiv(number, 3) order by number desc), count(number) over (partition by intDiv(number, 3) order by number desc) as m from numbers(7) order by number settings max_block_size = 2;
-
--- check that we can work with constant columns
-
 0	2	3
 1	2	2
 2	2	1
@@ -181,35 +152,26 @@ select number, max(number) over (partition by intDiv(number, 3) order by number
 4	5	2
 5	5	1
 6	6	1
+-- check that we can work with constant columns
 select median(x) over (partition by x) from (select 1 x);
-
--- an empty window definition is valid as well
-
 1
+-- an empty window definition is valid as well
 select groupArray(number) over () from numbers(3);
-
--- This one tests we properly process the window  function arguments.
--- Seen errors like 'column `1` not found' from count(1).
-
 [0]
 [0,1]
 [0,1,2]
+-- This one tests we properly process the window  function arguments.
+-- Seen errors like 'column `1` not found' from count(1).
 select count(1) over (), max(number + 1) over () from numbers(3);
-
--- Should work in DISTINCT
-
 1	3
+-- Should work in DISTINCT
 select distinct sum(0) over () from numbers(2);
-
 0
 select distinct any(number) over () from numbers(2);
-
+0
 -- Various kinds of aliases are properly substituted into various parts of window
 -- function definition.
-
-0
 with number + 1 as x select intDiv(number, 3) as y, sum(x + y) over (partition by y order by x) from numbers(7);
-
 0	1
 0	3
 0	6

From b2547e99a0fa7b2fe6ba6261e95af49f089458eb Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Mon, 18 Jan 2021 15:18:29 +0300
Subject: [PATCH 124/611] whitespace

---
 programs/client/Client.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index a02e6d88837..a13c36c1fcf 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -670,15 +670,14 @@ private:
                     actual_client_error = e.code();
                     if (!actual_client_error || actual_client_error != expected_client_error)
                     {
-                    std::cerr << std::endl
-                        << "Exception on client:" << std::endl
-                        << "Code: " << e.code() << ". " << e.displayText() << std::endl;
+                        std::cerr << std::endl
+                            << "Exception on client:" << std::endl
+                            << "Code: " << e.code() << ". " << e.displayText() << std::endl;
 
-                    if (config().getBool("stacktrace", false))
-                        std::cerr << "Stack trace:" << std::endl << e.getStackTraceString() << std::endl;
-
-                    std::cerr << std::endl;
+                        if (config().getBool("stacktrace", false))
+                            std::cerr << "Stack trace:" << std::endl << e.getStackTraceString() << std::endl;
 
+                        std::cerr << std::endl;
                     }
 
                     /// Client-side exception during query execution can result in the loss of

From d8a9c969c6d98cf3eea7b393c4c885acc5a61e1d Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Mon, 18 Jan 2021 16:07:12 +0300
Subject: [PATCH 125/611] Add changelog for version 21.1

---
 CHANGELOG.md                         | 3621 ++------------------------
 docs/en/whats-new/changelog/2020.md  | 3376 ++++++++++++++++++++++++
 docs/en/whats-new/changelog/index.md |    2 +-
 3 files changed, 3656 insertions(+), 3343 deletions(-)
 create mode 100644 docs/en/whats-new/changelog/2020.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ec48bcd584..fbaf92ce659 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3376 +1,313 @@
-### ClickHouse release 20.12
-
-### ClickHouse release v20.12.4.5-stable, 2020-12-24
-
-#### Bug Fix
-
-* Fixed issue when `clickhouse-odbc-bridge` process is unreachable by server on machines with dual IPv4/IPv6 stack; - Fixed issue when ODBC dictionary updates are performed using malformed queries and/or cause crashes; Possibly closes [#14489](https://github.com/ClickHouse/ClickHouse/issues/14489). [#18278](https://github.com/ClickHouse/ClickHouse/pull/18278) ([Denis Glazachev](https://github.com/traceon)).
-* Fixed key comparison between Enum and Int types. This fixes [#17989](https://github.com/ClickHouse/ClickHouse/issues/17989). [#18214](https://github.com/ClickHouse/ClickHouse/pull/18214) ([Amos Bird](https://github.com/amosbird)).
-* Fixed unique key convert crash in `MaterializeMySQL` database engine. This fixes [#18186](https://github.com/ClickHouse/ClickHouse/issues/18186) and fixes [#16372](https://github.com/ClickHouse/ClickHouse/issues/16372)  [#18211](https://github.com/ClickHouse/ClickHouse/pull/18211) ([Winter Zhang](https://github.com/zhang2014)).
-* Fixed `std::out_of_range: basic_string` in S3 URL parsing. [#18059](https://github.com/ClickHouse/ClickHouse/pull/18059) ([Vladimir Chebotarev](https://github.com/excitoon)).
-* Fixed the issue when some tables not synchronized to ClickHouse from MySQL caused by the fact that convertion MySQL prefix index wasn't supported for MaterializeMySQL. This fixes [#15187](https://github.com/ClickHouse/ClickHouse/issues/15187) and fixes [#17912](https://github.com/ClickHouse/ClickHouse/issues/17912)  [#17944](https://github.com/ClickHouse/ClickHouse/pull/17944) ([Winter Zhang](https://github.com/zhang2014)).
-* Fixed the issue when query optimization was producing wrong result if query contains `ARRAY JOIN`. [#17887](https://github.com/ClickHouse/ClickHouse/pull/17887) ([sundyli](https://github.com/sundy-li)).
-* Fixed possible segfault in `topK` aggregate function. This closes [#17404](https://github.com/ClickHouse/ClickHouse/issues/17404). [#17845](https://github.com/ClickHouse/ClickHouse/pull/17845) ([Maksim Kita](https://github.com/kitaisreal)).
-* Fixed empty `system.stack_trace` table when server is running in daemon mode. [#17630](https://github.com/ClickHouse/ClickHouse/pull/17630) ([Amos Bird](https://github.com/amosbird)).
-
-
-### ClickHouse release v20.12.3.3-stable, 2020-12-13
+622 PRs added between v20.12.5.14-stable and v21.1.2.15-stable.
+curl: (22) The requested URL returned error: 404 Not Found
+Failed to download 'https://api.github.com/repos/ClickHouse/ClickHouse/pulls/18701' to 'pr18701.json'. Contents: ''.
+curl: (28) Failed to connect to api.github.com port 443: Connection timed out
+Failed to download 'https://api.github.com/repos/ClickHouse/ClickHouse/pulls/17832' to 'pr17832.json'. Contents: ''.
+/home/milovidov/.local/lib/python3.8/site-packages/fuzzywuzzy/fuzz.py:11: UserWarning: Using slow pure-python SequenceMatcher. Install python-Levenshtein to remove this warning
+  warnings.warn('Using slow pure-python SequenceMatcher. Install python-Levenshtein to remove this warning')
+### ClickHouse release v21.1.2.15-stable FIXME as compared to v20.12.5.14-stable
 
 #### Backward Incompatible Change
 
-* Enable `use_compact_format_in_distributed_parts_names` by default (see the documentation for the reference). [#16728](https://github.com/ClickHouse/ClickHouse/pull/16728) ([Azat Khuzhin](https://github.com/azat)).
-* Accept user settings related to file formats (e.g. `format_csv_delimiter`) in the `SETTINGS` clause when creating a table that uses `File` engine, and use these settings in all `INSERT`s and `SELECT`s. The file format settings changed in the current user session, or in the `SETTINGS` clause of a DML query itself, no longer affect the query. [#16591](https://github.com/ClickHouse/ClickHouse/pull/16591) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Remove `sumburConsistentHash` function. This closes [#18120](https://github.com/ClickHouse/ClickHouse/issues/18120). [#18656](https://github.com/ClickHouse/ClickHouse/pull/18656) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Check settings constraints for profile settings from config. Server will fail to start if users.xml contain settings that do not meet corresponding constraints. [#18486](https://github.com/ClickHouse/ClickHouse/pull/18486) ([tavplubix](https://github.com/tavplubix)).
+* Restrict `ALTER MODIFY SETTING` from changing storage settings that affects data parts (`write_final_mark` and `enable_mixed_granularity_parts`). [#18306](https://github.com/ClickHouse/ClickHouse/pull/18306) ([Amos Bird](https://github.com/amosbird)).
+* Set `insert_quorum_parallel` to 1 by default. It is significantly more convenient to use than "sequential" quorum inserts. But if you rely to sequential consistency, you should set the setting back to zero. [#17567](https://github.com/ClickHouse/ClickHouse/pull/17567) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* The setting `input_format_null_as_default` is enabled by default. [#17525](https://github.com/ClickHouse/ClickHouse/pull/17525) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Removed aggregate functions `timeSeriesGroupSum`, `timeSeriesGroupRateSum` because a friend of mine said they never worked. This fixes [#16869](https://github.com/ClickHouse/ClickHouse/issues/16869). If you have luck using these functions, write a email to clickhouse-feedback@yandex-team.com. [#17423](https://github.com/ClickHouse/ClickHouse/pull/17423) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Prohibit toUnixTimestamp(Date()) (before it just returns UInt16 representation of Date). [#17376](https://github.com/ClickHouse/ClickHouse/pull/17376) ([Azat Khuzhin](https://github.com/azat)).
+* Allow using extended integer types (`Int128`, `Int256`, `UInt256`) in `avg` and `avgWeighted` functions. Also allow using different types (integer, decimal, floating point) for value and for weight in `avgWeighted` function. This is a backward-incompatible change: now the `avg` and `avgWeighted` functions always return `Float64` (as documented). Before this change the return type for `Decimal` arguments was also `Decimal`. [#15419](https://github.com/ClickHouse/ClickHouse/pull/15419) ([Mike](https://github.com/myrrc)).
 
 #### New Feature
 
-* add `*.xz` compression/decompression support.It enables using `*.xz` in `file()` function. This closes [#8828](https://github.com/ClickHouse/ClickHouse/issues/8828). [#16578](https://github.com/ClickHouse/ClickHouse/pull/16578) ([Abi Palagashvili](https://github.com/fibersel)).
-* Introduce the query `ALTER TABLE ... DROP|DETACH PART 'part_name'`. [#15511](https://github.com/ClickHouse/ClickHouse/pull/15511) ([nvartolomei](https://github.com/nvartolomei)).
-* Added new ALTER UPDATE/DELETE IN PARTITION syntax. [#13403](https://github.com/ClickHouse/ClickHouse/pull/13403) ([Vladimir Chebotarev](https://github.com/excitoon)).
-* Allow formatting named tuples as JSON objects when using JSON input/output formats, controlled by the `output_format_json_named_tuples_as_objects` setting, disabled by default. [#17175](https://github.com/ClickHouse/ClickHouse/pull/17175) ([Alexander Kuzmenkov](https://github.com/akuzm)).
-* Add a possibility to input enum value as it's id in TSV and CSV formats by default. [#16834](https://github.com/ClickHouse/ClickHouse/pull/16834) ([Kruglov Pavel](https://github.com/Avogar)).
-* Add COLLATE support for Nullable, LowCardinality, Array and Tuple, where nested type is String. Also refactor the code associated with collations in ColumnString.cpp. [#16273](https://github.com/ClickHouse/ClickHouse/pull/16273) ([Kruglov Pavel](https://github.com/Avogar)).
-* New `tcpPort` function returns TCP port listened by this server. [#17134](https://github.com/ClickHouse/ClickHouse/pull/17134) ([Ivan](https://github.com/abyss7)).
-* Add new math functions: `acosh`, `asinh`, `atan2`, `atanh`, `cosh`, `hypot`, `log1p`, `sinh`. [#16636](https://github.com/ClickHouse/ClickHouse/pull/16636) ([Konstantin Malanchev](https://github.com/hombit)).
-* Possibility to distribute the merges between different replicas. Introduces the `execute_merges_on_single_replica_time_threshold` mergetree setting. [#16424](https://github.com/ClickHouse/ClickHouse/pull/16424) ([filimonov](https://github.com/filimonov)).
-* Add setting `aggregate_functions_null_for_empty` for SQL standard compatibility. This option will rewrite all aggregate functions in a query, adding -OrNull suffix to them. Implements [10273](https://github.com/ClickHouse/ClickHouse/issues/10273). [#16123](https://github.com/ClickHouse/ClickHouse/pull/16123) ([flynn](https://github.com/ucasFL)).
-* Updated DateTime, DateTime64 parsing to accept string Date literal format. [#16040](https://github.com/ClickHouse/ClickHouse/pull/16040) ([Maksim Kita](https://github.com/kitaisreal)).
-* Make it possible to change the path to history file in `clickhouse-client` using the `--history_file` parameter. [#15960](https://github.com/ClickHouse/ClickHouse/pull/15960) ([Maksim Kita](https://github.com/kitaisreal)).
+* Function `position` now supports `position(needle in haystack)` synax for SQL compatibility. This closes [#18701](https://github.com/ClickHouse/ClickHouse/issues/18701). ... [#18779](https://github.com/ClickHouse/ClickHouse/pull/18779) ([Jianmei Zhang](https://github.com/zhangjmruc)).
+* Now we have a new storage setting `max_partitions_to_read` for tables in the MergeTree family. It limits the max number of partitions that can be accessed in one query. A user setting `force_max_partition_limit` is also added to enforce this constraint. [#18712](https://github.com/ClickHouse/ClickHouse/pull/18712) ([Amos Bird](https://github.com/amosbird)).
+* Add `query_id` column to `system.part_log` for inserted parts. closes [#10097](https://github.com/ClickHouse/ClickHouse/issues/10097). [#18644](https://github.com/ClickHouse/ClickHouse/pull/18644) ([flynn](https://github.com/ucasFL)).
+* Implemented `REPLACE TABLE` and `CREATE OR REPLACE TABLE` queries. [#18521](https://github.com/ClickHouse/ClickHouse/pull/18521) ([tavplubix](https://github.com/tavplubix)).
+* - IP Dictionary supports key fetching. Resolves [#18241](https://github.com/ClickHouse/ClickHouse/issues/18241). [#18480](https://github.com/ClickHouse/ClickHouse/pull/18480) ([vdimir](https://github.com/vdimir)).
+* Allow create table as select with columns specification. Example `CREATE TABLE t1 (x String) ENGINE = Memory AS SELECT 1;`. [#18060](https://github.com/ClickHouse/ClickHouse/pull/18060) ([Maksim Kita](https://github.com/kitaisreal)).
+* Support `SHOW SETTINGS` statement to show parameters in system.settings. `SHOW CHANGED SETTINGS` and `LIKE/ILIKE` clause are also supported. [#18056](https://github.com/ClickHouse/ClickHouse/pull/18056) ([Jianmei Zhang](https://github.com/zhangjmruc)).
+* Added `arrayMin`, `arrayMax`, `arrayAvg` aggregation functions. [#18032](https://github.com/ClickHouse/ClickHouse/pull/18032) ([Maksim Kita](https://github.com/kitaisreal)).
+* Implemented `ATTACH TABLE name FROM 'path/to/data/' (col1 Type1, ...` query. It creates new table with provided structure and attaches table data from provided directory in `user_files`. [#17903](https://github.com/ClickHouse/ClickHouse/pull/17903) ([tavplubix](https://github.com/tavplubix)).
+* Add settings `min_compress_block_size` and `max_compress_block_size` to MergeTreeSettings, which have higher priority than the global settings and take effect when they are set. close [13890](https://github.com/ClickHouse/ClickHouse/issues/13890). [#17867](https://github.com/ClickHouse/ClickHouse/pull/17867) ([flynn](https://github.com/ucasFL)).
+* Add bitmap64 feature. [#17858](https://github.com/ClickHouse/ClickHouse/pull/17858) ([Andy Yang](https://github.com/andyyzh)).
+* Extended `OPTIMIZE ... DEDUPLICATE` syntax to allow explicit (or implicit with asterisk/column transformers) list of columns to check for duplicates on. ... [#17846](https://github.com/ClickHouse/ClickHouse/pull/17846) ([Vasily Nemkov](https://github.com/Enmk)).
+* Added functions `toMJD`, `fromMJD`, `toMJDOrNull`, and `fromMJDOrNull`. These functions convert between Proleptic Gregorian calendar date and Modified Julian Day number. [#17750](https://github.com/ClickHouse/ClickHouse/pull/17750) ([PHO](https://github.com/depressed-pho)).
+* Add ability to use custom TLD list in functions `firstSignificantSubdomainCustom`, `cutToFirstSignificantSubdomainCustom`. [#17748](https://github.com/ClickHouse/ClickHouse/pull/17748) ([Azat Khuzhin](https://github.com/azat)).
+* Add support for PROXYv1 protocol to wrap native TCP interface. Allow quotas to be keyed by proxy-forwarded IP address (applied for PROXYv1 address and for X-Forwarded-For from HTTP interface). This is useful when you provide access to ClickHouse only via trusted proxy (e.g. CloudFlare) but want to account user resources by their original IP addresses. This fixes [#17268](https://github.com/ClickHouse/ClickHouse/issues/17268). [#17707](https://github.com/ClickHouse/ClickHouse/pull/17707) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Now clickhouse-client supports opening EDITOR to edit commands. `Alt-Shift-E`. [#17665](https://github.com/ClickHouse/ClickHouse/pull/17665) ([Amos Bird](https://github.com/amosbird)).
+* Add function `encodeXMLComponent` to escape characters to place string into XML text node or attribute. [#17659](https://github.com/ClickHouse/ClickHouse/pull/17659) ([nauta](https://github.com/nautaa)).
+* Introduce `DETACH TABLE/VIEW ... PERMANENTLY` syntax, so that after restarting the table does not reappear back automatically (only by explicit request). The table can still be attached back using the short syntax ATTACH TABLE. Implements [#5555](https://github.com/ClickHouse/ClickHouse/issues/5555). Fixes [#13850](https://github.com/ClickHouse/ClickHouse/issues/13850). [#17642](https://github.com/ClickHouse/ClickHouse/pull/17642) ([filimonov](https://github.com/filimonov)).
+* Add asynchronous metrics on total amount of rows, bytes and parts in MergeTree tables. This fix [#11714](https://github.com/ClickHouse/ClickHouse/issues/11714). [#17639](https://github.com/ClickHouse/ClickHouse/pull/17639) ([flynn](https://github.com/ucasFL)).
+* related: [#16176](https://github.com/ClickHouse/ClickHouse/issues/16176) Usage: ``` set limit = 10; set offset = 20; ``` this two settings will affect SELECT query as if it is added like ``` select * from ($your_original_select_query) tmp limit xxx offset xxx; ```. [#17633](https://github.com/ClickHouse/ClickHouse/pull/17633) ([hexiaoting](https://github.com/hexiaoting)).
+* * IP Dictionary supports `IPv4` / `IPv6` types directly. [#17571](https://github.com/ClickHouse/ClickHouse/pull/17571) ([vdimir](https://github.com/vdimir)).
+* add ```*.zst``` compression/decompression support.It enables using ```*.zst``` in ```file()``` function and ```Content-encoding: zstd``` in http client.This closes [#16791 ](https://github.com/ClickHouse/ClickHouse/issues/16791). [#17144](https://github.com/ClickHouse/ClickHouse/pull/17144) ([Abi Palagashvili](https://github.com/fibersel)).
+* Add a setting optimize_on_insert. When enabled, do the same transformation for INSERTed block of data as if merge was done on this block (e.g. Replacing, Collapsing, Aggregating...). This setting will be enabled as default. This can influence Materialized View and MaterializeMySQL behaviour (see detailed description). This closes [#10683](https://github.com/ClickHouse/ClickHouse/issues/10683). [#16954](https://github.com/ClickHouse/ClickHouse/pull/16954) ([Kruglov Pavel](https://github.com/Avogar)).
+* Added `mannWitneyUTest`, `studentTTest` and `welchTTest` aggregate functions. Refactored RankCorr a bit. [#16883](https://github.com/ClickHouse/ClickHouse/pull/16883) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Provide a new aggregator combinator : `-SimpleState` to build SimpleAggregateFunction types via query. It's useful for defining MaterializedView of AggregatingMergeTree engine, and will benefit projections too. [#16853](https://github.com/ClickHouse/ClickHouse/pull/16853) ([Amos Bird](https://github.com/amosbird)).
+* ... [#16819](https://github.com/ClickHouse/ClickHouse/pull/16819) ([Aleksandrov Vladimir](https://github.com/invis87)).
+* Use https://github.com/lemire/fast_float to parse floating point numbers. [#16787](https://github.com/ClickHouse/ClickHouse/pull/16787) ([Maksim Kita](https://github.com/kitaisreal)).
+* Added function `accurateCastOrNull`. This closes [#10290](https://github.com/ClickHouse/ClickHouse/issues/10290). Add type conversions in `x IN (subquery)` expressions. This closes [#10266](https://github.com/ClickHouse/ClickHouse/issues/10266). [#16724](https://github.com/ClickHouse/ClickHouse/pull/16724) ([Maksim Kita](https://github.com/kitaisreal)).
+* Kerberos Authenticaiton for HDFS. [#16621](https://github.com/ClickHouse/ClickHouse/pull/16621) ([Ilya Golshtein](https://github.com/ilejn)).
+* Implement `UNION DISTINCT` and treat the plain `UNION` clause as `UNION DISTINCT` by default. Add a setting `union_default_mode` that allows to treat it as `UNION ALL` or require explicit mode specification. [#16338](https://github.com/ClickHouse/ClickHouse/pull/16338) ([flynn](https://github.com/ucasFL)).
+* Added `queries-file` parameter for clickhouse-client and clickhouse-local. [#15930](https://github.com/ClickHouse/ClickHouse/pull/15930) ([Maksim Kita](https://github.com/kitaisreal)).
+* Add new datatype Map for supporting storage k:v . related to issue: [#1841](https://github.com/ClickHouse/ClickHouse/issues/1841) 1st version for Map only support String type of key and value. Later I will implement Int and other type for key and value. [#15806](https://github.com/ClickHouse/ClickHouse/pull/15806) ([hexiaoting](https://github.com/hexiaoting)).
+* Implement gRPC protocol in ClickHouse. [#15111](https://github.com/ClickHouse/ClickHouse/pull/15111) ([Vitaly Baranov](https://github.com/vitlibar)).
+* - parallel parsing was rewritten to processors - parallel formatting was implemented. [#11617](https://github.com/ClickHouse/ClickHouse/pull/11617) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Added functions `Simhash`, `Minhash`, `bitHammingDistance`, `tupleHammingDistance`. [#7649](https://github.com/ClickHouse/ClickHouse/pull/7649) ([flynn](https://github.com/ucasFL)).
 
 #### Bug Fix
 
-* Fix the issue when server can stop accepting connections in very rare cases. [#17542](https://github.com/ClickHouse/ClickHouse/pull/17542) ([Amos Bird](https://github.com/amosbird)).
-* Fixed `Function not implemented` error when executing `RENAME` query in `Atomic` database with ClickHouse running on Windows Subsystem for Linux. Fixes [#17661](https://github.com/ClickHouse/ClickHouse/issues/17661). [#17664](https://github.com/ClickHouse/ClickHouse/pull/17664) ([tavplubix](https://github.com/tavplubix)).
+* - Split RemoteQueryExecutorReadContext into module part - Fix leaking of pipe fd for `async_socket_for_remote`. [#19153](https://github.com/ClickHouse/ClickHouse/pull/19153) ([Azat Khuzhin](https://github.com/azat)).
+* Fix infinite reading from file in `ORC` format (was introduced in [#10580](https://github.com/ClickHouse/ClickHouse/issues/10580)). Fixes [#19095](https://github.com/ClickHouse/ClickHouse/issues/19095). [#19134](https://github.com/ClickHouse/ClickHouse/pull/19134) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix bug in merge tree data writer which can lead to marks with bigger size than fixed granularity size. Fixes [#18913](https://github.com/ClickHouse/ClickHouse/issues/18913). [#19123](https://github.com/ClickHouse/ClickHouse/pull/19123) ([alesapin](https://github.com/alesapin)).
+* Fix startup bug when clickhouse was not able to read compression codec from `LowCardinality(Nullable(...))` and throws exception `Attempt to read after EOF`. Fixes [#18340](https://github.com/ClickHouse/ClickHouse/issues/18340). [#19101](https://github.com/ClickHouse/ClickHouse/pull/19101) ([alesapin](https://github.com/alesapin)).
+* Simplify the implementation of `tupleHammingDistance`. Support for tuples of any equal length. Fixes [#19029](https://github.com/ClickHouse/ClickHouse/issues/19029). [#19084](https://github.com/ClickHouse/ClickHouse/pull/19084) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Restrict `MODIFY TTL` queries for `MergeTree` tables created in old syntax. Previously the query succeeded, but actually it had no effect. [#19064](https://github.com/ClickHouse/ClickHouse/pull/19064) ([Anton Popov](https://github.com/CurtizJ)).
+* Make sure `groupUniqArray` returns correct type for argument of Enum type. This closes [#17875](https://github.com/ClickHouse/ClickHouse/issues/17875). [#19019](https://github.com/ClickHouse/ClickHouse/pull/19019) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix possible error `Expected single dictionary argument for function` if use function `ignore` with `LowCardinality` argument. Fixes [#14275](https://github.com/ClickHouse/ClickHouse/issues/14275). [#19016](https://github.com/ClickHouse/ClickHouse/pull/19016) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix inserting of `LowCardinality` column to table with `TinyLog` engine. Fixes [#18629](https://github.com/ClickHouse/ClickHouse/issues/18629). [#19010](https://github.com/ClickHouse/ClickHouse/pull/19010) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Join tries to materialize const columns, but our code waits for them in other places. [#18982](https://github.com/ClickHouse/ClickHouse/pull/18982) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Disable `optimize_move_functions_out_of_any` because optimization is not always correct. This closes [#18051](https://github.com/ClickHouse/ClickHouse/issues/18051). This closes [#18973](https://github.com/ClickHouse/ClickHouse/issues/18973). [#18981](https://github.com/ClickHouse/ClickHouse/pull/18981) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix possible exception `QueryPipeline stream: different number of columns` caused by merging of query plan's `Expression` steps. Fixes [#18190](https://github.com/ClickHouse/ClickHouse/issues/18190). [#18980](https://github.com/ClickHouse/ClickHouse/pull/18980) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed very rare deadlock at shutdown. [#18977](https://github.com/ClickHouse/ClickHouse/pull/18977) ([tavplubix](https://github.com/tavplubix)).
+* Fix incorrect behavior when `ALTER TABLE ... DROP PART 'part_name'` query removes all deduplication blocks for the whole partition. Fixes [#18874](https://github.com/ClickHouse/ClickHouse/issues/18874). [#18969](https://github.com/ClickHouse/ClickHouse/pull/18969) ([alesapin](https://github.com/alesapin)).
+* Fix error `Task was not found in task queue` (possible only for remote queries, with `async_socket_for_remote = 1`). [#18964](https://github.com/ClickHouse/ClickHouse/pull/18964) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix bug when mutation with some escaped text (like `ALTER ... UPDATE e = CAST('foo', 'Enum8(\'foo\' = 1')` serialized incorrectly. Fixes [#18878](https://github.com/ClickHouse/ClickHouse/issues/18878). [#18944](https://github.com/ClickHouse/ClickHouse/pull/18944) ([alesapin](https://github.com/alesapin)).
+* Attach partition should reset the mutation. [#18804](https://github.com/ClickHouse/ClickHouse/issues/18804). [#18935](https://github.com/ClickHouse/ClickHouse/pull/18935) ([fastio](https://github.com/fastio)).
+* Fix issue with `bitmapOrCardinality` that may lead to nullptr dereference. This closes [#18911](https://github.com/ClickHouse/ClickHouse/issues/18911). [#18912](https://github.com/ClickHouse/ClickHouse/pull/18912) ([sundyli](https://github.com/sundy-li)).
+* Fix possible hang at shutdown in clickhouse-local. This fixes [#18891](https://github.com/ClickHouse/ClickHouse/issues/18891). [#18893](https://github.com/ClickHouse/ClickHouse/pull/18893) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* change the sorting key of events_list from timestamp to (timestamp, event_index). [#18884](https://github.com/ClickHouse/ClickHouse/pull/18884) ([Fuwang Hu](https://github.com/fuwhu)).
+* Queries for external databases (MySQL, ODBC, JDBC) were incorrectly rewritten if there was an expression in form of `x IN table`. This fixes [#9756](https://github.com/ClickHouse/ClickHouse/issues/9756). [#18876](https://github.com/ClickHouse/ClickHouse/pull/18876) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix use after free bug in rocksdb. [#18862](https://github.com/ClickHouse/ClickHouse/pull/18862) ([sundyli](https://github.com/sundy-li)).
+* - Fix never worked `fsync_part_directory`/`fsync_after_insert`/`in_memory_parts_insert_sync`. [#18845](https://github.com/ClickHouse/ClickHouse/pull/18845) ([Azat Khuzhin](https://github.com/azat)).
+* Fix *If combinator with unary function and Nullable types. [#18806](https://github.com/ClickHouse/ClickHouse/pull/18806) ([Azat Khuzhin](https://github.com/azat)).
+* Asynchronous distributed INSERTs can be rejected by the server if the setting `network_compression_method` is globally set to non-default value. This fixes [#18741](https://github.com/ClickHouse/ClickHouse/issues/18741). [#18776](https://github.com/ClickHouse/ClickHouse/pull/18776) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed `Attempt to read after eof` error when trying to `CAST` `NULL` from `Nullable(String)` to `Nullable(Decimal(P, S))`. Now function `CAST` returns `NULL` when it cannot parse decimal from nullable string. Fixes [#7690](https://github.com/ClickHouse/ClickHouse/issues/7690). [#18718](https://github.com/ClickHouse/ClickHouse/pull/18718) ([Winter Zhang](https://github.com/zhang2014)).
+* Fix Logger with unmatched arg size. [#18717](https://github.com/ClickHouse/ClickHouse/pull/18717) ([sundyli](https://github.com/sundy-li)).
+* Fix removing of empty parts in `ReplicatedMergeTree` tables, created with old syntax. Fixes [#18582](https://github.com/ClickHouse/ClickHouse/issues/18582). [#18614](https://github.com/ClickHouse/ClickHouse/pull/18614) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix previous bug when date overflow with different values. Strict Date value limit to "2106-02-07", cast date > "2106-02-07" to value 0. [#18565](https://github.com/ClickHouse/ClickHouse/pull/18565) ([hexiaoting](https://github.com/hexiaoting)).
+* Add FixedString Data type support. I'll get this exception "Code: 50, e.displayText() = DB::Exception: Unsupported type FixedString(1)" when replicating data from MySQL to ClickHouse. This patch fixes bug [#18450](https://github.com/ClickHouse/ClickHouse/issues/18450) Also fixes [#6556](https://github.com/ClickHouse/ClickHouse/issues/6556). [#18553](https://github.com/ClickHouse/ClickHouse/pull/18553) ([awesomeleo](https://github.com/awesomeleo)).
+* Fix possible `Pipeline stuck` error while using `ORDER BY` after subquery with `RIGHT` or `FULL` join. [#18550](https://github.com/ClickHouse/ClickHouse/pull/18550) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix bug which may lead to `ALTER` queries hung after corresponding mutation kill. Found by thread fuzzer. [#18518](https://github.com/ClickHouse/ClickHouse/pull/18518) ([alesapin](https://github.com/alesapin)).
+* Disable write with AIO during merges because it can lead to extremely rare data corruption of primary key columns during merge. [#18481](https://github.com/ClickHouse/ClickHouse/pull/18481) ([alesapin](https://github.com/alesapin)).
+* Proper support for 12AM in `parseDateTimeBestEffort` function. This fixes [#18402](https://github.com/ClickHouse/ClickHouse/issues/18402). [#18449](https://github.com/ClickHouse/ClickHouse/pull/18449) ([vladimir-golovchenko](https://github.com/vladimir-golovchenko)).
+* Fixed `value is too short` error when executing `toType(...)` functions (`toDate`, `toUInt32`, etc) with argument of type `Nullable(String)`. Now such functions return `NULL` on parsing errors instead of throwing exception. Fixes [#7673](https://github.com/ClickHouse/ClickHouse/issues/7673). [#18445](https://github.com/ClickHouse/ClickHouse/pull/18445) ([tavplubix](https://github.com/tavplubix)).
+* Fix the unexpected behaviour of `SHOW TABLES`. [#18431](https://github.com/ClickHouse/ClickHouse/pull/18431) ([fastio](https://github.com/fastio)).
+* Fix -SimpleState combinator generates incompatible arugment type and return type. [#18404](https://github.com/ClickHouse/ClickHouse/pull/18404) ([Amos Bird](https://github.com/amosbird)).
+* Fix possible race condition in concurrent usage of `Set` or `Join` tables and selects from `system.tables`. [#18385](https://github.com/ClickHouse/ClickHouse/pull/18385) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Restrict merges from wide to compact parts. In case of vertical merge it led to broken result part. [#18381](https://github.com/ClickHouse/ClickHouse/pull/18381) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix filling table `system.settings_profile_elements`. This PR fixes [#18231](https://github.com/ClickHouse/ClickHouse/issues/18231). [#18379](https://github.com/ClickHouse/ClickHouse/pull/18379) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix index analysis of binary functions with constant argument which leads to wrong query results. This fixes [#18364](https://github.com/ClickHouse/ClickHouse/issues/18364). [#18373](https://github.com/ClickHouse/ClickHouse/pull/18373) ([Amos Bird](https://github.com/amosbird)).
+* Fix possible crashes in aggregate functions with combinator `Distinct`, while using two-level aggregation. Fixes [#17682](https://github.com/ClickHouse/ClickHouse/issues/17682). [#18365](https://github.com/ClickHouse/ClickHouse/pull/18365) ([Anton Popov](https://github.com/CurtizJ)).
+* - Fixed issue when `clickhouse-odbc-bridge` process is unreachable by server on machines with dual IPv4/IPv6 stack; - Fixed issue when ODBC dictionary updates are performed using malformed queries and/or cause crashes; Possibly closes [#14489](https://github.com/ClickHouse/ClickHouse/issues/14489). [#18278](https://github.com/ClickHouse/ClickHouse/pull/18278) ([Denis Glazachev](https://github.com/traceon)).
+* `SELECT count() FROM table` now can be executed if only one any column can be selected from the `table`. This PR fixes [#10639](https://github.com/ClickHouse/ClickHouse/issues/10639). [#18233](https://github.com/ClickHouse/ClickHouse/pull/18233) ([Vitaly Baranov](https://github.com/vitlibar)).
+* `SELECT JOIN` now requires the `SELECT` privilege on each of the joined tables. This PR fixes [#17654](https://github.com/ClickHouse/ClickHouse/issues/17654). [#18232](https://github.com/ClickHouse/ClickHouse/pull/18232) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix possible incomplete query result while reading from `MergeTree*` in case of read backoff (message `<Debug> MergeTreeReadPool: Will lower number of threads` in logs). Was introduced in [#16423](https://github.com/ClickHouse/ClickHouse/issues/16423). Fixes [#18137](https://github.com/ClickHouse/ClickHouse/issues/18137). [#18216](https://github.com/ClickHouse/ClickHouse/pull/18216) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix key comparison between Enum and Int types. This fixes [#17989](https://github.com/ClickHouse/ClickHouse/issues/17989). [#18214](https://github.com/ClickHouse/ClickHouse/pull/18214) ([Amos Bird](https://github.com/amosbird)).
+* fixes [#18186](https://github.com/ClickHouse/ClickHouse/issues/18186) fixes [#16372](https://github.com/ClickHouse/ClickHouse/issues/16372) fix unique key convert crash in MaterializeMySQL database engine. [#18211](https://github.com/ClickHouse/ClickHouse/pull/18211) ([Winter Zhang](https://github.com/zhang2014)).
+* Related to [#17466](https://github.com/ClickHouse/ClickHouse/issues/17466). [#18188](https://github.com/ClickHouse/ClickHouse/pull/18188) ([hexiaoting](https://github.com/hexiaoting)).
+* Fix inserting a row with default value in case of parsing error in the last column. Fixes [#17712](https://github.com/ClickHouse/ClickHouse/issues/17712). [#18182](https://github.com/ClickHouse/ClickHouse/pull/18182) ([Jianmei Zhang](https://github.com/zhangjmruc)).
+* Fix `Unknown setting profile` error on attempt to set settings profile. [#18167](https://github.com/ClickHouse/ClickHouse/pull/18167) ([tavplubix](https://github.com/tavplubix)).
+* Fix error when query `MODIFY COLUMN ... REMOVE TTL` doesn't actually remove column TTL. [#18130](https://github.com/ClickHouse/ClickHouse/pull/18130) ([alesapin](https://github.com/alesapin)).
+* Fixed `std::out_of_range: basic_string` in S3 URL parsing. [#18059](https://github.com/ClickHouse/ClickHouse/pull/18059) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Fix corruption in librdkafka snappy decompression (was a problem only for gcc10 builds, but official builds uses clang already, so at least recent official releases are not affected). [#18053](https://github.com/ClickHouse/ClickHouse/pull/18053) ([Azat Khuzhin](https://github.com/azat)).
+* Fix comparison of `DateTime64` and `Date`. Fixes [#13804](https://github.com/ClickHouse/ClickHouse/issues/13804) and [#11222](https://github.com/ClickHouse/ClickHouse/issues/11222). ... [#18050](https://github.com/ClickHouse/ClickHouse/pull/18050) ([Vasily Nemkov](https://github.com/Enmk)).
+* fixes [#15187](https://github.com/ClickHouse/ClickHouse/issues/15187) fixes [#17912](https://github.com/ClickHouse/ClickHouse/issues/17912) support convert MySQL prefix index for MaterializeMySQL CC: @tavplubix. [#17944](https://github.com/ClickHouse/ClickHouse/pull/17944) ([Winter Zhang](https://github.com/zhang2014)).
+* When server log rotation was configured using `logger.size` parameter with numeric value larger than 2^32, the logs were not rotated properly. This is fixed. [#17905](https://github.com/ClickHouse/ClickHouse/pull/17905) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Fix comparison of `DateTime64` and `Date`. Fixes [#13804](https://github.com/ClickHouse/ClickHouse/issues/13804) and [#11222](https://github.com/ClickHouse/ClickHouse/issues/11222). ... [#17895](https://github.com/ClickHouse/ClickHouse/pull/17895) ([Vasily Nemkov](https://github.com/Enmk)).
+* Trivial query optimization was producing wrong result if query contains ARRAY JOIN (so query is actually non trivial). [#17887](https://github.com/ClickHouse/ClickHouse/pull/17887) ([sundyli](https://github.com/sundy-li)).
+* Fix max_distributed_connections (affects `prefer_localhost_replica=1` and `max_threads!=max_distributed_connections`). [#17848](https://github.com/ClickHouse/ClickHouse/pull/17848) ([Azat Khuzhin](https://github.com/azat)).
+* Fix possible segfault in `topK` aggregate function. This closes [#17404](https://github.com/ClickHouse/ClickHouse/issues/17404). [#17845](https://github.com/ClickHouse/ClickHouse/pull/17845) ([Maksim Kita](https://github.com/kitaisreal)).
+* fix incorrect initialize `max_compress_block_size` of MergeTreeWriterSettings with `min_compress_block_size`. [#17833](https://github.com/ClickHouse/ClickHouse/pull/17833) ([flynn](https://github.com/ucasFL)).
 * Do not restore parts from WAL if `in_memory_parts_enable_wal` is disabled. [#17802](https://github.com/ClickHouse/ClickHouse/pull/17802) ([detailyang](https://github.com/detailyang)).
-* fix incorrect initialization of `max_compress_block_size` of MergeTreeWriterSettings with `min_compress_block_size`. [#17833](https://github.com/ClickHouse/ClickHouse/pull/17833) ([flynn](https://github.com/ucasFL)).
 * Exception message about max table size to drop was displayed incorrectly. [#17764](https://github.com/ClickHouse/ClickHouse/pull/17764) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed possible segfault when there is not enough space when inserting into `Distributed` table. [#17737](https://github.com/ClickHouse/ClickHouse/pull/17737) ([tavplubix](https://github.com/tavplubix)).
+* Fixed segfault when there is not enough space when inserting into `Distributed` table. [#17737](https://github.com/ClickHouse/ClickHouse/pull/17737) ([tavplubix](https://github.com/tavplubix)).
 * Fixed problem when ClickHouse fails to resume connection to MySQL servers. [#17681](https://github.com/ClickHouse/ClickHouse/pull/17681) ([Alexander Kazakov](https://github.com/Akazz)).
+* Fixed `Function not implemented` error when executing `RENAME` query in `Atomic` database with ClickHouse running on Windows Subsystem for Linux. Fixes [#17661](https://github.com/ClickHouse/ClickHouse/issues/17661). [#17664](https://github.com/ClickHouse/ClickHouse/pull/17664) ([tavplubix](https://github.com/tavplubix)).
 * In might be determined incorrectly if cluster is circular- (cross-) replicated or not when executing `ON CLUSTER` query due to race condition when `pool_size` > 1. It's fixed. [#17640](https://github.com/ClickHouse/ClickHouse/pull/17640) ([tavplubix](https://github.com/tavplubix)).
+* Fix empty `system.stack_trace` table when server is running in daemon mode. [#17630](https://github.com/ClickHouse/ClickHouse/pull/17630) ([Amos Bird](https://github.com/amosbird)).
 * Exception `fmt::v7::format_error` can be logged in background for MergeTree tables. This fixes [#17613](https://github.com/ClickHouse/ClickHouse/issues/17613). [#17615](https://github.com/ClickHouse/ClickHouse/pull/17615) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * When clickhouse-client is used in interactive mode with multiline queries, single line comment was erronously extended till the end of query. This fixes [#13654](https://github.com/ClickHouse/ClickHouse/issues/13654). [#17565](https://github.com/ClickHouse/ClickHouse/pull/17565) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix the issue when server can stop accepting connections in very rare cases. [#17542](https://github.com/ClickHouse/ClickHouse/pull/17542) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Fix alter query hang when the corresponding mutation was killed on the different replica. Fixes [#16953](https://github.com/ClickHouse/ClickHouse/issues/16953). [#17499](https://github.com/ClickHouse/ClickHouse/pull/17499) ([alesapin](https://github.com/alesapin)).
-* Fix issue when mark cache size was underestimated by clickhouse. It may happen when there are a lot of tiny files with marks. [#17496](https://github.com/ClickHouse/ClickHouse/pull/17496) ([alesapin](https://github.com/alesapin)).
+* Fix bug when mark cache size was underestimated by clickhouse. It may happen when there are a lot of tiny files with marks. [#17496](https://github.com/ClickHouse/ClickHouse/pull/17496) ([alesapin](https://github.com/alesapin)).
 * Fix `ORDER BY` with enabled setting `optimize_redundant_functions_in_order_by`. [#17471](https://github.com/ClickHouse/ClickHouse/pull/17471) ([Anton Popov](https://github.com/CurtizJ)).
+* Avoid server abnormal termination in case of too low memory limits (`max_memory_usage=1`/`max_untracked_memory=1`). [#17453](https://github.com/ClickHouse/ClickHouse/pull/17453) ([Azat Khuzhin](https://github.com/azat)).
 * Fix duplicates after `DISTINCT` which were possible because of incorrect optimization. Fixes [#17294](https://github.com/ClickHouse/ClickHouse/issues/17294). [#17296](https://github.com/ClickHouse/ClickHouse/pull/17296) ([li chengxiang](https://github.com/chengxianglibra)). [#17439](https://github.com/ClickHouse/ClickHouse/pull/17439) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed high CPU usage in background tasks of *MergeTree tables. [#17416](https://github.com/ClickHouse/ClickHouse/pull/17416) ([tavplubix](https://github.com/tavplubix)).
 * Fix crash while reading from `JOIN` table with `LowCardinality` types. Fixes [#17228](https://github.com/ClickHouse/ClickHouse/issues/17228). [#17397](https://github.com/ClickHouse/ClickHouse/pull/17397) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* fix `toInt256(inf)` stack overflow. Int256 is an experimental feature. Closed [#17235](https://github.com/ClickHouse/ClickHouse/issues/17235). [#17257](https://github.com/ClickHouse/ClickHouse/pull/17257) ([flynn](https://github.com/ucasFL)).
-* Fix possible `Unexpected packet Data received from client` error logged for Distributed queries with `LIMIT`. [#17254](https://github.com/ClickHouse/ClickHouse/pull/17254) ([Azat Khuzhin](https://github.com/azat)).
-* Fix set index invalidation when there are const columns in the subquery. This fixes [#17246](https://github.com/ClickHouse/ClickHouse/issues/17246). [#17249](https://github.com/ClickHouse/ClickHouse/pull/17249) ([Amos Bird](https://github.com/amosbird)).
+* fixes [#16835](https://github.com/ClickHouse/ClickHouse/issues/16835) try fix miss match header with MySQL SHOW statement. [#17366](https://github.com/ClickHouse/ClickHouse/pull/17366) ([Winter Zhang](https://github.com/zhang2014)).
+* Fix indeterministic functions with predicate optimizer. This fixes [#17244](https://github.com/ClickHouse/ClickHouse/issues/17244). [#17273](https://github.com/ClickHouse/ClickHouse/pull/17273) ([Winter Zhang](https://github.com/zhang2014)).
+* Fix possible `Unexpected packet Data received from client` error for Distributed queries with `LIMIT`. [#17254](https://github.com/ClickHouse/ClickHouse/pull/17254) ([Azat Khuzhin](https://github.com/azat)).
+* Fix set index invalidation when there are const columns in the subquery. This fixes [#17246](https://github.com/ClickHouse/ClickHouse/issues/17246) . [#17249](https://github.com/ClickHouse/ClickHouse/pull/17249) ([Amos Bird](https://github.com/amosbird)).
+* Fix [#15235](https://github.com/ClickHouse/ClickHouse/issues/15235). When clickhouse-copier handle non-partitioned table, throws segfault error. [#17248](https://github.com/ClickHouse/ClickHouse/pull/17248) ([Qi Chen](https://github.com/kaka11chen)).
+* Fixed possible not-working mutations for parts stored on S3 disk. [#17227](https://github.com/ClickHouse/ClickHouse/pull/17227) ([Pavel Kovalenko](https://github.com/Jokser)).
 * Fix possible wrong index analysis when the types of the index comparison are different. This fixes [#17122](https://github.com/ClickHouse/ClickHouse/issues/17122). [#17145](https://github.com/ClickHouse/ClickHouse/pull/17145) ([Amos Bird](https://github.com/amosbird)).
-* Fix ColumnConst comparison which leads to crash. This fixed [#17088](https://github.com/ClickHouse/ClickHouse/issues/17088) . [#17135](https://github.com/ClickHouse/ClickHouse/pull/17135) ([Amos Bird](https://github.com/amosbird)).
-* Multiple fixed for MaterializeMySQL (experimental feature). Fixes [#16923](https://github.com/ClickHouse/ClickHouse/issues/16923) Fixes [#15883](https://github.com/ClickHouse/ClickHouse/issues/15883) Fix MaterializeMySQL SYNC failure when the modify MySQL binlog_checksum. [#17091](https://github.com/ClickHouse/ClickHouse/pull/17091) ([Winter Zhang](https://github.com/zhang2014)).
-* Fix bug when `ON CLUSTER` queries may hang forever for non-leader ReplicatedMergeTreeTables. [#17089](https://github.com/ClickHouse/ClickHouse/pull/17089) ([alesapin](https://github.com/alesapin)).
-* Fixed crash on `CREATE TABLE ... AS some_table` query when `some_table` was created `AS table_function()` Fixes [#16944](https://github.com/ClickHouse/ClickHouse/issues/16944). [#17072](https://github.com/ClickHouse/ClickHouse/pull/17072) ([tavplubix](https://github.com/tavplubix)).
-* Bug unfinished implementation for funciton fuzzBits, related issue: [#16980](https://github.com/ClickHouse/ClickHouse/issues/16980). [#17051](https://github.com/ClickHouse/ClickHouse/pull/17051) ([hexiaoting](https://github.com/hexiaoting)).
-* Fix LLVM's libunwind in the case when CFA register is RAX. This is the [bug](https://bugs.llvm.org/show_bug.cgi?id=48186) in [LLVM's libunwind](https://github.com/llvm/llvm-project/tree/master/libunwind). We already have workarounds for this bug. [#17046](https://github.com/ClickHouse/ClickHouse/pull/17046) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Avoid unnecessary network errors for remote queries which may be cancelled while execution, like queries with `LIMIT`. [#17006](https://github.com/ClickHouse/ClickHouse/pull/17006) ([Azat Khuzhin](https://github.com/azat)).
-* Fix `optimize_distributed_group_by_sharding_key` setting (that is disabled by default) for query with OFFSET only. [#16996](https://github.com/ClickHouse/ClickHouse/pull/16996) ([Azat Khuzhin](https://github.com/azat)).
-* Fix for Merge tables over Distributed tables with JOIN. [#16993](https://github.com/ClickHouse/ClickHouse/pull/16993) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed wrong result in big integers (128, 256 bit) when casting from double. Big integers support is experimental. [#16986](https://github.com/ClickHouse/ClickHouse/pull/16986) ([Mike](https://github.com/myrrc)).
-* Fix possible server crash after `ALTER TABLE ... MODIFY COLUMN ... NewType` when `SELECT` have `WHERE` expression on altering column and alter doesn't finished yet. [#16968](https://github.com/ClickHouse/ClickHouse/pull/16968) ([Amos Bird](https://github.com/amosbird)).
-* Blame info was not calculated correctly in `clickhouse-git-import`. [#16959](https://github.com/ClickHouse/ClickHouse/pull/16959) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Bug fix for funciton fuzzBits, related issue: [#16980](https://github.com/ClickHouse/ClickHouse/issues/16980). [#17051](https://github.com/ClickHouse/ClickHouse/pull/17051) ([hexiaoting](https://github.com/hexiaoting)).
+* - Fix optimize_distributed_group_by_sharding_key for query with OFFSET only. [#16996](https://github.com/ClickHouse/ClickHouse/pull/16996) ([Azat Khuzhin](https://github.com/azat)).
+* Fix Merge(Distributed()) with JOIN. [#16993](https://github.com/ClickHouse/ClickHouse/pull/16993) ([Azat Khuzhin](https://github.com/azat)).
 * Fix order by optimization with monotonous functions. Fixes [#16107](https://github.com/ClickHouse/ClickHouse/issues/16107). [#16956](https://github.com/ClickHouse/ClickHouse/pull/16956) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix incorrect comparison of types `DateTime64` with different scales. Fixes [#16655](https://github.com/ClickHouse/ClickHouse/issues/16655) ... [#16952](https://github.com/ClickHouse/ClickHouse/pull/16952) ([Vasily Nemkov](https://github.com/Enmk)).
 * Fix optimization of group by with enabled setting `optimize_aggregators_of_group_by_keys` and joins. Fixes [#12604](https://github.com/ClickHouse/ClickHouse/issues/12604). [#16951](https://github.com/ClickHouse/ClickHouse/pull/16951) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix possible error `Illegal type of argument` for queries with `ORDER BY`. Fixes [#16580](https://github.com/ClickHouse/ClickHouse/issues/16580). [#16928](https://github.com/ClickHouse/ClickHouse/pull/16928) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix strange code in InterpreterShowAccessQuery. [#16866](https://github.com/ClickHouse/ClickHouse/pull/16866) ([tavplubix](https://github.com/tavplubix)).
-* Prevent clickhouse server crashes when using the function `timeSeriesGroupSum`. The function is removed from newer ClickHouse releases. [#16865](https://github.com/ClickHouse/ClickHouse/pull/16865) ([filimonov](https://github.com/filimonov)).
-* Fix rare silent crashes when query profiler is on and ClickHouse is installed on OS with glibc version that has (supposedly) broken asynchronous unwind tables for some functions. This fixes [#15301](https://github.com/ClickHouse/ClickHouse/issues/15301). This fixes [#13098](https://github.com/ClickHouse/ClickHouse/issues/13098). [#16846](https://github.com/ClickHouse/ClickHouse/pull/16846) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix crash when using `any` without any arguments. This is for [#16803](https://github.com/ClickHouse/ClickHouse/issues/16803) . cc @azat. [#16826](https://github.com/ClickHouse/ClickHouse/pull/16826) ([Amos Bird](https://github.com/amosbird)).
-* If no memory can be allocated while writing table metadata on disk, broken metadata file can be written. [#16772](https://github.com/ClickHouse/ClickHouse/pull/16772) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix trivial query optimization with partition predicate. [#16767](https://github.com/ClickHouse/ClickHouse/pull/16767) ([Azat Khuzhin](https://github.com/azat)).
-* Fix `IN` operator over several columns and tuples with enabled `transform_null_in` setting. Fixes [#15310](https://github.com/ClickHouse/ClickHouse/issues/15310). [#16722](https://github.com/ClickHouse/ClickHouse/pull/16722) ([Anton Popov](https://github.com/CurtizJ)).
+* TODO. [#16866](https://github.com/ClickHouse/ClickHouse/pull/16866) ([tavplubix](https://github.com/tavplubix)).
+* Fix bug when clickhouse-server doesn't send `close` request to ZooKeeper server. [#16837](https://github.com/ClickHouse/ClickHouse/pull/16837) ([alesapin](https://github.com/alesapin)).
+* Fix optimize_trivial_count_query with partition predicate. [#16767](https://github.com/ClickHouse/ClickHouse/pull/16767) ([Azat Khuzhin](https://github.com/azat)).
 * Return number of affected rows for INSERT queries via MySQL protocol. Previously ClickHouse used to always return 0, it's fixed. Fixes [#16605](https://github.com/ClickHouse/ClickHouse/issues/16605). [#16715](https://github.com/ClickHouse/ClickHouse/pull/16715) ([Winter Zhang](https://github.com/zhang2014)).
-* Fix remote query failure when using 'if' suffix aggregate function. Fixes [#16574](https://github.com/ClickHouse/ClickHouse/issues/16574) Fixes [#16231](https://github.com/ClickHouse/ClickHouse/issues/16231) [#16610](https://github.com/ClickHouse/ClickHouse/pull/16610) ([Winter Zhang](https://github.com/zhang2014)).
 * Fix inconsistent behavior caused by `select_sequential_consistency` for optimized trivial count query and system.tables. [#16309](https://github.com/ClickHouse/ClickHouse/pull/16309) ([Hao Chen](https://github.com/haoch)).
-
-#### Improvement
-
-* Remove empty parts after they were pruned by TTL, mutation, or collapsing merge algorithm. [#16895](https://github.com/ClickHouse/ClickHouse/pull/16895) ([Anton Popov](https://github.com/CurtizJ)).
-* Enable compact format of directories for asynchronous sends in Distributed tables: `use_compact_format_in_distributed_parts_names` is set to 1 by default. [#16788](https://github.com/ClickHouse/ClickHouse/pull/16788) ([Azat Khuzhin](https://github.com/azat)).
-* Abort multipart upload if no data was written to S3. [#16840](https://github.com/ClickHouse/ClickHouse/pull/16840) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Reresolve the IP of the `format_avro_schema_registry_url` in case of errors. [#16985](https://github.com/ClickHouse/ClickHouse/pull/16985) ([filimonov](https://github.com/filimonov)).
-* Mask password in data_path in the system.distribution_queue. [#16727](https://github.com/ClickHouse/ClickHouse/pull/16727) ([Azat Khuzhin](https://github.com/azat)).
-* Throw error when use column transformer replaces non existing column. [#16183](https://github.com/ClickHouse/ClickHouse/pull/16183) ([hexiaoting](https://github.com/hexiaoting)).
-* Turn off parallel parsing when there is no enough memory for all threads to work simultaneously. Also there could be exceptions like "Memory limit exceeded" when somebody will try to insert extremely huge rows (> min_chunk_bytes_for_parallel_parsing), because each piece to parse has to be independent set of strings (one or more). [#16721](https://github.com/ClickHouse/ClickHouse/pull/16721) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Install script should always create subdirs in config folders. This is only relevant for Docker build with custom config. [#16936](https://github.com/ClickHouse/ClickHouse/pull/16936) ([filimonov](https://github.com/filimonov)).
-* Correct grammar in error message in JSONEachRow, JSONCompactEachRow, and RegexpRow input formats. [#17205](https://github.com/ClickHouse/ClickHouse/pull/17205) ([nico piderman](https://github.com/sneako)).
-* Set default `host` and `port` parameters for `SOURCE(CLICKHOUSE(...))` to current instance and set default `user` value to `'default'`. [#16997](https://github.com/ClickHouse/ClickHouse/pull/16997) ([vdimir](https://github.com/vdimir)).
-* Throw an informative error message when doing `ATTACH/DETACH TABLE <DICTIONARY>`. Before this PR, `detach table <dict>` works but leads to an ill-formed in-memory metadata. [#16885](https://github.com/ClickHouse/ClickHouse/pull/16885) ([Amos Bird](https://github.com/amosbird)).
-* Add cutToFirstSignificantSubdomainWithWWW(). [#16845](https://github.com/ClickHouse/ClickHouse/pull/16845) ([Azat Khuzhin](https://github.com/azat)).
-* Server refused to startup with exception message if wrong config is given (`metric_log`.`collect_interval_milliseconds` is missing). [#16815](https://github.com/ClickHouse/ClickHouse/pull/16815) ([Ivan](https://github.com/abyss7)).
-* Better exception message when configuration for distributed DDL is absent. This fixes [#5075](https://github.com/ClickHouse/ClickHouse/issues/5075). [#16769](https://github.com/ClickHouse/ClickHouse/pull/16769) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Usability improvement: better suggestions in syntax error message when `CODEC` expression is misplaced in `CREATE TABLE` query. This fixes [#12493](https://github.com/ClickHouse/ClickHouse/issues/12493). [#16768](https://github.com/ClickHouse/ClickHouse/pull/16768) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Remove empty directories for async INSERT at start of Distributed engine. [#16729](https://github.com/ClickHouse/ClickHouse/pull/16729) ([Azat Khuzhin](https://github.com/azat)).
-* Workaround for use S3 with nginx server as proxy. Nginx currenty does not accept urls with empty path like `http://domain.com?delete`, but vanilla aws-sdk-cpp produces this kind of urls. This commit uses patched aws-sdk-cpp version, which makes urls with "/" as path in this cases, like `http://domain.com/?delete`. [#16709](https://github.com/ClickHouse/ClickHouse/pull/16709) ([ianton-ru](https://github.com/ianton-ru)).
-* Allow `reinterpretAs*` functions to work for integers and floats of the same size. Implements [16640](https://github.com/ClickHouse/ClickHouse/issues/16640). [#16657](https://github.com/ClickHouse/ClickHouse/pull/16657) ([flynn](https://github.com/ucasFL)).
-* Now, `<auxiliary_zookeepers>` configuration can be changed in `config.xml` and reloaded without server startup. [#16627](https://github.com/ClickHouse/ClickHouse/pull/16627) ([Amos Bird](https://github.com/amosbird)).
-* Support SNI in https connections to remote resources. This will allow to connect to Cloudflare servers that require SNI. This fixes [#10055](https://github.com/ClickHouse/ClickHouse/issues/10055). [#16252](https://github.com/ClickHouse/ClickHouse/pull/16252) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Make it possible to connect to `clickhouse-server` secure endpoint which requires SNI. This is possible when `clickhouse-server` is hosted behind TLS proxy. [#16938](https://github.com/ClickHouse/ClickHouse/pull/16938) ([filimonov](https://github.com/filimonov)).
-* Fix possible stack overflow if a loop of materialized views is created. This closes [#15732](https://github.com/ClickHouse/ClickHouse/issues/15732). [#16048](https://github.com/ClickHouse/ClickHouse/pull/16048) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Simplify the implementation of background tasks processing for the MergeTree table engines family. There should be no visible changes for user. [#15983](https://github.com/ClickHouse/ClickHouse/pull/15983) ([alesapin](https://github.com/alesapin)).
-* Improvement for MaterializeMySQL (experimental feature). Throw exception about right sync privileges when MySQL sync user has error privileges. [#15977](https://github.com/ClickHouse/ClickHouse/pull/15977) ([TCeason](https://github.com/TCeason)).
-* Made `indexOf()` use BloomFilter. [#14977](https://github.com/ClickHouse/ClickHouse/pull/14977) ([achimbab](https://github.com/achimbab)).
-
-#### Performance Improvement
-
-* Use Floyd-Rivest algorithm, it is the best for the ClickHouse use case of partial sorting. Bechmarks are in https://github.com/danlark1/miniselect and [here](https://drive.google.com/drive/folders/1DHEaeXgZuX6AJ9eByeZ8iQVQv0ueP8XM). [#16825](https://github.com/ClickHouse/ClickHouse/pull/16825) ([Danila Kutenin](https://github.com/danlark1)).
-* Now `ReplicatedMergeTree` tree engines family uses a separate thread pool for replicated fetches. Size of the pool limited by setting `background_fetches_pool_size` which can be tuned with a server restart. The default value of the setting is 3 and it means that the maximum amount of parallel fetches is equal to 3 (and it allows to utilize 10G network). Fixes #520. [#16390](https://github.com/ClickHouse/ClickHouse/pull/16390) ([alesapin](https://github.com/alesapin)).
-* Fixed uncontrolled growth of the state of `quantileTDigest`. [#16680](https://github.com/ClickHouse/ClickHouse/pull/16680) ([hrissan](https://github.com/hrissan)).
-* Add `VIEW` subquery description to `EXPLAIN`. Limit push down optimisation for `VIEW`. Add local replicas of `Distributed` to query plan. [#14936](https://github.com/ClickHouse/ClickHouse/pull/14936) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix optimize_read_in_order/optimize_aggregation_in_order with max_threads > 0 and expression in ORDER BY. [#16637](https://github.com/ClickHouse/ClickHouse/pull/16637) ([Azat Khuzhin](https://github.com/azat)).
-* Fix performance of reading from `Merge` tables over huge number of `MergeTree` tables. Fixes [#7748](https://github.com/ClickHouse/ClickHouse/issues/7748). [#16988](https://github.com/ClickHouse/ClickHouse/pull/16988) ([Anton Popov](https://github.com/CurtizJ)).
-* Now we can safely prune partitions with exact match. Useful case: Suppose table is partitioned by `intHash64(x) % 100` and the query has condition on `intHash64(x) % 100` verbatim, not on x. [#16253](https://github.com/ClickHouse/ClickHouse/pull/16253) ([Amos Bird](https://github.com/amosbird)).
-
-#### Experimental Feature
-
-* Add `EmbeddedRocksDB` table engine (can be used for dictionaries). [#15073](https://github.com/ClickHouse/ClickHouse/pull/15073) ([sundyli](https://github.com/sundy-li)).
-
-#### Build/Testing/Packaging Improvement
-
-* Improvements in test coverage building images. [#17233](https://github.com/ClickHouse/ClickHouse/pull/17233) ([alesapin](https://github.com/alesapin)).
-* Update embedded timezone data to version 2020d (also update cctz to the latest master). [#17204](https://github.com/ClickHouse/ClickHouse/pull/17204) ([filimonov](https://github.com/filimonov)).
-* Fix UBSan report in Poco. This closes [#12719](https://github.com/ClickHouse/ClickHouse/issues/12719). [#16765](https://github.com/ClickHouse/ClickHouse/pull/16765) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Do not instrument 3rd-party libraries with UBSan. [#16764](https://github.com/ClickHouse/ClickHouse/pull/16764) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix UBSan report in cache dictionaries. This closes [#12641](https://github.com/ClickHouse/ClickHouse/issues/12641). [#16763](https://github.com/ClickHouse/ClickHouse/pull/16763) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix UBSan report when trying to convert infinite floating point number to integer. This closes [#14190](https://github.com/ClickHouse/ClickHouse/issues/14190). [#16677](https://github.com/ClickHouse/ClickHouse/pull/16677) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-
-
-## ClickHouse release 20.11
-
-### ClickHouse release v20.11.6.6-stable, 2020-12-24
-
-#### Bug Fix
-
-* Fixed issue when `clickhouse-odbc-bridge` process is unreachable by server on machines with dual `IPv4/IPv6 stack` and fixed issue when ODBC dictionary updates are performed using malformed queries and/or cause crashes. This possibly closes [#14489](https://github.com/ClickHouse/ClickHouse/issues/14489). [#18278](https://github.com/ClickHouse/ClickHouse/pull/18278) ([Denis Glazachev](https://github.com/traceon)).
-* Fixed key comparison between Enum and Int types. This fixes [#17989](https://github.com/ClickHouse/ClickHouse/issues/17989). [#18214](https://github.com/ClickHouse/ClickHouse/pull/18214) ([Amos Bird](https://github.com/amosbird)).
-* Fixed unique key convert crash in `MaterializeMySQL` database engine. This fixes [#18186](https://github.com/ClickHouse/ClickHouse/issues/18186) and fixes [#16372](https://github.com/ClickHouse/ClickHouse/issues/16372)  [#18211](https://github.com/ClickHouse/ClickHouse/pull/18211) ([Winter Zhang](https://github.com/zhang2014)).
-* Fixed `std::out_of_range: basic_string` in S3 URL parsing. [#18059](https://github.com/ClickHouse/ClickHouse/pull/18059) ([Vladimir Chebotarev](https://github.com/excitoon)).
-* Fixed the issue when some tables not synchronized to ClickHouse from MySQL caused by the fact that convertion MySQL prefix index wasn't supported for MaterializeMySQL. This fixes [#15187](https://github.com/ClickHouse/ClickHouse/issues/15187) and fixes [#17912](https://github.com/ClickHouse/ClickHouse/issues/17912)  [#17944](https://github.com/ClickHouse/ClickHouse/pull/17944) ([Winter Zhang](https://github.com/zhang2014)).
-* Fixed the issue when query optimization was producing wrong result if query contains `ARRAY JOIN`. [#17887](https://github.com/ClickHouse/ClickHouse/pull/17887) ([sundyli](https://github.com/sundy-li)).
-* Fix possible segfault in `topK` aggregate function. This closes [#17404](https://github.com/ClickHouse/ClickHouse/issues/17404). [#17845](https://github.com/ClickHouse/ClickHouse/pull/17845) ([Maksim Kita](https://github.com/kitaisreal)).
-* Do not restore parts from WAL if `in_memory_parts_enable_wal` is disabled. [#17802](https://github.com/ClickHouse/ClickHouse/pull/17802) ([detailyang](https://github.com/detailyang)).
-* Fixed problem when ClickHouse fails to resume connection to MySQL servers. [#17681](https://github.com/ClickHouse/ClickHouse/pull/17681) ([Alexander Kazakov](https://github.com/Akazz)).
-* Fixed inconsistent behaviour of `optimize_trivial_count_query` with partition predicate. [#17644](https://github.com/ClickHouse/ClickHouse/pull/17644) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed empty `system.stack_trace` table when server is running in daemon mode. [#17630](https://github.com/ClickHouse/ClickHouse/pull/17630) ([Amos Bird](https://github.com/amosbird)).
-* Fixed the behaviour when xxception `fmt::v7::format_error` can be logged in background for MergeTree tables. This fixes [#17613](https://github.com/ClickHouse/ClickHouse/issues/17613). [#17615](https://github.com/ClickHouse/ClickHouse/pull/17615) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed the behaviour when clickhouse-client is used in interactive mode with multiline queries and single line comment was erronously extended till the end of query. This fixes [#13654](https://github.com/ClickHouse/ClickHouse/issues/13654). [#17565](https://github.com/ClickHouse/ClickHouse/pull/17565) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed the issue when server can stop accepting connections in very rare cases. [#17542](https://github.com/ClickHouse/ClickHouse/pull/17542) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed alter query hang when the corresponding mutation was killed on the different replica. This fixes [#16953](https://github.com/ClickHouse/ClickHouse/issues/16953). [#17499](https://github.com/ClickHouse/ClickHouse/pull/17499) ([alesapin](https://github.com/alesapin)).
-* Fixed bug when mark cache size was underestimated by clickhouse. It may happen when there are a lot of tiny files with marks. [#17496](https://github.com/ClickHouse/ClickHouse/pull/17496) ([alesapin](https://github.com/alesapin)).
-* Fixed `ORDER BY` with enabled setting `optimize_redundant_functions_in_order_by`. [#17471](https://github.com/ClickHouse/ClickHouse/pull/17471) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed duplicates after `DISTINCT` which were possible because of incorrect optimization. This fixes [#17294](https://github.com/ClickHouse/ClickHouse/issues/17294). [#17296](https://github.com/ClickHouse/ClickHouse/pull/17296) ([li chengxiang](https://github.com/chengxianglibra)). [#17439](https://github.com/ClickHouse/ClickHouse/pull/17439) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed crash while reading from `JOIN` table with `LowCardinality` types. This fixes [#17228](https://github.com/ClickHouse/ClickHouse/issues/17228). [#17397](https://github.com/ClickHouse/ClickHouse/pull/17397) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed set index invalidation when there are const columns in the subquery. This fixes [#17246](https://github.com/ClickHouse/ClickHouse/issues/17246) . [#17249](https://github.com/ClickHouse/ClickHouse/pull/17249) ([Amos Bird](https://github.com/amosbird)).
-* Fixed possible wrong index analysis when the types of the index comparison are different. This fixes [#17122](https://github.com/ClickHouse/ClickHouse/issues/17122). [#17145](https://github.com/ClickHouse/ClickHouse/pull/17145) ([Amos Bird](https://github.com/amosbird)).
-* Fixed `ColumnConst` comparison which leads to crash. This fixes [#17088](https://github.com/ClickHouse/ClickHouse/issues/17088) . [#17135](https://github.com/ClickHouse/ClickHouse/pull/17135) ([Amos Bird](https://github.com/amosbird)).
-* Fixed bug when `ON CLUSTER` queries may hang forever for non-leader `ReplicatedMergeTreeTables`. [#17089](https://github.com/ClickHouse/ClickHouse/pull/17089) ([alesapin](https://github.com/alesapin)).
-* Fixed fuzzer-found bug in funciton `fuzzBits`. This fixes [#16980](https://github.com/ClickHouse/ClickHouse/issues/16980). [#17051](https://github.com/ClickHouse/ClickHouse/pull/17051) ([hexiaoting](https://github.com/hexiaoting)).
-* Avoid unnecessary network errors for remote queries which may be cancelled while execution, like queries with `LIMIT`. [#17006](https://github.com/ClickHouse/ClickHouse/pull/17006) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed wrong result in big integers (128, 256 bit) when casting from double. [#16986](https://github.com/ClickHouse/ClickHouse/pull/16986) ([Mike](https://github.com/myrrc)).
-* Reresolve the IP of the `format_avro_schema_registry_url` in case of errors. [#16985](https://github.com/ClickHouse/ClickHouse/pull/16985) ([filimonov](https://github.com/filimonov)).
-* Fixed possible server crash after `ALTER TABLE ... MODIFY COLUMN ... NewType` when `SELECT` have `WHERE` expression on altering column and alter doesn't finished yet. [#16968](https://github.com/ClickHouse/ClickHouse/pull/16968) ([Amos Bird](https://github.com/amosbird)).
-* Blame info was not calculated correctly in `clickhouse-git-import`. [#16959](https://github.com/ClickHouse/ClickHouse/pull/16959) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed order by optimization with monotonous functions. Fixes [#16107](https://github.com/ClickHouse/ClickHouse/issues/16107). [#16956](https://github.com/ClickHouse/ClickHouse/pull/16956) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed optimization of group by with enabled setting `optimize_aggregators_of_group_by_keys` and joins. This fixes [#12604](https://github.com/ClickHouse/ClickHouse/issues/12604). [#16951](https://github.com/ClickHouse/ClickHouse/pull/16951) ([Anton Popov](https://github.com/CurtizJ)).
-* Install script should always create subdirs in config folders. This is only relevant for Docker build with custom config. [#16936](https://github.com/ClickHouse/ClickHouse/pull/16936) ([filimonov](https://github.com/filimonov)).
-* Fixed possible error `Illegal type of argument` for queries with `ORDER BY`. This fixes [#16580](https://github.com/ClickHouse/ClickHouse/issues/16580). [#16928](https://github.com/ClickHouse/ClickHouse/pull/16928) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Abort multipart upload if no data was written to WriteBufferFromS3. [#16840](https://github.com/ClickHouse/ClickHouse/pull/16840) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Fixed crash when using `any` without any arguments. This fixes [#16803](https://github.com/ClickHouse/ClickHouse/issues/16803). [#16826](https://github.com/ClickHouse/ClickHouse/pull/16826) ([Amos Bird](https://github.com/amosbird)).
-* Fixed the behaviour when ClickHouse used to always return 0 insted of a number of affected rows for `INSERT` queries via MySQL protocol. This fixes [#16605](https://github.com/ClickHouse/ClickHouse/issues/16605). [#16715](https://github.com/ClickHouse/ClickHouse/pull/16715) ([Winter Zhang](https://github.com/zhang2014)).
-* Fixed uncontrolled growth of TDigest. [#16680](https://github.com/ClickHouse/ClickHouse/pull/16680) ([hrissan](https://github.com/hrissan)).
-* Fixed remote query failure when using suffix `if` in Aggregate function. This fixes [#16574](https://github.com/ClickHouse/ClickHouse/issues/16574) fixes [#16231](https://github.com/ClickHouse/ClickHouse/issues/16231) [#16610](https://github.com/ClickHouse/ClickHouse/pull/16610) ([Winter Zhang](https://github.com/zhang2014)).
-* Fixed inconsistent behavior caused by `select_sequential_consistency` for optimized trivial count query and system.tables. [#16309](https://github.com/ClickHouse/ClickHouse/pull/16309) ([Hao Chen](https://github.com/haoch)).
 * Throw error when use ColumnTransformer replace non exist column. [#16183](https://github.com/ClickHouse/ClickHouse/pull/16183) ([hexiaoting](https://github.com/hexiaoting)).
-
-
-### ClickHouse release v20.11.3.3-stable, 2020-11-13
-
-#### Bug Fix
-
-* Fix rare silent crashes when query profiler is on and ClickHouse is installed on OS with glibc version that has (supposedly) broken asynchronous unwind tables for some functions. This fixes [#15301](https://github.com/ClickHouse/ClickHouse/issues/15301). This fixes [#13098](https://github.com/ClickHouse/ClickHouse/issues/13098). [#16846](https://github.com/ClickHouse/ClickHouse/pull/16846) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-
-
-### ClickHouse release v20.11.2.1, 2020-11-11
-
-#### Backward Incompatible Change
-
-* If some `profile` was specified in `distributed_ddl` config section, then this profile could overwrite settings of `default` profile on server startup. It's fixed, now settings of distributed DDL queries should not affect global server settings. [#16635](https://github.com/ClickHouse/ClickHouse/pull/16635) ([tavplubix](https://github.com/tavplubix)).
-* Restrict to use of non-comparable data types (like `AggregateFunction`) in keys (Sorting key, Primary key, Partition key, and so on). [#16601](https://github.com/ClickHouse/ClickHouse/pull/16601) ([alesapin](https://github.com/alesapin)).
-* Remove `ANALYZE` and `AST` queries, and make the setting `enable_debug_queries` obsolete since now it is the part of full featured `EXPLAIN` query. [#16536](https://github.com/ClickHouse/ClickHouse/pull/16536) ([Ivan](https://github.com/abyss7)).
-* Aggregate functions `boundingRatio`, `rankCorr`, `retention`, `timeSeriesGroupSum`, `timeSeriesGroupRateSum`, `windowFunnel` were erroneously made case-insensitive. Now their names are made case sensitive as designed. Only functions that are specified in SQL standard or made for compatibility with other DBMS or functions similar to those should be case-insensitive. [#16407](https://github.com/ClickHouse/ClickHouse/pull/16407) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Make `rankCorr` function return nan on insufficient data [#16124](https://github.com/ClickHouse/ClickHouse/issues/16124). [#16135](https://github.com/ClickHouse/ClickHouse/pull/16135) ([hexiaoting](https://github.com/hexiaoting)).
-* When upgrading from versions older than 20.5, if rolling update is performed and cluster contains both versions 20.5 or greater and less than 20.5, if ClickHouse nodes with old versions are restarted and old version has been started up in presence of newer versions, it may lead to `Part ... intersects previous part` errors. To prevent this error, first install newer clickhouse-server packages on all cluster nodes and then do restarts (so, when clickhouse-server is restarted, it will start up with the new version).
-
-#### New Feature
-
-* Added support of LDAP as a user directory for locally non-existent users. [#12736](https://github.com/ClickHouse/ClickHouse/pull/12736) ([Denis Glazachev](https://github.com/traceon)).
-* Add `system.replicated_fetches` table which shows currently running background fetches. [#16428](https://github.com/ClickHouse/ClickHouse/pull/16428) ([alesapin](https://github.com/alesapin)).
-* Added setting `date_time_output_format`. [#15845](https://github.com/ClickHouse/ClickHouse/pull/15845) ([Maksim Kita](https://github.com/kitaisreal)).
-* Added minimal web UI to ClickHouse. [#16158](https://github.com/ClickHouse/ClickHouse/pull/16158) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Allows to read/write Single protobuf message at once (w/o length-delimiters). [#15199](https://github.com/ClickHouse/ClickHouse/pull/15199) ([filimonov](https://github.com/filimonov)).
-* Added initial OpenTelemetry support. ClickHouse now accepts OpenTelemetry traceparent headers over Native and HTTP protocols, and passes them downstream in some cases. The trace spans for executed queries are saved into the `system.opentelemetry_span_log` table. [#14195](https://github.com/ClickHouse/ClickHouse/pull/14195) ([Alexander Kuzmenkov](https://github.com/akuzm)).
-* Allow specify primary key in column list of `CREATE TABLE` query. This is needed for compatibility with other SQL dialects. [#15823](https://github.com/ClickHouse/ClickHouse/pull/15823) ([Maksim Kita](https://github.com/kitaisreal)).
-* Implement `OFFSET offset_row_count {ROW | ROWS} FETCH {FIRST | NEXT} fetch_row_count {ROW | ROWS} {ONLY | WITH TIES}` in SELECT query with ORDER BY. This is the SQL-standard way to specify `LIMIT`. [#15855](https://github.com/ClickHouse/ClickHouse/pull/15855) ([hexiaoting](https://github.com/hexiaoting)).
-* `errorCodeToName` function - return variable name of the error (useful for analyzing query_log and similar). `system.errors` table - shows how many times errors has been happened (respects `system_events_show_zero_values`). [#16438](https://github.com/ClickHouse/ClickHouse/pull/16438) ([Azat Khuzhin](https://github.com/azat)).
-* Added function `untuple` which is a special function which can introduce new columns to the SELECT list by expanding a named tuple. [#16242](https://github.com/ClickHouse/ClickHouse/pull/16242) ([Nikolai Kochetov](https://github.com/KochetovNicolai), [Amos Bird](https://github.com/amosbird)).
-* Now we can provide identifiers via query parameters. And these parameters can be used as table objects or columns. [#16594](https://github.com/ClickHouse/ClickHouse/pull/16594) ([Amos Bird](https://github.com/amosbird)).
-* Added big integers (UInt256, Int128, Int256) and UUID data types support for MergeTree BloomFilter index. Big integers is an experimental feature. [#16642](https://github.com/ClickHouse/ClickHouse/pull/16642) ([Maksim Kita](https://github.com/kitaisreal)).
-* Add `farmFingerprint64` function (non-cryptographic string hashing). [#16570](https://github.com/ClickHouse/ClickHouse/pull/16570) ([Jacob Hayes](https://github.com/JacobHayes)).
-* Add `log_queries_min_query_duration_ms`, only queries slower than the value of this setting will go to `query_log`/`query_thread_log` (i.e. something like `slow_query_log` in mysql). [#16529](https://github.com/ClickHouse/ClickHouse/pull/16529) ([Azat Khuzhin](https://github.com/azat)).
-* Ability to create a docker image on the top of `Alpine`. Uses precompiled binary and glibc components from ubuntu 20.04. [#16479](https://github.com/ClickHouse/ClickHouse/pull/16479) ([filimonov](https://github.com/filimonov)).
-* Added `toUUIDOrNull`, `toUUIDOrZero` cast functions. [#16337](https://github.com/ClickHouse/ClickHouse/pull/16337) ([Maksim Kita](https://github.com/kitaisreal)).
-* Add `max_concurrent_queries_for_all_users` setting, see [#6636](https://github.com/ClickHouse/ClickHouse/issues/6636) for use cases. [#16154](https://github.com/ClickHouse/ClickHouse/pull/16154) ([nvartolomei](https://github.com/nvartolomei)).
-* Add a new option `print_query_id` to clickhouse-client. It helps generate arbitrary strings with the current query id generated by the client. Also print query id in clickhouse-client by default. [#15809](https://github.com/ClickHouse/ClickHouse/pull/15809) ([Amos Bird](https://github.com/amosbird)).
-* Add `tid` and `logTrace` functions. This closes [#9434](https://github.com/ClickHouse/ClickHouse/issues/9434). [#15803](https://github.com/ClickHouse/ClickHouse/pull/15803) ([flynn](https://github.com/ucasFL)).
-* Add function `formatReadableTimeDelta` that format time delta to human readable string ... [#15497](https://github.com/ClickHouse/ClickHouse/pull/15497) ([Filipe Caixeta](https://github.com/filipecaixeta)).
-* Added `disable_merges` option for volumes in multi-disk configuration. [#13956](https://github.com/ClickHouse/ClickHouse/pull/13956) ([Vladimir Chebotarev](https://github.com/excitoon)).
-
-#### Experimental Feature
-
-* New functions `encrypt`, `aes_encrypt_mysql`, `decrypt`, `aes_decrypt_mysql`. These functions are working slowly, so we consider it as an experimental feature. [#11844](https://github.com/ClickHouse/ClickHouse/pull/11844) ([Vasily Nemkov](https://github.com/Enmk)).
-
-#### Bug Fix
-
-* Mask password in data_path in the `system.distribution_queue`. [#16727](https://github.com/ClickHouse/ClickHouse/pull/16727) ([Azat Khuzhin](https://github.com/azat)).
-* Fix `IN` operator over several columns and tuples with enabled `transform_null_in` setting. Fixes [#15310](https://github.com/ClickHouse/ClickHouse/issues/15310). [#16722](https://github.com/ClickHouse/ClickHouse/pull/16722) ([Anton Popov](https://github.com/CurtizJ)).
-* The setting `max_parallel_replicas` worked incorrectly if the queried table has no sampling. This fixes [#5733](https://github.com/ClickHouse/ClickHouse/issues/5733). [#16675](https://github.com/ClickHouse/ClickHouse/pull/16675) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix optimize_read_in_order/optimize_aggregation_in_order with max_threads > 0 and expression in ORDER BY. [#16637](https://github.com/ClickHouse/ClickHouse/pull/16637) ([Azat Khuzhin](https://github.com/azat)).
-* Calculation of `DEFAULT` expressions was involving possible name collisions (that was very unlikely to encounter). This fixes [#9359](https://github.com/ClickHouse/ClickHouse/issues/9359). [#16612](https://github.com/ClickHouse/ClickHouse/pull/16612) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix `query_thread_log.query_duration_ms` unit. [#16563](https://github.com/ClickHouse/ClickHouse/pull/16563) ([Azat Khuzhin](https://github.com/azat)).
-* Fix a bug when using MySQL Master -> MySQL Slave -> ClickHouse MaterializeMySQL Engine. `MaterializeMySQL` is an experimental feature. [#16504](https://github.com/ClickHouse/ClickHouse/pull/16504) ([TCeason](https://github.com/TCeason)).
-* Specifically crafted argument of `round` function with `Decimal` was leading to integer division by zero. This fixes [#13338](https://github.com/ClickHouse/ClickHouse/issues/13338). [#16451](https://github.com/ClickHouse/ClickHouse/pull/16451) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix DROP TABLE for Distributed (racy with INSERT). [#16409](https://github.com/ClickHouse/ClickHouse/pull/16409) ([Azat Khuzhin](https://github.com/azat)).
-* Fix processing of very large entries in replication queue. Very large entries may appear in ALTER queries if table structure is extremely large (near 1 MB). This fixes [#16307](https://github.com/ClickHouse/ClickHouse/issues/16307). [#16332](https://github.com/ClickHouse/ClickHouse/pull/16332) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed the inconsistent behaviour when a part of return data could be dropped because the set for its filtration wasn't created. [#16308](https://github.com/ClickHouse/ClickHouse/pull/16308) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fix dictGet in sharding_key (and similar places, i.e. when the function context is stored permanently). [#16205](https://github.com/ClickHouse/ClickHouse/pull/16205) ([Azat Khuzhin](https://github.com/azat)).
-* Fix the exception thrown in `clickhouse-local` when trying to execute `OPTIMIZE` command. Fixes [#16076](https://github.com/ClickHouse/ClickHouse/issues/16076). [#16192](https://github.com/ClickHouse/ClickHouse/pull/16192) ([filimonov](https://github.com/filimonov)).
-* Fixes [#15780](https://github.com/ClickHouse/ClickHouse/issues/15780) regression, e.g. `indexOf([1, 2, 3], toLowCardinality(1))` now is prohibited but it should not be. [#16038](https://github.com/ClickHouse/ClickHouse/pull/16038) ([Mike](https://github.com/myrrc)).
-* Fix bug with MySQL database. When MySQL server used as database engine is down some queries raise Exception, because they try to get tables from disabled server, while it's unnecessary. For example, query `SELECT ... FROM system.parts` should work only with MergeTree tables and don't touch MySQL database at all. [#16032](https://github.com/ClickHouse/ClickHouse/pull/16032) ([Kruglov Pavel](https://github.com/Avogar)).
-* Now exception will be thrown when `ALTER MODIFY COLUMN ... DEFAULT ...` has incompatible default with column type. Fixes [#15854](https://github.com/ClickHouse/ClickHouse/issues/15854). [#15858](https://github.com/ClickHouse/ClickHouse/pull/15858) ([alesapin](https://github.com/alesapin)).
-* Fixed IPv4CIDRToRange/IPv6CIDRToRange functions to accept const IP-column values. [#15856](https://github.com/ClickHouse/ClickHouse/pull/15856) ([vladimir-golovchenko](https://github.com/vladimir-golovchenko)).
+* Fix crash in case of not equi-join ON expression in RIGH|FULL JOIN. [#15162](https://github.com/ClickHouse/ClickHouse/pull/15162) ([Artem Zuikov](https://github.com/4ertus2)).
 
 #### Improvement
 
-* Treat `INTERVAL '1 hour'` as equivalent to `INTERVAL 1 HOUR`, to be compatible with Postgres and similar. This fixes [#15637](https://github.com/ClickHouse/ClickHouse/issues/15637). [#15978](https://github.com/ClickHouse/ClickHouse/pull/15978) ([flynn](https://github.com/ucasFL)).
-* Enable parsing enum values by their numeric ids for CSV, TSV and JSON input formats. [#15685](https://github.com/ClickHouse/ClickHouse/pull/15685) ([vivarum](https://github.com/vivarum)).
-* Better read task scheduling for JBOD architecture and `MergeTree` storage. New setting `read_backoff_min_concurrency` which serves as the lower limit to the number of reading threads. [#16423](https://github.com/ClickHouse/ClickHouse/pull/16423) ([Amos Bird](https://github.com/amosbird)).
-* Add missing support for `LowCardinality` in `Avro` format. [#16521](https://github.com/ClickHouse/ClickHouse/pull/16521) ([Mike](https://github.com/myrrc)).
-* Workaround for use `S3` with nginx server as proxy. Nginx currenty does not accept urls with empty path like `http://domain.com?delete`, but vanilla aws-sdk-cpp produces this kind of urls. This commit uses patched aws-sdk-cpp version, which makes urls with "/" as path in this cases, like `http://domain.com/?delete`. [#16814](https://github.com/ClickHouse/ClickHouse/pull/16814) ([ianton-ru](https://github.com/ianton-ru)).
-* Better diagnostics on parse errors in input data. Provide row number on `Cannot read all data` errors. [#16644](https://github.com/ClickHouse/ClickHouse/pull/16644) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Make the behaviour of `minMap` and `maxMap` more desireable. It will not skip zero values in the result. Fixes [#16087](https://github.com/ClickHouse/ClickHouse/issues/16087). [#16631](https://github.com/ClickHouse/ClickHouse/pull/16631) ([Ildus Kurbangaliev](https://github.com/ildus)).
-* Better update of ZooKeeper configuration in runtime. [#16630](https://github.com/ClickHouse/ClickHouse/pull/16630) ([sundyli](https://github.com/sundy-li)).
-* Apply SETTINGS clause as early as possible. It allows to modify more settings in the query. This closes [#3178](https://github.com/ClickHouse/ClickHouse/issues/3178). [#16619](https://github.com/ClickHouse/ClickHouse/pull/16619) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Now `event_time_microseconds` field stores in Decimal64, not UInt64. [#16617](https://github.com/ClickHouse/ClickHouse/pull/16617) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Now paratmeterized functions can be used in `APPLY` column transformer. [#16589](https://github.com/ClickHouse/ClickHouse/pull/16589) ([Amos Bird](https://github.com/amosbird)).
-* Improve scheduling of background task which removes data of dropped tables in `Atomic` databases. `Atomic` databases do not create broken symlink to table data directory if table actually has no data directory. [#16584](https://github.com/ClickHouse/ClickHouse/pull/16584) ([tavplubix](https://github.com/tavplubix)).
-* Subqueries in `WITH` section (CTE) can reference previous subqueries in `WITH` section by their name. [#16575](https://github.com/ClickHouse/ClickHouse/pull/16575) ([Amos Bird](https://github.com/amosbird)).
-* Add current_database into `system.query_thread_log`. [#16558](https://github.com/ClickHouse/ClickHouse/pull/16558) ([Azat Khuzhin](https://github.com/azat)).
-* Allow to fetch parts that are already committed or outdated in the current instance into the detached directory. It's useful when migrating tables from another cluster and having N to 1 shards mapping. It's also consistent with the current fetchPartition implementation. [#16538](https://github.com/ClickHouse/ClickHouse/pull/16538) ([Amos Bird](https://github.com/amosbird)).
-* Multiple improvements for `RabbitMQ`: Fixed bug for [#16263](https://github.com/ClickHouse/ClickHouse/issues/16263). Also minimized event loop lifetime. Added more efficient queues setup. [#16426](https://github.com/ClickHouse/ClickHouse/pull/16426) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix debug assertion in `quantileDeterministic` function. In previous version it may also transfer up to two times more data over the network. Although no bug existed. This fixes [#15683](https://github.com/ClickHouse/ClickHouse/issues/15683). [#16410](https://github.com/ClickHouse/ClickHouse/pull/16410) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add `TablesToDropQueueSize` metric. It's equal to number of dropped tables, that are waiting for background data removal. [#16364](https://github.com/ClickHouse/ClickHouse/pull/16364) ([tavplubix](https://github.com/tavplubix)).
-* Better diagnostics when client has dropped connection. In previous versions, `Attempt to read after EOF` and `Broken pipe` exceptions were logged in server. In new version, it's information message `Client has dropped the connection, cancel the query.`. [#16329](https://github.com/ClickHouse/ClickHouse/pull/16329) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add total_rows/total_bytes (from system.tables) support for Set/Join table engines. [#16306](https://github.com/ClickHouse/ClickHouse/pull/16306) ([Azat Khuzhin](https://github.com/azat)).
-* Now it's possible to specify `PRIMARY KEY` without `ORDER BY` for MergeTree table engines family. Closes [#15591](https://github.com/ClickHouse/ClickHouse/issues/15591). [#16284](https://github.com/ClickHouse/ClickHouse/pull/16284) ([alesapin](https://github.com/alesapin)).
-* If there is no tmp folder in the system (chroot, misconfigutation etc) `clickhouse-local` will create temporary subfolder in the current directory. [#16280](https://github.com/ClickHouse/ClickHouse/pull/16280) ([filimonov](https://github.com/filimonov)).
-* Add support for nested data types (like named tuple) as sub-types. Fixes [#15587](https://github.com/ClickHouse/ClickHouse/issues/15587). [#16262](https://github.com/ClickHouse/ClickHouse/pull/16262) ([Ivan](https://github.com/abyss7)).
-* Support for `database_atomic_wait_for_drop_and_detach_synchronously`/`NO DELAY`/`SYNC` for `DROP DATABASE`. [#16127](https://github.com/ClickHouse/ClickHouse/pull/16127) ([Azat Khuzhin](https://github.com/azat)).
-* Add `allow_nondeterministic_optimize_skip_unused_shards` (to allow non deterministic like `rand()` or `dictGet()` in sharding key). [#16105](https://github.com/ClickHouse/ClickHouse/pull/16105) ([Azat Khuzhin](https://github.com/azat)).
-* Fix `memory_profiler_step`/`max_untracked_memory` for queries via HTTP (test included). Fix the issue that adjusting this value globally in xml config does not help either, since those settings are not applied anyway, only default (4MB) value is [used](https://github.com/ClickHouse/ClickHouse/blob/17731245336d8c84f75e4c0894c5797ed7732190/src/Common/ThreadStatus.h#L104). Fix `query_id` for the most root ThreadStatus of the http query (by initializing QueryScope after reading query_id). [#16101](https://github.com/ClickHouse/ClickHouse/pull/16101) ([Azat Khuzhin](https://github.com/azat)).
-* Now it's allowed to execute `ALTER ... ON CLUSTER` queries regardless of the `<internal_replication>` setting in cluster config. [#16075](https://github.com/ClickHouse/ClickHouse/pull/16075) ([alesapin](https://github.com/alesapin)).
-* Fix rare issue when `clickhouse-client` may abort on exit due to loading of suggestions. This fixes [#16035](https://github.com/ClickHouse/ClickHouse/issues/16035). [#16047](https://github.com/ClickHouse/ClickHouse/pull/16047) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add support of `cache` layout for `Redis` dictionaries with complex key. [#15985](https://github.com/ClickHouse/ClickHouse/pull/15985) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix query hang (endless loop) in case of misconfiguration (`connections_with_failover_max_tries` set to 0). [#15876](https://github.com/ClickHouse/ClickHouse/pull/15876) ([Azat Khuzhin](https://github.com/azat)).
-* Change level of some log messages from information to debug, so information messages will not appear for every query. This closes [#5293](https://github.com/ClickHouse/ClickHouse/issues/5293). [#15816](https://github.com/ClickHouse/ClickHouse/pull/15816) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Remove `MemoryTrackingInBackground*` metrics to avoid potentially misleading results. This fixes [#15684](https://github.com/ClickHouse/ClickHouse/issues/15684). [#15813](https://github.com/ClickHouse/ClickHouse/pull/15813) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add reconnects to `zookeeper-dump-tree` tool. [#15711](https://github.com/ClickHouse/ClickHouse/pull/15711) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Allow explicitly specify columns list in `CREATE TABLE table AS table_function(...)` query. Fixes [#9249](https://github.com/ClickHouse/ClickHouse/issues/9249) Fixes [#14214](https://github.com/ClickHouse/ClickHouse/issues/14214). [#14295](https://github.com/ClickHouse/ClickHouse/pull/14295) ([tavplubix](https://github.com/tavplubix)).
+* Explicitly set uid / gid of clickhouse user & group to the fixed values (101) in clickhouse-server images. [#19096](https://github.com/ClickHouse/ClickHouse/pull/19096) ([filimonov](https://github.com/filimonov)).
+* Two new settings (by analogy with MergeTree family) has been added: - `fsync_after_insert` - Do fsync for every inserted. Will decreases performance of inserts. - `fsync_directories` - Do fsync for temporary directory (that is used for async INSERT only) after all operations (writes, renames, etc.). [#18864](https://github.com/ClickHouse/ClickHouse/pull/18864) ([Azat Khuzhin](https://github.com/azat)).
+* `SYSTEM KILL` command started to work in Docker. This closes [#18847](https://github.com/ClickHouse/ClickHouse/issues/18847). [#18848](https://github.com/ClickHouse/ClickHouse/pull/18848) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Expand macros in the zk path when executing fetchPartition. [#18839](https://github.com/ClickHouse/ClickHouse/pull/18839) ([fastio](https://github.com/fastio)).
+* Apply `ALTER TABLE <replicated_table> ON CLUSTER MODIFY SETTING ...` to all replicas. Because we don't replicate such alter commands. [#18789](https://github.com/ClickHouse/ClickHouse/pull/18789) ([Amos Bird](https://github.com/amosbird)).
+* Allow column transformer `EXCEPT` to accept a string as regular expression matcher. This resolves [#18685](https://github.com/ClickHouse/ClickHouse/issues/18685) . [#18699](https://github.com/ClickHouse/ClickHouse/pull/18699) ([Amos Bird](https://github.com/amosbird)).
+* Another fix of using SimpleAggregateFunction in SummingMergeTree. This fixes [#18676](https://github.com/ClickHouse/ClickHouse/issues/18676) . [#18677](https://github.com/ClickHouse/ClickHouse/pull/18677) ([Amos Bird](https://github.com/amosbird)).
+* Fix SimpleAggregateFunction in SummingMergeTree. Now it works like AggregateFunction. In previous versions values were summed together regardless to the aggregate function. This fixes [#18564](https://github.com/ClickHouse/ClickHouse/issues/18564) . [#8052](https://github.com/ClickHouse/ClickHouse/issues/8052). [#18637](https://github.com/ClickHouse/ClickHouse/pull/18637) ([Amos Bird](https://github.com/amosbird)).
+* PODArray: Avoid call to memcpy with (nullptr, 0) arguments (Fix UBSan report). This fixes [#18525](https://github.com/ClickHouse/ClickHouse/issues/18525). [#18526](https://github.com/ClickHouse/ClickHouse/pull/18526) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed assertion error inside allocator in case when last argument of function bar is NaN. Now simple ClickHouse's exception is being thrown. This fixes [#17876](https://github.com/ClickHouse/ClickHouse/issues/17876). [#18520](https://github.com/ClickHouse/ClickHouse/pull/18520) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* support syntax `EXISTS DATABASE name`. [#18458](https://github.com/ClickHouse/ClickHouse/pull/18458) ([Du Chuan](https://github.com/spongedu)).
+* Fix bug: no newline after exception message in some tools. [#18444](https://github.com/ClickHouse/ClickHouse/pull/18444) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add ability to modify primary and partition key column type from `LowCardinality(Type)` to `Type` and vice versa. Also add an ability to modify primary key column type from `EnumX ` to `IntX` type. Fixes [#5604](https://github.com/ClickHouse/ClickHouse/issues/5604). [#18362](https://github.com/ClickHouse/ClickHouse/pull/18362) ([alesapin](https://github.com/alesapin)).
+* Support builtin function `isIPv4String` && `isIPv6String` like [MySQL](https://github.com/ClickHouse/ClickHouse/compare/master...spongedu:support_is_ipv4?expand=1). [#18349](https://github.com/ClickHouse/ClickHouse/pull/18349) ([Du Chuan](https://github.com/spongedu)).
+* Fix potential server crash during Buffer rollback (that is impossible in current ClickHouse version). [#18329](https://github.com/ClickHouse/ClickHouse/pull/18329) ([Azat Khuzhin](https://github.com/azat)).
+* related to [#18133](https://github.com/ClickHouse/ClickHouse/issues/18133). [#18309](https://github.com/ClickHouse/ClickHouse/pull/18309) ([hexiaoting](https://github.com/hexiaoting)).
+* Add a new setting `insert_distributed_one_random_shard = 1` to allow insertion into multi-sharded distributed table without any distributed key. [#18294](https://github.com/ClickHouse/ClickHouse/pull/18294) ([Amos Bird](https://github.com/amosbird)).
+* Allow to parse Array fields from CSV if it is represented as a string containing array that was serialized as nested CSV. Example: `"[""Hello"", ""world"", ""42"""" TV""]"` will parse as `['Hello', 'world', '42" TV']`. Allow to parse array in CSV in a string without enclosing braces. Example: `"'Hello', 'world', '42"" TV'"` will parse as `['Hello', 'world', '42" TV']`. [#18271](https://github.com/ClickHouse/ClickHouse/pull/18271) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Make better adaptive granularity calculation for merge tree wide parts. [#18223](https://github.com/ClickHouse/ClickHouse/pull/18223) ([alesapin](https://github.com/alesapin)).
+* Now clickhouse-install could work on Mac. The problem was that there is no procfs on this platform. [#18201](https://github.com/ClickHouse/ClickHouse/pull/18201) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Better hints for `SHOW ...` query syntax. [#18183](https://github.com/ClickHouse/ClickHouse/pull/18183) ([Du Chuan](https://github.com/spongedu)).
+* Array aggregation `arrayMin`, `arrayMax`, `arraySum`, `arrayAvg` support for `Int128`, `Int256`, `UInt256`. [#18147](https://github.com/ClickHouse/ClickHouse/pull/18147) ([Maksim Kita](https://github.com/kitaisreal)).
+* All queries of type `Decimal * Float` or vice versa are allowed, including aggregate ones (e.g. `SELECT sum(decimal_field * 1.1)` or `SELECT dec_col * float_col`), the result type is Float32 or Float64. [#18145](https://github.com/ClickHouse/ClickHouse/pull/18145) ([Mike](https://github.com/myrrc)).
+* `EXPLAIN AST` now support queries other then `SELECT`. [#18136](https://github.com/ClickHouse/ClickHouse/pull/18136) ([taiyang-li](https://github.com/taiyang-li)).
+* Add `disk` to Set and Join storage settings. [#18112](https://github.com/ClickHouse/ClickHouse/pull/18112) ([Grigory Pervakov](https://github.com/GrigoryPervakov)).
+* Now the table function `merge()` requires the current user to have the `SELECT` privilege on each table it receives data from. This PR fixes [#16964](https://github.com/ClickHouse/ClickHouse/issues/16964). [#18104](https://github.com/ClickHouse/ClickHouse/pull/18104) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Support `SHOW CREATE VIEW name` syntax like [MySQL](https://dev.mysql.com/doc/refman/5.7/en/show-create-view.html). [#18095](https://github.com/ClickHouse/ClickHouse/pull/18095) ([Du Chuan](https://github.com/spongedu)).
+* Fix dead list watches removal for TestKeeperStorage. [#18065](https://github.com/ClickHouse/ClickHouse/pull/18065) ([alesapin](https://github.com/alesapin)).
+* Temporary tables are visible in the system tables `system.tables` and `system.columns` now only in those session where they have been created. The internal database `_temporary_and_external_tables` is now hidden in those system tables; temporary tables are shown as tables with empty database with the `is_temporary` flag set instead. [#18014](https://github.com/ClickHouse/ClickHouse/pull/18014) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix clickhouse-client rendering issue when the size of terminal window changes. [#18009](https://github.com/ClickHouse/ClickHouse/pull/18009) ([Amos Bird](https://github.com/amosbird)).
+* Decrease log verbosity of the events when the client drops the connection from WARNING to INFORMATION. [#18005](https://github.com/ClickHouse/ClickHouse/pull/18005) ([filimonov](https://github.com/filimonov)).
+* Now the table function `merge()` requires the current user to have the `SELECT` privilege on each table it receives data from. This PR fixes [#16964](https://github.com/ClickHouse/ClickHouse/issues/16964). [#17983](https://github.com/ClickHouse/ClickHouse/pull/17983) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Forcibly removing empty or bad metadata files from filesystem for DiskS3. S3 is an experimental feature. [#17935](https://github.com/ClickHouse/ClickHouse/pull/17935) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Adaptive choose of single/multi part upload in WriteBufferFromS3. Single part upload is controlled by a new setting 'max_single_part_upload_size'. [#17934](https://github.com/ClickHouse/ClickHouse/pull/17934) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Ability to set custom metadata when putting S3 object. [#17909](https://github.com/ClickHouse/ClickHouse/pull/17909) ([Pavel Kovalenko](https://github.com/Jokser)).
+* `allow_introspection_functions=0` prohibits usage of introspection functions but doesn't prohibit giving grants for them anymore (the grantee will need to set `allow_introspection_functions=1` for himself to be able to use that grant). Similarly `allow_ddl=0` prohibits usage of DDL commands but doesn't prohibit giving grants for them anymore. [#17908](https://github.com/ClickHouse/ClickHouse/pull/17908) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Support for async tasks in `PipelineExecutor`. Initial support of async sockets for remote queries. [#17868](https://github.com/ClickHouse/ClickHouse/pull/17868) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Hints for column names. [#17112](https://github.com/ClickHouse/ClickHouse/issues/17112). [#17857](https://github.com/ClickHouse/ClickHouse/pull/17857) ([fastio](https://github.com/fastio)).
+* Add diagnostic information when two merge tables try to read each other's data. [#17854](https://github.com/ClickHouse/ClickHouse/pull/17854) ([徐炘](https://github.com/weeds085490)).
+* Add metrics(Parts, PartsActive, PartsInactive) for part number in MergeTree in clickhouse. [#17838](https://github.com/ClickHouse/ClickHouse/pull/17838) ([徐炘](https://github.com/weeds085490)).
+* - Let the possibility to override timeout value for running script using the ClickHouse docker image. [#17818](https://github.com/ClickHouse/ClickHouse/pull/17818) ([Guillaume Tassery](https://github.com/YiuRULE)).
+* Improvement of Web UI: do not add empty query to browser history. [#17770](https://github.com/ClickHouse/ClickHouse/pull/17770) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Improves the path concatenation of zookeeper paths inside DDLWorker. [#17767](https://github.com/ClickHouse/ClickHouse/pull/17767) ([Bharat Nallan](https://github.com/bharatnc)).
+* Check system log tables' engine definition grammatically to prevent some configuration errors. Notes that this grammar check is not semantical, that means such mistakes as non-existent columns / expression functions would be not found out util the table is created. [#17739](https://github.com/ClickHouse/ClickHouse/pull/17739) ([Du Chuan](https://github.com/spongedu)).
+* system.query_log now has extensive information to achieve better query analysis. [#17726](https://github.com/ClickHouse/ClickHouse/pull/17726) ([Amos Bird](https://github.com/amosbird)).
+* Removed exception throwing at table initialization if there was no connection (it will be reconnecting in the background). [#17709](https://github.com/ClickHouse/ClickHouse/pull/17709) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Do not ignore server memory limits during Buffer flush. [#17646](https://github.com/ClickHouse/ClickHouse/pull/17646) ([Azat Khuzhin](https://github.com/azat)).
+* Switch to patched version of RocksDB (from ClickHouse-Extras). [#17643](https://github.com/ClickHouse/ClickHouse/pull/17643) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* This fixes [#17457](https://github.com/ClickHouse/ClickHouse/issues/17457). [#17641](https://github.com/ClickHouse/ClickHouse/pull/17641) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Allow to reload symbols from debug file. This PR also fixes a build-id issue. [#17637](https://github.com/ClickHouse/ClickHouse/pull/17637) ([Amos Bird](https://github.com/amosbird)).
+* Don't throw "Too many parts" error in the middle of INSERT query. [#17566](https://github.com/ClickHouse/ClickHouse/pull/17566) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Allow query parameters in UPDATE statement of ALTER query. Fixes [#10976](https://github.com/ClickHouse/ClickHouse/issues/10976). [#17563](https://github.com/ClickHouse/ClickHouse/pull/17563) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Query obfuscator: avoid usage of some SQL keywords for identifier names. [#17526](https://github.com/ClickHouse/ClickHouse/pull/17526) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Export current max ddl entry executed by DDLWorker. It's useful to check if DDLWorker hangs somewhere. [#17464](https://github.com/ClickHouse/ClickHouse/pull/17464) ([Amos Bird](https://github.com/amosbird)).
+* Export asynchronous metrics of all servers current threads. It's useful to track down issues like https://github.com/ClickHouse-Extras/poco/pull/28. [#17463](https://github.com/ClickHouse/ClickHouse/pull/17463) ([Amos Bird](https://github.com/amosbird)).
+* Return dynamic columns like MATERIALIZED / ALIAS for wildcard query when switches `asterisk_include_materialized_columns` and `asterisk_include_alias_columns` are turned on. [#17462](https://github.com/ClickHouse/ClickHouse/pull/17462) ([Ken Chen](https://github.com/chenziliang)).
+* Add functions countMatches/countMatchesCaseInsensitive. [#17459](https://github.com/ClickHouse/ClickHouse/pull/17459) ([Azat Khuzhin](https://github.com/azat)).
+* Allow specifying [TTL](https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/mergetree/#mergetree-table-ttl) to remove old entries from [system log tables](https://clickhouse.tech/docs/en/operations/system-tables/), using the `<ttl>` attribute in `config.xml`. [#17438](https://github.com/ClickHouse/ClickHouse/pull/17438) ([Du Chuan](https://github.com/spongedu)).
+* Now queries coming to the server via MySQL and PostgreSQL protocols have distinctive interface types (which can be seen in the `interface` column of the table`system.query_log`): `4` for MySQL, and `5` for PostgreSQL, instead of formerly used `1` which is now used for the native protocol only. [#17437](https://github.com/ClickHouse/ClickHouse/pull/17437) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Simplify Sys/V init script. It was not working on Ubuntu 12.04. [#17428](https://github.com/ClickHouse/ClickHouse/pull/17428) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Multiple improvements in `./clickhouse install` script. [#17421](https://github.com/ClickHouse/ClickHouse/pull/17421) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix parsing of SETTINGS clause of the INSERT ... SELECT ... SETTINGS query. [#17414](https://github.com/ClickHouse/ClickHouse/pull/17414) ([Azat Khuzhin](https://github.com/azat)).
+* Replaced `malloc` with `new`, so that the `MemoryTracker` takes this memory into account. [#17412](https://github.com/ClickHouse/ClickHouse/pull/17412) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Add eof check in receiveHello to prevent getting `Attempt to read after eof` exception. [#17365](https://github.com/ClickHouse/ClickHouse/pull/17365) ([Kruglov Pavel](https://github.com/Avogar)).
+* Implement `countSubstrings()`/`countSubstringsCaseInsensitive()`/`countSubstringsCaseInsensitiveUTF8()` (Count the number of substring occurrences). [#17347](https://github.com/ClickHouse/ClickHouse/pull/17347) ([Azat Khuzhin](https://github.com/azat)).
+* Allow to use `optimize_move_to_prewhere` optimization with compact parts, when sizes of columns are unknown. [#17330](https://github.com/ClickHouse/ClickHouse/pull/17330) ([Anton Popov](https://github.com/CurtizJ)).
+* Improved minimal Web UI: add history; add sharing support; avoid race condition of different requests; add request in-flight and ready indicators; add favicon; detect Ctrl+Enter if textarea is not in focus. [#17293](https://github.com/ClickHouse/ClickHouse/pull/17293) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Avoid possible stack overflow in bigint conversion. Big integers are experimental. [#17269](https://github.com/ClickHouse/ClickHouse/pull/17269) ([flynn](https://github.com/ucasFL)).
+* Now set indices will work with `GLOBAL IN`. This fixes [#17232](https://github.com/ClickHouse/ClickHouse/issues/17232) , [#5576](https://github.com/ClickHouse/ClickHouse/issues/5576) . [#17253](https://github.com/ClickHouse/ClickHouse/pull/17253) ([Amos Bird](https://github.com/amosbird)).
+* - Add limit for http redirects in request to S3 storage ('s3_max_redirects'). [#17220](https://github.com/ClickHouse/ClickHouse/pull/17220) ([ianton-ru](https://github.com/ianton-ru)).
+* - Add configuration for multi zookeeper clusters. [#17070](https://github.com/ClickHouse/ClickHouse/pull/17070) ([fastio](https://github.com/fastio)).
+* When `-OrNull` combinator combined `-If`, `-Merge`, `-MergeState`, `-State` combinators, we should put `-OrNull` in front. [#16935](https://github.com/ClickHouse/ClickHouse/pull/16935) ([flynn](https://github.com/ucasFL)).
+* Support HTTP proxy and HTTPS S3 endpoint configuration. [#16861](https://github.com/ClickHouse/ClickHouse/pull/16861) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Added proper authentication using environment, `~/.aws` and `AssumeRole` for S3 client. [#16856](https://github.com/ClickHouse/ClickHouse/pull/16856) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* - New IP Dictionary implementation with lower memory consumption, improved performance for some cases, and fixed bugs. [#16804](https://github.com/ClickHouse/ClickHouse/pull/16804) ([vdimir](https://github.com/vdimir)).
+* Add more OpenTelemetry spans. Add an example of how to export the span data to Zipkin. [#16535](https://github.com/ClickHouse/ClickHouse/pull/16535) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* - Added `verification_cooldown` parameter in LDAP server connection configuration to allow caching of successful "bind" attempts for configurable period of time. [#15988](https://github.com/ClickHouse/ClickHouse/pull/15988) ([Denis Glazachev](https://github.com/traceon)).
+* Avoid deadlock when executing INSERT SELECT into itself from a table with `TinyLog` or `Log` table engines. This closes [#6802](https://github.com/ClickHouse/ClickHouse/issues/6802). This closes [#18691](https://github.com/ClickHouse/ClickHouse/issues/18691). This closes [#16812](https://github.com/ClickHouse/ClickHouse/issues/16812). This closes [#14570](https://github.com/ClickHouse/ClickHouse/issues/14570). [#15260](https://github.com/ClickHouse/ClickHouse/pull/15260) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* fix [#9117](https://github.com/ClickHouse/ClickHouse/issues/9117). [#15127](https://github.com/ClickHouse/ClickHouse/pull/15127) ([flynn](https://github.com/ucasFL)).
+* * Completely eliminate callbacks and locks for acquiring them. * Keys are not divided into "not found" and "expired", but stored in the same map during query. [#14958](https://github.com/ClickHouse/ClickHouse/pull/14958) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Allow using `Atomic` engine for nested database of `MaterializeMySQL` engine. [#14849](https://github.com/ClickHouse/ClickHouse/pull/14849) ([tavplubix](https://github.com/tavplubix)).
+* Implement new parser based on ANTLR4 runtime and generated from EBNF grammar. [#11298](https://github.com/ClickHouse/ClickHouse/pull/11298) ([Ivan](https://github.com/abyss7)).
 
 #### Performance Improvement
 
-* Do not merge parts across partitions in SELECT FINAL. [#15938](https://github.com/ClickHouse/ClickHouse/pull/15938) ([Kruglov Pavel](https://github.com/Avogar)).
-* Improve performance of `-OrNull` and `-OrDefault` aggregate functions. [#16661](https://github.com/ClickHouse/ClickHouse/pull/16661) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Improve performance of `quantileMerge`. In previous versions it was obnoxiously slow. This closes [#1463](https://github.com/ClickHouse/ClickHouse/issues/1463). [#16643](https://github.com/ClickHouse/ClickHouse/pull/16643) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Improve performance of logical functions a little. [#16347](https://github.com/ClickHouse/ClickHouse/pull/16347) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Improved performance of merges assignment in MergeTree table engines. Shouldn't be visible for the user. [#16191](https://github.com/ClickHouse/ClickHouse/pull/16191) ([alesapin](https://github.com/alesapin)).
-* Speedup hashed/sparse_hashed dictionary loading by preallocating the hash table. [#15454](https://github.com/ClickHouse/ClickHouse/pull/15454) ([Azat Khuzhin](https://github.com/azat)).
-* Now trivial count optimization becomes slightly non-trivial. Predicates that contain exact partition expr can be optimized too. This also fixes [#11092](https://github.com/ClickHouse/ClickHouse/issues/11092) which returns wrong count when `max_parallel_replicas > 1`. [#15074](https://github.com/ClickHouse/ClickHouse/pull/15074) ([Amos Bird](https://github.com/amosbird)).
+* Add `--no-system-table` option for `clickhouse-local` to run without system tables. This avoids initialization of `DateLUT` that may take noticeable amount of time (tens of milliseconds) at startup. [#18899](https://github.com/ClickHouse/ClickHouse/pull/18899) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Replace `PODArray` with `PODArrayWithStackMemory` in `AggregateFunctionWindowFunnelData` to improvement `windowFunnel` function performance. [#18817](https://github.com/ClickHouse/ClickHouse/pull/18817) ([flynn](https://github.com/ucasFL)).
+* Don't send empty blocks to shards on synchronous INSERT into Distributed table. This closes [#14571](https://github.com/ClickHouse/ClickHouse/issues/14571). [#18775](https://github.com/ClickHouse/ClickHouse/pull/18775) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Optimized read for StorageMemory. [#18052](https://github.com/ClickHouse/ClickHouse/pull/18052) ([Maksim Kita](https://github.com/kitaisreal)).
+* Using dragonbox algorithm for float to string conversion instead of ryu. [#17831](https://github.com/ClickHouse/ClickHouse/pull/17831) ([Maksim Kita](https://github.com/kitaisreal)).
+* Speedup `IPv6CIDRToRange` implementation. [#17569](https://github.com/ClickHouse/ClickHouse/pull/17569) ([vdimir](https://github.com/vdimir)).
+* Add `remerge_sort_lowered_memory_bytes_ratio` setting (If memory usage after remerge does not reduced by this ratio, remerge will be disabled). [#17539](https://github.com/ClickHouse/ClickHouse/pull/17539) ([Azat Khuzhin](https://github.com/azat)).
+* Improve performance of AggregatingMergeTree w/ SimpleAggregateFunction(String) in PK. [#17109](https://github.com/ClickHouse/ClickHouse/pull/17109) ([Azat Khuzhin](https://github.com/azat)).
+* Now the `-If` combinator is devirtualized, and `count` is properly vectorized. This is for https://github.com/ClickHouse/ClickHouse/pull/17041. [#17043](https://github.com/ClickHouse/ClickHouse/pull/17043) ([Amos Bird](https://github.com/amosbird)).
+* Fix performance of reading from `Merge` tables over huge number of `MergeTree` tables. Fixes [#7748](https://github.com/ClickHouse/ClickHouse/issues/7748). [#16988](https://github.com/ClickHouse/ClickHouse/pull/16988) ([Anton Popov](https://github.com/CurtizJ)).
+* Improved performance of function `repeat`. [#16937](https://github.com/ClickHouse/ClickHouse/pull/16937) ([satanson](https://github.com/satanson)).
+* Slightly improved performance of float parsing. [#16809](https://github.com/ClickHouse/ClickHouse/pull/16809) ([Maksim Kita](https://github.com/kitaisreal)).
+* Add possibility to skip merged partitions for OPTIMIZE TABLE ... FINAL. [#15939](https://github.com/ClickHouse/ClickHouse/pull/15939) ([Kruglov Pavel](https://github.com/Avogar)).
 
 #### Build/Testing/Packaging Improvement
 
-* Add flaky check for stateless tests. It will detect potentially flaky functional tests in advance, before they are merged. [#16238](https://github.com/ClickHouse/ClickHouse/pull/16238) ([alesapin](https://github.com/alesapin)).
-* Use proper version for `croaring` instead of amalgamation. [#16285](https://github.com/ClickHouse/ClickHouse/pull/16285) ([sundyli](https://github.com/sundy-li)).
-* Improve generation of build files for `ya.make` build system (Arcadia). [#16700](https://github.com/ClickHouse/ClickHouse/pull/16700) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add MySQL BinLog file check tool for `MaterializeMySQL` database engine. `MaterializeMySQL` is an experimental feature. [#16223](https://github.com/ClickHouse/ClickHouse/pull/16223) ([Winter Zhang](https://github.com/zhang2014)).
-* Check for executable bit on non-executable files. People often accidentially commit executable files from Windows. [#15843](https://github.com/ClickHouse/ClickHouse/pull/15843) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Check for `#pragma once` in headers. [#15818](https://github.com/ClickHouse/ClickHouse/pull/15818) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix illegal code style `&vector[idx]` in libhdfs3. This fixes libcxx debug build. See also https://github.com/ClickHouse-Extras/libhdfs3/pull/8 . [#15815](https://github.com/ClickHouse/ClickHouse/pull/15815) ([Amos Bird](https://github.com/amosbird)).
-* Fix build of one miscellaneous example tool on Mac OS. Note that we don't build examples on Mac OS in our CI (we build only ClickHouse binary), so there is zero chance it will not break again. This fixes [#15804](https://github.com/ClickHouse/ClickHouse/issues/15804). [#15808](https://github.com/ClickHouse/ClickHouse/pull/15808) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Simplify Sys/V init script. [#14135](https://github.com/ClickHouse/ClickHouse/pull/14135) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Added `boost::program_options` to `db_generator` in order to increase its usability. This closes [#15940](https://github.com/ClickHouse/ClickHouse/issues/15940). [#15973](https://github.com/ClickHouse/ClickHouse/pull/15973) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-
-
-## ClickHouse release 20.10
-
-### ClickHouse release v20.10.7.4-stable, 2020-12-24
-                                                                                                                                                                                                                                                              
-#### Bug Fix                                                                                                                                                                                                                                                  
-                                                                                                                                                                                                                                                              
-* Fixed issue when `clickhouse-odbc-bridge` process is unreachable by server on machines with dual `IPv4/IPv6` stack and fixed issue when ODBC dictionary updates are performed using malformed queries and/or cause crashes. This possibly closes [#14489](https://github.com/ClickHouse/ClickHouse/issues/14489). [#18278](https://github.com/ClickHouse/ClickHouse/pull/18278) ([Denis Glazachev](https://github.com/traceon)).                                                                                                
-* Fix key comparison between Enum and Int types. This fixes [#17989](https://github.com/ClickHouse/ClickHouse/issues/17989). [#18214](https://github.com/ClickHouse/ClickHouse/pull/18214) ([Amos Bird](https://github.com/amosbird)).                        
-* Fixed unique key convert crash in `MaterializeMySQL` database engine. This fixes [#18186](https://github.com/ClickHouse/ClickHouse/issues/18186) and fixes [#16372](https://github.com/ClickHouse/ClickHouse/issues/16372)  [#18211](https://github.com/ClickHouse/ClickHouse/pull/18211) ([Winter Zhang](https://github.com/zhang2014)).
-* Fixed `std::out_of_range: basic_string` in S3 URL parsing. [#18059](https://github.com/ClickHouse/ClickHouse/pull/18059) ([Vladimir Chebotarev](https://github.com/excitoon)).
-* Fixed the issue when some tables not synchronized to ClickHouse from MySQL caused by the fact that convertion MySQL prefix index wasn't supported for MaterializeMySQL. This fixes [#15187](https://github.com/ClickHouse/ClickHouse/issues/15187) and fixes [#17912](https://github.com/ClickHouse/ClickHouse/issues/17912)  [#17944](https://github.com/ClickHouse/ClickHouse/pull/17944) ([Winter Zhang](https://github.com/zhang2014)).                                                                                                                                                                                
-* Fix possible segfault in `topK` aggregate function. This closes [#17404](https://github.com/ClickHouse/ClickHouse/issues/17404). [#17845](https://github.com/ClickHouse/ClickHouse/pull/17845) ([Maksim Kita](https://github.com/kitaisreal)).              
-* Do not restore parts from `WAL` if `in_memory_parts_enable_wal` is disabled. [#17802](https://github.com/ClickHouse/ClickHouse/pull/17802) ([detailyang](https://github.com/detailyang)).                                                                     
-* Fixed problem when ClickHouse fails to resume connection to MySQL servers. [#17681](https://github.com/ClickHouse/ClickHouse/pull/17681) ([Alexander Kazakov](https://github.com/Akazz)).                                                                   
-* Fixed empty `system.stack_trace` table when server is running in daemon mode. [#17630](https://github.com/ClickHouse/ClickHouse/pull/17630) ([Amos Bird](https://github.com/amosbird)).                                                                       
-* Fixed the behaviour when `clickhouse-client` is used in interactive mode with multiline queries and single line comment was erronously extended till the end of query. This fixes [#13654](https://github.com/ClickHouse/ClickHouse/issues/13654). [#17565](https://github.com/ClickHouse/ClickHouse/pull/17565) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed the issue when server can stop accepting connections in very rare cases. [#17542](https://github.com/ClickHouse/ClickHouse/pull/17542) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed `ALTER` query hang when the corresponding mutation was killed on the different replica. This fixes [#16953](https://github.com/ClickHouse/ClickHouse/issues/16953). [#17499](https://github.com/ClickHouse/ClickHouse/pull/17499) ([alesapin](https://github.com/alesapin)).
-* Fixed bug when mark cache size was underestimated by clickhouse. It may happen when there are a lot of tiny files with marks. [#17496](https://github.com/ClickHouse/ClickHouse/pull/17496) ([alesapin](https://github.com/alesapin)).
-* Fixed `ORDER BY` with enabled setting `optimize_redundant_functions_in_order_by`. [#17471](https://github.com/ClickHouse/ClickHouse/pull/17471) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed duplicates after `DISTINCT` which were possible because of incorrect optimization. Fixes [#17294](https://github.com/ClickHouse/ClickHouse/issues/17294). [#17296](https://github.com/ClickHouse/ClickHouse/pull/17296) ([li chengxiang](https://github.com/chengxianglibra)). [#17439](https://github.com/ClickHouse/ClickHouse/pull/17439) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed crash while reading from `JOIN` table with `LowCardinality` types. This fixes [#17228](https://github.com/ClickHouse/ClickHouse/issues/17228). [#17397](https://github.com/ClickHouse/ClickHouse/pull/17397) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed set index invalidation when there are const columns in the subquery. This fixes [#17246](https://github.com/ClickHouse/ClickHouse/issues/17246) . [#17249](https://github.com/ClickHouse/ClickHouse/pull/17249) ([Amos Bird](https://github.com/amosbird)).
-* Fixed `ColumnConst` comparison which leads to crash. This fixed [#17088](https://github.com/ClickHouse/ClickHouse/issues/17088) . [#17135](https://github.com/ClickHouse/ClickHouse/pull/17135) ([Amos Bird](https://github.com/amosbird)).
-* Fixed bug when `ON CLUSTER` queries may hang forever for non-leader `ReplicatedMergeTreeTables`. [#17089](https://github.com/ClickHouse/ClickHouse/pull/17089) ([alesapin](https://github.com/alesapin)).
-* Fixed fuzzer-found bug in function `fuzzBits`. This fixes [#16980](https://github.com/ClickHouse/ClickHouse/issues/16980). [#17051](https://github.com/ClickHouse/ClickHouse/pull/17051) ([hexiaoting](https://github.com/hexiaoting)).
-* Avoid unnecessary network errors for remote queries which may be cancelled while execution, like queries with `LIMIT`. [#17006](https://github.com/ClickHouse/ClickHouse/pull/17006) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed wrong result in big integers (128, 256 bit) when casting from double. [#16986](https://github.com/ClickHouse/ClickHouse/pull/16986) ([Mike](https://github.com/myrrc)).
-* Reresolve the IP of the `format_avro_schema_registry_url` in case of errors. [#16985](https://github.com/ClickHouse/ClickHouse/pull/16985) ([filimonov](https://github.com/filimonov)).
-* Fixed possible server crash after `ALTER TABLE ... MODIFY COLUMN ... NewType` when `SELECT` have `WHERE` expression on altering column and alter doesn't finished yet. [#16968](https://github.com/ClickHouse/ClickHouse/pull/16968) ([Amos Bird](https://github.com/amosbird)).
-* Blame info was not calculated correctly in `clickhouse-git-import`. [#16959](https://github.com/ClickHouse/ClickHouse/pull/16959) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed order by optimization with monotonous functions. This fixes [#16107](https://github.com/ClickHouse/ClickHouse/issues/16107). [#16956](https://github.com/ClickHouse/ClickHouse/pull/16956) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixrf optimization of group by with enabled setting `optimize_aggregators_of_group_by_keys` and joins. This fixes [#12604](https://github.com/ClickHouse/ClickHouse/issues/12604). [#16951](https://github.com/ClickHouse/ClickHouse/pull/16951) ([Anton Popov](https://github.com/CurtizJ)).
-* Install script should always create subdirs in config folders. This is only relevant for Docker build with custom config. [#16936](https://github.com/ClickHouse/ClickHouse/pull/16936) ([filimonov](https://github.com/filimonov)).
-* Fixrf possible error `Illegal type of argument` for queries with `ORDER BY`. This fixes [#16580](https://github.com/ClickHouse/ClickHouse/issues/16580). [#16928](https://github.com/ClickHouse/ClickHouse/pull/16928) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Abort multipart upload if no data was written to `WriteBufferFromS3`. [#16840](https://github.com/ClickHouse/ClickHouse/pull/16840) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Fixed crash when using `any` without any arguments. This fixes [#16803](https://github.com/ClickHouse/ClickHouse/issues/16803). [#16826](https://github.com/ClickHouse/ClickHouse/pull/16826) ([Amos Bird](https://github.com/amosbird)).
-* Fixed the behaviour when ClickHouse used to always return 0 insted of a number of affected rows for `INSERT` queries via MySQL protocol. This fixes [#16605](https://github.com/ClickHouse/ClickHouse/issues/16605). [#16715](https://github.com/ClickHouse/ClickHouse/pull/16715) ([Winter Zhang](https://github.com/zhang2014)).
-* Fixed uncontrolled growth of `TDigest`. [#16680](https://github.com/ClickHouse/ClickHouse/pull/16680) ([hrissan](https://github.com/hrissan)).
-* Fixed remote query failure when using suffix `if` in Aggregate function. This fixes [#16574](https://github.com/ClickHouse/ClickHouse/issues/16574) fixes [#16231](https://github.com/ClickHouse/ClickHouse/issues/16231) [#16610](https://github.com/ClickHouse/ClickHouse/pull/16610) ([Winter Zhang](https://github.com/zhang2014)).
-
-
-### ClickHouse release v20.10.4.1-stable, 2020-11-13
-
-#### Bug Fix
-
-* Fix rare silent crashes when query profiler is on and ClickHouse is installed on OS with glibc version that has (supposedly) broken asynchronous unwind tables for some functions. This fixes [#15301](https://github.com/ClickHouse/ClickHouse/issues/15301). This fixes [#13098](https://github.com/ClickHouse/ClickHouse/issues/13098). [#16846](https://github.com/ClickHouse/ClickHouse/pull/16846) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix `IN` operator over several columns and tuples with enabled `transform_null_in` setting. Fixes [#15310](https://github.com/ClickHouse/ClickHouse/issues/15310). [#16722](https://github.com/ClickHouse/ClickHouse/pull/16722) ([Anton Popov](https://github.com/CurtizJ)).
-* This will fix optimize_read_in_order/optimize_aggregation_in_order with max_threads>0 and expression in ORDER BY. [#16637](https://github.com/ClickHouse/ClickHouse/pull/16637) ([Azat Khuzhin](https://github.com/azat)).
-* Now when parsing AVRO from input the LowCardinality is removed from type. Fixes [#16188](https://github.com/ClickHouse/ClickHouse/issues/16188). [#16521](https://github.com/ClickHouse/ClickHouse/pull/16521) ([Mike](https://github.com/myrrc)).
-* Fix rapid growth of metadata when using MySQL Master -> MySQL Slave -> ClickHouse MaterializeMySQL Engine, and `slave_parallel_worker` enabled on MySQL Slave, by properly shrinking GTID sets. This fixes [#15951](https://github.com/ClickHouse/ClickHouse/issues/15951). [#16504](https://github.com/ClickHouse/ClickHouse/pull/16504) ([TCeason](https://github.com/TCeason)).
-* Fix DROP TABLE for Distributed (racy with INSERT). [#16409](https://github.com/ClickHouse/ClickHouse/pull/16409) ([Azat Khuzhin](https://github.com/azat)).
-* Fix processing of very large entries in replication queue. Very large entries may appear in ALTER queries if table structure is extremely large (near 1 MB). This fixes [#16307](https://github.com/ClickHouse/ClickHouse/issues/16307). [#16332](https://github.com/ClickHouse/ClickHouse/pull/16332) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix bug with MySQL database. When MySQL server used as database engine is down some queries raise Exception, because they try to get tables from disabled server, while it's unnecessary. For example, query `SELECT ... FROM system.parts` should work only with MergeTree tables and don't touch MySQL database at all. [#16032](https://github.com/ClickHouse/ClickHouse/pull/16032) ([Kruglov Pavel](https://github.com/Avogar)).
-
-#### Improvement
-
-* Workaround for use S3 with nginx server as proxy. Nginx currenty does not accept urls with empty path like http://domain.com?delete, but vanilla aws-sdk-cpp produces this kind of urls. This commit uses patched aws-sdk-cpp version, which makes urls with "/" as path in this cases, like http://domain.com/?delete. [#16813](https://github.com/ClickHouse/ClickHouse/pull/16813) ([ianton-ru](https://github.com/ianton-ru)).
-
-
-### ClickHouse release v20.10.3.30, 2020-10-28
-
-#### Backward Incompatible Change
-
-* Make `multiple_joins_rewriter_version` obsolete. Remove first version of joins rewriter. [#15472](https://github.com/ClickHouse/ClickHouse/pull/15472) ([Artem Zuikov](https://github.com/4ertus2)).
-* Change default value of `format_regexp_escaping_rule` setting (it's related to `Regexp` format) to `Raw` (it means - read whole subpattern as a value) to make the behaviour more like to what users expect. [#15426](https://github.com/ClickHouse/ClickHouse/pull/15426) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add support for nested multiline comments `/* comment /* comment */ */` in SQL. This conforms to the SQL standard. [#14655](https://github.com/ClickHouse/ClickHouse/pull/14655) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Added MergeTree settings (`max_replicated_merges_with_ttl_in_queue` and `max_number_of_merges_with_ttl_in_pool`) to control the number of merges with TTL in the background pool and replicated queue. This change breaks compatibility with older versions only if you use delete TTL. Otherwise, replication will stay compatible. You can avoid incompatibility issues if you update all shard replicas at once or execute `SYSTEM STOP TTL MERGES` until you finish the update of all replicas. If you'll get an incompatible entry in the replication queue, first of all, execute `SYSTEM STOP TTL MERGES` and after `ALTER TABLE ... DETACH PARTITION ...` the partition where incompatible TTL merge was assigned. Attach it back on a single replica. [#14490](https://github.com/ClickHouse/ClickHouse/pull/14490) ([alesapin](https://github.com/alesapin)).
-* When upgrading from versions older than 20.5, if rolling update is performed and cluster contains both versions 20.5 or greater and less than 20.5, if ClickHouse nodes with old versions are restarted and old version has been started up in presence of newer versions, it may lead to `Part ... intersects previous part` errors. To prevent this error, first install newer clickhouse-server packages on all cluster nodes and then do restarts (so, when clickhouse-server is restarted, it will start up with the new version).
-
-#### New Feature
-
-* Background data recompression. Add the ability to specify `TTL ... RECOMPRESS codec_name` for MergeTree table engines family. [#14494](https://github.com/ClickHouse/ClickHouse/pull/14494) ([alesapin](https://github.com/alesapin)).
-* Add parallel quorum inserts. This closes [#15601](https://github.com/ClickHouse/ClickHouse/issues/15601). [#15601](https://github.com/ClickHouse/ClickHouse/pull/15601) ([Latysheva Alexandra](https://github.com/alexelex)).
-* Settings for additional enforcement of data durability. Useful for non-replicated setups. [#11948](https://github.com/ClickHouse/ClickHouse/pull/11948) ([Anton Popov](https://github.com/CurtizJ)).
-* When duplicate block is written to replica where it does not exist locally (has not been fetched from replicas), don't ignore it and write locally to achieve the same effect as if it was successfully replicated. [#11684](https://github.com/ClickHouse/ClickHouse/pull/11684) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Now we support `WITH <identifier> AS (subquery) ... ` to introduce named subqueries in the query context. This closes [#2416](https://github.com/ClickHouse/ClickHouse/issues/2416). This closes [#4967](https://github.com/ClickHouse/ClickHouse/issues/4967). [#14771](https://github.com/ClickHouse/ClickHouse/pull/14771) ([Amos Bird](https://github.com/amosbird)).
-* Introduce `enable_global_with_statement` setting which propagates the first select's `WITH` statements to other select queries at the same level, and makes aliases in `WITH` statements visible to subqueries. [#15451](https://github.com/ClickHouse/ClickHouse/pull/15451) ([Amos Bird](https://github.com/amosbird)).
-* Secure inter-cluster query execution (with initial_user as current query user). [#13156](https://github.com/ClickHouse/ClickHouse/pull/13156) ([Azat Khuzhin](https://github.com/azat)). [#15551](https://github.com/ClickHouse/ClickHouse/pull/15551) ([Azat Khuzhin](https://github.com/azat)).
-* Add the ability to remove column properties and table TTLs. Introduced queries `ALTER TABLE MODIFY COLUMN col_name REMOVE what_to_remove` and `ALTER TABLE REMOVE TTL`. Both operations are lightweight and executed at the metadata level. [#14742](https://github.com/ClickHouse/ClickHouse/pull/14742) ([alesapin](https://github.com/alesapin)).
-* Added format `RawBLOB`. It is intended for input or output a single value without any escaping and delimiters. This closes [#15349](https://github.com/ClickHouse/ClickHouse/issues/15349). [#15364](https://github.com/ClickHouse/ClickHouse/pull/15364) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add the `reinterpretAsUUID` function that allows to convert a big-endian byte string to UUID. [#15480](https://github.com/ClickHouse/ClickHouse/pull/15480) ([Alexander Kuzmenkov](https://github.com/akuzm)).
-* Implement `force_data_skipping_indices` setting. [#15642](https://github.com/ClickHouse/ClickHouse/pull/15642) ([Azat Khuzhin](https://github.com/azat)).
-* Add a setting `output_format_pretty_row_numbers` to numerate the result in Pretty formats. This closes [#15350](https://github.com/ClickHouse/ClickHouse/issues/15350). [#15443](https://github.com/ClickHouse/ClickHouse/pull/15443) ([flynn](https://github.com/ucasFL)).
-* Added query obfuscation tool. It allows to share more queries for better testing. This closes [#15268](https://github.com/ClickHouse/ClickHouse/issues/15268). [#15321](https://github.com/ClickHouse/ClickHouse/pull/15321) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add table function `null('structure')`. [#14797](https://github.com/ClickHouse/ClickHouse/pull/14797) ([vxider](https://github.com/Vxider)).
-* Added `formatReadableQuantity` function. It is useful for reading big numbers by human. [#14725](https://github.com/ClickHouse/ClickHouse/pull/14725) ([Artem Hnilov](https://github.com/BooBSD)).
-* Add format `LineAsString` that accepts a sequence of lines separated by newlines, every line is parsed as a whole as a single String field. [#14703](https://github.com/ClickHouse/ClickHouse/pull/14703) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)), [#13846](https://github.com/ClickHouse/ClickHouse/pull/13846) ([hexiaoting](https://github.com/hexiaoting)).
-* Add `JSONStrings` format which output data in arrays of strings. [#14333](https://github.com/ClickHouse/ClickHouse/pull/14333) ([hcz](https://github.com/hczhcz)).
-* Add support for "Raw" column format for `Regexp` format. It allows to simply extract subpatterns as a whole without any escaping rules. [#15363](https://github.com/ClickHouse/ClickHouse/pull/15363) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Allow configurable `NULL` representation for `TSV` output format. It is controlled by the setting `output_format_tsv_null_representation` which is `\N` by default. This closes [#9375](https://github.com/ClickHouse/ClickHouse/issues/9375). Note that the setting only controls output format and `\N` is the only supported `NULL` representation for `TSV` input format. [#14586](https://github.com/ClickHouse/ClickHouse/pull/14586) ([Kruglov Pavel](https://github.com/Avogar)).
-* Support Decimal data type for `MaterializeMySQL`. `MaterializeMySQL` is an experimental feature. [#14535](https://github.com/ClickHouse/ClickHouse/pull/14535) ([Winter Zhang](https://github.com/zhang2014)).
-* Add new feature: `SHOW DATABASES LIKE 'xxx'`. [#14521](https://github.com/ClickHouse/ClickHouse/pull/14521) ([hexiaoting](https://github.com/hexiaoting)).
-* Added a script to import (arbitrary) git repository to ClickHouse as a sample dataset. [#14471](https://github.com/ClickHouse/ClickHouse/pull/14471) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Now insert statements can have asterisk (or variants) with column transformers in the column list. [#14453](https://github.com/ClickHouse/ClickHouse/pull/14453) ([Amos Bird](https://github.com/amosbird)).
-* New query complexity limit settings `max_rows_to_read_leaf`, `max_bytes_to_read_leaf` for distributed queries to limit max rows/bytes read on the leaf nodes. Limit is applied for local reads only, *excluding* the final merge stage on the root node. [#14221](https://github.com/ClickHouse/ClickHouse/pull/14221) ([Roman Khavronenko](https://github.com/hagen1778)).
-* Allow user to specify settings for `ReplicatedMergeTree*` storage in `<replicated_merge_tree>` section of config file. It works similarly to `<merge_tree>` section. For `ReplicatedMergeTree*` storages settings from `<merge_tree>` and `<replicated_merge_tree>` are applied together, but settings from `<replicated_merge_tree>` has higher priority. Added `system.replicated_merge_tree_settings` table. [#13573](https://github.com/ClickHouse/ClickHouse/pull/13573) ([Amos Bird](https://github.com/amosbird)).
-* Add `mapPopulateSeries` function. [#13166](https://github.com/ClickHouse/ClickHouse/pull/13166) ([Ildus Kurbangaliev](https://github.com/ildus)).
-* Supporting MySQL types: `decimal` (as ClickHouse `Decimal`) and `datetime` with sub-second precision (as `DateTime64`). [#11512](https://github.com/ClickHouse/ClickHouse/pull/11512) ([Vasily Nemkov](https://github.com/Enmk)).
-* Introduce `event_time_microseconds` field to `system.text_log`, `system.trace_log`, `system.query_log` and `system.query_thread_log` tables. [#14760](https://github.com/ClickHouse/ClickHouse/pull/14760) ([Bharat Nallan](https://github.com/bharatnc)).
-* Add `event_time_microseconds` to `system.asynchronous_metric_log` & `system.metric_log` tables. [#14514](https://github.com/ClickHouse/ClickHouse/pull/14514) ([Bharat Nallan](https://github.com/bharatnc)).
-* Add `query_start_time_microseconds` field to `system.query_log` & `system.query_thread_log` tables. [#14252](https://github.com/ClickHouse/ClickHouse/pull/14252) ([Bharat Nallan](https://github.com/bharatnc)).
-
-#### Bug Fix
-
-* Fix the case when memory can be overallocated regardless to the limit. This closes [#14560](https://github.com/ClickHouse/ClickHouse/issues/14560). [#16206](https://github.com/ClickHouse/ClickHouse/pull/16206) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix `executable` dictionary source hang. In previous versions, when using some formats (e.g. `JSONEachRow`) data was not feed to a child process before it outputs at least something. This closes [#1697](https://github.com/ClickHouse/ClickHouse/issues/1697). This closes [#2455](https://github.com/ClickHouse/ClickHouse/issues/2455). [#14525](https://github.com/ClickHouse/ClickHouse/pull/14525) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix double free in case of exception in function `dictGet`. It could have happened if dictionary was loaded with error. [#16429](https://github.com/ClickHouse/ClickHouse/pull/16429) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix group by with totals/rollup/cube modifers and min/max functions over group by keys. Fixes [#16393](https://github.com/ClickHouse/ClickHouse/issues/16393). [#16397](https://github.com/ClickHouse/ClickHouse/pull/16397) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix async Distributed INSERT with prefer_localhost_replica=0 and internal_replication. [#16358](https://github.com/ClickHouse/ClickHouse/pull/16358) ([Azat Khuzhin](https://github.com/azat)).
-* Fix a very wrong code in TwoLevelStringHashTable implementation, which might lead to memory leak. [#16264](https://github.com/ClickHouse/ClickHouse/pull/16264) ([Amos Bird](https://github.com/amosbird)).
-* Fix segfault in some cases of wrong aggregation in lambdas. [#16082](https://github.com/ClickHouse/ClickHouse/pull/16082) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix `ALTER MODIFY ... ORDER BY` query hang for `ReplicatedVersionedCollapsingMergeTree`. This fixes [#15980](https://github.com/ClickHouse/ClickHouse/issues/15980). [#16011](https://github.com/ClickHouse/ClickHouse/pull/16011) ([alesapin](https://github.com/alesapin)).
-* `MaterializeMySQL` (experimental feature): Fix collate name & charset name parser and support `length = 0` for string type. [#16008](https://github.com/ClickHouse/ClickHouse/pull/16008) ([Winter Zhang](https://github.com/zhang2014)).
-* Allow to use `direct` layout for dictionaries with complex keys. [#16007](https://github.com/ClickHouse/ClickHouse/pull/16007) ([Anton Popov](https://github.com/CurtizJ)).
-* Prevent replica hang for 5-10 mins when replication error happens after a period of inactivity. [#15987](https://github.com/ClickHouse/ClickHouse/pull/15987) ([filimonov](https://github.com/filimonov)).
-* Fix rare segfaults when inserting into or selecting from MaterializedView and concurrently dropping target table (for Atomic database engine). [#15984](https://github.com/ClickHouse/ClickHouse/pull/15984) ([tavplubix](https://github.com/tavplubix)).
-* Fix ambiguity in parsing of settings profiles: `CREATE USER ... SETTINGS profile readonly` is now considered as using a profile named `readonly`, not a setting named `profile` with the readonly constraint. This fixes [#15628](https://github.com/ClickHouse/ClickHouse/issues/15628). [#15982](https://github.com/ClickHouse/ClickHouse/pull/15982) ([Vitaly Baranov](https://github.com/vitlibar)).
-* `MaterializeMySQL` (experimental feature): Fix crash on create database failure. [#15954](https://github.com/ClickHouse/ClickHouse/pull/15954) ([Winter Zhang](https://github.com/zhang2014)).
-* Fixed `DROP TABLE IF EXISTS` failure with `Table ... doesn't exist` error when table is concurrently renamed (for Atomic database engine). Fixed rare deadlock when concurrently executing some DDL queries with multiple tables (like `DROP DATABASE` and `RENAME TABLE`) - Fixed `DROP/DETACH DATABASE` failure with `Table ... doesn't exist` when concurrently executing `DROP/DETACH TABLE`. [#15934](https://github.com/ClickHouse/ClickHouse/pull/15934) ([tavplubix](https://github.com/tavplubix)).
-* Fix incorrect empty result for query from `Distributed` table if query has `WHERE`, `PREWHERE` and `GLOBAL IN`. Fixes [#15792](https://github.com/ClickHouse/ClickHouse/issues/15792). [#15933](https://github.com/ClickHouse/ClickHouse/pull/15933) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixes [#12513](https://github.com/ClickHouse/ClickHouse/issues/12513): difference expressions with same alias when query is reanalyzed. [#15886](https://github.com/ClickHouse/ClickHouse/pull/15886) ([Winter Zhang](https://github.com/zhang2014)).
-* Fix possible very rare deadlocks in RBAC implementation. [#15875](https://github.com/ClickHouse/ClickHouse/pull/15875) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix exception `Block structure mismatch` in `SELECT ... ORDER BY DESC` queries which were executed after `ALTER MODIFY COLUMN` query. Fixes [#15800](https://github.com/ClickHouse/ClickHouse/issues/15800). [#15852](https://github.com/ClickHouse/ClickHouse/pull/15852) ([alesapin](https://github.com/alesapin)).
-* `MaterializeMySQL` (experimental feature): Fix `select count()` inaccuracy. [#15767](https://github.com/ClickHouse/ClickHouse/pull/15767) ([tavplubix](https://github.com/tavplubix)).
-* Fix some cases of queries, in which only virtual columns are selected. Previously `Not found column _nothing in block` exception may be thrown. Fixes [#12298](https://github.com/ClickHouse/ClickHouse/issues/12298). [#15756](https://github.com/ClickHouse/ClickHouse/pull/15756) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix drop of materialized view with inner table in Atomic database (hangs all subsequent DROP TABLE due to hang of the worker thread, due to recursive DROP TABLE for inner table of MV). [#15743](https://github.com/ClickHouse/ClickHouse/pull/15743) ([Azat Khuzhin](https://github.com/azat)).
-* Possibility to move part to another disk/volume if the first attempt was failed. [#15723](https://github.com/ClickHouse/ClickHouse/pull/15723) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Fix error `Cannot find column` which may happen at insertion into `MATERIALIZED VIEW` in case if query for `MV` containes `ARRAY JOIN`. [#15717](https://github.com/ClickHouse/ClickHouse/pull/15717) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed too low default value of `max_replicated_logs_to_keep` setting, which might cause replicas to become lost too often. Improve lost replica recovery process by choosing the most up-to-date replica to clone. Also do not remove old parts from lost replica, detach them instead. [#15701](https://github.com/ClickHouse/ClickHouse/pull/15701) ([tavplubix](https://github.com/tavplubix)).
-* Fix rare race condition in dictionaries and tables from MySQL. [#15686](https://github.com/ClickHouse/ClickHouse/pull/15686) ([alesapin](https://github.com/alesapin)).
-* Fix (benign) race condition in AMQP-CPP. [#15667](https://github.com/ClickHouse/ClickHouse/pull/15667) ([alesapin](https://github.com/alesapin)).
-* Fix error `Cannot add simple transform to empty Pipe` which happened while reading from `Buffer` table which has different structure than destination table. It was possible if destination table returned empty result for query. Fixes [#15529](https://github.com/ClickHouse/ClickHouse/issues/15529). [#15662](https://github.com/ClickHouse/ClickHouse/pull/15662) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Proper error handling during insert into MergeTree with S3. MergeTree over S3 is an experimental feature. [#15657](https://github.com/ClickHouse/ClickHouse/pull/15657) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Fixed bug with S3 table function: region from URL was not applied to S3 client configuration. [#15646](https://github.com/ClickHouse/ClickHouse/pull/15646) ([Vladimir Chebotarev](https://github.com/excitoon)).
-* Fix the order of destruction for resources in `ReadFromStorage` step of query plan. It might cause crashes in rare cases. Possibly connected with [#15610](https://github.com/ClickHouse/ClickHouse/issues/15610). [#15645](https://github.com/ClickHouse/ClickHouse/pull/15645) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Subtract `ReadonlyReplica` metric when detach readonly tables. [#15592](https://github.com/ClickHouse/ClickHouse/pull/15592) ([sundyli](https://github.com/sundy-li)).
-* Fixed `Element ... is not a constant expression` error when using `JSON*` function result in `VALUES`, `LIMIT` or right side of `IN` operator. [#15589](https://github.com/ClickHouse/ClickHouse/pull/15589) ([tavplubix](https://github.com/tavplubix)).
-* Query will finish faster in case of exception. Cancel execution on remote replicas if exception happens. [#15578](https://github.com/ClickHouse/ClickHouse/pull/15578) ([Azat Khuzhin](https://github.com/azat)).
-* Prevent the possibility of error message `Could not calculate available disk space (statvfs), errno: 4, strerror: Interrupted system call`. This fixes [#15541](https://github.com/ClickHouse/ClickHouse/issues/15541). [#15557](https://github.com/ClickHouse/ClickHouse/pull/15557) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix `Database <db> doesn't exist.` in queries with IN and Distributed table when there's no database on initiator. [#15538](https://github.com/ClickHouse/ClickHouse/pull/15538) ([Artem Zuikov](https://github.com/4ertus2)).
-* Mutation might hang waiting for some non-existent part after `MOVE` or `REPLACE PARTITION` or, in rare cases, after `DETACH` or `DROP PARTITION`. It's fixed. [#15537](https://github.com/ClickHouse/ClickHouse/pull/15537) ([tavplubix](https://github.com/tavplubix)).
-* Fix bug when `ILIKE` operator stops being case insensitive if `LIKE` with the same pattern was executed. [#15536](https://github.com/ClickHouse/ClickHouse/pull/15536) ([alesapin](https://github.com/alesapin)).
-* Fix `Missing columns` errors when selecting columns which absent in data, but depend on other columns which also absent in data. Fixes [#15530](https://github.com/ClickHouse/ClickHouse/issues/15530). [#15532](https://github.com/ClickHouse/ClickHouse/pull/15532) ([alesapin](https://github.com/alesapin)).
-* Throw an error when a single parameter is passed to ReplicatedMergeTree instead of ignoring it. [#15516](https://github.com/ClickHouse/ClickHouse/pull/15516) ([nvartolomei](https://github.com/nvartolomei)).
-* Fix bug with event subscription in DDLWorker which rarely may lead to query hangs in `ON CLUSTER`. Introduced in [#13450](https://github.com/ClickHouse/ClickHouse/issues/13450). [#15477](https://github.com/ClickHouse/ClickHouse/pull/15477) ([alesapin](https://github.com/alesapin)).
-* Report proper error when the second argument of `boundingRatio` aggregate function has a wrong type. [#15407](https://github.com/ClickHouse/ClickHouse/pull/15407) ([detailyang](https://github.com/detailyang)).
-* Fixes [#15365](https://github.com/ClickHouse/ClickHouse/issues/15365): attach a database with MySQL engine throws exception (no query context). [#15384](https://github.com/ClickHouse/ClickHouse/pull/15384) ([Winter Zhang](https://github.com/zhang2014)).
-* Fix the case of multiple occurrences of column transformers in a select query. [#15378](https://github.com/ClickHouse/ClickHouse/pull/15378) ([Amos Bird](https://github.com/amosbird)).
-* Fixed compression in `S3` storage. [#15376](https://github.com/ClickHouse/ClickHouse/pull/15376) ([Vladimir Chebotarev](https://github.com/excitoon)).
-* Fix bug where queries like `SELECT toStartOfDay(today())` fail complaining about empty time_zone argument. [#15319](https://github.com/ClickHouse/ClickHouse/pull/15319) ([Bharat Nallan](https://github.com/bharatnc)).
-* Fix race condition during MergeTree table rename and background cleanup. [#15304](https://github.com/ClickHouse/ClickHouse/pull/15304) ([alesapin](https://github.com/alesapin)).
-* Fix rare race condition on server startup when system logs are enabled. [#15300](https://github.com/ClickHouse/ClickHouse/pull/15300) ([alesapin](https://github.com/alesapin)).
-* Fix hang of queries with a lot of subqueries to same table of `MySQL` engine. Previously, if there were more than 16 subqueries to same `MySQL` table in query, it hang forever. [#15299](https://github.com/ClickHouse/ClickHouse/pull/15299) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix MSan report in QueryLog. Uninitialized memory can be used for the field `memory_usage`. [#15258](https://github.com/ClickHouse/ClickHouse/pull/15258) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix 'Unknown identifier' in GROUP BY when query has JOIN over Merge table. [#15242](https://github.com/ClickHouse/ClickHouse/pull/15242) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix instance crash when using `joinGet` with `LowCardinality` types. This fixes [#15214](https://github.com/ClickHouse/ClickHouse/issues/15214). [#15220](https://github.com/ClickHouse/ClickHouse/pull/15220) ([Amos Bird](https://github.com/amosbird)).
-* Fix bug in table engine `Buffer` which doesn't allow to insert data of new structure into `Buffer` after `ALTER` query. Fixes [#15117](https://github.com/ClickHouse/ClickHouse/issues/15117). [#15192](https://github.com/ClickHouse/ClickHouse/pull/15192) ([alesapin](https://github.com/alesapin)).
-* Adjust Decimal field size in MySQL column definition packet. [#15152](https://github.com/ClickHouse/ClickHouse/pull/15152) ([maqroll](https://github.com/maqroll)).
-* Fixes `Data compressed with different methods` in `join_algorithm='auto'`. Keep LowCardinality as type for left table join key in `join_algorithm='partial_merge'`. [#15088](https://github.com/ClickHouse/ClickHouse/pull/15088) ([Artem Zuikov](https://github.com/4ertus2)).
-* Update `jemalloc` to fix `percpu_arena` with affinity mask. [#15035](https://github.com/ClickHouse/ClickHouse/pull/15035) ([Azat Khuzhin](https://github.com/azat)). [#14957](https://github.com/ClickHouse/ClickHouse/pull/14957) ([Azat Khuzhin](https://github.com/azat)).
-* We already use padded comparison between String and FixedString (https://github.com/ClickHouse/ClickHouse/blob/master/src/Functions/FunctionsComparison.h#L333). This PR applies the same logic to field comparison which corrects the usage of FixedString as primary keys. This fixes [#14908](https://github.com/ClickHouse/ClickHouse/issues/14908). [#15033](https://github.com/ClickHouse/ClickHouse/pull/15033) ([Amos Bird](https://github.com/amosbird)).
-* If function `bar` was called with specifically crafted arguments, buffer overflow was possible. This closes [#13926](https://github.com/ClickHouse/ClickHouse/issues/13926). [#15028](https://github.com/ClickHouse/ClickHouse/pull/15028) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed `Cannot rename ... errno: 22, strerror: Invalid argument` error on DDL query execution in Atomic database when running clickhouse-server in Docker on Mac OS. [#15024](https://github.com/ClickHouse/ClickHouse/pull/15024) ([tavplubix](https://github.com/tavplubix)).
-* Fix crash in RIGHT or FULL JOIN with join_algorith='auto' when memory limit exceeded and we should change HashJoin with MergeJoin. [#15002](https://github.com/ClickHouse/ClickHouse/pull/15002) ([Artem Zuikov](https://github.com/4ertus2)).
-* Now settings `number_of_free_entries_in_pool_to_execute_mutation` and `number_of_free_entries_in_pool_to_lower_max_size_of_merge` can be equal to `background_pool_size`. [#14975](https://github.com/ClickHouse/ClickHouse/pull/14975) ([alesapin](https://github.com/alesapin)).
-* Fix to make predicate push down work when subquery contains `finalizeAggregation` function. Fixes [#14847](https://github.com/ClickHouse/ClickHouse/issues/14847). [#14937](https://github.com/ClickHouse/ClickHouse/pull/14937) ([filimonov](https://github.com/filimonov)).
-* Publish CPU frequencies per logical core in `system.asynchronous_metrics`. This fixes [#14923](https://github.com/ClickHouse/ClickHouse/issues/14923). [#14924](https://github.com/ClickHouse/ClickHouse/pull/14924) ([Alexander Kuzmenkov](https://github.com/akuzm)).
-* `MaterializeMySQL` (experimental feature): Fixed `.metadata.tmp File exists` error. [#14898](https://github.com/ClickHouse/ClickHouse/pull/14898) ([Winter Zhang](https://github.com/zhang2014)).
-* Fix the issue when some invocations of `extractAllGroups` function may trigger "Memory limit exceeded" error. This fixes [#13383](https://github.com/ClickHouse/ClickHouse/issues/13383). [#14889](https://github.com/ClickHouse/ClickHouse/pull/14889) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix SIGSEGV for an attempt to INSERT into StorageFile with file descriptor. [#14887](https://github.com/ClickHouse/ClickHouse/pull/14887) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed segfault in `cache` dictionary [#14837](https://github.com/ClickHouse/ClickHouse/issues/14837). [#14879](https://github.com/ClickHouse/ClickHouse/pull/14879) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* `MaterializeMySQL` (experimental feature): Fixed bug in parsing MySQL binlog events, which causes `Attempt to read after eof` and `Packet payload is not fully read` in `MaterializeMySQL` database engine. [#14852](https://github.com/ClickHouse/ClickHouse/pull/14852) ([Winter Zhang](https://github.com/zhang2014)).
-* Fix rare error in `SELECT` queries when the queried column has `DEFAULT` expression which depends on the other column which also has `DEFAULT` and not present in select query and not exists on disk. Partially fixes [#14531](https://github.com/ClickHouse/ClickHouse/issues/14531). [#14845](https://github.com/ClickHouse/ClickHouse/pull/14845) ([alesapin](https://github.com/alesapin)).
-* Fix a problem where the server may get stuck on startup while talking to ZooKeeper, if the configuration files have to be fetched from ZK (using the `from_zk` include option). This fixes [#14814](https://github.com/ClickHouse/ClickHouse/issues/14814). [#14843](https://github.com/ClickHouse/ClickHouse/pull/14843) ([Alexander Kuzmenkov](https://github.com/akuzm)).
-* Fix wrong monotonicity detection for shrunk `Int -> Int` cast of signed types. It might lead to incorrect query result. This bug is unveiled in [#14513](https://github.com/ClickHouse/ClickHouse/issues/14513). [#14783](https://github.com/ClickHouse/ClickHouse/pull/14783) ([Amos Bird](https://github.com/amosbird)).
-* `Replace` column transformer should replace identifiers with cloned ASTs. This fixes [#14695](https://github.com/ClickHouse/ClickHouse/issues/14695) . [#14734](https://github.com/ClickHouse/ClickHouse/pull/14734) ([Amos Bird](https://github.com/amosbird)).
-* Fixed missed default database name in metadata of materialized view when executing `ALTER ... MODIFY QUERY`. [#14664](https://github.com/ClickHouse/ClickHouse/pull/14664) ([tavplubix](https://github.com/tavplubix)).
-* Fix bug when `ALTER UPDATE` mutation with `Nullable` column in assignment expression and constant value (like `UPDATE x = 42`) leads to incorrect value in column or segfault. Fixes [#13634](https://github.com/ClickHouse/ClickHouse/issues/13634), [#14045](https://github.com/ClickHouse/ClickHouse/issues/14045). [#14646](https://github.com/ClickHouse/ClickHouse/pull/14646) ([alesapin](https://github.com/alesapin)).
-* Fix wrong Decimal multiplication result caused wrong decimal scale of result column. [#14603](https://github.com/ClickHouse/ClickHouse/pull/14603) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix function `has` with `LowCardinality` of `Nullable`. [#14591](https://github.com/ClickHouse/ClickHouse/pull/14591) ([Mike](https://github.com/myrrc)).
-* Cleanup data directory after Zookeeper exceptions during CreateQuery for StorageReplicatedMergeTree Engine. [#14563](https://github.com/ClickHouse/ClickHouse/pull/14563) ([Bharat Nallan](https://github.com/bharatnc)).
-* Fix rare segfaults in functions with combinator `-Resample`, which could appear in result of overflow with very large parameters. [#14562](https://github.com/ClickHouse/ClickHouse/pull/14562) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix a bug when converting `Nullable(String)` to Enum. Introduced by [#12745](https://github.com/ClickHouse/ClickHouse/pull/12745). This fixes [#14435](https://github.com/ClickHouse/ClickHouse/issues/14435). [#14530](https://github.com/ClickHouse/ClickHouse/pull/14530) ([Amos Bird](https://github.com/amosbird)).
-* Fixed the incorrect sorting order of `Nullable` column. This fixes [#14344](https://github.com/ClickHouse/ClickHouse/issues/14344). [#14495](https://github.com/ClickHouse/ClickHouse/pull/14495) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fix `currentDatabase()` function cannot be used in `ON CLUSTER` ddl query. [#14211](https://github.com/ClickHouse/ClickHouse/pull/14211) ([Winter Zhang](https://github.com/zhang2014)).
-* `MaterializeMySQL` (experimental feature): Fixed `Packet payload is not fully read` error in `MaterializeMySQL` database engine. [#14696](https://github.com/ClickHouse/ClickHouse/pull/14696) ([BohuTANG](https://github.com/BohuTANG)).
-
-#### Improvement
-
-* Enable `Atomic` database engine by default for newly created databases. [#15003](https://github.com/ClickHouse/ClickHouse/pull/15003) ([tavplubix](https://github.com/tavplubix)).
-* Add the ability to specify specialized codecs like `Delta`, `T64`, etc. for columns with subtypes. Implements [#12551](https://github.com/ClickHouse/ClickHouse/issues/12551), fixes [#11397](https://github.com/ClickHouse/ClickHouse/issues/11397), fixes [#4609](https://github.com/ClickHouse/ClickHouse/issues/4609). [#15089](https://github.com/ClickHouse/ClickHouse/pull/15089) ([alesapin](https://github.com/alesapin)).
-* Dynamic reload of zookeeper config. [#14678](https://github.com/ClickHouse/ClickHouse/pull/14678) ([sundyli](https://github.com/sundy-li)).
-* Now it's allowed to execute `ALTER ... ON CLUSTER` queries regardless of the `<internal_replication>` setting in cluster config. [#16075](https://github.com/ClickHouse/ClickHouse/pull/16075) ([alesapin](https://github.com/alesapin)).
-* Now `joinGet` supports multi-key lookup. Continuation of [#12418](https://github.com/ClickHouse/ClickHouse/issues/12418). [#13015](https://github.com/ClickHouse/ClickHouse/pull/13015) ([Amos Bird](https://github.com/amosbird)).
-* Wait for `DROP/DETACH TABLE` to actually finish if `NO DELAY` or `SYNC` is specified for `Atomic` database. [#15448](https://github.com/ClickHouse/ClickHouse/pull/15448) ([tavplubix](https://github.com/tavplubix)).
-* Now it's possible to change the type of version column for `VersionedCollapsingMergeTree` with `ALTER` query. [#15442](https://github.com/ClickHouse/ClickHouse/pull/15442) ([alesapin](https://github.com/alesapin)).
-* Unfold `{database}`, `{table}` and `{uuid}` macros in `zookeeper_path` on replicated table creation. Do not allow `RENAME TABLE` if it may break `zookeeper_path` after server restart. Fixes [#6917](https://github.com/ClickHouse/ClickHouse/issues/6917). [#15348](https://github.com/ClickHouse/ClickHouse/pull/15348) ([tavplubix](https://github.com/tavplubix)).
-* The function `now` allows an argument with timezone. This closes [15264](https://github.com/ClickHouse/ClickHouse/issues/15264). [#15285](https://github.com/ClickHouse/ClickHouse/pull/15285) ([flynn](https://github.com/ucasFL)).
-* Do not allow connections to ClickHouse server until all scripts in `/docker-entrypoint-initdb.d/` are executed. [#15244](https://github.com/ClickHouse/ClickHouse/pull/15244) ([Aleksei Kozharin](https://github.com/alekseik1)).
-* Added `optimize` setting to `EXPLAIN PLAN` query. If enabled, query plan level optimisations are applied. Enabled by default. [#15201](https://github.com/ClickHouse/ClickHouse/pull/15201) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Proper exception message for wrong number of arguments of CAST. This closes [#13992](https://github.com/ClickHouse/ClickHouse/issues/13992). [#15029](https://github.com/ClickHouse/ClickHouse/pull/15029) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add option to disable TTL move on data part insert. [#15000](https://github.com/ClickHouse/ClickHouse/pull/15000) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Ignore key constraints when doing mutations. Without this pull request, it's not possible to do mutations when `force_index_by_date = 1` or `force_primary_key = 1`. [#14973](https://github.com/ClickHouse/ClickHouse/pull/14973) ([Amos Bird](https://github.com/amosbird)).
-* Allow to drop Replicated table if previous drop attempt was failed due to ZooKeeper session expiration. This fixes [#11891](https://github.com/ClickHouse/ClickHouse/issues/11891). [#14926](https://github.com/ClickHouse/ClickHouse/pull/14926) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed excessive settings constraint violation when running SELECT with SETTINGS from a distributed table. [#14876](https://github.com/ClickHouse/ClickHouse/pull/14876) ([Amos Bird](https://github.com/amosbird)).
-* Provide a `load_balancing_first_offset` query setting to explicitly state what the first replica is. It's used together with `FIRST_OR_RANDOM` load balancing strategy, which allows to control replicas workload. [#14867](https://github.com/ClickHouse/ClickHouse/pull/14867) ([Amos Bird](https://github.com/amosbird)).
-* Show subqueries for `SET` and `JOIN` in `EXPLAIN` result. [#14856](https://github.com/ClickHouse/ClickHouse/pull/14856) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Allow using multi-volume storage configuration in storage `Distributed`. [#14839](https://github.com/ClickHouse/ClickHouse/pull/14839) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Construct `query_start_time` and `query_start_time_microseconds` from the same timespec. [#14831](https://github.com/ClickHouse/ClickHouse/pull/14831) ([Bharat Nallan](https://github.com/bharatnc)).
-* Support for disabling persistency for `StorageJoin` and `StorageSet`, this feature is controlled by setting `disable_set_and_join_persistency`. And this PR solved issue [#6318](https://github.com/ClickHouse/ClickHouse/issues/6318). [#14776](https://github.com/ClickHouse/ClickHouse/pull/14776) ([vxider](https://github.com/Vxider)).
-* Now `COLUMNS` can be used to wrap over a list of columns and apply column transformers afterwards. [#14775](https://github.com/ClickHouse/ClickHouse/pull/14775) ([Amos Bird](https://github.com/amosbird)).
-* Add `merge_algorithm` to `system.merges` table to improve merging inspections. [#14705](https://github.com/ClickHouse/ClickHouse/pull/14705) ([Amos Bird](https://github.com/amosbird)).
-* Fix potential memory leak caused by zookeeper exists watch. [#14693](https://github.com/ClickHouse/ClickHouse/pull/14693) ([hustnn](https://github.com/hustnn)).
-* Allow parallel execution of distributed DDL. [#14684](https://github.com/ClickHouse/ClickHouse/pull/14684) ([Azat Khuzhin](https://github.com/azat)).
-* Add `QueryMemoryLimitExceeded` event counter. This closes [#14589](https://github.com/ClickHouse/ClickHouse/issues/14589). [#14647](https://github.com/ClickHouse/ClickHouse/pull/14647) ([fastio](https://github.com/fastio)).
-* Fix some trailing whitespaces in query formatting. [#14595](https://github.com/ClickHouse/ClickHouse/pull/14595) ([Azat Khuzhin](https://github.com/azat)).
-* ClickHouse treats partition expr and key expr differently. Partition expr is used to construct an minmax index containing related columns, while primary key expr is stored as an expr. Sometimes user might partition a table at coarser levels, such as `partition by i / 1000`. However, binary operators are not monotonic and this PR tries to fix that. It might also benifit other use cases. [#14513](https://github.com/ClickHouse/ClickHouse/pull/14513) ([Amos Bird](https://github.com/amosbird)).
-* Add an option to skip access checks for `DiskS3`. `s3` disk is an experimental feature. [#14497](https://github.com/ClickHouse/ClickHouse/pull/14497) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Speed up server shutdown process if there are ongoing S3 requests. [#14496](https://github.com/ClickHouse/ClickHouse/pull/14496) ([Pavel Kovalenko](https://github.com/Jokser)).
-* `SYSTEM RELOAD CONFIG` now throws an exception if failed to reload and continues using the previous users.xml. The background periodic reloading also continues using the previous users.xml if failed to reload. [#14492](https://github.com/ClickHouse/ClickHouse/pull/14492) ([Vitaly Baranov](https://github.com/vitlibar)).
-* For INSERTs with inline data in VALUES format in the script mode of `clickhouse-client`, support semicolon as the data terminator, in addition to the new line. Closes [#12288](https://github.com/ClickHouse/ClickHouse/issues/12288). [#13192](https://github.com/ClickHouse/ClickHouse/pull/13192) ([Alexander Kuzmenkov](https://github.com/akuzm)).
-* Support custom codecs in compact parts. [#12183](https://github.com/ClickHouse/ClickHouse/pull/12183) ([Anton Popov](https://github.com/CurtizJ)).
-
-#### Performance Improvement
-
-* Enable compact parts by default for small parts. This will allow to process frequent inserts slightly more efficiently (4..100 times). [#11913](https://github.com/ClickHouse/ClickHouse/pull/11913) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Improve `quantileTDigest` performance. This fixes [#2668](https://github.com/ClickHouse/ClickHouse/issues/2668). [#15542](https://github.com/ClickHouse/ClickHouse/pull/15542) ([Kruglov Pavel](https://github.com/Avogar)).
-* Significantly reduce memory usage in AggregatingInOrderTransform/optimize_aggregation_in_order. [#15543](https://github.com/ClickHouse/ClickHouse/pull/15543) ([Azat Khuzhin](https://github.com/azat)).
-* Faster 256-bit multiplication. [#15418](https://github.com/ClickHouse/ClickHouse/pull/15418) ([Artem Zuikov](https://github.com/4ertus2)).
-* Improve performance of 256-bit types using (u)int64_t as base type for wide integers. Original wide integers use 8-bit types as base. [#14859](https://github.com/ClickHouse/ClickHouse/pull/14859) ([Artem Zuikov](https://github.com/4ertus2)).
-* Explicitly use a temporary disk to store vertical merge temporary data. [#15639](https://github.com/ClickHouse/ClickHouse/pull/15639) ([Grigory Pervakov](https://github.com/GrigoryPervakov)).
-* Use one S3 DeleteObjects request instead of multiple DeleteObject in a loop. No any functionality changes, so covered by existing tests like integration/test_log_family_s3. [#15238](https://github.com/ClickHouse/ClickHouse/pull/15238) ([ianton-ru](https://github.com/ianton-ru)).
-* Fix `DateTime <op> DateTime` mistakenly choosing the slow generic implementation. This fixes [#15153](https://github.com/ClickHouse/ClickHouse/issues/15153). [#15178](https://github.com/ClickHouse/ClickHouse/pull/15178) ([Amos Bird](https://github.com/amosbird)).
-* Improve performance of GROUP BY key of type `FixedString`. [#15034](https://github.com/ClickHouse/ClickHouse/pull/15034) ([Amos Bird](https://github.com/amosbird)).
-* Only `mlock` code segment when starting clickhouse-server. In previous versions, all mapped regions were locked in memory, including debug info. Debug info is usually splitted to a separate file but if it isn't, it led to +2..3 GiB memory usage. [#14929](https://github.com/ClickHouse/ClickHouse/pull/14929) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* ClickHouse binary become smaller due to link time optimization.
-
-#### Build/Testing/Packaging Improvement
-
-* Now we use clang-11 for production ClickHouse build. [#15239](https://github.com/ClickHouse/ClickHouse/pull/15239) ([alesapin](https://github.com/alesapin)).
-* Now we use clang-11 to build ClickHouse in CI. [#14846](https://github.com/ClickHouse/ClickHouse/pull/14846) ([alesapin](https://github.com/alesapin)).
-* Switch binary builds (Linux, Darwin, AArch64, FreeDSD) to clang-11. [#15622](https://github.com/ClickHouse/ClickHouse/pull/15622) ([Ilya Yatsishin](https://github.com/qoega)).
-* Now all test images use `llvm-symbolizer-11`. [#15069](https://github.com/ClickHouse/ClickHouse/pull/15069) ([alesapin](https://github.com/alesapin)).
-* Allow to build with llvm-11. [#15366](https://github.com/ClickHouse/ClickHouse/pull/15366) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Switch from `clang-tidy-10` to `clang-tidy-11`. [#14922](https://github.com/ClickHouse/ClickHouse/pull/14922) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Use LLVM's experimental pass manager by default. [#15608](https://github.com/ClickHouse/ClickHouse/pull/15608) ([Danila Kutenin](https://github.com/danlark1)).
-* Don't allow any C++ translation unit to build more than 10 minutes or to use more than 10 GB or memory. This fixes [#14925](https://github.com/ClickHouse/ClickHouse/issues/14925). [#15060](https://github.com/ClickHouse/ClickHouse/pull/15060) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Make performance test more stable and representative by splitting test runs and profile runs. [#15027](https://github.com/ClickHouse/ClickHouse/pull/15027) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Attempt to make performance test more reliable. It is done by remapping the executable memory of the process on the fly with `madvise` to use transparent huge pages - it can lower the number of iTLB misses which is the main source of instabilities in performance tests. [#14685](https://github.com/ClickHouse/ClickHouse/pull/14685) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Convert to python3. This closes [#14886](https://github.com/ClickHouse/ClickHouse/issues/14886). [#15007](https://github.com/ClickHouse/ClickHouse/pull/15007) ([Azat Khuzhin](https://github.com/azat)).
-* Fail early in functional tests if server failed to respond. This closes [#15262](https://github.com/ClickHouse/ClickHouse/issues/15262). [#15267](https://github.com/ClickHouse/ClickHouse/pull/15267) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Allow to run AArch64 version of clickhouse-server without configs. This facilitates [#15174](https://github.com/ClickHouse/ClickHouse/issues/15174). [#15266](https://github.com/ClickHouse/ClickHouse/pull/15266) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Improvements in CI docker images: get rid of ZooKeeper and single script for test configs installation. [#15215](https://github.com/ClickHouse/ClickHouse/pull/15215) ([alesapin](https://github.com/alesapin)).
-* Fix CMake options forwarding in fast test script. Fixes error in [#14711](https://github.com/ClickHouse/ClickHouse/issues/14711). [#15155](https://github.com/ClickHouse/ClickHouse/pull/15155) ([alesapin](https://github.com/alesapin)).
-* Added a script to perform hardware benchmark in a single command. [#15115](https://github.com/ClickHouse/ClickHouse/pull/15115) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Splitted huge test `test_dictionaries_all_layouts_and_sources` into smaller ones. [#15110](https://github.com/ClickHouse/ClickHouse/pull/15110) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Maybe fix MSan report in base64 (on servers with AVX-512). This fixes [#14006](https://github.com/ClickHouse/ClickHouse/issues/14006). [#15030](https://github.com/ClickHouse/ClickHouse/pull/15030) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Reformat and cleanup code in all integration test *.py files. [#14864](https://github.com/ClickHouse/ClickHouse/pull/14864) ([Bharat Nallan](https://github.com/bharatnc)).
-* Fix MaterializeMySQL empty transaction unstable test case found in CI. [#14854](https://github.com/ClickHouse/ClickHouse/pull/14854) ([Winter Zhang](https://github.com/zhang2014)).
-* Attempt to speed up build a little. [#14808](https://github.com/ClickHouse/ClickHouse/pull/14808) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Speed up build a little by removing unused headers. [#14714](https://github.com/ClickHouse/ClickHouse/pull/14714) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix build failure in OSX. [#14761](https://github.com/ClickHouse/ClickHouse/pull/14761) ([Winter Zhang](https://github.com/zhang2014)).
-* Enable ccache by default in cmake if it's found in OS. [#14575](https://github.com/ClickHouse/ClickHouse/pull/14575) ([alesapin](https://github.com/alesapin)).
-* Control CI builds configuration from the ClickHouse repository. [#14547](https://github.com/ClickHouse/ClickHouse/pull/14547) ([alesapin](https://github.com/alesapin)).
-* In CMake files: - Moved some options' descriptions' parts to comments above. - Replace 0 -> `OFF`, 1 -> `ON` in `option`s default values. - Added some descriptions and links to docs to the options. - Replaced `FUZZER` option (there is another option `ENABLE_FUZZING` which also enables same functionality). - Removed `ENABLE_GTEST_LIBRARY` option as there is `ENABLE_TESTS`. See the full description in PR: [#14711](https://github.com/ClickHouse/ClickHouse/pull/14711) ([Mike](https://github.com/myrrc)).
-* Make binary a bit smaller (~50 Mb for debug version). [#14555](https://github.com/ClickHouse/ClickHouse/pull/14555) ([Artem Zuikov](https://github.com/4ertus2)).
-* Use std::filesystem::path in ConfigProcessor for concatenating file paths. [#14558](https://github.com/ClickHouse/ClickHouse/pull/14558) ([Bharat Nallan](https://github.com/bharatnc)).
-* Fix debug assertion in `bitShiftLeft()` when called with negative big integer. [#14697](https://github.com/ClickHouse/ClickHouse/pull/14697) ([Artem Zuikov](https://github.com/4ertus2)).
-
-
-## ClickHouse release 20.9
-
-### ClickHouse release v20.9.5.5-stable, 2020-11-13
-
-#### Bug Fix
-
-* Fix rare silent crashes when query profiler is on and ClickHouse is installed on OS with glibc version that has (supposedly) broken asynchronous unwind tables for some functions. This fixes [#15301](https://github.com/ClickHouse/ClickHouse/issues/15301). This fixes [#13098](https://github.com/ClickHouse/ClickHouse/issues/13098). [#16846](https://github.com/ClickHouse/ClickHouse/pull/16846) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Now when parsing AVRO from input the LowCardinality is removed from type. Fixes [#16188](https://github.com/ClickHouse/ClickHouse/issues/16188). [#16521](https://github.com/ClickHouse/ClickHouse/pull/16521) ([Mike](https://github.com/myrrc)).
-* Fix rapid growth of metadata when using MySQL Master -> MySQL Slave -> ClickHouse MaterializeMySQL Engine, and `slave_parallel_worker` enabled on MySQL Slave, by properly shrinking GTID sets. This fixes [#15951](https://github.com/ClickHouse/ClickHouse/issues/15951). [#16504](https://github.com/ClickHouse/ClickHouse/pull/16504) ([TCeason](https://github.com/TCeason)).
-* Fix DROP TABLE for Distributed (racy with INSERT). [#16409](https://github.com/ClickHouse/ClickHouse/pull/16409) ([Azat Khuzhin](https://github.com/azat)).
-* Fix processing of very large entries in replication queue. Very large entries may appear in ALTER queries if table structure is extremely large (near 1 MB). This fixes [#16307](https://github.com/ClickHouse/ClickHouse/issues/16307). [#16332](https://github.com/ClickHouse/ClickHouse/pull/16332) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed the inconsistent behaviour when a part of return data could be dropped because the set for its filtration wasn't created. [#16308](https://github.com/ClickHouse/ClickHouse/pull/16308) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fix bug with MySQL database. When MySQL server used as database engine is down some queries raise Exception, because they try to get tables from disabled server, while it's unnecessary. For example, query `SELECT ... FROM system.parts` should work only with MergeTree tables and don't touch MySQL database at all. [#16032](https://github.com/ClickHouse/ClickHouse/pull/16032) ([Kruglov Pavel](https://github.com/Avogar)).
-
-
-### ClickHouse release v20.9.4.76-stable (2020-10-29)
-
-#### Bug Fix
-
-* Fix double free in case of exception in function `dictGet`. It could have happened if dictionary was loaded with error. [#16429](https://github.com/ClickHouse/ClickHouse/pull/16429) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix group by with totals/rollup/cube modifers and min/max functions over group by keys. Fixes [#16393](https://github.com/ClickHouse/ClickHouse/issues/16393). [#16397](https://github.com/ClickHouse/ClickHouse/pull/16397) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix async Distributed INSERT w/ prefer_localhost_replica=0 and internal_replication. [#16358](https://github.com/ClickHouse/ClickHouse/pull/16358) ([Azat Khuzhin](https://github.com/azat)).
-* Fix a very wrong code in TwoLevelStringHashTable implementation, which might lead to memory leak. I'm suprised how this bug can lurk for so long.... [#16264](https://github.com/ClickHouse/ClickHouse/pull/16264) ([Amos Bird](https://github.com/amosbird)).
-* Fix the case when memory can be overallocated regardless to the limit. This closes [#14560](https://github.com/ClickHouse/ClickHouse/issues/14560). [#16206](https://github.com/ClickHouse/ClickHouse/pull/16206) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix `ALTER MODIFY ... ORDER BY` query hang for `ReplicatedVersionedCollapsingMergeTree`. This fixes [#15980](https://github.com/ClickHouse/ClickHouse/issues/15980). [#16011](https://github.com/ClickHouse/ClickHouse/pull/16011) ([alesapin](https://github.com/alesapin)).
-* Fix collate name & charset name parser and support `length = 0` for string type. [#16008](https://github.com/ClickHouse/ClickHouse/pull/16008) ([Winter Zhang](https://github.com/zhang2014)).
-* Allow to use direct layout for dictionaries with complex keys. [#16007](https://github.com/ClickHouse/ClickHouse/pull/16007) ([Anton Popov](https://github.com/CurtizJ)).
-* Prevent replica hang for 5-10 mins when replication error happens after a period of inactivity. [#15987](https://github.com/ClickHouse/ClickHouse/pull/15987) ([filimonov](https://github.com/filimonov)).
-* Fix rare segfaults when inserting into or selecting from MaterializedView and concurrently dropping target table (for Atomic database engine). [#15984](https://github.com/ClickHouse/ClickHouse/pull/15984) ([tavplubix](https://github.com/tavplubix)).
-* Fix ambiguity in parsing of settings profiles: `CREATE USER ... SETTINGS profile readonly` is now considered as using a profile named `readonly`, not a setting named `profile` with the readonly constraint. This fixes [#15628](https://github.com/ClickHouse/ClickHouse/issues/15628). [#15982](https://github.com/ClickHouse/ClickHouse/pull/15982) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix a crash when database creation fails. [#15954](https://github.com/ClickHouse/ClickHouse/pull/15954) ([Winter Zhang](https://github.com/zhang2014)).
-* Fixed `DROP TABLE IF EXISTS` failure with `Table ... doesn't exist` error when table is concurrently renamed (for Atomic database engine). Fixed rare deadlock when concurrently executing some DDL queries with multiple tables (like `DROP DATABASE` and `RENAME TABLE`) Fixed `DROP/DETACH DATABASE` failure with `Table ... doesn't exist` when concurrently executing `DROP/DETACH TABLE`. [#15934](https://github.com/ClickHouse/ClickHouse/pull/15934) ([tavplubix](https://github.com/tavplubix)).
-* Fix incorrect empty result for query from `Distributed` table if query has `WHERE`, `PREWHERE` and `GLOBAL IN`. Fixes [#15792](https://github.com/ClickHouse/ClickHouse/issues/15792). [#15933](https://github.com/ClickHouse/ClickHouse/pull/15933) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix possible deadlocks in RBAC. [#15875](https://github.com/ClickHouse/ClickHouse/pull/15875) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix exception `Block structure mismatch` in `SELECT ... ORDER BY DESC` queries which were executed after `ALTER MODIFY COLUMN` query. Fixes [#15800](https://github.com/ClickHouse/ClickHouse/issues/15800). [#15852](https://github.com/ClickHouse/ClickHouse/pull/15852) ([alesapin](https://github.com/alesapin)).
-* Fix `select count()` inaccuracy for MaterializeMySQL. [#15767](https://github.com/ClickHouse/ClickHouse/pull/15767) ([tavplubix](https://github.com/tavplubix)).
-* Fix some cases of queries, in which only virtual columns are selected. Previously `Not found column _nothing in block` exception may be thrown. Fixes [#12298](https://github.com/ClickHouse/ClickHouse/issues/12298). [#15756](https://github.com/ClickHouse/ClickHouse/pull/15756) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed too low default value of `max_replicated_logs_to_keep` setting, which might cause replicas to become lost too often. Improve lost replica recovery process by choosing the most up-to-date replica to clone. Also do not remove old parts from lost replica, detach them instead. [#15701](https://github.com/ClickHouse/ClickHouse/pull/15701) ([tavplubix](https://github.com/tavplubix)).
-* Fix error `Cannot add simple transform to empty Pipe` which happened while reading from `Buffer` table which has different structure than destination table. It was possible if destination table returned empty result for query. Fixes [#15529](https://github.com/ClickHouse/ClickHouse/issues/15529). [#15662](https://github.com/ClickHouse/ClickHouse/pull/15662) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed bug with globs in S3 table function, region from URL was not applied to S3 client configuration. [#15646](https://github.com/ClickHouse/ClickHouse/pull/15646) ([Vladimir Chebotarev](https://github.com/excitoon)).
-* Decrement the `ReadonlyReplica` metric when detaching read-only tables. This fixes [#15598](https://github.com/ClickHouse/ClickHouse/issues/15598). [#15592](https://github.com/ClickHouse/ClickHouse/pull/15592) ([sundyli](https://github.com/sundy-li)).
-* Throw an error when a single parameter is passed to ReplicatedMergeTree instead of ignoring it. [#15516](https://github.com/ClickHouse/ClickHouse/pull/15516) ([nvartolomei](https://github.com/nvartolomei)).
-
-#### Improvement
-
-* Now it's allowed to execute `ALTER ... ON CLUSTER` queries regardless of the `<internal_replication>` setting in cluster config. [#16075](https://github.com/ClickHouse/ClickHouse/pull/16075) ([alesapin](https://github.com/alesapin)).
-* Unfold `{database}`, `{table}` and `{uuid}` macros in `ReplicatedMergeTree` arguments on table creation. [#16160](https://github.com/ClickHouse/ClickHouse/pull/16160) ([tavplubix](https://github.com/tavplubix)).
-
-
-### ClickHouse release v20.9.3.45-stable (2020-10-09)
-
-#### Bug Fix
-
-* Fix error `Cannot find column` which may happen at insertion into `MATERIALIZED VIEW` in case if query for `MV` containes `ARRAY JOIN`. [#15717](https://github.com/ClickHouse/ClickHouse/pull/15717) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix race condition in AMQP-CPP. [#15667](https://github.com/ClickHouse/ClickHouse/pull/15667) ([alesapin](https://github.com/alesapin)).
-* Fix the order of destruction for resources in `ReadFromStorage` step of query plan. It might cause crashes in rare cases. Possibly connected with [#15610](https://github.com/ClickHouse/ClickHouse/issues/15610). [#15645](https://github.com/ClickHouse/ClickHouse/pull/15645) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed `Element ... is not a constant expression` error when using `JSON*` function result in `VALUES`, `LIMIT` or right side of `IN` operator. [#15589](https://github.com/ClickHouse/ClickHouse/pull/15589) ([tavplubix](https://github.com/tavplubix)).
-* Prevent the possibility of error message `Could not calculate available disk space (statvfs), errno: 4, strerror: Interrupted system call`. This fixes [#15541](https://github.com/ClickHouse/ClickHouse/issues/15541). [#15557](https://github.com/ClickHouse/ClickHouse/pull/15557) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Significantly reduce memory usage in AggregatingInOrderTransform/optimize_aggregation_in_order. [#15543](https://github.com/ClickHouse/ClickHouse/pull/15543) ([Azat Khuzhin](https://github.com/azat)).
-* Mutation might hang waiting for some non-existent part after `MOVE` or `REPLACE PARTITION` or, in rare cases, after `DETACH` or `DROP PARTITION`. It's fixed. [#15537](https://github.com/ClickHouse/ClickHouse/pull/15537) ([tavplubix](https://github.com/tavplubix)).
-* Fix bug when `ILIKE` operator stops being case insensitive if `LIKE` with the same pattern was executed. [#15536](https://github.com/ClickHouse/ClickHouse/pull/15536) ([alesapin](https://github.com/alesapin)).
-* Fix `Missing columns` errors when selecting columns which absent in data, but depend on other columns which also absent in data. Fixes [#15530](https://github.com/ClickHouse/ClickHouse/issues/15530). [#15532](https://github.com/ClickHouse/ClickHouse/pull/15532) ([alesapin](https://github.com/alesapin)).
-* Fix bug with event subscription in DDLWorker which rarely may lead to query hangs in `ON CLUSTER`. Introduced in [#13450](https://github.com/ClickHouse/ClickHouse/issues/13450). [#15477](https://github.com/ClickHouse/ClickHouse/pull/15477) ([alesapin](https://github.com/alesapin)).
-* Report proper error when the second argument of `boundingRatio` aggregate function has a wrong type. [#15407](https://github.com/ClickHouse/ClickHouse/pull/15407) ([detailyang](https://github.com/detailyang)).
-* Fix bug where queries like `SELECT toStartOfDay(today())` fail complaining about empty time_zone argument. [#15319](https://github.com/ClickHouse/ClickHouse/pull/15319) ([Bharat Nallan](https://github.com/bharatnc)).
-* Fix race condition during MergeTree table rename and background cleanup. [#15304](https://github.com/ClickHouse/ClickHouse/pull/15304) ([alesapin](https://github.com/alesapin)).
-* Fix rare race condition on server startup when system.logs are enabled. [#15300](https://github.com/ClickHouse/ClickHouse/pull/15300) ([alesapin](https://github.com/alesapin)).
-* Fix MSan report in QueryLog. Uninitialized memory can be used for the field `memory_usage`. [#15258](https://github.com/ClickHouse/ClickHouse/pull/15258) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix instance crash when using joinGet with LowCardinality types. This fixes [#15214](https://github.com/ClickHouse/ClickHouse/issues/15214). [#15220](https://github.com/ClickHouse/ClickHouse/pull/15220) ([Amos Bird](https://github.com/amosbird)).
-* Fix bug in table engine `Buffer` which doesn't allow to insert data of new structure into `Buffer` after `ALTER` query. Fixes [#15117](https://github.com/ClickHouse/ClickHouse/issues/15117). [#15192](https://github.com/ClickHouse/ClickHouse/pull/15192) ([alesapin](https://github.com/alesapin)).
-* Adjust decimals field size in mysql column definition packet. [#15152](https://github.com/ClickHouse/ClickHouse/pull/15152) ([maqroll](https://github.com/maqroll)).
-* Fixed `Cannot rename ... errno: 22, strerror: Invalid argument` error on DDL query execution in Atomic database when running clickhouse-server in docker on Mac OS. [#15024](https://github.com/ClickHouse/ClickHouse/pull/15024) ([tavplubix](https://github.com/tavplubix)).
-* Fix to make predicate push down work when subquery contains finalizeAggregation function. Fixes [#14847](https://github.com/ClickHouse/ClickHouse/issues/14847). [#14937](https://github.com/ClickHouse/ClickHouse/pull/14937) ([filimonov](https://github.com/filimonov)).
-* Fix a problem where the server may get stuck on startup while talking to ZooKeeper, if the configuration files have to be fetched from ZK (using the `from_zk` include option). This fixes [#14814](https://github.com/ClickHouse/ClickHouse/issues/14814). [#14843](https://github.com/ClickHouse/ClickHouse/pull/14843) ([Alexander Kuzmenkov](https://github.com/akuzm)).
-
-#### Improvement
-
-* Now it's possible to change the type of version column for `VersionedCollapsingMergeTree` with `ALTER` query. [#15442](https://github.com/ClickHouse/ClickHouse/pull/15442) ([alesapin](https://github.com/alesapin)).
-
-
-### ClickHouse release v20.9.2.20, 2020-09-22
-
-#### Backward Incompatible Change
-
-* When upgrading from versions older than 20.5, if rolling update is performed and cluster contains both versions 20.5 or greater and less than 20.5, if ClickHouse nodes with old versions are restarted and old version has been started up in presence of newer versions, it may lead to `Part ... intersects previous part` errors. To prevent this error, first install newer clickhouse-server packages on all cluster nodes and then do restarts (so, when clickhouse-server is restarted, it will start up with the new version).
-
-#### New Feature
-
-* Added column transformers `EXCEPT`, `REPLACE`, `APPLY`, which can be applied to the list of selected columns (after `*` or `COLUMNS(...)`). For example, you can write `SELECT * EXCEPT(URL) REPLACE(number + 1 AS number)`. Another example: `select * apply(length) apply(max) from wide_string_table` to find out the maxium length of all string columns. [#14233](https://github.com/ClickHouse/ClickHouse/pull/14233) ([Amos Bird](https://github.com/amosbird)).
-* Added an aggregate function `rankCorr` which computes a rank correlation coefficient. [#11769](https://github.com/ClickHouse/ClickHouse/pull/11769) ([antikvist](https://github.com/antikvist)) [#14411](https://github.com/ClickHouse/ClickHouse/pull/14411) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Added table function `view` which turns a subquery into a table object. This helps passing queries around. For instance, it can be used in remote/cluster table functions. [#12567](https://github.com/ClickHouse/ClickHouse/pull/12567) ([Amos Bird](https://github.com/amosbird)).
-
-#### Bug Fix
-
-* Fix bug when `ALTER UPDATE` mutation with Nullable column in assignment expression and constant value (like `UPDATE x = 42`) leads to incorrect value in column or segfault. Fixes [#13634](https://github.com/ClickHouse/ClickHouse/issues/13634), [#14045](https://github.com/ClickHouse/ClickHouse/issues/14045). [#14646](https://github.com/ClickHouse/ClickHouse/pull/14646) ([alesapin](https://github.com/alesapin)).
-* Fix wrong Decimal multiplication result caused wrong decimal scale of result column. [#14603](https://github.com/ClickHouse/ClickHouse/pull/14603) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fixed the incorrect sorting order of `Nullable` column. This fixes [#14344](https://github.com/ClickHouse/ClickHouse/issues/14344). [#14495](https://github.com/ClickHouse/ClickHouse/pull/14495) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fixed inconsistent comparison with primary key of type `FixedString` on index analysis if they're compered with a string of less size. This fixes [#14908](https://github.com/ClickHouse/ClickHouse/issues/14908). [#15033](https://github.com/ClickHouse/ClickHouse/pull/15033) ([Amos Bird](https://github.com/amosbird)).
-* Fix bug which leads to wrong merges assignment if table has partitions with a single part. [#14444](https://github.com/ClickHouse/ClickHouse/pull/14444) ([alesapin](https://github.com/alesapin)).
-* If function `bar` was called with specifically crafted arguments, buffer overflow was possible. This closes [#13926](https://github.com/ClickHouse/ClickHouse/issues/13926). [#15028](https://github.com/ClickHouse/ClickHouse/pull/15028) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Publish CPU frequencies per logical core in `system.asynchronous_metrics`. This fixes [#14923](https://github.com/ClickHouse/ClickHouse/issues/14923). [#14924](https://github.com/ClickHouse/ClickHouse/pull/14924) ([Alexander Kuzmenkov](https://github.com/akuzm)).
-* Fixed `.metadata.tmp File exists` error when using `MaterializeMySQL` database engine. [#14898](https://github.com/ClickHouse/ClickHouse/pull/14898) ([Winter Zhang](https://github.com/zhang2014)).
-* Fix the issue when some invocations of `extractAllGroups` function may trigger "Memory limit exceeded" error. This fixes [#13383](https://github.com/ClickHouse/ClickHouse/issues/13383). [#14889](https://github.com/ClickHouse/ClickHouse/pull/14889) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix SIGSEGV for an attempt to INSERT into StorageFile(fd). [#14887](https://github.com/ClickHouse/ClickHouse/pull/14887) ([Azat Khuzhin](https://github.com/azat)).
-* Fix rare error in `SELECT` queries when the queried column has `DEFAULT` expression which depends on the other column which also has `DEFAULT` and not present in select query and not exists on disk. Partially fixes [#14531](https://github.com/ClickHouse/ClickHouse/issues/14531). [#14845](https://github.com/ClickHouse/ClickHouse/pull/14845) ([alesapin](https://github.com/alesapin)).
-* Fix wrong monotonicity detection for shrunk `Int -> Int` cast of signed types. It might lead to incorrect query result. This bug is unveiled in [#14513](https://github.com/ClickHouse/ClickHouse/issues/14513). [#14783](https://github.com/ClickHouse/ClickHouse/pull/14783) ([Amos Bird](https://github.com/amosbird)).
-* Fixed missed default database name in metadata of materialized view when executing `ALTER ... MODIFY QUERY`. [#14664](https://github.com/ClickHouse/ClickHouse/pull/14664) ([tavplubix](https://github.com/tavplubix)).
-* Fix possibly incorrect result of function `has` when LowCardinality and Nullable types are involved. [#14591](https://github.com/ClickHouse/ClickHouse/pull/14591) ([Mike](https://github.com/myrrc)).
-* Cleanup data directory after Zookeeper exceptions during CREATE query for tables with ReplicatedMergeTree Engine. [#14563](https://github.com/ClickHouse/ClickHouse/pull/14563) ([Bharat Nallan](https://github.com/bharatnc)).
-* Fix rare segfaults in functions with combinator `-Resample`, which could appear in result of overflow with very large parameters. [#14562](https://github.com/ClickHouse/ClickHouse/pull/14562) ([Anton Popov](https://github.com/CurtizJ)).
-* Check for array size overflow in `topK` aggregate function. Without this check the user may send a query with carefully crafted parameters that will lead to server crash. This closes [#14452](https://github.com/ClickHouse/ClickHouse/issues/14452). [#14467](https://github.com/ClickHouse/ClickHouse/pull/14467) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Proxy restart/start/stop/reload of SysVinit to systemd (if it is used). [#14460](https://github.com/ClickHouse/ClickHouse/pull/14460) ([Azat Khuzhin](https://github.com/azat)).
-* Stop query execution if exception happened in `PipelineExecutor` itself. This could prevent rare possible query hung. [#14334](https://github.com/ClickHouse/ClickHouse/pull/14334) [#14402](https://github.com/ClickHouse/ClickHouse/pull/14402) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix crash during `ALTER` query for table which was created `AS table_function`. Fixes [#14212](https://github.com/ClickHouse/ClickHouse/issues/14212). [#14326](https://github.com/ClickHouse/ClickHouse/pull/14326) ([alesapin](https://github.com/alesapin)).
-* Fix exception during ALTER LIVE VIEW query with REFRESH command. LIVE VIEW is an experimental feature. [#14320](https://github.com/ClickHouse/ClickHouse/pull/14320) ([Bharat Nallan](https://github.com/bharatnc)).
-* Fix QueryPlan lifetime (for EXPLAIN PIPELINE graph=1) for queries with nested interpreter. [#14315](https://github.com/ClickHouse/ClickHouse/pull/14315) ([Azat Khuzhin](https://github.com/azat)).
-* Better check for tuple size in SSD cache complex key external dictionaries. This fixes [#13981](https://github.com/ClickHouse/ClickHouse/issues/13981). [#14313](https://github.com/ClickHouse/ClickHouse/pull/14313) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Disallows `CODEC` on `ALIAS` column type. Fixes [#13911](https://github.com/ClickHouse/ClickHouse/issues/13911). [#14263](https://github.com/ClickHouse/ClickHouse/pull/14263) ([Bharat Nallan](https://github.com/bharatnc)).
-* Fix GRANT ALL statement when executed on a non-global level. [#13987](https://github.com/ClickHouse/ClickHouse/pull/13987) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix arrayJoin() capturing in lambda (exception with logical error message was thrown). [#13792](https://github.com/ClickHouse/ClickHouse/pull/13792) ([Azat Khuzhin](https://github.com/azat)).
-
-#### Experimental Feature
-
-* Added `db-generator` tool for random database generation by given SELECT queries. It may faciliate reproducing issues when there is only incomplete bug report from the user. [#14442](https://github.com/ClickHouse/ClickHouse/pull/14442) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)) [#10973](https://github.com/ClickHouse/ClickHouse/issues/10973) ([ZeDRoman](https://github.com/ZeDRoman)).
-
-#### Improvement
-
-* Allow using multi-volume storage configuration in storage Distributed. [#14839](https://github.com/ClickHouse/ClickHouse/pull/14839) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Disallow empty time_zone argument in `toStartOf*` type of functions. [#14509](https://github.com/ClickHouse/ClickHouse/pull/14509) ([Bharat Nallan](https://github.com/bharatnc)).
-* MySQL handler returns `OK` for queries like `SET @@var = value`. Such statement is ignored. It is needed because some MySQL drivers send `SET @@` query for setup after handshake https://github.com/ClickHouse/ClickHouse/issues/9336#issuecomment-686222422 . [#14469](https://github.com/ClickHouse/ClickHouse/pull/14469) ([BohuTANG](https://github.com/BohuTANG)).
-* Now TTLs will be applied during merge if they were not previously materialized. [#14438](https://github.com/ClickHouse/ClickHouse/pull/14438) ([alesapin](https://github.com/alesapin)).
-* Now `clickhouse-obfuscator` supports UUID type as proposed in [#13163](https://github.com/ClickHouse/ClickHouse/issues/13163). [#14409](https://github.com/ClickHouse/ClickHouse/pull/14409) ([dimarub2000](https://github.com/dimarub2000)).
-* Added new setting `system_events_show_zero_values` as proposed in [#11384](https://github.com/ClickHouse/ClickHouse/issues/11384). [#14404](https://github.com/ClickHouse/ClickHouse/pull/14404) ([dimarub2000](https://github.com/dimarub2000)).
-* Implicitly convert primary key to not null in `MaterializeMySQL` (Same as `MySQL`). Fixes [#14114](https://github.com/ClickHouse/ClickHouse/issues/14114). [#14397](https://github.com/ClickHouse/ClickHouse/pull/14397) ([Winter Zhang](https://github.com/zhang2014)).
-* Replace wide integers (256 bit) from boost multiprecision with implementation from https://github.com/cerevra/int. 256bit integers are experimental. [#14229](https://github.com/ClickHouse/ClickHouse/pull/14229) ([Artem Zuikov](https://github.com/4ertus2)).
-* Add default compression codec for parts in `system.part_log` with the name `default_compression_codec`. [#14116](https://github.com/ClickHouse/ClickHouse/pull/14116) ([alesapin](https://github.com/alesapin)).
-* Add precision argument for `DateTime` type. It allows to use `DateTime` name instead of `DateTime64`. [#13761](https://github.com/ClickHouse/ClickHouse/pull/13761) ([Winter Zhang](https://github.com/zhang2014)).
-* Added requirepass authorization for `Redis` external dictionary. [#13688](https://github.com/ClickHouse/ClickHouse/pull/13688) ([Ivan Torgashov](https://github.com/it1804)).
-* Improvements in `RabbitMQ` engine: added connection and channels failure handling, proper commits, insert failures handling, better exchanges, queue durability and queue resume opportunity, new queue settings. Fixed tests. [#12761](https://github.com/ClickHouse/ClickHouse/pull/12761) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Support custom codecs in compact parts. [#12183](https://github.com/ClickHouse/ClickHouse/pull/12183) ([Anton Popov](https://github.com/CurtizJ)).
-
-#### Performance Improvement
-
-* Optimize queries with LIMIT/LIMIT BY/ORDER BY for distributed with GROUP BY sharding_key (under `optimize_skip_unused_shards` and `optimize_distributed_group_by_sharding_key`). [#10373](https://github.com/ClickHouse/ClickHouse/pull/10373) ([Azat Khuzhin](https://github.com/azat)).
-* Creating sets for multiple `JOIN` and `IN` in parallel. It may slightly improve performance for queries with several different `IN subquery` expressions. [#14412](https://github.com/ClickHouse/ClickHouse/pull/14412) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Improve Kafka engine performance by providing independent thread for each consumer. Separate thread pool for streaming engines (like Kafka). [#13939](https://github.com/ClickHouse/ClickHouse/pull/13939) ([fastio](https://github.com/fastio)).
-
-#### Build/Testing/Packaging Improvement
-
-* Lower binary size in debug build by removing debug info from `Functions`. This is needed only for one internal project in Yandex who is using very old linker. [#14549](https://github.com/ClickHouse/ClickHouse/pull/14549) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Prepare for build with clang 11. [#14455](https://github.com/ClickHouse/ClickHouse/pull/14455) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix the logic in backport script. In previous versions it was triggered for any labels of 100% red color. It was strange. [#14433](https://github.com/ClickHouse/ClickHouse/pull/14433) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Integration tests use default base config. All config changes are explicit with main_configs, user_configs and dictionaries parameters for instance. [#13647](https://github.com/ClickHouse/ClickHouse/pull/13647) ([Ilya Yatsishin](https://github.com/qoega)).
-
-
-
-## ClickHouse release 20.8
-
-### ClickHouse release v20.8.10.13-lts, 2020-12-24
-
-#### Bug Fix
-
-* When server log rotation was configured using `logger.size` parameter with numeric value larger than 2^32, the logs were not rotated properly. [#17905](https://github.com/ClickHouse/ClickHouse/pull/17905) ([Alexander Kuzmenkov](https://github.com/akuzm)).
-* Fixed incorrect initialization of `max_compress_block_size` in MergeTreeWriterSettings with `min_compress_block_size`. [#17833](https://github.com/ClickHouse/ClickHouse/pull/17833) ([flynn](https://github.com/ucasFL)).
-* Fixed problem when ClickHouse fails to resume connection to MySQL servers. [#17681](https://github.com/ClickHouse/ClickHouse/pull/17681) ([Alexander Kazakov](https://github.com/Akazz)).
-* Fixed `ALTER` query hang when the corresponding mutation was killed on the different replica. This fixes [#16953](https://github.com/ClickHouse/ClickHouse/issues/16953). [#17499](https://github.com/ClickHouse/ClickHouse/pull/17499) ([alesapin](https://github.com/alesapin)).
-* Fixed a bug when mark cache size was underestimated by ClickHouse. It may happen when there are a lot of tiny files with marks. [#17496](https://github.com/ClickHouse/ClickHouse/pull/17496) ([alesapin](https://github.com/alesapin)).
-* Fixed `ORDER BY` with enabled setting `optimize_redundant_functions_in_order_by`. [#17471](https://github.com/ClickHouse/ClickHouse/pull/17471) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed `ColumnConst` comparison which leads to crash. This fixed [#17088](https://github.com/ClickHouse/ClickHouse/issues/17088) . [#17135](https://github.com/ClickHouse/ClickHouse/pull/17135) ([Amos Bird](https://github.com/amosbird)).
-* Fixed bug when `ON CLUSTER` queries may hang forever for non-leader ReplicatedMergeTreeTables. [#17089](https://github.com/ClickHouse/ClickHouse/pull/17089) ([alesapin](https://github.com/alesapin)).
-* Avoid unnecessary network errors for remote queries which may be cancelled while execution, like queries with `LIMIT`. [#17006](https://github.com/ClickHouse/ClickHouse/pull/17006) ([Azat Khuzhin](https://github.com/azat)).
-* Reresolve the IP of the `format_avro_schema_registry_url` in case of errors. [#16985](https://github.com/ClickHouse/ClickHouse/pull/16985) ([filimonov](https://github.com/filimonov)).
-* Fixed possible server crash after `ALTER TABLE ... MODIFY COLUMN ... NewType` when `SELECT` have `WHERE` expression on altering column and alter doesn't finished yet. [#16968](https://github.com/ClickHouse/ClickHouse/pull/16968) ([Amos Bird](https://github.com/amosbird)).
-* Install script should always create subdirs in config folders. This is only relevant for Docker build with custom config. [#16936](https://github.com/ClickHouse/ClickHouse/pull/16936) ([filimonov](https://github.com/filimonov)).
-* Fixed possible error `Illegal type of argument` for queries with `ORDER BY`. Fixes [#16580](https://github.com/ClickHouse/ClickHouse/issues/16580). [#16928](https://github.com/ClickHouse/ClickHouse/pull/16928) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Abort multipart upload if no data was written to WriteBufferFromS3. [#16840](https://github.com/ClickHouse/ClickHouse/pull/16840) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Fixed crash when using `any` without any arguments. This fixes [#16803](https://github.com/ClickHouse/ClickHouse/issues/16803). [#16826](https://github.com/ClickHouse/ClickHouse/pull/16826) ([Amos Bird](https://github.com/amosbird)).
-* Fixed `IN` operator over several columns and tuples with enabled `transform_null_in` setting. Fixes [#15310](https://github.com/ClickHouse/ClickHouse/issues/15310). [#16722](https://github.com/ClickHouse/ClickHouse/pull/16722) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed inconsistent behaviour of `optimize_read_in_order/optimize_aggregation_in_order` with max_threads > 0 and expression in ORDER BY. [#16637](https://github.com/ClickHouse/ClickHouse/pull/16637) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed the issue when query optimization was producing wrong result if query contains `ARRAY JOIN`. [#17887](https://github.com/ClickHouse/ClickHouse/pull/17887) ([sundyli](https://github.com/sundy-li)).
-* Query is finished faster in case of exception. Cancel execution on remote replicas if exception happens. [#15578](https://github.com/ClickHouse/ClickHouse/pull/15578) ([Azat Khuzhin](https://github.com/azat)).
-
-
-### ClickHouse release v20.8.6.6-lts, 2020-11-13
-
-#### Bug Fix
-
-* Fix rare silent crashes when query profiler is on and ClickHouse is installed on OS with glibc version that has (supposedly) broken asynchronous unwind tables for some functions. This fixes [#15301](https://github.com/ClickHouse/ClickHouse/issues/15301). This fixes [#13098](https://github.com/ClickHouse/ClickHouse/issues/13098). [#16846](https://github.com/ClickHouse/ClickHouse/pull/16846) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Now when parsing AVRO from input the LowCardinality is removed from type. Fixes [#16188](https://github.com/ClickHouse/ClickHouse/issues/16188). [#16521](https://github.com/ClickHouse/ClickHouse/pull/16521) ([Mike](https://github.com/myrrc)).
-* Fix rapid growth of metadata when using MySQL Master -> MySQL Slave -> ClickHouse MaterializeMySQL Engine, and `slave_parallel_worker` enabled on MySQL Slave, by properly shrinking GTID sets. This fixes [#15951](https://github.com/ClickHouse/ClickHouse/issues/15951). [#16504](https://github.com/ClickHouse/ClickHouse/pull/16504) ([TCeason](https://github.com/TCeason)).
-* Fix DROP TABLE for Distributed (racy with INSERT). [#16409](https://github.com/ClickHouse/ClickHouse/pull/16409) ([Azat Khuzhin](https://github.com/azat)).
-* Fix processing of very large entries in replication queue. Very large entries may appear in ALTER queries if table structure is extremely large (near 1 MB). This fixes [#16307](https://github.com/ClickHouse/ClickHouse/issues/16307). [#16332](https://github.com/ClickHouse/ClickHouse/pull/16332) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed the inconsistent behaviour when a part of return data could be dropped because the set for its filtration wasn't created. [#16308](https://github.com/ClickHouse/ClickHouse/pull/16308) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fix bug with MySQL database. When MySQL server used as database engine is down some queries raise Exception, because they try to get tables from disabled server, while it's unnecessary. For example, query `SELECT ... FROM system.parts` should work only with MergeTree tables and don't touch MySQL database at all. [#16032](https://github.com/ClickHouse/ClickHouse/pull/16032) ([Kruglov Pavel](https://github.com/Avogar)).
-
-
-### ClickHouse release v20.8.5.45-lts, 2020-10-29
-
-#### Bug Fix
-
-* Fix double free in case of exception in function `dictGet`. It could have happened if dictionary was loaded with error. [#16429](https://github.com/ClickHouse/ClickHouse/pull/16429) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix group by with totals/rollup/cube modifers and min/max functions over group by keys. Fixes [#16393](https://github.com/ClickHouse/ClickHouse/issues/16393). [#16397](https://github.com/ClickHouse/ClickHouse/pull/16397) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix async Distributed INSERT w/ prefer_localhost_replica=0 and internal_replication. [#16358](https://github.com/ClickHouse/ClickHouse/pull/16358) ([Azat Khuzhin](https://github.com/azat)).
-* Fix a possible memory leak during `GROUP BY` with string keys, caused by an error in `TwoLevelStringHashTable` implementation. [#16264](https://github.com/ClickHouse/ClickHouse/pull/16264) ([Amos Bird](https://github.com/amosbird)).
-* Fix the case when memory can be overallocated regardless to the limit. This closes [#14560](https://github.com/ClickHouse/ClickHouse/issues/14560). [#16206](https://github.com/ClickHouse/ClickHouse/pull/16206) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix `ALTER MODIFY ... ORDER BY` query hang for `ReplicatedVersionedCollapsingMergeTree`. This fixes [#15980](https://github.com/ClickHouse/ClickHouse/issues/15980). [#16011](https://github.com/ClickHouse/ClickHouse/pull/16011) ([alesapin](https://github.com/alesapin)).
-* Fix collate name & charset name parser and support `length = 0` for string type. [#16008](https://github.com/ClickHouse/ClickHouse/pull/16008) ([Winter Zhang](https://github.com/zhang2014)).
-* Allow to use direct layout for dictionaries with complex keys. [#16007](https://github.com/ClickHouse/ClickHouse/pull/16007) ([Anton Popov](https://github.com/CurtizJ)).
-* Prevent replica hang for 5-10 mins when replication error happens after a period of inactivity. [#15987](https://github.com/ClickHouse/ClickHouse/pull/15987) ([filimonov](https://github.com/filimonov)).
-* Fix rare segfaults when inserting into or selecting from MaterializedView and concurrently dropping target table (for Atomic database engine). [#15984](https://github.com/ClickHouse/ClickHouse/pull/15984) ([tavplubix](https://github.com/tavplubix)).
-* Fix ambiguity in parsing of settings profiles: `CREATE USER ... SETTINGS profile readonly` is now considered as using a profile named `readonly`, not a setting named `profile` with the readonly constraint. This fixes [#15628](https://github.com/ClickHouse/ClickHouse/issues/15628). [#15982](https://github.com/ClickHouse/ClickHouse/pull/15982) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix a crash when database creation fails. [#15954](https://github.com/ClickHouse/ClickHouse/pull/15954) ([Winter Zhang](https://github.com/zhang2014)).
-* Fixed `DROP TABLE IF EXISTS` failure with `Table ... doesn't exist` error when table is concurrently renamed (for Atomic database engine). Fixed rare deadlock when concurrently executing some DDL queries with multiple tables (like `DROP DATABASE` and `RENAME TABLE`) Fixed `DROP/DETACH DATABASE` failure with `Table ... doesn't exist` when concurrently executing `DROP/DETACH TABLE`. [#15934](https://github.com/ClickHouse/ClickHouse/pull/15934) ([tavplubix](https://github.com/tavplubix)).
-* Fix incorrect empty result for query from `Distributed` table if query has `WHERE`, `PREWHERE` and `GLOBAL IN`. Fixes [#15792](https://github.com/ClickHouse/ClickHouse/issues/15792). [#15933](https://github.com/ClickHouse/ClickHouse/pull/15933) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix possible deadlocks in RBAC. [#15875](https://github.com/ClickHouse/ClickHouse/pull/15875) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix exception `Block structure mismatch` in `SELECT ... ORDER BY DESC` queries which were executed after `ALTER MODIFY COLUMN` query. Fixes [#15800](https://github.com/ClickHouse/ClickHouse/issues/15800). [#15852](https://github.com/ClickHouse/ClickHouse/pull/15852) ([alesapin](https://github.com/alesapin)).
-* Fix some cases of queries, in which only virtual columns are selected. Previously `Not found column _nothing in block` exception may be thrown. Fixes [#12298](https://github.com/ClickHouse/ClickHouse/issues/12298). [#15756](https://github.com/ClickHouse/ClickHouse/pull/15756) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix error `Cannot find column` which may happen at insertion into `MATERIALIZED VIEW` in case if query for `MV` containes `ARRAY JOIN`. [#15717](https://github.com/ClickHouse/ClickHouse/pull/15717) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed too low default value of `max_replicated_logs_to_keep` setting, which might cause replicas to become lost too often. Improve lost replica recovery process by choosing the most up-to-date replica to clone. Also do not remove old parts from lost replica, detach them instead. [#15701](https://github.com/ClickHouse/ClickHouse/pull/15701) ([tavplubix](https://github.com/tavplubix)).
-* Fix error `Cannot add simple transform to empty Pipe` which happened while reading from `Buffer` table which has different structure than destination table. It was possible if destination table returned empty result for query. Fixes [#15529](https://github.com/ClickHouse/ClickHouse/issues/15529). [#15662](https://github.com/ClickHouse/ClickHouse/pull/15662) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed bug with globs in S3 table function, region from URL was not applied to S3 client configuration. [#15646](https://github.com/ClickHouse/ClickHouse/pull/15646) ([Vladimir Chebotarev](https://github.com/excitoon)).
-* Decrement the `ReadonlyReplica` metric when detaching read-only tables. This fixes [#15598](https://github.com/ClickHouse/ClickHouse/issues/15598). [#15592](https://github.com/ClickHouse/ClickHouse/pull/15592) ([sundyli](https://github.com/sundy-li)).
-* Throw an error when a single parameter is passed to ReplicatedMergeTree instead of ignoring it. [#15516](https://github.com/ClickHouse/ClickHouse/pull/15516) ([nvartolomei](https://github.com/nvartolomei)).
-
-#### Improvement
-
-* Now it's allowed to execute `ALTER ... ON CLUSTER` queries regardless of the `<internal_replication>` setting in cluster config. [#16075](https://github.com/ClickHouse/ClickHouse/pull/16075) ([alesapin](https://github.com/alesapin)).
-* Unfold `{database}`, `{table}` and `{uuid}` macros in `ReplicatedMergeTree` arguments on table creation. [#16159](https://github.com/ClickHouse/ClickHouse/pull/16159) ([tavplubix](https://github.com/tavplubix)).
-
-
-### ClickHouse release v20.8.4.11-lts, 2020-10-09
-
-#### Bug Fix
-
-* Fix the order of destruction for resources in `ReadFromStorage` step of query plan. It might cause crashes in rare cases. Possibly connected with [#15610](https://github.com/ClickHouse/ClickHouse/issues/15610). [#15645](https://github.com/ClickHouse/ClickHouse/pull/15645) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed `Element ... is not a constant expression` error when using `JSON*` function result in `VALUES`, `LIMIT` or right side of `IN` operator. [#15589](https://github.com/ClickHouse/ClickHouse/pull/15589) ([tavplubix](https://github.com/tavplubix)).
-* Prevent the possibility of error message `Could not calculate available disk space (statvfs), errno: 4, strerror: Interrupted system call`. This fixes [#15541](https://github.com/ClickHouse/ClickHouse/issues/15541). [#15557](https://github.com/ClickHouse/ClickHouse/pull/15557) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Significantly reduce memory usage in AggregatingInOrderTransform/optimize_aggregation_in_order. [#15543](https://github.com/ClickHouse/ClickHouse/pull/15543) ([Azat Khuzhin](https://github.com/azat)).
-* Mutation might hang waiting for some non-existent part after `MOVE` or `REPLACE PARTITION` or, in rare cases, after `DETACH` or `DROP PARTITION`. It's fixed. [#15537](https://github.com/ClickHouse/ClickHouse/pull/15537) ([tavplubix](https://github.com/tavplubix)).
-* Fix bug when `ILIKE` operator stops being case insensitive if `LIKE` with the same pattern was executed. [#15536](https://github.com/ClickHouse/ClickHouse/pull/15536) ([alesapin](https://github.com/alesapin)).
-* Fix `Missing columns` errors when selecting columns which absent in data, but depend on other columns which also absent in data. Fixes [#15530](https://github.com/ClickHouse/ClickHouse/issues/15530). [#15532](https://github.com/ClickHouse/ClickHouse/pull/15532) ([alesapin](https://github.com/alesapin)).
-* Fix bug with event subscription in DDLWorker which rarely may lead to query hangs in `ON CLUSTER`. Introduced in [#13450](https://github.com/ClickHouse/ClickHouse/issues/13450). [#15477](https://github.com/ClickHouse/ClickHouse/pull/15477) ([alesapin](https://github.com/alesapin)).
-* Report proper error when the second argument of `boundingRatio` aggregate function has a wrong type. [#15407](https://github.com/ClickHouse/ClickHouse/pull/15407) ([detailyang](https://github.com/detailyang)).
-* Fix race condition during MergeTree table rename and background cleanup. [#15304](https://github.com/ClickHouse/ClickHouse/pull/15304) ([alesapin](https://github.com/alesapin)).
-* Fix rare race condition on server startup when system.logs are enabled. [#15300](https://github.com/ClickHouse/ClickHouse/pull/15300) ([alesapin](https://github.com/alesapin)).
-* Fix MSan report in QueryLog. Uninitialized memory can be used for the field `memory_usage`. [#15258](https://github.com/ClickHouse/ClickHouse/pull/15258) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix instance crash when using joinGet with LowCardinality types. This fixes [#15214](https://github.com/ClickHouse/ClickHouse/issues/15214). [#15220](https://github.com/ClickHouse/ClickHouse/pull/15220) ([Amos Bird](https://github.com/amosbird)).
-* Fix bug in table engine `Buffer` which doesn't allow to insert data of new structure into `Buffer` after `ALTER` query. Fixes [#15117](https://github.com/ClickHouse/ClickHouse/issues/15117). [#15192](https://github.com/ClickHouse/ClickHouse/pull/15192) ([alesapin](https://github.com/alesapin)).
-* Adjust decimals field size in mysql column definition packet. [#15152](https://github.com/ClickHouse/ClickHouse/pull/15152) ([maqroll](https://github.com/maqroll)).
-* We already use padded comparison between String and FixedString (https://github.com/ClickHouse/ClickHouse/blob/master/src/Functions/FunctionsComparison.h#L333). This PR applies the same logic to field comparison which corrects the usage of FixedString as primary keys. This fixes [#14908](https://github.com/ClickHouse/ClickHouse/issues/14908). [#15033](https://github.com/ClickHouse/ClickHouse/pull/15033) ([Amos Bird](https://github.com/amosbird)).
-* If function `bar` was called with specifically crafted arguments, buffer overflow was possible. This closes [#13926](https://github.com/ClickHouse/ClickHouse/issues/13926). [#15028](https://github.com/ClickHouse/ClickHouse/pull/15028) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed `Cannot rename ... errno: 22, strerror: Invalid argument` error on DDL query execution in Atomic database when running clickhouse-server in docker on Mac OS. [#15024](https://github.com/ClickHouse/ClickHouse/pull/15024) ([tavplubix](https://github.com/tavplubix)).
-* Now settings `number_of_free_entries_in_pool_to_execute_mutation` and `number_of_free_entries_in_pool_to_lower_max_size_of_merge` can be equal to `background_pool_size`. [#14975](https://github.com/ClickHouse/ClickHouse/pull/14975) ([alesapin](https://github.com/alesapin)).
-* Fix to make predicate push down work when subquery contains finalizeAggregation function. Fixes [#14847](https://github.com/ClickHouse/ClickHouse/issues/14847). [#14937](https://github.com/ClickHouse/ClickHouse/pull/14937) ([filimonov](https://github.com/filimonov)).
-* Publish CPU frequencies per logical core in `system.asynchronous_metrics`. This fixes [#14923](https://github.com/ClickHouse/ClickHouse/issues/14923). [#14924](https://github.com/ClickHouse/ClickHouse/pull/14924) ([Alexander Kuzmenkov](https://github.com/akuzm)).
-* Fixed `.metadata.tmp File exists` error when using `MaterializeMySQL` database engine. [#14898](https://github.com/ClickHouse/ClickHouse/pull/14898) ([Winter Zhang](https://github.com/zhang2014)).
-* Fix a problem where the server may get stuck on startup while talking to ZooKeeper, if the configuration files have to be fetched from ZK (using the `from_zk` include option). This fixes [#14814](https://github.com/ClickHouse/ClickHouse/issues/14814). [#14843](https://github.com/ClickHouse/ClickHouse/pull/14843) ([Alexander Kuzmenkov](https://github.com/akuzm)).
-* Fix wrong monotonicity detection for shrunk `Int -> Int` cast of signed types. It might lead to incorrect query result. This bug is unveiled in [#14513](https://github.com/ClickHouse/ClickHouse/issues/14513). [#14783](https://github.com/ClickHouse/ClickHouse/pull/14783) ([Amos Bird](https://github.com/amosbird)).
-* Fixed the incorrect sorting order of `Nullable` column. This fixes [#14344](https://github.com/ClickHouse/ClickHouse/issues/14344). [#14495](https://github.com/ClickHouse/ClickHouse/pull/14495) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-
-#### Improvement
-
-* Now it's possible to change the type of version column for `VersionedCollapsingMergeTree` with `ALTER` query. [#15442](https://github.com/ClickHouse/ClickHouse/pull/15442) ([alesapin](https://github.com/alesapin)).
-
-
-### ClickHouse release v20.8.3.18-stable, 2020-09-18
-
-#### Bug Fix
-
-* Fix the issue when some invocations of `extractAllGroups` function may trigger "Memory limit exceeded" error. This fixes [#13383](https://github.com/ClickHouse/ClickHouse/issues/13383). [#14889](https://github.com/ClickHouse/ClickHouse/pull/14889) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix SIGSEGV for an attempt to INSERT into StorageFile(fd). [#14887](https://github.com/ClickHouse/ClickHouse/pull/14887) ([Azat Khuzhin](https://github.com/azat)).
-* Fix rare error in `SELECT` queries when the queried column has `DEFAULT` expression which depends on the other column which also has `DEFAULT` and not present in select query and not exists on disk. Partially fixes [#14531](https://github.com/ClickHouse/ClickHouse/issues/14531). [#14845](https://github.com/ClickHouse/ClickHouse/pull/14845) ([alesapin](https://github.com/alesapin)).
-* Fixed missed default database name in metadata of materialized view when executing `ALTER ... MODIFY QUERY`. [#14664](https://github.com/ClickHouse/ClickHouse/pull/14664) ([tavplubix](https://github.com/tavplubix)).
-* Fix bug when `ALTER UPDATE` mutation with Nullable column in assignment expression and constant value (like `UPDATE x = 42`) leads to incorrect value in column or segfault. Fixes [#13634](https://github.com/ClickHouse/ClickHouse/issues/13634), [#14045](https://github.com/ClickHouse/ClickHouse/issues/14045). [#14646](https://github.com/ClickHouse/ClickHouse/pull/14646) ([alesapin](https://github.com/alesapin)).
-* Fix wrong Decimal multiplication result caused wrong decimal scale of result column. [#14603](https://github.com/ClickHouse/ClickHouse/pull/14603) ([Artem Zuikov](https://github.com/4ertus2)).
-* Added the checker as neither calling `lc->isNullable()` nor calling `ls->getDictionaryPtr()->isNullable()` would return the correct result. [#14591](https://github.com/ClickHouse/ClickHouse/pull/14591) ([myrrc](https://github.com/myrrc)).
-* Cleanup data directory after Zookeeper exceptions during CreateQuery for StorageReplicatedMergeTree Engine. [#14563](https://github.com/ClickHouse/ClickHouse/pull/14563) ([Bharat Nallan](https://github.com/bharatnc)).
-* Fix rare segfaults in functions with combinator -Resample, which could appear in result of overflow with very large parameters. [#14562](https://github.com/ClickHouse/ClickHouse/pull/14562) ([Anton Popov](https://github.com/CurtizJ)).
-
-#### Improvement
-
-* Speed up server shutdown process if there are ongoing S3 requests. [#14858](https://github.com/ClickHouse/ClickHouse/pull/14858) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Allow using multi-volume storage configuration in storage Distributed. [#14839](https://github.com/ClickHouse/ClickHouse/pull/14839) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Speed up server shutdown process if there are ongoing S3 requests. [#14496](https://github.com/ClickHouse/ClickHouse/pull/14496) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Support custom codecs in compact parts. [#12183](https://github.com/ClickHouse/ClickHouse/pull/12183) ([Anton Popov](https://github.com/CurtizJ)).
-
-
-### ClickHouse release v20.8.2.3-stable, 2020-09-08
-
-#### Backward Incompatible Change
-
-* Now `OPTIMIZE FINAL` query doesn't recalculate TTL for parts that were added before TTL was created. Use `ALTER TABLE ... MATERIALIZE TTL` once to calculate them, after that `OPTIMIZE FINAL` will evaluate TTL's properly. This behavior never worked for replicated tables. [#14220](https://github.com/ClickHouse/ClickHouse/pull/14220) ([alesapin](https://github.com/alesapin)).
-* Extend `parallel_distributed_insert_select` setting, adding an option to run `INSERT` into local table. The setting changes type from `Bool` to `UInt64`, so the values `false` and `true` are no longer supported. If you have these values in server configuration, the server will not start. Please replace them with `0` and `1`, respectively. [#14060](https://github.com/ClickHouse/ClickHouse/pull/14060) ([Azat Khuzhin](https://github.com/azat)).
-* Remove support for the `ODBCDriver` input/output format. This was a deprecated format once used for communication with the ClickHouse ODBC driver, now long superseded by the `ODBCDriver2` format. Resolves [#13629](https://github.com/ClickHouse/ClickHouse/issues/13629). [#13847](https://github.com/ClickHouse/ClickHouse/pull/13847) ([hexiaoting](https://github.com/hexiaoting)).
-* When upgrading from versions older than 20.5, if rolling update is performed and cluster contains both versions 20.5 or greater and less than 20.5, if ClickHouse nodes with old versions are restarted and old version has been started up in presence of newer versions, it may lead to `Part ... intersects previous part` errors. To prevent this error, first install newer clickhouse-server packages on all cluster nodes and then do restarts (so, when clickhouse-server is restarted, it will start up with the new version).
-
-#### New Feature
-
-* Add the ability to specify `Default` compression codec for columns that correspond to settings specified in `config.xml`. Implements: [#9074](https://github.com/ClickHouse/ClickHouse/issues/9074). [#14049](https://github.com/ClickHouse/ClickHouse/pull/14049) ([alesapin](https://github.com/alesapin)).
-* Support Kerberos authentication in Kafka, using `krb5` and `cyrus-sasl` libraries. [#12771](https://github.com/ClickHouse/ClickHouse/pull/12771) ([Ilya Golshtein](https://github.com/ilejn)).
-* Add function `normalizeQuery` that replaces literals, sequences of literals and complex aliases with placeholders. Add function `normalizedQueryHash` that returns identical 64bit hash values for similar queries. It helps to analyze query log. This closes [#11271](https://github.com/ClickHouse/ClickHouse/issues/11271). [#13816](https://github.com/ClickHouse/ClickHouse/pull/13816) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add `time_zones` table. [#13880](https://github.com/ClickHouse/ClickHouse/pull/13880) ([Bharat Nallan](https://github.com/bharatnc)).
-* Add function `defaultValueOfTypeName` that returns the default value for a given type. [#13877](https://github.com/ClickHouse/ClickHouse/pull/13877) ([hcz](https://github.com/hczhcz)).
-* Add `countDigits(x)` function that count number of decimal digits in integer or decimal column. Add `isDecimalOverflow(d, [p])` function that checks if the value in Decimal column is out of its (or specified) precision. [#14151](https://github.com/ClickHouse/ClickHouse/pull/14151) ([Artem Zuikov](https://github.com/4ertus2)).
-* Add `quantileExactLow` and `quantileExactHigh` implementations with respective aliases for `medianExactLow` and `medianExactHigh`. [#13818](https://github.com/ClickHouse/ClickHouse/pull/13818) ([Bharat Nallan](https://github.com/bharatnc)).
-* Added `date_trunc` function that truncates a date/time value to a specified date/time part. [#13888](https://github.com/ClickHouse/ClickHouse/pull/13888) ([Vladimir Golovchenko](https://github.com/vladimir-golovchenko)).
-* Add new optional section `<user_directories>` to the main config. [#13425](https://github.com/ClickHouse/ClickHouse/pull/13425) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Add `ALTER SAMPLE BY` statement that allows to change table sample clause. [#13280](https://github.com/ClickHouse/ClickHouse/pull/13280) ([Amos Bird](https://github.com/amosbird)).
-* Function `position` now supports optional `start_pos` argument. [#13237](https://github.com/ClickHouse/ClickHouse/pull/13237) ([vdimir](https://github.com/vdimir)).
-
-#### Bug Fix
-
-* Fix visible data clobbering by progress bar in client in interactive mode. This fixes [#12562](https://github.com/ClickHouse/ClickHouse/issues/12562) and [#13369](https://github.com/ClickHouse/ClickHouse/issues/13369) and [#13584](https://github.com/ClickHouse/ClickHouse/issues/13584) and fixes [#12964](https://github.com/ClickHouse/ClickHouse/issues/12964). [#13691](https://github.com/ClickHouse/ClickHouse/pull/13691) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed incorrect sorting order if `LowCardinality` column when sorting by multiple columns. This fixes [#13958](https://github.com/ClickHouse/ClickHouse/issues/13958). [#14223](https://github.com/ClickHouse/ClickHouse/pull/14223) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Check for array size overflow in `topK` aggregate function. Without this check the user may send a query with carefully crafted parameters that will lead to server crash. This closes [#14452](https://github.com/ClickHouse/ClickHouse/issues/14452). [#14467](https://github.com/ClickHouse/ClickHouse/pull/14467) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix bug which can lead to wrong merges assignment if table has partitions with a single part. [#14444](https://github.com/ClickHouse/ClickHouse/pull/14444) ([alesapin](https://github.com/alesapin)).
-* Stop query execution if exception happened in `PipelineExecutor` itself. This could prevent rare possible query hung. Continuation of [#14334](https://github.com/ClickHouse/ClickHouse/issues/14334). [#14402](https://github.com/ClickHouse/ClickHouse/pull/14402) [#14334](https://github.com/ClickHouse/ClickHouse/pull/14334) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix crash during `ALTER` query for table which was created `AS table_function`. Fixes [#14212](https://github.com/ClickHouse/ClickHouse/issues/14212). [#14326](https://github.com/ClickHouse/ClickHouse/pull/14326) ([alesapin](https://github.com/alesapin)).
-* Fix exception during ALTER LIVE VIEW query with REFRESH command. Live view is an experimental feature. [#14320](https://github.com/ClickHouse/ClickHouse/pull/14320) ([Bharat Nallan](https://github.com/bharatnc)).
-* Fix QueryPlan lifetime (for EXPLAIN PIPELINE graph=1) for queries with nested interpreter. [#14315](https://github.com/ClickHouse/ClickHouse/pull/14315) ([Azat Khuzhin](https://github.com/azat)).
-* Fix segfault in `clickhouse-odbc-bridge` during schema fetch from some external sources. This PR fixes [#13861](https://github.com/ClickHouse/ClickHouse/issues/13861). [#14267](https://github.com/ClickHouse/ClickHouse/pull/14267) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix crash in mark inclusion search introduced in [#12277](https://github.com/ClickHouse/ClickHouse/pull/12277). [#14225](https://github.com/ClickHouse/ClickHouse/pull/14225) ([Amos Bird](https://github.com/amosbird)).
-* Fix creation of tables with named tuples. This fixes [#13027](https://github.com/ClickHouse/ClickHouse/issues/13027). [#14143](https://github.com/ClickHouse/ClickHouse/pull/14143) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix formatting of minimal negative decimal numbers. This fixes [#14111](https://github.com/ClickHouse/ClickHouse/issues/14111). [#14119](https://github.com/ClickHouse/ClickHouse/pull/14119) ([Alexander Kuzmenkov](https://github.com/akuzm)).
-* Fix `DistributedFilesToInsert` metric (zeroed when it should not). [#14095](https://github.com/ClickHouse/ClickHouse/pull/14095) ([Azat Khuzhin](https://github.com/azat)).
-* Fix `pointInPolygon` with const 2d array as polygon. [#14079](https://github.com/ClickHouse/ClickHouse/pull/14079) ([Alexey Ilyukhov](https://github.com/livace)).
-* Fixed wrong mount point in extra info for `Poco::Exception: no space left on device`. [#14050](https://github.com/ClickHouse/ClickHouse/pull/14050) ([tavplubix](https://github.com/tavplubix)).
-* Fix GRANT ALL statement when executed on a non-global level. [#13987](https://github.com/ClickHouse/ClickHouse/pull/13987) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix parser to reject create table as table function with engine. [#13940](https://github.com/ClickHouse/ClickHouse/pull/13940) ([hcz](https://github.com/hczhcz)).
-* Fix wrong results in select queries with `DISTINCT` keyword and subqueries with UNION ALL in case `optimize_duplicate_order_by_and_distinct` setting is enabled. [#13925](https://github.com/ClickHouse/ClickHouse/pull/13925) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fixed potential deadlock when renaming `Distributed` table. [#13922](https://github.com/ClickHouse/ClickHouse/pull/13922) ([tavplubix](https://github.com/tavplubix)).
-* Fix incorrect sorting for `FixedString` columns when sorting by multiple columns. Fixes [#13182](https://github.com/ClickHouse/ClickHouse/issues/13182). [#13887](https://github.com/ClickHouse/ClickHouse/pull/13887) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix potentially imprecise result of `topK`/`topKWeighted` merge (with non-default parameters). [#13817](https://github.com/ClickHouse/ClickHouse/pull/13817) ([Azat Khuzhin](https://github.com/azat)).
-* Fix reading from MergeTree table with INDEX of type SET fails when comparing against NULL. This fixes [#13686](https://github.com/ClickHouse/ClickHouse/issues/13686). [#13793](https://github.com/ClickHouse/ClickHouse/pull/13793) ([Amos Bird](https://github.com/amosbird)).
-* Fix `arrayJoin` capturing in lambda (LOGICAL_ERROR). [#13792](https://github.com/ClickHouse/ClickHouse/pull/13792) ([Azat Khuzhin](https://github.com/azat)).
-* Add step overflow check in function `range`. [#13790](https://github.com/ClickHouse/ClickHouse/pull/13790) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed `Directory not empty` error when concurrently executing `DROP DATABASE` and `CREATE TABLE`. [#13756](https://github.com/ClickHouse/ClickHouse/pull/13756) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add range check for `h3KRing` function. This fixes [#13633](https://github.com/ClickHouse/ClickHouse/issues/13633). [#13752](https://github.com/ClickHouse/ClickHouse/pull/13752) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix race condition between DETACH and background merges. Parts may revive after detach. This is continuation of [#8602](https://github.com/ClickHouse/ClickHouse/issues/8602) that did not fix the issue but introduced a test that started to fail in very rare cases, demonstrating the issue. [#13746](https://github.com/ClickHouse/ClickHouse/pull/13746) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix logging Settings.Names/Values when log_queries_min_type > QUERY_START. [#13737](https://github.com/ClickHouse/ClickHouse/pull/13737) ([Azat Khuzhin](https://github.com/azat)).
-* Fixes `/replicas_status` endpoint response status code when verbose=1. [#13722](https://github.com/ClickHouse/ClickHouse/pull/13722) ([javi santana](https://github.com/javisantana)).
-* Fix incorrect message in `clickhouse-server.init` while checking user and group. [#13711](https://github.com/ClickHouse/ClickHouse/pull/13711) ([ylchou](https://github.com/ylchou)).
-* Do not optimize any(arrayJoin()) -> arrayJoin() under `optimize_move_functions_out_of_any` setting. [#13681](https://github.com/ClickHouse/ClickHouse/pull/13681) ([Azat Khuzhin](https://github.com/azat)).
-* Fix crash in JOIN with StorageMerge and `set enable_optimize_predicate_expression=1`. [#13679](https://github.com/ClickHouse/ClickHouse/pull/13679) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix typo in error message about `The value of 'number_of_free_entries_in_pool_to_lower_max_size_of_merge' setting`. [#13678](https://github.com/ClickHouse/ClickHouse/pull/13678) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Concurrent `ALTER ... REPLACE/MOVE PARTITION ...` queries might cause deadlock. It's fixed. [#13626](https://github.com/ClickHouse/ClickHouse/pull/13626) ([tavplubix](https://github.com/tavplubix)).
-* Fixed the behaviour when sometimes cache-dictionary returned default value instead of present value from source. [#13624](https://github.com/ClickHouse/ClickHouse/pull/13624) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fix secondary indices corruption in compact parts. Compact parts are experimental feature. [#13538](https://github.com/ClickHouse/ClickHouse/pull/13538) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix premature `ON CLUSTER` timeouts for queries that must be executed on a single replica. Fixes [#6704](https://github.com/ClickHouse/ClickHouse/issues/6704), [#7228](https://github.com/ClickHouse/ClickHouse/issues/7228), [#13361](https://github.com/ClickHouse/ClickHouse/issues/13361), [#11884](https://github.com/ClickHouse/ClickHouse/issues/11884). [#13450](https://github.com/ClickHouse/ClickHouse/pull/13450) ([alesapin](https://github.com/alesapin)).
-* Fix wrong code in function `netloc`. This fixes [#13335](https://github.com/ClickHouse/ClickHouse/issues/13335). [#13446](https://github.com/ClickHouse/ClickHouse/pull/13446) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix possible race in `StorageMemory`. [#13416](https://github.com/ClickHouse/ClickHouse/pull/13416) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix missing or excessive headers in `TSV/CSVWithNames` formats in HTTP protocol. This fixes [#12504](https://github.com/ClickHouse/ClickHouse/issues/12504). [#13343](https://github.com/ClickHouse/ClickHouse/pull/13343) ([Azat Khuzhin](https://github.com/azat)).
-* Fix parsing row policies from users.xml when names of databases or tables contain dots. This fixes [#5779](https://github.com/ClickHouse/ClickHouse/issues/5779), [#12527](https://github.com/ClickHouse/ClickHouse/issues/12527). [#13199](https://github.com/ClickHouse/ClickHouse/pull/13199) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix access to `redis` dictionary after connection was dropped once. It may happen with `cache` and `direct` dictionary layouts. [#13082](https://github.com/ClickHouse/ClickHouse/pull/13082) ([Anton Popov](https://github.com/CurtizJ)).
-* Removed wrong auth access check when using ClickHouseDictionarySource to query remote tables. [#12756](https://github.com/ClickHouse/ClickHouse/pull/12756) ([sundyli](https://github.com/sundy-li)).
-* Properly distinguish subqueries in some cases for common subexpression elimination. [#8333](https://github.com/ClickHouse/ClickHouse/issues/8333). [#8367](https://github.com/ClickHouse/ClickHouse/pull/8367) ([Amos Bird](https://github.com/amosbird)).
-
-#### Improvement
-
-* Disallows `CODEC` on `ALIAS` column type. Fixes [#13911](https://github.com/ClickHouse/ClickHouse/issues/13911). [#14263](https://github.com/ClickHouse/ClickHouse/pull/14263) ([Bharat Nallan](https://github.com/bharatnc)).
-* When waiting for a dictionary update to complete, use the timeout specified by `query_wait_timeout_milliseconds` setting instead of a hard-coded value. [#14105](https://github.com/ClickHouse/ClickHouse/pull/14105) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Add setting `min_index_granularity_bytes` that protects against accidentally creating a table with very low `index_granularity_bytes` setting. [#14139](https://github.com/ClickHouse/ClickHouse/pull/14139) ([Bharat Nallan](https://github.com/bharatnc)).
-* Now it's possible to fetch partitions from clusters that use different ZooKeeper: `ALTER TABLE table_name FETCH PARTITION partition_expr FROM 'zk-name:/path-in-zookeeper'`. It's useful for shipping data to new clusters. [#14155](https://github.com/ClickHouse/ClickHouse/pull/14155) ([Amos Bird](https://github.com/amosbird)).
-* Slightly better performance of Memory table if it was constructed from a huge number of very small blocks (that's unlikely). Author of the idea: [Mark Papadakis](https://github.com/markpapadakis). Closes [#14043](https://github.com/ClickHouse/ClickHouse/issues/14043). [#14056](https://github.com/ClickHouse/ClickHouse/pull/14056) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Conditional aggregate functions (for example: `avgIf`, `sumIf`, `maxIf`) should return `NULL` when miss rows and use nullable arguments. [#13964](https://github.com/ClickHouse/ClickHouse/pull/13964) ([Winter Zhang](https://github.com/zhang2014)).
-* Increase limit in -Resample combinator to 1M. [#13947](https://github.com/ClickHouse/ClickHouse/pull/13947) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
-* Corrected an error in AvroConfluent format that caused the Kafka table engine to stop processing messages when an abnormally small, malformed, message was received. [#13941](https://github.com/ClickHouse/ClickHouse/pull/13941) ([Gervasio Varela](https://github.com/gervarela)).
-* Fix wrong error for long queries. It was possible to get syntax error other than `Max query size exceeded` for correct query. [#13928](https://github.com/ClickHouse/ClickHouse/pull/13928) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Better error message for null value of `TabSeparated` format. [#13906](https://github.com/ClickHouse/ClickHouse/pull/13906) ([jiang tao](https://github.com/tomjiang1987)).
-* Function `arrayCompact` will compare NaNs bitwise if the type of array elements is Float32/Float64. In previous versions NaNs were always not equal if the type of array elements is Float32/Float64 and were always equal if the type is more complex, like Nullable(Float64). This closes [#13857](https://github.com/ClickHouse/ClickHouse/issues/13857). [#13868](https://github.com/ClickHouse/ClickHouse/pull/13868) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix data race in `lgamma` function. This race was caught only in `tsan`, no side effects a really happened. [#13842](https://github.com/ClickHouse/ClickHouse/pull/13842) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Avoid too slow queries when arrays are manipulated as fields. Throw exception instead. [#13753](https://github.com/ClickHouse/ClickHouse/pull/13753) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Added Redis requirepass authorization (for redis dictionary source). [#13688](https://github.com/ClickHouse/ClickHouse/pull/13688) ([Ivan Torgashov](https://github.com/it1804)).
-* Add MergeTree Write-Ahead-Log (WAL) dump tool. WAL is an experimental feature. [#13640](https://github.com/ClickHouse/ClickHouse/pull/13640) ([BohuTANG](https://github.com/BohuTANG)).
-* In previous versions `lcm` function may produce assertion violation in debug build if called with specifically crafted arguments. This fixes [#13368](https://github.com/ClickHouse/ClickHouse/issues/13368). [#13510](https://github.com/ClickHouse/ClickHouse/pull/13510) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Provide monotonicity for `toDate/toDateTime` functions in more cases. Monotonicity information is used for index analysis (more complex queries will be able to use index). Now the input arguments are saturated more naturally and provides better monotonicity. [#13497](https://github.com/ClickHouse/ClickHouse/pull/13497) ([Amos Bird](https://github.com/amosbird)).
-* Support compound identifiers for custom settings. Custom settings is an integration point of ClickHouse codebase with other codebases (no benefits for ClickHouse itself) [#13496](https://github.com/ClickHouse/ClickHouse/pull/13496) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Move parts from DiskLocal to DiskS3 in parallel. `DiskS3` is an experimental feature. [#13459](https://github.com/ClickHouse/ClickHouse/pull/13459) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Enable mixed granularity parts by default. [#13449](https://github.com/ClickHouse/ClickHouse/pull/13449) ([alesapin](https://github.com/alesapin)).
-* Proper remote host checking in S3 redirects (security-related thing). [#13404](https://github.com/ClickHouse/ClickHouse/pull/13404) ([Vladimir Chebotarev](https://github.com/excitoon)).
-* Add `QueryTimeMicroseconds`, `SelectQueryTimeMicroseconds` and `InsertQueryTimeMicroseconds` to system.events. [#13336](https://github.com/ClickHouse/ClickHouse/pull/13336) ([ianton-ru](https://github.com/ianton-ru)).
-* Fix debug assertion when Decimal has too large negative exponent. Fixes [#13188](https://github.com/ClickHouse/ClickHouse/issues/13188). [#13228](https://github.com/ClickHouse/ClickHouse/pull/13228) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Added cache layer for DiskS3 (cache to local disk mark and index files). `DiskS3` is an experimental feature. [#13076](https://github.com/ClickHouse/ClickHouse/pull/13076) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Fix readline so it dumps history to file now. [#13600](https://github.com/ClickHouse/ClickHouse/pull/13600) ([Amos Bird](https://github.com/amosbird)).
-* Create `system` database with `Atomic` engine by default (a preparation to enable `Atomic` database engine by default everywhere). [#13680](https://github.com/ClickHouse/ClickHouse/pull/13680) ([tavplubix](https://github.com/tavplubix)).
-
-#### Performance Improvement
-
-* Slightly optimize very short queries with `LowCardinality`. [#14129](https://github.com/ClickHouse/ClickHouse/pull/14129) ([Anton Popov](https://github.com/CurtizJ)).
-* Enable parallel INSERTs for table engines `Null`, `Memory`, `Distributed` and `Buffer` when the setting `max_insert_threads` is set. [#14120](https://github.com/ClickHouse/ClickHouse/pull/14120) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fail fast if `max_rows_to_read` limit is exceeded on parts scan. The motivation behind this change is to skip ranges scan for all selected parts if it is clear that `max_rows_to_read` is already exceeded. The change is quite noticeable for queries over big number of parts. [#13677](https://github.com/ClickHouse/ClickHouse/pull/13677) ([Roman Khavronenko](https://github.com/hagen1778)).
-* Slightly improve performance of aggregation by UInt8/UInt16 keys. [#13099](https://github.com/ClickHouse/ClickHouse/pull/13099) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Optimize `has()`, `indexOf()` and `countEqual()` functions for `Array(LowCardinality(T))` and constant right arguments. [#12550](https://github.com/ClickHouse/ClickHouse/pull/12550) ([myrrc](https://github.com/myrrc)).
-* When performing trivial `INSERT SELECT` queries, automatically set `max_threads` to 1 or `max_insert_threads`, and set `max_block_size` to `min_insert_block_size_rows`. Related to [#5907](https://github.com/ClickHouse/ClickHouse/issues/5907). [#12195](https://github.com/ClickHouse/ClickHouse/pull/12195) ([flynn](https://github.com/ucasFL)).
-
-#### Experimental Feature
-
-* ClickHouse can work as MySQL replica - it is implemented by `MaterializeMySQL` database engine. Implements [#4006](https://github.com/ClickHouse/ClickHouse/issues/4006). [#10851](https://github.com/ClickHouse/ClickHouse/pull/10851) ([Winter Zhang](https://github.com/zhang2014)).
-* Add types `Int128`, `Int256`, `UInt256` and related functions for them. Extend Decimals with Decimal256 (precision up to 76 digits). New types are under the setting `allow_experimental_bigint_types`. It is working extremely slow and bad. The implementation is incomplete. Please don't use this feature. [#13097](https://github.com/ClickHouse/ClickHouse/pull/13097) ([Artem Zuikov](https://github.com/4ertus2)).
-
-#### Build/Testing/Packaging Improvement
-
-* Added `clickhouse install` script, that is useful if you only have a single binary. [#13528](https://github.com/ClickHouse/ClickHouse/pull/13528) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Allow to run `clickhouse` binary without configuration. [#13515](https://github.com/ClickHouse/ClickHouse/pull/13515) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Enable check for typos in code with `codespell`. [#13513](https://github.com/ClickHouse/ClickHouse/pull/13513) [#13511](https://github.com/ClickHouse/ClickHouse/pull/13511) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Enable Shellcheck in CI as a linter of .sh tests. This closes [#13168](https://github.com/ClickHouse/ClickHouse/issues/13168). [#13530](https://github.com/ClickHouse/ClickHouse/pull/13530) [#13529](https://github.com/ClickHouse/ClickHouse/pull/13529) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add a CMake option to fail configuration instead of auto-reconfiguration, enabled by default. [#13687](https://github.com/ClickHouse/ClickHouse/pull/13687) ([Konstantin](https://github.com/podshumok)).
-* Expose version of embedded tzdata via TZDATA_VERSION in system.build_options. [#13648](https://github.com/ClickHouse/ClickHouse/pull/13648) ([filimonov](https://github.com/filimonov)).
-* Improve generation of system.time_zones table during build. Closes [#14209](https://github.com/ClickHouse/ClickHouse/issues/14209). [#14215](https://github.com/ClickHouse/ClickHouse/pull/14215) ([filimonov](https://github.com/filimonov)).
-* Build ClickHouse with the most fresh tzdata from package repository. [#13623](https://github.com/ClickHouse/ClickHouse/pull/13623) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add the ability to write js-style comments in skip_list.json. [#14159](https://github.com/ClickHouse/ClickHouse/pull/14159) ([alesapin](https://github.com/alesapin)).
-* Ensure that there is no copy-pasted GPL code. [#13514](https://github.com/ClickHouse/ClickHouse/pull/13514) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Switch tests docker images to use test-base parent. [#14167](https://github.com/ClickHouse/ClickHouse/pull/14167) ([Ilya Yatsishin](https://github.com/qoega)).
-* Adding retry logic when bringing up docker-compose cluster; Increasing COMPOSE_HTTP_TIMEOUT. [#14112](https://github.com/ClickHouse/ClickHouse/pull/14112) ([vzakaznikov](https://github.com/vzakaznikov)).
-* Enabled `system.text_log` in stress test to find more bugs. [#13855](https://github.com/ClickHouse/ClickHouse/pull/13855) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Testflows LDAP module: adding missing certificates and dhparam.pem for openldap4. [#13780](https://github.com/ClickHouse/ClickHouse/pull/13780) ([vzakaznikov](https://github.com/vzakaznikov)).
-* ZooKeeper cannot work reliably in unit tests in CI infrastructure. Using unit tests for ZooKeeper interaction with real ZooKeeper is bad idea from the start (unit tests are not supposed to verify complex distributed systems). We already using integration tests for this purpose and they are better suited. [#13745](https://github.com/ClickHouse/ClickHouse/pull/13745) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Added docker image for style check. Added style check that all docker and docker compose files are located in docker directory. [#13724](https://github.com/ClickHouse/ClickHouse/pull/13724) ([Ilya Yatsishin](https://github.com/qoega)).
-* Fix cassandra build on Mac OS. [#13708](https://github.com/ClickHouse/ClickHouse/pull/13708) ([Ilya Yatsishin](https://github.com/qoega)).
-* Fix link error in shared build. [#13700](https://github.com/ClickHouse/ClickHouse/pull/13700) ([Amos Bird](https://github.com/amosbird)).
-* Updating LDAP user authentication suite to check that it works with RBAC. [#13656](https://github.com/ClickHouse/ClickHouse/pull/13656) ([vzakaznikov](https://github.com/vzakaznikov)).
-* Removed `-DENABLE_CURL_CLIENT` for `contrib/aws`. [#13628](https://github.com/ClickHouse/ClickHouse/pull/13628) ([Vladimir Chebotarev](https://github.com/excitoon)).
-* Increasing health-check timeouts for ClickHouse nodes and adding support to dump docker-compose logs if unhealthy containers found. [#13612](https://github.com/ClickHouse/ClickHouse/pull/13612) ([vzakaznikov](https://github.com/vzakaznikov)).
-* Make sure [#10977](https://github.com/ClickHouse/ClickHouse/issues/10977) is invalid. [#13539](https://github.com/ClickHouse/ClickHouse/pull/13539) ([Amos Bird](https://github.com/amosbird)).
-* Skip PR's from robot-clickhouse. [#13489](https://github.com/ClickHouse/ClickHouse/pull/13489) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Move Dockerfiles from integration tests to `docker/test` directory. docker_compose files are available in `runner` docker container. Docker images are built in CI and not in integration tests. [#13448](https://github.com/ClickHouse/ClickHouse/pull/13448) ([Ilya Yatsishin](https://github.com/qoega)).
-
-
-## ClickHouse release 20.7
-
-### ClickHouse release v20.7.2.30-stable, 2020-08-31
-
-#### Backward Incompatible Change
-
-* Function `modulo` (operator `%`) with at least one floating point number as argument will calculate remainder of division directly on floating point numbers without converting both arguments to integers. It makes behaviour compatible with most of DBMS. This also applicable for Date and DateTime data types. Added alias `mod`. This closes [#7323](https://github.com/ClickHouse/ClickHouse/issues/7323). [#12585](https://github.com/ClickHouse/ClickHouse/pull/12585) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Deprecate special printing of zero Date/DateTime values as `0000-00-00` and `0000-00-00 00:00:00`. [#12442](https://github.com/ClickHouse/ClickHouse/pull/12442) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* The function `groupArrayMoving*` was not working for distributed queries. It's result was calculated within incorrect data type (without promotion to the largest type). The function `groupArrayMovingAvg` was returning integer number that was inconsistent with the `avg` function. This fixes [#12568](https://github.com/ClickHouse/ClickHouse/issues/12568). [#12622](https://github.com/ClickHouse/ClickHouse/pull/12622) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add sanity check for MergeTree settings. If the settings are incorrect, the server will refuse to start or to create a table, printing detailed explanation to the user. [#13153](https://github.com/ClickHouse/ClickHouse/pull/13153) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Protect from the cases when user may set `background_pool_size` to value lower than `number_of_free_entries_in_pool_to_execute_mutation` or `number_of_free_entries_in_pool_to_lower_max_size_of_merge`. In these cases ALTERs won't work or the maximum size of merge will be too limited. It will throw exception explaining what to do. This closes [#10897](https://github.com/ClickHouse/ClickHouse/issues/10897). [#12728](https://github.com/ClickHouse/ClickHouse/pull/12728) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* When upgrading from versions older than 20.5, if rolling update is performed and cluster contains both versions 20.5 or greater and less than 20.5, if ClickHouse nodes with old versions are restarted and old version has been started up in presence of newer versions, it may lead to `Part ... intersects previous part` errors. To prevent this error, first install newer clickhouse-server packages on all cluster nodes and then do restarts (so, when clickhouse-server is restarted, it will start up with the new version).
-
-#### New Feature
-
-* Polygon dictionary type that provides efficient "reverse geocoding" lookups - to find the region by coordinates in a dictionary of many polygons (world map). It is using carefully optimized algorithm with recursive grids to maintain low CPU and memory usage. [#9278](https://github.com/ClickHouse/ClickHouse/pull/9278) ([achulkov2](https://github.com/achulkov2)).
-* Added support of LDAP authentication for preconfigured users ("Simple Bind" method). [#11234](https://github.com/ClickHouse/ClickHouse/pull/11234) ([Denis Glazachev](https://github.com/traceon)).
-* Introduce setting `alter_partition_verbose_result` which outputs information about touched parts for some types of `ALTER TABLE ... PARTITION ...` queries (currently `ATTACH` and `FREEZE`). Closes [#8076](https://github.com/ClickHouse/ClickHouse/issues/8076). [#13017](https://github.com/ClickHouse/ClickHouse/pull/13017) ([alesapin](https://github.com/alesapin)).
-* Add `bayesAB` function for bayesian-ab-testing. [#12327](https://github.com/ClickHouse/ClickHouse/pull/12327) ([achimbab](https://github.com/achimbab)).
-* Added `system.crash_log` table into which stack traces for fatal errors are collected. This table should be empty. [#12316](https://github.com/ClickHouse/ClickHouse/pull/12316) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Added http headers `X-ClickHouse-Database` and `X-ClickHouse-Format` which may be used to set default database and output format. [#12981](https://github.com/ClickHouse/ClickHouse/pull/12981) ([hcz](https://github.com/hczhcz)).
-* Add `minMap` and `maxMap` functions support to `SimpleAggregateFunction`. [#12662](https://github.com/ClickHouse/ClickHouse/pull/12662) ([Ildus Kurbangaliev](https://github.com/ildus)).
-* Add setting `allow_non_metadata_alters` which restricts to execute `ALTER` queries which modify data on disk. Disabled be default. Closes [#11547](https://github.com/ClickHouse/ClickHouse/issues/11547). [#12635](https://github.com/ClickHouse/ClickHouse/pull/12635) ([alesapin](https://github.com/alesapin)).
-* A function `formatRow` is added to support turning arbitrary expressions into a string via given format. It's useful for manipulating SQL outputs and is quite versatile combined with the `columns` function. [#12574](https://github.com/ClickHouse/ClickHouse/pull/12574) ([Amos Bird](https://github.com/amosbird)).
-* Add `FROM_UNIXTIME` function for compatibility with MySQL, related to [12149](https://github.com/ClickHouse/ClickHouse/issues/12149). [#12484](https://github.com/ClickHouse/ClickHouse/pull/12484) ([flynn](https://github.com/ucasFL)).
-* Allow Nullable types as keys in MergeTree tables if `allow_nullable_key` table setting is enabled. Closes [#5319](https://github.com/ClickHouse/ClickHouse/issues/5319). [#12433](https://github.com/ClickHouse/ClickHouse/pull/12433) ([Amos Bird](https://github.com/amosbird)).
-* Integration with [COS](https://intl.cloud.tencent.com/product/cos). [#12386](https://github.com/ClickHouse/ClickHouse/pull/12386) ([fastio](https://github.com/fastio)).
-* Add `mapAdd` and `mapSubtract` functions for adding/subtracting key-mapped values. [#11735](https://github.com/ClickHouse/ClickHouse/pull/11735) ([Ildus Kurbangaliev](https://github.com/ildus)).
-
-#### Bug Fix
-
-* Fix premature `ON CLUSTER` timeouts for queries that must be executed on a single replica. Fixes [#6704](https://github.com/ClickHouse/ClickHouse/issues/6704), [#7228](https://github.com/ClickHouse/ClickHouse/issues/7228), [#13361](https://github.com/ClickHouse/ClickHouse/issues/13361), [#11884](https://github.com/ClickHouse/ClickHouse/issues/11884). [#13450](https://github.com/ClickHouse/ClickHouse/pull/13450) ([alesapin](https://github.com/alesapin)).
-* Fix crash in mark inclusion search introduced in [#12277](https://github.com/ClickHouse/ClickHouse/pull/12277). [#14225](https://github.com/ClickHouse/ClickHouse/pull/14225) ([Amos Bird](https://github.com/amosbird)).
-* Fix race condition in external dictionaries with cache layout which can lead server crash. [#12566](https://github.com/ClickHouse/ClickHouse/pull/12566) ([alesapin](https://github.com/alesapin)).
-* Fix visible data clobbering by progress bar in client in interactive mode. This fixes [#12562](https://github.com/ClickHouse/ClickHouse/issues/12562) and [#13369](https://github.com/ClickHouse/ClickHouse/issues/13369) and [#13584](https://github.com/ClickHouse/ClickHouse/issues/13584) and fixes [#12964](https://github.com/ClickHouse/ClickHouse/issues/12964). [#13691](https://github.com/ClickHouse/ClickHouse/pull/13691) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed incorrect sorting order for `LowCardinality` columns when ORDER BY multiple columns is used. This fixes [#13958](https://github.com/ClickHouse/ClickHouse/issues/13958). [#14223](https://github.com/ClickHouse/ClickHouse/pull/14223) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Removed hardcoded timeout, which wrongly overruled `query_wait_timeout_milliseconds` setting for cache-dictionary. [#14105](https://github.com/ClickHouse/ClickHouse/pull/14105) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fixed wrong mount point in extra info for `Poco::Exception: no space left on device`. [#14050](https://github.com/ClickHouse/ClickHouse/pull/14050) ([tavplubix](https://github.com/tavplubix)).
-* Fix wrong query optimization of select queries with `DISTINCT` keyword when subqueries also have `DISTINCT` in case `optimize_duplicate_order_by_and_distinct` setting is enabled. [#13925](https://github.com/ClickHouse/ClickHouse/pull/13925) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fixed potential deadlock when renaming `Distributed` table. [#13922](https://github.com/ClickHouse/ClickHouse/pull/13922) ([tavplubix](https://github.com/tavplubix)).
-* Fix incorrect sorting for `FixedString` columns when ORDER BY multiple columns is used. Fixes [#13182](https://github.com/ClickHouse/ClickHouse/issues/13182). [#13887](https://github.com/ClickHouse/ClickHouse/pull/13887) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix potentially lower precision of `topK`/`topKWeighted` aggregations (with non-default parameters). [#13817](https://github.com/ClickHouse/ClickHouse/pull/13817) ([Azat Khuzhin](https://github.com/azat)).
-* Fix reading from MergeTree table with INDEX of type SET fails when compared against NULL. This fixes [#13686](https://github.com/ClickHouse/ClickHouse/issues/13686). [#13793](https://github.com/ClickHouse/ClickHouse/pull/13793) ([Amos Bird](https://github.com/amosbird)).
-* Fix step overflow in function `range()`. [#13790](https://github.com/ClickHouse/ClickHouse/pull/13790) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed `Directory not empty` error when concurrently executing `DROP DATABASE` and `CREATE TABLE`. [#13756](https://github.com/ClickHouse/ClickHouse/pull/13756) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add range check for `h3KRing` function. This fixes [#13633](https://github.com/ClickHouse/ClickHouse/issues/13633). [#13752](https://github.com/ClickHouse/ClickHouse/pull/13752) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix race condition between DETACH and background merges. Parts may revive after detach. This is continuation of [#8602](https://github.com/ClickHouse/ClickHouse/issues/8602) that did not fix the issue but introduced a test that started to fail in very rare cases, demonstrating the issue. [#13746](https://github.com/ClickHouse/ClickHouse/pull/13746) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix logging Settings.Names/Values when `log_queries_min_type` greater than `QUERY_START`. [#13737](https://github.com/ClickHouse/ClickHouse/pull/13737) ([Azat Khuzhin](https://github.com/azat)).
-* Fix incorrect message in `clickhouse-server.init` while checking user and group. [#13711](https://github.com/ClickHouse/ClickHouse/pull/13711) ([ylchou](https://github.com/ylchou)).
-* Do not optimize `any(arrayJoin())` to `arrayJoin()` under `optimize_move_functions_out_of_any`. [#13681](https://github.com/ClickHouse/ClickHouse/pull/13681) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed possible deadlock in concurrent `ALTER ... REPLACE/MOVE PARTITION ...` queries. [#13626](https://github.com/ClickHouse/ClickHouse/pull/13626) ([tavplubix](https://github.com/tavplubix)).
-* Fixed the behaviour when sometimes cache-dictionary returned default value instead of present value from source. [#13624](https://github.com/ClickHouse/ClickHouse/pull/13624) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fix secondary indices corruption in compact parts (compact parts is an experimental feature). [#13538](https://github.com/ClickHouse/ClickHouse/pull/13538) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix wrong code in function `netloc`. This fixes [#13335](https://github.com/ClickHouse/ClickHouse/issues/13335). [#13446](https://github.com/ClickHouse/ClickHouse/pull/13446) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix error in `parseDateTimeBestEffort` function when unix timestamp was passed as an argument. This fixes [#13362](https://github.com/ClickHouse/ClickHouse/issues/13362). [#13441](https://github.com/ClickHouse/ClickHouse/pull/13441) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix invalid return type for comparison of tuples with `NULL` elements. Fixes [#12461](https://github.com/ClickHouse/ClickHouse/issues/12461). [#13420](https://github.com/ClickHouse/ClickHouse/pull/13420) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix wrong optimization caused `aggregate function any(x) is found inside another aggregate function in query` error with `SET optimize_move_functions_out_of_any = 1` and aliases inside `any()`. [#13419](https://github.com/ClickHouse/ClickHouse/pull/13419) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix possible race in `StorageMemory`. [#13416](https://github.com/ClickHouse/ClickHouse/pull/13416) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix empty output for `Arrow` and `Parquet` formats in case if query return zero rows. It was done because empty output is not valid for this formats. [#13399](https://github.com/ClickHouse/ClickHouse/pull/13399) ([hcz](https://github.com/hczhcz)).
-* Fix select queries with constant columns and prefix of primary key in `ORDER BY` clause. [#13396](https://github.com/ClickHouse/ClickHouse/pull/13396) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix `PrettyCompactMonoBlock` for clickhouse-local. Fix extremes/totals with `PrettyCompactMonoBlock`. Fixes [#7746](https://github.com/ClickHouse/ClickHouse/issues/7746). [#13394](https://github.com/ClickHouse/ClickHouse/pull/13394) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed deadlock in system.text_log. [#12452](https://github.com/ClickHouse/ClickHouse/pull/12452) ([alexey-milovidov](https://github.com/alexey-milovidov)). It is a part of [#12339](https://github.com/ClickHouse/ClickHouse/issues/12339). This fixes [#12325](https://github.com/ClickHouse/ClickHouse/issues/12325). [#13386](https://github.com/ClickHouse/ClickHouse/pull/13386) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fixed `File(TSVWithNames*)` (header was written multiple times), fixed `clickhouse-local --format CSVWithNames*` (lacks header, broken after [#12197](https://github.com/ClickHouse/ClickHouse/issues/12197)), fixed `clickhouse-local --format CSVWithNames*` with zero rows (lacks header). [#13343](https://github.com/ClickHouse/ClickHouse/pull/13343) ([Azat Khuzhin](https://github.com/azat)).
-* Fix segfault when function `groupArrayMovingSum` deserializes empty state. Fixes [#13339](https://github.com/ClickHouse/ClickHouse/issues/13339). [#13341](https://github.com/ClickHouse/ClickHouse/pull/13341) ([alesapin](https://github.com/alesapin)).
-* Throw error on `arrayJoin()` function in `JOIN ON` section. [#13330](https://github.com/ClickHouse/ClickHouse/pull/13330) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix crash in `LEFT ASOF JOIN` with `join_use_nulls=1`. [#13291](https://github.com/ClickHouse/ClickHouse/pull/13291) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix possible error `Totals having transform was already added to pipeline` in case of a query from delayed replica. [#13290](https://github.com/ClickHouse/ClickHouse/pull/13290) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* The server may crash if user passed specifically crafted arguments to the function `h3ToChildren`. This fixes [#13275](https://github.com/ClickHouse/ClickHouse/issues/13275). [#13277](https://github.com/ClickHouse/ClickHouse/pull/13277) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix potentially low performance and slightly incorrect result for `uniqExact`, `topK`, `sumDistinct` and similar aggregate functions called on Float types with `NaN` values. It also triggered assert in debug build. This fixes [#12491](https://github.com/ClickHouse/ClickHouse/issues/12491). [#13254](https://github.com/ClickHouse/ClickHouse/pull/13254) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix assertion in KeyCondition when primary key contains expression with monotonic function and query contains comparison with constant whose type is different. This fixes [#12465](https://github.com/ClickHouse/ClickHouse/issues/12465). [#13251](https://github.com/ClickHouse/ClickHouse/pull/13251) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Return passed number for numbers with MSB set in function roundUpToPowerOfTwoOrZero(). It prevents potential errors in case of overflow of array sizes. [#13234](https://github.com/ClickHouse/ClickHouse/pull/13234) ([Azat Khuzhin](https://github.com/azat)).
-* Fix function if with nullable constexpr as cond that is not literal NULL. Fixes [#12463](https://github.com/ClickHouse/ClickHouse/issues/12463). [#13226](https://github.com/ClickHouse/ClickHouse/pull/13226) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix assert in `arrayElement` function in case of array elements are Nullable and array subscript is also Nullable. This fixes [#12172](https://github.com/ClickHouse/ClickHouse/issues/12172). [#13224](https://github.com/ClickHouse/ClickHouse/pull/13224) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix DateTime64 conversion functions with constant argument. [#13205](https://github.com/ClickHouse/ClickHouse/pull/13205) ([Azat Khuzhin](https://github.com/azat)).
-* Fix parsing row policies from users.xml when names of databases or tables contain dots. This fixes [#5779](https://github.com/ClickHouse/ClickHouse/issues/5779), [#12527](https://github.com/ClickHouse/ClickHouse/issues/12527). [#13199](https://github.com/ClickHouse/ClickHouse/pull/13199) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix access to `redis` dictionary after connection was dropped once. It may happen with `cache` and `direct` dictionary layouts. [#13082](https://github.com/ClickHouse/ClickHouse/pull/13082) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix wrong index analysis with functions. It could lead to some data parts being skipped when reading from `MergeTree` tables. Fixes [#13060](https://github.com/ClickHouse/ClickHouse/issues/13060). Fixes [#12406](https://github.com/ClickHouse/ClickHouse/issues/12406). [#13081](https://github.com/ClickHouse/ClickHouse/pull/13081) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix error `Cannot convert column because it is constant but values of constants are different in source and result` for remote queries which use deterministic functions in scope of query, but not deterministic between queries, like `now()`, `now64()`, `randConstant()`. Fixes [#11327](https://github.com/ClickHouse/ClickHouse/issues/11327). [#13075](https://github.com/ClickHouse/ClickHouse/pull/13075) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix crash which was possible for queries with `ORDER BY` tuple and small `LIMIT`. Fixes [#12623](https://github.com/ClickHouse/ClickHouse/issues/12623). [#13009](https://github.com/ClickHouse/ClickHouse/pull/13009) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix `Block structure mismatch` error for queries with `UNION` and `JOIN`. Fixes [#12602](https://github.com/ClickHouse/ClickHouse/issues/12602). [#12989](https://github.com/ClickHouse/ClickHouse/pull/12989) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Corrected `merge_with_ttl_timeout` logic which did not work well when expiration affected more than one partition over one time interval. (Authored by @excitoon). [#12982](https://github.com/ClickHouse/ClickHouse/pull/12982) ([Alexander Kazakov](https://github.com/Akazz)).
-* Fix columns duplication for range hashed dictionary created from DDL query. This fixes [#10605](https://github.com/ClickHouse/ClickHouse/issues/10605). [#12857](https://github.com/ClickHouse/ClickHouse/pull/12857) ([alesapin](https://github.com/alesapin)).
-* Fix unnecessary limiting for the number of threads for selects from local replica. [#12840](https://github.com/ClickHouse/ClickHouse/pull/12840) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix rare bug when `ALTER DELETE` and `ALTER MODIFY COLUMN` queries executed simultaneously as a single mutation. Bug leads to an incorrect amount of rows in `count.txt` and as a consequence incorrect data in part. Also, fix a small bug with simultaneous `ALTER RENAME COLUMN` and `ALTER ADD COLUMN`. [#12760](https://github.com/ClickHouse/ClickHouse/pull/12760) ([alesapin](https://github.com/alesapin)).
-* Wrong credentials being used when using `clickhouse` dictionary source to query remote tables. [#12756](https://github.com/ClickHouse/ClickHouse/pull/12756) ([sundyli](https://github.com/sundy-li)).
-* Fix `CAST(Nullable(String), Enum())`. [#12745](https://github.com/ClickHouse/ClickHouse/pull/12745) ([Azat Khuzhin](https://github.com/azat)).
-* Fix performance with large tuples, which are interpreted as functions in `IN` section. The case when user writes `WHERE x IN tuple(1, 2, ...)` instead of `WHERE x IN (1, 2, ...)` for some obscure reason. [#12700](https://github.com/ClickHouse/ClickHouse/pull/12700) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix memory tracking for input_format_parallel_parsing (by attaching thread to group). [#12672](https://github.com/ClickHouse/ClickHouse/pull/12672) ([Azat Khuzhin](https://github.com/azat)).
-* Fix wrong optimization `optimize_move_functions_out_of_any=1` in case of `any(func(<lambda>))`. [#12664](https://github.com/ClickHouse/ClickHouse/pull/12664) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fixed [#10572](https://github.com/ClickHouse/ClickHouse/issues/10572) fix bloom filter index with const expression. [#12659](https://github.com/ClickHouse/ClickHouse/pull/12659) ([Winter Zhang](https://github.com/zhang2014)).
-* Fix SIGSEGV in StorageKafka when broker is unavailable (and not only). [#12658](https://github.com/ClickHouse/ClickHouse/pull/12658) ([Azat Khuzhin](https://github.com/azat)).
-* Add support for function `if` with `Array(UUID)` arguments. This fixes [#11066](https://github.com/ClickHouse/ClickHouse/issues/11066). [#12648](https://github.com/ClickHouse/ClickHouse/pull/12648) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* CREATE USER IF NOT EXISTS now doesn't throw exception if the user exists. This fixes [#12507](https://github.com/ClickHouse/ClickHouse/issues/12507). [#12646](https://github.com/ClickHouse/ClickHouse/pull/12646) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Exception `There is no supertype...` can be thrown during `ALTER ... UPDATE` in unexpected cases (e.g. when subtracting from UInt64 column). This fixes [#7306](https://github.com/ClickHouse/ClickHouse/issues/7306). This fixes [#4165](https://github.com/ClickHouse/ClickHouse/issues/4165). [#12633](https://github.com/ClickHouse/ClickHouse/pull/12633) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix possible `Pipeline stuck` error for queries with external sorting. Fixes [#12617](https://github.com/ClickHouse/ClickHouse/issues/12617). [#12618](https://github.com/ClickHouse/ClickHouse/pull/12618) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix error `Output of TreeExecutor is not sorted` for `OPTIMIZE DEDUPLICATE`. Fixes [#11572](https://github.com/ClickHouse/ClickHouse/issues/11572). [#12613](https://github.com/ClickHouse/ClickHouse/pull/12613) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix the issue when alias on result of function `any` can be lost during query optimization. [#12593](https://github.com/ClickHouse/ClickHouse/pull/12593) ([Anton Popov](https://github.com/CurtizJ)).
-* Remove data for Distributed tables (blocks from async INSERTs) on DROP TABLE. [#12556](https://github.com/ClickHouse/ClickHouse/pull/12556) ([Azat Khuzhin](https://github.com/azat)).
-* Now ClickHouse will recalculate checksums for parts when file `checksums.txt` is absent. Broken since [#9827](https://github.com/ClickHouse/ClickHouse/issues/9827). [#12545](https://github.com/ClickHouse/ClickHouse/pull/12545) ([alesapin](https://github.com/alesapin)).
-* Fix bug which lead to broken old parts after `ALTER DELETE` query when `enable_mixed_granularity_parts=1`. Fixes [#12536](https://github.com/ClickHouse/ClickHouse/issues/12536). [#12543](https://github.com/ClickHouse/ClickHouse/pull/12543) ([alesapin](https://github.com/alesapin)).
-* Fixing race condition in live view tables which could cause data duplication. LIVE VIEW is an experimental feature. [#12519](https://github.com/ClickHouse/ClickHouse/pull/12519) ([vzakaznikov](https://github.com/vzakaznikov)).
-* Fix backwards compatibility in binary format of `AggregateFunction(avg, ...)` values. This fixes [#12342](https://github.com/ClickHouse/ClickHouse/issues/12342). [#12486](https://github.com/ClickHouse/ClickHouse/pull/12486) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix crash in JOIN with dictionary when we are joining over expression of dictionary key: `t JOIN dict ON expr(dict.id) = t.id`. Disable dictionary join optimisation for this case. [#12458](https://github.com/ClickHouse/ClickHouse/pull/12458) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix overflow when very large LIMIT or OFFSET is specified. This fixes [#10470](https://github.com/ClickHouse/ClickHouse/issues/10470). This fixes [#11372](https://github.com/ClickHouse/ClickHouse/issues/11372). [#12427](https://github.com/ClickHouse/ClickHouse/pull/12427) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* kafka: fix SIGSEGV if there is a message with error in the middle of the batch. [#12302](https://github.com/ClickHouse/ClickHouse/pull/12302) ([Azat Khuzhin](https://github.com/azat)).
-
-#### Improvement
-
-* Keep smaller amount of logs in ZooKeeper. Avoid excessive growing of ZooKeeper nodes in case of offline replicas when having many servers/tables/inserts. [#13100](https://github.com/ClickHouse/ClickHouse/pull/13100) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Now exceptions forwarded to the client if an error happened during ALTER or mutation. Closes [#11329](https://github.com/ClickHouse/ClickHouse/issues/11329). [#12666](https://github.com/ClickHouse/ClickHouse/pull/12666) ([alesapin](https://github.com/alesapin)).
-* Add `QueryTimeMicroseconds`, `SelectQueryTimeMicroseconds` and `InsertQueryTimeMicroseconds` to `system.events`, along with system.metrics, processes, query_log, etc. [#13028](https://github.com/ClickHouse/ClickHouse/pull/13028) ([ianton-ru](https://github.com/ianton-ru)).
-* Added `SelectedRows` and `SelectedBytes` to `system.events`, along with system.metrics, processes, query_log, etc. [#12638](https://github.com/ClickHouse/ClickHouse/pull/12638) ([ianton-ru](https://github.com/ianton-ru)).
-* Added `current_database` information to `system.query_log`. [#12652](https://github.com/ClickHouse/ClickHouse/pull/12652) ([Amos Bird](https://github.com/amosbird)).
-* Allow `TabSeparatedRaw` as input format. [#12009](https://github.com/ClickHouse/ClickHouse/pull/12009) ([hcz](https://github.com/hczhcz)).
-* Now `joinGet` supports multi-key lookup. [#12418](https://github.com/ClickHouse/ClickHouse/pull/12418) ([Amos Bird](https://github.com/amosbird)).
-* Allow `*Map` aggregate functions to work on Arrays with NULLs. Fixes [#13157](https://github.com/ClickHouse/ClickHouse/issues/13157). [#13225](https://github.com/ClickHouse/ClickHouse/pull/13225) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Avoid overflow in parsing of DateTime values that will lead to negative unix timestamp in their timezone (for example, `1970-01-01 00:00:00` in Moscow). Saturate to zero instead. This fixes [#3470](https://github.com/ClickHouse/ClickHouse/issues/3470). This fixes [#4172](https://github.com/ClickHouse/ClickHouse/issues/4172). [#12443](https://github.com/ClickHouse/ClickHouse/pull/12443) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* AvroConfluent: Skip Kafka tombstone records - Support skipping broken records [#13203](https://github.com/ClickHouse/ClickHouse/pull/13203) ([Andrew Onyshchuk](https://github.com/oandrew)).
-* Fix wrong error for long queries. It was possible to get syntax error other than `Max query size exceeded` for correct query. [#13928](https://github.com/ClickHouse/ClickHouse/pull/13928) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix data race in `lgamma` function. This race was caught only in `tsan`, no side effects really happened. [#13842](https://github.com/ClickHouse/ClickHouse/pull/13842) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix a 'Week'-interval formatting for ATTACH/ALTER/CREATE QUOTA-statements. [#13417](https://github.com/ClickHouse/ClickHouse/pull/13417) ([vladimir-golovchenko](https://github.com/vladimir-golovchenko)).
-* Now broken parts are also reported when encountered in compact part processing. Compact parts is an experimental feature. [#13282](https://github.com/ClickHouse/ClickHouse/pull/13282) ([Amos Bird](https://github.com/amosbird)).
-* Fix assert in `geohashesInBox`. This fixes [#12554](https://github.com/ClickHouse/ClickHouse/issues/12554). [#13229](https://github.com/ClickHouse/ClickHouse/pull/13229) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix assert in `parseDateTimeBestEffort`. This fixes [#12649](https://github.com/ClickHouse/ClickHouse/issues/12649). [#13227](https://github.com/ClickHouse/ClickHouse/pull/13227) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Minor optimization in Processors/PipelineExecutor: breaking out of a loop because it makes sense to do so. [#13058](https://github.com/ClickHouse/ClickHouse/pull/13058) ([Mark Papadakis](https://github.com/markpapadakis)).
-* Support TRUNCATE table without TABLE keyword. [#12653](https://github.com/ClickHouse/ClickHouse/pull/12653) ([Winter Zhang](https://github.com/zhang2014)).
-* Fix explain query format overwrite by default. This fixes [#12541](https://github.com/ClickHouse/ClickHouse/issues/12432). [#12541](https://github.com/ClickHouse/ClickHouse/pull/12541) ([BohuTANG](https://github.com/BohuTANG)).
-* Allow to set JOIN kind and type in more standad way: `LEFT SEMI JOIN` instead of `SEMI LEFT JOIN`. For now both are correct. [#12520](https://github.com/ClickHouse/ClickHouse/pull/12520) ([Artem Zuikov](https://github.com/4ertus2)).
-* Changes default value for `multiple_joins_rewriter_version` to 2. It enables new multiple joins rewriter that knows about column names. [#12469](https://github.com/ClickHouse/ClickHouse/pull/12469) ([Artem Zuikov](https://github.com/4ertus2)).
-* Add several metrics for requests to S3 storages. [#12464](https://github.com/ClickHouse/ClickHouse/pull/12464) ([ianton-ru](https://github.com/ianton-ru)).
-* Use correct default secure port for clickhouse-benchmark with `--secure` argument. This fixes [#11044](https://github.com/ClickHouse/ClickHouse/issues/11044). [#12440](https://github.com/ClickHouse/ClickHouse/pull/12440) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Rollback insertion errors in `Log`, `TinyLog`, `StripeLog` engines. In previous versions insertion error lead to inconsisent table state (this works as documented and it is normal for these table engines). This fixes [#12402](https://github.com/ClickHouse/ClickHouse/issues/12402). [#12426](https://github.com/ClickHouse/ClickHouse/pull/12426) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Implement `RENAME DATABASE` and `RENAME DICTIONARY` for `Atomic` database engine - Add implicit `{uuid}` macro, which can be used in ZooKeeper path for `ReplicatedMergeTree`. It works with `CREATE ... ON CLUSTER ...` queries. Set `show_table_uuid_in_table_create_query_if_not_nil` to `true` to use it. - Make `ReplicatedMergeTree` engine arguments optional, `/clickhouse/tables/{uuid}/{shard}/` and `{replica}` are used by default. Closes [#12135](https://github.com/ClickHouse/ClickHouse/issues/12135). - Minor fixes. - These changes break backward compatibility of `Atomic` database engine. Previously created `Atomic` databases must be manually converted to new format. Atomic database is an experimental feature. [#12343](https://github.com/ClickHouse/ClickHouse/pull/12343) ([tavplubix](https://github.com/tavplubix)).
-* Separated `AWSAuthV4Signer` into different logger, removed excessive `AWSClient: AWSClient` from log messages. [#12320](https://github.com/ClickHouse/ClickHouse/pull/12320) ([Vladimir Chebotarev](https://github.com/excitoon)).
-* Better exception message in disk access storage. [#12625](https://github.com/ClickHouse/ClickHouse/pull/12625) ([alesapin](https://github.com/alesapin)).
-* Better exception for function `in` with invalid number of arguments. [#12529](https://github.com/ClickHouse/ClickHouse/pull/12529) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix error message about adaptive granularity. [#12624](https://github.com/ClickHouse/ClickHouse/pull/12624) ([alesapin](https://github.com/alesapin)).
-* Fix SETTINGS parse after FORMAT. [#12480](https://github.com/ClickHouse/ClickHouse/pull/12480) ([Azat Khuzhin](https://github.com/azat)).
-* If MergeTree table does not contain ORDER BY or PARTITION BY, it was possible to request ALTER to CLEAR all the columns and ALTER will stuck. Fixed [#7941](https://github.com/ClickHouse/ClickHouse/issues/7941). [#12382](https://github.com/ClickHouse/ClickHouse/pull/12382) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Avoid re-loading completion from the history file after each query (to avoid history overlaps with other client sessions). [#13086](https://github.com/ClickHouse/ClickHouse/pull/13086) ([Azat Khuzhin](https://github.com/azat)).
-
-#### Performance Improvement
-
-* Lower memory usage for some operations up to 2 times. [#12424](https://github.com/ClickHouse/ClickHouse/pull/12424) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Optimize PK lookup for queries that match exact PK range. [#12277](https://github.com/ClickHouse/ClickHouse/pull/12277) ([Ivan Babrou](https://github.com/bobrik)).
-* Slightly optimize very short queries with `LowCardinality`. [#14129](https://github.com/ClickHouse/ClickHouse/pull/14129) ([Anton Popov](https://github.com/CurtizJ)).
-* Slightly improve performance of aggregation by UInt8/UInt16 keys. [#13091](https://github.com/ClickHouse/ClickHouse/pull/13091) and [#13055](https://github.com/ClickHouse/ClickHouse/pull/13055) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Push down `LIMIT` step for query plan (inside subqueries). [#13016](https://github.com/ClickHouse/ClickHouse/pull/13016) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Parallel primary key lookup and skipping index stages on parts, as described in [#11564](https://github.com/ClickHouse/ClickHouse/issues/11564). [#12589](https://github.com/ClickHouse/ClickHouse/pull/12589) ([Ivan Babrou](https://github.com/bobrik)).
-* Converting String-type arguments of function "if" and "transform" into enum if `set optimize_if_transform_strings_to_enum = 1`. [#12515](https://github.com/ClickHouse/ClickHouse/pull/12515) ([Artem Zuikov](https://github.com/4ertus2)).
-* Replaces monotonic functions with its argument in `ORDER BY` if `set optimize_monotonous_functions_in_order_by=1`. [#12467](https://github.com/ClickHouse/ClickHouse/pull/12467) ([Artem Zuikov](https://github.com/4ertus2)).
-* Add order by optimization that rewrites `ORDER BY x, f(x)` with `ORDER by x` if `set optimize_redundant_functions_in_order_by = 1`. [#12404](https://github.com/ClickHouse/ClickHouse/pull/12404) ([Artem Zuikov](https://github.com/4ertus2)).
-* Allow pushdown predicate when subquery contains `WITH` clause. This fixes [#12293](https://github.com/ClickHouse/ClickHouse/issues/12293) [#12663](https://github.com/ClickHouse/ClickHouse/pull/12663) ([Winter Zhang](https://github.com/zhang2014)).
-* Improve performance of reading from compact parts. Compact parts is an experimental feature. [#12492](https://github.com/ClickHouse/ClickHouse/pull/12492) ([Anton Popov](https://github.com/CurtizJ)).
-* Attempt to implement streaming optimization in `DiskS3`. DiskS3 is an experimental feature. [#12434](https://github.com/ClickHouse/ClickHouse/pull/12434) ([Vladimir Chebotarev](https://github.com/excitoon)).
-
-#### Build/Testing/Packaging Improvement
-
-* Use `shellcheck` for sh tests linting. [#13200](https://github.com/ClickHouse/ClickHouse/pull/13200) [#13207](https://github.com/ClickHouse/ClickHouse/pull/13207) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add script which set labels for pull requests in GitHub hook. [#13183](https://github.com/ClickHouse/ClickHouse/pull/13183) ([alesapin](https://github.com/alesapin)).
-* Remove some of recursive submodules. See [#13378](https://github.com/ClickHouse/ClickHouse/issues/13378). [#13379](https://github.com/ClickHouse/ClickHouse/pull/13379) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Ensure that all the submodules are from proper URLs. Continuation of [#13379](https://github.com/ClickHouse/ClickHouse/issues/13379). This fixes [#13378](https://github.com/ClickHouse/ClickHouse/issues/13378). [#13397](https://github.com/ClickHouse/ClickHouse/pull/13397) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Added support for user-declared settings, which can be accessed from inside queries. This is needed when ClickHouse engine is used as a component of another system. [#13013](https://github.com/ClickHouse/ClickHouse/pull/13013) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Added testing for RBAC functionality of INSERT privilege in TestFlows. Expanded tables on which SELECT is being tested. Added Requirements to match new table engine tests. [#13340](https://github.com/ClickHouse/ClickHouse/pull/13340) ([MyroTk](https://github.com/MyroTk)).
-* Fix timeout error during server restart in the stress test. [#13321](https://github.com/ClickHouse/ClickHouse/pull/13321) ([alesapin](https://github.com/alesapin)).
-* Now fast test will wait server with retries. [#13284](https://github.com/ClickHouse/ClickHouse/pull/13284) ([alesapin](https://github.com/alesapin)).
-* Function `materialize()` (the function for ClickHouse testing) will work for NULL as expected - by transforming it to non-constant column. [#13212](https://github.com/ClickHouse/ClickHouse/pull/13212) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix libunwind build in AArch64. This fixes [#13204](https://github.com/ClickHouse/ClickHouse/issues/13204). [#13208](https://github.com/ClickHouse/ClickHouse/pull/13208) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Even more retries in zkutil gtest to prevent test flakiness. [#13165](https://github.com/ClickHouse/ClickHouse/pull/13165) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Small fixes to the RBAC TestFlows. [#13152](https://github.com/ClickHouse/ClickHouse/pull/13152) ([vzakaznikov](https://github.com/vzakaznikov)).
-* Fixing `00960_live_view_watch_events_live.py` test. [#13108](https://github.com/ClickHouse/ClickHouse/pull/13108) ([vzakaznikov](https://github.com/vzakaznikov)).
-* Improve cache purge in documentation deploy script. [#13107](https://github.com/ClickHouse/ClickHouse/pull/13107) ([alesapin](https://github.com/alesapin)).
-* Rewrote some orphan tests to gtest. Removed useless includes from tests. [#13073](https://github.com/ClickHouse/ClickHouse/pull/13073) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Added tests for RBAC functionality of `SELECT` privilege in TestFlows. [#13061](https://github.com/ClickHouse/ClickHouse/pull/13061) ([Ritaank Tiwari](https://github.com/ritaank)).
-* Rerun some tests in fast test check. [#12992](https://github.com/ClickHouse/ClickHouse/pull/12992) ([alesapin](https://github.com/alesapin)).
-* Fix MSan error in "rdkafka" library. This closes [#12990](https://github.com/ClickHouse/ClickHouse/issues/12990). Updated `rdkafka` to version 1.5 (master). [#12991](https://github.com/ClickHouse/ClickHouse/pull/12991) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix UBSan report in base64 if tests were run on server with AVX-512. This fixes [#12318](https://github.com/ClickHouse/ClickHouse/issues/12318). Author: @qoega. [#12441](https://github.com/ClickHouse/ClickHouse/pull/12441) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix UBSan report in HDFS library. This closes [#12330](https://github.com/ClickHouse/ClickHouse/issues/12330). [#12453](https://github.com/ClickHouse/ClickHouse/pull/12453) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Check an ability that we able to restore the backup from an old version to the new version. This closes [#8979](https://github.com/ClickHouse/ClickHouse/issues/8979). [#12959](https://github.com/ClickHouse/ClickHouse/pull/12959) ([alesapin](https://github.com/alesapin)).
-* Do not build helper_container image inside integrational tests. Build docker container in CI and use pre-built helper_container in integration tests. [#12953](https://github.com/ClickHouse/ClickHouse/pull/12953) ([Ilya Yatsishin](https://github.com/qoega)).
-* Add a test for `ALTER TABLE CLEAR COLUMN` query for primary key columns. [#12951](https://github.com/ClickHouse/ClickHouse/pull/12951) ([alesapin](https://github.com/alesapin)).
-* Increased timeouts in testflows tests. [#12949](https://github.com/ClickHouse/ClickHouse/pull/12949) ([vzakaznikov](https://github.com/vzakaznikov)).
-* Fix build of test under Mac OS X. This closes [#12767](https://github.com/ClickHouse/ClickHouse/issues/12767). [#12772](https://github.com/ClickHouse/ClickHouse/pull/12772) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Connector-ODBC updated to mysql-connector-odbc-8.0.21. [#12739](https://github.com/ClickHouse/ClickHouse/pull/12739) ([Ilya Yatsishin](https://github.com/qoega)).
-* Adding RBAC syntax tests in TestFlows. [#12642](https://github.com/ClickHouse/ClickHouse/pull/12642) ([vzakaznikov](https://github.com/vzakaznikov)).
-* Improve performance of TestKeeper. This will speedup tests with heavy usage of Replicated tables. [#12505](https://github.com/ClickHouse/ClickHouse/pull/12505) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Now we check that server is able to start after stress tests run. This fixes [#12473](https://github.com/ClickHouse/ClickHouse/issues/12473). [#12496](https://github.com/ClickHouse/ClickHouse/pull/12496) ([alesapin](https://github.com/alesapin)).
-* Update fmtlib to master (7.0.1). [#12446](https://github.com/ClickHouse/ClickHouse/pull/12446) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add docker image for fast tests. [#12294](https://github.com/ClickHouse/ClickHouse/pull/12294) ([alesapin](https://github.com/alesapin)).
-* Rework configuration paths for integration tests. [#12285](https://github.com/ClickHouse/ClickHouse/pull/12285) ([Ilya Yatsishin](https://github.com/qoega)).
-* Add compiler option to control that stack frames are not too large. This will help to run the code in fibers with small stack size. [#11524](https://github.com/ClickHouse/ClickHouse/pull/11524) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Update gitignore-files. [#13447](https://github.com/ClickHouse/ClickHouse/pull/13447) ([vladimir-golovchenko](https://github.com/vladimir-golovchenko)).
-
-
-## ClickHouse release 20.6
-
-### ClickHouse release v20.6.3.28-stable
-
-#### Backward Incompatible Change
-
-* When upgrading from versions older than 20.5, if rolling update is performed and cluster contains both versions 20.5 or greater and less than 20.5, if ClickHouse nodes with old versions are restarted and old version has been started up in presence of newer versions, it may lead to `Part ... intersects previous part` errors. To prevent this error, first install newer clickhouse-server packages on all cluster nodes and then do restarts (so, when clickhouse-server is restarted, it will start up with the new version).
-
-#### New Feature
-
-* Added an initial implementation of `EXPLAIN` query. Syntax: `EXPLAIN SELECT ...`. This fixes [#1118](https://github.com/ClickHouse/ClickHouse/issues/1118). [#11873](https://github.com/ClickHouse/ClickHouse/pull/11873) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Added storage `RabbitMQ`. [#11069](https://github.com/ClickHouse/ClickHouse/pull/11069) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Implemented PostgreSQL-like `ILIKE` operator for [#11710](https://github.com/ClickHouse/ClickHouse/issues/11710). [#12125](https://github.com/ClickHouse/ClickHouse/pull/12125) ([Mike](https://github.com/myrrc)).
-* Supported RIGHT and FULL JOIN with `SET join_algorithm = 'partial_merge'`. Only ALL strictness is allowed (ANY, SEMI, ANTI, ASOF are not). [#12118](https://github.com/ClickHouse/ClickHouse/pull/12118) ([Artem Zuikov](https://github.com/4ertus2)).
-* Added a function `initializeAggregation` to initialize an aggregation based on a single value. [#12109](https://github.com/ClickHouse/ClickHouse/pull/12109) ([Guillaume Tassery](https://github.com/YiuRULE)).
-* Supported `ALTER TABLE ... [ADD|MODIFY] COLUMN ... FIRST` [#4006](https://github.com/ClickHouse/ClickHouse/issues/4006). [#12073](https://github.com/ClickHouse/ClickHouse/pull/12073) ([Winter Zhang](https://github.com/zhang2014)).
-* Added function `parseDateTimeBestEffortUS`. [#12028](https://github.com/ClickHouse/ClickHouse/pull/12028) ([flynn](https://github.com/ucasFL)).
-* Support format `ORC` for output (was supported only for input). [#11662](https://github.com/ClickHouse/ClickHouse/pull/11662) ([Kruglov Pavel](https://github.com/Avogar)).
-
-#### Bug Fix
-
-* Fixed `aggregate function any(x) is found inside another aggregate function in query` error with `SET optimize_move_functions_out_of_any = 1` and aliases inside `any()`. [#13419](https://github.com/ClickHouse/ClickHouse/pull/13419) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fixed `PrettyCompactMonoBlock` for clickhouse-local. Fixed extremes/totals with `PrettyCompactMonoBlock`. This fixes [#7746](https://github.com/ClickHouse/ClickHouse/issues/7746). [#13394](https://github.com/ClickHouse/ClickHouse/pull/13394) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed possible error `Totals having transform was already added to pipeline` in case of a query from delayed replica. [#13290](https://github.com/ClickHouse/ClickHouse/pull/13290) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* The server may crash if user passed specifically crafted arguments to the function `h3ToChildren`. This fixes [#13275](https://github.com/ClickHouse/ClickHouse/issues/13275). [#13277](https://github.com/ClickHouse/ClickHouse/pull/13277) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed potentially low performance and slightly incorrect result for `uniqExact`, `topK`, `sumDistinct` and similar aggregate functions called on Float types with NaN values. It also triggered assert in debug build. This fixes [#12491](https://github.com/ClickHouse/ClickHouse/issues/12491). [#13254](https://github.com/ClickHouse/ClickHouse/pull/13254) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed function if with nullable constexpr as cond that is not literal NULL. Fixes [#12463](https://github.com/ClickHouse/ClickHouse/issues/12463). [#13226](https://github.com/ClickHouse/ClickHouse/pull/13226) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed assert in `arrayElement` function in case of array elements are Nullable and array subscript is also Nullable. This fixes [#12172](https://github.com/ClickHouse/ClickHouse/issues/12172). [#13224](https://github.com/ClickHouse/ClickHouse/pull/13224) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed `DateTime64` conversion functions with constant argument. [#13205](https://github.com/ClickHouse/ClickHouse/pull/13205) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed wrong index analysis with functions. It could lead to pruning wrong parts, while reading from `MergeTree` tables. Fixes [#13060](https://github.com/ClickHouse/ClickHouse/issues/13060). Fixes [#12406](https://github.com/ClickHouse/ClickHouse/issues/12406). [#13081](https://github.com/ClickHouse/ClickHouse/pull/13081) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed error `Cannot convert column because it is constant but values of constants are different in source and result` for remote queries which use deterministic functions in scope of query, but not deterministic between queries, like `now()`, `now64()`, `randConstant()`. Fixes [#11327](https://github.com/ClickHouse/ClickHouse/issues/11327). [#13075](https://github.com/ClickHouse/ClickHouse/pull/13075) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed unnecessary limiting for the number of threads for selects from local replica. [#12840](https://github.com/ClickHouse/ClickHouse/pull/12840) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed rare bug when `ALTER DELETE` and `ALTER MODIFY COLUMN` queries executed simultaneously as a single mutation. Bug leads to an incorrect amount of rows in `count.txt` and as a consequence incorrect data in part. Also, fix a small bug with simultaneous `ALTER RENAME COLUMN` and `ALTER ADD COLUMN`. [#12760](https://github.com/ClickHouse/ClickHouse/pull/12760) ([alesapin](https://github.com/alesapin)).
-* Fixed `CAST(Nullable(String), Enum())`. [#12745](https://github.com/ClickHouse/ClickHouse/pull/12745) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed a performance with large tuples, which are interpreted as functions in `IN` section. The case when user write `WHERE x IN tuple(1, 2, ...)` instead of `WHERE x IN (1, 2, ...)` for some obscure reason. [#12700](https://github.com/ClickHouse/ClickHouse/pull/12700) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed memory tracking for `input_format_parallel_parsing` (by attaching thread to group). [#12672](https://github.com/ClickHouse/ClickHouse/pull/12672) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed bloom filter index with const expression. This fixes [#10572](https://github.com/ClickHouse/ClickHouse/issues/10572). [#12659](https://github.com/ClickHouse/ClickHouse/pull/12659) ([Winter Zhang](https://github.com/zhang2014)).
-* Fixed `SIGSEGV` in `StorageKafka` when broker is unavailable (and not only). [#12658](https://github.com/ClickHouse/ClickHouse/pull/12658) ([Azat Khuzhin](https://github.com/azat)).
-* Added support for function `if` with `Array(UUID)` arguments. This fixes [#11066](https://github.com/ClickHouse/ClickHouse/issues/11066). [#12648](https://github.com/ClickHouse/ClickHouse/pull/12648) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* `CREATE USER IF NOT EXISTS` now doesn't throw exception if the user exists. This fixes [#12507](https://github.com/ClickHouse/ClickHouse/issues/12507). [#12646](https://github.com/ClickHouse/ClickHouse/pull/12646) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Better exception message in disk access storage. [#12625](https://github.com/ClickHouse/ClickHouse/pull/12625) ([alesapin](https://github.com/alesapin)).
-* The function `groupArrayMoving*` was not working for distributed queries. It's result was calculated within incorrect data type (without promotion to the largest type). The function `groupArrayMovingAvg` was returning integer number that was inconsistent with the `avg` function. This fixes [#12568](https://github.com/ClickHouse/ClickHouse/issues/12568). [#12622](https://github.com/ClickHouse/ClickHouse/pull/12622) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed lack of aliases with function `any`. [#12593](https://github.com/ClickHouse/ClickHouse/pull/12593) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed race condition in external dictionaries with cache layout which can lead server crash. [#12566](https://github.com/ClickHouse/ClickHouse/pull/12566) ([alesapin](https://github.com/alesapin)).
-* Remove data for Distributed tables (blocks from async INSERTs) on DROP TABLE. [#12556](https://github.com/ClickHouse/ClickHouse/pull/12556) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed bug which lead to broken old parts after `ALTER DELETE` query when `enable_mixed_granularity_parts=1`. Fixes [#12536](https://github.com/ClickHouse/ClickHouse/issues/12536). [#12543](https://github.com/ClickHouse/ClickHouse/pull/12543) ([alesapin](https://github.com/alesapin)).
-* Better exception for function `in` with invalid number of arguments. [#12529](https://github.com/ClickHouse/ClickHouse/pull/12529) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixing race condition in live view tables which could cause data duplication. [#12519](https://github.com/ClickHouse/ClickHouse/pull/12519) ([vzakaznikov](https://github.com/vzakaznikov)).
-* Fixed performance issue, while reading from compact parts. [#12492](https://github.com/ClickHouse/ClickHouse/pull/12492) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed backwards compatibility in binary format of `AggregateFunction(avg, ...)` values. This fixes [#12342](https://github.com/ClickHouse/ClickHouse/issues/12342). [#12486](https://github.com/ClickHouse/ClickHouse/pull/12486) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed SETTINGS parse after FORMAT. [#12480](https://github.com/ClickHouse/ClickHouse/pull/12480) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed the deadlock if `text_log` is enabled. [#12452](https://github.com/ClickHouse/ClickHouse/pull/12452) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed overflow when very large `LIMIT` or `OFFSET` is specified. This fixes [#10470](https://github.com/ClickHouse/ClickHouse/issues/10470). This fixes [#11372](https://github.com/ClickHouse/ClickHouse/issues/11372). [#12427](https://github.com/ClickHouse/ClickHouse/pull/12427) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed possible segfault if `StorageMerge`. This fixes [#12054](https://github.com/ClickHouse/ClickHouse/issues/12054). [#12401](https://github.com/ClickHouse/ClickHouse/pull/12401) ([tavplubix](https://github.com/tavplubix)).
-* Reverted change introduced in [#11079](https://github.com/ClickHouse/ClickHouse/issues/11079) to resolve [#12098](https://github.com/ClickHouse/ClickHouse/issues/12098). [#12397](https://github.com/ClickHouse/ClickHouse/pull/12397) ([Mike](https://github.com/myrrc)).
-* Additional check for arguments of bloom filter index. This fixes [#11408](https://github.com/ClickHouse/ClickHouse/issues/11408). [#12388](https://github.com/ClickHouse/ClickHouse/pull/12388) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Avoid exception when negative or floating point constant is used in WHERE condition for indexed tables. This fixes [#11905](https://github.com/ClickHouse/ClickHouse/issues/11905). [#12384](https://github.com/ClickHouse/ClickHouse/pull/12384) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Allowed to `CLEAR` column even if there are depending `DEFAULT` expressions. This fixes [#12333](https://github.com/ClickHouse/ClickHouse/issues/12333). [#12378](https://github.com/ClickHouse/ClickHouse/pull/12378) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix `TOTALS/ROLLUP/CUBE` for aggregate functions with `-State` and `Nullable` arguments. This fixes [#12163](https://github.com/ClickHouse/ClickHouse/issues/12163). [#12376](https://github.com/ClickHouse/ClickHouse/pull/12376) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed error message and exit codes for `ALTER RENAME COLUMN` queries, when `RENAME` is not allowed. Fixes [#12301](https://github.com/ClickHouse/ClickHouse/issues/12301) and [#12303](https://github.com/ClickHouse/ClickHouse/issues/12303). [#12335](https://github.com/ClickHouse/ClickHouse/pull/12335) ([alesapin](https://github.com/alesapin)).
-* Fixed very rare race condition in `ReplicatedMergeTreeQueue`. [#12315](https://github.com/ClickHouse/ClickHouse/pull/12315) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* When using codec `Delta` or `DoubleDelta` with non fixed width types, exception with code `LOGICAL_ERROR` was returned instead of exception with code `BAD_ARGUMENTS` (we ensure that exceptions with code logical error never happen). This fixes [#12110](https://github.com/ClickHouse/ClickHouse/issues/12110). [#12308](https://github.com/ClickHouse/ClickHouse/pull/12308) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed order of columns in `WITH FILL` modifier. Previously order of columns of `ORDER BY` statement wasn't respected. [#12306](https://github.com/ClickHouse/ClickHouse/pull/12306) ([Anton Popov](https://github.com/CurtizJ)).
-* Avoid "bad cast" exception when there is an expression that filters data by virtual columns (like `_table` in `Merge` tables) or by "index" columns in system tables such as filtering by database name when querying from `system.tables`, and this expression returns `Nullable` type. This fixes [#12166](https://github.com/ClickHouse/ClickHouse/issues/12166). [#12305](https://github.com/ClickHouse/ClickHouse/pull/12305) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed `TTL` after renaming column, on which depends TTL expression. [#12304](https://github.com/ClickHouse/ClickHouse/pull/12304) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed SIGSEGV if there is an message with error in the middle of the batch in `Kafka` Engine. [#12302](https://github.com/ClickHouse/ClickHouse/pull/12302) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed the situation when some threads might randomly hang for a few seconds during `DNS` cache updating. [#12296](https://github.com/ClickHouse/ClickHouse/pull/12296) ([tavplubix](https://github.com/tavplubix)).
-* Fixed typo in setting name. [#12292](https://github.com/ClickHouse/ClickHouse/pull/12292) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Show error after `TrieDictionary` failed to load. [#12290](https://github.com/ClickHouse/ClickHouse/pull/12290) ([Vitaly Baranov](https://github.com/vitlibar)).
-* The function `arrayFill` worked incorrectly for empty arrays that may lead to crash. This fixes [#12263](https://github.com/ClickHouse/ClickHouse/issues/12263). [#12279](https://github.com/ClickHouse/ClickHouse/pull/12279) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Implement conversions to the common type for `LowCardinality` types. This allows to execute UNION ALL of tables with columns of LowCardinality and other columns. This fixes [#8212](https://github.com/ClickHouse/ClickHouse/issues/8212). This fixes [#4342](https://github.com/ClickHouse/ClickHouse/issues/4342). [#12275](https://github.com/ClickHouse/ClickHouse/pull/12275) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed the behaviour on reaching redirect limit in request to `S3` storage. [#12256](https://github.com/ClickHouse/ClickHouse/pull/12256) ([ianton-ru](https://github.com/ianton-ru)).
-* Fixed the behaviour when during multiple sequential inserts in `StorageFile` header for some special types was written more than once. This fixed [#6155](https://github.com/ClickHouse/ClickHouse/issues/6155). [#12197](https://github.com/ClickHouse/ClickHouse/pull/12197) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fixed logical functions for UInt8 values when they are not equal to 0 or 1. [#12196](https://github.com/ClickHouse/ClickHouse/pull/12196) ([Alexander Kazakov](https://github.com/Akazz)).
-* Cap max_memory_usage* limits to the process resident memory. [#12182](https://github.com/ClickHouse/ClickHouse/pull/12182) ([Azat Khuzhin](https://github.com/azat)).
-* Fix dictGet arguments check during `GROUP BY` injective functions elimination. [#12179](https://github.com/ClickHouse/ClickHouse/pull/12179) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed the behaviour when `SummingMergeTree` engine sums up columns from partition key. Added an exception in case of explicit definition of columns to sum which intersects with partition key columns. This fixes [#7867](https://github.com/ClickHouse/ClickHouse/issues/7867). [#12173](https://github.com/ClickHouse/ClickHouse/pull/12173) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Don't split the dictionary source's table name into schema and table name itself if ODBC connection doesn't support schema. [#12165](https://github.com/ClickHouse/ClickHouse/pull/12165) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fixed wrong logic in `ALTER DELETE` that leads to deleting of records when condition evaluates to NULL. This fixes [#9088](https://github.com/ClickHouse/ClickHouse/issues/9088). This closes [#12106](https://github.com/ClickHouse/ClickHouse/issues/12106). [#12153](https://github.com/ClickHouse/ClickHouse/pull/12153) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed transform of query to send to external DBMS (e.g. MySQL, ODBC) in presense of aliases. This fixes [#12032](https://github.com/ClickHouse/ClickHouse/issues/12032). [#12151](https://github.com/ClickHouse/ClickHouse/pull/12151) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed bad code in redundant ORDER BY optimization. The bug was introduced in [#10067](https://github.com/ClickHouse/ClickHouse/issues/10067). [#12148](https://github.com/ClickHouse/ClickHouse/pull/12148) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed potential overflow in integer division. This fixes [#12119](https://github.com/ClickHouse/ClickHouse/issues/12119). [#12140](https://github.com/ClickHouse/ClickHouse/pull/12140) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed potential infinite loop in `greatCircleDistance`, `geoDistance`. This fixes [#12117](https://github.com/ClickHouse/ClickHouse/issues/12117). [#12137](https://github.com/ClickHouse/ClickHouse/pull/12137) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Normalize "pid" file handling. In previous versions the server may refuse to start if it was killed without proper shutdown and if there is another process that has the same pid as previously runned server. Also pid file may be removed in unsuccessful server startup even if there is another server running. This fixes [#3501](https://github.com/ClickHouse/ClickHouse/issues/3501). [#12133](https://github.com/ClickHouse/ClickHouse/pull/12133) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed bug which leads to incorrect table metadata in ZooKeepeer for ReplicatedVersionedCollapsingMergeTree tables. Fixes [#12093](https://github.com/ClickHouse/ClickHouse/issues/12093). [#12121](https://github.com/ClickHouse/ClickHouse/pull/12121) ([alesapin](https://github.com/alesapin)).
-* Avoid "There is no query" exception for materialized views with joins or with subqueries attached to system logs (system.query_log, metric_log, etc) or to engine=Buffer underlying table. [#12120](https://github.com/ClickHouse/ClickHouse/pull/12120) ([filimonov](https://github.com/filimonov)).
-* Fixed handling dependency of table with ENGINE=Dictionary on dictionary. This fixes [#10994](https://github.com/ClickHouse/ClickHouse/issues/10994). This fixes [#10397](https://github.com/ClickHouse/ClickHouse/issues/10397). [#12116](https://github.com/ClickHouse/ClickHouse/pull/12116) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Format `Parquet` now properly works with `LowCardinality` and `LowCardinality(Nullable)` types. Fixes [#12086](https://github.com/ClickHouse/ClickHouse/issues/12086), [#8406](https://github.com/ClickHouse/ClickHouse/issues/8406). [#12108](https://github.com/ClickHouse/ClickHouse/pull/12108) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed performance for selects with `UNION` caused by wrong limit for the total number of threads. Fixes [#12030](https://github.com/ClickHouse/ClickHouse/issues/12030). [#12103](https://github.com/ClickHouse/ClickHouse/pull/12103) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed segfault with `-StateResample` combinators. [#12092](https://github.com/ClickHouse/ClickHouse/pull/12092) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed empty `result_rows` and `result_bytes` metrics in `system.quey_log` for selects. Fixes [#11595](https://github.com/ClickHouse/ClickHouse/issues/11595). [#12089](https://github.com/ClickHouse/ClickHouse/pull/12089) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed unnecessary limiting the number of threads for selects from `VIEW`. Fixes [#11937](https://github.com/ClickHouse/ClickHouse/issues/11937). [#12085](https://github.com/ClickHouse/ClickHouse/pull/12085) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed SIGSEGV in StorageKafka on DROP TABLE. [#12075](https://github.com/ClickHouse/ClickHouse/pull/12075) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed possible crash while using wrong type for `PREWHERE`. Fixes [#12053](https://github.com/ClickHouse/ClickHouse/issues/12053), [#12060](https://github.com/ClickHouse/ClickHouse/issues/12060). [#12060](https://github.com/ClickHouse/ClickHouse/pull/12060) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed error `Cannot capture column` for higher-order functions with `Tuple(LowCardinality)` argument. Fixes [#9766](https://github.com/ClickHouse/ClickHouse/issues/9766). [#12055](https://github.com/ClickHouse/ClickHouse/pull/12055) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed constraints check if constraint is a constant expression. This fixes [#11360](https://github.com/ClickHouse/ClickHouse/issues/11360). [#12042](https://github.com/ClickHouse/ClickHouse/pull/12042) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed wrong result and potential crash when invoking function `if` with arguments of type `FixedString` with different sizes. This fixes [#11362](https://github.com/ClickHouse/ClickHouse/issues/11362). [#12021](https://github.com/ClickHouse/ClickHouse/pull/12021) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-
-#### Improvement
-
-* Allowed to set `JOIN` kind and type in more standard way: `LEFT SEMI JOIN` instead of `SEMI LEFT JOIN`. For now both are correct. [#12520](https://github.com/ClickHouse/ClickHouse/pull/12520) ([Artem Zuikov](https://github.com/4ertus2)).
-* lifetime_rows/lifetime_bytes for Buffer engine. [#12421](https://github.com/ClickHouse/ClickHouse/pull/12421) ([Azat Khuzhin](https://github.com/azat)).
-* Write the detail exception message to the client instead of 'MySQL server has gone away'. [#12383](https://github.com/ClickHouse/ClickHouse/pull/12383) ([BohuTANG](https://github.com/BohuTANG)).
-* Allows to change a charset which is used for printing grids borders. Available charsets are following: UTF-8, ASCII. Setting `output_format_pretty_grid_charset` enables this feature. [#12372](https://github.com/ClickHouse/ClickHouse/pull/12372) ([Sabyanin Maxim](https://github.com/s-mx)).
-* Supported MySQL 'SELECT DATABASE()' [#9336](https://github.com/ClickHouse/ClickHouse/issues/9336) 2. Add MySQL replacement query integration test. [#12314](https://github.com/ClickHouse/ClickHouse/pull/12314) ([BohuTANG](https://github.com/BohuTANG)).
-* Added `KILL QUERY [connection_id]` for the MySQL client/driver to cancel the long query, issue [#12038](https://github.com/ClickHouse/ClickHouse/issues/12038). [#12152](https://github.com/ClickHouse/ClickHouse/pull/12152) ([BohuTANG](https://github.com/BohuTANG)).
-* Added support for `%g` (two digit ISO year) and `%G` (four digit ISO year) substitutions in `formatDateTime` function. [#12136](https://github.com/ClickHouse/ClickHouse/pull/12136) ([vivarum](https://github.com/vivarum)).
-* Added 'type' column in system.disks. [#12115](https://github.com/ClickHouse/ClickHouse/pull/12115) ([ianton-ru](https://github.com/ianton-ru)).
-* Improved `REVOKE` command: now it requires grant/admin option for only access which will be revoked. For example, to execute `REVOKE ALL ON *.* FROM user1` now it doesn't require to have full access rights granted with grant option. Added command `REVOKE ALL FROM user1` - it revokes all granted roles from `user1`. [#12083](https://github.com/ClickHouse/ClickHouse/pull/12083) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Added replica priority for load_balancing (for manual prioritization of the load balancing). [#11995](https://github.com/ClickHouse/ClickHouse/pull/11995) ([Azat Khuzhin](https://github.com/azat)).
-* Switched paths in S3 metadata to relative which allows to handle S3 blobs more easily. [#11892](https://github.com/ClickHouse/ClickHouse/pull/11892) ([Vladimir Chebotarev](https://github.com/excitoon)).
-
-#### Performance Improvement
-
-* Improved performace of 'ORDER BY' and 'GROUP BY' by prefix of sorting key (enabled with `optimize_aggregation_in_order` setting, disabled by default). [#11696](https://github.com/ClickHouse/ClickHouse/pull/11696) ([Anton Popov](https://github.com/CurtizJ)).
-* Removed injective functions inside `uniq*()` if `set optimize_injective_functions_inside_uniq=1`. [#12337](https://github.com/ClickHouse/ClickHouse/pull/12337) ([Ruslan Kamalov](https://github.com/kamalov-ruslan)).
-* Index not used for IN operator with literals, performance regression introduced around v19.3. This fixes [#10574](https://github.com/ClickHouse/ClickHouse/issues/10574). [#12062](https://github.com/ClickHouse/ClickHouse/pull/12062) ([nvartolomei](https://github.com/nvartolomei)).
-* Implemented single part uploads for DiskS3 (experimental feature). [#12026](https://github.com/ClickHouse/ClickHouse/pull/12026) ([Vladimir Chebotarev](https://github.com/excitoon)).
-
-#### Experimental Feature
-* Added new in-memory format of parts in `MergeTree`-family tables, which stores data in memory. Parts are written on disk at first merge. Part will be created in in-memory format if its size in rows or bytes is below thresholds `min_rows_for_compact_part` and `min_bytes_for_compact_part`. Also optional support of Write-Ahead-Log is available, which is enabled by default and is controlled by setting `in_memory_parts_enable_wal`. [#10697](https://github.com/ClickHouse/ClickHouse/pull/10697) ([Anton Popov](https://github.com/CurtizJ)).
-
-#### Build/Testing/Packaging Improvement
-
-* Implement AST-based query fuzzing mode for clickhouse-client. See [this label](https://github.com/ClickHouse/ClickHouse/issues?q=label%3Afuzz+is%3Aissue) for the list of issues we recently found by fuzzing. Most of them were found by this tool, and a couple by SQLancer and `00746_sql_fuzzy.pl`. [#12111](https://github.com/ClickHouse/ClickHouse/pull/12111) ([Alexander Kuzmenkov](https://github.com/akuzm)).
-* Add new type of tests based on Testflows framework. [#12090](https://github.com/ClickHouse/ClickHouse/pull/12090) ([vzakaznikov](https://github.com/vzakaznikov)).
-* Added S3 HTTPS integration test. [#12412](https://github.com/ClickHouse/ClickHouse/pull/12412) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Log sanitizer trap messages from separate thread. This will prevent possible deadlock under thread sanitizer. [#12313](https://github.com/ClickHouse/ClickHouse/pull/12313) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Now functional and stress tests will be able to run with old version of `clickhouse-test` script. [#12287](https://github.com/ClickHouse/ClickHouse/pull/12287) ([alesapin](https://github.com/alesapin)).
-* Remove strange file creation during build in `orc`. [#12258](https://github.com/ClickHouse/ClickHouse/pull/12258) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Place common docker compose files to integration docker container. [#12168](https://github.com/ClickHouse/ClickHouse/pull/12168) ([Ilya Yatsishin](https://github.com/qoega)).
-* Fix warnings from CodeQL. `CodeQL` is another static analyzer that we will use along with `clang-tidy` and `PVS-Studio` that we use already. [#12138](https://github.com/ClickHouse/ClickHouse/pull/12138) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Minor CMake fixes for UNBUNDLED build. [#12131](https://github.com/ClickHouse/ClickHouse/pull/12131) ([Matwey V. Kornilov](https://github.com/matwey)).
-* Added a showcase of the minimal Docker image without using any Linux distribution. [#12126](https://github.com/ClickHouse/ClickHouse/pull/12126) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Perform an upgrade of system packages in the `clickhouse-server` docker image. [#12124](https://github.com/ClickHouse/ClickHouse/pull/12124) ([Ivan Blinkov](https://github.com/blinkov)).
-* Add `UNBUNDLED` flag to `system.build_options` table. Move skip lists for `clickhouse-test` to clickhouse repo. [#12107](https://github.com/ClickHouse/ClickHouse/pull/12107) ([alesapin](https://github.com/alesapin)).
-* Regular check by [Anchore Container Analysis](https://docs.anchore.com) security analysis tool that looks for [CVE](https://cve.mitre.org/) in `clickhouse-server` Docker image. Also confirms that `Dockerfile` is buildable. Runs daily on `master` and on pull-requests to `Dockerfile`. [#12102](https://github.com/ClickHouse/ClickHouse/pull/12102) ([Ivan Blinkov](https://github.com/blinkov)).
-* Daily check by [GitHub CodeQL](https://securitylab.github.com/tools/codeql) security analysis tool that looks for [CWE](https://cwe.mitre.org/). [#12101](https://github.com/ClickHouse/ClickHouse/pull/12101) ([Ivan Blinkov](https://github.com/blinkov)).
-* Install `ca-certificates` before the first `apt-get update` in Dockerfile. [#12095](https://github.com/ClickHouse/ClickHouse/pull/12095) ([Ivan Blinkov](https://github.com/blinkov)).
-
-## ClickHouse release 20.5
-
-### ClickHouse release v20.5.4.40-stable 2020-08-10
-
-#### Bug Fix
-
-* Fixed wrong index analysis with functions. It could lead to pruning wrong parts, while reading from `MergeTree` tables. Fixes [#13060](https://github.com/ClickHouse/ClickHouse/issues/13060). Fixes [#12406](https://github.com/ClickHouse/ClickHouse/issues/12406). [#13081](https://github.com/ClickHouse/ClickHouse/pull/13081) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed unnecessary limiting for the number of threads for selects from local replica. [#12840](https://github.com/ClickHouse/ClickHouse/pull/12840) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed performance with large tuples, which are interpreted as functions in `IN` section. The case when user write `WHERE x IN tuple(1, 2, ...)` instead of `WHERE x IN (1, 2, ...)` for some obscure reason. [#12700](https://github.com/ClickHouse/ClickHouse/pull/12700) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed memory tracking for input_format_parallel_parsing (by attaching thread to group). [#12672](https://github.com/ClickHouse/ClickHouse/pull/12672) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed bloom filter index with const expression. This fixes [#10572](https://github.com/ClickHouse/ClickHouse/issues/10572). [#12659](https://github.com/ClickHouse/ClickHouse/pull/12659) ([Winter Zhang](https://github.com/zhang2014)).
-* Fixed `SIGSEGV` in `StorageKafka` when broker is unavailable (and not only). [#12658](https://github.com/ClickHouse/ClickHouse/pull/12658) ([Azat Khuzhin](https://github.com/azat)).
-* Added support for function `if` with `Array(UUID)` arguments. This fixes [#11066](https://github.com/ClickHouse/ClickHouse/issues/11066). [#12648](https://github.com/ClickHouse/ClickHouse/pull/12648) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed lack of aliases with function `any`. [#12593](https://github.com/ClickHouse/ClickHouse/pull/12593) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed race condition in external dictionaries with cache layout which can lead server crash. [#12566](https://github.com/ClickHouse/ClickHouse/pull/12566) ([alesapin](https://github.com/alesapin)).
-* Remove data for Distributed tables (blocks from async INSERTs) on DROP TABLE. [#12556](https://github.com/ClickHouse/ClickHouse/pull/12556) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed bug which lead to broken old parts after `ALTER DELETE` query when `enable_mixed_granularity_parts=1`. Fixes [#12536](https://github.com/ClickHouse/ClickHouse/issues/12536). [#12543](https://github.com/ClickHouse/ClickHouse/pull/12543) ([alesapin](https://github.com/alesapin)).
-* Better exception for function `in` with invalid number of arguments. [#12529](https://github.com/ClickHouse/ClickHouse/pull/12529) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed race condition in live view tables which could cause data duplication. [#12519](https://github.com/ClickHouse/ClickHouse/pull/12519) ([vzakaznikov](https://github.com/vzakaznikov)).
-* Fixed performance issue, while reading from compact parts. [#12492](https://github.com/ClickHouse/ClickHouse/pull/12492) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed backwards compatibility in binary format of `AggregateFunction(avg, ...)` values. This fixes [#12342](https://github.com/ClickHouse/ClickHouse/issues/12342). [#12486](https://github.com/ClickHouse/ClickHouse/pull/12486) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed the deadlock if `text_log` is enabled. [#12452](https://github.com/ClickHouse/ClickHouse/pull/12452) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed overflow when very large LIMIT or OFFSET is specified. This fixes [#10470](https://github.com/ClickHouse/ClickHouse/issues/10470). This fixes [#11372](https://github.com/ClickHouse/ClickHouse/issues/11372). [#12427](https://github.com/ClickHouse/ClickHouse/pull/12427) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed possible segfault if StorageMerge. Closes [#12054](https://github.com/ClickHouse/ClickHouse/issues/12054). [#12401](https://github.com/ClickHouse/ClickHouse/pull/12401) ([tavplubix](https://github.com/tavplubix)).
-* Reverts change introduced in [#11079](https://github.com/ClickHouse/ClickHouse/issues/11079) to resolve [#12098](https://github.com/ClickHouse/ClickHouse/issues/12098). [#12397](https://github.com/ClickHouse/ClickHouse/pull/12397) ([Mike](https://github.com/myrrc)).
-* Avoid exception when negative or floating point constant is used in WHERE condition for indexed tables. This fixes [#11905](https://github.com/ClickHouse/ClickHouse/issues/11905). [#12384](https://github.com/ClickHouse/ClickHouse/pull/12384) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Allow to CLEAR column even if there are depending DEFAULT expressions. This fixes [#12333](https://github.com/ClickHouse/ClickHouse/issues/12333). [#12378](https://github.com/ClickHouse/ClickHouse/pull/12378) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed TOTALS/ROLLUP/CUBE for aggregate functions with `-State` and `Nullable` arguments. This fixes [#12163](https://github.com/ClickHouse/ClickHouse/issues/12163). [#12376](https://github.com/ClickHouse/ClickHouse/pull/12376) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed SIGSEGV if there is an message with error in the middle of the batch in `Kafka` Engine. [#12302](https://github.com/ClickHouse/ClickHouse/pull/12302) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed the behaviour when `SummingMergeTree` engine sums up columns from partition key. Added an exception in case of explicit definition of columns to sum which intersects with partition key columns. This fixes [#7867](https://github.com/ClickHouse/ClickHouse/issues/7867). [#12173](https://github.com/ClickHouse/ClickHouse/pull/12173) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fixed transform of query to send to external DBMS (e.g. MySQL, ODBC) in presense of aliases. This fixes [#12032](https://github.com/ClickHouse/ClickHouse/issues/12032). [#12151](https://github.com/ClickHouse/ClickHouse/pull/12151) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed bug which leads to incorrect table metadata in ZooKeepeer for ReplicatedVersionedCollapsingMergeTree tables. Fixes [#12093](https://github.com/ClickHouse/ClickHouse/issues/12093). [#12121](https://github.com/ClickHouse/ClickHouse/pull/12121) ([alesapin](https://github.com/alesapin)).
-* Fixed unnecessary limiting the number of threads for selects from `VIEW`. Fixes [#11937](https://github.com/ClickHouse/ClickHouse/issues/11937). [#12085](https://github.com/ClickHouse/ClickHouse/pull/12085) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed crash in JOIN with LowCardinality type with `join_algorithm=partial_merge`. [#12035](https://github.com/ClickHouse/ClickHouse/pull/12035) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fixed wrong result for `if()` with NULLs in condition. [#11807](https://github.com/ClickHouse/ClickHouse/pull/11807) ([Artem Zuikov](https://github.com/4ertus2)).
-
-#### Performance Improvement
-
-* Index not used for IN operator with literals, performance regression introduced around v19.3. This fixes [#10574](https://github.com/ClickHouse/ClickHouse/issues/10574). [#12062](https://github.com/ClickHouse/ClickHouse/pull/12062) ([nvartolomei](https://github.com/nvartolomei)).
-
-#### Build/Testing/Packaging Improvement
-
-* Install `ca-certificates` before the first `apt-get update` in Dockerfile. [#12095](https://github.com/ClickHouse/ClickHouse/pull/12095) ([Ivan Blinkov](https://github.com/blinkov)).
-
-
-### ClickHouse release v20.5.2.7-stable 2020-07-02
-
-#### Backward Incompatible Change
-
-* Return non-Nullable result from COUNT(DISTINCT), and `uniq` aggregate functions family. If all passed values are NULL, return zero instead. This improves SQL compatibility. [#11661](https://github.com/ClickHouse/ClickHouse/pull/11661) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Added a check for the case when user-level setting is specified in a wrong place. User-level settings should be specified in `users.xml` inside `<profile>` section for specific user profile (or in `<default>` for default settings). The server won't start with exception message in log. This fixes [#9051](https://github.com/ClickHouse/ClickHouse/issues/9051). If you want to skip the check, you can either move settings to the appropriate place or add `<skip_check_for_incorrect_settings>1</skip_check_for_incorrect_settings>` to config.xml. [#11449](https://github.com/ClickHouse/ClickHouse/pull/11449) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* The setting `input_format_with_names_use_header` is enabled by default. It will affect parsing of input formats `-WithNames` and `-WithNamesAndTypes`. [#10937](https://github.com/ClickHouse/ClickHouse/pull/10937) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Remove `experimental_use_processors` setting. It is enabled by default. [#10924](https://github.com/ClickHouse/ClickHouse/pull/10924) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Update `zstd` to 1.4.4. It has some minor improvements in performance and compression ratio. If you run replicas with different versions of ClickHouse you may see reasonable error messages `Data after merge is not byte-identical to data on another replicas.` with explanation. These messages are Ok and you should not worry. This change is backward compatible but we list it here in changelog in case you will wonder about these messages. [#10663](https://github.com/ClickHouse/ClickHouse/pull/10663) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Added a check for meaningless codecs and a setting `allow_suspicious_codecs` to control this check. This closes [#4966](https://github.com/ClickHouse/ClickHouse/issues/4966). [#10645](https://github.com/ClickHouse/ClickHouse/pull/10645) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Several Kafka setting changes their defaults. See [#11388](https://github.com/ClickHouse/ClickHouse/pull/11388).
-* When upgrading from versions older than 20.5, if rolling update is performed and cluster contains both versions 20.5 or greater and less than 20.5, if ClickHouse nodes with old versions are restarted and old version has been started up in presence of newer versions, it may lead to `Part ... intersects previous part` errors. To prevent this error, first install newer clickhouse-server packages on all cluster nodes and then do restarts (so, when clickhouse-server is restarted, it will start up with the new version).
-
-#### New Feature
-
-* `TTL DELETE WHERE` and `TTL GROUP BY` for automatic data coarsening and rollup in tables. [#10537](https://github.com/ClickHouse/ClickHouse/pull/10537) ([expl0si0nn](https://github.com/expl0si0nn)).
-* Implementation of PostgreSQL wire protocol. [#10242](https://github.com/ClickHouse/ClickHouse/pull/10242) ([Movses](https://github.com/MovElb)).
-* Added system tables for users, roles, grants, settings profiles, quotas, row policies; added commands SHOW USER, SHOW [CURRENT|ENABLED] ROLES, SHOW SETTINGS PROFILES. [#10387](https://github.com/ClickHouse/ClickHouse/pull/10387) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Support writes in ODBC Table function [#10554](https://github.com/ClickHouse/ClickHouse/pull/10554) ([ageraab](https://github.com/ageraab)). [#10901](https://github.com/ClickHouse/ClickHouse/pull/10901) ([tavplubix](https://github.com/tavplubix)).
-* Add query performance metrics based on Linux `perf_events` (these metrics are calculated with hardware CPU counters and OS counters). It is optional and requires `CAP_SYS_ADMIN` to be set on clickhouse binary. [#9545](https://github.com/ClickHouse/ClickHouse/pull/9545) [Andrey Skobtsov](https://github.com/And42). [#11226](https://github.com/ClickHouse/ClickHouse/pull/11226) ([Alexander Kuzmenkov](https://github.com/akuzm)).
-* Now support `NULL` and `NOT NULL` modifiers for data types in `CREATE` query. [#11057](https://github.com/ClickHouse/ClickHouse/pull/11057) ([Павел Потемкин](https://github.com/Potya)).
-* Add `ArrowStream` input and output format. [#11088](https://github.com/ClickHouse/ClickHouse/pull/11088) ([hcz](https://github.com/hczhcz)).
-* Support Cassandra as external dictionary source. [#4978](https://github.com/ClickHouse/ClickHouse/pull/4978) ([favstovol](https://github.com/favstovol)).
-* Added a new layout `direct` which loads all the data directly from the source for each query, without storing or caching data. [#10622](https://github.com/ClickHouse/ClickHouse/pull/10622) ([Artem Streltsov](https://github.com/kekekekule)).
-* Added new `complex_key_direct` layout to dictionaries, that does not store anything locally during query execution. [#10850](https://github.com/ClickHouse/ClickHouse/pull/10850) ([Artem Streltsov](https://github.com/kekekekule)).
-* Added support for MySQL style global variables syntax (stub). This is needed for compatibility of MySQL protocol. [#11832](https://github.com/ClickHouse/ClickHouse/pull/11832) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Added syntax highligting to `clickhouse-client` using `replxx`. [#11422](https://github.com/ClickHouse/ClickHouse/pull/11422) ([Tagir Kuskarov](https://github.com/kuskarov)).
-* `minMap` and `maxMap` functions were added. [#11603](https://github.com/ClickHouse/ClickHouse/pull/11603) ([Ildus Kurbangaliev](https://github.com/ildus)).
-* Add the `system.asynchronous_metric_log` table that logs historical metrics from `system.asynchronous_metrics`. [#11588](https://github.com/ClickHouse/ClickHouse/pull/11588) ([Alexander Kuzmenkov](https://github.com/akuzm)).
-* Add functions `extractAllGroupsHorizontal(haystack, re)` and `extractAllGroupsVertical(haystack, re)`. [#11554](https://github.com/ClickHouse/ClickHouse/pull/11554) ([Vasily Nemkov](https://github.com/Enmk)).
-* Add SHOW CLUSTER(S) queries. [#11467](https://github.com/ClickHouse/ClickHouse/pull/11467) ([hexiaoting](https://github.com/hexiaoting)).
-* Add `netloc` function for extracting network location, similar to `urlparse(url)`, `netloc` in python. [#11356](https://github.com/ClickHouse/ClickHouse/pull/11356) ([Guillaume Tassery](https://github.com/YiuRULE)).
-* Add 2 more virtual columns for engine=Kafka to access message headers. [#11283](https://github.com/ClickHouse/ClickHouse/pull/11283) ([filimonov](https://github.com/filimonov)).
-* Add `_timestamp_ms` virtual column for Kafka engine (type is `Nullable(DateTime64(3))`). [#11260](https://github.com/ClickHouse/ClickHouse/pull/11260) ([filimonov](https://github.com/filimonov)).
-* Add function `randomFixedString`. [#10866](https://github.com/ClickHouse/ClickHouse/pull/10866) ([Andrei Nekrashevich](https://github.com/xolm)).
-* Add function `fuzzBits` that randomly flips bits in a string with given probability. [#11237](https://github.com/ClickHouse/ClickHouse/pull/11237) ([Andrei Nekrashevich](https://github.com/xolm)).
-* Allow comparison of numbers with constant string in comparison operators, IN and VALUES sections. [#11647](https://github.com/ClickHouse/ClickHouse/pull/11647) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add `round_robin` load_balancing mode. [#11645](https://github.com/ClickHouse/ClickHouse/pull/11645) ([Azat Khuzhin](https://github.com/azat)).
-* Add `cast_keep_nullable` setting. If set `CAST(something_nullable AS Type)` return `Nullable(Type)`. [#11733](https://github.com/ClickHouse/ClickHouse/pull/11733) ([Artem Zuikov](https://github.com/4ertus2)).
-* Added column `position` to `system.columns` table and `column_position` to `system.parts_columns` table. It contains ordinal position of a column in a table starting with 1. This closes [#7744](https://github.com/ClickHouse/ClickHouse/issues/7744). [#11655](https://github.com/ClickHouse/ClickHouse/pull/11655) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* ON CLUSTER support for SYSTEM {FLUSH DISTRIBUTED,STOP/START DISTRIBUTED SEND}. [#11415](https://github.com/ClickHouse/ClickHouse/pull/11415) ([Azat Khuzhin](https://github.com/azat)).
-* Add system.distribution_queue table. [#11394](https://github.com/ClickHouse/ClickHouse/pull/11394) ([Azat Khuzhin](https://github.com/azat)).
-* Support for all format settings in Kafka, expose some setting on table level, adjust the defaults for better performance. [#11388](https://github.com/ClickHouse/ClickHouse/pull/11388) ([filimonov](https://github.com/filimonov)).
-* Add `port` function (to extract port from URL). [#11120](https://github.com/ClickHouse/ClickHouse/pull/11120) ([Azat Khuzhin](https://github.com/azat)).
-* Now `dictGet*` functions accept table names. [#11050](https://github.com/ClickHouse/ClickHouse/pull/11050) ([Vitaly Baranov](https://github.com/vitlibar)).
-* The `clickhouse-format` tool is now able to format multiple queries when the `-n` argument is used. [#10852](https://github.com/ClickHouse/ClickHouse/pull/10852) ([Darío](https://github.com/dgrr)).
-* Possibility to configure proxy-resolver for DiskS3. [#10744](https://github.com/ClickHouse/ClickHouse/pull/10744) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Make `pointInPolygon` work with non-constant polygon. PointInPolygon now can take Array(Array(Tuple(..., ...))) as second argument, array of polygon and holes. [#10623](https://github.com/ClickHouse/ClickHouse/pull/10623) ([Alexey Ilyukhov](https://github.com/livace)) [#11421](https://github.com/ClickHouse/ClickHouse/pull/11421) ([Alexey Ilyukhov](https://github.com/livace)).
-* Added `move_ttl_info` to `system.parts` in order to provide introspection of move TTL functionality. [#10591](https://github.com/ClickHouse/ClickHouse/pull/10591) ([Vladimir Chebotarev](https://github.com/excitoon)).
-* Possibility to work with S3 through proxies. [#10576](https://github.com/ClickHouse/ClickHouse/pull/10576) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Add `NCHAR` and `NVARCHAR` synonims for data types. [#11025](https://github.com/ClickHouse/ClickHouse/pull/11025) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Resolved [#7224](https://github.com/ClickHouse/ClickHouse/issues/7224): added `FailedQuery`, `FailedSelectQuery` and `FailedInsertQuery` metrics to `system.events` table. [#11151](https://github.com/ClickHouse/ClickHouse/pull/11151) ([Nikita Orlov](https://github.com/naorlov)).
-* Add more `jemalloc` statistics to `system.asynchronous_metrics`, and ensure that we see up-to-date values for them. [#11748](https://github.com/ClickHouse/ClickHouse/pull/11748) ([Alexander Kuzmenkov](https://github.com/akuzm)).
-* Allow to specify default S3 credentials and custom auth headers. [#11134](https://github.com/ClickHouse/ClickHouse/pull/11134) ([Grigory Pervakov](https://github.com/GrigoryPervakov)).
-* Added new functions to import/export DateTime64 as Int64 with various precision: `to-/fromUnixTimestamp64Milli/-Micro/-Nano`. [#10923](https://github.com/ClickHouse/ClickHouse/pull/10923) ([Vasily Nemkov](https://github.com/Enmk)).
-* Allow specifying `mongodb://` URI for MongoDB dictionaries. [#10915](https://github.com/ClickHouse/ClickHouse/pull/10915) ([Alexander Kuzmenkov](https://github.com/akuzm)).
-* OFFSET keyword can now be used without an affiliated LIMIT clause. [#10802](https://github.com/ClickHouse/ClickHouse/pull/10802) ([Guillaume Tassery](https://github.com/YiuRULE)).
-* Added `system.licenses` table. This table contains licenses of third-party libraries that are located in `contrib` directory. This closes [#2890](https://github.com/ClickHouse/ClickHouse/issues/2890). [#10795](https://github.com/ClickHouse/ClickHouse/pull/10795) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* New function function toStartOfSecond(DateTime64) -> DateTime64 that nullifies sub-second part of DateTime64 value. [#10722](https://github.com/ClickHouse/ClickHouse/pull/10722) ([Vasily Nemkov](https://github.com/Enmk)).
-* Add new input format `JSONAsString` that accepts a sequence of JSON objects separated by newlines, spaces and/or commas. [#10607](https://github.com/ClickHouse/ClickHouse/pull/10607) ([Kruglov Pavel](https://github.com/Avogar)).
-* Allowed to profile memory with finer granularity steps than 4 MiB. Added sampling memory profiler to capture random allocations/deallocations. [#10598](https://github.com/ClickHouse/ClickHouse/pull/10598) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* `SimpleAggregateFunction` now also supports `sumMap`. [#10000](https://github.com/ClickHouse/ClickHouse/pull/10000) ([Ildus Kurbangaliev](https://github.com/ildus)).
-* Support `ALTER RENAME COLUMN` for the distributed table engine. Continuation of [#10727](https://github.com/ClickHouse/ClickHouse/issues/10727). Fixes [#10747](https://github.com/ClickHouse/ClickHouse/issues/10747). [#10887](https://github.com/ClickHouse/ClickHouse/pull/10887) ([alesapin](https://github.com/alesapin)).
-
-#### Bug Fix
-
-* Fix UBSan report in Decimal parse. This fixes [#7540](https://github.com/ClickHouse/ClickHouse/issues/7540). [#10512](https://github.com/ClickHouse/ClickHouse/pull/10512) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix potential floating point exception when parsing DateTime64. This fixes [#11374](https://github.com/ClickHouse/ClickHouse/issues/11374). [#11875](https://github.com/ClickHouse/ClickHouse/pull/11875) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix rare crash caused by using `Nullable` column in prewhere condition. [#11895](https://github.com/ClickHouse/ClickHouse/pull/11895) [#11608](https://github.com/ClickHouse/ClickHouse/issues/11608) [#11869](https://github.com/ClickHouse/ClickHouse/pull/11869) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Don't allow arrayJoin inside higher order functions. It was leading to broken protocol synchronization. This closes [#3933](https://github.com/ClickHouse/ClickHouse/issues/3933). [#11846](https://github.com/ClickHouse/ClickHouse/pull/11846) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix wrong result of comparison of FixedString with constant String. This fixes [#11393](https://github.com/ClickHouse/ClickHouse/issues/11393). This bug appeared in version 20.4. [#11828](https://github.com/ClickHouse/ClickHouse/pull/11828) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix wrong result for `if` with NULLs in condition. [#11807](https://github.com/ClickHouse/ClickHouse/pull/11807) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix using too many threads for queries. [#11788](https://github.com/ClickHouse/ClickHouse/pull/11788) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed `Scalar doesn't exist` exception when using `WITH <scalar subquery> ...` in `SELECT ... FROM merge_tree_table ...` [#11621](https://github.com/ClickHouse/ClickHouse/issues/11621). [#11767](https://github.com/ClickHouse/ClickHouse/pull/11767) ([Amos Bird](https://github.com/amosbird)).
-* Fix unexpected behaviour of queries like `SELECT *, xyz.*` which were success while an error expected. [#11753](https://github.com/ClickHouse/ClickHouse/pull/11753) ([hexiaoting](https://github.com/hexiaoting)).
-* Now replicated fetches will be cancelled during metadata alter. [#11744](https://github.com/ClickHouse/ClickHouse/pull/11744) ([alesapin](https://github.com/alesapin)).
-* Parse metadata stored in zookeeper before checking for equality. [#11739](https://github.com/ClickHouse/ClickHouse/pull/11739) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed LOGICAL_ERROR caused by wrong type deduction of complex literals in Values input format. [#11732](https://github.com/ClickHouse/ClickHouse/pull/11732) ([tavplubix](https://github.com/tavplubix)).
-* Fix `ORDER BY ... WITH FILL` over const columns. [#11697](https://github.com/ClickHouse/ClickHouse/pull/11697) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix very rare race condition in SYSTEM SYNC REPLICA. If the replicated table is created and at the same time from the separate connection another client is issuing `SYSTEM SYNC REPLICA` command on that table (this is unlikely, because another client should be aware that the table is created), it's possible to get nullptr dereference. [#11691](https://github.com/ClickHouse/ClickHouse/pull/11691) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Pass proper timeouts when communicating with XDBC bridge. Recently timeouts were not respected when checking bridge liveness and receiving meta info. [#11690](https://github.com/ClickHouse/ClickHouse/pull/11690) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix `LIMIT n WITH TIES` usage together with `ORDER BY` statement, which contains aliases. [#11689](https://github.com/ClickHouse/ClickHouse/pull/11689) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix possible `Pipeline stuck` for selects with parallel `FINAL`. Fixes [#11636](https://github.com/ClickHouse/ClickHouse/issues/11636). [#11682](https://github.com/ClickHouse/ClickHouse/pull/11682) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix error which leads to an incorrect state of `system.mutations`. It may show that whole mutation is already done but the server still has `MUTATE_PART` tasks in the replication queue and tries to execute them. This fixes [#11611](https://github.com/ClickHouse/ClickHouse/issues/11611). [#11681](https://github.com/ClickHouse/ClickHouse/pull/11681) ([alesapin](https://github.com/alesapin)).
-* Fix syntax hilite in CREATE USER query. [#11664](https://github.com/ClickHouse/ClickHouse/pull/11664) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add support for regular expressions with case-insensitive flags. This fixes [#11101](https://github.com/ClickHouse/ClickHouse/issues/11101) and fixes [#11506](https://github.com/ClickHouse/ClickHouse/issues/11506). [#11649](https://github.com/ClickHouse/ClickHouse/pull/11649) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Remove trivial count query optimization if row-level security is set. In previous versions the user get total count of records in a table instead filtered. This fixes [#11352](https://github.com/ClickHouse/ClickHouse/issues/11352). [#11644](https://github.com/ClickHouse/ClickHouse/pull/11644) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix bloom filters for String (data skipping indices). [#11638](https://github.com/ClickHouse/ClickHouse/pull/11638) ([Azat Khuzhin](https://github.com/azat)).
-* Without `-q` option the database does not get created at startup. [#11604](https://github.com/ClickHouse/ClickHouse/pull/11604) ([giordyb](https://github.com/giordyb)).
-* Fix error `Block structure mismatch` for queries with sampling reading from `Buffer` table. [#11602](https://github.com/ClickHouse/ClickHouse/pull/11602) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix wrong exit code of the clickhouse-client, when `exception.code() % 256 == 0`. [#11601](https://github.com/ClickHouse/ClickHouse/pull/11601) ([filimonov](https://github.com/filimonov)).
-* Fix race conditions in CREATE/DROP of different replicas of ReplicatedMergeTree. Continue to work if the table was not removed completely from ZooKeeper or not created successfully. This fixes [#11432](https://github.com/ClickHouse/ClickHouse/issues/11432). [#11592](https://github.com/ClickHouse/ClickHouse/pull/11592) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix trivial error in log message about "Mark cache size was lowered" at server startup. This closes [#11399](https://github.com/ClickHouse/ClickHouse/issues/11399). [#11589](https://github.com/ClickHouse/ClickHouse/pull/11589) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix error `Size of offsets doesn't match size of column` for queries with `PREWHERE column in (subquery)` and `ARRAY JOIN`. [#11580](https://github.com/ClickHouse/ClickHouse/pull/11580) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed rare segfault in `SHOW CREATE TABLE` Fixes [#11490](https://github.com/ClickHouse/ClickHouse/issues/11490). [#11579](https://github.com/ClickHouse/ClickHouse/pull/11579) ([tavplubix](https://github.com/tavplubix)).
-* All queries in HTTP session have had the same query_id. It is fixed. [#11578](https://github.com/ClickHouse/ClickHouse/pull/11578) ([tavplubix](https://github.com/tavplubix)).
-* Now clickhouse-server docker container will prefer IPv6 checking server aliveness. [#11550](https://github.com/ClickHouse/ClickHouse/pull/11550) ([Ivan Starkov](https://github.com/istarkov)).
-* Fix the error `Data compressed with different methods` that can happen if `min_bytes_to_use_direct_io` is enabled and PREWHERE is active and using SAMPLE or high number of threads. This fixes [#11539](https://github.com/ClickHouse/ClickHouse/issues/11539). [#11540](https://github.com/ClickHouse/ClickHouse/pull/11540) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix shard_num/replica_num for `<node>` (breaks use_compact_format_in_distributed_parts_names). [#11528](https://github.com/ClickHouse/ClickHouse/pull/11528) ([Azat Khuzhin](https://github.com/azat)).
-* Fix async INSERT into Distributed for prefer_localhost_replica=0 and w/o internal_replication. [#11527](https://github.com/ClickHouse/ClickHouse/pull/11527) ([Azat Khuzhin](https://github.com/azat)).
-* Fix memory leak when exception is thrown in the middle of aggregation with `-State` functions. This fixes [#8995](https://github.com/ClickHouse/ClickHouse/issues/8995). [#11496](https://github.com/ClickHouse/ClickHouse/pull/11496) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix `Pipeline stuck` exception for `INSERT SELECT FINAL` where `SELECT` (`max_threads`>1) has multiple streams but `INSERT` has only one (`max_insert_threads`==0). [#11455](https://github.com/ClickHouse/ClickHouse/pull/11455) ([Azat Khuzhin](https://github.com/azat)).
-* Fix wrong result in queries like `select count() from t, u`. [#11454](https://github.com/ClickHouse/ClickHouse/pull/11454) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix return compressed size for codecs. [#11448](https://github.com/ClickHouse/ClickHouse/pull/11448) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix server crash when a column has compression codec with non-literal arguments. Fixes [#11365](https://github.com/ClickHouse/ClickHouse/issues/11365). [#11431](https://github.com/ClickHouse/ClickHouse/pull/11431) ([alesapin](https://github.com/alesapin)).
-* Fix potential uninitialized memory read in MergeTree shutdown if table was not created successfully. [#11420](https://github.com/ClickHouse/ClickHouse/pull/11420) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix crash in JOIN over `LowCarinality(T)` and `Nullable(T)`. [#11380](https://github.com/ClickHouse/ClickHouse/issues/11380). [#11414](https://github.com/ClickHouse/ClickHouse/pull/11414) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix error code for wrong `USING` key. [#11373](https://github.com/ClickHouse/ClickHouse/issues/11373). [#11404](https://github.com/ClickHouse/ClickHouse/pull/11404) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fixed `geohashesInBox` with arguments outside of latitude/longitude range. [#11403](https://github.com/ClickHouse/ClickHouse/pull/11403) ([Vasily Nemkov](https://github.com/Enmk)).
-* Better errors for `joinGet()` functions. [#11389](https://github.com/ClickHouse/ClickHouse/pull/11389) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix possible `Pipeline stuck` error for queries with external sort and limit. Fixes [#11359](https://github.com/ClickHouse/ClickHouse/issues/11359). [#11366](https://github.com/ClickHouse/ClickHouse/pull/11366) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Remove redundant lock during parts send in ReplicatedMergeTree. [#11354](https://github.com/ClickHouse/ClickHouse/pull/11354) ([alesapin](https://github.com/alesapin)).
-* Fix support for `\G` (vertical output) in clickhouse-client in multiline mode. This closes [#9933](https://github.com/ClickHouse/ClickHouse/issues/9933). [#11350](https://github.com/ClickHouse/ClickHouse/pull/11350) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix potential segfault when using `Lazy` database. [#11348](https://github.com/ClickHouse/ClickHouse/pull/11348) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix crash in direct selects from `Join` table engine (without JOIN) and wrong nullability. [#11340](https://github.com/ClickHouse/ClickHouse/pull/11340) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix crash in `quantilesExactWeightedArray`. [#11337](https://github.com/ClickHouse/ClickHouse/pull/11337) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Now merges stopped before change metadata in `ALTER` queries. [#11335](https://github.com/ClickHouse/ClickHouse/pull/11335) ([alesapin](https://github.com/alesapin)).
-* Make writing to `MATERIALIZED VIEW` with setting `parallel_view_processing = 1` parallel again. Fixes [#10241](https://github.com/ClickHouse/ClickHouse/issues/10241). [#11330](https://github.com/ClickHouse/ClickHouse/pull/11330) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix `visitParamExtractRaw` when extracted JSON has strings with unbalanced { or [. [#11318](https://github.com/ClickHouse/ClickHouse/pull/11318) ([Ewout](https://github.com/devwout)).
-* Fix very rare race condition in ThreadPool. [#11314](https://github.com/ClickHouse/ClickHouse/pull/11314) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix insignificant data race in `clickhouse-copier`. Found by integration tests. [#11313](https://github.com/ClickHouse/ClickHouse/pull/11313) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix potential uninitialized memory in conversion. Example: `SELECT toIntervalSecond(now64())`. [#11311](https://github.com/ClickHouse/ClickHouse/pull/11311) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix the issue when index analysis cannot work if a table has Array column in primary key and if a query is filtering by this column with `empty` or `notEmpty` functions. This fixes [#11286](https://github.com/ClickHouse/ClickHouse/issues/11286). [#11303](https://github.com/ClickHouse/ClickHouse/pull/11303) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix bug when query speed estimation can be incorrect and the limit of `min_execution_speed` may not work or work incorrectly if the query is throttled by `max_network_bandwidth`, `max_execution_speed` or `priority` settings. Change the default value of `timeout_before_checking_execution_speed` to non-zero, because otherwise the settings `min_execution_speed` and `max_execution_speed` have no effect. This fixes [#11297](https://github.com/ClickHouse/ClickHouse/issues/11297). This fixes [#5732](https://github.com/ClickHouse/ClickHouse/issues/5732). This fixes [#6228](https://github.com/ClickHouse/ClickHouse/issues/6228). Usability improvement: avoid concatenation of exception message with progress bar in `clickhouse-client`. [#11296](https://github.com/ClickHouse/ClickHouse/pull/11296) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix crash when `SET DEFAULT ROLE` is called with wrong arguments. This fixes [#10586](https://github.com/ClickHouse/ClickHouse/issues/10586). [#11278](https://github.com/ClickHouse/ClickHouse/pull/11278) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix crash while reading malformed data in `Protobuf` format. This fixes [#5957](https://github.com/ClickHouse/ClickHouse/issues/5957), fixes [#11203](https://github.com/ClickHouse/ClickHouse/issues/11203). [#11258](https://github.com/ClickHouse/ClickHouse/pull/11258) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fixed a bug when `cache` dictionary could return default value instead of normal (when there are only expired keys). This affects only string fields. [#11233](https://github.com/ClickHouse/ClickHouse/pull/11233) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fix error `Block structure mismatch in QueryPipeline` while reading from `VIEW` with constants in inner query. Fixes [#11181](https://github.com/ClickHouse/ClickHouse/issues/11181). [#11205](https://github.com/ClickHouse/ClickHouse/pull/11205) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix possible exception `Invalid status for associated output`. [#11200](https://github.com/ClickHouse/ClickHouse/pull/11200) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Now `primary.idx` will be checked if it's defined in `CREATE` query. [#11199](https://github.com/ClickHouse/ClickHouse/pull/11199) ([alesapin](https://github.com/alesapin)).
-* Fix possible error `Cannot capture column` for higher-order functions with `Array(Array(LowCardinality))` captured argument. [#11185](https://github.com/ClickHouse/ClickHouse/pull/11185) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed `S3` globbing which could fail in case of more than 1000 keys and some backends. [#11179](https://github.com/ClickHouse/ClickHouse/pull/11179) ([Vladimir Chebotarev](https://github.com/excitoon)).
-* If data skipping index is dependent on columns that are going to be modified during background merge (for SummingMergeTree, AggregatingMergeTree as well as for TTL GROUP BY), it was calculated incorrectly. This issue is fixed by moving index calculation after merge so the index is calculated on merged data. [#11162](https://github.com/ClickHouse/ClickHouse/pull/11162) ([Azat Khuzhin](https://github.com/azat)).
-* Fix for the hang which was happening sometimes during DROP of table engine=Kafka (or during server restarts). [#11145](https://github.com/ClickHouse/ClickHouse/pull/11145) ([filimonov](https://github.com/filimonov)).
-* Fix excessive reserving of threads for simple queries (optimization for reducing the number of threads, which was partly broken after changes in pipeline). [#11114](https://github.com/ClickHouse/ClickHouse/pull/11114) ([Azat Khuzhin](https://github.com/azat)).
-* Remove logging from mutation finalization task if nothing was finalized. [#11109](https://github.com/ClickHouse/ClickHouse/pull/11109) ([alesapin](https://github.com/alesapin)).
-* Fixed deadlock during server startup after update with changes in structure of system log tables. [#11106](https://github.com/ClickHouse/ClickHouse/pull/11106) ([alesapin](https://github.com/alesapin)).
-* Fixed memory leak in registerDiskS3. [#11074](https://github.com/ClickHouse/ClickHouse/pull/11074) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Fix error `No such name in Block::erase()` when JOIN appears with PREWHERE or `optimize_move_to_prewhere` makes PREWHERE from WHERE. [#11051](https://github.com/ClickHouse/ClickHouse/pull/11051) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fixes the potential missed data during termination of Kafka engine table. [#11048](https://github.com/ClickHouse/ClickHouse/pull/11048) ([filimonov](https://github.com/filimonov)).
-* Fixed parseDateTime64BestEffort argument resolution bugs. [#10925](https://github.com/ClickHouse/ClickHouse/issues/10925). [#11038](https://github.com/ClickHouse/ClickHouse/pull/11038) ([Vasily Nemkov](https://github.com/Enmk)).
-* Now it's possible to `ADD/DROP` and `RENAME` the same one column in a single `ALTER` query. Exception message for simultaneous `MODIFY` and `RENAME` became more clear. Partially fixes [#10669](https://github.com/ClickHouse/ClickHouse/issues/10669). [#11037](https://github.com/ClickHouse/ClickHouse/pull/11037) ([alesapin](https://github.com/alesapin)).
-* Fixed parsing of S3 URLs. [#11036](https://github.com/ClickHouse/ClickHouse/pull/11036) ([Vladimir Chebotarev](https://github.com/excitoon)).
-* Fix memory tracking for two-level `GROUP BY` when there is a `LIMIT`. [#11022](https://github.com/ClickHouse/ClickHouse/pull/11022) ([Azat Khuzhin](https://github.com/azat)).
-* Fix very rare potential use-after-free error in MergeTree if table was not created successfully. [#10986](https://github.com/ClickHouse/ClickHouse/pull/10986) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix metadata (relative path for rename) and data (relative path for symlink) handling for Atomic database. [#10980](https://github.com/ClickHouse/ClickHouse/pull/10980) ([Azat Khuzhin](https://github.com/azat)).
-* Fix server crash on concurrent `ALTER` and `DROP DATABASE` queries with `Atomic` database engine. [#10968](https://github.com/ClickHouse/ClickHouse/pull/10968) ([tavplubix](https://github.com/tavplubix)).
-* Fix incorrect raw data size in method getRawData(). [#10964](https://github.com/ClickHouse/ClickHouse/pull/10964) ([Igr](https://github.com/ObjatieGroba)).
-* Fix incompatibility of two-level aggregation between versions 20.1 and earlier. This incompatibility happens when different versions of ClickHouse are used on initiator node and remote nodes and the size of GROUP BY result is large and aggregation is performed by a single String field. It leads to several unmerged rows for a single key in result. [#10952](https://github.com/ClickHouse/ClickHouse/pull/10952) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Avoid sending partially written files by the DistributedBlockOutputStream. [#10940](https://github.com/ClickHouse/ClickHouse/pull/10940) ([Azat Khuzhin](https://github.com/azat)).
-* Fix crash in `SELECT count(notNullIn(NULL, []))`. [#10920](https://github.com/ClickHouse/ClickHouse/pull/10920) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix for the hang which was happening sometimes during DROP of table engine=Kafka (or during server restarts). [#10910](https://github.com/ClickHouse/ClickHouse/pull/10910) ([filimonov](https://github.com/filimonov)).
-* Now it's possible to execute multiple `ALTER RENAME` like `a TO b, c TO a`. [#10895](https://github.com/ClickHouse/ClickHouse/pull/10895) ([alesapin](https://github.com/alesapin)).
-* Fix possible race which could happen when you get result from aggregate function state from multiple thread for the same column. The only way (which I found) it can happen is when you use `finalizeAggregation` function while reading from table with `Memory` engine which stores `AggregateFunction` state for `quanite*` function. [#10890](https://github.com/ClickHouse/ClickHouse/pull/10890) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix backward compatibility with tuples in Distributed tables. [#10889](https://github.com/ClickHouse/ClickHouse/pull/10889) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix SIGSEGV in StringHashTable (if such key does not exist). [#10870](https://github.com/ClickHouse/ClickHouse/pull/10870) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed `WATCH` hangs after `LiveView` table was dropped from database with `Atomic` engine. [#10859](https://github.com/ClickHouse/ClickHouse/pull/10859) ([tavplubix](https://github.com/tavplubix)).
-* Fixed bug in `ReplicatedMergeTree` which might cause some `ALTER` on `OPTIMIZE` query to hang waiting for some replica after it become inactive. [#10849](https://github.com/ClickHouse/ClickHouse/pull/10849) ([tavplubix](https://github.com/tavplubix)).
-* Now constraints are updated if the column participating in `CONSTRAINT` expression was renamed. Fixes [#10844](https://github.com/ClickHouse/ClickHouse/issues/10844). [#10847](https://github.com/ClickHouse/ClickHouse/pull/10847) ([alesapin](https://github.com/alesapin)).
-* Fix potential read of uninitialized memory in cache dictionary. [#10834](https://github.com/ClickHouse/ClickHouse/pull/10834) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix columns order after Block::sortColumns() (also add a test that shows that it affects some real use case - Buffer engine). [#10826](https://github.com/ClickHouse/ClickHouse/pull/10826) ([Azat Khuzhin](https://github.com/azat)).
-* Fix the issue with ODBC bridge when no quoting of identifiers is requested. This fixes [#7984](https://github.com/ClickHouse/ClickHouse/issues/7984). [#10821](https://github.com/ClickHouse/ClickHouse/pull/10821) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix UBSan and MSan report in DateLUT. [#10798](https://github.com/ClickHouse/ClickHouse/pull/10798) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Make use of `src_type` for correct type conversion in key conditions. Fixes [#6287](https://github.com/ClickHouse/ClickHouse/issues/6287). [#10791](https://github.com/ClickHouse/ClickHouse/pull/10791) ([Andrew Onyshchuk](https://github.com/oandrew)).
-* Get rid of old libunwind patches. https://github.com/ClickHouse-Extras/libunwind/commit/500aa227911bd185a94bfc071d68f4d3b03cb3b1#r39048012 This allows to disable `-fno-omit-frame-pointer` in `clang` builds that improves performance at least by 1% in average. [#10761](https://github.com/ClickHouse/ClickHouse/pull/10761) ([Amos Bird](https://github.com/amosbird)).
-* Fix avgWeighted when using floating-point weight over multiple shards. [#10758](https://github.com/ClickHouse/ClickHouse/pull/10758) ([Baudouin Giard](https://github.com/bgiard)).
-* Fix `parallel_view_processing` behavior. Now all insertions into `MATERIALIZED VIEW` without exception should be finished if exception happened. Fixes [#10241](https://github.com/ClickHouse/ClickHouse/issues/10241). [#10757](https://github.com/ClickHouse/ClickHouse/pull/10757) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix combinator -OrNull and -OrDefault when combined with -State. [#10741](https://github.com/ClickHouse/ClickHouse/pull/10741) ([hcz](https://github.com/hczhcz)).
-* Fix crash in `generateRandom` with nested types. Fixes [#10583](https://github.com/ClickHouse/ClickHouse/issues/10583). [#10734](https://github.com/ClickHouse/ClickHouse/pull/10734) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix data corruption for `LowCardinality(FixedString)` key column in `SummingMergeTree` which could have happened after merge. Fixes [#10489](https://github.com/ClickHouse/ClickHouse/issues/10489). [#10721](https://github.com/ClickHouse/ClickHouse/pull/10721) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix usage of primary key wrapped into a function with 'FINAL' modifier and 'ORDER BY' optimization. [#10715](https://github.com/ClickHouse/ClickHouse/pull/10715) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix possible buffer overflow in function `h3EdgeAngle`. [#10711](https://github.com/ClickHouse/ClickHouse/pull/10711) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix disappearing totals. Totals could have being filtered if query had had join or subquery with external where condition. Fixes [#10674](https://github.com/ClickHouse/ClickHouse/issues/10674). [#10698](https://github.com/ClickHouse/ClickHouse/pull/10698) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix atomicity of HTTP insert. This fixes [#9666](https://github.com/ClickHouse/ClickHouse/issues/9666). [#10687](https://github.com/ClickHouse/ClickHouse/pull/10687) ([Andrew Onyshchuk](https://github.com/oandrew)).
-* Fix multiple usages of `IN` operator with the identical set in one query. [#10686](https://github.com/ClickHouse/ClickHouse/pull/10686) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed bug, which causes http requests stuck on client close when `readonly=2` and `cancel_http_readonly_queries_on_client_close=1`. Fixes [#7939](https://github.com/ClickHouse/ClickHouse/issues/7939), [#7019](https://github.com/ClickHouse/ClickHouse/issues/7019), [#7736](https://github.com/ClickHouse/ClickHouse/issues/7736), [#7091](https://github.com/ClickHouse/ClickHouse/issues/7091). [#10684](https://github.com/ClickHouse/ClickHouse/pull/10684) ([tavplubix](https://github.com/tavplubix)).
-* Fix order of parameters in AggregateTransform constructor. [#10667](https://github.com/ClickHouse/ClickHouse/pull/10667) ([palasonic1](https://github.com/palasonic1)).
-* Fix the lack of parallel execution of remote queries with `distributed_aggregation_memory_efficient` enabled. Fixes [#10655](https://github.com/ClickHouse/ClickHouse/issues/10655). [#10664](https://github.com/ClickHouse/ClickHouse/pull/10664) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix possible incorrect number of rows for queries with `LIMIT`. Fixes [#10566](https://github.com/ClickHouse/ClickHouse/issues/10566), [#10709](https://github.com/ClickHouse/ClickHouse/issues/10709). [#10660](https://github.com/ClickHouse/ClickHouse/pull/10660) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix bug which locks concurrent alters when table has a lot of parts. [#10659](https://github.com/ClickHouse/ClickHouse/pull/10659) ([alesapin](https://github.com/alesapin)).
-* Fix nullptr dereference in StorageBuffer if server was shutdown before table startup. [#10641](https://github.com/ClickHouse/ClickHouse/pull/10641) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix predicates optimization for distributed queries (`enable_optimize_predicate_expression=1`) for queries with `HAVING` section (i.e. when filtering on the server initiator is required), by preserving the order of expressions (and this is enough to fix), and also force aggregator use column names over indexes. Fixes: [#10613](https://github.com/ClickHouse/ClickHouse/issues/10613), [#11413](https://github.com/ClickHouse/ClickHouse/issues/11413). [#10621](https://github.com/ClickHouse/ClickHouse/pull/10621) ([Azat Khuzhin](https://github.com/azat)).
-* Fix optimize_skip_unused_shards with LowCardinality. [#10611](https://github.com/ClickHouse/ClickHouse/pull/10611) ([Azat Khuzhin](https://github.com/azat)).
-* Fix segfault in StorageBuffer when exception on server startup. Fixes [#10550](https://github.com/ClickHouse/ClickHouse/issues/10550). [#10609](https://github.com/ClickHouse/ClickHouse/pull/10609) ([tavplubix](https://github.com/tavplubix)).
-* On `SYSTEM DROP DNS CACHE` query also drop caches, which are used to check if user is allowed to connect from some IP addresses. [#10608](https://github.com/ClickHouse/ClickHouse/pull/10608) ([tavplubix](https://github.com/tavplubix)).
-* Fixed incorrect scalar results inside inner query of `MATERIALIZED VIEW` in case if this query contained dependent table. [#10603](https://github.com/ClickHouse/ClickHouse/pull/10603) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed handling condition variable for synchronous mutations. In some cases signals to that condition variable could be lost. [#10588](https://github.com/ClickHouse/ClickHouse/pull/10588) ([Vladimir Chebotarev](https://github.com/excitoon)).
-* Fixes possible crash `createDictionary()` is called before `loadStoredObject()` has finished. [#10587](https://github.com/ClickHouse/ClickHouse/pull/10587) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix error `the BloomFilter false positive must be a double number between 0 and 1` [#10551](https://github.com/ClickHouse/ClickHouse/issues/10551). [#10569](https://github.com/ClickHouse/ClickHouse/pull/10569) ([Winter Zhang](https://github.com/zhang2014)).
-* Fix SELECT of column ALIAS which default expression type different from column type. [#10563](https://github.com/ClickHouse/ClickHouse/pull/10563) ([Azat Khuzhin](https://github.com/azat)).
-* Implemented comparison between DateTime64 and String values (just like for DateTime). [#10560](https://github.com/ClickHouse/ClickHouse/pull/10560) ([Vasily Nemkov](https://github.com/Enmk)).
-* Fix index corruption, which may occur in some cases after merge compact parts into another compact part. [#10531](https://github.com/ClickHouse/ClickHouse/pull/10531) ([Anton Popov](https://github.com/CurtizJ)).
-* Disable GROUP BY sharding_key optimization by default (`optimize_distributed_group_by_sharding_key` had been introduced and turned of by default, due to trickery of sharding_key analyzing, simple example is `if` in sharding key) and fix it for WITH ROLLUP/CUBE/TOTALS. [#10516](https://github.com/ClickHouse/ClickHouse/pull/10516) ([Azat Khuzhin](https://github.com/azat)).
-* Fixes: [#10263](https://github.com/ClickHouse/ClickHouse/issues/10263) (after that PR dist send via INSERT had been postponing on each INSERT) Fixes: [#8756](https://github.com/ClickHouse/ClickHouse/issues/8756) (that PR breaks distributed sends with all of the following conditions met (unlikely setup for now I guess): `internal_replication == false`, multiple local shards (activates the hardlinking code) and `distributed_storage_policy` (makes `link(2)` fails on `EXDEV`)). [#10486](https://github.com/ClickHouse/ClickHouse/pull/10486) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed error with "max_rows_to_sort" limit. [#10268](https://github.com/ClickHouse/ClickHouse/pull/10268) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Get dictionary and check access rights only once per each call of any function reading external dictionaries. [#10928](https://github.com/ClickHouse/ClickHouse/pull/10928) ([Vitaly Baranov](https://github.com/vitlibar)).
-
-#### Improvement
-
-* Apply `TTL` for old data, after `ALTER MODIFY TTL` query. This behaviour is controlled by setting `materialize_ttl_after_modify`, which is enabled by default. [#11042](https://github.com/ClickHouse/ClickHouse/pull/11042) ([Anton Popov](https://github.com/CurtizJ)).
-* When parsing C-style backslash escapes in string literals, VALUES and various text formats (this is an extension to SQL standard that is endemic for ClickHouse and MySQL), keep backslash if unknown escape sequence is found (e.g. `\%` or `\w`) that will make usage of `LIKE` and `match` regular expressions more convenient (it's enough to write `name LIKE 'used\_cars'` instead of `name LIKE 'used\\_cars'`) and more compatible at the same time. This fixes [#10922](https://github.com/ClickHouse/ClickHouse/issues/10922). [#11208](https://github.com/ClickHouse/ClickHouse/pull/11208) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* When reading Decimal value, cut extra digits after point. This behaviour is more compatible with MySQL and PostgreSQL. This fixes [#10202](https://github.com/ClickHouse/ClickHouse/issues/10202). [#11831](https://github.com/ClickHouse/ClickHouse/pull/11831) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Allow to DROP replicated table if the metadata in ZooKeeper was already removed and does not exist (this is also the case when using TestKeeper for testing and the server was restarted). Allow to RENAME replicated table even if there is an error communicating with ZooKeeper. This fixes [#10720](https://github.com/ClickHouse/ClickHouse/issues/10720). [#11652](https://github.com/ClickHouse/ClickHouse/pull/11652) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Slightly improve diagnostic of reading decimal from string. This closes [#10202](https://github.com/ClickHouse/ClickHouse/issues/10202). [#11829](https://github.com/ClickHouse/ClickHouse/pull/11829) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix sleep invocation in signal handler. It was sleeping for less amount of time than expected. [#11825](https://github.com/ClickHouse/ClickHouse/pull/11825) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* (Only Linux) OS related performance metrics (for CPU and I/O) will work even without `CAP_NET_ADMIN` capability. [#10544](https://github.com/ClickHouse/ClickHouse/pull/10544) ([Alexander Kazakov](https://github.com/Akazz)).
-* Added `hostname` as an alias to function `hostName`. This feature was suggested by Victor Tarnavskiy from Yandex.Metrica. [#11821](https://github.com/ClickHouse/ClickHouse/pull/11821) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Added support for distributed `DDL` (update/delete/drop partition) on cross replication clusters. [#11703](https://github.com/ClickHouse/ClickHouse/pull/11703) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Emit warning instead of error in server log at startup if we cannot listen one of the listen addresses (e.g. IPv6 is unavailable inside Docker). Note that if server fails to listen all listed addresses, it will refuse to startup as before. This fixes [#4406](https://github.com/ClickHouse/ClickHouse/issues/4406). [#11687](https://github.com/ClickHouse/ClickHouse/pull/11687) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Default user and database creation on docker image starting. [#10637](https://github.com/ClickHouse/ClickHouse/pull/10637) ([Paramtamtam](https://github.com/tarampampam)).
-* When multiline query is printed to server log, the lines are joined. Make it to work correct in case of multiline string literals, identifiers and single-line comments. This fixes [#3853](https://github.com/ClickHouse/ClickHouse/issues/3853). [#11686](https://github.com/ClickHouse/ClickHouse/pull/11686) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Multiple names are now allowed in commands: CREATE USER, CREATE ROLE, ALTER USER, SHOW CREATE USER, SHOW GRANTS and so on. [#11670](https://github.com/ClickHouse/ClickHouse/pull/11670) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Add support for distributed DDL (`UPDATE/DELETE/DROP PARTITION`) on cross replication clusters. [#11508](https://github.com/ClickHouse/ClickHouse/pull/11508) ([frank lee](https://github.com/etah000)).
-* Clear password from command line in `clickhouse-client` and `clickhouse-benchmark` if the user has specified it with explicit value. This prevents password exposure by `ps` and similar tools. [#11665](https://github.com/ClickHouse/ClickHouse/pull/11665) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Don't use debug info from ELF file if it doesn't correspond to the running binary. It is needed to avoid printing wrong function names and source locations in stack traces. This fixes [#7514](https://github.com/ClickHouse/ClickHouse/issues/7514). [#11657](https://github.com/ClickHouse/ClickHouse/pull/11657) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Return NULL/zero when value is not parsed completely in parseDateTimeBestEffortOrNull/Zero functions. This fixes [#7876](https://github.com/ClickHouse/ClickHouse/issues/7876). [#11653](https://github.com/ClickHouse/ClickHouse/pull/11653) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Skip empty parameters in requested URL. They may appear when you write `http://localhost:8123/?&a=b` or `http://localhost:8123/?a=b&&c=d`. This closes [#10749](https://github.com/ClickHouse/ClickHouse/issues/10749). [#11651](https://github.com/ClickHouse/ClickHouse/pull/11651) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Allow using `groupArrayArray` and `groupUniqArrayArray` as `SimpleAggregateFunction`. [#11650](https://github.com/ClickHouse/ClickHouse/pull/11650) ([Volodymyr Kuznetsov](https://github.com/ksvladimir)).
-* Allow comparison with constant strings by implicit conversions when analysing index conditions on other types. This may close [#11630](https://github.com/ClickHouse/ClickHouse/issues/11630). [#11648](https://github.com/ClickHouse/ClickHouse/pull/11648) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* https://github.com/ClickHouse/ClickHouse/pull/7572#issuecomment-642815377 Support config default HTTPHandlers. [#11628](https://github.com/ClickHouse/ClickHouse/pull/11628) ([Winter Zhang](https://github.com/zhang2014)).
-* Make more input formats to work with Kafka engine. Fix the issue with premature flushes. Fix the performance issue when `kafka_num_consumers` is greater than number of partitions in topic. [#11599](https://github.com/ClickHouse/ClickHouse/pull/11599) ([filimonov](https://github.com/filimonov)).
-* Improve `multiple_joins_rewriter_version=2` logic. Fix unknown columns error for lambda aliases. [#11587](https://github.com/ClickHouse/ClickHouse/pull/11587) ([Artem Zuikov](https://github.com/4ertus2)).
-* Better exception message when cannot parse columns declaration list. This closes [#10403](https://github.com/ClickHouse/ClickHouse/issues/10403). [#11537](https://github.com/ClickHouse/ClickHouse/pull/11537) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Improve `enable_optimize_predicate_expression=1` logic for VIEW. [#11513](https://github.com/ClickHouse/ClickHouse/pull/11513) ([Artem Zuikov](https://github.com/4ertus2)).
-* Adding support for PREWHERE in live view tables. [#11495](https://github.com/ClickHouse/ClickHouse/pull/11495) ([vzakaznikov](https://github.com/vzakaznikov)).
-* Automatically update DNS cache, which is used to check if user is allowed to connect from an address. [#11487](https://github.com/ClickHouse/ClickHouse/pull/11487) ([tavplubix](https://github.com/tavplubix)).
-* OPTIMIZE FINAL will force merge even if concurrent merges are performed. This closes [#11309](https://github.com/ClickHouse/ClickHouse/issues/11309) and closes [#11322](https://github.com/ClickHouse/ClickHouse/issues/11322). [#11346](https://github.com/ClickHouse/ClickHouse/pull/11346) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Suppress output of cancelled queries in clickhouse-client. In previous versions result may continue to print in terminal even after you press Ctrl+C to cancel query. This closes [#9473](https://github.com/ClickHouse/ClickHouse/issues/9473). [#11342](https://github.com/ClickHouse/ClickHouse/pull/11342) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Now history file is updated after each query and there is no race condition if multiple clients use one history file. This fixes [#9897](https://github.com/ClickHouse/ClickHouse/issues/9897). [#11453](https://github.com/ClickHouse/ClickHouse/pull/11453) ([Tagir Kuskarov](https://github.com/kuskarov)).
-* Better log messages in while reloading configuration. [#11341](https://github.com/ClickHouse/ClickHouse/pull/11341) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Remove trailing whitespaces from formatted queries in `clickhouse-client` or `clickhouse-format` in some cases. [#11325](https://github.com/ClickHouse/ClickHouse/pull/11325) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add setting "output_format_pretty_max_value_width". If value is longer, it will be cut to avoid output of too large values in terminal. This closes [#11140](https://github.com/ClickHouse/ClickHouse/issues/11140). [#11324](https://github.com/ClickHouse/ClickHouse/pull/11324) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Better exception message in case when there is shortage of memory mappings. This closes [#11027](https://github.com/ClickHouse/ClickHouse/issues/11027). [#11316](https://github.com/ClickHouse/ClickHouse/pull/11316) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Support (U)Int8, (U)Int16, Date in ASOF JOIN. [#11301](https://github.com/ClickHouse/ClickHouse/pull/11301) ([Artem Zuikov](https://github.com/4ertus2)).
-* Support kafka_client_id parameter for Kafka tables. It also changes the default `client.id` used by ClickHouse when communicating with Kafka to be more verbose and usable. [#11252](https://github.com/ClickHouse/ClickHouse/pull/11252) ([filimonov](https://github.com/filimonov)).
-* Keep the value of `DistributedFilesToInsert` metric on exceptions. In previous versions, the value was set when we are going to send some files, but it is zero, if there was an exception and some files are still pending. Now it corresponds to the number of pending files in filesystem. [#11220](https://github.com/ClickHouse/ClickHouse/pull/11220) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add support for multi-word data type names (such as `DOUBLE PRECISION` and `CHAR VARYING`) for better SQL compatibility. [#11214](https://github.com/ClickHouse/ClickHouse/pull/11214) ([Павел Потемкин](https://github.com/Potya)).
-* Provide synonyms for some data types. [#10856](https://github.com/ClickHouse/ClickHouse/pull/10856) ([Павел Потемкин](https://github.com/Potya)).
-* The query log is now enabled by default. [#11184](https://github.com/ClickHouse/ClickHouse/pull/11184) ([Ivan Blinkov](https://github.com/blinkov)).
-* Show authentication type in table system.users and while executing SHOW CREATE USER query. [#11080](https://github.com/ClickHouse/ClickHouse/pull/11080) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Remove data on explicit `DROP DATABASE` for `Memory` database engine. Fixes [#10557](https://github.com/ClickHouse/ClickHouse/issues/10557). [#11021](https://github.com/ClickHouse/ClickHouse/pull/11021) ([tavplubix](https://github.com/tavplubix)).
-* Set thread names for internal threads of rdkafka library. Make logs from rdkafka available in server logs. [#10983](https://github.com/ClickHouse/ClickHouse/pull/10983) ([Azat Khuzhin](https://github.com/azat)).
-* Support for unicode whitespaces in queries. This helps when queries are copy-pasted from Word or from web page. This fixes [#10896](https://github.com/ClickHouse/ClickHouse/issues/10896). [#10903](https://github.com/ClickHouse/ClickHouse/pull/10903) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Allow large UInt types as the index in function `tupleElement`. [#10874](https://github.com/ClickHouse/ClickHouse/pull/10874) ([hcz](https://github.com/hczhcz)).
-* Respect prefer_localhost_replica/load_balancing on INSERT into Distributed. [#10867](https://github.com/ClickHouse/ClickHouse/pull/10867) ([Azat Khuzhin](https://github.com/azat)).
-* Introduce `min_insert_block_size_rows_for_materialized_views`, `min_insert_block_size_bytes_for_materialized_views` settings. This settings are similar to `min_insert_block_size_rows` and `min_insert_block_size_bytes`, but applied only for blocks inserted into `MATERIALIZED VIEW`. It helps to control blocks squashing while pushing to MVs and avoid excessive memory usage. [#10858](https://github.com/ClickHouse/ClickHouse/pull/10858) ([Azat Khuzhin](https://github.com/azat)).
-* Get rid of exception from replicated queue during server shutdown. Fixes [#10819](https://github.com/ClickHouse/ClickHouse/issues/10819). [#10841](https://github.com/ClickHouse/ClickHouse/pull/10841) ([alesapin](https://github.com/alesapin)).
-* Ensure that `varSamp`, `varPop` cannot return negative results due to numerical errors and that `stddevSamp`, `stddevPop` cannot be calculated from negative variance. This fixes [#10532](https://github.com/ClickHouse/ClickHouse/issues/10532). [#10829](https://github.com/ClickHouse/ClickHouse/pull/10829) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Better DNS exception message. This fixes [#10813](https://github.com/ClickHouse/ClickHouse/issues/10813). [#10828](https://github.com/ClickHouse/ClickHouse/pull/10828) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Change HTTP response code in case of some parse errors to 400 Bad Request. This fix [#10636](https://github.com/ClickHouse/ClickHouse/issues/10636). [#10640](https://github.com/ClickHouse/ClickHouse/pull/10640) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Print a message if clickhouse-client is newer than clickhouse-server. [#10627](https://github.com/ClickHouse/ClickHouse/pull/10627) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Adding support for `INSERT INTO [db.]table WATCH` query. [#10498](https://github.com/ClickHouse/ClickHouse/pull/10498) ([vzakaznikov](https://github.com/vzakaznikov)).
-* Allow to pass quota_key in clickhouse-client. This closes [#10227](https://github.com/ClickHouse/ClickHouse/issues/10227). [#10270](https://github.com/ClickHouse/ClickHouse/pull/10270) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-
-#### Performance Improvement
-
-* Allow multiple replicas to assign merges, mutations, partition drop, move and replace concurrently. This closes [#10367](https://github.com/ClickHouse/ClickHouse/issues/10367). [#11639](https://github.com/ClickHouse/ClickHouse/pull/11639) ([alexey-milovidov](https://github.com/alexey-milovidov)) [#11795](https://github.com/ClickHouse/ClickHouse/pull/11795) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Optimization of GROUP BY with respect to table sorting key, enabled with `optimize_aggregation_in_order` setting. [#9113](https://github.com/ClickHouse/ClickHouse/pull/9113) ([dimarub2000](https://github.com/dimarub2000)).
-* Selects with final are executed in parallel. Added setting `max_final_threads` to limit the number of threads used. [#10463](https://github.com/ClickHouse/ClickHouse/pull/10463) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Improve performance for INSERT queries via `INSERT SELECT` or INSERT with clickhouse-client when small blocks are generated (typical case with parallel parsing). This fixes [#11275](https://github.com/ClickHouse/ClickHouse/issues/11275). Fix the issue that CONSTRAINTs were not working for DEFAULT fields. This fixes [#11273](https://github.com/ClickHouse/ClickHouse/issues/11273). Fix the issue that CONSTRAINTS were ignored for TEMPORARY tables. This fixes [#11274](https://github.com/ClickHouse/ClickHouse/issues/11274). [#11276](https://github.com/ClickHouse/ClickHouse/pull/11276) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Optimization that eliminates min/max/any aggregators of GROUP BY keys in SELECT section, enabled with `optimize_aggregators_of_group_by_keys` setting. [#11667](https://github.com/ClickHouse/ClickHouse/pull/11667) ([xPoSx](https://github.com/xPoSx)). [#11806](https://github.com/ClickHouse/ClickHouse/pull/11806) ([Azat Khuzhin](https://github.com/azat)).
-* New optimization that takes all operations out of `any` function, enabled with `optimize_move_functions_out_of_any` [#11529](https://github.com/ClickHouse/ClickHouse/pull/11529) ([Ruslan](https://github.com/kamalov-ruslan)).
-* Improve performance of `clickhouse-client` in interactive mode when Pretty formats are used. In previous versions, significant amount of time can be spent calculating visible width of UTF-8 string. This closes [#11323](https://github.com/ClickHouse/ClickHouse/issues/11323). [#11323](https://github.com/ClickHouse/ClickHouse/pull/11323) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Improved performance for queries with `ORDER BY` and small `LIMIT` (less, then `max_block_size`). [#11171](https://github.com/ClickHouse/ClickHouse/pull/11171) ([Albert Kidrachev](https://github.com/Provet)).
-* Add runtime CPU detection to select and dispatch the best function implementation. Add support for codegeneration for multiple targets. This closes [#1017](https://github.com/ClickHouse/ClickHouse/issues/1017). [#10058](https://github.com/ClickHouse/ClickHouse/pull/10058) ([DimasKovas](https://github.com/DimasKovas)).
-* Enable `mlock` of clickhouse binary by default. It will prevent clickhouse executable from being paged out under high IO load. [#11139](https://github.com/ClickHouse/ClickHouse/pull/11139) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Make queries with `sum` aggregate function and without GROUP BY keys to run multiple times faster. [#10992](https://github.com/ClickHouse/ClickHouse/pull/10992) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Improving radix sort (used in `ORDER BY` with simple keys) by removing some redundant data moves. [#10981](https://github.com/ClickHouse/ClickHouse/pull/10981) ([Arslan Gumerov](https://github.com/g-arslan)).
-* Sort bigger parts of the left table in MergeJoin. Buffer left blocks in memory. Add `partial_merge_join_left_table_buffer_bytes` setting to manage the left blocks buffers sizes. [#10601](https://github.com/ClickHouse/ClickHouse/pull/10601) ([Artem Zuikov](https://github.com/4ertus2)).
-* Remove duplicate ORDER BY and DISTINCT from subqueries, this optimization is enabled with `optimize_duplicate_order_by_and_distinct` [#10067](https://github.com/ClickHouse/ClickHouse/pull/10067) ([Mikhail Malafeev](https://github.com/demo-99)).
-* This feature eliminates functions of other keys in GROUP BY section, enabled with `optimize_group_by_function_keys` [#10051](https://github.com/ClickHouse/ClickHouse/pull/10051) ([xPoSx](https://github.com/xPoSx)).
-* New optimization that takes arithmetic operations out of aggregate functions, enabled with `optimize_arithmetic_operations_in_aggregate_functions` [#10047](https://github.com/ClickHouse/ClickHouse/pull/10047) ([Ruslan](https://github.com/kamalov-ruslan)).
-* Use HTTP client for S3 based on Poco instead of curl. This will improve performance and lower memory usage of s3 storage and table functions. [#11230](https://github.com/ClickHouse/ClickHouse/pull/11230) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Fix Kafka performance issue related to reschedules based on limits, which were always applied. [#11149](https://github.com/ClickHouse/ClickHouse/pull/11149) ([filimonov](https://github.com/filimonov)).
-* Enable percpu_arena:percpu for jemalloc (This will reduce memory fragmentation due to thread pool). [#11084](https://github.com/ClickHouse/ClickHouse/pull/11084) ([Azat Khuzhin](https://github.com/azat)).
-* Optimize memory usage when reading a response from an S3 HTTP client. [#11561](https://github.com/ClickHouse/ClickHouse/pull/11561) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Adjust the default Kafka settings for better performance. [#11388](https://github.com/ClickHouse/ClickHouse/pull/11388) ([filimonov](https://github.com/filimonov)).
-
-#### Experimental Feature
-
-* Add data type `Point` (Tuple(Float64, Float64)) and `Polygon` (Array(Array(Tuple(Float64, Float64))). [#10678](https://github.com/ClickHouse/ClickHouse/pull/10678) ([Alexey Ilyukhov](https://github.com/livace)).
-* Add's a `hasSubstr` function that allows for look for subsequences in arrays. Note: this function is likely to be renamed without further notice. [#11071](https://github.com/ClickHouse/ClickHouse/pull/11071) ([Ryad Zenine](https://github.com/r-zenine)).
-* Added OpenCL support and bitonic sort algorithm, which can be used for sorting integer types of data in single column. Needs to be build with flag `-DENABLE_OPENCL=1`. For using bitonic sort algorithm instead of others you need to set `bitonic_sort` for Setting's option `special_sort` and make sure that OpenCL is available. This feature does not improve performance or anything else, it is only provided as an example and for demonstration purposes. It is likely to be removed in near future if there will be no further development in this direction. [#10232](https://github.com/ClickHouse/ClickHouse/pull/10232) ([Ri](https://github.com/margaritiko)).
-
-#### Build/Testing/Packaging Improvement
-
-* Enable clang-tidy for programs and utils. [#10991](https://github.com/ClickHouse/ClickHouse/pull/10991) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Remove dependency on `tzdata`: do not fail if `/usr/share/zoneinfo` directory does not exist. Note that all timezones work in ClickHouse even without tzdata installed in system. [#11827](https://github.com/ClickHouse/ClickHouse/pull/11827) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Added MSan and UBSan stress tests. Note that we already have MSan, UBSan for functional tests and "stress" test is another kind of tests. [#10871](https://github.com/ClickHouse/ClickHouse/pull/10871) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Print compiler build id in crash messages. It will make us slightly more certain about what binary has crashed. Added new function `buildId`. [#11824](https://github.com/ClickHouse/ClickHouse/pull/11824) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Added a test to ensure that mutations continue to work after FREEZE query. [#11820](https://github.com/ClickHouse/ClickHouse/pull/11820) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Don't allow tests with "fail" substring in their names because it makes looking at the tests results in browser less convenient when you type Ctrl+F and search for "fail". [#11817](https://github.com/ClickHouse/ClickHouse/pull/11817) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Removes unused imports from HTTPHandlerFactory. [#11660](https://github.com/ClickHouse/ClickHouse/pull/11660) ([Bharat Nallan](https://github.com/bharatnc)).
-* Added a random sampling of instances where copier is executed. It is needed to avoid `Too many simultaneous queries` error. Also increased timeout and decreased fault probability. [#11573](https://github.com/ClickHouse/ClickHouse/pull/11573) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fix missed include. [#11525](https://github.com/ClickHouse/ClickHouse/pull/11525) ([Matwey V. Kornilov](https://github.com/matwey)).
-* Speed up build by removing old example programs. Also found some orphan functional test. [#11486](https://github.com/ClickHouse/ClickHouse/pull/11486) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Increase ccache size for builds in CI. [#11450](https://github.com/ClickHouse/ClickHouse/pull/11450) ([alesapin](https://github.com/alesapin)).
-* Leave only unit_tests_dbms in deb build. [#11429](https://github.com/ClickHouse/ClickHouse/pull/11429) ([Ilya Yatsishin](https://github.com/qoega)).
-* Update librdkafka to version [1.4.2](https://github.com/edenhill/librdkafka/releases/tag/v1.4.2). [#11256](https://github.com/ClickHouse/ClickHouse/pull/11256) ([filimonov](https://github.com/filimonov)).
-* Refactor CMake build files. [#11390](https://github.com/ClickHouse/ClickHouse/pull/11390) ([Ivan](https://github.com/abyss7)).
-* Fix several flaky integration tests. [#11355](https://github.com/ClickHouse/ClickHouse/pull/11355) ([alesapin](https://github.com/alesapin)).
-* Add support for unit tests run with UBSan. [#11345](https://github.com/ClickHouse/ClickHouse/pull/11345) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Remove redundant timeout from integration test `test_insertion_sync_fails_with_timeout`. [#11343](https://github.com/ClickHouse/ClickHouse/pull/11343) ([alesapin](https://github.com/alesapin)).
-* Better check for hung queries in clickhouse-test. [#11321](https://github.com/ClickHouse/ClickHouse/pull/11321) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Emit a warning if server was build in debug or with sanitizers. [#11304](https://github.com/ClickHouse/ClickHouse/pull/11304) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Now clickhouse-test check the server aliveness before tests run. [#11285](https://github.com/ClickHouse/ClickHouse/pull/11285) ([alesapin](https://github.com/alesapin)).
-* Fix potentially flacky test `00731_long_merge_tree_select_opened_files.sh`. It does not fail frequently but we have discovered potential race condition in this test while experimenting with ThreadFuzzer: [#9814](https://github.com/ClickHouse/ClickHouse/issues/9814) See [link](https://clickhouse-test-reports.s3.yandex.net/9814/40e3023e215df22985d275bf85f4d2290897b76b/functional_stateless_tests_(unbundled).html#fail1) for the example. [#11270](https://github.com/ClickHouse/ClickHouse/pull/11270) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Repeat test in CI if `curl` invocation was timed out. It is possible due to system hangups for 10+ seconds that are typical in our CI infrastructure. This fixes [#11267](https://github.com/ClickHouse/ClickHouse/issues/11267). [#11268](https://github.com/ClickHouse/ClickHouse/pull/11268) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add a test for Join table engine from @donmikel. This closes [#9158](https://github.com/ClickHouse/ClickHouse/issues/9158). [#11265](https://github.com/ClickHouse/ClickHouse/pull/11265) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix several non significant errors in unit tests. [#11262](https://github.com/ClickHouse/ClickHouse/pull/11262) ([alesapin](https://github.com/alesapin)).
-* Now parts of linker command for `cctz` library will not be shuffled with other libraries. [#11213](https://github.com/ClickHouse/ClickHouse/pull/11213) ([alesapin](https://github.com/alesapin)).
-* Split /programs/server into actual program and library. [#11186](https://github.com/ClickHouse/ClickHouse/pull/11186) ([Ivan](https://github.com/abyss7)).
-* Improve build scripts for protobuf & gRPC. [#11172](https://github.com/ClickHouse/ClickHouse/pull/11172) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Enable performance test that was not working. [#11158](https://github.com/ClickHouse/ClickHouse/pull/11158) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Create root S3 bucket for tests before any CH instance is started. [#11142](https://github.com/ClickHouse/ClickHouse/pull/11142) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Add performance test for non-constant polygons. [#11141](https://github.com/ClickHouse/ClickHouse/pull/11141) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixing `00979_live_view_watch_continuous_aggregates` test. [#11024](https://github.com/ClickHouse/ClickHouse/pull/11024) ([vzakaznikov](https://github.com/vzakaznikov)).
-* Add ability to run zookeeper in integration tests over tmpfs. [#11002](https://github.com/ClickHouse/ClickHouse/pull/11002) ([alesapin](https://github.com/alesapin)).
-* Wait for odbc-bridge with exponential backoff. Previous wait time of 200 ms was not enough in our CI environment. [#10990](https://github.com/ClickHouse/ClickHouse/pull/10990) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix non-deterministic test. [#10989](https://github.com/ClickHouse/ClickHouse/pull/10989) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Added a test for empty external data. [#10926](https://github.com/ClickHouse/ClickHouse/pull/10926) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Database is recreated for every test. This improves separation of tests. [#10902](https://github.com/ClickHouse/ClickHouse/pull/10902) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Added more asserts in columns code. [#10833](https://github.com/ClickHouse/ClickHouse/pull/10833) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Better cooperation with sanitizers. Print information about query_id in the message of sanitizer failure. [#10832](https://github.com/ClickHouse/ClickHouse/pull/10832) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix obvious race condition in "Split build smoke test" check. [#10820](https://github.com/ClickHouse/ClickHouse/pull/10820) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix (false) MSan report in MergeTreeIndexFullText. The issue first appeared in [#9968](https://github.com/ClickHouse/ClickHouse/issues/9968). [#10801](https://github.com/ClickHouse/ClickHouse/pull/10801) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add MSan suppression for MariaDB Client library. [#10800](https://github.com/ClickHouse/ClickHouse/pull/10800) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* GRPC make couldn't find protobuf files, changed make file by adding the right link. [#10794](https://github.com/ClickHouse/ClickHouse/pull/10794) ([mnkonkova](https://github.com/mnkonkova)).
-* Enable extra warnings (`-Weverything`) for base, utils, programs. Note that we already have it for the most of the code. [#10779](https://github.com/ClickHouse/ClickHouse/pull/10779) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Suppressions of warnings from libraries was mistakenly declared as public in [#10396](https://github.com/ClickHouse/ClickHouse/issues/10396). [#10776](https://github.com/ClickHouse/ClickHouse/pull/10776) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Restore a patch that was accidentially deleted in [#10396](https://github.com/ClickHouse/ClickHouse/issues/10396). [#10774](https://github.com/ClickHouse/ClickHouse/pull/10774) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix performance tests errors, part 2. [#10773](https://github.com/ClickHouse/ClickHouse/pull/10773) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix performance test errors. [#10766](https://github.com/ClickHouse/ClickHouse/pull/10766) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Update cross-builds to use clang-10 compiler. [#10724](https://github.com/ClickHouse/ClickHouse/pull/10724) ([Ivan](https://github.com/abyss7)).
-* Update instruction to install RPM packages. This was suggested by Denis (TG login @ldviolet) and implemented by Arkady Shejn. [#10707](https://github.com/ClickHouse/ClickHouse/pull/10707) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Trying to fix `tests/queries/0_stateless/01246_insert_into_watch_live_view.py` test. [#10670](https://github.com/ClickHouse/ClickHouse/pull/10670) ([vzakaznikov](https://github.com/vzakaznikov)).
-* Fixing and re-enabling 00979_live_view_watch_continuous_aggregates.py test. [#10658](https://github.com/ClickHouse/ClickHouse/pull/10658) ([vzakaznikov](https://github.com/vzakaznikov)).
-* Fix OOM in ASan stress test. [#10646](https://github.com/ClickHouse/ClickHouse/pull/10646) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix UBSan report (adding zero to nullptr) in HashTable that appeared after migration to clang-10. [#10638](https://github.com/ClickHouse/ClickHouse/pull/10638) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Remove external call to `ld` (bfd) linker during tzdata processing in compile time. [#10634](https://github.com/ClickHouse/ClickHouse/pull/10634) ([alesapin](https://github.com/alesapin)).
-* Allow to use `lld` to link blobs (resources). [#10632](https://github.com/ClickHouse/ClickHouse/pull/10632) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix UBSan report in `LZ4` library. [#10631](https://github.com/ClickHouse/ClickHouse/pull/10631) ([alexey-milovidov](https://github.com/alexey-milovidov)). See also [https://github.com/lz4/lz4/issues/857](https://github.com/lz4/lz4/issues/857)
-* Update LZ4 to the latest dev branch. [#10630](https://github.com/ClickHouse/ClickHouse/pull/10630) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Added auto-generated machine-readable file with the list of stable versions. [#10628](https://github.com/ClickHouse/ClickHouse/pull/10628) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix `capnproto` version check for `capnp::UnalignedFlatArrayMessageReader`. [#10618](https://github.com/ClickHouse/ClickHouse/pull/10618) ([Matwey V. Kornilov](https://github.com/matwey)).
-* Lower memory usage in tests. [#10617](https://github.com/ClickHouse/ClickHouse/pull/10617) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixing hard coded timeouts in new live view tests. [#10604](https://github.com/ClickHouse/ClickHouse/pull/10604) ([vzakaznikov](https://github.com/vzakaznikov)).
-* Increasing timeout when opening a client in tests/queries/0_stateless/helpers/client.py. [#10599](https://github.com/ClickHouse/ClickHouse/pull/10599) ([vzakaznikov](https://github.com/vzakaznikov)).
-* Enable ThinLTO for clang builds, continuation of [#10435](https://github.com/ClickHouse/ClickHouse/pull/10435). [#10585](https://github.com/ClickHouse/ClickHouse/pull/10585) ([Amos Bird](https://github.com/amosbird)).
-* Adding fuzzers and preparing for oss-fuzz integration. [#10546](https://github.com/ClickHouse/ClickHouse/pull/10546) ([kyprizel](https://github.com/kyprizel)).
-* Fix FreeBSD build. [#10150](https://github.com/ClickHouse/ClickHouse/pull/10150) ([Ivan](https://github.com/abyss7)).
-* Add new build for query tests using pytest framework. [#10039](https://github.com/ClickHouse/ClickHouse/pull/10039) ([Ivan](https://github.com/abyss7)).
-
-
-## ClickHouse release v20.4
-
-### ClickHouse release v20.4.8.99-stable 2020-08-10
-
-#### Bug Fix
-
-* Fixed error in `parseDateTimeBestEffort` function when unix timestamp was passed as an argument. This fixes [#13362](https://github.com/ClickHouse/ClickHouse/issues/13362). [#13441](https://github.com/ClickHouse/ClickHouse/pull/13441) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed potentially low performance and slightly incorrect result for `uniqExact`, `topK`, `sumDistinct` and similar aggregate functions called on Float types with NaN values. It also triggered assert in debug build. This fixes [#12491](https://github.com/ClickHouse/ClickHouse/issues/12491). [#13254](https://github.com/ClickHouse/ClickHouse/pull/13254) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed function if with nullable constexpr as cond that is not literal NULL. Fixes [#12463](https://github.com/ClickHouse/ClickHouse/issues/12463). [#13226](https://github.com/ClickHouse/ClickHouse/pull/13226) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed assert in `arrayElement` function in case of array elements are Nullable and array subscript is also Nullable. This fixes [#12172](https://github.com/ClickHouse/ClickHouse/issues/12172). [#13224](https://github.com/ClickHouse/ClickHouse/pull/13224) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed wrong index analysis with functions. It could lead to pruning wrong parts, while reading from `MergeTree` tables. Fixes [#13060](https://github.com/ClickHouse/ClickHouse/issues/13060). Fixes [#12406](https://github.com/ClickHouse/ClickHouse/issues/12406). [#13081](https://github.com/ClickHouse/ClickHouse/pull/13081) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed unnecessary limiting for the number of threads for selects from local replica. [#12840](https://github.com/ClickHouse/ClickHouse/pull/12840) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed possible extra overflow row in data which could appear for queries `WITH TOTALS`. [#12747](https://github.com/ClickHouse/ClickHouse/pull/12747) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed performance with large tuples, which are interpreted as functions in `IN` section. The case when user write `WHERE x IN tuple(1, 2, ...)` instead of `WHERE x IN (1, 2, ...)` for some obscure reason. [#12700](https://github.com/ClickHouse/ClickHouse/pull/12700) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed memory tracking for `input_format_parallel_parsing` (by attaching thread to group). [#12672](https://github.com/ClickHouse/ClickHouse/pull/12672) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed [#12293](https://github.com/ClickHouse/ClickHouse/issues/12293) allow push predicate when subquery contains with clause. [#12663](https://github.com/ClickHouse/ClickHouse/pull/12663) ([Winter Zhang](https://github.com/zhang2014)).
-* Fixed [#10572](https://github.com/ClickHouse/ClickHouse/issues/10572) fix bloom filter index with const expression. [#12659](https://github.com/ClickHouse/ClickHouse/pull/12659) ([Winter Zhang](https://github.com/zhang2014)).
-* Fixed `SIGSEGV` in `StorageKafka` when broker is unavailable (and not only). [#12658](https://github.com/ClickHouse/ClickHouse/pull/12658) ([Azat Khuzhin](https://github.com/azat)).
-* Added support for function `if` with `Array(UUID)` arguments. This fixes [#11066](https://github.com/ClickHouse/ClickHouse/issues/11066). [#12648](https://github.com/ClickHouse/ClickHouse/pull/12648) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed race condition in external dictionaries with cache layout which can lead server crash. [#12566](https://github.com/ClickHouse/ClickHouse/pull/12566) ([alesapin](https://github.com/alesapin)).
-* Removed data for Distributed tables (blocks from async INSERTs) on DROP TABLE. [#12556](https://github.com/ClickHouse/ClickHouse/pull/12556) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed bug which lead to broken old parts after `ALTER DELETE` query when `enable_mixed_granularity_parts=1`. Fixes [#12536](https://github.com/ClickHouse/ClickHouse/issues/12536). [#12543](https://github.com/ClickHouse/ClickHouse/pull/12543) ([alesapin](https://github.com/alesapin)).
-* Better exception for function `in` with invalid number of arguments. [#12529](https://github.com/ClickHouse/ClickHouse/pull/12529) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed performance issue, while reading from compact parts. [#12492](https://github.com/ClickHouse/ClickHouse/pull/12492) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed crash in JOIN with dictionary when we are joining over expression of dictionary key: `t JOIN dict ON expr(dict.id) = t.id`. Disable dictionary join optimisation for this case. [#12458](https://github.com/ClickHouse/ClickHouse/pull/12458) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fixed possible segfault if StorageMerge. Closes [#12054](https://github.com/ClickHouse/ClickHouse/issues/12054). [#12401](https://github.com/ClickHouse/ClickHouse/pull/12401) ([tavplubix](https://github.com/tavplubix)).
-* Fixed order of columns in `WITH FILL` modifier. Previously order of columns of `ORDER BY` statement wasn't respected. [#12306](https://github.com/ClickHouse/ClickHouse/pull/12306) ([Anton Popov](https://github.com/CurtizJ)).
-* Avoid "bad cast" exception when there is an expression that filters data by virtual columns (like `_table` in `Merge` tables) or by "index" columns in system tables such as filtering by database name when querying from `system.tables`, and this expression returns `Nullable` type. This fixes [#12166](https://github.com/ClickHouse/ClickHouse/issues/12166). [#12305](https://github.com/ClickHouse/ClickHouse/pull/12305) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Show error after TrieDictionary failed to load. [#12290](https://github.com/ClickHouse/ClickHouse/pull/12290) ([Vitaly Baranov](https://github.com/vitlibar)).
-* The function `arrayFill` worked incorrectly for empty arrays that may lead to crash. This fixes [#12263](https://github.com/ClickHouse/ClickHouse/issues/12263). [#12279](https://github.com/ClickHouse/ClickHouse/pull/12279) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Implemented conversions to the common type for `LowCardinality` types. This allows to execute UNION ALL of tables with columns of LowCardinality and other columns. This fixes [#8212](https://github.com/ClickHouse/ClickHouse/issues/8212). This fixes [#4342](https://github.com/ClickHouse/ClickHouse/issues/4342). [#12275](https://github.com/ClickHouse/ClickHouse/pull/12275) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed the behaviour when during multiple sequential inserts in `StorageFile` header for some special types was written more than once. This fixed [#6155](https://github.com/ClickHouse/ClickHouse/issues/6155). [#12197](https://github.com/ClickHouse/ClickHouse/pull/12197) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fixed logical functions for UInt8 values when they are not equal to 0 or 1. [#12196](https://github.com/ClickHouse/ClickHouse/pull/12196) ([Alexander Kazakov](https://github.com/Akazz)).
-* Cap max_memory_usage* limits to the process resident memory. [#12182](https://github.com/ClickHouse/ClickHouse/pull/12182) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed `dictGet` arguments check during GROUP BY injective functions elimination. [#12179](https://github.com/ClickHouse/ClickHouse/pull/12179) ([Azat Khuzhin](https://github.com/azat)).
-* Don't split the dictionary source's table name into schema and table name itself if ODBC connection doesn't support schema. [#12165](https://github.com/ClickHouse/ClickHouse/pull/12165) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fixed wrong logic in `ALTER DELETE` that leads to deleting of records when condition evaluates to NULL. This fixes [#9088](https://github.com/ClickHouse/ClickHouse/issues/9088). This closes [#12106](https://github.com/ClickHouse/ClickHouse/issues/12106). [#12153](https://github.com/ClickHouse/ClickHouse/pull/12153) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed transform of query to send to external DBMS (e.g. MySQL, ODBC) in presense of aliases. This fixes [#12032](https://github.com/ClickHouse/ClickHouse/issues/12032). [#12151](https://github.com/ClickHouse/ClickHouse/pull/12151) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed potential overflow in integer division. This fixes [#12119](https://github.com/ClickHouse/ClickHouse/issues/12119). [#12140](https://github.com/ClickHouse/ClickHouse/pull/12140) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed potential infinite loop in `greatCircleDistance`, `geoDistance`. This fixes [#12117](https://github.com/ClickHouse/ClickHouse/issues/12117). [#12137](https://github.com/ClickHouse/ClickHouse/pull/12137) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Normalize "pid" file handling. In previous versions the server may refuse to start if it was killed without proper shutdown and if there is another process that has the same pid as previously runned server. Also pid file may be removed in unsuccessful server startup even if there is another server running. This fixes [#3501](https://github.com/ClickHouse/ClickHouse/issues/3501). [#12133](https://github.com/ClickHouse/ClickHouse/pull/12133) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed handling dependency of table with ENGINE=Dictionary on dictionary. This fixes [#10994](https://github.com/ClickHouse/ClickHouse/issues/10994). This fixes [#10397](https://github.com/ClickHouse/ClickHouse/issues/10397). [#12116](https://github.com/ClickHouse/ClickHouse/pull/12116) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fixed performance for selects with `UNION` caused by wrong limit for the total number of threads. Fixes [#12030](https://github.com/ClickHouse/ClickHouse/issues/12030). [#12103](https://github.com/ClickHouse/ClickHouse/pull/12103) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed segfault with `-StateResample` combinators. [#12092](https://github.com/ClickHouse/ClickHouse/pull/12092) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed empty `result_rows` and `result_bytes` metrics in `system.quey_log` for selects. Fixes [#11595](https://github.com/ClickHouse/ClickHouse/issues/11595). [#12089](https://github.com/ClickHouse/ClickHouse/pull/12089) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed unnecessary limiting the number of threads for selects from `VIEW`. Fixes [#11937](https://github.com/ClickHouse/ClickHouse/issues/11937). [#12085](https://github.com/ClickHouse/ClickHouse/pull/12085) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed possible crash while using wrong type for `PREWHERE`. Fixes [#12053](https://github.com/ClickHouse/ClickHouse/issues/12053), [#12060](https://github.com/ClickHouse/ClickHouse/issues/12060). [#12060](https://github.com/ClickHouse/ClickHouse/pull/12060) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed error `Expected single dictionary argument for function` for function `defaultValueOfArgumentType` with `LowCardinality` type. Fixes [#11808](https://github.com/ClickHouse/ClickHouse/issues/11808). [#12056](https://github.com/ClickHouse/ClickHouse/pull/12056) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed error `Cannot capture column` for higher-order functions with `Tuple(LowCardinality)` argument. Fixes [#9766](https://github.com/ClickHouse/ClickHouse/issues/9766). [#12055](https://github.com/ClickHouse/ClickHouse/pull/12055) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Parse tables metadata in parallel when loading database. This fixes slow server startup when there are large number of tables. [#12045](https://github.com/ClickHouse/ClickHouse/pull/12045) ([tavplubix](https://github.com/tavplubix)).
-* Make `topK` aggregate function return Enum for Enum types. This fixes [#3740](https://github.com/ClickHouse/ClickHouse/issues/3740). [#12043](https://github.com/ClickHouse/ClickHouse/pull/12043) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed constraints check if constraint is a constant expression. This fixes [#11360](https://github.com/ClickHouse/ClickHouse/issues/11360). [#12042](https://github.com/ClickHouse/ClickHouse/pull/12042) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed incorrect comparison of tuples with `Nullable` columns. Fixes [#11985](https://github.com/ClickHouse/ClickHouse/issues/11985). [#12039](https://github.com/ClickHouse/ClickHouse/pull/12039) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed calculation of access rights when allow_introspection_functions=0. [#12031](https://github.com/ClickHouse/ClickHouse/pull/12031) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fixed wrong result and potential crash when invoking function `if` with arguments of type `FixedString` with different sizes. This fixes [#11362](https://github.com/ClickHouse/ClickHouse/issues/11362). [#12021](https://github.com/ClickHouse/ClickHouse/pull/12021) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* A query with function `neighbor` as the only returned expression may return empty result if the function is called with offset `-9223372036854775808`. This fixes [#11367](https://github.com/ClickHouse/ClickHouse/issues/11367). [#12019](https://github.com/ClickHouse/ClickHouse/pull/12019) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed calculation of access rights when allow_ddl=0. [#12015](https://github.com/ClickHouse/ClickHouse/pull/12015) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fixed potential array size overflow in generateRandom that may lead to crash. This fixes [#11371](https://github.com/ClickHouse/ClickHouse/issues/11371). [#12013](https://github.com/ClickHouse/ClickHouse/pull/12013) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed potential floating point exception. This closes [#11378](https://github.com/ClickHouse/ClickHouse/issues/11378). [#12005](https://github.com/ClickHouse/ClickHouse/pull/12005) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed wrong setting name in log message at server startup. [#11997](https://github.com/ClickHouse/ClickHouse/pull/11997) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed `Query parameter was not set` in `Values` format. Fixes [#11918](https://github.com/ClickHouse/ClickHouse/issues/11918). [#11936](https://github.com/ClickHouse/ClickHouse/pull/11936) ([tavplubix](https://github.com/tavplubix)).
-* Keep aliases for substitutions in query (parametrized queries). This fixes [#11914](https://github.com/ClickHouse/ClickHouse/issues/11914). [#11916](https://github.com/ClickHouse/ClickHouse/pull/11916) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed bug with no moves when changing storage policy from default one. [#11893](https://github.com/ClickHouse/ClickHouse/pull/11893) ([Vladimir Chebotarev](https://github.com/excitoon)).
-* Fixed potential floating point exception when parsing `DateTime64`. This fixes [#11374](https://github.com/ClickHouse/ClickHouse/issues/11374). [#11875](https://github.com/ClickHouse/ClickHouse/pull/11875) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed memory accounting via HTTP interface (can be significant with `wait_end_of_query=1`). [#11840](https://github.com/ClickHouse/ClickHouse/pull/11840) ([Azat Khuzhin](https://github.com/azat)).
-* Parse metadata stored in zookeeper before checking for equality. [#11739](https://github.com/ClickHouse/ClickHouse/pull/11739) ([Azat Khuzhin](https://github.com/azat)).
-
-#### Performance Improvement
-
-* Index not used for IN operator with literals, performance regression introduced around v19.3. This fixes [#10574](https://github.com/ClickHouse/ClickHouse/issues/10574). [#12062](https://github.com/ClickHouse/ClickHouse/pull/12062) ([nvartolomei](https://github.com/nvartolomei)).
-
-#### Build/Testing/Packaging Improvement
-
-* Install `ca-certificates` before the first `apt-get update` in Dockerfile. [#12095](https://github.com/ClickHouse/ClickHouse/pull/12095) ([Ivan Blinkov](https://github.com/blinkov)).
-
-
-### ClickHouse release v20.4.6.53-stable 2020-06-25
-
-#### Bug Fix
-
-* Fix rare crash caused by using `Nullable` column in prewhere condition. Continuation of [#11608](https://github.com/ClickHouse/ClickHouse/issues/11608). [#11869](https://github.com/ClickHouse/ClickHouse/pull/11869) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Don't allow arrayJoin inside higher order functions. It was leading to broken protocol synchronization. This closes [#3933](https://github.com/ClickHouse/ClickHouse/issues/3933). [#11846](https://github.com/ClickHouse/ClickHouse/pull/11846) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix wrong result of comparison of FixedString with constant String. This fixes [#11393](https://github.com/ClickHouse/ClickHouse/issues/11393). This bug appeared in version 20.4. [#11828](https://github.com/ClickHouse/ClickHouse/pull/11828) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix wrong result for `if()` with NULLs in condition. [#11807](https://github.com/ClickHouse/ClickHouse/pull/11807) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix using too many threads for queries. [#11788](https://github.com/ClickHouse/ClickHouse/pull/11788) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix unexpected behaviour of queries like `SELECT *, xyz.*` which were success while an error expected. [#11753](https://github.com/ClickHouse/ClickHouse/pull/11753) ([hexiaoting](https://github.com/hexiaoting)).
-* Now replicated fetches will be cancelled during metadata alter. [#11744](https://github.com/ClickHouse/ClickHouse/pull/11744) ([alesapin](https://github.com/alesapin)).
-* Fixed LOGICAL_ERROR caused by wrong type deduction of complex literals in Values input format. [#11732](https://github.com/ClickHouse/ClickHouse/pull/11732) ([tavplubix](https://github.com/tavplubix)).
-* Fix `ORDER BY ... WITH FILL` over const columns. [#11697](https://github.com/ClickHouse/ClickHouse/pull/11697) ([Anton Popov](https://github.com/CurtizJ)).
-* Pass proper timeouts when communicating with XDBC bridge. Recently timeouts were not respected when checking bridge liveness and receiving meta info. [#11690](https://github.com/ClickHouse/ClickHouse/pull/11690) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix `LIMIT n WITH TIES` usage together with `ORDER BY` statement, which contains aliases. [#11689](https://github.com/ClickHouse/ClickHouse/pull/11689) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix error which leads to an incorrect state of `system.mutations`. It may show that whole mutation is already done but the server still has `MUTATE_PART` tasks in the replication queue and tries to execute them. This fixes [#11611](https://github.com/ClickHouse/ClickHouse/issues/11611). [#11681](https://github.com/ClickHouse/ClickHouse/pull/11681) ([alesapin](https://github.com/alesapin)).
-* Add support for regular expressions with case-insensitive flags. This fixes [#11101](https://github.com/ClickHouse/ClickHouse/issues/11101) and fixes [#11506](https://github.com/ClickHouse/ClickHouse/issues/11506). [#11649](https://github.com/ClickHouse/ClickHouse/pull/11649) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Remove trivial count query optimization if row-level security is set. In previous versions the user get total count of records in a table instead filtered. This fixes [#11352](https://github.com/ClickHouse/ClickHouse/issues/11352). [#11644](https://github.com/ClickHouse/ClickHouse/pull/11644) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix bloom filters for String (data skipping indices). [#11638](https://github.com/ClickHouse/ClickHouse/pull/11638) ([Azat Khuzhin](https://github.com/azat)).
-* Fix rare crash caused by using `Nullable` column in prewhere condition. (Probably it is connected with [#11572](https://github.com/ClickHouse/ClickHouse/issues/11572) somehow). [#11608](https://github.com/ClickHouse/ClickHouse/pull/11608) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix error `Block structure mismatch` for queries with sampling reading from `Buffer` table. [#11602](https://github.com/ClickHouse/ClickHouse/pull/11602) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix wrong exit code of the clickhouse-client, when exception.code() % 256 = 0. [#11601](https://github.com/ClickHouse/ClickHouse/pull/11601) ([filimonov](https://github.com/filimonov)).
-* Fix trivial error in log message about "Mark cache size was lowered" at server startup. This closes [#11399](https://github.com/ClickHouse/ClickHouse/issues/11399). [#11589](https://github.com/ClickHouse/ClickHouse/pull/11589) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix error `Size of offsets doesn't match size of column` for queries with `PREWHERE column in (subquery)` and `ARRAY JOIN`. [#11580](https://github.com/ClickHouse/ClickHouse/pull/11580) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed rare segfault in `SHOW CREATE TABLE` Fixes [#11490](https://github.com/ClickHouse/ClickHouse/issues/11490). [#11579](https://github.com/ClickHouse/ClickHouse/pull/11579) ([tavplubix](https://github.com/tavplubix)).
-* All queries in HTTP session have had the same query_id. It is fixed. [#11578](https://github.com/ClickHouse/ClickHouse/pull/11578) ([tavplubix](https://github.com/tavplubix)).
-* Now clickhouse-server docker container will prefer IPv6 checking server aliveness. [#11550](https://github.com/ClickHouse/ClickHouse/pull/11550) ([Ivan Starkov](https://github.com/istarkov)).
-* Fix shard_num/replica_num for `<node>` (breaks use_compact_format_in_distributed_parts_names). [#11528](https://github.com/ClickHouse/ClickHouse/pull/11528) ([Azat Khuzhin](https://github.com/azat)).
-* Fix race condition which may lead to an exception during table drop. It's a bit tricky and not dangerous at all. If you want an explanation, just notice me in telegram. [#11523](https://github.com/ClickHouse/ClickHouse/pull/11523) ([alesapin](https://github.com/alesapin)).
-* Fix memory leak when exception is thrown in the middle of aggregation with -State functions. This fixes [#8995](https://github.com/ClickHouse/ClickHouse/issues/8995). [#11496](https://github.com/ClickHouse/ClickHouse/pull/11496) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* If data skipping index is dependent on columns that are going to be modified during background merge (for SummingMergeTree, AggregatingMergeTree as well as for TTL GROUP BY), it was calculated incorrectly. This issue is fixed by moving index calculation after merge so the index is calculated on merged data. [#11162](https://github.com/ClickHouse/ClickHouse/pull/11162) ([Azat Khuzhin](https://github.com/azat)).
-* Get rid of old libunwind patches. https://github.com/ClickHouse-Extras/libunwind/commit/500aa227911bd185a94bfc071d68f4d3b03cb3b1#r39048012 This allows to disable `-fno-omit-frame-pointer` in `clang` builds that improves performance at least by 1% in average. [#10761](https://github.com/ClickHouse/ClickHouse/pull/10761) ([Amos Bird](https://github.com/amosbird)).
-* Fix usage of primary key wrapped into a function with 'FINAL' modifier and 'ORDER BY' optimization. [#10715](https://github.com/ClickHouse/ClickHouse/pull/10715) ([Anton Popov](https://github.com/CurtizJ)).
-
-#### Build/Testing/Packaging Improvement
-
-* Fix several non significant errors in unit tests. [#11262](https://github.com/ClickHouse/ClickHouse/pull/11262) ([alesapin](https://github.com/alesapin)).
-* Fix (false) MSan report in MergeTreeIndexFullText. The issue first appeared in [#9968](https://github.com/ClickHouse/ClickHouse/issues/9968). [#10801](https://github.com/ClickHouse/ClickHouse/pull/10801) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-
-
-### ClickHouse release v20.4.5.36-stable 2020-06-10
-
-#### Bug Fix
-
-* Fix the error `Data compressed with different methods` that can happen if `min_bytes_to_use_direct_io` is enabled and PREWHERE is active and using SAMPLE or high number of threads. This fixes [#11539](https://github.com/ClickHouse/ClickHouse/issues/11539). [#11540](https://github.com/ClickHouse/ClickHouse/pull/11540) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix return compressed size for codecs. [#11448](https://github.com/ClickHouse/ClickHouse/pull/11448) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix server crash when a column has compression codec with non-literal arguments. Fixes [#11365](https://github.com/ClickHouse/ClickHouse/issues/11365). [#11431](https://github.com/ClickHouse/ClickHouse/pull/11431) ([alesapin](https://github.com/alesapin)).
-* Fix pointInPolygon with nan as point. Fixes [#11375](https://github.com/ClickHouse/ClickHouse/issues/11375). [#11421](https://github.com/ClickHouse/ClickHouse/pull/11421) ([Alexey Ilyukhov](https://github.com/livace)).
-* Fix potential uninitialized memory read in MergeTree shutdown if table was not created successfully. [#11420](https://github.com/ClickHouse/ClickHouse/pull/11420) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed geohashesInBox with arguments outside of latitude/longitude range. [#11403](https://github.com/ClickHouse/ClickHouse/pull/11403) ([Vasily Nemkov](https://github.com/Enmk)).
-* Fix possible `Pipeline stuck` error for queries with external sort and limit. Fixes [#11359](https://github.com/ClickHouse/ClickHouse/issues/11359). [#11366](https://github.com/ClickHouse/ClickHouse/pull/11366) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Remove redundant lock during parts send in ReplicatedMergeTree. [#11354](https://github.com/ClickHouse/ClickHouse/pull/11354) ([alesapin](https://github.com/alesapin)).
-* Fix support for `\G` (vertical output) in clickhouse-client in multiline mode. This closes [#9933](https://github.com/ClickHouse/ClickHouse/issues/9933). [#11350](https://github.com/ClickHouse/ClickHouse/pull/11350) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix potential segfault when using `Lazy` database. [#11348](https://github.com/ClickHouse/ClickHouse/pull/11348) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix crash in `quantilesExactWeightedArray`. [#11337](https://github.com/ClickHouse/ClickHouse/pull/11337) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Now merges stopped before change metadata in `ALTER` queries. [#11335](https://github.com/ClickHouse/ClickHouse/pull/11335) ([alesapin](https://github.com/alesapin)).
-* Make writing to `MATERIALIZED VIEW` with setting `parallel_view_processing = 1` parallel again. Fixes [#10241](https://github.com/ClickHouse/ClickHouse/issues/10241). [#11330](https://github.com/ClickHouse/ClickHouse/pull/11330) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix visitParamExtractRaw when extracted JSON has strings with unbalanced { or [. [#11318](https://github.com/ClickHouse/ClickHouse/pull/11318) ([Ewout](https://github.com/devwout)).
-* Fix very rare race condition in ThreadPool. [#11314](https://github.com/ClickHouse/ClickHouse/pull/11314) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix insignificant data race in clickhouse-copier. Found by integration tests. [#11313](https://github.com/ClickHouse/ClickHouse/pull/11313) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix potential uninitialized memory in conversion. Example: `SELECT toIntervalSecond(now64())`. [#11311](https://github.com/ClickHouse/ClickHouse/pull/11311) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix the issue when index analysis cannot work if a table has Array column in primary key and if a query is filtering by this column with `empty` or `notEmpty` functions. This fixes [#11286](https://github.com/ClickHouse/ClickHouse/issues/11286). [#11303](https://github.com/ClickHouse/ClickHouse/pull/11303) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix bug when query speed estimation can be incorrect and the limit of `min_execution_speed` may not work or work incorrectly if the query is throttled by `max_network_bandwidth`, `max_execution_speed` or `priority` settings. Change the default value of `timeout_before_checking_execution_speed` to non-zero, because otherwise the settings `min_execution_speed` and `max_execution_speed` have no effect. This fixes [#11297](https://github.com/ClickHouse/ClickHouse/issues/11297). This fixes [#5732](https://github.com/ClickHouse/ClickHouse/issues/5732). This fixes [#6228](https://github.com/ClickHouse/ClickHouse/issues/6228). Usability improvement: avoid concatenation of exception message with progress bar in `clickhouse-client`. [#11296](https://github.com/ClickHouse/ClickHouse/pull/11296) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix crash when SET DEFAULT ROLE is called with wrong arguments. This fixes [#10586](https://github.com/ClickHouse/ClickHouse/issues/10586). [#11278](https://github.com/ClickHouse/ClickHouse/pull/11278) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix crash while reading malformed data in Protobuf format. This fixes [#5957](https://github.com/ClickHouse/ClickHouse/issues/5957), fixes [#11203](https://github.com/ClickHouse/ClickHouse/issues/11203). [#11258](https://github.com/ClickHouse/ClickHouse/pull/11258) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fixed a bug when cache-dictionary could return default value instead of normal (when there are only expired keys). This affects only string fields. [#11233](https://github.com/ClickHouse/ClickHouse/pull/11233) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fix error `Block structure mismatch in QueryPipeline` while reading from `VIEW` with constants in inner query. Fixes [#11181](https://github.com/ClickHouse/ClickHouse/issues/11181). [#11205](https://github.com/ClickHouse/ClickHouse/pull/11205) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix possible exception `Invalid status for associated output`. [#11200](https://github.com/ClickHouse/ClickHouse/pull/11200) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix possible error `Cannot capture column` for higher-order functions with `Array(Array(LowCardinality))` captured argument. [#11185](https://github.com/ClickHouse/ClickHouse/pull/11185) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed S3 globbing which could fail in case of more than 1000 keys and some backends. [#11179](https://github.com/ClickHouse/ClickHouse/pull/11179) ([Vladimir Chebotarev](https://github.com/excitoon)).
-* If data skipping index is dependent on columns that are going to be modified during background merge (for SummingMergeTree, AggregatingMergeTree as well as for TTL GROUP BY), it was calculated incorrectly. This issue is fixed by moving index calculation after merge so the index is calculated on merged data. [#11162](https://github.com/ClickHouse/ClickHouse/pull/11162) ([Azat Khuzhin](https://github.com/azat)).
-* Fix Kafka performance issue related to reschedules based on limits, which were always applied. [#11149](https://github.com/ClickHouse/ClickHouse/pull/11149) ([filimonov](https://github.com/filimonov)).
-* Fix for the hang which was happening sometimes during DROP of table engine=Kafka (or during server restarts). [#11145](https://github.com/ClickHouse/ClickHouse/pull/11145) ([filimonov](https://github.com/filimonov)).
-* Fix excessive reserving of threads for simple queries (optimization for reducing the number of threads, which was partly broken after changes in pipeline). [#11114](https://github.com/ClickHouse/ClickHouse/pull/11114) ([Azat Khuzhin](https://github.com/azat)).
-* Fix predicates optimization for distributed queries (`enable_optimize_predicate_expression=1`) for queries with `HAVING` section (i.e. when filtering on the server initiator is required), by preserving the order of expressions (and this is enough to fix), and also force aggregator use column names over indexes. Fixes: [#10613](https://github.com/ClickHouse/ClickHouse/issues/10613), [#11413](https://github.com/ClickHouse/ClickHouse/issues/11413). [#10621](https://github.com/ClickHouse/ClickHouse/pull/10621) ([Azat Khuzhin](https://github.com/azat)).
-
-#### Build/Testing/Packaging Improvement
-
-* Fix several flaky integration tests. [#11355](https://github.com/ClickHouse/ClickHouse/pull/11355) ([alesapin](https://github.com/alesapin)).
-
-### ClickHouse release v20.4.4.18-stable 2020-05-26
-
-No changes compared to v20.4.3.16-stable.
-
-### ClickHouse release v20.4.3.16-stable 2020-05-23
-
-#### Bug Fix
-
-* Removed logging from mutation finalization task if nothing was finalized. [#11109](https://github.com/ClickHouse/ClickHouse/pull/11109) ([alesapin](https://github.com/alesapin)).
-* Fixed memory leak in registerDiskS3. [#11074](https://github.com/ClickHouse/ClickHouse/pull/11074) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Fixed the potential missed data during termination of Kafka engine table. [#11048](https://github.com/ClickHouse/ClickHouse/pull/11048) ([filimonov](https://github.com/filimonov)).
-* Fixed `parseDateTime64BestEffort` argument resolution bugs. [#11038](https://github.com/ClickHouse/ClickHouse/pull/11038) ([Vasily Nemkov](https://github.com/Enmk)).
-* Fixed very rare potential use-after-free error in `MergeTree` if table was not created successfully. [#10986](https://github.com/ClickHouse/ClickHouse/pull/10986), [#10970](https://github.com/ClickHouse/ClickHouse/pull/10970) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed metadata (relative path for rename) and data (relative path for symlink) handling for Atomic database. [#10980](https://github.com/ClickHouse/ClickHouse/pull/10980) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed server crash on concurrent `ALTER` and `DROP DATABASE` queries with `Atomic` database engine. [#10968](https://github.com/ClickHouse/ClickHouse/pull/10968) ([tavplubix](https://github.com/tavplubix)).
-* Fixed incorrect raw data size in `getRawData()` method. [#10964](https://github.com/ClickHouse/ClickHouse/pull/10964) ([Igr](https://github.com/ObjatieGroba)).
-* Fixed incompatibility of two-level aggregation between versions 20.1 and earlier. This incompatibility happens when different versions of ClickHouse are used on initiator node and remote nodes and the size of GROUP BY result is large and aggregation is performed by a single String field. It leads to several unmerged rows for a single key in result. [#10952](https://github.com/ClickHouse/ClickHouse/pull/10952) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed sending partially written files by the `DistributedBlockOutputStream`. [#10940](https://github.com/ClickHouse/ClickHouse/pull/10940) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed crash in `SELECT count(notNullIn(NULL, []))`. [#10920](https://github.com/ClickHouse/ClickHouse/pull/10920) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed the hang which was happening sometimes during `DROP` of `Kafka` table engine. (or during server restarts). [#10910](https://github.com/ClickHouse/ClickHouse/pull/10910) ([filimonov](https://github.com/filimonov)).
-* Fixed the impossibility of executing multiple `ALTER RENAME` like `a TO b, c TO a`. [#10895](https://github.com/ClickHouse/ClickHouse/pull/10895) ([alesapin](https://github.com/alesapin)).
-* Fixed possible race which could happen when you get result from aggregate function state from multiple thread for the same column. The only way it can happen is when you use `finalizeAggregation` function while reading from table with `Memory` engine which stores `AggregateFunction` state for `quantile*` function. [#10890](https://github.com/ClickHouse/ClickHouse/pull/10890) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed backward compatibility with tuples in Distributed tables. [#10889](https://github.com/ClickHouse/ClickHouse/pull/10889) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed `SIGSEGV` in `StringHashTable` if such a key does not exist. [#10870](https://github.com/ClickHouse/ClickHouse/pull/10870) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed `WATCH` hangs after `LiveView` table was dropped from database with `Atomic` engine. [#10859](https://github.com/ClickHouse/ClickHouse/pull/10859) ([tavplubix](https://github.com/tavplubix)).
-* Fixed bug in `ReplicatedMergeTree` which might cause some `ALTER` on `OPTIMIZE` query to hang waiting for some replica after it become inactive. [#10849](https://github.com/ClickHouse/ClickHouse/pull/10849) ([tavplubix](https://github.com/tavplubix)).
-* Now constraints are updated if the column participating in `CONSTRAINT` expression was renamed. Fixes [#10844](https://github.com/ClickHouse/ClickHouse/issues/10844). [#10847](https://github.com/ClickHouse/ClickHouse/pull/10847) ([alesapin](https://github.com/alesapin)).
-* Fixed potential read of uninitialized memory in cache-dictionary. [#10834](https://github.com/ClickHouse/ClickHouse/pull/10834) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed columns order after `Block::sortColumns()`. [#10826](https://github.com/ClickHouse/ClickHouse/pull/10826) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed the issue with `ODBC` bridge when no quoting of identifiers is requested. Fixes [#7984](https://github.com/ClickHouse/ClickHouse/issues/7984). [#10821](https://github.com/ClickHouse/ClickHouse/pull/10821) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed `UBSan` and `MSan` report in `DateLUT`. [#10798](https://github.com/ClickHouse/ClickHouse/pull/10798) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed incorrect type conversion in key conditions. Fixes [#6287](https://github.com/ClickHouse/ClickHouse/issues/6287). [#10791](https://github.com/ClickHouse/ClickHouse/pull/10791) ([Andrew Onyshchuk](https://github.com/oandrew)).
-* Fixed `parallel_view_processing` behavior. Now all insertions into `MATERIALIZED VIEW` without exception should be finished if exception happened. Fixes [#10241](https://github.com/ClickHouse/ClickHouse/issues/10241). [#10757](https://github.com/ClickHouse/ClickHouse/pull/10757) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed combinator `-OrNull` and `-OrDefault` when combined with `-State`. [#10741](https://github.com/ClickHouse/ClickHouse/pull/10741) ([hcz](https://github.com/hczhcz)).
-* Fixed possible buffer overflow in function `h3EdgeAngle`. [#10711](https://github.com/ClickHouse/ClickHouse/pull/10711) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed bug which locks concurrent alters when table has a lot of parts. [#10659](https://github.com/ClickHouse/ClickHouse/pull/10659) ([alesapin](https://github.com/alesapin)).
-* Fixed `nullptr` dereference in `StorageBuffer` if server was shutdown before table startup. [#10641](https://github.com/ClickHouse/ClickHouse/pull/10641) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed `optimize_skip_unused_shards` with `LowCardinality`. [#10611](https://github.com/ClickHouse/ClickHouse/pull/10611) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed handling condition variable for synchronous mutations. In some cases signals to that condition variable could be lost. [#10588](https://github.com/ClickHouse/ClickHouse/pull/10588) ([Vladimir Chebotarev](https://github.com/excitoon)).
-* Fixed possible crash when `createDictionary()` is called before `loadStoredObject()` has finished. [#10587](https://github.com/ClickHouse/ClickHouse/pull/10587) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fixed `SELECT` of column `ALIAS` which default expression type different from column type. [#10563](https://github.com/ClickHouse/ClickHouse/pull/10563) ([Azat Khuzhin](https://github.com/azat)).
-* Implemented comparison between DateTime64 and String values. [#10560](https://github.com/ClickHouse/ClickHouse/pull/10560) ([Vasily Nemkov](https://github.com/Enmk)).
-* Disable `GROUP BY` sharding_key optimization by default (`optimize_distributed_group_by_sharding_key` had been introduced and turned of by default, due to trickery of sharding_key analyzing, simple example is `if` in sharding key) and fix it for `WITH ROLLUP/CUBE/TOTALS`. [#10516](https://github.com/ClickHouse/ClickHouse/pull/10516) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed [#10263](https://github.com/ClickHouse/ClickHouse/issues/10263). [#10486](https://github.com/ClickHouse/ClickHouse/pull/10486) ([Azat Khuzhin](https://github.com/azat)).
-* Added tests about `max_rows_to_sort` setting. [#10268](https://github.com/ClickHouse/ClickHouse/pull/10268) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Added backward compatibility for create bloom filter index. [#10551](https://github.com/ClickHouse/ClickHouse/issues/10551). [#10569](https://github.com/ClickHouse/ClickHouse/pull/10569) ([Winter Zhang](https://github.com/zhang2014)).
-
-### ClickHouse release v20.4.2.9, 2020-05-12
-
-#### Backward Incompatible Change
-* System tables (e.g. system.query_log, system.trace_log, system.metric_log) are using compact data part format for parts smaller than 10 MiB in size. Compact data part format is supported since version 20.3. If you are going to downgrade to version less than 20.3, you should manually delete table data for system logs in `/var/lib/clickhouse/data/system/`.
-* When string comparison involves FixedString and compared arguments are of different sizes, do comparison as if smaller string is padded to the length of the larger. This is intented for SQL compatibility if we imagine that FixedString data type corresponds to SQL CHAR. This closes [#9272](https://github.com/ClickHouse/ClickHouse/issues/9272). [#10363](https://github.com/ClickHouse/ClickHouse/pull/10363) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Make SHOW CREATE TABLE multiline. Now it is more readable and more like MySQL. [#10049](https://github.com/ClickHouse/ClickHouse/pull/10049) ([Azat Khuzhin](https://github.com/azat))
-* Added a setting `validate_polygons` that is used in `pointInPolygon` function and enabled by default. [#9857](https://github.com/ClickHouse/ClickHouse/pull/9857) ([alexey-milovidov](https://github.com/alexey-milovidov))
-
-#### New Feature
-* Add support for secured connection from ClickHouse to Zookeeper [#10184](https://github.com/ClickHouse/ClickHouse/pull/10184) ([Konstantin Lebedev](https://github.com/xzkostyan))
-* Support custom HTTP handlers. See [#5436](https://github.com/ClickHouse/ClickHouse/issues/5436) for description. [#7572](https://github.com/ClickHouse/ClickHouse/pull/7572) ([Winter Zhang](https://github.com/zhang2014))
-* Add MessagePack Input/Output format. [#9889](https://github.com/ClickHouse/ClickHouse/pull/9889) ([Kruglov Pavel](https://github.com/Avogar))
-* Add Regexp input format. [#9196](https://github.com/ClickHouse/ClickHouse/pull/9196) ([Kruglov Pavel](https://github.com/Avogar))
-* Added output format `Markdown` for embedding tables in markdown documents. [#10317](https://github.com/ClickHouse/ClickHouse/pull/10317) ([Kruglov Pavel](https://github.com/Avogar))
-* Added support for custom settings section in dictionaries. Also fixes issue [#2829](https://github.com/ClickHouse/ClickHouse/issues/2829). [#10137](https://github.com/ClickHouse/ClickHouse/pull/10137) ([Artem Streltsov](https://github.com/kekekekule))
-* Added custom settings support in DDL-queries for `CREATE DICTIONARY` [#10465](https://github.com/ClickHouse/ClickHouse/pull/10465) ([Artem Streltsov](https://github.com/kekekekule))
-* Add simple server-wide memory profiler that will collect allocation contexts when server memory usage becomes higher than the next allocation threshold. [#10444](https://github.com/ClickHouse/ClickHouse/pull/10444) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Add setting `always_fetch_merged_part` which restrict replica to merge parts by itself and always prefer dowloading from other replicas. [#10379](https://github.com/ClickHouse/ClickHouse/pull/10379) ([alesapin](https://github.com/alesapin))
-* Add function `JSONExtractKeysAndValuesRaw` which extracts raw data from JSON objects [#10378](https://github.com/ClickHouse/ClickHouse/pull/10378) ([hcz](https://github.com/hczhcz))
-* Add memory usage from OS to `system.asynchronous_metrics`. [#10361](https://github.com/ClickHouse/ClickHouse/pull/10361) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Added generic variants for functions `least` and `greatest`. Now they work with arbitrary number of arguments of arbitrary types. This fixes [#4767](https://github.com/ClickHouse/ClickHouse/issues/4767) [#10318](https://github.com/ClickHouse/ClickHouse/pull/10318) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Now ClickHouse controls timeouts of dictionary sources on its side. Two new settings added to cache dictionary configuration: `strict_max_lifetime_seconds`, which is `max_lifetime` by default, and `query_wait_timeout_milliseconds`, which is one minute by default. The first settings is also useful with `allow_read_expired_keys` settings (to forbid reading very expired keys). [#10337](https://github.com/ClickHouse/ClickHouse/pull/10337) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
-* Add log_queries_min_type to filter which entries will be written to query_log [#10053](https://github.com/ClickHouse/ClickHouse/pull/10053) ([Azat Khuzhin](https://github.com/azat))
-* Added function `isConstant`. This function checks whether its argument is constant expression and returns 1 or 0. It is intended for development, debugging and demonstration purposes. [#10198](https://github.com/ClickHouse/ClickHouse/pull/10198) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* add joinGetOrNull to return NULL when key is missing instead of returning the default value. [#10094](https://github.com/ClickHouse/ClickHouse/pull/10094) ([Amos Bird](https://github.com/amosbird))
-* Consider `NULL` to be equal to `NULL` in `IN` operator, if the option `transform_null_in` is set. [#10085](https://github.com/ClickHouse/ClickHouse/pull/10085) ([achimbab](https://github.com/achimbab))
-* Add `ALTER TABLE ... RENAME COLUMN` for MergeTree table engines family. [#9948](https://github.com/ClickHouse/ClickHouse/pull/9948) ([alesapin](https://github.com/alesapin))
-* Support parallel distributed INSERT SELECT. [#9759](https://github.com/ClickHouse/ClickHouse/pull/9759) ([vxider](https://github.com/Vxider))
-* Add ability to query Distributed over Distributed (w/o `distributed_group_by_no_merge`) ... [#9923](https://github.com/ClickHouse/ClickHouse/pull/9923) ([Azat Khuzhin](https://github.com/azat))
-* Add function `arrayReduceInRanges` which aggregates array elements in given ranges. [#9598](https://github.com/ClickHouse/ClickHouse/pull/9598) ([hcz](https://github.com/hczhcz))
-* Add Dictionary Status on prometheus exporter. [#9622](https://github.com/ClickHouse/ClickHouse/pull/9622) ([Guillaume Tassery](https://github.com/YiuRULE))
-* Add function `arrayAUC` [#8698](https://github.com/ClickHouse/ClickHouse/pull/8698) ([taiyang-li](https://github.com/taiyang-li))
-* Support `DROP VIEW` statement for better TPC-H compatibility. [#9831](https://github.com/ClickHouse/ClickHouse/pull/9831) ([Amos Bird](https://github.com/amosbird))
-* Add 'strict_order' option to windowFunnel() [#9773](https://github.com/ClickHouse/ClickHouse/pull/9773) ([achimbab](https://github.com/achimbab))
-* Support `DATE` and `TIMESTAMP` SQL operators, e.g. `SELECT date '2001-01-01'` [#9691](https://github.com/ClickHouse/ClickHouse/pull/9691) ([Artem Zuikov](https://github.com/4ertus2))
-
-#### Experimental Feature
-* Added experimental database engine Atomic. It supports non-blocking `DROP` and `RENAME TABLE` queries and atomic `EXCHANGE TABLES t1 AND t2` query [#7512](https://github.com/ClickHouse/ClickHouse/pull/7512) ([tavplubix](https://github.com/tavplubix))
-* Initial support for ReplicatedMergeTree over S3 (it works in suboptimal way) [#10126](https://github.com/ClickHouse/ClickHouse/pull/10126) ([Pavel Kovalenko](https://github.com/Jokser))
-
-#### Bug Fix
-* Fixed incorrect scalar results inside inner query of `MATERIALIZED VIEW` in case if this query contained dependent table [#10603](https://github.com/ClickHouse/ClickHouse/pull/10603) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fixed bug, which caused HTTP requests to get stuck on client closing connection when `readonly=2` and `cancel_http_readonly_queries_on_client_close=1`. [#10684](https://github.com/ClickHouse/ClickHouse/pull/10684) ([tavplubix](https://github.com/tavplubix))
-* Fix segfault in StorageBuffer when exception is thrown on server startup. Fixes [#10550](https://github.com/ClickHouse/ClickHouse/issues/10550) [#10609](https://github.com/ClickHouse/ClickHouse/pull/10609) ([tavplubix](https://github.com/tavplubix))
-* The query`SYSTEM DROP DNS CACHE` now also drops caches used to check if user is allowed to connect from some IP addresses [#10608](https://github.com/ClickHouse/ClickHouse/pull/10608) ([tavplubix](https://github.com/tavplubix))
-* Fix usage of multiple `IN` operators with an identical set in one query. Fixes [#10539](https://github.com/ClickHouse/ClickHouse/issues/10539) [#10686](https://github.com/ClickHouse/ClickHouse/pull/10686) ([Anton Popov](https://github.com/CurtizJ))
-* Fix crash in `generateRandom` with nested types. Fixes [#10583](https://github.com/ClickHouse/ClickHouse/issues/10583). [#10734](https://github.com/ClickHouse/ClickHouse/pull/10734) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fix data corruption for `LowCardinality(FixedString)` key column in `SummingMergeTree` which could have happened after merge. Fixes [#10489](https://github.com/ClickHouse/ClickHouse/issues/10489). [#10721](https://github.com/ClickHouse/ClickHouse/pull/10721) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fix logic for aggregation_memory_efficient_merge_threads setting. [#10667](https://github.com/ClickHouse/ClickHouse/pull/10667) ([palasonic1](https://github.com/palasonic1))
-* Fix disappearing totals. Totals could have being filtered if query had `JOIN` or subquery with external `WHERE` condition. Fixes [#10674](https://github.com/ClickHouse/ClickHouse/issues/10674) [#10698](https://github.com/ClickHouse/ClickHouse/pull/10698) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fix the lack of parallel execution of remote queries with `distributed_aggregation_memory_efficient` enabled. Fixes [#10655](https://github.com/ClickHouse/ClickHouse/issues/10655) [#10664](https://github.com/ClickHouse/ClickHouse/pull/10664) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fix possible incorrect number of rows for queries with `LIMIT`. Fixes [#10566](https://github.com/ClickHouse/ClickHouse/issues/10566), [#10709](https://github.com/ClickHouse/ClickHouse/issues/10709) [#10660](https://github.com/ClickHouse/ClickHouse/pull/10660) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fix index corruption, which may occur in some cases after merging compact parts into another compact part. [#10531](https://github.com/ClickHouse/ClickHouse/pull/10531) ([Anton Popov](https://github.com/CurtizJ))
-* Fix the situation, when mutation finished all parts, but hung up in `is_done=0`. [#10526](https://github.com/ClickHouse/ClickHouse/pull/10526) ([alesapin](https://github.com/alesapin))
-* Fix overflow at beginning of unix epoch for timezones with fractional offset from UTC. Fixes [#9335](https://github.com/ClickHouse/ClickHouse/issues/9335). [#10513](https://github.com/ClickHouse/ClickHouse/pull/10513) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Better diagnostics for input formats. Fixes [#10204](https://github.com/ClickHouse/ClickHouse/issues/10204) [#10418](https://github.com/ClickHouse/ClickHouse/pull/10418) ([tavplubix](https://github.com/tavplubix))
-* Fix numeric overflow in `simpleLinearRegression()` over large integers [#10474](https://github.com/ClickHouse/ClickHouse/pull/10474) ([hcz](https://github.com/hczhcz))
-* Fix use-after-free in Distributed shutdown, avoid waiting for sending all batches [#10491](https://github.com/ClickHouse/ClickHouse/pull/10491) ([Azat Khuzhin](https://github.com/azat))
-* Add CA certificates to clickhouse-server docker image [#10476](https://github.com/ClickHouse/ClickHouse/pull/10476) ([filimonov](https://github.com/filimonov))
-* Fix a rare endless loop that might have occurred when using the `addressToLine` function or AggregateFunctionState columns. [#10466](https://github.com/ClickHouse/ClickHouse/pull/10466) ([Alexander Kuzmenkov](https://github.com/akuzm))
-* Handle zookeeper "no node error" during distributed query [#10050](https://github.com/ClickHouse/ClickHouse/pull/10050) ([Daniel Chen](https://github.com/Phantomape))
-* Fix bug when server cannot attach table after column's default was altered. [#10441](https://github.com/ClickHouse/ClickHouse/pull/10441) ([alesapin](https://github.com/alesapin))
-* Implicitly cast the default expression type to the column type for the ALIAS columns [#10563](https://github.com/ClickHouse/ClickHouse/pull/10563) ([Azat Khuzhin](https://github.com/azat))
-* Don't remove metadata directory if `ATTACH DATABASE` fails [#10442](https://github.com/ClickHouse/ClickHouse/pull/10442) ([Winter Zhang](https://github.com/zhang2014))
-* Avoid dependency on system tzdata. Fixes loading of `Africa/Casablanca` timezone on CentOS 8. Fixes [#10211](https://github.com/ClickHouse/ClickHouse/issues/10211) [#10425](https://github.com/ClickHouse/ClickHouse/pull/10425) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix some issues if data is inserted with quorum and then gets deleted (DROP PARTITION, TTL, etc.). It led to stuck of INSERTs or false-positive exceptions in SELECTs. Fixes [#9946](https://github.com/ClickHouse/ClickHouse/issues/9946) [#10188](https://github.com/ClickHouse/ClickHouse/pull/10188) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
-* Check the number and type of arguments when creating BloomFilter index [#9623](https://github.com/ClickHouse/ClickHouse/issues/9623) [#10431](https://github.com/ClickHouse/ClickHouse/pull/10431) ([Winter Zhang](https://github.com/zhang2014))
-* Prefer `fallback_to_stale_replicas` over `skip_unavailable_shards`, otherwise when both settings specified and there are no up-to-date replicas the query will fail (patch from @alex-zaitsev ) [#10422](https://github.com/ClickHouse/ClickHouse/pull/10422) ([Azat Khuzhin](https://github.com/azat))
-* Fix the issue when a query with ARRAY JOIN, ORDER BY and LIMIT may return incomplete result. Fixes [#10226](https://github.com/ClickHouse/ClickHouse/issues/10226). [#10427](https://github.com/ClickHouse/ClickHouse/pull/10427) ([Vadim Plakhtinskiy](https://github.com/VadimPlh))
-* Add database name to dictionary name after DETACH/ATTACH. Fixes system.dictionaries table and `SYSTEM RELOAD` query [#10415](https://github.com/ClickHouse/ClickHouse/pull/10415) ([Azat Khuzhin](https://github.com/azat))
-* Fix possible incorrect result for extremes in processors pipeline. [#10131](https://github.com/ClickHouse/ClickHouse/pull/10131) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fix possible segfault when the setting `distributed_group_by_no_merge` is enabled (introduced in 20.3.7.46 by [#10131](https://github.com/ClickHouse/ClickHouse/issues/10131)). [#10399](https://github.com/ClickHouse/ClickHouse/pull/10399) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fix wrong flattening of `Array(Tuple(...))` data types. Fixes [#10259](https://github.com/ClickHouse/ClickHouse/issues/10259) [#10390](https://github.com/ClickHouse/ClickHouse/pull/10390) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix column names of constants inside JOIN that may clash with names of constants outside of JOIN [#9950](https://github.com/ClickHouse/ClickHouse/pull/9950) ([Alexander Kuzmenkov](https://github.com/akuzm))
-* Fix order of columns after Block::sortColumns() [#10826](https://github.com/ClickHouse/ClickHouse/pull/10826) ([Azat Khuzhin](https://github.com/azat))
-* Fix possible `Pipeline stuck` error in `ConcatProcessor` which may happen in remote query. [#10381](https://github.com/ClickHouse/ClickHouse/pull/10381) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Don't make disk reservations for aggregations. Fixes [#9241](https://github.com/ClickHouse/ClickHouse/issues/9241) [#10375](https://github.com/ClickHouse/ClickHouse/pull/10375) ([Azat Khuzhin](https://github.com/azat))
-* Fix wrong behaviour of datetime functions for timezones that has altered between positive and negative offsets from UTC (e.g. Pacific/Kiritimati). Fixes [#7202](https://github.com/ClickHouse/ClickHouse/issues/7202) [#10369](https://github.com/ClickHouse/ClickHouse/pull/10369) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Avoid infinite loop in `dictIsIn` function. Fixes #515 [#10365](https://github.com/ClickHouse/ClickHouse/pull/10365) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Disable GROUP BY sharding_key optimization by default and fix it for WITH ROLLUP/CUBE/TOTALS [#10516](https://github.com/ClickHouse/ClickHouse/pull/10516) ([Azat Khuzhin](https://github.com/azat))
-* Check for error code when checking parts and don't mark part as broken if the error is like "not enough memory". Fixes [#6269](https://github.com/ClickHouse/ClickHouse/issues/6269) [#10364](https://github.com/ClickHouse/ClickHouse/pull/10364) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Show information about not loaded dictionaries in system tables. [#10234](https://github.com/ClickHouse/ClickHouse/pull/10234) ([Vitaly Baranov](https://github.com/vitlibar))
-* Fix nullptr dereference in StorageBuffer if server was shutdown before table startup. [#10641](https://github.com/ClickHouse/ClickHouse/pull/10641) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fixed `DROP` vs `OPTIMIZE` race in `ReplicatedMergeTree`. `DROP` could left some garbage in replica path in ZooKeeper if there was concurrent `OPTIMIZE` query. [#10312](https://github.com/ClickHouse/ClickHouse/pull/10312) ([tavplubix](https://github.com/tavplubix))
-* Fix 'Logical error: CROSS JOIN has expressions' error for queries with comma and names joins mix. Fixes [#9910](https://github.com/ClickHouse/ClickHouse/issues/9910) [#10311](https://github.com/ClickHouse/ClickHouse/pull/10311) ([Artem Zuikov](https://github.com/4ertus2))
-* Fix queries with `max_bytes_before_external_group_by`. [#10302](https://github.com/ClickHouse/ClickHouse/pull/10302) ([Artem Zuikov](https://github.com/4ertus2))
-* Fix the issue with limiting maximum recursion depth in parser in certain cases. This fixes [#10283](https://github.com/ClickHouse/ClickHouse/issues/10283) This fix may introduce minor incompatibility: long and deep queries via clickhouse-client may refuse to work, and you should adjust settings `max_query_size` and `max_parser_depth` accordingly. [#10295](https://github.com/ClickHouse/ClickHouse/pull/10295) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Allow to use `count(*)` with multiple JOINs. Fixes [#9853](https://github.com/ClickHouse/ClickHouse/issues/9853) [#10291](https://github.com/ClickHouse/ClickHouse/pull/10291) ([Artem Zuikov](https://github.com/4ertus2))
-* Fix error `Pipeline stuck` with `max_rows_to_group_by` and `group_by_overflow_mode = 'break'`. [#10279](https://github.com/ClickHouse/ClickHouse/pull/10279) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fix 'Cannot add column' error while creating `range_hashed` dictionary using DDL query. Fixes [#10093](https://github.com/ClickHouse/ClickHouse/issues/10093). [#10235](https://github.com/ClickHouse/ClickHouse/pull/10235) ([alesapin](https://github.com/alesapin))
-* Fix rare possible exception `Cannot drain connections: cancel first`. [#10239](https://github.com/ClickHouse/ClickHouse/pull/10239) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fixed bug where ClickHouse would throw "Unknown function lambda." error message when user tries to run ALTER UPDATE/DELETE on tables with ENGINE = Replicated*. Check for nondeterministic functions now handles lambda expressions correctly. [#10237](https://github.com/ClickHouse/ClickHouse/pull/10237) ([Alexander Kazakov](https://github.com/Akazz))
-* Fixed reasonably rare segfault in StorageSystemTables that happens when SELECT ... FROM system.tables is run on a database with Lazy engine. [#10209](https://github.com/ClickHouse/ClickHouse/pull/10209) ([Alexander Kazakov](https://github.com/Akazz))
-* Fix possible infinite query execution when the query actually should stop on LIMIT, while reading from infinite source like `system.numbers` or `system.zeros`. [#10206](https://github.com/ClickHouse/ClickHouse/pull/10206) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fixed "generateRandom" function for Date type. This fixes [#9973](https://github.com/ClickHouse/ClickHouse/issues/9973). Fix an edge case when dates with year 2106 are inserted to MergeTree tables with old-style partitioning but partitions are named with year 1970. [#10218](https://github.com/ClickHouse/ClickHouse/pull/10218) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Convert types if the table definition of a View does not correspond to the SELECT query. This fixes [#10180](https://github.com/ClickHouse/ClickHouse/issues/10180) and [#10022](https://github.com/ClickHouse/ClickHouse/issues/10022) [#10217](https://github.com/ClickHouse/ClickHouse/pull/10217) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix `parseDateTimeBestEffort` for strings in RFC-2822 when day of week is Tuesday or Thursday. This fixes [#10082](https://github.com/ClickHouse/ClickHouse/issues/10082) [#10214](https://github.com/ClickHouse/ClickHouse/pull/10214) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix column names of constants inside JOIN that may clash with names of constants outside of JOIN. [#10207](https://github.com/ClickHouse/ClickHouse/pull/10207) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix move-to-prewhere optimization in presense of arrayJoin functions (in certain cases). This fixes [#10092](https://github.com/ClickHouse/ClickHouse/issues/10092) [#10195](https://github.com/ClickHouse/ClickHouse/pull/10195) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix issue with separator appearing in SCRAMBLE for native mysql-connector-java (JDBC) [#10140](https://github.com/ClickHouse/ClickHouse/pull/10140) ([BohuTANG](https://github.com/BohuTANG))
-* Fix using the current database for an access checking when the database isn't specified. [#10192](https://github.com/ClickHouse/ClickHouse/pull/10192) ([Vitaly Baranov](https://github.com/vitlibar))
-* Fix ALTER of tables with compact parts. [#10130](https://github.com/ClickHouse/ClickHouse/pull/10130) ([Anton Popov](https://github.com/CurtizJ))
-* Add the ability to relax the restriction on non-deterministic functions usage in mutations with `allow_nondeterministic_mutations` setting. [#10186](https://github.com/ClickHouse/ClickHouse/pull/10186) ([filimonov](https://github.com/filimonov))
-* Fix `DROP TABLE` invoked for dictionary [#10165](https://github.com/ClickHouse/ClickHouse/pull/10165) ([Azat Khuzhin](https://github.com/azat))
-* Convert blocks if structure does not match when doing `INSERT` into Distributed table [#10135](https://github.com/ClickHouse/ClickHouse/pull/10135) ([Azat Khuzhin](https://github.com/azat))
-* The number of rows was logged incorrectly (as sum across all parts) when inserted block is split by parts with partition key. [#10138](https://github.com/ClickHouse/ClickHouse/pull/10138) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Add some arguments check and support identifier arguments for MySQL Database Engine [#10077](https://github.com/ClickHouse/ClickHouse/pull/10077) ([Winter Zhang](https://github.com/zhang2014))
-* Fix incorrect `index_granularity_bytes` check while creating new replica. Fixes [#10098](https://github.com/ClickHouse/ClickHouse/issues/10098). [#10121](https://github.com/ClickHouse/ClickHouse/pull/10121) ([alesapin](https://github.com/alesapin))
-* Fix bug in `CHECK TABLE` query when table contain skip indices. [#10068](https://github.com/ClickHouse/ClickHouse/pull/10068) ([alesapin](https://github.com/alesapin))
-* Fix Distributed-over-Distributed with the only one shard in a nested table [#9997](https://github.com/ClickHouse/ClickHouse/pull/9997) ([Azat Khuzhin](https://github.com/azat))
-* Fix possible rows loss for queries with `JOIN` and `UNION ALL`. Fixes [#9826](https://github.com/ClickHouse/ClickHouse/issues/9826), [#10113](https://github.com/ClickHouse/ClickHouse/issues/10113). ... [#10099](https://github.com/ClickHouse/ClickHouse/pull/10099) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fix bug in dictionary when local clickhouse server is used as source. It may caused memory corruption if types in dictionary and source are not compatible. [#10071](https://github.com/ClickHouse/ClickHouse/pull/10071) ([alesapin](https://github.com/alesapin))
-* Fixed replicated tables startup when updating from an old ClickHouse version where `/table/replicas/replica_name/metadata` node doesn't exist. Fixes [#10037](https://github.com/ClickHouse/ClickHouse/issues/10037). [#10095](https://github.com/ClickHouse/ClickHouse/pull/10095) ([alesapin](https://github.com/alesapin))
-* Fix error `Cannot clone block with columns because block has 0 columns ... While executing GroupingAggregatedTransform`. It happened when setting `distributed_aggregation_memory_efficient` was enabled, and distributed query read aggregating data with mixed single and two-level aggregation from different shards.  [#10063](https://github.com/ClickHouse/ClickHouse/pull/10063) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fix deadlock when database with materialized view failed attach at start [#10054](https://github.com/ClickHouse/ClickHouse/pull/10054) ([Azat Khuzhin](https://github.com/azat))
-* Fix a segmentation fault that could occur in GROUP BY over string keys containing trailing zero bytes ([#8636](https://github.com/ClickHouse/ClickHouse/issues/8636), [#8925](https://github.com/ClickHouse/ClickHouse/issues/8925)). ... [#10025](https://github.com/ClickHouse/ClickHouse/pull/10025) ([Alexander Kuzmenkov](https://github.com/akuzm))
-* Fix wrong results of distributed queries when alias could override qualified column name. Fixes [#9672](https://github.com/ClickHouse/ClickHouse/issues/9672) [#9714](https://github.com/ClickHouse/ClickHouse/issues/9714) [#9972](https://github.com/ClickHouse/ClickHouse/pull/9972) ([Artem Zuikov](https://github.com/4ertus2))
-* Fix possible deadlock in `SYSTEM RESTART REPLICAS` [#9955](https://github.com/ClickHouse/ClickHouse/pull/9955) ([tavplubix](https://github.com/tavplubix))
-* Fix the number of threads used for remote query execution (performance regression, since 20.3). This happened when query from `Distributed` table was executed simultaneously on local and remote shards. Fixes [#9965](https://github.com/ClickHouse/ClickHouse/issues/9965) [#9971](https://github.com/ClickHouse/ClickHouse/pull/9971) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fixed `DeleteOnDestroy` logic in `ATTACH PART` which could lead to automatic removal of attached part and added few tests [#9410](https://github.com/ClickHouse/ClickHouse/pull/9410) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Fix a bug with `ON CLUSTER` DDL queries freezing on server startup. [#9927](https://github.com/ClickHouse/ClickHouse/pull/9927) ([Gagan Arneja](https://github.com/garneja))
-* Fix bug in which the necessary tables weren't retrieved at one of the processing stages of queries to some databases. Fixes [#9699](https://github.com/ClickHouse/ClickHouse/issues/9699). [#9949](https://github.com/ClickHouse/ClickHouse/pull/9949) ([achulkov2](https://github.com/achulkov2))
-* Fix 'Not found column in block' error when `JOIN` appears with `TOTALS`. Fixes [#9839](https://github.com/ClickHouse/ClickHouse/issues/9839) [#9939](https://github.com/ClickHouse/ClickHouse/pull/9939) ([Artem Zuikov](https://github.com/4ertus2))
-* Fix parsing multiple hosts set in the CREATE USER command [#9924](https://github.com/ClickHouse/ClickHouse/pull/9924) ([Vitaly Baranov](https://github.com/vitlibar))
-* Fix `TRUNCATE` for Join table engine ([#9917](https://github.com/ClickHouse/ClickHouse/issues/9917)). [#9920](https://github.com/ClickHouse/ClickHouse/pull/9920) ([Amos Bird](https://github.com/amosbird))
-* Fix race condition between drop and optimize in `ReplicatedMergeTree`. [#9901](https://github.com/ClickHouse/ClickHouse/pull/9901) ([alesapin](https://github.com/alesapin))
-* Fix `DISTINCT` for Distributed when `optimize_skip_unused_shards` is set. [#9808](https://github.com/ClickHouse/ClickHouse/pull/9808) ([Azat Khuzhin](https://github.com/azat))
-* Fix "scalar doesn't exist" error in ALTERs ([#9878](https://github.com/ClickHouse/ClickHouse/issues/9878)). ... [#9904](https://github.com/ClickHouse/ClickHouse/pull/9904) ([Amos Bird](https://github.com/amosbird))
-* Fix error with qualified names in `distributed_product_mode=\'local\'`. Fixes [#4756](https://github.com/ClickHouse/ClickHouse/issues/4756) [#9891](https://github.com/ClickHouse/ClickHouse/pull/9891) ([Artem Zuikov](https://github.com/4ertus2))
-* For INSERT queries shards now do clamp the settings from the initiator to their constraints instead of throwing an exception. This fix allows to send INSERT queries to a shard with another constraints. This change improves fix [#9447](https://github.com/ClickHouse/ClickHouse/issues/9447). [#9852](https://github.com/ClickHouse/ClickHouse/pull/9852) ([Vitaly Baranov](https://github.com/vitlibar))
-* Add some retries when commiting offsets to Kafka broker, since it can reject commit if during `offsets.commit.timeout.ms` there were no enough replicas available for the `__consumer_offsets` topic [#9884](https://github.com/ClickHouse/ClickHouse/pull/9884) ([filimonov](https://github.com/filimonov))
-* Fix Distributed engine behavior when virtual columns of the underlying table used in `WHERE` [#9847](https://github.com/ClickHouse/ClickHouse/pull/9847) ([Azat Khuzhin](https://github.com/azat))
-* Fixed some cases when timezone of the function argument wasn't used properly. [#9574](https://github.com/ClickHouse/ClickHouse/pull/9574) ([Vasily Nemkov](https://github.com/Enmk))
-* Fix 'Different expressions with the same alias' error when query has PREWHERE and WHERE on distributed table and `SET distributed_product_mode = 'local'`. [#9871](https://github.com/ClickHouse/ClickHouse/pull/9871) ([Artem Zuikov](https://github.com/4ertus2))
-* Fix mutations excessive memory consumption for tables with a composite primary key. This fixes [#9850](https://github.com/ClickHouse/ClickHouse/issues/9850). [#9860](https://github.com/ClickHouse/ClickHouse/pull/9860) ([alesapin](https://github.com/alesapin))
-* Fix calculating grants for introspection functions from the setting `allow_introspection_functions`. [#9840](https://github.com/ClickHouse/ClickHouse/pull/9840) ([Vitaly Baranov](https://github.com/vitlibar))
-* Fix max_distributed_connections (w/ and w/o Processors) [#9673](https://github.com/ClickHouse/ClickHouse/pull/9673) ([Azat Khuzhin](https://github.com/azat))
-* Fix possible exception `Got 0 in totals chunk, expected 1` on client. It happened for queries with `JOIN` in case if right joined table had zero rows. Example: `select * from system.one t1 join system.one t2 on t1.dummy = t2.dummy limit 0 FORMAT TabSeparated;`. Fixes [#9777](https://github.com/ClickHouse/ClickHouse/issues/9777). ... [#9823](https://github.com/ClickHouse/ClickHouse/pull/9823) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fix 'COMMA to CROSS JOIN rewriter is not enabled or cannot rewrite query' error in case of subqueries with COMMA JOIN out of tables lists (i.e. in WHERE). Fixes [#9782](https://github.com/ClickHouse/ClickHouse/issues/9782) [#9830](https://github.com/ClickHouse/ClickHouse/pull/9830) ([Artem Zuikov](https://github.com/4ertus2))
-* Fix server crashing when `optimize_skip_unused_shards` is set and expression for key can't be converted to its field type [#9804](https://github.com/ClickHouse/ClickHouse/pull/9804) ([Azat Khuzhin](https://github.com/azat))
-* Fix empty string handling in `splitByString`. [#9767](https://github.com/ClickHouse/ClickHouse/pull/9767) ([hcz](https://github.com/hczhcz))
-* Fix broken `ALTER TABLE DELETE COLUMN` query for compact parts. [#9779](https://github.com/ClickHouse/ClickHouse/pull/9779) ([alesapin](https://github.com/alesapin))
-* Fixed missing `rows_before_limit_at_least` for queries over http (with processors pipeline). Fixes [#9730](https://github.com/ClickHouse/ClickHouse/issues/9730) [#9757](https://github.com/ClickHouse/ClickHouse/pull/9757) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fix excessive memory consumption in `ALTER` queries (mutations). This fixes [#9533](https://github.com/ClickHouse/ClickHouse/issues/9533) and [#9670](https://github.com/ClickHouse/ClickHouse/issues/9670). [#9754](https://github.com/ClickHouse/ClickHouse/pull/9754) ([alesapin](https://github.com/alesapin))
-* Fix possible permanent "Cannot schedule a task" error. [#9154](https://github.com/ClickHouse/ClickHouse/pull/9154) ([Azat Khuzhin](https://github.com/azat))
-* Fix bug in backquoting in external dictionaries DDL. Fixes [#9619](https://github.com/ClickHouse/ClickHouse/issues/9619). [#9734](https://github.com/ClickHouse/ClickHouse/pull/9734) ([alesapin](https://github.com/alesapin))
-* Fixed data race in `text_log`. It does not correspond to any real bug. [#9726](https://github.com/ClickHouse/ClickHouse/pull/9726) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix bug in a replication that doesn't allow replication to work if the user has executed mutations on the previous version. This fixes [#9645](https://github.com/ClickHouse/ClickHouse/issues/9645). [#9652](https://github.com/ClickHouse/ClickHouse/pull/9652) ([alesapin](https://github.com/alesapin))
-* Fixed incorrect internal function names for `sumKahan` and `sumWithOverflow`. It led to exception while using this functions in remote queries. [#9636](https://github.com/ClickHouse/ClickHouse/pull/9636) ([Azat Khuzhin](https://github.com/azat))
-* Add setting `use_compact_format_in_distributed_parts_names` which allows to write files for `INSERT` queries into `Distributed` table with more compact format. This fixes [#9647](https://github.com/ClickHouse/ClickHouse/issues/9647). [#9653](https://github.com/ClickHouse/ClickHouse/pull/9653) ([alesapin](https://github.com/alesapin))
-* Fix RIGHT and FULL JOIN with LowCardinality in JOIN keys. [#9610](https://github.com/ClickHouse/ClickHouse/pull/9610) ([Artem Zuikov](https://github.com/4ertus2))
-* Fix possible exceptions `Size of filter doesn't match size of column` and `Invalid number of rows in Chunk` in `MergeTreeRangeReader`. They could appear while executing `PREWHERE` in some cases. [#9612](https://github.com/ClickHouse/ClickHouse/pull/9612) ([Anton Popov](https://github.com/CurtizJ))
-* Allow `ALTER ON CLUSTER` of Distributed tables with internal replication. This fixes [#3268](https://github.com/ClickHouse/ClickHouse/issues/3268) [#9617](https://github.com/ClickHouse/ClickHouse/pull/9617) ([shinoi2](https://github.com/shinoi2))
-* Fix issue when timezone was not preserved if you write a simple arithmetic expression like `time + 1` (in contrast to an expression like `time + INTERVAL 1 SECOND`). This fixes [#5743](https://github.com/ClickHouse/ClickHouse/issues/5743) [#9323](https://github.com/ClickHouse/ClickHouse/pull/9323) ([alexey-milovidov](https://github.com/alexey-milovidov))
-
-#### Improvement
-* Use time zone when comparing DateTime with string literal. This fixes [#5206](https://github.com/ClickHouse/ClickHouse/issues/5206). [#10515](https://github.com/ClickHouse/ClickHouse/pull/10515) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Print verbose diagnostic info if Decimal value cannot be parsed from text input format. [#10205](https://github.com/ClickHouse/ClickHouse/pull/10205) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Add tasks/memory metrics for distributed/buffer schedule pools [#10449](https://github.com/ClickHouse/ClickHouse/pull/10449) ([Azat Khuzhin](https://github.com/azat))
-* Display result as soon as it's ready for SELECT DISTINCT queries in clickhouse-local and HTTP interface. This fixes [#8951](https://github.com/ClickHouse/ClickHouse/issues/8951) [#9559](https://github.com/ClickHouse/ClickHouse/pull/9559) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Allow to use `SAMPLE OFFSET` query instead of `cityHash64(PRIMARY KEY) % N == n` for splitting in `clickhouse-copier`. To use this feature, pass `--experimental-use-sample-offset 1` as a command line argument. [#10414](https://github.com/ClickHouse/ClickHouse/pull/10414) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
-* Allow to parse BOM in TSV if the first column cannot contain BOM in its value. This fixes [#10301](https://github.com/ClickHouse/ClickHouse/issues/10301) [#10424](https://github.com/ClickHouse/ClickHouse/pull/10424) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Add Avro nested fields insert support [#10354](https://github.com/ClickHouse/ClickHouse/pull/10354) ([Andrew Onyshchuk](https://github.com/oandrew))
-* Allowed to alter column in non-modifying data mode when the same type is specified. [#10382](https://github.com/ClickHouse/ClickHouse/pull/10382) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Auto `distributed_group_by_no_merge` on GROUP BY sharding key (if `optimize_skip_unused_shards` is set) [#10341](https://github.com/ClickHouse/ClickHouse/pull/10341) ([Azat Khuzhin](https://github.com/azat))
-* Optimize queries with LIMIT/LIMIT BY/ORDER BY for distributed with GROUP BY sharding_key [#10373](https://github.com/ClickHouse/ClickHouse/pull/10373) ([Azat Khuzhin](https://github.com/azat))
-* Added a setting `max_server_memory_usage` to limit total memory usage of the server. The metric `MemoryTracking` is now calculated without a drift. The setting `max_memory_usage_for_all_queries` is now obsolete and does nothing. This closes [#10293](https://github.com/ClickHouse/ClickHouse/issues/10293). [#10362](https://github.com/ClickHouse/ClickHouse/pull/10362) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Add config option `system_tables_lazy_load`. If it's set to false, then system tables with logs are loaded at the server startup. [Alexander Burmak](https://github.com/Alex-Burmak), [Svyatoslav Tkhon Il Pak](https://github.com/DeifyTheGod), [#9642](https://github.com/ClickHouse/ClickHouse/pull/9642) [#10359](https://github.com/ClickHouse/ClickHouse/pull/10359) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Use background thread pool (background_schedule_pool_size) for distributed sends [#10263](https://github.com/ClickHouse/ClickHouse/pull/10263) ([Azat Khuzhin](https://github.com/azat))
-* Use background thread pool for background buffer flushes. [#10315](https://github.com/ClickHouse/ClickHouse/pull/10315) ([Azat Khuzhin](https://github.com/azat))
-* Support for one special case of removing incompletely written parts. This fixes [#9940](https://github.com/ClickHouse/ClickHouse/issues/9940). [#10221](https://github.com/ClickHouse/ClickHouse/pull/10221) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Use isInjective() over manual list of such functions for GROUP BY optimization. [#10342](https://github.com/ClickHouse/ClickHouse/pull/10342) ([Azat Khuzhin](https://github.com/azat))
-* Avoid printing error message in log if client sends RST packet immediately on connect. It is typical behaviour of IPVS balancer with keepalived and VRRP. This fixes [#1851](https://github.com/ClickHouse/ClickHouse/issues/1851) [#10274](https://github.com/ClickHouse/ClickHouse/pull/10274) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Allow to parse `+inf` for floating point types. This closes [#1839](https://github.com/ClickHouse/ClickHouse/issues/1839) [#10272](https://github.com/ClickHouse/ClickHouse/pull/10272) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Implemented `generateRandom` table function for Nested types. This closes [#9903](https://github.com/ClickHouse/ClickHouse/issues/9903) [#10219](https://github.com/ClickHouse/ClickHouse/pull/10219) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Provide `max_allowed_packed` in MySQL compatibility interface that will help some clients to communicate with ClickHouse via MySQL protocol. [#10199](https://github.com/ClickHouse/ClickHouse/pull/10199) ([BohuTANG](https://github.com/BohuTANG))
-* Allow literals for GLOBAL IN (i.e. `SELECT * FROM remote('localhost', system.one) WHERE dummy global in (0)`) [#10196](https://github.com/ClickHouse/ClickHouse/pull/10196) ([Azat Khuzhin](https://github.com/azat))
-* Fix various small issues in interactive mode of clickhouse-client [#10194](https://github.com/ClickHouse/ClickHouse/pull/10194) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Avoid superfluous dictionaries load (system.tables, DROP/SHOW CREATE TABLE) [#10164](https://github.com/ClickHouse/ClickHouse/pull/10164) ([Azat Khuzhin](https://github.com/azat))
-* Update to RWLock: timeout parameter for getLock() + implementation reworked to be phase fair [#10073](https://github.com/ClickHouse/ClickHouse/pull/10073) ([Alexander Kazakov](https://github.com/Akazz))
-* Enhanced compatibility with native mysql-connector-java(JDBC) [#10021](https://github.com/ClickHouse/ClickHouse/pull/10021) ([BohuTANG](https://github.com/BohuTANG))
-* The function `toString` is considered monotonic and can be used for index analysis even when applied in tautological cases with String or LowCardinality(String) argument. [#10110](https://github.com/ClickHouse/ClickHouse/pull/10110) ([Amos Bird](https://github.com/amosbird))
-* Add `ON CLUSTER` clause support to commands `{CREATE|DROP} USER/ROLE/ROW POLICY/SETTINGS PROFILE/QUOTA`, `GRANT`. [#9811](https://github.com/ClickHouse/ClickHouse/pull/9811) ([Vitaly Baranov](https://github.com/vitlibar))
-* Virtual hosted-style support for S3 URI [#9998](https://github.com/ClickHouse/ClickHouse/pull/9998) ([Pavel Kovalenko](https://github.com/Jokser))
-* Now layout type for dictionaries with no arguments can be specified without round brackets in dictionaries DDL-queries. Fixes [#10057](https://github.com/ClickHouse/ClickHouse/issues/10057). [#10064](https://github.com/ClickHouse/ClickHouse/pull/10064) ([alesapin](https://github.com/alesapin))
-* Add ability to use number ranges with leading zeros in filepath [#9989](https://github.com/ClickHouse/ClickHouse/pull/9989) ([Olga Khvostikova](https://github.com/stavrolia))
-* Better memory usage in CROSS JOIN. [#10029](https://github.com/ClickHouse/ClickHouse/pull/10029) ([Artem Zuikov](https://github.com/4ertus2))
-* Try to connect to all shards in cluster when getting structure of remote table and skip_unavailable_shards is set. [#7278](https://github.com/ClickHouse/ClickHouse/pull/7278) ([nvartolomei](https://github.com/nvartolomei))
-* Add `total_rows`/`total_bytes` into the `system.tables` table. [#9919](https://github.com/ClickHouse/ClickHouse/pull/9919) ([Azat Khuzhin](https://github.com/azat))
-* System log tables now use polymorpic parts by default. [#9905](https://github.com/ClickHouse/ClickHouse/pull/9905) ([Anton Popov](https://github.com/CurtizJ))
-* Add type column into system.settings/merge_tree_settings [#9909](https://github.com/ClickHouse/ClickHouse/pull/9909) ([Azat Khuzhin](https://github.com/azat))
-* Check for available CPU instructions at server startup as early as possible. [#9888](https://github.com/ClickHouse/ClickHouse/pull/9888) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Remove `ORDER BY` stage from mutations because we read from a single ordered part in a single thread. Also add check that the rows in mutation are ordered by sorting key and this order is not violated. [#9886](https://github.com/ClickHouse/ClickHouse/pull/9886) ([alesapin](https://github.com/alesapin))
-* Implement operator LIKE for FixedString at left hand side. This is needed to better support TPC-DS queries. [#9890](https://github.com/ClickHouse/ClickHouse/pull/9890) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Add `force_optimize_skip_unused_shards_no_nested` that will disable `force_optimize_skip_unused_shards` for nested Distributed table [#9812](https://github.com/ClickHouse/ClickHouse/pull/9812) ([Azat Khuzhin](https://github.com/azat))
-* Now columns size is calculated only once for MergeTree data parts. [#9827](https://github.com/ClickHouse/ClickHouse/pull/9827) ([alesapin](https://github.com/alesapin))
-* Evaluate constant expressions for `optimize_skip_unused_shards` (i.e. `SELECT * FROM foo_dist WHERE key=xxHash32(0)`) [#8846](https://github.com/ClickHouse/ClickHouse/pull/8846) ([Azat Khuzhin](https://github.com/azat))
-* Check for using `Date` or `DateTime` column from TTL expressions was removed. [#9967](https://github.com/ClickHouse/ClickHouse/pull/9967) ([Vladimir Chebotarev](https://github.com/excitoon))
-* DiskS3 hard links optimal implementation. [#9760](https://github.com/ClickHouse/ClickHouse/pull/9760) ([Pavel Kovalenko](https://github.com/Jokser))
-* If `set multiple_joins_rewriter_version = 2` enables second version of multiple JOIN rewrites that keeps not clashed column names as is. It supports multiple JOINs with `USING` and allow `select *` for JOINs with subqueries. [#9739](https://github.com/ClickHouse/ClickHouse/pull/9739) ([Artem Zuikov](https://github.com/4ertus2))
-* Implementation of "non-blocking" alter for StorageMergeTree [#9606](https://github.com/ClickHouse/ClickHouse/pull/9606) ([alesapin](https://github.com/alesapin))
-* Add MergeTree full support for DiskS3 [#9646](https://github.com/ClickHouse/ClickHouse/pull/9646) ([Pavel Kovalenko](https://github.com/Jokser))
-* Extend `splitByString` to support empty strings as separators. [#9742](https://github.com/ClickHouse/ClickHouse/pull/9742) ([hcz](https://github.com/hczhcz))
-* Add a `timestamp_ns` column to `system.trace_log`. It contains a high-definition timestamp of the trace event, and allows to build timelines of thread profiles ("flame charts"). [#9696](https://github.com/ClickHouse/ClickHouse/pull/9696) ([Alexander Kuzmenkov](https://github.com/akuzm))
-* When the setting `send_logs_level` is enabled, avoid intermixing of log messages and query progress. [#9634](https://github.com/ClickHouse/ClickHouse/pull/9634) ([Azat Khuzhin](https://github.com/azat))
-* Added support of `MATERIALIZE TTL IN PARTITION`. [#9581](https://github.com/ClickHouse/ClickHouse/pull/9581) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Support complex types inside Avro nested fields [#10502](https://github.com/ClickHouse/ClickHouse/pull/10502) ([Andrew Onyshchuk](https://github.com/oandrew))
-
-#### Performance Improvement
-* Better insert logic for right table for Partial MergeJoin. [#10467](https://github.com/ClickHouse/ClickHouse/pull/10467) ([Artem Zuikov](https://github.com/4ertus2))
-* Improved performance of row-oriented formats (more than 10% for CSV and more than 35% for Avro in case of narrow tables). [#10503](https://github.com/ClickHouse/ClickHouse/pull/10503) ([Andrew Onyshchuk](https://github.com/oandrew))
-* Improved performance of queries with explicitly defined sets at right side of IN operator and tuples on the left side. [#10385](https://github.com/ClickHouse/ClickHouse/pull/10385) ([Anton Popov](https://github.com/CurtizJ))
-* Use less memory for hash table in HashJoin. [#10416](https://github.com/ClickHouse/ClickHouse/pull/10416) ([Artem Zuikov](https://github.com/4ertus2))
-* Special HashJoin over StorageDictionary. Allow rewrite `dictGet()` functions with JOINs. It's not backward incompatible itself but could uncover [#8400](https://github.com/ClickHouse/ClickHouse/issues/8400) on some installations. [#10133](https://github.com/ClickHouse/ClickHouse/pull/10133) ([Artem Zuikov](https://github.com/4ertus2))
-* Enable parallel insert of materialized view when its target table supports. [#10052](https://github.com/ClickHouse/ClickHouse/pull/10052) ([vxider](https://github.com/Vxider))
-* Improved performance of index analysis with monotonic functions. [#9607](https://github.com/ClickHouse/ClickHouse/pull/9607)[#10026](https://github.com/ClickHouse/ClickHouse/pull/10026) ([Anton Popov](https://github.com/CurtizJ))
-* Using SSE2 or SSE4.2 SIMD intrinsics to speed up tokenization in bloom filters. [#9968](https://github.com/ClickHouse/ClickHouse/pull/9968) ([Vasily Nemkov](https://github.com/Enmk))
-* Improved performance of queries with explicitly defined sets at right side of `IN` operator. This fixes performance regression in version 20.3. [#9740](https://github.com/ClickHouse/ClickHouse/pull/9740) ([Anton Popov](https://github.com/CurtizJ))
-* Now clickhouse-copier splits each partition in number of pieces and copies them independently. [#9075](https://github.com/ClickHouse/ClickHouse/pull/9075) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
-* Adding more aggregation methods. For example TPC-H query 1 will now pick `FixedHashMap<UInt16, AggregateDataPtr>` and gets 25% performance gain [#9829](https://github.com/ClickHouse/ClickHouse/pull/9829) ([Amos Bird](https://github.com/amosbird))
-* Use single row counter for multiple streams in pre-limit transform. This helps to avoid uniting pipeline streams in queries with `limit` but without `order by` (like `select f(x) from (select x from t limit 1000000000)`) and use multiple threads for further processing. [#9602](https://github.com/ClickHouse/ClickHouse/pull/9602) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-
-#### Build/Testing/Packaging Improvement
-* Use a fork of AWS SDK libraries from ClickHouse-Extras [#10527](https://github.com/ClickHouse/ClickHouse/pull/10527) ([Pavel Kovalenko](https://github.com/Jokser))
-* Add integration tests for new ALTER RENAME COLUMN query. [#10654](https://github.com/ClickHouse/ClickHouse/pull/10654) ([vzakaznikov](https://github.com/vzakaznikov))
-* Fix possible signed integer overflow in invocation of function `now64` with wrong arguments. This fixes [#8973](https://github.com/ClickHouse/ClickHouse/issues/8973) [#10511](https://github.com/ClickHouse/ClickHouse/pull/10511) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Split fuzzer and sanitizer configurations to make build config compatible with Oss-fuzz. [#10494](https://github.com/ClickHouse/ClickHouse/pull/10494) ([kyprizel](https://github.com/kyprizel))
-* Fixes for clang-tidy on clang-10. [#10420](https://github.com/ClickHouse/ClickHouse/pull/10420) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Display absolute paths in error messages. Otherwise KDevelop fails to navigate to correct file and opens a new file instead. [#10434](https://github.com/ClickHouse/ClickHouse/pull/10434) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Added `ASAN_OPTIONS` environment variable to investigate errors in CI stress tests with Address sanitizer. [#10440](https://github.com/ClickHouse/ClickHouse/pull/10440) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
-* Enable ThinLTO for clang builds (experimental). [#10435](https://github.com/ClickHouse/ClickHouse/pull/10435) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Remove accidential dependency on Z3 that may be introduced if the system has Z3 solver installed. [#10426](https://github.com/ClickHouse/ClickHouse/pull/10426) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Move integration tests docker files to docker/ directory. [#10335](https://github.com/ClickHouse/ClickHouse/pull/10335) ([Ilya Yatsishin](https://github.com/qoega))
-* Allow to use `clang-10` in CI. It ensures that [#10238](https://github.com/ClickHouse/ClickHouse/issues/10238) is fixed. [#10384](https://github.com/ClickHouse/ClickHouse/pull/10384) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Update OpenSSL to upstream master. Fixed the issue when TLS connections may fail with the message `OpenSSL SSL_read: error:14094438:SSL routines:ssl3_read_bytes:tlsv1 alert internal error` and `SSL Exception: error:2400006E:random number generator::error retrieving entropy`. The issue was present in version 20.1. [#8956](https://github.com/ClickHouse/ClickHouse/pull/8956) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix clang-10 build. [#10238](https://github.com/ClickHouse/ClickHouse/issues/10238) [#10370](https://github.com/ClickHouse/ClickHouse/pull/10370) ([Amos Bird](https://github.com/amosbird))
-* Add performance test for [Parallel INSERT for materialized view](https://github.com/ClickHouse/ClickHouse/pull/10052). [#10345](https://github.com/ClickHouse/ClickHouse/pull/10345) ([vxider](https://github.com/Vxider))
-* Fix flaky test `test_settings_constraints_distributed.test_insert_clamps_settings`. [#10346](https://github.com/ClickHouse/ClickHouse/pull/10346) ([Vitaly Baranov](https://github.com/vitlibar))
-* Add util to test results upload in CI ClickHouse [#10330](https://github.com/ClickHouse/ClickHouse/pull/10330) ([Ilya Yatsishin](https://github.com/qoega))
-* Convert test results to JSONEachRow format in junit_to_html tool [#10323](https://github.com/ClickHouse/ClickHouse/pull/10323) ([Ilya Yatsishin](https://github.com/qoega))
-* Update cctz. [#10215](https://github.com/ClickHouse/ClickHouse/pull/10215) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Allow to create HTML report from the purest JUnit XML report. [#10247](https://github.com/ClickHouse/ClickHouse/pull/10247) ([Ilya Yatsishin](https://github.com/qoega))
-* Update the check for minimal compiler version. Fix the root cause of the issue [#10250](https://github.com/ClickHouse/ClickHouse/issues/10250) [#10256](https://github.com/ClickHouse/ClickHouse/pull/10256) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Initial support for live view tables over distributed [#10179](https://github.com/ClickHouse/ClickHouse/pull/10179) ([vzakaznikov](https://github.com/vzakaznikov))
-* Fix (false) MSan report in MergeTreeIndexFullText. The issue first appeared in [#9968](https://github.com/ClickHouse/ClickHouse/issues/9968). [#10801](https://github.com/ClickHouse/ClickHouse/pull/10801) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* clickhouse-docker-util [#10151](https://github.com/ClickHouse/ClickHouse/pull/10151) ([filimonov](https://github.com/filimonov))
-* Update pdqsort to recent version [#10171](https://github.com/ClickHouse/ClickHouse/pull/10171) ([Ivan](https://github.com/abyss7))
-* Update libdivide to v3.0 [#10169](https://github.com/ClickHouse/ClickHouse/pull/10169) ([Ivan](https://github.com/abyss7))
-* Add check with enabled polymorphic parts. [#10086](https://github.com/ClickHouse/ClickHouse/pull/10086) ([Anton Popov](https://github.com/CurtizJ))
-* Add cross-compile build for FreeBSD. This fixes [#9465](https://github.com/ClickHouse/ClickHouse/issues/9465) [#9643](https://github.com/ClickHouse/ClickHouse/pull/9643) ([Ivan](https://github.com/abyss7))
-* Add performance test for [#6924](https://github.com/ClickHouse/ClickHouse/issues/6924) [#6980](https://github.com/ClickHouse/ClickHouse/pull/6980) ([filimonov](https://github.com/filimonov))
-* Add support of `/dev/null` in the `File` engine for better performance testing [#8455](https://github.com/ClickHouse/ClickHouse/pull/8455) ([Amos Bird](https://github.com/amosbird))
-* Move all folders inside /dbms one level up [#9974](https://github.com/ClickHouse/ClickHouse/pull/9974) ([Ivan](https://github.com/abyss7))
-* Add a test that checks that read from MergeTree with single thread is performed in order. Addition to [#9670](https://github.com/ClickHouse/ClickHouse/issues/9670) [#9762](https://github.com/ClickHouse/ClickHouse/pull/9762) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix the `00964_live_view_watch_events_heartbeat.py` test to avoid race condition. [#9944](https://github.com/ClickHouse/ClickHouse/pull/9944) ([vzakaznikov](https://github.com/vzakaznikov))
-* Fix integration test `test_settings_constraints` [#9962](https://github.com/ClickHouse/ClickHouse/pull/9962) ([Vitaly Baranov](https://github.com/vitlibar))
-* Every function in its own file, part 12. [#9922](https://github.com/ClickHouse/ClickHouse/pull/9922) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Added performance test for the case of extremely slow analysis of array of tuples. [#9872](https://github.com/ClickHouse/ClickHouse/pull/9872) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Update zstd to 1.4.4. It has some minor improvements in performance and compression ratio. If you run replicas with different versions of ClickHouse you may see reasonable error messages `Data after merge is not byte-identical to data on another replicas.` with explanation. These messages are Ok and you should not worry. [#10663](https://github.com/ClickHouse/ClickHouse/pull/10663) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix TSan report in `system.stack_trace`. [#9832](https://github.com/ClickHouse/ClickHouse/pull/9832) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Removed dependency on `clock_getres`. [#9833](https://github.com/ClickHouse/ClickHouse/pull/9833) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Added identifier names check with clang-tidy. [#9799](https://github.com/ClickHouse/ClickHouse/pull/9799) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Update "builder" docker image. This image is not used in CI but is useful for developers. [#9809](https://github.com/ClickHouse/ClickHouse/pull/9809) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Remove old `performance-test` tool that is no longer used in CI. `clickhouse-performance-test` is great but now we are using way superior tool that is doing comparison testing with sophisticated statistical formulas to achieve confident results regardless to various changes in environment. [#9796](https://github.com/ClickHouse/ClickHouse/pull/9796) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Added most of clang-static-analyzer checks. [#9765](https://github.com/ClickHouse/ClickHouse/pull/9765) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Update Poco to 1.9.3 in preparation for MongoDB URI support. [#6892](https://github.com/ClickHouse/ClickHouse/pull/6892) ([Alexander Kuzmenkov](https://github.com/akuzm))
-* Fix build with `-DUSE_STATIC_LIBRARIES=0 -DENABLE_JEMALLOC=0` [#9651](https://github.com/ClickHouse/ClickHouse/pull/9651) ([Artem Zuikov](https://github.com/4ertus2))
-* For change log script, if merge commit was cherry-picked to release branch, take PR name from commit description. [#9708](https://github.com/ClickHouse/ClickHouse/pull/9708) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Support `vX.X-conflicts` tag in backport script. [#9705](https://github.com/ClickHouse/ClickHouse/pull/9705) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fix `auto-label` for backporting script. [#9685](https://github.com/ClickHouse/ClickHouse/pull/9685) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Use libc++ in Darwin cross-build to make it consistent with native build. [#9665](https://github.com/ClickHouse/ClickHouse/pull/9665) ([Hui Wang](https://github.com/huiwang))
-* Fix flacky test `01017_uniqCombined_memory_usage`. Continuation of [#7236](https://github.com/ClickHouse/ClickHouse/issues/7236). [#9667](https://github.com/ClickHouse/ClickHouse/pull/9667) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix build for native MacOS Clang compiler [#9649](https://github.com/ClickHouse/ClickHouse/pull/9649) ([Ivan](https://github.com/abyss7))
-* Allow to add various glitches around `pthread_mutex_lock`, `pthread_mutex_unlock` functions. [#9635](https://github.com/ClickHouse/ClickHouse/pull/9635) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Add support for `clang-tidy` in `packager` script. [#9625](https://github.com/ClickHouse/ClickHouse/pull/9625) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Add ability to use unbundled msgpack. [#10168](https://github.com/ClickHouse/ClickHouse/pull/10168) ([Azat Khuzhin](https://github.com/azat))
-
-
-## ClickHouse release v20.3
-
-
-### ClickHouse release v20.3.21.2-lts, 2020-11-02
-
-#### Bug Fix
-
-* Fix dictGet in sharding_key (and similar places, i.e. when the function context is stored permanently). [#16205](https://github.com/ClickHouse/ClickHouse/pull/16205) ([Azat Khuzhin](https://github.com/azat)).
-* Fix incorrect empty result for query from `Distributed` table if query has `WHERE`, `PREWHERE` and `GLOBAL IN`. Fixes [#15792](https://github.com/ClickHouse/ClickHouse/issues/15792). [#15933](https://github.com/ClickHouse/ClickHouse/pull/15933) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix missing or excessive headers in `TSV/CSVWithNames` formats. This fixes [#12504](https://github.com/ClickHouse/ClickHouse/issues/12504). [#13343](https://github.com/ClickHouse/ClickHouse/pull/13343) ([Azat Khuzhin](https://github.com/azat)).
-
-
-### ClickHouse release v20.3.20.6-lts, 2020-10-09
-
-#### Bug Fix
-
-* Mutation might hang waiting for some non-existent part after `MOVE` or `REPLACE PARTITION` or, in rare cases, after `DETACH` or `DROP PARTITION`. It's fixed. [#15724](https://github.com/ClickHouse/ClickHouse/pull/15724), [#15537](https://github.com/ClickHouse/ClickHouse/pull/15537) ([tavplubix](https://github.com/tavplubix)).
-* Fix hang of queries with a lot of subqueries to same table of `MySQL` engine. Previously, if there were more than 16 subqueries to same `MySQL` table in query, it hang forever. [#15299](https://github.com/ClickHouse/ClickHouse/pull/15299) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix 'Unknown identifier' in GROUP BY when query has JOIN over Merge table. [#15242](https://github.com/ClickHouse/ClickHouse/pull/15242) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix to make predicate push down work when subquery contains finalizeAggregation function. Fixes [#14847](https://github.com/ClickHouse/ClickHouse/issues/14847). [#14937](https://github.com/ClickHouse/ClickHouse/pull/14937) ([filimonov](https://github.com/filimonov)).
-* Concurrent `ALTER ... REPLACE/MOVE PARTITION ...` queries might cause deadlock. It's fixed. [#13626](https://github.com/ClickHouse/ClickHouse/pull/13626) ([tavplubix](https://github.com/tavplubix)).
-
-
-### ClickHouse release v20.3.19.4-lts, 2020-09-18
-
-#### Bug Fix
-
-* Fix rare error in `SELECT` queries when the queried column has `DEFAULT` expression which depends on the other column which also has `DEFAULT` and not present in select query and not exists on disk. Partially fixes [#14531](https://github.com/ClickHouse/ClickHouse/issues/14531). [#14845](https://github.com/ClickHouse/ClickHouse/pull/14845) ([alesapin](https://github.com/alesapin)).
-* Fix bug when `ALTER UPDATE` mutation with Nullable column in assignment expression and constant value (like `UPDATE x = 42`) leads to incorrect value in column or segfault. Fixes [#13634](https://github.com/ClickHouse/ClickHouse/issues/13634), [#14045](https://github.com/ClickHouse/ClickHouse/issues/14045). [#14646](https://github.com/ClickHouse/ClickHouse/pull/14646) ([alesapin](https://github.com/alesapin)).
-* Fix wrong Decimal multiplication result caused wrong decimal scale of result column. [#14603](https://github.com/ClickHouse/ClickHouse/pull/14603) ([Artem Zuikov](https://github.com/4ertus2)).
-
-#### Improvement
-
-* Support custom codecs in compact parts. [#12183](https://github.com/ClickHouse/ClickHouse/pull/12183) ([Anton Popov](https://github.com/CurtizJ)).
-
-
-### ClickHouse release v20.3.18.10-lts, 2020-09-08
-
-#### Bug Fix
-
-* Stop query execution if exception happened in `PipelineExecutor` itself. This could prevent rare possible query hung. Continuation of [#14334](https://github.com/ClickHouse/ClickHouse/issues/14334). [#14402](https://github.com/ClickHouse/ClickHouse/pull/14402) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed the behaviour when sometimes cache-dictionary returned default value instead of present value from source. [#13624](https://github.com/ClickHouse/ClickHouse/pull/13624) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fix parsing row policies from users.xml when names of databases or tables contain dots. This fixes [#5779](https://github.com/ClickHouse/ClickHouse/issues/5779), [#12527](https://github.com/ClickHouse/ClickHouse/issues/12527). [#13199](https://github.com/ClickHouse/ClickHouse/pull/13199) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix CAST(Nullable(String), Enum()). [#12745](https://github.com/ClickHouse/ClickHouse/pull/12745) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed data race in `text_log`. It does not correspond to any real bug. [#9726](https://github.com/ClickHouse/ClickHouse/pull/9726) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-
-#### Improvement
-
-* Fix wrong error for long queries. It was possible to get syntax error other than `Max query size exceeded` for correct query. [#13928](https://github.com/ClickHouse/ClickHouse/pull/13928) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Return NULL/zero when value is not parsed completely in parseDateTimeBestEffortOrNull/Zero functions. This fixes [#7876](https://github.com/ClickHouse/ClickHouse/issues/7876). [#11653](https://github.com/ClickHouse/ClickHouse/pull/11653) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-
-#### Performance Improvement
-
-* Slightly optimize very short queries with LowCardinality. [#14129](https://github.com/ClickHouse/ClickHouse/pull/14129) ([Anton Popov](https://github.com/CurtizJ)).
-
-#### Build/Testing/Packaging Improvement
-
-* Fix UBSan report (adding zero to nullptr) in HashTable that appeared after migration to clang-10. [#10638](https://github.com/ClickHouse/ClickHouse/pull/10638) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-
-
-### ClickHouse release v20.3.17.173-lts, 2020-08-15
-
-#### Bug Fix
-
-* Fix crash in JOIN with StorageMerge and `set enable_optimize_predicate_expression=1`. [#13679](https://github.com/ClickHouse/ClickHouse/pull/13679) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix invalid return type for comparison of tuples with `NULL` elements. Fixes [#12461](https://github.com/ClickHouse/ClickHouse/issues/12461). [#13420](https://github.com/ClickHouse/ClickHouse/pull/13420) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix queries with constant columns and `ORDER BY` prefix of primary key. [#13396](https://github.com/ClickHouse/ClickHouse/pull/13396) ([Anton Popov](https://github.com/CurtizJ)).
-* Return passed number for numbers with MSB set in roundUpToPowerOfTwoOrZero(). [#13234](https://github.com/ClickHouse/ClickHouse/pull/13234) ([Azat Khuzhin](https://github.com/azat)).
-
-
-### ClickHouse release v20.3.16.165-lts 2020-08-10
-
-#### Bug Fix
-
-* Fixed error in `parseDateTimeBestEffort` function when unix timestamp was passed as an argument. This fixes [#13362](https://github.com/ClickHouse/ClickHouse/issues/13362). [#13441](https://github.com/ClickHouse/ClickHouse/pull/13441) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed potentially low performance and slightly incorrect result for `uniqExact`, `topK`, `sumDistinct` and similar aggregate functions called on Float types with `NaN` values. It also triggered assert in debug build. This fixes [#12491](https://github.com/ClickHouse/ClickHouse/issues/12491). [#13254](https://github.com/ClickHouse/ClickHouse/pull/13254) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed function if with nullable constexpr as cond that is not literal NULL. Fixes [#12463](https://github.com/ClickHouse/ClickHouse/issues/12463). [#13226](https://github.com/ClickHouse/ClickHouse/pull/13226) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed assert in `arrayElement` function in case of array elements are Nullable and array subscript is also Nullable. This fixes [#12172](https://github.com/ClickHouse/ClickHouse/issues/12172). [#13224](https://github.com/ClickHouse/ClickHouse/pull/13224) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed unnecessary limiting for the number of threads for selects from local replica. [#12840](https://github.com/ClickHouse/ClickHouse/pull/12840) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed possible extra overflow row in data which could appear for queries `WITH TOTALS`. [#12747](https://github.com/ClickHouse/ClickHouse/pull/12747) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed performance with large tuples, which are interpreted as functions in `IN` section. The case when user write `WHERE x IN tuple(1, 2, ...)` instead of `WHERE x IN (1, 2, ...)` for some obscure reason. [#12700](https://github.com/ClickHouse/ClickHouse/pull/12700) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed memory tracking for input_format_parallel_parsing (by attaching thread to group). [#12672](https://github.com/ClickHouse/ClickHouse/pull/12672) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed [#12293](https://github.com/ClickHouse/ClickHouse/issues/12293) allow push predicate when subquery contains with clause. [#12663](https://github.com/ClickHouse/ClickHouse/pull/12663) ([Winter Zhang](https://github.com/zhang2014)).
-* Fixed [#10572](https://github.com/ClickHouse/ClickHouse/issues/10572) fix bloom filter index with const expression. [#12659](https://github.com/ClickHouse/ClickHouse/pull/12659) ([Winter Zhang](https://github.com/zhang2014)).
-* Fixed SIGSEGV in StorageKafka when broker is unavailable (and not only). [#12658](https://github.com/ClickHouse/ClickHouse/pull/12658) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed race condition in external dictionaries with cache layout which can lead server crash. [#12566](https://github.com/ClickHouse/ClickHouse/pull/12566) ([alesapin](https://github.com/alesapin)).
-* Fixed bug which lead to broken old parts after `ALTER DELETE` query when `enable_mixed_granularity_parts=1`. Fixes [#12536](https://github.com/ClickHouse/ClickHouse/issues/12536). [#12543](https://github.com/ClickHouse/ClickHouse/pull/12543) ([alesapin](https://github.com/alesapin)).
-* Better exception for function `in` with invalid number of arguments. [#12529](https://github.com/ClickHouse/ClickHouse/pull/12529) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed performance issue, while reading from compact parts. [#12492](https://github.com/ClickHouse/ClickHouse/pull/12492) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed the deadlock if `text_log` is enabled. [#12452](https://github.com/ClickHouse/ClickHouse/pull/12452) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed possible segfault if StorageMerge. Closes [#12054](https://github.com/ClickHouse/ClickHouse/issues/12054). [#12401](https://github.com/ClickHouse/ClickHouse/pull/12401) ([tavplubix](https://github.com/tavplubix)).
-* Fixed `TOTALS/ROLLUP/CUBE` for aggregate functions with `-State` and `Nullable` arguments. This fixes [#12163](https://github.com/ClickHouse/ClickHouse/issues/12163). [#12376](https://github.com/ClickHouse/ClickHouse/pull/12376) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed order of columns in `WITH FILL` modifier. Previously order of columns of `ORDER BY` statement wasn't respected. [#12306](https://github.com/ClickHouse/ClickHouse/pull/12306) ([Anton Popov](https://github.com/CurtizJ)).
-* Avoid "bad cast" exception when there is an expression that filters data by virtual columns (like `_table` in `Merge` tables) or by "index" columns in system tables such as filtering by database name when querying from `system.tables`, and this expression returns `Nullable` type. This fixes [#12166](https://github.com/ClickHouse/ClickHouse/issues/12166). [#12305](https://github.com/ClickHouse/ClickHouse/pull/12305) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Show error after `TrieDictionary` failed to load. [#12290](https://github.com/ClickHouse/ClickHouse/pull/12290) ([Vitaly Baranov](https://github.com/vitlibar)).
-* The function `arrayFill` worked incorrectly for empty arrays that may lead to crash. This fixes [#12263](https://github.com/ClickHouse/ClickHouse/issues/12263). [#12279](https://github.com/ClickHouse/ClickHouse/pull/12279) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Implement conversions to the common type for `LowCardinality` types. This allows to execute UNION ALL of tables with columns of LowCardinality and other columns. This fixes [#8212](https://github.com/ClickHouse/ClickHouse/issues/8212). This fixes [#4342](https://github.com/ClickHouse/ClickHouse/issues/4342). [#12275](https://github.com/ClickHouse/ClickHouse/pull/12275) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed the behaviour when during multiple sequential inserts in `StorageFile` header for some special types was written more than once. This fixed [#6155](https://github.com/ClickHouse/ClickHouse/issues/6155). [#12197](https://github.com/ClickHouse/ClickHouse/pull/12197) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fixed logical functions for UInt8 values when they are not equal to 0 or 1. [#12196](https://github.com/ClickHouse/ClickHouse/pull/12196) ([Alexander Kazakov](https://github.com/Akazz)).
-* Fixed `dictGet` arguments check during GROUP BY injective functions elimination. [#12179](https://github.com/ClickHouse/ClickHouse/pull/12179) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed wrong logic in `ALTER DELETE` that leads to deleting of records when condition evaluates to NULL. This fixes [#9088](https://github.com/ClickHouse/ClickHouse/issues/9088). This closes [#12106](https://github.com/ClickHouse/ClickHouse/issues/12106). [#12153](https://github.com/ClickHouse/ClickHouse/pull/12153) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed transform of query to send to external DBMS (e.g. MySQL, ODBC) in presense of aliases. This fixes [#12032](https://github.com/ClickHouse/ClickHouse/issues/12032). [#12151](https://github.com/ClickHouse/ClickHouse/pull/12151) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed potential overflow in integer division. This fixes [#12119](https://github.com/ClickHouse/ClickHouse/issues/12119). [#12140](https://github.com/ClickHouse/ClickHouse/pull/12140) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed potential infinite loop in `greatCircleDistance`, `geoDistance`. This fixes [#12117](https://github.com/ClickHouse/ClickHouse/issues/12117). [#12137](https://github.com/ClickHouse/ClickHouse/pull/12137) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Avoid `There is no query` exception for materialized views with joins or with subqueries attached to system logs (system.query_log, metric_log, etc) or to engine=Buffer underlying table. [#12120](https://github.com/ClickHouse/ClickHouse/pull/12120) ([filimonov](https://github.com/filimonov)).
-* Fixed performance for selects with `UNION` caused by wrong limit for the total number of threads. Fixes [#12030](https://github.com/ClickHouse/ClickHouse/issues/12030). [#12103](https://github.com/ClickHouse/ClickHouse/pull/12103) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed segfault with `-StateResample` combinators. [#12092](https://github.com/ClickHouse/ClickHouse/pull/12092) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed unnecessary limiting the number of threads for selects from `VIEW`. Fixes [#11937](https://github.com/ClickHouse/ClickHouse/issues/11937). [#12085](https://github.com/ClickHouse/ClickHouse/pull/12085) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed possible crash while using wrong type for `PREWHERE`. Fixes [#12053](https://github.com/ClickHouse/ClickHouse/issues/12053), [#12060](https://github.com/ClickHouse/ClickHouse/issues/12060). [#12060](https://github.com/ClickHouse/ClickHouse/pull/12060) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed error `Expected single dictionary argument for function` for function `defaultValueOfArgumentType` with `LowCardinality` type. Fixes [#11808](https://github.com/ClickHouse/ClickHouse/issues/11808). [#12056](https://github.com/ClickHouse/ClickHouse/pull/12056) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed error `Cannot capture column` for higher-order functions with `Tuple(LowCardinality)` argument. Fixes [#9766](https://github.com/ClickHouse/ClickHouse/issues/9766). [#12055](https://github.com/ClickHouse/ClickHouse/pull/12055) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Parse tables metadata in parallel when loading database. This fixes slow server startup when there are large number of tables. [#12045](https://github.com/ClickHouse/ClickHouse/pull/12045) ([tavplubix](https://github.com/tavplubix)).
-* Make `topK` aggregate function return Enum for Enum types. This fixes [#3740](https://github.com/ClickHouse/ClickHouse/issues/3740). [#12043](https://github.com/ClickHouse/ClickHouse/pull/12043) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed constraints check if constraint is a constant expression. This fixes [#11360](https://github.com/ClickHouse/ClickHouse/issues/11360). [#12042](https://github.com/ClickHouse/ClickHouse/pull/12042) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed incorrect comparison of tuples with `Nullable` columns. Fixes [#11985](https://github.com/ClickHouse/ClickHouse/issues/11985). [#12039](https://github.com/ClickHouse/ClickHouse/pull/12039) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed wrong result and potential crash when invoking function `if` with arguments of type `FixedString` with different sizes. This fixes [#11362](https://github.com/ClickHouse/ClickHouse/issues/11362). [#12021](https://github.com/ClickHouse/ClickHouse/pull/12021) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* A query with function `neighbor` as the only returned expression may return empty result if the function is called with offset `-9223372036854775808`. This fixes [#11367](https://github.com/ClickHouse/ClickHouse/issues/11367). [#12019](https://github.com/ClickHouse/ClickHouse/pull/12019) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed potential array size overflow in generateRandom that may lead to crash. This fixes [#11371](https://github.com/ClickHouse/ClickHouse/issues/11371). [#12013](https://github.com/ClickHouse/ClickHouse/pull/12013) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed potential floating point exception. This closes [#11378](https://github.com/ClickHouse/ClickHouse/issues/11378). [#12005](https://github.com/ClickHouse/ClickHouse/pull/12005) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed wrong setting name in log message at server startup. [#11997](https://github.com/ClickHouse/ClickHouse/pull/11997) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed `Query parameter was not set` in `Values` format. Fixes [#11918](https://github.com/ClickHouse/ClickHouse/issues/11918). [#11936](https://github.com/ClickHouse/ClickHouse/pull/11936) ([tavplubix](https://github.com/tavplubix)).
-* Keep aliases for substitutions in query (parametrized queries). This fixes [#11914](https://github.com/ClickHouse/ClickHouse/issues/11914). [#11916](https://github.com/ClickHouse/ClickHouse/pull/11916) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed potential floating point exception when parsing DateTime64. This fixes [#11374](https://github.com/ClickHouse/ClickHouse/issues/11374). [#11875](https://github.com/ClickHouse/ClickHouse/pull/11875) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed memory accounting via `HTTP` interface (can be significant with `wait_end_of_query=1`). [#11840](https://github.com/ClickHouse/ClickHouse/pull/11840) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed wrong result for `if()` with NULLs in condition. [#11807](https://github.com/ClickHouse/ClickHouse/pull/11807) ([Artem Zuikov](https://github.com/4ertus2)).
-* Parse metadata stored in zookeeper before checking for equality. [#11739](https://github.com/ClickHouse/ClickHouse/pull/11739) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed `LIMIT n WITH TIES` usage together with `ORDER BY` statement, which contains aliases. [#11689](https://github.com/ClickHouse/ClickHouse/pull/11689) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix potential read of uninitialized memory in cache dictionary. [#10834](https://github.com/ClickHouse/ClickHouse/pull/10834) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-
-#### Performance Improvement
-
-* Index not used for IN operator with literals, performance regression introduced around v19.3. This fixes [#10574](https://github.com/ClickHouse/ClickHouse/issues/10574). [#12062](https://github.com/ClickHouse/ClickHouse/pull/12062) ([nvartolomei](https://github.com/nvartolomei)).
-
-
-### ClickHouse release v20.3.12.112-lts 2020-06-25
-
-#### Bug Fix
-
-* Fix rare crash caused by using `Nullable` column in prewhere condition. Continuation of [#11608](https://github.com/ClickHouse/ClickHouse/issues/11608). [#11869](https://github.com/ClickHouse/ClickHouse/pull/11869) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Don't allow arrayJoin inside higher order functions. It was leading to broken protocol synchronization. This closes [#3933](https://github.com/ClickHouse/ClickHouse/issues/3933). [#11846](https://github.com/ClickHouse/ClickHouse/pull/11846) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix using too many threads for queries. [#11788](https://github.com/ClickHouse/ClickHouse/pull/11788) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix unexpected behaviour of queries like `SELECT *, xyz.*` which were success while an error expected. [#11753](https://github.com/ClickHouse/ClickHouse/pull/11753) ([hexiaoting](https://github.com/hexiaoting)).
-* Now replicated fetches will be cancelled during metadata alter. [#11744](https://github.com/ClickHouse/ClickHouse/pull/11744) ([alesapin](https://github.com/alesapin)).
-* Fixed LOGICAL_ERROR caused by wrong type deduction of complex literals in Values input format. [#11732](https://github.com/ClickHouse/ClickHouse/pull/11732) ([tavplubix](https://github.com/tavplubix)).
-* Fix `ORDER BY ... WITH FILL` over const columns. [#11697](https://github.com/ClickHouse/ClickHouse/pull/11697) ([Anton Popov](https://github.com/CurtizJ)).
-* Pass proper timeouts when communicating with XDBC bridge. Recently timeouts were not respected when checking bridge liveness and receiving meta info. [#11690](https://github.com/ClickHouse/ClickHouse/pull/11690) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix error which leads to an incorrect state of `system.mutations`. It may show that whole mutation is already done but the server still has `MUTATE_PART` tasks in the replication queue and tries to execute them. This fixes [#11611](https://github.com/ClickHouse/ClickHouse/issues/11611). [#11681](https://github.com/ClickHouse/ClickHouse/pull/11681) ([alesapin](https://github.com/alesapin)).
-* Add support for regular expressions with case-insensitive flags. This fixes [#11101](https://github.com/ClickHouse/ClickHouse/issues/11101) and fixes [#11506](https://github.com/ClickHouse/ClickHouse/issues/11506). [#11649](https://github.com/ClickHouse/ClickHouse/pull/11649) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Remove trivial count query optimization if row-level security is set. In previous versions the user get total count of records in a table instead filtered. This fixes [#11352](https://github.com/ClickHouse/ClickHouse/issues/11352). [#11644](https://github.com/ClickHouse/ClickHouse/pull/11644) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix bloom filters for String (data skipping indices). [#11638](https://github.com/ClickHouse/ClickHouse/pull/11638) ([Azat Khuzhin](https://github.com/azat)).
-* Fix rare crash caused by using `Nullable` column in prewhere condition. (Probably it is connected with [#11572](https://github.com/ClickHouse/ClickHouse/issues/11572) somehow). [#11608](https://github.com/ClickHouse/ClickHouse/pull/11608) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix error `Block structure mismatch` for queries with sampling reading from `Buffer` table. [#11602](https://github.com/ClickHouse/ClickHouse/pull/11602) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix wrong exit code of the clickhouse-client, when exception.code() % 256 = 0. [#11601](https://github.com/ClickHouse/ClickHouse/pull/11601) ([filimonov](https://github.com/filimonov)).
-* Fix trivial error in log message about "Mark cache size was lowered" at server startup. This closes [#11399](https://github.com/ClickHouse/ClickHouse/issues/11399). [#11589](https://github.com/ClickHouse/ClickHouse/pull/11589) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix error `Size of offsets doesn't match size of column` for queries with `PREWHERE column in (subquery)` and `ARRAY JOIN`. [#11580](https://github.com/ClickHouse/ClickHouse/pull/11580) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* All queries in HTTP session have had the same query_id. It is fixed. [#11578](https://github.com/ClickHouse/ClickHouse/pull/11578) ([tavplubix](https://github.com/tavplubix)).
-* Now clickhouse-server docker container will prefer IPv6 checking server aliveness. [#11550](https://github.com/ClickHouse/ClickHouse/pull/11550) ([Ivan Starkov](https://github.com/istarkov)).
-* Fix shard_num/replica_num for `<node>` (breaks use_compact_format_in_distributed_parts_names). [#11528](https://github.com/ClickHouse/ClickHouse/pull/11528) ([Azat Khuzhin](https://github.com/azat)).
-* Fix memory leak when exception is thrown in the middle of aggregation with -State functions. This fixes [#8995](https://github.com/ClickHouse/ClickHouse/issues/8995). [#11496](https://github.com/ClickHouse/ClickHouse/pull/11496) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix wrong results of distributed queries when alias could override qualified column name. Fixes [#9672](https://github.com/ClickHouse/ClickHouse/issues/9672) [#9714](https://github.com/ClickHouse/ClickHouse/issues/9714). [#9972](https://github.com/ClickHouse/ClickHouse/pull/9972) ([Artem Zuikov](https://github.com/4ertus2)).
-
-
-### ClickHouse release v20.3.11.97-lts 2020-06-10
-
-#### New Feature
-
-* Now ClickHouse controls timeouts of dictionary sources on its side. Two new settings added to cache dictionary configuration: `strict_max_lifetime_seconds`, which is `max_lifetime` by default and `query_wait_timeout_milliseconds`, which is one minute by default. The first settings is also useful with `allow_read_expired_keys` settings (to forbid reading very expired keys). [#10337](https://github.com/ClickHouse/ClickHouse/pull/10337) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-
-#### Bug Fix
-
-* Fix the error `Data compressed with different methods` that can happen if `min_bytes_to_use_direct_io` is enabled and PREWHERE is active and using SAMPLE or high number of threads. This fixes [#11539](https://github.com/ClickHouse/ClickHouse/issues/11539). [#11540](https://github.com/ClickHouse/ClickHouse/pull/11540) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix return compressed size for codecs. [#11448](https://github.com/ClickHouse/ClickHouse/pull/11448) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix server crash when a column has compression codec with non-literal arguments. Fixes [#11365](https://github.com/ClickHouse/ClickHouse/issues/11365). [#11431](https://github.com/ClickHouse/ClickHouse/pull/11431) ([alesapin](https://github.com/alesapin)).
-* Fix pointInPolygon with nan as point. Fixes [#11375](https://github.com/ClickHouse/ClickHouse/issues/11375). [#11421](https://github.com/ClickHouse/ClickHouse/pull/11421) ([Alexey Ilyukhov](https://github.com/livace)).
-* Fix crash in JOIN over LowCarinality(T) and Nullable(T). [#11380](https://github.com/ClickHouse/ClickHouse/issues/11380). [#11414](https://github.com/ClickHouse/ClickHouse/pull/11414) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix error code for wrong `USING` key. [#11373](https://github.com/ClickHouse/ClickHouse/issues/11373). [#11404](https://github.com/ClickHouse/ClickHouse/pull/11404) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fixed geohashesInBox with arguments outside of latitude/longitude range. [#11403](https://github.com/ClickHouse/ClickHouse/pull/11403) ([Vasily Nemkov](https://github.com/Enmk)).
-* Better errors for `joinGet()` functions. [#11389](https://github.com/ClickHouse/ClickHouse/pull/11389) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix possible `Pipeline stuck` error for queries with external sort and limit. Fixes [#11359](https://github.com/ClickHouse/ClickHouse/issues/11359). [#11366](https://github.com/ClickHouse/ClickHouse/pull/11366) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Remove redundant lock during parts send in ReplicatedMergeTree. [#11354](https://github.com/ClickHouse/ClickHouse/pull/11354) ([alesapin](https://github.com/alesapin)).
-* Fix support for `\G` (vertical output) in clickhouse-client in multiline mode. This closes [#9933](https://github.com/ClickHouse/ClickHouse/issues/9933). [#11350](https://github.com/ClickHouse/ClickHouse/pull/11350) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix crash in direct selects from StorageJoin (without JOIN) and wrong nullability. [#11340](https://github.com/ClickHouse/ClickHouse/pull/11340) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix crash in `quantilesExactWeightedArray`. [#11337](https://github.com/ClickHouse/ClickHouse/pull/11337) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Now merges stopped before change metadata in `ALTER` queries. [#11335](https://github.com/ClickHouse/ClickHouse/pull/11335) ([alesapin](https://github.com/alesapin)).
-* Make writing to `MATERIALIZED VIEW` with setting `parallel_view_processing = 1` parallel again. Fixes [#10241](https://github.com/ClickHouse/ClickHouse/issues/10241). [#11330](https://github.com/ClickHouse/ClickHouse/pull/11330) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix visitParamExtractRaw when extracted JSON has strings with unbalanced { or [. [#11318](https://github.com/ClickHouse/ClickHouse/pull/11318) ([Ewout](https://github.com/devwout)).
-* Fix very rare race condition in ThreadPool. [#11314](https://github.com/ClickHouse/ClickHouse/pull/11314) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix potential uninitialized memory in conversion. Example: `SELECT toIntervalSecond(now64())`. [#11311](https://github.com/ClickHouse/ClickHouse/pull/11311) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix the issue when index analysis cannot work if a table has Array column in primary key and if a query is filtering by this column with `empty` or `notEmpty` functions. This fixes [#11286](https://github.com/ClickHouse/ClickHouse/issues/11286). [#11303](https://github.com/ClickHouse/ClickHouse/pull/11303) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix bug when query speed estimation can be incorrect and the limit of `min_execution_speed` may not work or work incorrectly if the query is throttled by `max_network_bandwidth`, `max_execution_speed` or `priority` settings. Change the default value of `timeout_before_checking_execution_speed` to non-zero, because otherwise the settings `min_execution_speed` and `max_execution_speed` have no effect. This fixes [#11297](https://github.com/ClickHouse/ClickHouse/issues/11297). This fixes [#5732](https://github.com/ClickHouse/ClickHouse/issues/5732). This fixes [#6228](https://github.com/ClickHouse/ClickHouse/issues/6228). Usability improvement: avoid concatenation of exception message with progress bar in `clickhouse-client`. [#11296](https://github.com/ClickHouse/ClickHouse/pull/11296) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix crash while reading malformed data in Protobuf format. This fixes [#5957](https://github.com/ClickHouse/ClickHouse/issues/5957), fixes [#11203](https://github.com/ClickHouse/ClickHouse/issues/11203). [#11258](https://github.com/ClickHouse/ClickHouse/pull/11258) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fixed a bug when cache-dictionary could return default value instead of normal (when there are only expired keys). This affects only string fields. [#11233](https://github.com/ClickHouse/ClickHouse/pull/11233) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fix error `Block structure mismatch in QueryPipeline` while reading from `VIEW` with constants in inner query. Fixes [#11181](https://github.com/ClickHouse/ClickHouse/issues/11181). [#11205](https://github.com/ClickHouse/ClickHouse/pull/11205) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix possible exception `Invalid status for associated output`. [#11200](https://github.com/ClickHouse/ClickHouse/pull/11200) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix possible error `Cannot capture column` for higher-order functions with `Array(Array(LowCardinality))` captured argument. [#11185](https://github.com/ClickHouse/ClickHouse/pull/11185) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed S3 globbing which could fail in case of more than 1000 keys and some backends. [#11179](https://github.com/ClickHouse/ClickHouse/pull/11179) ([Vladimir Chebotarev](https://github.com/excitoon)).
-* If data skipping index is dependent on columns that are going to be modified during background merge (for SummingMergeTree, AggregatingMergeTree as well as for TTL GROUP BY), it was calculated incorrectly. This issue is fixed by moving index calculation after merge so the index is calculated on merged data. [#11162](https://github.com/ClickHouse/ClickHouse/pull/11162) ([Azat Khuzhin](https://github.com/azat)).
-* Fix excessive reserving of threads for simple queries (optimization for reducing the number of threads, which was partly broken after changes in pipeline). [#11114](https://github.com/ClickHouse/ClickHouse/pull/11114) ([Azat Khuzhin](https://github.com/azat)).
-* Fix predicates optimization for distributed queries (`enable_optimize_predicate_expression=1`) for queries with `HAVING` section (i.e. when filtering on the server initiator is required), by preserving the order of expressions (and this is enough to fix), and also force aggregator use column names over indexes. Fixes: [#10613](https://github.com/ClickHouse/ClickHouse/issues/10613), [#11413](https://github.com/ClickHouse/ClickHouse/issues/11413). [#10621](https://github.com/ClickHouse/ClickHouse/pull/10621) ([Azat Khuzhin](https://github.com/azat)).
-* Introduce commit retry logic to decrease the possibility of getting duplicates from Kafka in rare cases when offset commit was failed. [#9884](https://github.com/ClickHouse/ClickHouse/pull/9884) ([filimonov](https://github.com/filimonov)).
-
-#### Performance Improvement
-
-* Get dictionary and check access rights only once per each call of any function reading external dictionaries. [#10928](https://github.com/ClickHouse/ClickHouse/pull/10928) ([Vitaly Baranov](https://github.com/vitlibar)).
-
-#### Build/Testing/Packaging Improvement
-
-* Fix several flaky integration tests. [#11355](https://github.com/ClickHouse/ClickHouse/pull/11355) ([alesapin](https://github.com/alesapin)).
-
-### ClickHouse release v20.3.10.75-lts 2020-05-23
-
-#### Bug Fix
-
-* Removed logging from mutation finalization task if nothing was finalized. [#11109](https://github.com/ClickHouse/ClickHouse/pull/11109) ([alesapin](https://github.com/alesapin)).
-* Fixed `parseDateTime64BestEffort` argument resolution bugs. [#11038](https://github.com/ClickHouse/ClickHouse/pull/11038) ([Vasily Nemkov](https://github.com/Enmk)).
-* Fixed incorrect raw data size in method `getRawData()`. [#10964](https://github.com/ClickHouse/ClickHouse/pull/10964) ([Igr](https://github.com/ObjatieGroba)).
-* Fixed incompatibility of two-level aggregation between versions 20.1 and earlier. This incompatibility happens when different versions of ClickHouse are used on initiator node and remote nodes and the size of `GROUP BY` result is large and aggregation is performed by a single `String` field. It leads to several unmerged rows for a single key in result. [#10952](https://github.com/ClickHouse/ClickHouse/pull/10952) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed backward compatibility with tuples in `Distributed` tables. [#10889](https://github.com/ClickHouse/ClickHouse/pull/10889) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed `SIGSEGV` in `StringHashTable` if such a key does not exist. [#10870](https://github.com/ClickHouse/ClickHouse/pull/10870) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed bug in `ReplicatedMergeTree` which might cause some `ALTER` on `OPTIMIZE` query to hang waiting for some replica after it become inactive. [#10849](https://github.com/ClickHouse/ClickHouse/pull/10849) ([tavplubix](https://github.com/tavplubix)).
-* Fixed columns order after `Block::sortColumns()`. [#10826](https://github.com/ClickHouse/ClickHouse/pull/10826) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed the issue with `ODBC` bridge when no quoting of identifiers is requested. Fixes [#7984](https://github.com/ClickHouse/ClickHouse/issues/7984). [#10821](https://github.com/ClickHouse/ClickHouse/pull/10821) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed `UBSan` and `MSan` report in `DateLUT`. [#10798](https://github.com/ClickHouse/ClickHouse/pull/10798) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed incorrect type conversion in key conditions. Fixes [#6287](https://github.com/ClickHouse/ClickHouse/issues/6287). [#10791](https://github.com/ClickHouse/ClickHouse/pull/10791) ([Andrew Onyshchuk](https://github.com/oandrew))
-* Fixed `parallel_view_processing` behavior. Now all insertions into `MATERIALIZED VIEW` without exception should be finished if exception happened. Fixes [#10241](https://github.com/ClickHouse/ClickHouse/issues/10241). [#10757](https://github.com/ClickHouse/ClickHouse/pull/10757) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed combinator -`OrNull` and `-OrDefault` when combined with `-State`. [#10741](https://github.com/ClickHouse/ClickHouse/pull/10741) ([hcz](https://github.com/hczhcz)).
-* Fixed crash in `generateRandom` with nested types. Fixes [#10583](https://github.com/ClickHouse/ClickHouse/issues/10583). [#10734](https://github.com/ClickHouse/ClickHouse/pull/10734) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed data corruption for `LowCardinality(FixedString)` key column in `SummingMergeTree` which could have happened after merge. Fixes [#10489](https://github.com/ClickHouse/ClickHouse/issues/10489). [#10721](https://github.com/ClickHouse/ClickHouse/pull/10721) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed possible buffer overflow in function `h3EdgeAngle`. [#10711](https://github.com/ClickHouse/ClickHouse/pull/10711) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed disappearing totals. Totals could have being filtered if query had had join or subquery with external where condition. Fixes [#10674](https://github.com/ClickHouse/ClickHouse/issues/10674). [#10698](https://github.com/ClickHouse/ClickHouse/pull/10698) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed multiple usages of `IN` operator with the identical set in one query. [#10686](https://github.com/ClickHouse/ClickHouse/pull/10686) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed bug, which causes http requests stuck on client close when `readonly=2` and `cancel_http_readonly_queries_on_client_close=1`. Fixes [#7939](https://github.com/ClickHouse/ClickHouse/issues/7939), [#7019](https://github.com/ClickHouse/ClickHouse/issues/7019), [#7736](https://github.com/ClickHouse/ClickHouse/issues/7736), [#7091](https://github.com/ClickHouse/ClickHouse/issues/7091). [#10684](https://github.com/ClickHouse/ClickHouse/pull/10684) ([tavplubix](https://github.com/tavplubix)).
-* Fixed order of parameters in `AggregateTransform` constructor. [#10667](https://github.com/ClickHouse/ClickHouse/pull/10667) ([palasonic1](https://github.com/palasonic1)).
-* Fixed the lack of parallel execution of remote queries with `distributed_aggregation_memory_efficient` enabled. Fixes [#10655](https://github.com/ClickHouse/ClickHouse/issues/10655). [#10664](https://github.com/ClickHouse/ClickHouse/pull/10664) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed possible incorrect number of rows for queries with `LIMIT`. Fixes [#10566](https://github.com/ClickHouse/ClickHouse/issues/10566), [#10709](https://github.com/ClickHouse/ClickHouse/issues/10709). [#10660](https://github.com/ClickHouse/ClickHouse/pull/10660) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed a bug which locks concurrent alters when table has a lot of parts. [#10659](https://github.com/ClickHouse/ClickHouse/pull/10659) ([alesapin](https://github.com/alesapin)).
-* Fixed a bug when on `SYSTEM DROP DNS CACHE` query also drop caches, which are used to check if user is allowed to connect from some IP addresses. [#10608](https://github.com/ClickHouse/ClickHouse/pull/10608) ([tavplubix](https://github.com/tavplubix)).
-* Fixed incorrect scalar results inside inner query of `MATERIALIZED VIEW` in case if this query contained dependent table. [#10603](https://github.com/ClickHouse/ClickHouse/pull/10603) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed `SELECT` of column `ALIAS` which default expression type different from column type. [#10563](https://github.com/ClickHouse/ClickHouse/pull/10563) ([Azat Khuzhin](https://github.com/azat)).
-* Implemented comparison between DateTime64 and String values. [#10560](https://github.com/ClickHouse/ClickHouse/pull/10560) ([Vasily Nemkov](https://github.com/Enmk)).
-* Fixed index corruption, which may occur in some cases after merge compact parts into another compact part. [#10531](https://github.com/ClickHouse/ClickHouse/pull/10531) ([Anton Popov](https://github.com/CurtizJ)).
-* Fixed the situation, when mutation finished all parts, but hung up in `is_done=0`. [#10526](https://github.com/ClickHouse/ClickHouse/pull/10526) ([alesapin](https://github.com/alesapin)).
-* Fixed overflow at beginning of unix epoch for timezones with fractional offset from `UTC`. This fixes [#9335](https://github.com/ClickHouse/ClickHouse/issues/9335). [#10513](https://github.com/ClickHouse/ClickHouse/pull/10513) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed improper shutdown of `Distributed` storage. [#10491](https://github.com/ClickHouse/ClickHouse/pull/10491) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed numeric overflow in `simpleLinearRegression` over large integers. [#10474](https://github.com/ClickHouse/ClickHouse/pull/10474) ([hcz](https://github.com/hczhcz)).
-
-
-#### Build/Testing/Packaging Improvement
-
-* Fix UBSan report in LZ4 library. [#10631](https://github.com/ClickHouse/ClickHouse/pull/10631) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix clang-10 build. [#10238](https://github.com/ClickHouse/ClickHouse/issues/10238). [#10370](https://github.com/ClickHouse/ClickHouse/pull/10370) ([Amos Bird](https://github.com/amosbird)).
-* Added failing tests about `max_rows_to_sort` setting. [#10268](https://github.com/ClickHouse/ClickHouse/pull/10268) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Added some improvements in printing diagnostic info in input formats. Fixes [#10204](https://github.com/ClickHouse/ClickHouse/issues/10204). [#10418](https://github.com/ClickHouse/ClickHouse/pull/10418) ([tavplubix](https://github.com/tavplubix)).
-* Added CA certificates to clickhouse-server docker image. [#10476](https://github.com/ClickHouse/ClickHouse/pull/10476) ([filimonov](https://github.com/filimonov)).
-
-#### Bug fix
-
-* Fix error `the BloomFilter false positive must be a double number between 0 and 1` [#10551](https://github.com/ClickHouse/ClickHouse/issues/10551). [#10569](https://github.com/ClickHouse/ClickHouse/pull/10569) ([Winter Zhang](https://github.com/zhang2014)).
-
-
-### ClickHouse release v20.3.8.53, 2020-04-23
-
-#### Bug Fix
-* Fixed wrong behaviour of datetime functions for timezones that has altered between positive and negative offsets from UTC (e.g. Pacific/Kiritimati). This fixes [#7202](https://github.com/ClickHouse/ClickHouse/issues/7202) [#10369](https://github.com/ClickHouse/ClickHouse/pull/10369) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix possible segfault with `distributed_group_by_no_merge` enabled (introduced in 20.3.7.46 by [#10131](https://github.com/ClickHouse/ClickHouse/issues/10131)). [#10399](https://github.com/ClickHouse/ClickHouse/pull/10399) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fix wrong flattening of `Array(Tuple(...))` data types. This fixes [#10259](https://github.com/ClickHouse/ClickHouse/issues/10259) [#10390](https://github.com/ClickHouse/ClickHouse/pull/10390) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Drop disks reservation in Aggregator. This fixes bug in disk space reservation, which may cause big external aggregation to fail even if it could be completed successfully [#10375](https://github.com/ClickHouse/ClickHouse/pull/10375) ([Azat Khuzhin](https://github.com/azat))
-* Fixed `DROP` vs `OPTIMIZE` race in `ReplicatedMergeTree`. `DROP` could left some garbage in replica path in ZooKeeper if there was concurrent `OPTIMIZE` query. [#10312](https://github.com/ClickHouse/ClickHouse/pull/10312) ([tavplubix](https://github.com/tavplubix))
-* Fix bug when server cannot attach table after column default was altered. [#10441](https://github.com/ClickHouse/ClickHouse/pull/10441) ([alesapin](https://github.com/alesapin))
-* Do not remove metadata directory when attach database fails before loading tables.  [#10442](https://github.com/ClickHouse/ClickHouse/pull/10442) ([Winter Zhang](https://github.com/zhang2014))
-* Fixed several bugs when some data was inserted with quorum, then deleted somehow (DROP PARTITION, TTL) and this leaded to the stuck of INSERTs or false-positive exceptions in SELECTs. This fixes [#9946](https://github.com/ClickHouse/ClickHouse/issues/9946) [#10188](https://github.com/ClickHouse/ClickHouse/pull/10188) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
-* Fix possible `Pipeline stuck` error in `ConcatProcessor` which could have happened in remote query. [#10381](https://github.com/ClickHouse/ClickHouse/pull/10381) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fixed wrong behavior in HashTable that caused compilation error when trying to read HashMap from buffer. [#10386](https://github.com/ClickHouse/ClickHouse/pull/10386) ([palasonic1](https://github.com/palasonic1))
-* Allow to use `count(*)` with multiple JOINs. Fixes [#9853](https://github.com/ClickHouse/ClickHouse/issues/9853) [#10291](https://github.com/ClickHouse/ClickHouse/pull/10291) ([Artem Zuikov](https://github.com/4ertus2))
-* Prefer `fallback_to_stale_replicas` over `skip_unavailable_shards`, otherwise when both settings specified and there are no up-to-date replicas the query will fail (patch from @alex-zaitsev). Fixes: [#2564](https://github.com/ClickHouse/ClickHouse/issues/2564). [#10422](https://github.com/ClickHouse/ClickHouse/pull/10422) ([Azat Khuzhin](https://github.com/azat))
-* Fix the issue when a query with ARRAY JOIN, ORDER BY and LIMIT may return incomplete result. This fixes [#10226](https://github.com/ClickHouse/ClickHouse/issues/10226). Author: [Vadim Plakhtinskiy](https://github.com/VadimPlh). [#10427](https://github.com/ClickHouse/ClickHouse/pull/10427) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Check the number and type of arguments when creating BloomFilter index [#9623](https://github.com/ClickHouse/ClickHouse/issues/9623) [#10431](https://github.com/ClickHouse/ClickHouse/pull/10431) ([Winter Zhang](https://github.com/zhang2014))
-
-#### Performance Improvement
-* Improved performance of queries with explicitly defined sets at right side of `IN` operator and tuples in the left side. This fixes performance regression in version 20.3. [#9740](https://github.com/ClickHouse/ClickHouse/pull/9740), [#10385](https://github.com/ClickHouse/ClickHouse/pull/10385) ([Anton Popov](https://github.com/CurtizJ))
-
-### ClickHouse release v20.3.7.46, 2020-04-17
-
-#### Bug Fix
-
-* Fix `Logical error: CROSS JOIN has expressions` error for queries with comma and names joins mix. [#10311](https://github.com/ClickHouse/ClickHouse/pull/10311) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix queries with `max_bytes_before_external_group_by`. [#10302](https://github.com/ClickHouse/ClickHouse/pull/10302) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix move-to-prewhere optimization in presense of arrayJoin functions (in certain cases). This fixes [#10092](https://github.com/ClickHouse/ClickHouse/issues/10092). [#10195](https://github.com/ClickHouse/ClickHouse/pull/10195) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add the ability to relax the restriction on non-deterministic functions usage in mutations with `allow_nondeterministic_mutations` setting. [#10186](https://github.com/ClickHouse/ClickHouse/pull/10186) ([filimonov](https://github.com/filimonov)).
-
-### ClickHouse release v20.3.6.40, 2020-04-16
-
-#### New Feature
-
-* Added function `isConstant`. This function checks whether its argument is constant expression and returns 1 or 0. It is intended for development, debugging and demonstration purposes. [#10198](https://github.com/ClickHouse/ClickHouse/pull/10198) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-
-#### Bug Fix
-
-* Fix error `Pipeline stuck` with `max_rows_to_group_by` and `group_by_overflow_mode = 'break'`. [#10279](https://github.com/ClickHouse/ClickHouse/pull/10279) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix rare possible exception `Cannot drain connections: cancel first`. [#10239](https://github.com/ClickHouse/ClickHouse/pull/10239) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed bug where ClickHouse would throw "Unknown function lambda." error message when user tries to run ALTER UPDATE/DELETE on tables with ENGINE = Replicated*. Check for nondeterministic functions now handles lambda expressions correctly. [#10237](https://github.com/ClickHouse/ClickHouse/pull/10237) ([Alexander Kazakov](https://github.com/Akazz)).
-* Fixed "generateRandom" function for Date type. This fixes [#9973](https://github.com/ClickHouse/ClickHouse/issues/9973). Fix an edge case when dates with year 2106 are inserted to MergeTree tables with old-style partitioning but partitions are named with year 1970. [#10218](https://github.com/ClickHouse/ClickHouse/pull/10218) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Convert types if the table definition of a View does not correspond to the SELECT query. This fixes [#10180](https://github.com/ClickHouse/ClickHouse/issues/10180) and [#10022](https://github.com/ClickHouse/ClickHouse/issues/10022). [#10217](https://github.com/ClickHouse/ClickHouse/pull/10217) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix `parseDateTimeBestEffort` for strings in RFC-2822 when day of week is Tuesday or Thursday. This fixes [#10082](https://github.com/ClickHouse/ClickHouse/issues/10082). [#10214](https://github.com/ClickHouse/ClickHouse/pull/10214) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix column names of constants inside JOIN that may clash with names of constants outside of JOIN. [#10207](https://github.com/ClickHouse/ClickHouse/pull/10207) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix possible inifinite query execution when the query actually should stop on LIMIT, while reading from infinite source like `system.numbers` or `system.zeros`. [#10206](https://github.com/ClickHouse/ClickHouse/pull/10206) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix using the current database for access checking when the database isn't specified. [#10192](https://github.com/ClickHouse/ClickHouse/pull/10192) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Convert blocks if structure does not match on INSERT into Distributed(). [#10135](https://github.com/ClickHouse/ClickHouse/pull/10135) ([Azat Khuzhin](https://github.com/azat)).
-* Fix possible incorrect result for extremes in processors pipeline. [#10131](https://github.com/ClickHouse/ClickHouse/pull/10131) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix some kinds of alters with compact parts. [#10130](https://github.com/ClickHouse/ClickHouse/pull/10130) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix incorrect `index_granularity_bytes` check while creating new replica. Fixes [#10098](https://github.com/ClickHouse/ClickHouse/issues/10098). [#10121](https://github.com/ClickHouse/ClickHouse/pull/10121) ([alesapin](https://github.com/alesapin)).
-* Fix SIGSEGV on INSERT into Distributed table when its structure differs from the underlying tables. [#10105](https://github.com/ClickHouse/ClickHouse/pull/10105) ([Azat Khuzhin](https://github.com/azat)).
-* Fix possible rows loss for queries with `JOIN` and `UNION ALL`. Fixes [#9826](https://github.com/ClickHouse/ClickHouse/issues/9826), [#10113](https://github.com/ClickHouse/ClickHouse/issues/10113). [#10099](https://github.com/ClickHouse/ClickHouse/pull/10099) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed replicated tables startup when updating from an old ClickHouse version where `/table/replicas/replica_name/metadata` node doesn't exist. Fixes [#10037](https://github.com/ClickHouse/ClickHouse/issues/10037). [#10095](https://github.com/ClickHouse/ClickHouse/pull/10095) ([alesapin](https://github.com/alesapin)).
-* Add some arguments check and support identifier arguments for MySQL Database Engine. [#10077](https://github.com/ClickHouse/ClickHouse/pull/10077) ([Winter Zhang](https://github.com/zhang2014)).
-* Fix bug in clickhouse dictionary source from localhost clickhouse server. The bug may lead to memory corruption if types in dictionary and source are not compatible. [#10071](https://github.com/ClickHouse/ClickHouse/pull/10071) ([alesapin](https://github.com/alesapin)).
-* Fix bug in `CHECK TABLE` query when table contain skip indices. [#10068](https://github.com/ClickHouse/ClickHouse/pull/10068) ([alesapin](https://github.com/alesapin)).
-* Fix error `Cannot clone block with columns because block has 0 columns ... While executing GroupingAggregatedTransform`. It happened when setting `distributed_aggregation_memory_efficient` was enabled, and distributed query read aggregating data with different level from different shards (mixed single and two level aggregation). [#10063](https://github.com/ClickHouse/ClickHouse/pull/10063) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix a segmentation fault that could occur in GROUP BY over string keys containing trailing zero bytes ([#8636](https://github.com/ClickHouse/ClickHouse/issues/8636), [#8925](https://github.com/ClickHouse/ClickHouse/issues/8925)). [#10025](https://github.com/ClickHouse/ClickHouse/pull/10025) ([Alexander Kuzmenkov](https://github.com/akuzm)).
-* Fix the number of threads used for remote query execution (performance regression, since 20.3). This happened when query from `Distributed` table was executed simultaneously on local and remote shards. Fixes [#9965](https://github.com/ClickHouse/ClickHouse/issues/9965). [#9971](https://github.com/ClickHouse/ClickHouse/pull/9971) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix bug in which the necessary tables weren't retrieved at one of the processing stages of queries to some databases. Fixes [#9699](https://github.com/ClickHouse/ClickHouse/issues/9699). [#9949](https://github.com/ClickHouse/ClickHouse/pull/9949) ([achulkov2](https://github.com/achulkov2)).
-* Fix 'Not found column in block' error when `JOIN` appears with `TOTALS`. Fixes [#9839](https://github.com/ClickHouse/ClickHouse/issues/9839). [#9939](https://github.com/ClickHouse/ClickHouse/pull/9939) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix a bug with `ON CLUSTER` DDL queries freezing on server startup. [#9927](https://github.com/ClickHouse/ClickHouse/pull/9927) ([Gagan Arneja](https://github.com/garneja)).
-* Fix parsing multiple hosts set in the CREATE USER command, e.g. `CREATE USER user6 HOST NAME REGEXP 'lo.?*host', NAME REGEXP 'lo*host'`. [#9924](https://github.com/ClickHouse/ClickHouse/pull/9924) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix `TRUNCATE` for Join table engine ([#9917](https://github.com/ClickHouse/ClickHouse/issues/9917)). [#9920](https://github.com/ClickHouse/ClickHouse/pull/9920) ([Amos Bird](https://github.com/amosbird)).
-* Fix "scalar doesn't exist" error in ALTERs ([#9878](https://github.com/ClickHouse/ClickHouse/issues/9878)). [#9904](https://github.com/ClickHouse/ClickHouse/pull/9904) ([Amos Bird](https://github.com/amosbird)).
-* Fix race condition between drop and optimize in `ReplicatedMergeTree`. [#9901](https://github.com/ClickHouse/ClickHouse/pull/9901) ([alesapin](https://github.com/alesapin)).
-* Fix error with qualified names in `distributed_product_mode='local'`. Fixes [#4756](https://github.com/ClickHouse/ClickHouse/issues/4756). [#9891](https://github.com/ClickHouse/ClickHouse/pull/9891) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix calculating grants for introspection functions from the setting 'allow_introspection_functions'. [#9840](https://github.com/ClickHouse/ClickHouse/pull/9840) ([Vitaly Baranov](https://github.com/vitlibar)).
-
-#### Build/Testing/Packaging Improvement
-
-* Fix integration test `test_settings_constraints`. [#9962](https://github.com/ClickHouse/ClickHouse/pull/9962) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Removed dependency on `clock_getres`. [#9833](https://github.com/ClickHouse/ClickHouse/pull/9833) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-
-
-### ClickHouse release v20.3.5.21, 2020-03-27
-
-#### Bug Fix
-
-* Fix 'Different expressions with the same alias' error when query has PREWHERE and WHERE on distributed table and `SET distributed_product_mode = 'local'`. [#9871](https://github.com/ClickHouse/ClickHouse/pull/9871) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix mutations excessive memory consumption for tables with a composite primary key. This fixes [#9850](https://github.com/ClickHouse/ClickHouse/issues/9850). [#9860](https://github.com/ClickHouse/ClickHouse/pull/9860) ([alesapin](https://github.com/alesapin)).
-* For INSERT queries shard now clamps the settings got from the initiator to the shard's constaints instead of throwing an exception. This fix allows to send INSERT queries to a shard with another constraints. This change improves fix [#9447](https://github.com/ClickHouse/ClickHouse/issues/9447). [#9852](https://github.com/ClickHouse/ClickHouse/pull/9852) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix 'COMMA to CROSS JOIN rewriter is not enabled or cannot rewrite query' error in case of subqueries with COMMA JOIN out of tables lists (i.e. in WHERE). Fixes [#9782](https://github.com/ClickHouse/ClickHouse/issues/9782). [#9830](https://github.com/ClickHouse/ClickHouse/pull/9830) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix possible exception `Got 0 in totals chunk, expected 1` on client. It happened for queries with `JOIN` in case if right joined table had zero rows. Example: `select * from system.one t1 join system.one t2 on t1.dummy = t2.dummy limit 0 FORMAT TabSeparated;`. Fixes [#9777](https://github.com/ClickHouse/ClickHouse/issues/9777). [#9823](https://github.com/ClickHouse/ClickHouse/pull/9823) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix SIGSEGV with optimize_skip_unused_shards when type cannot be converted. [#9804](https://github.com/ClickHouse/ClickHouse/pull/9804) ([Azat Khuzhin](https://github.com/azat)).
-* Fix broken `ALTER TABLE DELETE COLUMN` query for compact parts. [#9779](https://github.com/ClickHouse/ClickHouse/pull/9779) ([alesapin](https://github.com/alesapin)).
-* Fix max_distributed_connections (w/ and w/o Processors). [#9673](https://github.com/ClickHouse/ClickHouse/pull/9673) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed a few cases when timezone of the function argument wasn't used properly. [#9574](https://github.com/ClickHouse/ClickHouse/pull/9574) ([Vasily Nemkov](https://github.com/Enmk)).
-
-#### Improvement
-
-* Remove order by stage from mutations because we read from a single ordered part in a single thread. Also add check that the order of rows in mutation is ordered in sorting key order and this order is not violated. [#9886](https://github.com/ClickHouse/ClickHouse/pull/9886) ([alesapin](https://github.com/alesapin)).
-
-
-### ClickHouse release v20.3.4.10, 2020-03-20
-
-#### Bug Fix
-* This release also contains all bug fixes from 20.1.8.41
-* Fix missing `rows_before_limit_at_least` for queries over http (with processors pipeline). This fixes [#9730](https://github.com/ClickHouse/ClickHouse/issues/9730). [#9757](https://github.com/ClickHouse/ClickHouse/pull/9757) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-
-
-### ClickHouse release v20.3.3.6, 2020-03-17
-
-#### Bug Fix
-* This release also contains all bug fixes from 20.1.7.38
-* Fix bug in a replication that doesn't allow replication to work if the user has executed mutations on the previous version. This fixes [#9645](https://github.com/ClickHouse/ClickHouse/issues/9645). [#9652](https://github.com/ClickHouse/ClickHouse/pull/9652) ([alesapin](https://github.com/alesapin)). It makes version 20.3 backward compatible again.
-* Add setting `use_compact_format_in_distributed_parts_names` which allows to write files for `INSERT` queries into `Distributed` table with more compact format. This fixes [#9647](https://github.com/ClickHouse/ClickHouse/issues/9647). [#9653](https://github.com/ClickHouse/ClickHouse/pull/9653) ([alesapin](https://github.com/alesapin)). It makes version 20.3 backward compatible again.
-
-### ClickHouse release v20.3.2.1, 2020-03-12
-
-#### Backward Incompatible Change
-
-* Fixed the issue `file name too long` when sending data for `Distributed` tables for a large number of replicas. Fixed the issue that replica credentials were exposed in the server log. The format of directory name on disk was changed to `[shard{shard_index}[_replica{replica_index}]]`. [#8911](https://github.com/ClickHouse/ClickHouse/pull/8911) ([Mikhail Korotov](https://github.com/millb)) After you upgrade to the new version, you will not be able to downgrade without manual intervention, because old server version does not recognize the new directory format. If you want to downgrade, you have to manually rename the corresponding directories to the old format. This change is relevant only if you have used asynchronous `INSERT`s to `Distributed` tables. In the version 20.3.3 we will introduce a setting that will allow you to enable the new format gradually.
-* Changed the format of replication log entries for mutation commands. You have to wait for old mutations to process before installing the new version.
-* Implement simple memory profiler that dumps stacktraces to `system.trace_log` every N bytes over soft allocation limit [#8765](https://github.com/ClickHouse/ClickHouse/pull/8765) ([Ivan](https://github.com/abyss7)) [#9472](https://github.com/ClickHouse/ClickHouse/pull/9472) ([alexey-milovidov](https://github.com/alexey-milovidov)) The column of `system.trace_log` was renamed from `timer_type` to `trace_type`. This will require changes in third-party performance analysis and flamegraph processing tools.
-* Use OS thread id everywhere instead of internal thread number. This fixes [#7477](https://github.com/ClickHouse/ClickHouse/issues/7477) Old `clickhouse-client` cannot receive logs that are send from the server when the setting `send_logs_level` is enabled, because the names and types of the structured log messages were changed. On the other hand, different server versions can send logs with different types to each other. When you don't use the `send_logs_level` setting, you should not care. [#8954](https://github.com/ClickHouse/ClickHouse/pull/8954) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Remove `indexHint` function [#9542](https://github.com/ClickHouse/ClickHouse/pull/9542) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Remove `findClusterIndex`, `findClusterValue` functions. This fixes [#8641](https://github.com/ClickHouse/ClickHouse/issues/8641). If you were using these functions, send an email to `clickhouse-feedback@yandex-team.com` [#9543](https://github.com/ClickHouse/ClickHouse/pull/9543) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Now it's not allowed to create columns or add columns with `SELECT` subquery as default expression. [#9481](https://github.com/ClickHouse/ClickHouse/pull/9481) ([alesapin](https://github.com/alesapin))
-* Require aliases for subqueries in JOIN. [#9274](https://github.com/ClickHouse/ClickHouse/pull/9274) ([Artem Zuikov](https://github.com/4ertus2))
-* Improved `ALTER MODIFY/ADD` queries logic. Now you cannot `ADD` column without type, `MODIFY` default expression doesn't change type of column and `MODIFY` type doesn't loose default expression value. Fixes [#8669](https://github.com/ClickHouse/ClickHouse/issues/8669). [#9227](https://github.com/ClickHouse/ClickHouse/pull/9227) ([alesapin](https://github.com/alesapin))
-* Require server to be restarted to apply the changes in logging configuration. This is a temporary workaround to avoid the bug where the server logs to a deleted log file (see [#8696](https://github.com/ClickHouse/ClickHouse/issues/8696)). [#8707](https://github.com/ClickHouse/ClickHouse/pull/8707) ([Alexander Kuzmenkov](https://github.com/akuzm))
-* The setting `experimental_use_processors` is enabled by default. This setting enables usage of the new query pipeline. This is internal refactoring and we expect no visible changes. If you will see any issues, set it to back zero. [#8768](https://github.com/ClickHouse/ClickHouse/pull/8768) ([alexey-milovidov](https://github.com/alexey-milovidov))
-
-#### New Feature
-* Add `Avro` and `AvroConfluent` input/output formats [#8571](https://github.com/ClickHouse/ClickHouse/pull/8571) ([Andrew Onyshchuk](https://github.com/oandrew)) [#8957](https://github.com/ClickHouse/ClickHouse/pull/8957) ([Andrew Onyshchuk](https://github.com/oandrew)) [#8717](https://github.com/ClickHouse/ClickHouse/pull/8717) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Multi-threaded and non-blocking updates of expired keys in `cache` dictionaries (with optional permission to read old ones). [#8303](https://github.com/ClickHouse/ClickHouse/pull/8303) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
-* Add query `ALTER ... MATERIALIZE TTL`. It runs mutation that forces to remove expired data by TTL and recalculates meta-information about TTL in all parts. [#8775](https://github.com/ClickHouse/ClickHouse/pull/8775) ([Anton Popov](https://github.com/CurtizJ))
-* Switch from HashJoin to MergeJoin (on disk) if needed [#9082](https://github.com/ClickHouse/ClickHouse/pull/9082) ([Artem Zuikov](https://github.com/4ertus2))
-* Added `MOVE PARTITION` command for `ALTER TABLE` [#4729](https://github.com/ClickHouse/ClickHouse/issues/4729) [#6168](https://github.com/ClickHouse/ClickHouse/pull/6168) ([Guillaume Tassery](https://github.com/YiuRULE))
-* Reloading storage configuration from configuration file on the fly. [#8594](https://github.com/ClickHouse/ClickHouse/pull/8594) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Allowed to change `storage_policy` to not less rich one. [#8107](https://github.com/ClickHouse/ClickHouse/pull/8107) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Added support for globs/wildcards for S3 storage and table function. [#8851](https://github.com/ClickHouse/ClickHouse/pull/8851) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Implement `bitAnd`, `bitOr`, `bitXor`, `bitNot` for `FixedString(N)` datatype. [#9091](https://github.com/ClickHouse/ClickHouse/pull/9091) ([Guillaume Tassery](https://github.com/YiuRULE))
-* Added function `bitCount`. This fixes [#8702](https://github.com/ClickHouse/ClickHouse/issues/8702). [#8708](https://github.com/ClickHouse/ClickHouse/pull/8708) ([alexey-milovidov](https://github.com/alexey-milovidov)) [#8749](https://github.com/ClickHouse/ClickHouse/pull/8749) ([ikopylov](https://github.com/ikopylov))
-* Add `generateRandom` table function to generate random rows with given schema. Allows to populate arbitrary test table with data. [#8994](https://github.com/ClickHouse/ClickHouse/pull/8994) ([Ilya Yatsishin](https://github.com/qoega))
-* `JSONEachRowFormat`: support special case when objects enclosed in top-level array. [#8860](https://github.com/ClickHouse/ClickHouse/pull/8860) ([Kruglov Pavel](https://github.com/Avogar))
-* Now it's possible to create a column with `DEFAULT` expression which depends on a column with default `ALIAS` expression. [#9489](https://github.com/ClickHouse/ClickHouse/pull/9489) ([alesapin](https://github.com/alesapin))
-* Allow to specify `--limit` more than the source data size in `clickhouse-obfuscator`. The data will repeat itself with different random seed. [#9155](https://github.com/ClickHouse/ClickHouse/pull/9155) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Added `groupArraySample` function (similar to `groupArray`) with reservior sampling algorithm. [#8286](https://github.com/ClickHouse/ClickHouse/pull/8286) ([Amos Bird](https://github.com/amosbird))
-* Now you can monitor the size of update queue in `cache`/`complex_key_cache` dictionaries via system metrics. [#9413](https://github.com/ClickHouse/ClickHouse/pull/9413) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
-* Allow to use CRLF as a line separator in CSV output format with setting `output_format_csv_crlf_end_of_line` is set to 1 [#8934](https://github.com/ClickHouse/ClickHouse/pull/8934) [#8935](https://github.com/ClickHouse/ClickHouse/pull/8935) [#8963](https://github.com/ClickHouse/ClickHouse/pull/8963) ([Mikhail Korotov](https://github.com/millb))
-* Implement more functions of the [H3](https://github.com/uber/h3) API: `h3GetBaseCell`, `h3HexAreaM2`, `h3IndexesAreNeighbors`, `h3ToChildren`, `h3ToString` and `stringToH3` [#8938](https://github.com/ClickHouse/ClickHouse/pull/8938) ([Nico Mandery](https://github.com/nmandery))
-* New setting introduced: `max_parser_depth` to control maximum stack size and allow large complex queries. This fixes [#6681](https://github.com/ClickHouse/ClickHouse/issues/6681) and [#7668](https://github.com/ClickHouse/ClickHouse/issues/7668). [#8647](https://github.com/ClickHouse/ClickHouse/pull/8647) ([Maxim Smirnov](https://github.com/qMBQx8GH))
-* Add a setting `force_optimize_skip_unused_shards` setting to throw if skipping of unused shards is not possible [#8805](https://github.com/ClickHouse/ClickHouse/pull/8805) ([Azat Khuzhin](https://github.com/azat))
-* Allow to configure multiple disks/volumes for storing data for send in `Distributed` engine [#8756](https://github.com/ClickHouse/ClickHouse/pull/8756) ([Azat Khuzhin](https://github.com/azat))
-* Support storage policy (`<tmp_policy>`) for storing temporary data. [#8750](https://github.com/ClickHouse/ClickHouse/pull/8750) ([Azat Khuzhin](https://github.com/azat))
-* Added `X-ClickHouse-Exception-Code` HTTP header that is set if exception was thrown before sending data. This implements [#4971](https://github.com/ClickHouse/ClickHouse/issues/4971). [#8786](https://github.com/ClickHouse/ClickHouse/pull/8786) ([Mikhail Korotov](https://github.com/millb))
-* Added function `ifNotFinite`. It is just a syntactic sugar: `ifNotFinite(x, y) = isFinite(x) ? x : y`. [#8710](https://github.com/ClickHouse/ClickHouse/pull/8710) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Added `last_successful_update_time` column in `system.dictionaries` table [#9394](https://github.com/ClickHouse/ClickHouse/pull/9394) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
-* Add `blockSerializedSize` function (size on disk without compression) [#8952](https://github.com/ClickHouse/ClickHouse/pull/8952) ([Azat Khuzhin](https://github.com/azat))
-* Add function `moduloOrZero` [#9358](https://github.com/ClickHouse/ClickHouse/pull/9358) ([hcz](https://github.com/hczhcz))
-* Added system tables `system.zeros` and `system.zeros_mt` as well as tale functions `zeros()` and `zeros_mt()`. Tables (and table functions) contain single column with name `zero` and type `UInt8`. This column contains zeros. It is needed for test purposes as the fastest method to generate many rows. This fixes [#6604](https://github.com/ClickHouse/ClickHouse/issues/6604) [#9593](https://github.com/ClickHouse/ClickHouse/pull/9593) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-
-#### Experimental Feature
-* Add new compact format of parts in `MergeTree`-family tables in which all columns are stored in one file. It helps to increase performance of small and frequent inserts. The old format (one file per column) is now called wide. Data storing format is controlled by settings `min_bytes_for_wide_part` and `min_rows_for_wide_part`. [#8290](https://github.com/ClickHouse/ClickHouse/pull/8290) ([Anton Popov](https://github.com/CurtizJ))
-* Support for S3 storage for `Log`, `TinyLog` and `StripeLog` tables. [#8862](https://github.com/ClickHouse/ClickHouse/pull/8862) ([Pavel Kovalenko](https://github.com/Jokser))
-
-#### Bug Fix
-* Fixed inconsistent whitespaces in log messages. [#9322](https://github.com/ClickHouse/ClickHouse/pull/9322) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix bug in which arrays of unnamed tuples were flattened as Nested structures on table creation. [#8866](https://github.com/ClickHouse/ClickHouse/pull/8866) ([achulkov2](https://github.com/achulkov2))
-* Fixed the issue when "Too many open files" error may happen if there are too many files matching glob pattern in `File` table or `file` table function. Now files are opened lazily. This fixes [#8857](https://github.com/ClickHouse/ClickHouse/issues/8857) [#8861](https://github.com/ClickHouse/ClickHouse/pull/8861) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* DROP TEMPORARY TABLE now drops only temporary table. [#8907](https://github.com/ClickHouse/ClickHouse/pull/8907) ([Vitaly Baranov](https://github.com/vitlibar))
-* Remove outdated partition when we shutdown the server or DETACH/ATTACH a table. [#8602](https://github.com/ClickHouse/ClickHouse/pull/8602) ([Guillaume Tassery](https://github.com/YiuRULE))
-* For how the default disk calculates the free space from `data` subdirectory. Fixed the issue when the amount of free space is not calculated correctly if the `data` directory is mounted to a separate device (rare case). This fixes [#7441](https://github.com/ClickHouse/ClickHouse/issues/7441) [#9257](https://github.com/ClickHouse/ClickHouse/pull/9257) ([Mikhail Korotov](https://github.com/millb))
-* Allow comma (cross) join with IN () inside. [#9251](https://github.com/ClickHouse/ClickHouse/pull/9251) ([Artem Zuikov](https://github.com/4ertus2))
-* Allow to rewrite CROSS to INNER JOIN if there's [NOT] LIKE operator in WHERE section. [#9229](https://github.com/ClickHouse/ClickHouse/pull/9229) ([Artem Zuikov](https://github.com/4ertus2))
-* Fix possible incorrect result after `GROUP BY` with enabled setting `distributed_aggregation_memory_efficient`. Fixes [#9134](https://github.com/ClickHouse/ClickHouse/issues/9134). [#9289](https://github.com/ClickHouse/ClickHouse/pull/9289) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Found keys were counted as missed in metrics of cache dictionaries. [#9411](https://github.com/ClickHouse/ClickHouse/pull/9411) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
-* Fix replication protocol incompatibility introduced in [#8598](https://github.com/ClickHouse/ClickHouse/issues/8598). [#9412](https://github.com/ClickHouse/ClickHouse/pull/9412) ([alesapin](https://github.com/alesapin))
-* Fixed race condition on `queue_task_handle` at the startup of `ReplicatedMergeTree` tables. [#9552](https://github.com/ClickHouse/ClickHouse/pull/9552) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* The token `NOT` didn't work in `SHOW TABLES NOT LIKE` query [#8727](https://github.com/ClickHouse/ClickHouse/issues/8727) [#8940](https://github.com/ClickHouse/ClickHouse/pull/8940) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Added range check to function `h3EdgeLengthM`. Without this check, buffer overflow is possible. [#8945](https://github.com/ClickHouse/ClickHouse/pull/8945) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fixed up a bug in batched calculations of ternary logical OPs on multiple arguments (more than 10). [#8718](https://github.com/ClickHouse/ClickHouse/pull/8718) ([Alexander Kazakov](https://github.com/Akazz))
-* Fix error of PREWHERE optimization, which could lead to segfaults or `Inconsistent number of columns got from MergeTreeRangeReader` exception. [#9024](https://github.com/ClickHouse/ClickHouse/pull/9024) ([Anton Popov](https://github.com/CurtizJ))
-* Fix unexpected `Timeout exceeded while reading from socket` exception, which randomly happens on secure connection before timeout actually exceeded and when query profiler is enabled. Also add `connect_timeout_with_failover_secure_ms` settings (default 100ms), which is similar to `connect_timeout_with_failover_ms`, but is used for secure connections (because SSL handshake is slower, than ordinary TCP connection) [#9026](https://github.com/ClickHouse/ClickHouse/pull/9026) ([tavplubix](https://github.com/tavplubix))
-* Fix bug with mutations finalization, when mutation may hang in state with `parts_to_do=0` and `is_done=0`. [#9022](https://github.com/ClickHouse/ClickHouse/pull/9022) ([alesapin](https://github.com/alesapin))
-* Use new ANY JOIN logic with `partial_merge_join` setting. It's possible to make `ANY|ALL|SEMI LEFT` and `ALL INNER` joins with `partial_merge_join=1` now. [#8932](https://github.com/ClickHouse/ClickHouse/pull/8932) ([Artem Zuikov](https://github.com/4ertus2))
-* Shard now clamps the settings got from the initiator to the shard's constaints instead of throwing an exception. This fix allows to send queries to a shard with another constraints. [#9447](https://github.com/ClickHouse/ClickHouse/pull/9447) ([Vitaly Baranov](https://github.com/vitlibar))
-* Fixed memory management problem in `MergeTreeReadPool`. [#8791](https://github.com/ClickHouse/ClickHouse/pull/8791) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Fix `toDecimal*OrNull()` functions family when called with string `e`. Fixes [#8312](https://github.com/ClickHouse/ClickHouse/issues/8312) [#8764](https://github.com/ClickHouse/ClickHouse/pull/8764) ([Artem Zuikov](https://github.com/4ertus2))
-* Make sure that `FORMAT Null` sends no data to the client. [#8767](https://github.com/ClickHouse/ClickHouse/pull/8767) ([Alexander Kuzmenkov](https://github.com/akuzm))
-* Fix bug that timestamp in `LiveViewBlockInputStream` will not updated. `LIVE VIEW` is an experimental feature. [#8644](https://github.com/ClickHouse/ClickHouse/pull/8644) ([vxider](https://github.com/Vxider)) [#8625](https://github.com/ClickHouse/ClickHouse/pull/8625) ([vxider](https://github.com/Vxider))
-* Fixed `ALTER MODIFY TTL` wrong behavior which did not allow to delete old TTL expressions. [#8422](https://github.com/ClickHouse/ClickHouse/pull/8422) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Fixed UBSan report in MergeTreeIndexSet. This fixes [#9250](https://github.com/ClickHouse/ClickHouse/issues/9250) [#9365](https://github.com/ClickHouse/ClickHouse/pull/9365) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fixed the behaviour of `match` and `extract` functions when haystack has zero bytes. The behaviour was wrong when haystack was constant. This fixes [#9160](https://github.com/ClickHouse/ClickHouse/issues/9160) [#9163](https://github.com/ClickHouse/ClickHouse/pull/9163) ([alexey-milovidov](https://github.com/alexey-milovidov)) [#9345](https://github.com/ClickHouse/ClickHouse/pull/9345) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Avoid throwing from destructor in Apache Avro 3rd-party library. [#9066](https://github.com/ClickHouse/ClickHouse/pull/9066) ([Andrew Onyshchuk](https://github.com/oandrew))
-* Don't commit a batch polled from `Kafka` partially as it can lead to holes in data. [#8876](https://github.com/ClickHouse/ClickHouse/pull/8876) ([filimonov](https://github.com/filimonov))
-* Fix `joinGet` with nullable return types. [#8919](https://github.com/ClickHouse/ClickHouse/issues/8919) [#9014](https://github.com/ClickHouse/ClickHouse/pull/9014) ([Amos Bird](https://github.com/amosbird))
-* Fix data incompatibility when compressed with `T64` codec. [#9016](https://github.com/ClickHouse/ClickHouse/pull/9016) ([Artem Zuikov](https://github.com/4ertus2)) Fix data type ids in `T64` compression codec that leads to wrong (de)compression in affected versions. [#9033](https://github.com/ClickHouse/ClickHouse/pull/9033) ([Artem Zuikov](https://github.com/4ertus2))
-* Add setting `enable_early_constant_folding` and disable it in some cases that leads to errors. [#9010](https://github.com/ClickHouse/ClickHouse/pull/9010) ([Artem Zuikov](https://github.com/4ertus2))
-* Fix pushdown predicate optimizer with VIEW and enable the test [#9011](https://github.com/ClickHouse/ClickHouse/pull/9011) ([Winter Zhang](https://github.com/zhang2014))
-* Fix segfault in `Merge` tables, that can happen when reading from `File` storages [#9387](https://github.com/ClickHouse/ClickHouse/pull/9387) ([tavplubix](https://github.com/tavplubix))
-* Added a check for storage policy in `ATTACH PARTITION FROM`, `REPLACE PARTITION`, `MOVE TO TABLE`. Otherwise it could make data of part inaccessible after restart and prevent ClickHouse to start. [#9383](https://github.com/ClickHouse/ClickHouse/pull/9383) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Fix alters if there is TTL set for table. [#8800](https://github.com/ClickHouse/ClickHouse/pull/8800) ([Anton Popov](https://github.com/CurtizJ))
-* Fix race condition that can happen when `SYSTEM RELOAD ALL DICTIONARIES` is executed while some dictionary is being modified/added/removed. [#8801](https://github.com/ClickHouse/ClickHouse/pull/8801) ([Vitaly Baranov](https://github.com/vitlibar))
-* In previous versions `Memory` database engine use empty data path, so tables are created in `path` directory (e.g. `/var/lib/clickhouse/`), not in data directory of database (e.g. `/var/lib/clickhouse/db_name`). [#8753](https://github.com/ClickHouse/ClickHouse/pull/8753) ([tavplubix](https://github.com/tavplubix))
-* Fixed wrong log messages about missing default disk or policy. [#9530](https://github.com/ClickHouse/ClickHouse/pull/9530) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Fix not(has()) for the bloom_filter index of array types. [#9407](https://github.com/ClickHouse/ClickHouse/pull/9407) ([achimbab](https://github.com/achimbab))
-* Allow first column(s) in a table with `Log` engine be an alias [#9231](https://github.com/ClickHouse/ClickHouse/pull/9231) ([Ivan](https://github.com/abyss7))
-* Fix order of ranges while reading from `MergeTree` table in one thread. It could lead to exceptions from `MergeTreeRangeReader` or wrong query results. [#9050](https://github.com/ClickHouse/ClickHouse/pull/9050) ([Anton Popov](https://github.com/CurtizJ))
-* Make `reinterpretAsFixedString` to return `FixedString` instead of `String`. [#9052](https://github.com/ClickHouse/ClickHouse/pull/9052) ([Andrew Onyshchuk](https://github.com/oandrew))
-* Avoid extremely rare cases when the user can get wrong error message (`Success` instead of detailed error description). [#9457](https://github.com/ClickHouse/ClickHouse/pull/9457) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Do not crash when using `Template` format with empty row template. [#8785](https://github.com/ClickHouse/ClickHouse/pull/8785) ([Alexander Kuzmenkov](https://github.com/akuzm))
-* Metadata files for system tables could be created in wrong place [#8653](https://github.com/ClickHouse/ClickHouse/pull/8653) ([tavplubix](https://github.com/tavplubix)) Fixes [#8581](https://github.com/ClickHouse/ClickHouse/issues/8581).
-* Fix data race on exception_ptr in cache dictionary [#8303](https://github.com/ClickHouse/ClickHouse/issues/8303). [#9379](https://github.com/ClickHouse/ClickHouse/pull/9379) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
-* Do not throw an exception for query `ATTACH TABLE IF NOT EXISTS`. Previously it was thrown if table already exists, despite the `IF NOT EXISTS` clause. [#8967](https://github.com/ClickHouse/ClickHouse/pull/8967) ([Anton Popov](https://github.com/CurtizJ))
-* Fixed missing closing paren in exception message. [#8811](https://github.com/ClickHouse/ClickHouse/pull/8811) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Avoid message `Possible deadlock avoided` at the startup of clickhouse-client in interactive mode. [#9455](https://github.com/ClickHouse/ClickHouse/pull/9455) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fixed the issue when padding at the end of base64 encoded value can be malformed. Update base64 library. This fixes [#9491](https://github.com/ClickHouse/ClickHouse/issues/9491), closes [#9492](https://github.com/ClickHouse/ClickHouse/issues/9492) [#9500](https://github.com/ClickHouse/ClickHouse/pull/9500) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Prevent losing data in `Kafka` in rare cases when exception happens after reading suffix but before commit. Fixes [#9378](https://github.com/ClickHouse/ClickHouse/issues/9378) [#9507](https://github.com/ClickHouse/ClickHouse/pull/9507) ([filimonov](https://github.com/filimonov))
-* Fixed exception in `DROP TABLE IF EXISTS` [#8663](https://github.com/ClickHouse/ClickHouse/pull/8663) ([Nikita Vasilev](https://github.com/nikvas0))
-* Fix crash when a user tries to `ALTER MODIFY SETTING` for old-formated `MergeTree` table engines family. [#9435](https://github.com/ClickHouse/ClickHouse/pull/9435) ([alesapin](https://github.com/alesapin))
-* Support for UInt64 numbers that don't fit in Int64 in JSON-related functions. Update SIMDJSON to master. This fixes [#9209](https://github.com/ClickHouse/ClickHouse/issues/9209) [#9344](https://github.com/ClickHouse/ClickHouse/pull/9344) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fixed execution of inversed predicates when non-strictly monotinic functional index is used. [#9223](https://github.com/ClickHouse/ClickHouse/pull/9223) ([Alexander Kazakov](https://github.com/Akazz))
-* Don't try to fold `IN` constant in `GROUP BY` [#8868](https://github.com/ClickHouse/ClickHouse/pull/8868) ([Amos Bird](https://github.com/amosbird))
-* Fix bug in `ALTER DELETE` mutations which leads to index corruption. This fixes [#9019](https://github.com/ClickHouse/ClickHouse/issues/9019) and [#8982](https://github.com/ClickHouse/ClickHouse/issues/8982). Additionally fix extremely rare race conditions in `ReplicatedMergeTree` `ALTER` queries. [#9048](https://github.com/ClickHouse/ClickHouse/pull/9048) ([alesapin](https://github.com/alesapin))
-* When the setting `compile_expressions` is enabled, you can get `unexpected column` in `LLVMExecutableFunction` when we use `Nullable` type [#8910](https://github.com/ClickHouse/ClickHouse/pull/8910) ([Guillaume Tassery](https://github.com/YiuRULE))
-* Multiple fixes for `Kafka` engine: 1) fix duplicates that were appearing during consumer group rebalance. 2) Fix rare 'holes' appeared when data were polled from several partitions with one poll and committed partially (now we always process / commit the whole polled block of messages). 3) Fix flushes by block size (before that only flushing by timeout was working properly). 4) better subscription procedure (with assignment feedback). 5) Make tests work faster (with default intervals and timeouts). Due to the fact that data was not flushed by block size before (as it should according to documentation), that PR may lead to some performance degradation with default settings (due to more often & tinier flushes which are less optimal). If you encounter the performance issue after that change - please increase `kafka_max_block_size` in the table to the bigger value ( for example `CREATE TABLE ...Engine=Kafka ... SETTINGS ... kafka_max_block_size=524288`). Fixes [#7259](https://github.com/ClickHouse/ClickHouse/issues/7259) [#8917](https://github.com/ClickHouse/ClickHouse/pull/8917) ([filimonov](https://github.com/filimonov))
-* Fix `Parameter out of bound` exception in some queries after PREWHERE optimizations. [#8914](https://github.com/ClickHouse/ClickHouse/pull/8914) ([Baudouin Giard](https://github.com/bgiard))
-* Fixed the case of mixed-constness of arguments of function `arrayZip`. [#8705](https://github.com/ClickHouse/ClickHouse/pull/8705) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* When executing `CREATE` query, fold constant expressions in storage engine arguments. Replace empty database name with current database. Fixes [#6508](https://github.com/ClickHouse/ClickHouse/issues/6508), [#3492](https://github.com/ClickHouse/ClickHouse/issues/3492) [#9262](https://github.com/ClickHouse/ClickHouse/pull/9262) ([tavplubix](https://github.com/tavplubix))
-* Now it's not possible to create or add columns with simple cyclic aliases like `a DEFAULT b, b DEFAULT a`. [#9603](https://github.com/ClickHouse/ClickHouse/pull/9603) ([alesapin](https://github.com/alesapin))
-* Fixed a bug with double move which may corrupt original part. This is relevant if you use `ALTER TABLE MOVE` [#8680](https://github.com/ClickHouse/ClickHouse/pull/8680) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Allow `interval` identifier to correctly parse without backticks. Fixed issue when a query cannot be executed even if the `interval` identifier is enclosed in backticks or double quotes. This fixes [#9124](https://github.com/ClickHouse/ClickHouse/issues/9124). [#9142](https://github.com/ClickHouse/ClickHouse/pull/9142) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fixed fuzz test and incorrect behaviour of `bitTestAll`/`bitTestAny` functions. [#9143](https://github.com/ClickHouse/ClickHouse/pull/9143) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix possible crash/wrong number of rows in `LIMIT n WITH TIES` when there are a lot of rows equal to n'th row. [#9464](https://github.com/ClickHouse/ClickHouse/pull/9464) ([tavplubix](https://github.com/tavplubix))
-* Fix mutations with parts written with enabled `insert_quorum`. [#9463](https://github.com/ClickHouse/ClickHouse/pull/9463) ([alesapin](https://github.com/alesapin))
-* Fix data race at destruction of `Poco::HTTPServer`. It could happen when server is started and immediately shut down. [#9468](https://github.com/ClickHouse/ClickHouse/pull/9468) ([Anton Popov](https://github.com/CurtizJ))
-* Fix bug in which a misleading error message was shown when running `SHOW CREATE TABLE a_table_that_does_not_exist`. [#8899](https://github.com/ClickHouse/ClickHouse/pull/8899) ([achulkov2](https://github.com/achulkov2))
-* Fixed `Parameters are out of bound` exception in some rare cases when we have a constant in the `SELECT` clause when we have an `ORDER BY` and a `LIMIT` clause. [#8892](https://github.com/ClickHouse/ClickHouse/pull/8892) ([Guillaume Tassery](https://github.com/YiuRULE))
-* Fix mutations finalization, when already done mutation can have status `is_done=0`. [#9217](https://github.com/ClickHouse/ClickHouse/pull/9217) ([alesapin](https://github.com/alesapin))
-* Prevent from executing `ALTER ADD INDEX` for MergeTree tables with old syntax, because it doesn't work. [#8822](https://github.com/ClickHouse/ClickHouse/pull/8822) ([Mikhail Korotov](https://github.com/millb))
-* During server startup do not access table, which `LIVE VIEW` depends on, so server will be able to start. Also remove `LIVE VIEW` dependencies when detaching `LIVE VIEW`. `LIVE VIEW` is an experimental feature. [#8824](https://github.com/ClickHouse/ClickHouse/pull/8824) ([tavplubix](https://github.com/tavplubix))
-* Fix possible segfault in `MergeTreeRangeReader`, while executing `PREWHERE`. [#9106](https://github.com/ClickHouse/ClickHouse/pull/9106) ([Anton Popov](https://github.com/CurtizJ))
-* Fix possible mismatched checksums with column TTLs. [#9451](https://github.com/ClickHouse/ClickHouse/pull/9451) ([Anton Popov](https://github.com/CurtizJ))
-* Fixed a bug when parts were not being moved in background by TTL rules in case when there is only one volume. [#8672](https://github.com/ClickHouse/ClickHouse/pull/8672) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Fixed the issue `Method createColumn() is not implemented for data type Set`. This fixes [#7799](https://github.com/ClickHouse/ClickHouse/issues/7799). [#8674](https://github.com/ClickHouse/ClickHouse/pull/8674) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Now we will try finalize mutations more frequently. [#9427](https://github.com/ClickHouse/ClickHouse/pull/9427) ([alesapin](https://github.com/alesapin))
-* Fix `intDiv` by minus one constant [#9351](https://github.com/ClickHouse/ClickHouse/pull/9351) ([hcz](https://github.com/hczhcz))
-* Fix possible race condition in `BlockIO`. [#9356](https://github.com/ClickHouse/ClickHouse/pull/9356) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fix bug leading to server termination when trying to use / drop `Kafka` table created with wrong parameters. [#9513](https://github.com/ClickHouse/ClickHouse/pull/9513) ([filimonov](https://github.com/filimonov))
-* Added workaround if OS returns wrong result for `timer_create` function. [#8837](https://github.com/ClickHouse/ClickHouse/pull/8837) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fixed error in usage of `min_marks_for_seek` parameter. Fixed the error message when there is no sharding key in Distributed table and we try to skip unused shards. [#8908](https://github.com/ClickHouse/ClickHouse/pull/8908) ([Azat Khuzhin](https://github.com/azat))
-
-#### Improvement
-* Implement `ALTER MODIFY/DROP` queries on top of mutations for `ReplicatedMergeTree*` engines family. Now `ALTERS` blocks only at the metadata update stage, and don't block after that. [#8701](https://github.com/ClickHouse/ClickHouse/pull/8701) ([alesapin](https://github.com/alesapin))
-* Add ability to rewrite CROSS to INNER JOINs with `WHERE` section containing unqialified names. [#9512](https://github.com/ClickHouse/ClickHouse/pull/9512) ([Artem Zuikov](https://github.com/4ertus2))
-* Make `SHOW TABLES` and `SHOW DATABASES` queries support the `WHERE` expressions and `FROM`/`IN` [#9076](https://github.com/ClickHouse/ClickHouse/pull/9076) ([sundyli](https://github.com/sundy-li))
-* Added a setting `deduplicate_blocks_in_dependent_materialized_views`. [#9070](https://github.com/ClickHouse/ClickHouse/pull/9070) ([urykhy](https://github.com/urykhy))
-* After recent changes MySQL client started to print binary strings in hex thereby making them not readable ([#9032](https://github.com/ClickHouse/ClickHouse/issues/9032)). The workaround in ClickHouse is to mark string columns as UTF-8, which is not always, but usually the case. [#9079](https://github.com/ClickHouse/ClickHouse/pull/9079) ([Yuriy Baranov](https://github.com/yurriy))
-* Add support of String and FixedString keys for `sumMap` [#8903](https://github.com/ClickHouse/ClickHouse/pull/8903) ([Baudouin Giard](https://github.com/bgiard))
-* Support string keys in SummingMergeTree maps [#8933](https://github.com/ClickHouse/ClickHouse/pull/8933) ([Baudouin Giard](https://github.com/bgiard))
-* Signal termination of thread to the thread pool even if the thread has thrown exception [#8736](https://github.com/ClickHouse/ClickHouse/pull/8736) ([Ding Xiang Fei](https://github.com/dingxiangfei2009))
-* Allow to set `query_id` in `clickhouse-benchmark` [#9416](https://github.com/ClickHouse/ClickHouse/pull/9416) ([Anton Popov](https://github.com/CurtizJ))
-* Don't allow strange expressions in `ALTER TABLE ... PARTITION partition` query. This addresses [#7192](https://github.com/ClickHouse/ClickHouse/issues/7192) [#8835](https://github.com/ClickHouse/ClickHouse/pull/8835) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* The table `system.table_engines` now provides information about feature support (like `supports_ttl` or `supports_sort_order`). [#8830](https://github.com/ClickHouse/ClickHouse/pull/8830) ([Max Akhmedov](https://github.com/zlobober))
-* Enable `system.metric_log` by default. It will contain rows with values of ProfileEvents, CurrentMetrics collected with "collect_interval_milliseconds" interval (one second by default). The table is very small (usually in order of megabytes) and collecting this data by default is reasonable. [#9225](https://github.com/ClickHouse/ClickHouse/pull/9225) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Initialize query profiler for all threads in a group, e.g. it allows to fully profile insert-queries. Fixes [#6964](https://github.com/ClickHouse/ClickHouse/issues/6964) [#8874](https://github.com/ClickHouse/ClickHouse/pull/8874) ([Ivan](https://github.com/abyss7))
-* Now temporary `LIVE VIEW` is created by `CREATE LIVE VIEW name WITH TIMEOUT [42] ...` instead of `CREATE TEMPORARY LIVE VIEW ...`, because the previous syntax was not consistent with `CREATE TEMPORARY TABLE ...` [#9131](https://github.com/ClickHouse/ClickHouse/pull/9131) ([tavplubix](https://github.com/tavplubix))
-* Add text_log.level configuration parameter to limit entries that goes to `system.text_log` table [#8809](https://github.com/ClickHouse/ClickHouse/pull/8809) ([Azat Khuzhin](https://github.com/azat))
-* Allow to put downloaded part to a disks/volumes according to TTL rules [#8598](https://github.com/ClickHouse/ClickHouse/pull/8598) ([Vladimir Chebotarev](https://github.com/excitoon))
-* For external MySQL dictionaries, allow to mutualize MySQL connection pool to "share" them among dictionaries. This option significantly reduces the number of connections to MySQL servers. [#9409](https://github.com/ClickHouse/ClickHouse/pull/9409) ([Clément Rodriguez](https://github.com/clemrodriguez))
-* Show nearest query execution time for quantiles in `clickhouse-benchmark` output instead of interpolated values. It's better to show values that correspond to the execution time of some queries. [#8712](https://github.com/ClickHouse/ClickHouse/pull/8712) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Possibility to add key & timestamp for the message when inserting data to Kafka. Fixes [#7198](https://github.com/ClickHouse/ClickHouse/issues/7198) [#8969](https://github.com/ClickHouse/ClickHouse/pull/8969) ([filimonov](https://github.com/filimonov))
-* If server is run from terminal, highlight thread number, query id and log priority by colors. This is for improved readability of correlated log messages for developers. [#8961](https://github.com/ClickHouse/ClickHouse/pull/8961) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Better exception message while loading tables for `Ordinary` database. [#9527](https://github.com/ClickHouse/ClickHouse/pull/9527) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Implement `arraySlice` for arrays with aggregate function states. This fixes [#9388](https://github.com/ClickHouse/ClickHouse/issues/9388) [#9391](https://github.com/ClickHouse/ClickHouse/pull/9391) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Allow constant functions and constant arrays to be used on the right side of IN operator. [#8813](https://github.com/ClickHouse/ClickHouse/pull/8813) ([Anton Popov](https://github.com/CurtizJ))
-* If zookeeper exception has happened while fetching data for system.replicas, display it in a separate column. This implements [#9137](https://github.com/ClickHouse/ClickHouse/issues/9137) [#9138](https://github.com/ClickHouse/ClickHouse/pull/9138) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Atomically remove MergeTree data parts on destroy. [#8402](https://github.com/ClickHouse/ClickHouse/pull/8402) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Support row-level security for Distributed tables. [#8926](https://github.com/ClickHouse/ClickHouse/pull/8926) ([Ivan](https://github.com/abyss7))
-* Now we recognize suffix (like KB, KiB...) in settings values. [#8072](https://github.com/ClickHouse/ClickHouse/pull/8072) ([Mikhail Korotov](https://github.com/millb))
-* Prevent out of memory while constructing result of a large JOIN. [#8637](https://github.com/ClickHouse/ClickHouse/pull/8637) ([Artem Zuikov](https://github.com/4ertus2))
-* Added names of clusters to suggestions in interactive mode in `clickhouse-client`. [#8709](https://github.com/ClickHouse/ClickHouse/pull/8709) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Initialize query profiler for all threads in a group, e.g. it allows to fully profile insert-queries [#8820](https://github.com/ClickHouse/ClickHouse/pull/8820) ([Ivan](https://github.com/abyss7))
-* Added column `exception_code` in `system.query_log` table. [#8770](https://github.com/ClickHouse/ClickHouse/pull/8770) ([Mikhail Korotov](https://github.com/millb))
-* Enabled MySQL compatibility server on port `9004` in the default server configuration file. Fixed password generation command in the example in configuration. [#8771](https://github.com/ClickHouse/ClickHouse/pull/8771) ([Yuriy Baranov](https://github.com/yurriy))
-* Prevent abort on shutdown if the filesystem is readonly. This fixes [#9094](https://github.com/ClickHouse/ClickHouse/issues/9094) [#9100](https://github.com/ClickHouse/ClickHouse/pull/9100) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Better exception message when length is required in HTTP POST query. [#9453](https://github.com/ClickHouse/ClickHouse/pull/9453) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Add `_path` and `_file` virtual columns to `HDFS` and `File` engines and `hdfs` and `file` table functions [#8489](https://github.com/ClickHouse/ClickHouse/pull/8489) ([Olga Khvostikova](https://github.com/stavrolia))
-* Fix error `Cannot find column` while inserting into `MATERIALIZED VIEW` in case if new column was added to view's internal table. [#8766](https://github.com/ClickHouse/ClickHouse/pull/8766) [#8788](https://github.com/ClickHouse/ClickHouse/pull/8788) ([vzakaznikov](https://github.com/vzakaznikov)) [#8788](https://github.com/ClickHouse/ClickHouse/issues/8788) [#8806](https://github.com/ClickHouse/ClickHouse/pull/8806) ([Nikolai Kochetov](https://github.com/KochetovNicolai)) [#8803](https://github.com/ClickHouse/ClickHouse/pull/8803) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fix progress over native client-server protocol, by send progress after final update (like logs). This may be relevant only to some third-party tools that are using native protocol. [#9495](https://github.com/ClickHouse/ClickHouse/pull/9495) ([Azat Khuzhin](https://github.com/azat))
-* Add a system metric tracking the number of client connections using MySQL protocol ([#9013](https://github.com/ClickHouse/ClickHouse/issues/9013)). [#9015](https://github.com/ClickHouse/ClickHouse/pull/9015) ([Eugene Klimov](https://github.com/Slach))
-* From now on, HTTP responses will have `X-ClickHouse-Timezone` header set to the same timezone value that `SELECT timezone()` would report. [#9493](https://github.com/ClickHouse/ClickHouse/pull/9493) ([Denis Glazachev](https://github.com/traceon))
-
-#### Performance Improvement
-* Improve performance of analysing index with IN [#9261](https://github.com/ClickHouse/ClickHouse/pull/9261) ([Anton Popov](https://github.com/CurtizJ))
-* Simpler and more efficient code in Logical Functions + code cleanups. A followup to [#8718](https://github.com/ClickHouse/ClickHouse/issues/8718) [#8728](https://github.com/ClickHouse/ClickHouse/pull/8728) ([Alexander Kazakov](https://github.com/Akazz))
-* Overall performance improvement (in range of 5%..200% for affected queries) by ensuring even more strict aliasing with C++20 features. [#9304](https://github.com/ClickHouse/ClickHouse/pull/9304) ([Amos Bird](https://github.com/amosbird))
-* More strict aliasing for inner loops of comparison functions. [#9327](https://github.com/ClickHouse/ClickHouse/pull/9327) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* More strict aliasing for inner loops of arithmetic functions. [#9325](https://github.com/ClickHouse/ClickHouse/pull/9325) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* A ~3 times faster implementation for ColumnVector::replicate(), via which ColumnConst::convertToFullColumn() is implemented. Also will be useful in tests when materializing constants. [#9293](https://github.com/ClickHouse/ClickHouse/pull/9293) ([Alexander Kazakov](https://github.com/Akazz))
-* Another minor performance improvement to `ColumnVector::replicate()` (this speeds up the `materialize` function and higher order functions) an even further improvement to [#9293](https://github.com/ClickHouse/ClickHouse/issues/9293) [#9442](https://github.com/ClickHouse/ClickHouse/pull/9442) ([Alexander Kazakov](https://github.com/Akazz))
-* Improved performance of `stochasticLinearRegression` aggregate function. This patch is contributed by Intel. [#8652](https://github.com/ClickHouse/ClickHouse/pull/8652) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Improve performance of `reinterpretAsFixedString` function. [#9342](https://github.com/ClickHouse/ClickHouse/pull/9342) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Do not send blocks to client for `Null` format in processors pipeline. [#8797](https://github.com/ClickHouse/ClickHouse/pull/8797) ([Nikolai Kochetov](https://github.com/KochetovNicolai)) [#8767](https://github.com/ClickHouse/ClickHouse/pull/8767) ([Alexander Kuzmenkov](https://github.com/akuzm))
-
-#### Build/Testing/Packaging Improvement
-* Exception handling now works correctly on Windows Subsystem for Linux. See https://github.com/ClickHouse-Extras/libunwind/pull/3 This fixes [#6480](https://github.com/ClickHouse/ClickHouse/issues/6480) [#9564](https://github.com/ClickHouse/ClickHouse/pull/9564) ([sobolevsv](https://github.com/sobolevsv))
-* Replace `readline` with `replxx` for interactive line editing in `clickhouse-client` [#8416](https://github.com/ClickHouse/ClickHouse/pull/8416) ([Ivan](https://github.com/abyss7))
-* Better build time and less template instantiations in FunctionsComparison. [#9324](https://github.com/ClickHouse/ClickHouse/pull/9324) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Added integration with `clang-tidy` in CI. See also [#6044](https://github.com/ClickHouse/ClickHouse/issues/6044) [#9566](https://github.com/ClickHouse/ClickHouse/pull/9566) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Now we link ClickHouse in CI using `lld` even for `gcc`. [#9049](https://github.com/ClickHouse/ClickHouse/pull/9049) ([alesapin](https://github.com/alesapin))
-* Allow to randomize thread scheduling and insert glitches when `THREAD_FUZZER_*` environment variables are set. This helps testing. [#9459](https://github.com/ClickHouse/ClickHouse/pull/9459) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Enable secure sockets in stateless tests [#9288](https://github.com/ClickHouse/ClickHouse/pull/9288) ([tavplubix](https://github.com/tavplubix))
-* Make SPLIT_SHARED_LIBRARIES=OFF more robust [#9156](https://github.com/ClickHouse/ClickHouse/pull/9156) ([Azat Khuzhin](https://github.com/azat))
-* Make "performance_introspection_and_logging" test reliable to random server stuck. This may happen in CI environment. See also [#9515](https://github.com/ClickHouse/ClickHouse/issues/9515) [#9528](https://github.com/ClickHouse/ClickHouse/pull/9528) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Validate XML in style check. [#9550](https://github.com/ClickHouse/ClickHouse/pull/9550) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fixed race condition in test `00738_lock_for_inner_table`. This test relied on sleep. [#9555](https://github.com/ClickHouse/ClickHouse/pull/9555) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Remove performance tests of type `once`. This is needed to run all performance tests in statistical comparison mode (more reliable). [#9557](https://github.com/ClickHouse/ClickHouse/pull/9557) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Added performance test for arithmetic functions. [#9326](https://github.com/ClickHouse/ClickHouse/pull/9326) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Added performance test for `sumMap` and `sumMapWithOverflow` aggregate functions. Follow-up for [#8933](https://github.com/ClickHouse/ClickHouse/issues/8933) [#8947](https://github.com/ClickHouse/ClickHouse/pull/8947) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Ensure style of ErrorCodes by style check. [#9370](https://github.com/ClickHouse/ClickHouse/pull/9370) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Add script for tests history. [#8796](https://github.com/ClickHouse/ClickHouse/pull/8796) ([alesapin](https://github.com/alesapin))
-* Add GCC warning `-Wsuggest-override` to locate and fix all places where `override` keyword must be used. [#8760](https://github.com/ClickHouse/ClickHouse/pull/8760) ([kreuzerkrieg](https://github.com/kreuzerkrieg))
-* Ignore weak symbol under Mac OS X because it must be defined [#9538](https://github.com/ClickHouse/ClickHouse/pull/9538) ([Deleted user](https://github.com/ghost))
-* Normalize running time of some queries in performance tests. This is done in preparation to run all the performance tests in comparison mode. [#9565](https://github.com/ClickHouse/ClickHouse/pull/9565) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix some tests to support pytest with query tests [#9062](https://github.com/ClickHouse/ClickHouse/pull/9062) ([Ivan](https://github.com/abyss7))
-* Enable SSL in build with MSan, so server will not fail at startup when running stateless tests [#9531](https://github.com/ClickHouse/ClickHouse/pull/9531) ([tavplubix](https://github.com/tavplubix))
-* Fix database substitution in test results [#9384](https://github.com/ClickHouse/ClickHouse/pull/9384) ([Ilya Yatsishin](https://github.com/qoega))
-* Build fixes for miscellaneous platforms [#9381](https://github.com/ClickHouse/ClickHouse/pull/9381) ([proller](https://github.com/proller)) [#8755](https://github.com/ClickHouse/ClickHouse/pull/8755) ([proller](https://github.com/proller)) [#8631](https://github.com/ClickHouse/ClickHouse/pull/8631) ([proller](https://github.com/proller))
-* Added disks section to stateless-with-coverage test docker image [#9213](https://github.com/ClickHouse/ClickHouse/pull/9213) ([Pavel Kovalenko](https://github.com/Jokser))
-* Get rid of in-source-tree files when building with GRPC [#9588](https://github.com/ClickHouse/ClickHouse/pull/9588) ([Amos Bird](https://github.com/amosbird))
-* Slightly faster build time by removing SessionCleaner from Context. Make the code of SessionCleaner more simple. [#9232](https://github.com/ClickHouse/ClickHouse/pull/9232) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Updated checking for hung queries in clickhouse-test script [#8858](https://github.com/ClickHouse/ClickHouse/pull/8858) ([Alexander Kazakov](https://github.com/Akazz))
-* Removed some useless files from repository. [#8843](https://github.com/ClickHouse/ClickHouse/pull/8843) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Changed type of math perftests from `once` to `loop`. [#8783](https://github.com/ClickHouse/ClickHouse/pull/8783) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Add docker image which allows to build interactive code browser HTML report for our codebase. [#8781](https://github.com/ClickHouse/ClickHouse/pull/8781) ([alesapin](https://github.com/alesapin)) See [Woboq Code Browser](https://clickhouse-test-reports.s3.yandex.net/codebrowser/html_report///ClickHouse/dbms/index.html)
-* Suppress some test failures under MSan. [#8780](https://github.com/ClickHouse/ClickHouse/pull/8780) ([Alexander Kuzmenkov](https://github.com/akuzm))
-* Speedup "exception while insert" test. This test often time out in debug-with-coverage build. [#8711](https://github.com/ClickHouse/ClickHouse/pull/8711) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Updated `libcxx` and `libcxxabi` to master. In preparation to [#9304](https://github.com/ClickHouse/ClickHouse/issues/9304) [#9308](https://github.com/ClickHouse/ClickHouse/pull/9308) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix flacky test `00910_zookeeper_test_alter_compression_codecs`. [#9525](https://github.com/ClickHouse/ClickHouse/pull/9525) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Clean up duplicated linker flags. Make sure the linker won't look up an unexpected symbol. [#9433](https://github.com/ClickHouse/ClickHouse/pull/9433) ([Amos Bird](https://github.com/amosbird))
-* Add `clickhouse-odbc` driver into test images. This allows to test interaction of ClickHouse with ClickHouse via its own ODBC driver. [#9348](https://github.com/ClickHouse/ClickHouse/pull/9348) ([filimonov](https://github.com/filimonov))
-* Fix several bugs in unit tests. [#9047](https://github.com/ClickHouse/ClickHouse/pull/9047) ([alesapin](https://github.com/alesapin))
-* Enable `-Wmissing-include-dirs` GCC warning to eliminate all non-existing includes - mostly as a result of CMake scripting errors [#8704](https://github.com/ClickHouse/ClickHouse/pull/8704) ([kreuzerkrieg](https://github.com/kreuzerkrieg))
-* Describe reasons if query profiler cannot work. This is intended for [#9049](https://github.com/ClickHouse/ClickHouse/issues/9049) [#9144](https://github.com/ClickHouse/ClickHouse/pull/9144) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Update OpenSSL to upstream master. Fixed the issue when TLS connections may fail with the message `OpenSSL SSL_read: error:14094438:SSL routines:ssl3_read_bytes:tlsv1 alert internal error` and `SSL Exception: error:2400006E:random number generator::error retrieving entropy`. The issue was present in version 20.1. [#8956](https://github.com/ClickHouse/ClickHouse/pull/8956) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Update Dockerfile for server [#8893](https://github.com/ClickHouse/ClickHouse/pull/8893) ([Ilya Mazaev](https://github.com/ne-ray))
-* Minor fixes in build-gcc-from-sources script [#8774](https://github.com/ClickHouse/ClickHouse/pull/8774) ([Michael Nacharov](https://github.com/mnach))
-* Replace `numbers` to `zeros` in perftests where `number` column is not used. This will lead to more clean test results. [#9600](https://github.com/ClickHouse/ClickHouse/pull/9600) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fix stack overflow issue when using initializer_list in Column constructors. [#9367](https://github.com/ClickHouse/ClickHouse/pull/9367) ([Deleted user](https://github.com/ghost))
-* Upgrade librdkafka to v1.3.0. Enable bundled `rdkafka` and `gsasl` libraries on Mac OS X. [#9000](https://github.com/ClickHouse/ClickHouse/pull/9000) ([Andrew Onyshchuk](https://github.com/oandrew))
-* build fix on GCC 9.2.0 [#9306](https://github.com/ClickHouse/ClickHouse/pull/9306) ([vxider](https://github.com/Vxider))
-
-
-## ClickHouse release v20.1
-
-### ClickHouse release v20.1.16.120-stable 2020-60-26
-
-#### Bug Fix
-
-* Fix rare crash caused by using `Nullable` column in prewhere condition. Continuation of [#11608](https://github.com/ClickHouse/ClickHouse/issues/11608). [#11869](https://github.com/ClickHouse/ClickHouse/pull/11869) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Don't allow arrayJoin inside higher order functions. It was leading to broken protocol synchronization. This closes [#3933](https://github.com/ClickHouse/ClickHouse/issues/3933). [#11846](https://github.com/ClickHouse/ClickHouse/pull/11846) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix unexpected behaviour of queries like `SELECT *, xyz.*` which were success while an error expected. [#11753](https://github.com/ClickHouse/ClickHouse/pull/11753) ([hexiaoting](https://github.com/hexiaoting)).
-* Fixed LOGICAL_ERROR caused by wrong type deduction of complex literals in Values input format. [#11732](https://github.com/ClickHouse/ClickHouse/pull/11732) ([tavplubix](https://github.com/tavplubix)).
-* Fix `ORDER BY ... WITH FILL` over const columns. [#11697](https://github.com/ClickHouse/ClickHouse/pull/11697) ([Anton Popov](https://github.com/CurtizJ)).
-* Pass proper timeouts when communicating with XDBC bridge. Recently timeouts were not respected when checking bridge liveness and receiving meta info. [#11690](https://github.com/ClickHouse/ClickHouse/pull/11690) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add support for regular expressions with case-insensitive flags. This fixes [#11101](https://github.com/ClickHouse/ClickHouse/issues/11101) and fixes [#11506](https://github.com/ClickHouse/ClickHouse/issues/11506). [#11649](https://github.com/ClickHouse/ClickHouse/pull/11649) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix bloom filters for String (data skipping indices). [#11638](https://github.com/ClickHouse/ClickHouse/pull/11638) ([Azat Khuzhin](https://github.com/azat)).
-* Fix rare crash caused by using `Nullable` column in prewhere condition. (Probably it is connected with [#11572](https://github.com/ClickHouse/ClickHouse/issues/11572) somehow). [#11608](https://github.com/ClickHouse/ClickHouse/pull/11608) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix wrong exit code of the clickhouse-client, when exception.code() % 256 = 0. [#11601](https://github.com/ClickHouse/ClickHouse/pull/11601) ([filimonov](https://github.com/filimonov)).
-* Fix trivial error in log message about "Mark cache size was lowered" at server startup. This closes [#11399](https://github.com/ClickHouse/ClickHouse/issues/11399). [#11589](https://github.com/ClickHouse/ClickHouse/pull/11589) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Now clickhouse-server docker container will prefer IPv6 checking server aliveness. [#11550](https://github.com/ClickHouse/ClickHouse/pull/11550) ([Ivan Starkov](https://github.com/istarkov)).
-* Fix memory leak when exception is thrown in the middle of aggregation with -State functions. This fixes [#8995](https://github.com/ClickHouse/ClickHouse/issues/8995). [#11496](https://github.com/ClickHouse/ClickHouse/pull/11496) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix usage of primary key wrapped into a function with 'FINAL' modifier and 'ORDER BY' optimization. [#10715](https://github.com/ClickHouse/ClickHouse/pull/10715) ([Anton Popov](https://github.com/CurtizJ)).
-
-
-### ClickHouse release v20.1.15.109-stable 2020-06-19
-
-#### Bug Fix
-
-* Fix excess lock for structure during alter. [#11790](https://github.com/ClickHouse/ClickHouse/pull/11790) ([alesapin](https://github.com/alesapin)).
-
-
-### ClickHouse release v20.1.14.107-stable 2020-06-11
-
-#### Bug Fix
-
-* Fix error `Size of offsets doesn't match size of column` for queries with `PREWHERE column in (subquery)` and `ARRAY JOIN`. [#11580](https://github.com/ClickHouse/ClickHouse/pull/11580) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-
-
-### ClickHouse release v20.1.13.105-stable 2020-06-10
-
-#### Bug Fix
-
-* Fix the error `Data compressed with different methods` that can happen if `min_bytes_to_use_direct_io` is enabled and PREWHERE is active and using SAMPLE or high number of threads. This fixes [#11539](https://github.com/ClickHouse/ClickHouse/issues/11539). [#11540](https://github.com/ClickHouse/ClickHouse/pull/11540) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix return compressed size for codecs. [#11448](https://github.com/ClickHouse/ClickHouse/pull/11448) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix server crash when a column has compression codec with non-literal arguments. Fixes [#11365](https://github.com/ClickHouse/ClickHouse/issues/11365). [#11431](https://github.com/ClickHouse/ClickHouse/pull/11431) ([alesapin](https://github.com/alesapin)).
-* Fix pointInPolygon with nan as point. Fixes [#11375](https://github.com/ClickHouse/ClickHouse/issues/11375). [#11421](https://github.com/ClickHouse/ClickHouse/pull/11421) ([Alexey Ilyukhov](https://github.com/livace)).
-* Fixed geohashesInBox with arguments outside of latitude/longitude range. [#11403](https://github.com/ClickHouse/ClickHouse/pull/11403) ([Vasily Nemkov](https://github.com/Enmk)).
-* Fix possible `Pipeline stuck` error for queries with external sort and limit. Fixes [#11359](https://github.com/ClickHouse/ClickHouse/issues/11359). [#11366](https://github.com/ClickHouse/ClickHouse/pull/11366) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix crash in `quantilesExactWeightedArray`. [#11337](https://github.com/ClickHouse/ClickHouse/pull/11337) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Make writing to `MATERIALIZED VIEW` with setting `parallel_view_processing = 1` parallel again. Fixes [#10241](https://github.com/ClickHouse/ClickHouse/issues/10241). [#11330](https://github.com/ClickHouse/ClickHouse/pull/11330) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix visitParamExtractRaw when extracted JSON has strings with unbalanced { or [. [#11318](https://github.com/ClickHouse/ClickHouse/pull/11318) ([Ewout](https://github.com/devwout)).
-* Fix very rare race condition in ThreadPool. [#11314](https://github.com/ClickHouse/ClickHouse/pull/11314) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix potential uninitialized memory in conversion. Example: `SELECT toIntervalSecond(now64())`. [#11311](https://github.com/ClickHouse/ClickHouse/pull/11311) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix the issue when index analysis cannot work if a table has Array column in primary key and if a query is filtering by this column with `empty` or `notEmpty` functions. This fixes [#11286](https://github.com/ClickHouse/ClickHouse/issues/11286). [#11303](https://github.com/ClickHouse/ClickHouse/pull/11303) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix bug when query speed estimation can be incorrect and the limit of `min_execution_speed` may not work or work incorrectly if the query is throttled by `max_network_bandwidth`, `max_execution_speed` or `priority` settings. Change the default value of `timeout_before_checking_execution_speed` to non-zero, because otherwise the settings `min_execution_speed` and `max_execution_speed` have no effect. This fixes [#11297](https://github.com/ClickHouse/ClickHouse/issues/11297). This fixes [#5732](https://github.com/ClickHouse/ClickHouse/issues/5732). This fixes [#6228](https://github.com/ClickHouse/ClickHouse/issues/6228). Usability improvement: avoid concatenation of exception message with progress bar in `clickhouse-client`. [#11296](https://github.com/ClickHouse/ClickHouse/pull/11296) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix crash while reading malformed data in Protobuf format. This fixes [#5957](https://github.com/ClickHouse/ClickHouse/issues/5957), fixes [#11203](https://github.com/ClickHouse/ClickHouse/issues/11203). [#11258](https://github.com/ClickHouse/ClickHouse/pull/11258) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix possible error `Cannot capture column` for higher-order functions with `Array(Array(LowCardinality))` captured argument. [#11185](https://github.com/ClickHouse/ClickHouse/pull/11185) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* If data skipping index is dependent on columns that are going to be modified during background merge (for SummingMergeTree, AggregatingMergeTree as well as for TTL GROUP BY), it was calculated incorrectly. This issue is fixed by moving index calculation after merge so the index is calculated on merged data. [#11162](https://github.com/ClickHouse/ClickHouse/pull/11162) ([Azat Khuzhin](https://github.com/azat)).
-* Remove logging from mutation finalization task if nothing was finalized. [#11109](https://github.com/ClickHouse/ClickHouse/pull/11109) ([alesapin](https://github.com/alesapin)).
-* Fixed parseDateTime64BestEffort argument resolution bugs. [#10925](https://github.com/ClickHouse/ClickHouse/issues/10925). [#11038](https://github.com/ClickHouse/ClickHouse/pull/11038) ([Vasily Nemkov](https://github.com/Enmk)).
-* Fix incorrect raw data size in method getRawData(). [#10964](https://github.com/ClickHouse/ClickHouse/pull/10964) ([Igr](https://github.com/ObjatieGroba)).
-* Fix backward compatibility with tuples in Distributed tables. [#10889](https://github.com/ClickHouse/ClickHouse/pull/10889) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix SIGSEGV in StringHashTable (if such key does not exist). [#10870](https://github.com/ClickHouse/ClickHouse/pull/10870) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed bug in `ReplicatedMergeTree` which might cause some `ALTER` on `OPTIMIZE` query to hang waiting for some replica after it become inactive. [#10849](https://github.com/ClickHouse/ClickHouse/pull/10849) ([tavplubix](https://github.com/tavplubix)).
-* Fix columns order after Block::sortColumns() (also add a test that shows that it affects some real use case - Buffer engine). [#10826](https://github.com/ClickHouse/ClickHouse/pull/10826) ([Azat Khuzhin](https://github.com/azat)).
-* Fix the issue with ODBC bridge when no quoting of identifiers is requested. This fixes [#7984](https://github.com/ClickHouse/ClickHouse/issues/7984). [#10821](https://github.com/ClickHouse/ClickHouse/pull/10821) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix UBSan and MSan report in DateLUT. [#10798](https://github.com/ClickHouse/ClickHouse/pull/10798) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* - Make use of `src_type` for correct type conversion in key conditions. Fixes [#6287](https://github.com/ClickHouse/ClickHouse/issues/6287). [#10791](https://github.com/ClickHouse/ClickHouse/pull/10791) ([Andrew Onyshchuk](https://github.com/oandrew)).
-* Fix `parallel_view_processing` behavior. Now all insertions into `MATERIALIZED VIEW` without exception should be finished if exception happened. Fixes [#10241](https://github.com/ClickHouse/ClickHouse/issues/10241). [#10757](https://github.com/ClickHouse/ClickHouse/pull/10757) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix combinator -OrNull and -OrDefault when combined with -State. [#10741](https://github.com/ClickHouse/ClickHouse/pull/10741) ([hcz](https://github.com/hczhcz)).
-* Fix disappearing totals. Totals could have being filtered if query had had join or subquery with external where condition. Fixes [#10674](https://github.com/ClickHouse/ClickHouse/issues/10674). [#10698](https://github.com/ClickHouse/ClickHouse/pull/10698) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix multiple usages of `IN` operator with the identical set in one query. [#10686](https://github.com/ClickHouse/ClickHouse/pull/10686) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix order of parameters in AggregateTransform constructor. [#10667](https://github.com/ClickHouse/ClickHouse/pull/10667) ([palasonic1](https://github.com/palasonic1)).
-* Fix the lack of parallel execution of remote queries with `distributed_aggregation_memory_efficient` enabled. Fixes [#10655](https://github.com/ClickHouse/ClickHouse/issues/10655). [#10664](https://github.com/ClickHouse/ClickHouse/pull/10664) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix predicates optimization for distributed queries (`enable_optimize_predicate_expression=1`) for queries with `HAVING` section (i.e. when filtering on the server initiator is required), by preserving the order of expressions (and this is enough to fix), and also force aggregator use column names over indexes. Fixes: [#10613](https://github.com/ClickHouse/ClickHouse/issues/10613), [#11413](https://github.com/ClickHouse/ClickHouse/issues/11413). [#10621](https://github.com/ClickHouse/ClickHouse/pull/10621) ([Azat Khuzhin](https://github.com/azat)).
-* Fix error `the BloomFilter false positive must be a double number between 0 and 1` [#10551](https://github.com/ClickHouse/ClickHouse/issues/10551). [#10569](https://github.com/ClickHouse/ClickHouse/pull/10569) ([Winter Zhang](https://github.com/zhang2014)).
-* Fix SELECT of column ALIAS which default expression type different from column type. [#10563](https://github.com/ClickHouse/ClickHouse/pull/10563) ([Azat Khuzhin](https://github.com/azat)).
-* * Implemented comparison between DateTime64 and String values (just like for DateTime). [#10560](https://github.com/ClickHouse/ClickHouse/pull/10560) ([Vasily Nemkov](https://github.com/Enmk)).
-
-
-### ClickHouse release v20.1.12.86, 2020-05-26
-
-#### Bug Fix
-
-* Fixed incompatibility of two-level aggregation between versions 20.1 and earlier. This incompatibility happens when different versions of ClickHouse are used on initiator node and remote nodes and the size of GROUP BY result is large and aggregation is performed by a single String field. It leads to several unmerged rows for a single key in result. [#10952](https://github.com/ClickHouse/ClickHouse/pull/10952) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed data corruption for `LowCardinality(FixedString)` key column in `SummingMergeTree` which could have happened after merge. Fixes [#10489](https://github.com/ClickHouse/ClickHouse/issues/10489). [#10721](https://github.com/ClickHouse/ClickHouse/pull/10721) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed bug, which causes http requests stuck on client close when `readonly=2` and `cancel_http_readonly_queries_on_client_close=1`. Fixes [#7939](https://github.com/ClickHouse/ClickHouse/issues/7939), [#7019](https://github.com/ClickHouse/ClickHouse/issues/7019), [#7736](https://github.com/ClickHouse/ClickHouse/issues/7736), [#7091](https://github.com/ClickHouse/ClickHouse/issues/7091). [#10684](https://github.com/ClickHouse/ClickHouse/pull/10684) ([tavplubix](https://github.com/tavplubix)).
-* Fixed a bug when on `SYSTEM DROP DNS CACHE` query also drop caches, which are used to check if user is allowed to connect from some IP addresses. [#10608](https://github.com/ClickHouse/ClickHouse/pull/10608) ([tavplubix](https://github.com/tavplubix)).
-* Fixed incorrect scalar results inside inner query of `MATERIALIZED VIEW` in case if this query contained dependent table. [#10603](https://github.com/ClickHouse/ClickHouse/pull/10603) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed the situation when mutation finished all parts, but hung up in `is_done=0`. [#10526](https://github.com/ClickHouse/ClickHouse/pull/10526) ([alesapin](https://github.com/alesapin)).
-* Fixed overflow at beginning of unix epoch for timezones with fractional offset from UTC. This fixes [#9335](https://github.com/ClickHouse/ClickHouse/issues/9335). [#10513](https://github.com/ClickHouse/ClickHouse/pull/10513) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed improper shutdown of Distributed storage. [#10491](https://github.com/ClickHouse/ClickHouse/pull/10491) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed numeric overflow in `simpleLinearRegression` over large integers. [#10474](https://github.com/ClickHouse/ClickHouse/pull/10474) ([hcz](https://github.com/hczhcz)).
-* Fixed removing metadata directory when attach database fails. [#10442](https://github.com/ClickHouse/ClickHouse/pull/10442) ([Winter Zhang](https://github.com/zhang2014)).
-* Added a check of number and type of arguments when creating `BloomFilter` index [#9623](https://github.com/ClickHouse/ClickHouse/issues/9623). [#10431](https://github.com/ClickHouse/ClickHouse/pull/10431) ([Winter Zhang](https://github.com/zhang2014)).
-* Fixed the issue when a query with `ARRAY JOIN`, `ORDER BY` and `LIMIT` may return incomplete result. This fixes [#10226](https://github.com/ClickHouse/ClickHouse/issues/10226). [#10427](https://github.com/ClickHouse/ClickHouse/pull/10427) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Prefer `fallback_to_stale_replicas` over `skip_unavailable_shards`. [#10422](https://github.com/ClickHouse/ClickHouse/pull/10422) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed wrong flattening of `Array(Tuple(...))` data types. This fixes [#10259](https://github.com/ClickHouse/ClickHouse/issues/10259). [#10390](https://github.com/ClickHouse/ClickHouse/pull/10390) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed wrong behavior in `HashTable` that caused compilation error when trying to read HashMap from buffer. [#10386](https://github.com/ClickHouse/ClickHouse/pull/10386) ([palasonic1](https://github.com/palasonic1)).
-* Fixed possible `Pipeline stuck` error in `ConcatProcessor` which could have happened in remote query. [#10381](https://github.com/ClickHouse/ClickHouse/pull/10381) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed error `Pipeline stuck` with `max_rows_to_group_by` and `group_by_overflow_mode = 'break'`. [#10279](https://github.com/ClickHouse/ClickHouse/pull/10279) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed several bugs when some data was inserted with quorum, then deleted somehow (DROP PARTITION, TTL) and this leaded to the stuck of INSERTs or false-positive exceptions in SELECTs. This fixes [#9946](https://github.com/ClickHouse/ClickHouse/issues/9946). [#10188](https://github.com/ClickHouse/ClickHouse/pull/10188) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fixed incompatibility when versions prior to 18.12.17 are used on remote servers and newer is used on initiating server, and GROUP BY both fixed and non-fixed keys, and when two-level group by method is activated. [#3254](https://github.com/ClickHouse/ClickHouse/pull/3254) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-
-#### Build/Testing/Packaging Improvement
-
-* Added CA certificates to clickhouse-server docker image. [#10476](https://github.com/ClickHouse/ClickHouse/pull/10476) ([filimonov](https://github.com/filimonov)).
-
-
-### ClickHouse release v20.1.10.70, 2020-04-17
-
-#### Bug Fix
-
-* Fix rare possible exception `Cannot drain connections: cancel first`. [#10239](https://github.com/ClickHouse/ClickHouse/pull/10239) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed bug where ClickHouse would throw `'Unknown function lambda.'` error message when user tries to run `ALTER UPDATE/DELETE` on tables with `ENGINE = Replicated*`. Check for nondeterministic functions now handles lambda expressions correctly. [#10237](https://github.com/ClickHouse/ClickHouse/pull/10237) ([Alexander Kazakov](https://github.com/Akazz)).
-* Fix `parseDateTimeBestEffort` for strings in RFC-2822 when day of week is Tuesday or Thursday. This fixes [#10082](https://github.com/ClickHouse/ClickHouse/issues/10082). [#10214](https://github.com/ClickHouse/ClickHouse/pull/10214) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix column names of constants inside `JOIN` that may clash with names of constants outside of `JOIN`. [#10207](https://github.com/ClickHouse/ClickHouse/pull/10207) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix possible inifinite query execution when the query actually should stop on LIMIT, while reading from infinite source like `system.numbers` or `system.zeros`. [#10206](https://github.com/ClickHouse/ClickHouse/pull/10206) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix move-to-prewhere optimization in presense of `arrayJoin` functions (in certain cases). This fixes [#10092](https://github.com/ClickHouse/ClickHouse/issues/10092). [#10195](https://github.com/ClickHouse/ClickHouse/pull/10195) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add the ability to relax the restriction on non-deterministic functions usage in mutations with `allow_nondeterministic_mutations` setting. [#10186](https://github.com/ClickHouse/ClickHouse/pull/10186) ([filimonov](https://github.com/filimonov)).
-* Convert blocks if structure does not match on `INSERT` into table with `Distributed` engine. [#10135](https://github.com/ClickHouse/ClickHouse/pull/10135) ([Azat Khuzhin](https://github.com/azat)).
-* Fix `SIGSEGV` on `INSERT` into `Distributed` table when its structure differs from the underlying tables. [#10105](https://github.com/ClickHouse/ClickHouse/pull/10105) ([Azat Khuzhin](https://github.com/azat)).
-* Fix possible rows loss for queries with `JOIN` and `UNION ALL`. Fixes [#9826](https://github.com/ClickHouse/ClickHouse/issues/9826), [#10113](https://github.com/ClickHouse/ClickHouse/issues/10113). [#10099](https://github.com/ClickHouse/ClickHouse/pull/10099) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Add arguments check and support identifier arguments for MySQL Database Engine. [#10077](https://github.com/ClickHouse/ClickHouse/pull/10077) ([Winter Zhang](https://github.com/zhang2014)).
-* Fix bug in clickhouse dictionary source from localhost clickhouse server. The bug may lead to memory corruption if types in dictionary and source are not compatible. [#10071](https://github.com/ClickHouse/ClickHouse/pull/10071) ([alesapin](https://github.com/alesapin)).
-* Fix error `Cannot clone block with columns because block has 0 columns ... While executing GroupingAggregatedTransform`. It happened when setting `distributed_aggregation_memory_efficient` was enabled, and distributed query read aggregating data with different level from different shards (mixed single and two level aggregation). [#10063](https://github.com/ClickHouse/ClickHouse/pull/10063) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix a segmentation fault that could occur in `GROUP BY` over string keys containing trailing zero bytes ([#8636](https://github.com/ClickHouse/ClickHouse/issues/8636), [#8925](https://github.com/ClickHouse/ClickHouse/issues/8925)). [#10025](https://github.com/ClickHouse/ClickHouse/pull/10025) ([Alexander Kuzmenkov](https://github.com/akuzm)).
-* Fix bug in which the necessary tables weren't retrieved at one of the processing stages of queries to some databases. Fixes [#9699](https://github.com/ClickHouse/ClickHouse/issues/9699). [#9949](https://github.com/ClickHouse/ClickHouse/pull/9949) ([achulkov2](https://github.com/achulkov2)).
-* Fix `'Not found column in block'` error when `JOIN` appears with `TOTALS`. Fixes [#9839](https://github.com/ClickHouse/ClickHouse/issues/9839). [#9939](https://github.com/ClickHouse/ClickHouse/pull/9939) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix a bug with `ON CLUSTER` DDL queries freezing on server startup. [#9927](https://github.com/ClickHouse/ClickHouse/pull/9927) ([Gagan Arneja](https://github.com/garneja)).
-* Fix `TRUNCATE` for Join table engine ([#9917](https://github.com/ClickHouse/ClickHouse/issues/9917)). [#9920](https://github.com/ClickHouse/ClickHouse/pull/9920) ([Amos Bird](https://github.com/amosbird)).
-* Fix `'scalar doesn't exist'` error in ALTER queries ([#9878](https://github.com/ClickHouse/ClickHouse/issues/9878)). [#9904](https://github.com/ClickHouse/ClickHouse/pull/9904) ([Amos Bird](https://github.com/amosbird)).
-* Fix race condition between drop and optimize in `ReplicatedMergeTree`. [#9901](https://github.com/ClickHouse/ClickHouse/pull/9901) ([alesapin](https://github.com/alesapin)).
-* Fixed `DeleteOnDestroy` logic in `ATTACH PART` which could lead to automatic removal of attached part and added few tests. [#9410](https://github.com/ClickHouse/ClickHouse/pull/9410) ([Vladimir Chebotarev](https://github.com/excitoon)).
-
-#### Build/Testing/Packaging Improvement
-
-* Fix unit test `collapsing_sorted_stream`. [#9367](https://github.com/ClickHouse/ClickHouse/pull/9367) ([Deleted user](https://github.com/ghost)).
-
-### ClickHouse release v20.1.9.54, 2020-03-28
-
-#### Bug Fix
-
-* Fix `'Different expressions with the same alias'` error when query has `PREWHERE` and `WHERE` on distributed table and `SET distributed_product_mode = 'local'`. [#9871](https://github.com/ClickHouse/ClickHouse/pull/9871) ([Artem Zuikov](https://github.com/4ertus2)).
-* Fix mutations excessive memory consumption for tables with a composite primary key. This fixes [#9850](https://github.com/ClickHouse/ClickHouse/issues/9850). [#9860](https://github.com/ClickHouse/ClickHouse/pull/9860) ([alesapin](https://github.com/alesapin)).
-* For INSERT queries shard now clamps the settings got from the initiator to the shard's constaints instead of throwing an exception. This fix allows to send `INSERT` queries to a shard with another constraints. This change improves fix [#9447](https://github.com/ClickHouse/ClickHouse/issues/9447). [#9852](https://github.com/ClickHouse/ClickHouse/pull/9852) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix possible exception `Got 0 in totals chunk, expected 1` on client. It happened for queries with `JOIN` in case if right joined table had zero rows. Example: `select * from system.one t1 join system.one t2 on t1.dummy = t2.dummy limit 0 FORMAT TabSeparated;`. Fixes [#9777](https://github.com/ClickHouse/ClickHouse/issues/9777). [#9823](https://github.com/ClickHouse/ClickHouse/pull/9823) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix `SIGSEGV` with `optimize_skip_unused_shards` when type cannot be converted. [#9804](https://github.com/ClickHouse/ClickHouse/pull/9804) ([Azat Khuzhin](https://github.com/azat)).
-* Fixed a few cases when timezone of the function argument wasn't used properly. [#9574](https://github.com/ClickHouse/ClickHouse/pull/9574) ([Vasily Nemkov](https://github.com/Enmk)).
-
-#### Improvement
-
-* Remove `ORDER BY` stage from mutations because we read from a single ordered part in a single thread. Also add check that the order of rows in mutation is ordered in sorting key order and this order is not violated. [#9886](https://github.com/ClickHouse/ClickHouse/pull/9886) ([alesapin](https://github.com/alesapin)).
-
-#### Build/Testing/Packaging Improvement
-
-* Clean up duplicated linker flags. Make sure the linker won't look up an unexpected symbol. [#9433](https://github.com/ClickHouse/ClickHouse/pull/9433) ([Amos Bird](https://github.com/amosbird)).
-
-### ClickHouse release v20.1.8.41, 2020-03-20
-
-#### Bug Fix
-* Fix possible permanent `Cannot schedule a task` error (due to unhandled exception in `ParallelAggregatingBlockInputStream::Handler::onFinish/onFinishThread`). This fixes [#6833](https://github.com/ClickHouse/ClickHouse/issues/6833). [#9154](https://github.com/ClickHouse/ClickHouse/pull/9154) ([Azat Khuzhin](https://github.com/azat))
-* Fix excessive memory consumption in `ALTER` queries (mutations). This fixes [#9533](https://github.com/ClickHouse/ClickHouse/issues/9533) and [#9670](https://github.com/ClickHouse/ClickHouse/issues/9670). [#9754](https://github.com/ClickHouse/ClickHouse/pull/9754) ([alesapin](https://github.com/alesapin))
-* Fix bug in backquoting in external dictionaries DDL. This fixes [#9619](https://github.com/ClickHouse/ClickHouse/issues/9619). [#9734](https://github.com/ClickHouse/ClickHouse/pull/9734) ([alesapin](https://github.com/alesapin))
-
-### ClickHouse release v20.1.7.38, 2020-03-18
-
-#### Bug Fix
-* Fixed incorrect internal function names for `sumKahan` and `sumWithOverflow`. I lead to exception while using this functions in remote queries. [#9636](https://github.com/ClickHouse/ClickHouse/pull/9636) ([Azat Khuzhin](https://github.com/azat)). This issue was in all ClickHouse releases.
-* Allow `ALTER ON CLUSTER` of `Distributed` tables with internal replication. This fixes [#3268](https://github.com/ClickHouse/ClickHouse/issues/3268). [#9617](https://github.com/ClickHouse/ClickHouse/pull/9617) ([shinoi2](https://github.com/shinoi2)). This issue was in all ClickHouse releases.
-* Fix possible exceptions `Size of filter doesn't match size of column` and `Invalid number of rows in Chunk` in `MergeTreeRangeReader`. They could appear while executing `PREWHERE` in some cases. Fixes [#9132](https://github.com/ClickHouse/ClickHouse/issues/9132). [#9612](https://github.com/ClickHouse/ClickHouse/pull/9612) ([Anton Popov](https://github.com/CurtizJ))
-* Fixed the issue: timezone was not preserved if you write a simple arithmetic expression like `time + 1` (in contrast to an expression like `time + INTERVAL 1 SECOND`). This fixes [#5743](https://github.com/ClickHouse/ClickHouse/issues/5743). [#9323](https://github.com/ClickHouse/ClickHouse/pull/9323) ([alexey-milovidov](https://github.com/alexey-milovidov)). This issue was in all ClickHouse releases.
-* Now it's not possible to create or add columns with simple cyclic aliases like `a DEFAULT b, b DEFAULT a`. [#9603](https://github.com/ClickHouse/ClickHouse/pull/9603) ([alesapin](https://github.com/alesapin))
-* Fixed the issue when padding at the end of base64 encoded value can be malformed. Update base64 library. This fixes [#9491](https://github.com/ClickHouse/ClickHouse/issues/9491), closes [#9492](https://github.com/ClickHouse/ClickHouse/issues/9492) [#9500](https://github.com/ClickHouse/ClickHouse/pull/9500) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix data race at destruction of `Poco::HTTPServer`. It could happen when server is started and immediately shut down. [#9468](https://github.com/ClickHouse/ClickHouse/pull/9468) ([Anton Popov](https://github.com/CurtizJ))
-* Fix possible crash/wrong number of rows in `LIMIT n WITH TIES` when there are a lot of rows equal to n'th row. [#9464](https://github.com/ClickHouse/ClickHouse/pull/9464) ([tavplubix](https://github.com/tavplubix))
-* Fix possible mismatched checksums with column TTLs. [#9451](https://github.com/ClickHouse/ClickHouse/pull/9451) ([Anton Popov](https://github.com/CurtizJ))
-* Fix crash when a user tries to `ALTER MODIFY SETTING` for old-formated `MergeTree` table engines family. [#9435](https://github.com/ClickHouse/ClickHouse/pull/9435) ([alesapin](https://github.com/alesapin))
-* Now we will try finalize mutations more frequently. [#9427](https://github.com/ClickHouse/ClickHouse/pull/9427) ([alesapin](https://github.com/alesapin))
-* Fix replication protocol incompatibility introduced in [#8598](https://github.com/ClickHouse/ClickHouse/issues/8598). [#9412](https://github.com/ClickHouse/ClickHouse/pull/9412) ([alesapin](https://github.com/alesapin))
-* Fix not(has()) for the bloom_filter index of array types. [#9407](https://github.com/ClickHouse/ClickHouse/pull/9407) ([achimbab](https://github.com/achimbab))
-* Fixed the behaviour of `match` and `extract` functions when haystack has zero bytes. The behaviour was wrong when haystack was constant. This fixes [#9160](https://github.com/ClickHouse/ClickHouse/issues/9160) [#9163](https://github.com/ClickHouse/ClickHouse/pull/9163) ([alexey-milovidov](https://github.com/alexey-milovidov)) [#9345](https://github.com/ClickHouse/ClickHouse/pull/9345) ([alexey-milovidov](https://github.com/alexey-milovidov))
-
-#### Build/Testing/Packaging Improvement
-
-* Exception handling now works correctly on Windows Subsystem for Linux. See https://github.com/ClickHouse-Extras/libunwind/pull/3 This fixes [#6480](https://github.com/ClickHouse/ClickHouse/issues/6480) [#9564](https://github.com/ClickHouse/ClickHouse/pull/9564) ([sobolevsv](https://github.com/sobolevsv))
-
-
-### ClickHouse release v20.1.6.30, 2020-03-05
-
-#### Bug Fix
-
-* Fix data incompatibility when compressed with `T64` codec.
-[#9039](https://github.com/ClickHouse/ClickHouse/pull/9039) [(abyss7)](https://github.com/abyss7)
-* Fix order of ranges while reading from MergeTree table in one thread. Fixes [#8964](https://github.com/ClickHouse/ClickHouse/issues/8964).
-[#9050](https://github.com/ClickHouse/ClickHouse/pull/9050) [(CurtizJ)](https://github.com/CurtizJ)
-* Fix possible segfault in `MergeTreeRangeReader`, while executing `PREWHERE`. Fixes [#9064](https://github.com/ClickHouse/ClickHouse/issues/9064).
-[#9106](https://github.com/ClickHouse/ClickHouse/pull/9106) [(CurtizJ)](https://github.com/CurtizJ)
-* Fix `reinterpretAsFixedString` to return `FixedString` instead of `String`.
-[#9052](https://github.com/ClickHouse/ClickHouse/pull/9052) [(oandrew)](https://github.com/oandrew)
-* Fix `joinGet` with nullable return types. Fixes [#8919](https://github.com/ClickHouse/ClickHouse/issues/8919)
-[#9014](https://github.com/ClickHouse/ClickHouse/pull/9014) [(amosbird)](https://github.com/amosbird)
-* Fix fuzz test and incorrect behaviour of bitTestAll/bitTestAny functions.
-[#9143](https://github.com/ClickHouse/ClickHouse/pull/9143) [(alexey-milovidov)](https://github.com/alexey-milovidov)
-* Fix the behaviour of match and extract functions when haystack has zero bytes. The behaviour was wrong when haystack was constant. Fixes [#9160](https://github.com/ClickHouse/ClickHouse/issues/9160)
-[#9163](https://github.com/ClickHouse/ClickHouse/pull/9163) [(alexey-milovidov)](https://github.com/alexey-milovidov)
-* Fixed execution of inversed predicates when non-strictly monotinic functional index is used. Fixes [#9034](https://github.com/ClickHouse/ClickHouse/issues/9034)
-[#9223](https://github.com/ClickHouse/ClickHouse/pull/9223) [(Akazz)](https://github.com/Akazz)
-* Allow to rewrite `CROSS` to `INNER JOIN` if there's `[NOT] LIKE` operator in `WHERE` section. Fixes [#9191](https://github.com/ClickHouse/ClickHouse/issues/9191)
-[#9229](https://github.com/ClickHouse/ClickHouse/pull/9229) [(4ertus2)](https://github.com/4ertus2)
-* Allow first column(s) in a table with Log engine be an alias.
-[#9231](https://github.com/ClickHouse/ClickHouse/pull/9231) [(abyss7)](https://github.com/abyss7)
-* Allow comma join with `IN()` inside. Fixes [#7314](https://github.com/ClickHouse/ClickHouse/issues/7314).
-[#9251](https://github.com/ClickHouse/ClickHouse/pull/9251) [(4ertus2)](https://github.com/4ertus2)
-* Improve `ALTER MODIFY/ADD` queries logic. Now you cannot `ADD` column without type, `MODIFY` default expression doesn't change type of column and `MODIFY` type doesn't loose default expression value. Fixes [#8669](https://github.com/ClickHouse/ClickHouse/issues/8669).
-[#9227](https://github.com/ClickHouse/ClickHouse/pull/9227)  [(alesapin)](https://github.com/alesapin)
-* Fix mutations finalization, when already done mutation can have status is_done=0.
-[#9217](https://github.com/ClickHouse/ClickHouse/pull/9217) [(alesapin)](https://github.com/alesapin)
-* Support "Processors" pipeline for system.numbers and system.numbers_mt. This also fixes the bug when `max_execution_time` is not respected.
-[#7796](https://github.com/ClickHouse/ClickHouse/pull/7796)  [(KochetovNicolai)](https://github.com/KochetovNicolai)
-* Fix wrong counting of `DictCacheKeysRequestedFound` metric.
-[#9411](https://github.com/ClickHouse/ClickHouse/pull/9411) [(nikitamikhaylov)](https://github.com/nikitamikhaylov)
-* Added a check for storage policy in `ATTACH PARTITION FROM`, `REPLACE PARTITION`, `MOVE TO TABLE` which otherwise could make data of part inaccessible after restart and prevent ClickHouse to start.
-[#9383](https://github.com/ClickHouse/ClickHouse/pull/9383) [(excitoon)](https://github.com/excitoon)
-* Fixed UBSan report in `MergeTreeIndexSet`. This fixes [#9250](https://github.com/ClickHouse/ClickHouse/issues/9250)
-[#9365](https://github.com/ClickHouse/ClickHouse/pull/9365) [(alexey-milovidov)](https://github.com/alexey-milovidov)
-* Fix possible datarace in BlockIO.
-[#9356](https://github.com/ClickHouse/ClickHouse/pull/9356) [(KochetovNicolai)](https://github.com/KochetovNicolai)
-* Support for `UInt64` numbers that don't fit in Int64 in JSON-related functions. Update `SIMDJSON` to master. This fixes [#9209](https://github.com/ClickHouse/ClickHouse/issues/9209)
-[#9344](https://github.com/ClickHouse/ClickHouse/pull/9344) [(alexey-milovidov)](https://github.com/alexey-milovidov)
-* Fix the issue when the amount of free space is not calculated correctly if the data directory is mounted to a separate device. For default disk calculate the free space from data subdirectory. This fixes [#7441](https://github.com/ClickHouse/ClickHouse/issues/7441)
-[#9257](https://github.com/ClickHouse/ClickHouse/pull/9257) [(millb)](https://github.com/millb)
-* Fix the issue when TLS connections may fail with the message `OpenSSL SSL_read: error:14094438:SSL routines:ssl3_read_bytes:tlsv1 alert internal error and SSL Exception: error:2400006E:random number generator::error retrieving entropy.` Update OpenSSL to upstream master.
-[#8956](https://github.com/ClickHouse/ClickHouse/pull/8956) [(alexey-milovidov)](https://github.com/alexey-milovidov)
-* When executing `CREATE` query, fold constant expressions in storage engine arguments. Replace empty database name with current database. Fixes [#6508](https://github.com/ClickHouse/ClickHouse/issues/6508), [#3492](https://github.com/ClickHouse/ClickHouse/issues/3492). Also fix check for local address in ClickHouseDictionarySource.
-[#9262](https://github.com/ClickHouse/ClickHouse/pull/9262) [(tabplubix)](https://github.com/tavplubix)
-* Fix segfault in `StorageMerge`, which can happen when reading from StorageFile.
-[#9387](https://github.com/ClickHouse/ClickHouse/pull/9387) [(tabplubix)](https://github.com/tavplubix)
-* Prevent losing data in `Kafka` in rare cases when exception happens after reading suffix but before commit. Fixes [#9378](https://github.com/ClickHouse/ClickHouse/issues/9378). Related: [#7175](https://github.com/ClickHouse/ClickHouse/issues/7175)
-[#9507](https://github.com/ClickHouse/ClickHouse/pull/9507) [(filimonov)](https://github.com/filimonov)
-* Fix bug leading to server termination when trying to use / drop `Kafka` table created with wrong parameters. Fixes [#9494](https://github.com/ClickHouse/ClickHouse/issues/9494). Incorporates [#9507](https://github.com/ClickHouse/ClickHouse/issues/9507).
-[#9513](https://github.com/ClickHouse/ClickHouse/pull/9513) [(filimonov)](https://github.com/filimonov)
-
-#### New Feature
-* Add `deduplicate_blocks_in_dependent_materialized_views` option to control the behaviour of idempotent inserts into tables with materialized views. This new feature was added to the bugfix release by a special request from Altinity.
-[#9070](https://github.com/ClickHouse/ClickHouse/pull/9070) [(urykhy)](https://github.com/urykhy)
-
-### ClickHouse release v20.1.2.4, 2020-01-22
-
-#### Backward Incompatible Change
-* Make the setting `merge_tree_uniform_read_distribution` obsolete. The server still recognizes this setting but it has no effect. [#8308](https://github.com/ClickHouse/ClickHouse/pull/8308) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Changed return type of the function `greatCircleDistance` to `Float32` because now the result of calculation is `Float32`. [#7993](https://github.com/ClickHouse/ClickHouse/pull/7993) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Now it's expected that query parameters are represented in "escaped" format. For example, to pass string `a<tab>b` you have to write `a\tb` or `a\<tab>b` and respectively, `a%5Ctb` or `a%5C%09b` in URL. This is needed to add the possibility to pass NULL as `\N`. This fixes [#7488](https://github.com/ClickHouse/ClickHouse/issues/7488). [#8517](https://github.com/ClickHouse/ClickHouse/pull/8517) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Enable `use_minimalistic_part_header_in_zookeeper` setting for `ReplicatedMergeTree` by default. This will significantly reduce amount of data stored in ZooKeeper. This setting is supported since version 19.1 and we already use it in production in multiple services without any issues for more than half a year. Disable this setting if you have a chance to downgrade to versions older than 19.1. [#6850](https://github.com/ClickHouse/ClickHouse/pull/6850) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Data skipping indices are production ready and enabled by default. The settings `allow_experimental_data_skipping_indices`, `allow_experimental_cross_to_join_conversion` and `allow_experimental_multiple_joins_emulation` are now obsolete and do nothing. [#7974](https://github.com/ClickHouse/ClickHouse/pull/7974) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Add new `ANY JOIN` logic for `StorageJoin` consistent with `JOIN` operation. To upgrade without changes in behaviour you need add `SETTINGS any_join_distinct_right_table_keys = 1` to Engine Join tables metadata or recreate these tables after upgrade. [#8400](https://github.com/ClickHouse/ClickHouse/pull/8400) ([Artem Zuikov](https://github.com/4ertus2))
-* Require server to be restarted to apply the changes in logging configuration. This is a temporary workaround to avoid the bug where the server logs to a deleted log file (see [#8696](https://github.com/ClickHouse/ClickHouse/issues/8696)). [#8707](https://github.com/ClickHouse/ClickHouse/pull/8707) ([Alexander Kuzmenkov](https://github.com/akuzm))
-
-#### New Feature
-* Added information about part paths to `system.merges`. [#8043](https://github.com/ClickHouse/ClickHouse/pull/8043) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Add ability to execute `SYSTEM RELOAD DICTIONARY` query in `ON CLUSTER` mode. [#8288](https://github.com/ClickHouse/ClickHouse/pull/8288) ([Guillaume Tassery](https://github.com/YiuRULE))
-* Add ability to execute `CREATE DICTIONARY` queries in `ON CLUSTER` mode. [#8163](https://github.com/ClickHouse/ClickHouse/pull/8163) ([alesapin](https://github.com/alesapin))
-* Now user's profile in `users.xml` can inherit multiple profiles. [#8343](https://github.com/ClickHouse/ClickHouse/pull/8343) ([Mikhail f. Shiryaev](https://github.com/Felixoid))
-* Added `system.stack_trace` table that allows to look at stack traces of all server threads. This is useful for developers to introspect server state. This fixes [#7576](https://github.com/ClickHouse/ClickHouse/issues/7576). [#8344](https://github.com/ClickHouse/ClickHouse/pull/8344) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Add `DateTime64` datatype with configurable sub-second precision. [#7170](https://github.com/ClickHouse/ClickHouse/pull/7170) ([Vasily Nemkov](https://github.com/Enmk))
-* Add table function `clusterAllReplicas` which allows to query all the nodes in the cluster. [#8493](https://github.com/ClickHouse/ClickHouse/pull/8493) ([kiran sunkari](https://github.com/kiransunkari))
-* Add aggregate function `categoricalInformationValue` which calculates the information value of a discrete feature. [#8117](https://github.com/ClickHouse/ClickHouse/pull/8117) ([hcz](https://github.com/hczhcz))
-* Speed up parsing of data files in `CSV`, `TSV` and `JSONEachRow` format by doing it in parallel. [#7780](https://github.com/ClickHouse/ClickHouse/pull/7780) ([Alexander Kuzmenkov](https://github.com/akuzm))
-* Add function `bankerRound` which performs banker's rounding. [#8112](https://github.com/ClickHouse/ClickHouse/pull/8112) ([hcz](https://github.com/hczhcz))
-* Support more languages in embedded dictionary for region names: 'ru', 'en', 'ua', 'uk', 'by', 'kz', 'tr', 'de', 'uz', 'lv', 'lt', 'et', 'pt', 'he', 'vi'. [#8189](https://github.com/ClickHouse/ClickHouse/pull/8189) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Improvements in consistency of `ANY JOIN` logic. Now `t1 ANY LEFT JOIN t2` equals `t2 ANY RIGHT JOIN t1`. [#7665](https://github.com/ClickHouse/ClickHouse/pull/7665) ([Artem Zuikov](https://github.com/4ertus2))
-* Add setting `any_join_distinct_right_table_keys` which enables old behaviour for `ANY INNER JOIN`. [#7665](https://github.com/ClickHouse/ClickHouse/pull/7665) ([Artem Zuikov](https://github.com/4ertus2))
-* Add new `SEMI` and `ANTI JOIN`. Old `ANY INNER JOIN` behaviour now available as `SEMI LEFT JOIN`. [#7665](https://github.com/ClickHouse/ClickHouse/pull/7665) ([Artem Zuikov](https://github.com/4ertus2))
-* Added `Distributed` format for `File` engine and `file` table function which allows to read from `.bin` files generated by asynchronous  inserts into `Distributed` table. [#8535](https://github.com/ClickHouse/ClickHouse/pull/8535) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Add optional reset column argument for `runningAccumulate` which allows to reset aggregation results for each new key value. [#8326](https://github.com/ClickHouse/ClickHouse/pull/8326) ([Sergey Kononenko](https://github.com/kononencheg))
-* Add ability to use ClickHouse as Prometheus endpoint. [#7900](https://github.com/ClickHouse/ClickHouse/pull/7900) ([vdimir](https://github.com/Vdimir))
-* Add section `<remote_url_allow_hosts>` in `config.xml` which restricts allowed hosts for remote table engines and table functions `URL`, `S3`, `HDFS`. [#7154](https://github.com/ClickHouse/ClickHouse/pull/7154) ([Mikhail Korotov](https://github.com/millb))
-* Added function `greatCircleAngle` which calculates the distance on a sphere in degrees. [#8105](https://github.com/ClickHouse/ClickHouse/pull/8105) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Changed Earth radius to be consistent with H3 library. [#8105](https://github.com/ClickHouse/ClickHouse/pull/8105) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Added `JSONCompactEachRow` and `JSONCompactEachRowWithNamesAndTypes` formats for input and output. [#7841](https://github.com/ClickHouse/ClickHouse/pull/7841) ([Mikhail Korotov](https://github.com/millb))
-* Added feature for file-related table engines and table functions (`File`, `S3`, `URL`, `HDFS`) which allows to read and write `gzip` files based on additional engine parameter or file extension. [#7840](https://github.com/ClickHouse/ClickHouse/pull/7840) ([Andrey Bodrov](https://github.com/apbodrov))
-* Added the `randomASCII(length)` function, generating a string with a random set of [ASCII](https://en.wikipedia.org/wiki/ASCII#Printable_characters) printable characters. [#8401](https://github.com/ClickHouse/ClickHouse/pull/8401) ([BayoNet](https://github.com/BayoNet))
-* Added function `JSONExtractArrayRaw` which returns an array on unparsed json array elements from `JSON` string. [#8081](https://github.com/ClickHouse/ClickHouse/pull/8081) ([Oleg Matrokhin](https://github.com/errx))
-* Add `arrayZip` function which allows to combine multiple arrays of equal lengths into one array of tuples. [#8149](https://github.com/ClickHouse/ClickHouse/pull/8149) ([Winter Zhang](https://github.com/zhang2014))
-* Add ability to move data between disks according to configured `TTL`-expressions for `*MergeTree` table engines family. [#8140](https://github.com/ClickHouse/ClickHouse/pull/8140) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Added new aggregate function `avgWeighted` which allows to calculate weighted average. [#7898](https://github.com/ClickHouse/ClickHouse/pull/7898) ([Andrey Bodrov](https://github.com/apbodrov))
-* Now parallel parsing is enabled by default for `TSV`, `TSKV`, `CSV` and `JSONEachRow` formats. [#7894](https://github.com/ClickHouse/ClickHouse/pull/7894) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
-* Add several geo functions from `H3` library: `h3GetResolution`, `h3EdgeAngle`, `h3EdgeLength`, `h3IsValid` and `h3kRing`. [#8034](https://github.com/ClickHouse/ClickHouse/pull/8034) ([Konstantin Malanchev](https://github.com/hombit))
-* Added support for brotli (`br`) compression in file-related storages and table functions. This fixes [#8156](https://github.com/ClickHouse/ClickHouse/issues/8156). [#8526](https://github.com/ClickHouse/ClickHouse/pull/8526) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Add `groupBit*` functions for the `SimpleAggregationFunction` type. [#8485](https://github.com/ClickHouse/ClickHouse/pull/8485) ([Guillaume Tassery](https://github.com/YiuRULE))
-
-#### Bug Fix
-* Fix rename of tables with `Distributed` engine. Fixes issue [#7868](https://github.com/ClickHouse/ClickHouse/issues/7868). [#8306](https://github.com/ClickHouse/ClickHouse/pull/8306) ([tavplubix](https://github.com/tavplubix))
-* Now dictionaries support `EXPRESSION` for attributes in arbitrary string in non-ClickHouse SQL dialect. [#8098](https://github.com/ClickHouse/ClickHouse/pull/8098) ([alesapin](https://github.com/alesapin))
-* Fix broken `INSERT SELECT FROM mysql(...)` query. This fixes [#8070](https://github.com/ClickHouse/ClickHouse/issues/8070) and [#7960](https://github.com/ClickHouse/ClickHouse/issues/7960). [#8234](https://github.com/ClickHouse/ClickHouse/pull/8234) ([tavplubix](https://github.com/tavplubix))
-* Fix error "Mismatch column sizes" when inserting default `Tuple` from `JSONEachRow`. This fixes [#5653](https://github.com/ClickHouse/ClickHouse/issues/5653). [#8606](https://github.com/ClickHouse/ClickHouse/pull/8606) ([tavplubix](https://github.com/tavplubix))
-* Now an exception will be thrown in case of using `WITH TIES` alongside `LIMIT BY`. Also add ability to use `TOP` with `LIMIT BY`. This fixes [#7472](https://github.com/ClickHouse/ClickHouse/issues/7472). [#7637](https://github.com/ClickHouse/ClickHouse/pull/7637) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
-* Fix unintendent dependency from fresh glibc version in `clickhouse-odbc-bridge` binary. [#8046](https://github.com/ClickHouse/ClickHouse/pull/8046) ([Amos Bird](https://github.com/amosbird))
-* Fix bug in check function of `*MergeTree` engines family. Now it doesn't fail in case when we have equal amount of rows in last granule and last mark (non-final). [#8047](https://github.com/ClickHouse/ClickHouse/pull/8047) ([alesapin](https://github.com/alesapin))
-* Fix insert into `Enum*` columns after `ALTER` query, when underlying numeric type is equal to table specified type. This fixes [#7836](https://github.com/ClickHouse/ClickHouse/issues/7836). [#7908](https://github.com/ClickHouse/ClickHouse/pull/7908) ([Anton Popov](https://github.com/CurtizJ))
-* Allowed non-constant negative "size" argument for function `substring`. It was not allowed by mistake. This fixes [#4832](https://github.com/ClickHouse/ClickHouse/issues/4832). [#7703](https://github.com/ClickHouse/ClickHouse/pull/7703) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix parsing bug when wrong number of arguments passed to `(O|J)DBC` table engine. [#7709](https://github.com/ClickHouse/ClickHouse/pull/7709) ([alesapin](https://github.com/alesapin))
-* Using command name of the running clickhouse process when sending logs to syslog. In previous versions, empty string was used instead of command name. [#8460](https://github.com/ClickHouse/ClickHouse/pull/8460) ([Michael Nacharov](https://github.com/mnach))
-* Fix check of allowed hosts for `localhost`. This PR fixes the solution provided in [#8241](https://github.com/ClickHouse/ClickHouse/pull/8241). [#8342](https://github.com/ClickHouse/ClickHouse/pull/8342) ([Vitaly Baranov](https://github.com/vitlibar))
-* Fix rare crash in `argMin` and `argMax` functions for long string arguments, when result is used in `runningAccumulate` function. This fixes [#8325](https://github.com/ClickHouse/ClickHouse/issues/8325) [#8341](https://github.com/ClickHouse/ClickHouse/pull/8341) ([dinosaur](https://github.com/769344359))
-* Fix memory overcommit for tables with `Buffer` engine. [#8345](https://github.com/ClickHouse/ClickHouse/pull/8345) ([Azat Khuzhin](https://github.com/azat))
-* Fixed potential bug in functions that can take `NULL` as one of the arguments and return non-NULL. [#8196](https://github.com/ClickHouse/ClickHouse/pull/8196) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Better metrics calculations in thread pool for background processes for `MergeTree` table engines. [#8194](https://github.com/ClickHouse/ClickHouse/pull/8194) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Fix function `IN` inside `WHERE` statement when row-level table filter is present. Fixes [#6687](https://github.com/ClickHouse/ClickHouse/issues/6687) [#8357](https://github.com/ClickHouse/ClickHouse/pull/8357) ([Ivan](https://github.com/abyss7))
-* Now an exception is thrown if the integral value is not parsed completely for settings values. [#7678](https://github.com/ClickHouse/ClickHouse/pull/7678) ([Mikhail Korotov](https://github.com/millb))
-* Fix exception when aggregate function is used in query to distributed table with more than two local shards. [#8164](https://github.com/ClickHouse/ClickHouse/pull/8164) ([小路](https://github.com/nicelulu))
-* Now bloom filter can handle zero length arrays and doesn't perform redundant calculations. [#8242](https://github.com/ClickHouse/ClickHouse/pull/8242) ([achimbab](https://github.com/achimbab))
-* Fixed checking if a client host is allowed by matching the client host to `host_regexp` specified in `users.xml`. [#8241](https://github.com/ClickHouse/ClickHouse/pull/8241) ([Vitaly Baranov](https://github.com/vitlibar))
-* Relax ambiguous column check that leads to false positives in multiple `JOIN ON` section. [#8385](https://github.com/ClickHouse/ClickHouse/pull/8385) ([Artem Zuikov](https://github.com/4ertus2))
-* Fixed possible server crash (`std::terminate`) when the server cannot send or write data in `JSON` or `XML` format with values of `String` data type (that require `UTF-8` validation) or when compressing result data with Brotli algorithm or in some other rare cases. This fixes [#7603](https://github.com/ClickHouse/ClickHouse/issues/7603) [#8384](https://github.com/ClickHouse/ClickHouse/pull/8384) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix race condition in `StorageDistributedDirectoryMonitor` found by CI. This fixes [#8364](https://github.com/ClickHouse/ClickHouse/issues/8364). [#8383](https://github.com/ClickHouse/ClickHouse/pull/8383) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Now background merges in `*MergeTree` table engines family preserve storage policy volume order more accurately. [#8549](https://github.com/ClickHouse/ClickHouse/pull/8549) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Now table engine `Kafka` works properly with `Native` format. This fixes [#6731](https://github.com/ClickHouse/ClickHouse/issues/6731) [#7337](https://github.com/ClickHouse/ClickHouse/issues/7337) [#8003](https://github.com/ClickHouse/ClickHouse/issues/8003). [#8016](https://github.com/ClickHouse/ClickHouse/pull/8016) ([filimonov](https://github.com/filimonov))
-* Fixed formats with headers (like `CSVWithNames`) which were throwing exception about EOF for table engine `Kafka`. [#8016](https://github.com/ClickHouse/ClickHouse/pull/8016) ([filimonov](https://github.com/filimonov))
-* Fixed a bug with making set from subquery in right part of `IN` section. This fixes [#5767](https://github.com/ClickHouse/ClickHouse/issues/5767) and [#2542](https://github.com/ClickHouse/ClickHouse/issues/2542). [#7755](https://github.com/ClickHouse/ClickHouse/pull/7755) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
-* Fix possible crash while reading from storage `File`. [#7756](https://github.com/ClickHouse/ClickHouse/pull/7756) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fixed reading of the files in `Parquet` format containing columns of type `list`. [#8334](https://github.com/ClickHouse/ClickHouse/pull/8334) ([maxulan](https://github.com/maxulan))
-* Fix error `Not found column` for distributed queries with `PREWHERE` condition dependent on sampling key if `max_parallel_replicas > 1`. [#7913](https://github.com/ClickHouse/ClickHouse/pull/7913) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fix error `Not found column` if query used `PREWHERE` dependent on table's alias and the result set was empty because of primary key condition. [#7911](https://github.com/ClickHouse/ClickHouse/pull/7911) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fixed return type for functions `rand` and `randConstant` in case of `Nullable` argument. Now functions always return `UInt32` and never `Nullable(UInt32)`. [#8204](https://github.com/ClickHouse/ClickHouse/pull/8204) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Disabled predicate push-down for `WITH FILL` expression. This fixes [#7784](https://github.com/ClickHouse/ClickHouse/issues/7784). [#7789](https://github.com/ClickHouse/ClickHouse/pull/7789) ([Winter Zhang](https://github.com/zhang2014))
-* Fixed incorrect `count()` result for `SummingMergeTree` when `FINAL` section is used. [#3280](https://github.com/ClickHouse/ClickHouse/issues/3280) [#7786](https://github.com/ClickHouse/ClickHouse/pull/7786) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
-* Fix possible incorrect result for constant functions from remote servers. It happened for queries with functions like `version()`, `uptime()`, etc. which returns different constant values for different servers. This fixes [#7666](https://github.com/ClickHouse/ClickHouse/issues/7666). [#7689](https://github.com/ClickHouse/ClickHouse/pull/7689) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fix complicated bug in push-down predicate optimization which leads to wrong results. This fixes a lot of issues on push-down predicate optimization. [#8503](https://github.com/ClickHouse/ClickHouse/pull/8503) ([Winter Zhang](https://github.com/zhang2014))
-* Fix crash in `CREATE TABLE .. AS dictionary` query. [#8508](https://github.com/ClickHouse/ClickHouse/pull/8508) ([Azat Khuzhin](https://github.com/azat))
-* Several improvements ClickHouse grammar in `.g4` file. [#8294](https://github.com/ClickHouse/ClickHouse/pull/8294) ([taiyang-li](https://github.com/taiyang-li))
-* Fix bug that leads to crashes in `JOIN`s with tables with engine `Join`. This fixes [#7556](https://github.com/ClickHouse/ClickHouse/issues/7556) [#8254](https://github.com/ClickHouse/ClickHouse/issues/8254) [#7915](https://github.com/ClickHouse/ClickHouse/issues/7915) [#8100](https://github.com/ClickHouse/ClickHouse/issues/8100). [#8298](https://github.com/ClickHouse/ClickHouse/pull/8298) ([Artem Zuikov](https://github.com/4ertus2))
-* Fix redundant dictionaries reload on `CREATE DATABASE`. [#7916](https://github.com/ClickHouse/ClickHouse/pull/7916) ([Azat Khuzhin](https://github.com/azat))
-* Limit maximum number of streams for read from `StorageFile` and `StorageHDFS`. Fixes [#7650](https://github.com/ClickHouse/ClickHouse/issues/7650). [#7981](https://github.com/ClickHouse/ClickHouse/pull/7981) ([alesapin](https://github.com/alesapin))
-* Fix bug in `ALTER ... MODIFY ... CODEC` query, when user specify both default expression and codec. Fixes [8593](https://github.com/ClickHouse/ClickHouse/issues/8593). [#8614](https://github.com/ClickHouse/ClickHouse/pull/8614) ([alesapin](https://github.com/alesapin))
-* Fix error in background merge of columns with `SimpleAggregateFunction(LowCardinality)` type. [#8613](https://github.com/ClickHouse/ClickHouse/pull/8613) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fixed type check in function `toDateTime64`. [#8375](https://github.com/ClickHouse/ClickHouse/pull/8375) ([Vasily Nemkov](https://github.com/Enmk))
-* Now server do not crash on `LEFT` or `FULL JOIN` with and Join engine and unsupported `join_use_nulls` settings. [#8479](https://github.com/ClickHouse/ClickHouse/pull/8479) ([Artem Zuikov](https://github.com/4ertus2))
-* Now `DROP DICTIONARY IF EXISTS db.dict` query doesn't throw exception if `db` doesn't exist. [#8185](https://github.com/ClickHouse/ClickHouse/pull/8185) ([Vitaly Baranov](https://github.com/vitlibar))
-* Fix possible crashes in table functions (`file`, `mysql`, `remote`) caused by usage of reference to removed `IStorage` object. Fix incorrect parsing of columns specified at insertion into table function. [#7762](https://github.com/ClickHouse/ClickHouse/pull/7762) ([tavplubix](https://github.com/tavplubix))
-* Ensure network be up before starting `clickhouse-server`. This fixes [#7507](https://github.com/ClickHouse/ClickHouse/issues/7507). [#8570](https://github.com/ClickHouse/ClickHouse/pull/8570) ([Zhichang Yu](https://github.com/yuzhichang))
-* Fix timeouts handling for secure connections, so queries doesn't hang indefenitely. This fixes [#8126](https://github.com/ClickHouse/ClickHouse/issues/8126). [#8128](https://github.com/ClickHouse/ClickHouse/pull/8128) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix `clickhouse-copier`'s redundant contention between concurrent workers. [#7816](https://github.com/ClickHouse/ClickHouse/pull/7816) ([Ding Xiang Fei](https://github.com/dingxiangfei2009))
-* Now mutations doesn't skip attached parts, even if their mutation version were larger than current mutation version. [#7812](https://github.com/ClickHouse/ClickHouse/pull/7812) ([Zhichang Yu](https://github.com/yuzhichang)) [#8250](https://github.com/ClickHouse/ClickHouse/pull/8250) ([alesapin](https://github.com/alesapin))
-* Ignore redundant copies of `*MergeTree` data parts after move to another disk and server restart. [#7810](https://github.com/ClickHouse/ClickHouse/pull/7810) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Fix crash in `FULL JOIN` with `LowCardinality` in `JOIN` key. [#8252](https://github.com/ClickHouse/ClickHouse/pull/8252) ([Artem Zuikov](https://github.com/4ertus2))
-* Forbidden to use column name more than once in insert query like `INSERT INTO tbl (x, y, x)`. This fixes [#5465](https://github.com/ClickHouse/ClickHouse/issues/5465), [#7681](https://github.com/ClickHouse/ClickHouse/issues/7681). [#7685](https://github.com/ClickHouse/ClickHouse/pull/7685) ([alesapin](https://github.com/alesapin))
-* Added fallback for detection the number of physical CPU cores for unknown CPUs (using the number of logical CPU cores). This fixes [#5239](https://github.com/ClickHouse/ClickHouse/issues/5239). [#7726](https://github.com/ClickHouse/ClickHouse/pull/7726) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix `There's no column` error for materialized and alias columns. [#8210](https://github.com/ClickHouse/ClickHouse/pull/8210) ([Artem Zuikov](https://github.com/4ertus2))
-* Fixed sever crash when `EXISTS` query was used without `TABLE` or `DICTIONARY` qualifier. Just like `EXISTS t`. This fixes [#8172](https://github.com/ClickHouse/ClickHouse/issues/8172). This bug was introduced in version 19.17. [#8213](https://github.com/ClickHouse/ClickHouse/pull/8213) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix rare bug with error `"Sizes of columns doesn't match"` that might appear when using `SimpleAggregateFunction` column. [#7790](https://github.com/ClickHouse/ClickHouse/pull/7790) ([Boris Granveaud](https://github.com/bgranvea))
-* Fix bug where user with empty `allow_databases` got access to all databases (and same for `allow_dictionaries`). [#7793](https://github.com/ClickHouse/ClickHouse/pull/7793) ([DeifyTheGod](https://github.com/DeifyTheGod))
-* Fix client crash when server already disconnected from client. [#8071](https://github.com/ClickHouse/ClickHouse/pull/8071) ([Azat Khuzhin](https://github.com/azat))
-* Fix `ORDER BY` behaviour in case of sorting by primary key prefix and non primary key suffix. [#7759](https://github.com/ClickHouse/ClickHouse/pull/7759) ([Anton Popov](https://github.com/CurtizJ))
-* Check if qualified column present in the table. This fixes [#6836](https://github.com/ClickHouse/ClickHouse/issues/6836). [#7758](https://github.com/ClickHouse/ClickHouse/pull/7758) ([Artem Zuikov](https://github.com/4ertus2))
-* Fixed behavior with `ALTER MOVE` ran immediately after merge finish moves superpart of specified. Fixes [#8103](https://github.com/ClickHouse/ClickHouse/issues/8103). [#8104](https://github.com/ClickHouse/ClickHouse/pull/8104) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Fix possible server crash while using `UNION` with different number of columns. Fixes [#7279](https://github.com/ClickHouse/ClickHouse/issues/7279). [#7929](https://github.com/ClickHouse/ClickHouse/pull/7929) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fix size of result substring for function `substr` with negative size. [#8589](https://github.com/ClickHouse/ClickHouse/pull/8589) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Now server does not execute part mutation in `MergeTree` if there are not enough free threads in background pool.  [#8588](https://github.com/ClickHouse/ClickHouse/pull/8588) ([tavplubix](https://github.com/tavplubix))
-* Fix a minor typo on formatting `UNION ALL` AST. [#7999](https://github.com/ClickHouse/ClickHouse/pull/7999) ([litao91](https://github.com/litao91))
-* Fixed incorrect bloom filter results for negative numbers. This fixes [#8317](https://github.com/ClickHouse/ClickHouse/issues/8317). [#8566](https://github.com/ClickHouse/ClickHouse/pull/8566) ([Winter Zhang](https://github.com/zhang2014))
-* Fixed potential buffer overflow in decompress. Malicious user can pass fabricated compressed data that will cause read after buffer. This issue was found by Eldar Zaitov from Yandex information security team. [#8404](https://github.com/ClickHouse/ClickHouse/pull/8404) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix incorrect result because of integers overflow in `arrayIntersect`. [#7777](https://github.com/ClickHouse/ClickHouse/pull/7777) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Now `OPTIMIZE TABLE` query will not wait for offline replicas to perform the operation. [#8314](https://github.com/ClickHouse/ClickHouse/pull/8314) ([javi santana](https://github.com/javisantana))
-* Fixed `ALTER TTL` parser for `Replicated*MergeTree` tables. [#8318](https://github.com/ClickHouse/ClickHouse/pull/8318) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Fix communication between server and client, so server read temporary tables info after query failure. [#8084](https://github.com/ClickHouse/ClickHouse/pull/8084) ([Azat Khuzhin](https://github.com/azat))
-* Fix `bitmapAnd` function error when intersecting an aggregated bitmap and a scalar bitmap. [#8082](https://github.com/ClickHouse/ClickHouse/pull/8082) ([Yue Huang](https://github.com/moon03432))
-* Refine the definition of `ZXid` according to the ZooKeeper Programmer's Guide which fixes bug in `clickhouse-cluster-copier`. [#8088](https://github.com/ClickHouse/ClickHouse/pull/8088) ([Ding Xiang Fei](https://github.com/dingxiangfei2009))
-* `odbc` table function now respects `external_table_functions_use_nulls` setting. [#7506](https://github.com/ClickHouse/ClickHouse/pull/7506) ([Vasily Nemkov](https://github.com/Enmk))
-* Fixed bug that lead to a rare data race. [#8143](https://github.com/ClickHouse/ClickHouse/pull/8143) ([Alexander Kazakov](https://github.com/Akazz))
-* Now `SYSTEM RELOAD DICTIONARY` reloads a dictionary completely, ignoring `update_field`. This fixes [#7440](https://github.com/ClickHouse/ClickHouse/issues/7440). [#8037](https://github.com/ClickHouse/ClickHouse/pull/8037) ([Vitaly Baranov](https://github.com/vitlibar))
-* Add ability to check if dictionary exists in create query. [#8032](https://github.com/ClickHouse/ClickHouse/pull/8032) ([alesapin](https://github.com/alesapin))
-* Fix `Float*` parsing in `Values` format. This fixes [#7817](https://github.com/ClickHouse/ClickHouse/issues/7817). [#7870](https://github.com/ClickHouse/ClickHouse/pull/7870) ([tavplubix](https://github.com/tavplubix))
-* Fix crash when we cannot reserve space in some background operations of `*MergeTree` table engines family. [#7873](https://github.com/ClickHouse/ClickHouse/pull/7873) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Fix crash of merge operation when table contains `SimpleAggregateFunction(LowCardinality)` column. This fixes [#8515](https://github.com/ClickHouse/ClickHouse/issues/8515). [#8522](https://github.com/ClickHouse/ClickHouse/pull/8522) ([Azat Khuzhin](https://github.com/azat))
-* Restore support of all ICU locales and add the ability to apply collations for constant expressions. Also add language name to `system.collations` table. [#8051](https://github.com/ClickHouse/ClickHouse/pull/8051) ([alesapin](https://github.com/alesapin))
-* Fix bug when external dictionaries with zero minimal lifetime (`LIFETIME(MIN 0 MAX N)`, `LIFETIME(N)`) don't update in background. [#7983](https://github.com/ClickHouse/ClickHouse/pull/7983) ([alesapin](https://github.com/alesapin))
-* Fix crash when external dictionary with ClickHouse source has subquery in query. [#8351](https://github.com/ClickHouse/ClickHouse/pull/8351) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Fix incorrect parsing of file extension in table with engine `URL`. This fixes [#8157](https://github.com/ClickHouse/ClickHouse/issues/8157). [#8419](https://github.com/ClickHouse/ClickHouse/pull/8419) ([Andrey Bodrov](https://github.com/apbodrov))
-* Fix `CHECK TABLE` query for `*MergeTree` tables without key. Fixes [#7543](https://github.com/ClickHouse/ClickHouse/issues/7543). [#7979](https://github.com/ClickHouse/ClickHouse/pull/7979) ([alesapin](https://github.com/alesapin))
-* Fixed conversion of `Float64` to MySQL type. [#8079](https://github.com/ClickHouse/ClickHouse/pull/8079) ([Yuriy Baranov](https://github.com/yurriy))
-* Now if table was not completely dropped because of server crash, server will try to restore and load it. [#8176](https://github.com/ClickHouse/ClickHouse/pull/8176) ([tavplubix](https://github.com/tavplubix))
-* Fixed crash in table function `file` while inserting into file that doesn't exist. Now in this case file would be created and then insert would be processed. [#8177](https://github.com/ClickHouse/ClickHouse/pull/8177) ([Olga Khvostikova](https://github.com/stavrolia))
-* Fix rare deadlock which can happen when `trace_log` is in enabled. [#7838](https://github.com/ClickHouse/ClickHouse/pull/7838) ([filimonov](https://github.com/filimonov))
-* Add ability to work with different types besides `Date` in `RangeHashed` external dictionary created from DDL query. Fixes [7899](https://github.com/ClickHouse/ClickHouse/issues/7899). [#8275](https://github.com/ClickHouse/ClickHouse/pull/8275) ([alesapin](https://github.com/alesapin))
-* Fixes crash when `now64()` is called with result of another function. [#8270](https://github.com/ClickHouse/ClickHouse/pull/8270) ([Vasily Nemkov](https://github.com/Enmk))
-* Fixed bug with detecting client IP for connections through mysql wire protocol. [#7743](https://github.com/ClickHouse/ClickHouse/pull/7743) ([Dmitry Muzyka](https://github.com/dmitriy-myz))
-* Fix empty array handling in `arraySplit` function. This fixes [#7708](https://github.com/ClickHouse/ClickHouse/issues/7708). [#7747](https://github.com/ClickHouse/ClickHouse/pull/7747) ([hcz](https://github.com/hczhcz))
-* Fixed the issue when `pid-file` of another running `clickhouse-server` may be deleted. [#8487](https://github.com/ClickHouse/ClickHouse/pull/8487) ([Weiqing Xu](https://github.com/weiqxu))
-* Fix dictionary reload if it has `invalidate_query`, which stopped updates and some exception on previous update tries. [#8029](https://github.com/ClickHouse/ClickHouse/pull/8029) ([alesapin](https://github.com/alesapin))
-* Fixed error in function `arrayReduce` that may lead to "double free" and error in aggregate function combinator `Resample` that may lead to memory leak. Added aggregate function `aggThrow`. This function can be used for testing purposes. [#8446](https://github.com/ClickHouse/ClickHouse/pull/8446) ([alexey-milovidov](https://github.com/alexey-milovidov))
-
-#### Improvement
-* Improved logging when working with `S3` table engine. [#8251](https://github.com/ClickHouse/ClickHouse/pull/8251) ([Grigory Pervakov](https://github.com/GrigoryPervakov))
-* Printed help message when no arguments are passed when calling `clickhouse-local`. This fixes [#5335](https://github.com/ClickHouse/ClickHouse/issues/5335). [#8230](https://github.com/ClickHouse/ClickHouse/pull/8230) ([Andrey Nagorny](https://github.com/Melancholic))
-* Add setting `mutations_sync` which allows to wait `ALTER UPDATE/DELETE` queries synchronously. [#8237](https://github.com/ClickHouse/ClickHouse/pull/8237) ([alesapin](https://github.com/alesapin))
-* Allow to set up relative `user_files_path` in `config.xml` (in the way similar to `format_schema_path`). [#7632](https://github.com/ClickHouse/ClickHouse/pull/7632) ([hcz](https://github.com/hczhcz))
-* Add exception for illegal types for conversion functions with `-OrZero` postfix. [#7880](https://github.com/ClickHouse/ClickHouse/pull/7880) ([Andrey Konyaev](https://github.com/akonyaev90))
-* Simplify format of the header of data sending to a shard in a distributed query. [#8044](https://github.com/ClickHouse/ClickHouse/pull/8044) ([Vitaly Baranov](https://github.com/vitlibar))
-* `Live View` table engine refactoring. [#8519](https://github.com/ClickHouse/ClickHouse/pull/8519) ([vzakaznikov](https://github.com/vzakaznikov))
-* Add additional checks for external dictionaries created from DDL-queries. [#8127](https://github.com/ClickHouse/ClickHouse/pull/8127) ([alesapin](https://github.com/alesapin))
-* Fix error `Column ... already exists` while using `FINAL` and `SAMPLE` together, e.g. `select count() from table final sample 1/2`. Fixes [#5186](https://github.com/ClickHouse/ClickHouse/issues/5186). [#7907](https://github.com/ClickHouse/ClickHouse/pull/7907) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Now table the first argument of `joinGet` function can be table identifier. [#7707](https://github.com/ClickHouse/ClickHouse/pull/7707) ([Amos Bird](https://github.com/amosbird))
-* Allow using `MaterializedView` with subqueries above `Kafka` tables. [#8197](https://github.com/ClickHouse/ClickHouse/pull/8197) ([filimonov](https://github.com/filimonov))
-* Now background moves between disks run it the seprate thread pool. [#7670](https://github.com/ClickHouse/ClickHouse/pull/7670) ([Vladimir Chebotarev](https://github.com/excitoon))
-* `SYSTEM RELOAD DICTIONARY` now executes synchronously. [#8240](https://github.com/ClickHouse/ClickHouse/pull/8240) ([Vitaly Baranov](https://github.com/vitlibar))
-* Stack traces now display physical addresses (offsets in object file) instead of virtual memory addresses (where the object file was loaded). That allows the use of `addr2line` when binary is position independent and ASLR is active. This fixes [#8360](https://github.com/ClickHouse/ClickHouse/issues/8360). [#8387](https://github.com/ClickHouse/ClickHouse/pull/8387) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Support new syntax for row-level security filters: `<table name='table_name'>…</table>`. Fixes [#5779](https://github.com/ClickHouse/ClickHouse/issues/5779). [#8381](https://github.com/ClickHouse/ClickHouse/pull/8381) ([Ivan](https://github.com/abyss7))
-* Now `cityHash` function can work with `Decimal` and `UUID` types. Fixes [#5184](https://github.com/ClickHouse/ClickHouse/issues/5184). [#7693](https://github.com/ClickHouse/ClickHouse/pull/7693) ([Mikhail Korotov](https://github.com/millb))
-* Removed fixed index granularity (it was 1024) from system logs because it's obsolete after implementation of adaptive granularity. [#7698](https://github.com/ClickHouse/ClickHouse/pull/7698) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Enabled MySQL compatibility server when ClickHouse is compiled without SSL. [#7852](https://github.com/ClickHouse/ClickHouse/pull/7852) ([Yuriy Baranov](https://github.com/yurriy))
-* Now server checksums distributed batches, which gives more verbose errors in case of corrupted data in batch. [#7914](https://github.com/ClickHouse/ClickHouse/pull/7914) ([Azat Khuzhin](https://github.com/azat))
-* Support `DROP DATABASE`, `DETACH TABLE`, `DROP TABLE` and `ATTACH TABLE` for `MySQL` database engine. [#8202](https://github.com/ClickHouse/ClickHouse/pull/8202) ([Winter Zhang](https://github.com/zhang2014))
-* Add authentication in S3 table function and table engine. [#7623](https://github.com/ClickHouse/ClickHouse/pull/7623) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Added check for extra parts of `MergeTree` at different disks, in order to not allow to miss data parts at undefined disks. [#8118](https://github.com/ClickHouse/ClickHouse/pull/8118) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Enable SSL support for Mac client and server. [#8297](https://github.com/ClickHouse/ClickHouse/pull/8297) ([Ivan](https://github.com/abyss7))
-* Now ClickHouse can work as MySQL federated server (see https://dev.mysql.com/doc/refman/5.7/en/federated-create-server.html). [#7717](https://github.com/ClickHouse/ClickHouse/pull/7717) ([Maxim Fedotov](https://github.com/MaxFedotov))
-* `clickhouse-client` now only enable `bracketed-paste` when multiquery is on and multiline is off. This fixes [#7757](https://github.com/ClickHouse/ClickHouse/issues/7757). [#7761](https://github.com/ClickHouse/ClickHouse/pull/7761) ([Amos Bird](https://github.com/amosbird))
-* Support `Array(Decimal)` in `if` function. [#7721](https://github.com/ClickHouse/ClickHouse/pull/7721) ([Artem Zuikov](https://github.com/4ertus2))
-* Support Decimals in `arrayDifference`, `arrayCumSum` and `arrayCumSumNegative` functions. [#7724](https://github.com/ClickHouse/ClickHouse/pull/7724) ([Artem Zuikov](https://github.com/4ertus2))
-* Added `lifetime` column to `system.dictionaries` table. [#6820](https://github.com/ClickHouse/ClickHouse/issues/6820) [#7727](https://github.com/ClickHouse/ClickHouse/pull/7727) ([kekekekule](https://github.com/kekekekule))
-* Improved check for existing parts on different disks for `*MergeTree` table engines. Addresses [#7660](https://github.com/ClickHouse/ClickHouse/issues/7660). [#8440](https://github.com/ClickHouse/ClickHouse/pull/8440) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Integration with `AWS SDK` for `S3` interactions which allows to use all S3 features out of the box. [#8011](https://github.com/ClickHouse/ClickHouse/pull/8011) ([Pavel Kovalenko](https://github.com/Jokser))
-* Added support for subqueries in `Live View` tables. [#7792](https://github.com/ClickHouse/ClickHouse/pull/7792) ([vzakaznikov](https://github.com/vzakaznikov))
-* Check for using `Date` or `DateTime` column from `TTL` expressions was removed. [#7920](https://github.com/ClickHouse/ClickHouse/pull/7920) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Information about disk was added to `system.detached_parts` table. [#7833](https://github.com/ClickHouse/ClickHouse/pull/7833) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Now settings `max_(table|partition)_size_to_drop` can be changed without a restart. [#7779](https://github.com/ClickHouse/ClickHouse/pull/7779) ([Grigory Pervakov](https://github.com/GrigoryPervakov))
-* Slightly better usability of error messages. Ask user not to remove the lines below `Stack trace:`. [#7897](https://github.com/ClickHouse/ClickHouse/pull/7897) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Better reading messages from `Kafka` engine in various formats after [#7935](https://github.com/ClickHouse/ClickHouse/issues/7935). [#8035](https://github.com/ClickHouse/ClickHouse/pull/8035) ([Ivan](https://github.com/abyss7))
-* Better compatibility with MySQL clients which don't support `sha2_password` auth plugin. [#8036](https://github.com/ClickHouse/ClickHouse/pull/8036) ([Yuriy Baranov](https://github.com/yurriy))
-* Support more column types in MySQL compatibility server. [#7975](https://github.com/ClickHouse/ClickHouse/pull/7975) ([Yuriy Baranov](https://github.com/yurriy))
-* Implement `ORDER BY` optimization for `Merge`, `Buffer` and `Materilized View` storages with underlying `MergeTree` tables. [#8130](https://github.com/ClickHouse/ClickHouse/pull/8130) ([Anton Popov](https://github.com/CurtizJ))
-* Now we always use POSIX implementation of `getrandom` to have better compatibility with old kernels (< 3.17). [#7940](https://github.com/ClickHouse/ClickHouse/pull/7940) ([Amos Bird](https://github.com/amosbird))
-* Better check for valid destination in a move TTL rule. [#8410](https://github.com/ClickHouse/ClickHouse/pull/8410) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Better checks for broken insert batches for `Distributed` table engine. [#7933](https://github.com/ClickHouse/ClickHouse/pull/7933) ([Azat Khuzhin](https://github.com/azat))
-* Add column with array of parts name which mutations must process in future to `system.mutations` table. [#8179](https://github.com/ClickHouse/ClickHouse/pull/8179) ([alesapin](https://github.com/alesapin))
-* Parallel merge sort optimization for processors. [#8552](https://github.com/ClickHouse/ClickHouse/pull/8552) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* The settings `mark_cache_min_lifetime` is now obsolete and does nothing. In previous versions, mark cache can grow in memory larger than `mark_cache_size` to accomodate data within `mark_cache_min_lifetime` seconds. That was leading to confusion and higher memory usage than expected, that is especially bad on memory constrained systems. If you will see performance degradation after installing this release, you should increase the `mark_cache_size`. [#8484](https://github.com/ClickHouse/ClickHouse/pull/8484) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Preparation to use `tid` everywhere. This is needed for [#7477](https://github.com/ClickHouse/ClickHouse/issues/7477). [#8276](https://github.com/ClickHouse/ClickHouse/pull/8276) ([alexey-milovidov](https://github.com/alexey-milovidov))
-
-#### Performance Improvement
-* Performance optimizations in processors pipeline. [#7988](https://github.com/ClickHouse/ClickHouse/pull/7988) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Non-blocking updates of expired keys in cache dictionaries (with permission to read old ones). [#8303](https://github.com/ClickHouse/ClickHouse/pull/8303) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
-* Compile ClickHouse without `-fno-omit-frame-pointer` globally to spare one more register. [#8097](https://github.com/ClickHouse/ClickHouse/pull/8097) ([Amos Bird](https://github.com/amosbird))
-* Speedup `greatCircleDistance` function and add performance tests for it. [#7307](https://github.com/ClickHouse/ClickHouse/pull/7307) ([Olga Khvostikova](https://github.com/stavrolia))
-* Improved performance of function `roundDown`. [#8465](https://github.com/ClickHouse/ClickHouse/pull/8465) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Improved performance of `max`, `min`, `argMin`, `argMax` for `DateTime64` data type. [#8199](https://github.com/ClickHouse/ClickHouse/pull/8199) ([Vasily Nemkov](https://github.com/Enmk))
-* Improved performance of sorting without a limit or with big limit and external sorting. [#8545](https://github.com/ClickHouse/ClickHouse/pull/8545) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Improved performance of formatting floating point numbers up to 6 times. [#8542](https://github.com/ClickHouse/ClickHouse/pull/8542) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Improved performance of `modulo` function. [#7750](https://github.com/ClickHouse/ClickHouse/pull/7750) ([Amos Bird](https://github.com/amosbird))
-* Optimized `ORDER BY` and merging with single column key. [#8335](https://github.com/ClickHouse/ClickHouse/pull/8335) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Better implementation for `arrayReduce`, `-Array` and `-State` combinators.  [#7710](https://github.com/ClickHouse/ClickHouse/pull/7710) ([Amos Bird](https://github.com/amosbird))
-* Now `PREWHERE` should be optimized to be at least as efficient as `WHERE`. [#7769](https://github.com/ClickHouse/ClickHouse/pull/7769) ([Amos Bird](https://github.com/amosbird))
-* Improve the way `round` and `roundBankers` handling negative numbers. [#8229](https://github.com/ClickHouse/ClickHouse/pull/8229) ([hcz](https://github.com/hczhcz))
-* Improved decoding performance of `DoubleDelta` and `Gorilla` codecs by roughly 30-40%. This fixes [#7082](https://github.com/ClickHouse/ClickHouse/issues/7082). [#8019](https://github.com/ClickHouse/ClickHouse/pull/8019) ([Vasily Nemkov](https://github.com/Enmk))
-* Improved performance of `base64` related functions. [#8444](https://github.com/ClickHouse/ClickHouse/pull/8444) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Added a function `geoDistance`. It is similar to `greatCircleDistance` but uses approximation to WGS-84 ellipsoid model. The performance of both functions are near the same. [#8086](https://github.com/ClickHouse/ClickHouse/pull/8086) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Faster `min` and `max` aggregation functions for `Decimal` data type. [#8144](https://github.com/ClickHouse/ClickHouse/pull/8144) ([Artem Zuikov](https://github.com/4ertus2))
-* Vectorize processing `arrayReduce`. [#7608](https://github.com/ClickHouse/ClickHouse/pull/7608) ([Amos Bird](https://github.com/amosbird))
-* `if` chains are now optimized as `multiIf`. [#8355](https://github.com/ClickHouse/ClickHouse/pull/8355) ([kamalov-ruslan](https://github.com/kamalov-ruslan))
-* Fix performance regression of `Kafka` table engine introduced in 19.15. This fixes [#7261](https://github.com/ClickHouse/ClickHouse/issues/7261). [#7935](https://github.com/ClickHouse/ClickHouse/pull/7935) ([filimonov](https://github.com/filimonov))
-* Removed "pie" code generation that `gcc` from Debian packages occasionally brings by default. [#8483](https://github.com/ClickHouse/ClickHouse/pull/8483) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Parallel parsing data formats [#6553](https://github.com/ClickHouse/ClickHouse/pull/6553) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
-* Enable optimized parser of `Values` with expressions by default (`input_format_values_deduce_templates_of_expressions=1`). [#8231](https://github.com/ClickHouse/ClickHouse/pull/8231) ([tavplubix](https://github.com/tavplubix))
-
-#### Build/Testing/Packaging Improvement
-* Build fixes for `ARM` and in minimal mode. [#8304](https://github.com/ClickHouse/ClickHouse/pull/8304) ([proller](https://github.com/proller))
-* Add coverage file flush for `clickhouse-server` when std::atexit is not called. Also slightly improved logging in stateless tests with coverage. [#8267](https://github.com/ClickHouse/ClickHouse/pull/8267) ([alesapin](https://github.com/alesapin))
-* Update LLVM library in contrib. Avoid using LLVM from OS packages. [#8258](https://github.com/ClickHouse/ClickHouse/pull/8258) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Make bundled `curl` build fully quiet. [#8232](https://github.com/ClickHouse/ClickHouse/pull/8232) [#8203](https://github.com/ClickHouse/ClickHouse/pull/8203) ([Pavel Kovalenko](https://github.com/Jokser))
-* Fix some `MemorySanitizer` warnings. [#8235](https://github.com/ClickHouse/ClickHouse/pull/8235) ([Alexander Kuzmenkov](https://github.com/akuzm))
-* Use `add_warning` and `no_warning` macros in `CMakeLists.txt`. [#8604](https://github.com/ClickHouse/ClickHouse/pull/8604) ([Ivan](https://github.com/abyss7))
-* Add support of Minio S3 Compatible object (https://min.io/) for better integration tests. [#7863](https://github.com/ClickHouse/ClickHouse/pull/7863) [#7875](https://github.com/ClickHouse/ClickHouse/pull/7875) ([Pavel Kovalenko](https://github.com/Jokser))
-* Imported `libc` headers to contrib. It allows to make builds more consistent across various systems (only for `x86_64-linux-gnu`). [#5773](https://github.com/ClickHouse/ClickHouse/pull/5773) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Remove `-fPIC` from some libraries. [#8464](https://github.com/ClickHouse/ClickHouse/pull/8464) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Clean `CMakeLists.txt` for curl. See https://github.com/ClickHouse/ClickHouse/pull/8011#issuecomment-569478910 [#8459](https://github.com/ClickHouse/ClickHouse/pull/8459) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Silent warnings in `CapNProto` library. [#8220](https://github.com/ClickHouse/ClickHouse/pull/8220) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Add performance tests for short string optimized hash tables. [#7679](https://github.com/ClickHouse/ClickHouse/pull/7679) ([Amos Bird](https://github.com/amosbird))
-* Now ClickHouse will build on `AArch64` even if `MADV_FREE` is not available. This fixes [#8027](https://github.com/ClickHouse/ClickHouse/issues/8027). [#8243](https://github.com/ClickHouse/ClickHouse/pull/8243) ([Amos Bird](https://github.com/amosbird))
-* Update `zlib-ng` to fix memory sanitizer problems. [#7182](https://github.com/ClickHouse/ClickHouse/pull/7182) [#8206](https://github.com/ClickHouse/ClickHouse/pull/8206) ([Alexander Kuzmenkov](https://github.com/akuzm))
-* Enable internal MySQL library on non-Linux system, because usage of OS packages is very fragile and usually doesn't work at all. This fixes [#5765](https://github.com/ClickHouse/ClickHouse/issues/5765). [#8426](https://github.com/ClickHouse/ClickHouse/pull/8426) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fixed build on some systems after enabling `libc++`. This supersedes [#8374](https://github.com/ClickHouse/ClickHouse/issues/8374). [#8380](https://github.com/ClickHouse/ClickHouse/pull/8380) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Make `Field` methods more type-safe to find more errors. [#7386](https://github.com/ClickHouse/ClickHouse/pull/7386) [#8209](https://github.com/ClickHouse/ClickHouse/pull/8209) ([Alexander Kuzmenkov](https://github.com/akuzm))
-* Added missing files to the `libc-headers` submodule. [#8507](https://github.com/ClickHouse/ClickHouse/pull/8507) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix wrong `JSON` quoting in performance test output. [#8497](https://github.com/ClickHouse/ClickHouse/pull/8497) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Now stack trace is displayed for `std::exception` and `Poco::Exception`. In previous versions it was available only for `DB::Exception`. This improves diagnostics. [#8501](https://github.com/ClickHouse/ClickHouse/pull/8501) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Porting `clock_gettime` and `clock_nanosleep` for fresh glibc versions. [#8054](https://github.com/ClickHouse/ClickHouse/pull/8054) ([Amos Bird](https://github.com/amosbird))
-* Enable `part_log` in example config for developers. [#8609](https://github.com/ClickHouse/ClickHouse/pull/8609) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix async nature of reload in `01036_no_superfluous_dict_reload_on_create_database*`. [#8111](https://github.com/ClickHouse/ClickHouse/pull/8111) ([Azat Khuzhin](https://github.com/azat))
-* Fixed codec performance tests. [#8615](https://github.com/ClickHouse/ClickHouse/pull/8615) ([Vasily Nemkov](https://github.com/Enmk))
-* Add install scripts for `.tgz` build and documentation for them. [#8612](https://github.com/ClickHouse/ClickHouse/pull/8612) [#8591](https://github.com/ClickHouse/ClickHouse/pull/8591) ([alesapin](https://github.com/alesapin))
-* Removed old `ZSTD` test (it was created in year 2016 to reproduce the bug that pre 1.0 version of ZSTD has had). This fixes [#8618](https://github.com/ClickHouse/ClickHouse/issues/8618). [#8619](https://github.com/ClickHouse/ClickHouse/pull/8619) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fixed build on Mac OS Catalina. [#8600](https://github.com/ClickHouse/ClickHouse/pull/8600) ([meo](https://github.com/meob))
-* Increased number of rows in codec performance tests to make results noticeable. [#8574](https://github.com/ClickHouse/ClickHouse/pull/8574) ([Vasily Nemkov](https://github.com/Enmk))
-* In debug builds, treat `LOGICAL_ERROR` exceptions as assertion failures, so that they are easier to notice. [#8475](https://github.com/ClickHouse/ClickHouse/pull/8475) ([Alexander Kuzmenkov](https://github.com/akuzm))
-* Make formats-related performance test more deterministic. [#8477](https://github.com/ClickHouse/ClickHouse/pull/8477) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Update `lz4` to fix a MemorySanitizer failure. [#8181](https://github.com/ClickHouse/ClickHouse/pull/8181) ([Alexander Kuzmenkov](https://github.com/akuzm))
-* Suppress a known MemorySanitizer false positive in exception handling. [#8182](https://github.com/ClickHouse/ClickHouse/pull/8182) ([Alexander Kuzmenkov](https://github.com/akuzm))
-* Update `gcc` and `g++` to version 9 in `build/docker/build.sh` [#7766](https://github.com/ClickHouse/ClickHouse/pull/7766) ([TLightSky](https://github.com/tlightsky))
-* Add performance test case to test that `PREWHERE` is worse than `WHERE`.  [#7768](https://github.com/ClickHouse/ClickHouse/pull/7768) ([Amos Bird](https://github.com/amosbird))
-* Progress towards fixing one flacky test. [#8621](https://github.com/ClickHouse/ClickHouse/pull/8621) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Avoid MemorySanitizer report for data from `libunwind`. [#8539](https://github.com/ClickHouse/ClickHouse/pull/8539) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Updated `libc++` to the latest version. [#8324](https://github.com/ClickHouse/ClickHouse/pull/8324) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Build ICU library from sources. This fixes [#6460](https://github.com/ClickHouse/ClickHouse/issues/6460). [#8219](https://github.com/ClickHouse/ClickHouse/pull/8219) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Switched from `libressl` to `openssl`. ClickHouse should support TLS 1.3 and SNI after this change. This fixes [#8171](https://github.com/ClickHouse/ClickHouse/issues/8171). [#8218](https://github.com/ClickHouse/ClickHouse/pull/8218) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fixed UBSan report when using `chacha20_poly1305` from SSL (happens on connect to https://yandex.ru/). [#8214](https://github.com/ClickHouse/ClickHouse/pull/8214) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix mode of default password file for `.deb` linux distros. [#8075](https://github.com/ClickHouse/ClickHouse/pull/8075) ([proller](https://github.com/proller))
-* Improved expression for getting `clickhouse-server` PID in `clickhouse-test`. [#8063](https://github.com/ClickHouse/ClickHouse/pull/8063) ([Alexander Kazakov](https://github.com/Akazz))
-* Updated contrib/googletest to v1.10.0. [#8587](https://github.com/ClickHouse/ClickHouse/pull/8587) ([Alexander Burmak](https://github.com/Alex-Burmak))
-* Fixed ThreadSaninitizer report in `base64` library. Also updated this library to the latest version, but it doesn't matter. This fixes [#8397](https://github.com/ClickHouse/ClickHouse/issues/8397). [#8403](https://github.com/ClickHouse/ClickHouse/pull/8403) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix `00600_replace_running_query` for processors. [#8272](https://github.com/ClickHouse/ClickHouse/pull/8272) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Remove support for `tcmalloc` to make `CMakeLists.txt` simpler. [#8310](https://github.com/ClickHouse/ClickHouse/pull/8310) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Release gcc builds now use `libc++` instead of `libstdc++`. Recently `libc++` was used only with clang. This will improve consistency of build configurations and portability. [#8311](https://github.com/ClickHouse/ClickHouse/pull/8311) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Enable ICU library for build with MemorySanitizer. [#8222](https://github.com/ClickHouse/ClickHouse/pull/8222) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Suppress warnings from `CapNProto` library. [#8224](https://github.com/ClickHouse/ClickHouse/pull/8224) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Removed special cases of code for `tcmalloc`, because it's no longer supported. [#8225](https://github.com/ClickHouse/ClickHouse/pull/8225) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* In CI coverage task, kill the server gracefully to allow it to save the coverage report. This fixes incomplete coverage reports we've been seeing lately. [#8142](https://github.com/ClickHouse/ClickHouse/pull/8142) ([alesapin](https://github.com/alesapin))
-* Performance tests for all codecs against `Float64` and `UInt64` values. [#8349](https://github.com/ClickHouse/ClickHouse/pull/8349) ([Vasily Nemkov](https://github.com/Enmk))
-* `termcap` is very much deprecated and lead to various problems (f.g. missing "up" cap and echoing `^J` instead of multi line) . Favor `terminfo` or bundled `ncurses`. [#7737](https://github.com/ClickHouse/ClickHouse/pull/7737) ([Amos Bird](https://github.com/amosbird))
-* Fix `test_storage_s3` integration test. [#7734](https://github.com/ClickHouse/ClickHouse/pull/7734) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Support `StorageFile(<format>, null) ` to insert block into given format file without actually write to disk. This is required for performance tests. [#8455](https://github.com/ClickHouse/ClickHouse/pull/8455) ([Amos Bird](https://github.com/amosbird))
-* Added argument `--print-time` to functional tests which prints execution time per test. [#8001](https://github.com/ClickHouse/ClickHouse/pull/8001) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Added asserts to `KeyCondition` while evaluating RPN. This will fix warning from gcc-9. [#8279](https://github.com/ClickHouse/ClickHouse/pull/8279) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Dump cmake options in CI builds. [#8273](https://github.com/ClickHouse/ClickHouse/pull/8273) ([Alexander Kuzmenkov](https://github.com/akuzm))
-* Don't generate debug info for some fat libraries. [#8271](https://github.com/ClickHouse/ClickHouse/pull/8271) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Make `log_to_console.xml` always log to stderr, regardless of is it interactive or not. [#8395](https://github.com/ClickHouse/ClickHouse/pull/8395) ([Alexander Kuzmenkov](https://github.com/akuzm))
-* Removed some unused features from `clickhouse-performance-test` tool. [#8555](https://github.com/ClickHouse/ClickHouse/pull/8555) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Now we will also search for `lld-X` with corresponding `clang-X` version. [#8092](https://github.com/ClickHouse/ClickHouse/pull/8092) ([alesapin](https://github.com/alesapin))
-* Parquet build improvement. [#8421](https://github.com/ClickHouse/ClickHouse/pull/8421) ([maxulan](https://github.com/maxulan))
-* More GCC warnings [#8221](https://github.com/ClickHouse/ClickHouse/pull/8221) ([kreuzerkrieg](https://github.com/kreuzerkrieg))
-* Package for Arch Linux now allows to run ClickHouse server, and not only client. [#8534](https://github.com/ClickHouse/ClickHouse/pull/8534) ([Vladimir Chebotarev](https://github.com/excitoon))
-* Fix test with processors. Tiny performance fixes. [#7672](https://github.com/ClickHouse/ClickHouse/pull/7672) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
-* Update contrib/protobuf. [#8256](https://github.com/ClickHouse/ClickHouse/pull/8256) ([Matwey V. Kornilov](https://github.com/matwey))
-* In preparation of switching to c++20 as a new year celebration. "May the C++ force be with ClickHouse." [#8447](https://github.com/ClickHouse/ClickHouse/pull/8447) ([Amos Bird](https://github.com/amosbird))
-
-#### Experimental Feature
-* Added experimental setting `min_bytes_to_use_mmap_io`. It allows to read big files without copying data from kernel to userspace. The setting is disabled by default. Recommended threshold is about 64 MB, because mmap/munmap is slow. [#8520](https://github.com/ClickHouse/ClickHouse/pull/8520) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Reworked quotas as a part of access control system. Added new table `system.quotas`, new functions `currentQuota`, `currentQuotaKey`, new SQL syntax `CREATE QUOTA`, `ALTER QUOTA`, `DROP QUOTA`, `SHOW QUOTA`. [#7257](https://github.com/ClickHouse/ClickHouse/pull/7257) ([Vitaly Baranov](https://github.com/vitlibar))
-* Allow skipping unknown settings with warnings instead of throwing exceptions. [#7653](https://github.com/ClickHouse/ClickHouse/pull/7653) ([Vitaly Baranov](https://github.com/vitlibar))
-* Reworked row policies as a part of access control system. Added new table `system.row_policies`, new function `currentRowPolicies()`, new SQL syntax `CREATE POLICY`, `ALTER POLICY`, `DROP POLICY`, `SHOW CREATE POLICY`, `SHOW POLICIES`. [#7808](https://github.com/ClickHouse/ClickHouse/pull/7808) ([Vitaly Baranov](https://github.com/vitlibar))
-
-#### Security Fix
-* Fixed the possibility of reading directories structure in tables with `File` table engine. This fixes [#8536](https://github.com/ClickHouse/ClickHouse/issues/8536). [#8537](https://github.com/ClickHouse/ClickHouse/pull/8537) ([alexey-milovidov](https://github.com/alexey-milovidov))
-
-## [Changelog for 2019](https://github.com/ClickHouse/ClickHouse/blob/master/docs/en/whats-new/changelog/2019.md)
+* Add `SYSTEM SUSPEND` command for fault injection. It can be used to faciliate failover tests. This closes [#15979](https://github.com/ClickHouse/ClickHouse/issues/15979). [#18850](https://github.com/ClickHouse/ClickHouse/pull/18850) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Removed the -finline-hint-functions flag not present in GCC. [#18846](https://github.com/ClickHouse/ClickHouse/pull/18846) ([Mike](https://github.com/myrrc)).
+* Add simple integrity check for ClickHouse binary. It allows to detect corruption due to faulty hardware (bit rot on storage media or bit flips in RAM). [#18811](https://github.com/ClickHouse/ClickHouse/pull/18811) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Generate build id when ClickHouse is linked with `lld`. It's appeared that `lld` does not generate it by default on my machine. Build id is used for crash reports and introspection. [#18808](https://github.com/ClickHouse/ClickHouse/pull/18808) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* TestFlows: fixes to LDAP tests that fail due to slow test execution. [#18790](https://github.com/ClickHouse/ClickHouse/pull/18790) ([vzakaznikov](https://github.com/vzakaznikov)).
+* Fix shellcheck errors in style check. [#18566](https://github.com/ClickHouse/ClickHouse/pull/18566) ([Ilya Yatsishin](https://github.com/qoega)).
+* Update timezones info to 2020e. [#18531](https://github.com/ClickHouse/ClickHouse/pull/18531) ([alesapin](https://github.com/alesapin)).
+* Fix codespell warnings. Split style checks into separate parts. Update style checks docker image. [#18463](https://github.com/ClickHouse/ClickHouse/pull/18463) ([Ilya Yatsishin](https://github.com/qoega)).
+* Check for leftovers of conflict markers in docs. [#18332](https://github.com/ClickHouse/ClickHouse/pull/18332) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Enable Thread Fuzzer for stateless tests flaky check. [#18299](https://github.com/ClickHouse/ClickHouse/pull/18299) ([alesapin](https://github.com/alesapin)).
+* Merging requirements for AES encryption functions. Updating aes_encryption tests to use new requirements. Updating TestFlows version to 1.6.72. [#18221](https://github.com/ClickHouse/ClickHouse/pull/18221) ([vzakaznikov](https://github.com/vzakaznikov)).
+* - Updating TestFlows version to the latest 1.6.72 - Re-generating requirements.py. [#18208](https://github.com/ClickHouse/ClickHouse/pull/18208) ([vzakaznikov](https://github.com/vzakaznikov)).
+* Do not use non thread-safe function `strerror`. [#18204](https://github.com/ClickHouse/ClickHouse/pull/18204) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Update `anchore/scan-action@main` workflow action (was moved from master). [#18192](https://github.com/ClickHouse/ClickHouse/pull/18192) ([Stig Bakken](https://github.com/stigsb)).
+* Fix usage of uninitialized value in function toModifiedJulianDayOrNull, reported by MSan. Was discovered [here](https://github.com/ClickHouse/ClickHouse/pull/17726#issuecomment-744050500). [#18172](https://github.com/ClickHouse/ClickHouse/pull/18172) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Change OpenSSL to BoringSSL. It allows to avoid issues with sanitizers. This fixes [#12490](https://github.com/ClickHouse/ClickHouse/issues/12490). This fixes [#17502](https://github.com/ClickHouse/ClickHouse/issues/17502). This fixes [#12952](https://github.com/ClickHouse/ClickHouse/issues/12952). [#18129](https://github.com/ClickHouse/ClickHouse/pull/18129) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Now, `clickhouse-test` DROP/CREATE databases with a timeout. [#18098](https://github.com/ClickHouse/ClickHouse/pull/18098) ([alesapin](https://github.com/alesapin)).
+* Adjusting timeouts a bit, in the good hope that it will prevent flakiness of the test. [#18000](https://github.com/ClickHouse/ClickHouse/pull/18000) ([filimonov](https://github.com/filimonov)).
+* Enable Pytest framework for stateless tests. [#17902](https://github.com/ClickHouse/ClickHouse/pull/17902) ([Ivan](https://github.com/abyss7)).
+* Add our own CMakeList for dragonbox which was added in [#17831](https://github.com/ClickHouse/ClickHouse/issues/17831). [#17869](https://github.com/ClickHouse/ClickHouse/pull/17869) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Updating TestFlows README.md to include "How To Debug Why Test Failed" section. [#17808](https://github.com/ClickHouse/ClickHouse/pull/17808) ([vzakaznikov](https://github.com/vzakaznikov)).
+* - Testflows tests for RBAC [ACCESS MANAGEMENT](https://clickhouse.tech/docs/en/sql-reference/statements/grant/#grant-access-management) privileges. [#17804](https://github.com/ClickHouse/ClickHouse/pull/17804) ([MyroTk](https://github.com/MyroTk)).
+* Now we use the fresh docker daemon version in integration tests. [#17671](https://github.com/ClickHouse/ClickHouse/pull/17671) ([alesapin](https://github.com/alesapin)).
+* - RBAC testflows tests for SHOW, TRUNCATE, KILL, and OPTIMIZE. - Updates to old tests. - Resolved comments from #https://github.com/ClickHouse/ClickHouse/pull/16977. [#17657](https://github.com/ClickHouse/ClickHouse/pull/17657) ([MyroTk](https://github.com/MyroTk)).
+* Add an integration test: ClickHouse killed while insert for MaterializeMySQL ENGINE. [#17622](https://github.com/ClickHouse/ClickHouse/pull/17622) ([TCeason](https://github.com/TCeason)).
+* Add an integration test: MySQL server killed while insert for MaterializeMySQL Engine. [#17614](https://github.com/ClickHouse/ClickHouse/pull/17614) ([TCeason](https://github.com/TCeason)).
+* Send info about official build, memory, cpu and free disk space to Sentry if it is enabled. Sentry is opt-in feature to help ClickHouse developers. This closes [#17279](https://github.com/ClickHouse/ClickHouse/issues/17279). [#17543](https://github.com/ClickHouse/ClickHouse/pull/17543) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* There was an uninitialized variable in the code of Copier. [#17363](https://github.com/ClickHouse/ClickHouse/pull/17363) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* `PODArray` does not initialize "new" elements when resizing, unlike `std::vector`. This probably fixes [this failure](https://clickhouse-test-reports.s3.yandex.net/17309/065cd002578f2e8228f12a2744bd40c970065e0c/stress_test_(memory)/stderr.log) from [#17309](https://github.com/ClickHouse/ClickHouse/issues/17309). [#17344](https://github.com/ClickHouse/ClickHouse/pull/17344) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* * Added RBAC tests for `ATTACH`, `CREATE`, `DROP`, and `DETACH`. [#16977](https://github.com/ClickHouse/ClickHouse/pull/16977) ([MyroTk](https://github.com/MyroTk)).
+* Now ClickHouse can pretend to be a fake ZooKeeper. Currently, storage implementation is just stored in-memory hash-table, and server partially support ZooKeeper protocol. [#16877](https://github.com/ClickHouse/ClickHouse/pull/16877) ([alesapin](https://github.com/alesapin)).
+* Add some test for MaterializeMySQL. e.g. network partition, MySQL kill sync thread... [#16806](https://github.com/ClickHouse/ClickHouse/pull/16806) ([TCeason](https://github.com/TCeason)).
+* ... Detailed description / Documentation draft: ClickHouse-Extras repo contains fix for the issue with ipv6 in Arrow Flight library. See https://github.com/ClickHouse/ClickHouse/pull/16243#issuecomment-720830294 for details. [#16664](https://github.com/ClickHouse/ClickHouse/pull/16664) ([Zhanna](https://github.com/FawnD2)).
+* Add a library that replaces some `libc` functions to traps that will terminate the process. [#16366](https://github.com/ClickHouse/ClickHouse/pull/16366) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Provide diagnostics in server logs in case of stack overflow, send error message to clickhouse-client. This closes [#14840](https://github.com/ClickHouse/ClickHouse/issues/14840). [#16346](https://github.com/ClickHouse/ClickHouse/pull/16346) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Now we can run almost all stateless functional tests in parallel. [#15236](https://github.com/ClickHouse/ClickHouse/pull/15236) ([alesapin](https://github.com/alesapin)).
+* If server was terminated by OOM killer, print message in log. [#13516](https://github.com/ClickHouse/ClickHouse/pull/13516) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+
+#### NO CL ENTRY
+
+* NO CL ENTRY:  'Revert "Add metrics for part number in MergeTree in ClickHouse"'. [#18834](https://github.com/ClickHouse/ClickHouse/pull/18834) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'Fix typo in array functions' documentation'. [#18792](https://github.com/ClickHouse/ClickHouse/pull/18792) ([Bertrand Junqua](https://github.com/Bertrand31)).
+* NO CL ENTRY:  'Revert "Add some extra tests to copier"'. [#18636](https://github.com/ClickHouse/ClickHouse/pull/18636) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* NO CL ENTRY:  'Revert "Fix access rights required for the merge() table function."'. [#18103](https://github.com/ClickHouse/ClickHouse/pull/18103) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'Исправил опечатку в названии ОС RedHad->RedHat'. [#18028](https://github.com/ClickHouse/ClickHouse/pull/18028) ([Erixonich](https://github.com/Erixonich)).
+* NO CL ENTRY:  'Revert "Date vs DateTime64 comparison"'. [#17985](https://github.com/ClickHouse/ClickHouse/pull/17985) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'Revert "Fix index granularity calculation on block borders"'. [#17918](https://github.com/ClickHouse/ClickHouse/pull/17918) ([alesapin](https://github.com/alesapin)).
+* NO CL ENTRY:  'Update README.md'. [#17596](https://github.com/ClickHouse/ClickHouse/pull/17596) ([Robert Hodges](https://github.com/hodgesrm)).
+* NO CL ENTRY:  'Revert "Bump mkdocs-macros-plugin from 0.4.20 to 0.5.0 in /docs/tools"'. [#17405](https://github.com/ClickHouse/ClickHouse/pull/17405) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'Revert "Attempt to fix Stress test (MSan)"'. [#17372](https://github.com/ClickHouse/ClickHouse/pull/17372) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
diff --git a/docs/en/whats-new/changelog/2020.md b/docs/en/whats-new/changelog/2020.md
new file mode 100644
index 00000000000..2ec48bcd584
--- /dev/null
+++ b/docs/en/whats-new/changelog/2020.md
@@ -0,0 +1,3376 @@
+### ClickHouse release 20.12
+
+### ClickHouse release v20.12.4.5-stable, 2020-12-24
+
+#### Bug Fix
+
+* Fixed issue when `clickhouse-odbc-bridge` process is unreachable by server on machines with dual IPv4/IPv6 stack; - Fixed issue when ODBC dictionary updates are performed using malformed queries and/or cause crashes; Possibly closes [#14489](https://github.com/ClickHouse/ClickHouse/issues/14489). [#18278](https://github.com/ClickHouse/ClickHouse/pull/18278) ([Denis Glazachev](https://github.com/traceon)).
+* Fixed key comparison between Enum and Int types. This fixes [#17989](https://github.com/ClickHouse/ClickHouse/issues/17989). [#18214](https://github.com/ClickHouse/ClickHouse/pull/18214) ([Amos Bird](https://github.com/amosbird)).
+* Fixed unique key convert crash in `MaterializeMySQL` database engine. This fixes [#18186](https://github.com/ClickHouse/ClickHouse/issues/18186) and fixes [#16372](https://github.com/ClickHouse/ClickHouse/issues/16372)  [#18211](https://github.com/ClickHouse/ClickHouse/pull/18211) ([Winter Zhang](https://github.com/zhang2014)).
+* Fixed `std::out_of_range: basic_string` in S3 URL parsing. [#18059](https://github.com/ClickHouse/ClickHouse/pull/18059) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Fixed the issue when some tables not synchronized to ClickHouse from MySQL caused by the fact that convertion MySQL prefix index wasn't supported for MaterializeMySQL. This fixes [#15187](https://github.com/ClickHouse/ClickHouse/issues/15187) and fixes [#17912](https://github.com/ClickHouse/ClickHouse/issues/17912)  [#17944](https://github.com/ClickHouse/ClickHouse/pull/17944) ([Winter Zhang](https://github.com/zhang2014)).
+* Fixed the issue when query optimization was producing wrong result if query contains `ARRAY JOIN`. [#17887](https://github.com/ClickHouse/ClickHouse/pull/17887) ([sundyli](https://github.com/sundy-li)).
+* Fixed possible segfault in `topK` aggregate function. This closes [#17404](https://github.com/ClickHouse/ClickHouse/issues/17404). [#17845](https://github.com/ClickHouse/ClickHouse/pull/17845) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fixed empty `system.stack_trace` table when server is running in daemon mode. [#17630](https://github.com/ClickHouse/ClickHouse/pull/17630) ([Amos Bird](https://github.com/amosbird)).
+
+
+### ClickHouse release v20.12.3.3-stable, 2020-12-13
+
+#### Backward Incompatible Change
+
+* Enable `use_compact_format_in_distributed_parts_names` by default (see the documentation for the reference). [#16728](https://github.com/ClickHouse/ClickHouse/pull/16728) ([Azat Khuzhin](https://github.com/azat)).
+* Accept user settings related to file formats (e.g. `format_csv_delimiter`) in the `SETTINGS` clause when creating a table that uses `File` engine, and use these settings in all `INSERT`s and `SELECT`s. The file format settings changed in the current user session, or in the `SETTINGS` clause of a DML query itself, no longer affect the query. [#16591](https://github.com/ClickHouse/ClickHouse/pull/16591) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+
+#### New Feature
+
+* add `*.xz` compression/decompression support.It enables using `*.xz` in `file()` function. This closes [#8828](https://github.com/ClickHouse/ClickHouse/issues/8828). [#16578](https://github.com/ClickHouse/ClickHouse/pull/16578) ([Abi Palagashvili](https://github.com/fibersel)).
+* Introduce the query `ALTER TABLE ... DROP|DETACH PART 'part_name'`. [#15511](https://github.com/ClickHouse/ClickHouse/pull/15511) ([nvartolomei](https://github.com/nvartolomei)).
+* Added new ALTER UPDATE/DELETE IN PARTITION syntax. [#13403](https://github.com/ClickHouse/ClickHouse/pull/13403) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Allow formatting named tuples as JSON objects when using JSON input/output formats, controlled by the `output_format_json_named_tuples_as_objects` setting, disabled by default. [#17175](https://github.com/ClickHouse/ClickHouse/pull/17175) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Add a possibility to input enum value as it's id in TSV and CSV formats by default. [#16834](https://github.com/ClickHouse/ClickHouse/pull/16834) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add COLLATE support for Nullable, LowCardinality, Array and Tuple, where nested type is String. Also refactor the code associated with collations in ColumnString.cpp. [#16273](https://github.com/ClickHouse/ClickHouse/pull/16273) ([Kruglov Pavel](https://github.com/Avogar)).
+* New `tcpPort` function returns TCP port listened by this server. [#17134](https://github.com/ClickHouse/ClickHouse/pull/17134) ([Ivan](https://github.com/abyss7)).
+* Add new math functions: `acosh`, `asinh`, `atan2`, `atanh`, `cosh`, `hypot`, `log1p`, `sinh`. [#16636](https://github.com/ClickHouse/ClickHouse/pull/16636) ([Konstantin Malanchev](https://github.com/hombit)).
+* Possibility to distribute the merges between different replicas. Introduces the `execute_merges_on_single_replica_time_threshold` mergetree setting. [#16424](https://github.com/ClickHouse/ClickHouse/pull/16424) ([filimonov](https://github.com/filimonov)).
+* Add setting `aggregate_functions_null_for_empty` for SQL standard compatibility. This option will rewrite all aggregate functions in a query, adding -OrNull suffix to them. Implements [10273](https://github.com/ClickHouse/ClickHouse/issues/10273). [#16123](https://github.com/ClickHouse/ClickHouse/pull/16123) ([flynn](https://github.com/ucasFL)).
+* Updated DateTime, DateTime64 parsing to accept string Date literal format. [#16040](https://github.com/ClickHouse/ClickHouse/pull/16040) ([Maksim Kita](https://github.com/kitaisreal)).
+* Make it possible to change the path to history file in `clickhouse-client` using the `--history_file` parameter. [#15960](https://github.com/ClickHouse/ClickHouse/pull/15960) ([Maksim Kita](https://github.com/kitaisreal)).
+
+#### Bug Fix
+
+* Fix the issue when server can stop accepting connections in very rare cases. [#17542](https://github.com/ClickHouse/ClickHouse/pull/17542) ([Amos Bird](https://github.com/amosbird)).
+* Fixed `Function not implemented` error when executing `RENAME` query in `Atomic` database with ClickHouse running on Windows Subsystem for Linux. Fixes [#17661](https://github.com/ClickHouse/ClickHouse/issues/17661). [#17664](https://github.com/ClickHouse/ClickHouse/pull/17664) ([tavplubix](https://github.com/tavplubix)).
+* Do not restore parts from WAL if `in_memory_parts_enable_wal` is disabled. [#17802](https://github.com/ClickHouse/ClickHouse/pull/17802) ([detailyang](https://github.com/detailyang)).
+* fix incorrect initialization of `max_compress_block_size` of MergeTreeWriterSettings with `min_compress_block_size`. [#17833](https://github.com/ClickHouse/ClickHouse/pull/17833) ([flynn](https://github.com/ucasFL)).
+* Exception message about max table size to drop was displayed incorrectly. [#17764](https://github.com/ClickHouse/ClickHouse/pull/17764) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed possible segfault when there is not enough space when inserting into `Distributed` table. [#17737](https://github.com/ClickHouse/ClickHouse/pull/17737) ([tavplubix](https://github.com/tavplubix)).
+* Fixed problem when ClickHouse fails to resume connection to MySQL servers. [#17681](https://github.com/ClickHouse/ClickHouse/pull/17681) ([Alexander Kazakov](https://github.com/Akazz)).
+* In might be determined incorrectly if cluster is circular- (cross-) replicated or not when executing `ON CLUSTER` query due to race condition when `pool_size` > 1. It's fixed. [#17640](https://github.com/ClickHouse/ClickHouse/pull/17640) ([tavplubix](https://github.com/tavplubix)).
+* Exception `fmt::v7::format_error` can be logged in background for MergeTree tables. This fixes [#17613](https://github.com/ClickHouse/ClickHouse/issues/17613). [#17615](https://github.com/ClickHouse/ClickHouse/pull/17615) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* When clickhouse-client is used in interactive mode with multiline queries, single line comment was erronously extended till the end of query. This fixes [#13654](https://github.com/ClickHouse/ClickHouse/issues/13654). [#17565](https://github.com/ClickHouse/ClickHouse/pull/17565) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix alter query hang when the corresponding mutation was killed on the different replica. Fixes [#16953](https://github.com/ClickHouse/ClickHouse/issues/16953). [#17499](https://github.com/ClickHouse/ClickHouse/pull/17499) ([alesapin](https://github.com/alesapin)).
+* Fix issue when mark cache size was underestimated by clickhouse. It may happen when there are a lot of tiny files with marks. [#17496](https://github.com/ClickHouse/ClickHouse/pull/17496) ([alesapin](https://github.com/alesapin)).
+* Fix `ORDER BY` with enabled setting `optimize_redundant_functions_in_order_by`. [#17471](https://github.com/ClickHouse/ClickHouse/pull/17471) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix duplicates after `DISTINCT` which were possible because of incorrect optimization. Fixes [#17294](https://github.com/ClickHouse/ClickHouse/issues/17294). [#17296](https://github.com/ClickHouse/ClickHouse/pull/17296) ([li chengxiang](https://github.com/chengxianglibra)). [#17439](https://github.com/ClickHouse/ClickHouse/pull/17439) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix crash while reading from `JOIN` table with `LowCardinality` types. Fixes [#17228](https://github.com/ClickHouse/ClickHouse/issues/17228). [#17397](https://github.com/ClickHouse/ClickHouse/pull/17397) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* fix `toInt256(inf)` stack overflow. Int256 is an experimental feature. Closed [#17235](https://github.com/ClickHouse/ClickHouse/issues/17235). [#17257](https://github.com/ClickHouse/ClickHouse/pull/17257) ([flynn](https://github.com/ucasFL)).
+* Fix possible `Unexpected packet Data received from client` error logged for Distributed queries with `LIMIT`. [#17254](https://github.com/ClickHouse/ClickHouse/pull/17254) ([Azat Khuzhin](https://github.com/azat)).
+* Fix set index invalidation when there are const columns in the subquery. This fixes [#17246](https://github.com/ClickHouse/ClickHouse/issues/17246). [#17249](https://github.com/ClickHouse/ClickHouse/pull/17249) ([Amos Bird](https://github.com/amosbird)).
+* Fix possible wrong index analysis when the types of the index comparison are different. This fixes [#17122](https://github.com/ClickHouse/ClickHouse/issues/17122). [#17145](https://github.com/ClickHouse/ClickHouse/pull/17145) ([Amos Bird](https://github.com/amosbird)).
+* Fix ColumnConst comparison which leads to crash. This fixed [#17088](https://github.com/ClickHouse/ClickHouse/issues/17088) . [#17135](https://github.com/ClickHouse/ClickHouse/pull/17135) ([Amos Bird](https://github.com/amosbird)).
+* Multiple fixed for MaterializeMySQL (experimental feature). Fixes [#16923](https://github.com/ClickHouse/ClickHouse/issues/16923) Fixes [#15883](https://github.com/ClickHouse/ClickHouse/issues/15883) Fix MaterializeMySQL SYNC failure when the modify MySQL binlog_checksum. [#17091](https://github.com/ClickHouse/ClickHouse/pull/17091) ([Winter Zhang](https://github.com/zhang2014)).
+* Fix bug when `ON CLUSTER` queries may hang forever for non-leader ReplicatedMergeTreeTables. [#17089](https://github.com/ClickHouse/ClickHouse/pull/17089) ([alesapin](https://github.com/alesapin)).
+* Fixed crash on `CREATE TABLE ... AS some_table` query when `some_table` was created `AS table_function()` Fixes [#16944](https://github.com/ClickHouse/ClickHouse/issues/16944). [#17072](https://github.com/ClickHouse/ClickHouse/pull/17072) ([tavplubix](https://github.com/tavplubix)).
+* Bug unfinished implementation for funciton fuzzBits, related issue: [#16980](https://github.com/ClickHouse/ClickHouse/issues/16980). [#17051](https://github.com/ClickHouse/ClickHouse/pull/17051) ([hexiaoting](https://github.com/hexiaoting)).
+* Fix LLVM's libunwind in the case when CFA register is RAX. This is the [bug](https://bugs.llvm.org/show_bug.cgi?id=48186) in [LLVM's libunwind](https://github.com/llvm/llvm-project/tree/master/libunwind). We already have workarounds for this bug. [#17046](https://github.com/ClickHouse/ClickHouse/pull/17046) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Avoid unnecessary network errors for remote queries which may be cancelled while execution, like queries with `LIMIT`. [#17006](https://github.com/ClickHouse/ClickHouse/pull/17006) ([Azat Khuzhin](https://github.com/azat)).
+* Fix `optimize_distributed_group_by_sharding_key` setting (that is disabled by default) for query with OFFSET only. [#16996](https://github.com/ClickHouse/ClickHouse/pull/16996) ([Azat Khuzhin](https://github.com/azat)).
+* Fix for Merge tables over Distributed tables with JOIN. [#16993](https://github.com/ClickHouse/ClickHouse/pull/16993) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed wrong result in big integers (128, 256 bit) when casting from double. Big integers support is experimental. [#16986](https://github.com/ClickHouse/ClickHouse/pull/16986) ([Mike](https://github.com/myrrc)).
+* Fix possible server crash after `ALTER TABLE ... MODIFY COLUMN ... NewType` when `SELECT` have `WHERE` expression on altering column and alter doesn't finished yet. [#16968](https://github.com/ClickHouse/ClickHouse/pull/16968) ([Amos Bird](https://github.com/amosbird)).
+* Blame info was not calculated correctly in `clickhouse-git-import`. [#16959](https://github.com/ClickHouse/ClickHouse/pull/16959) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix order by optimization with monotonous functions. Fixes [#16107](https://github.com/ClickHouse/ClickHouse/issues/16107). [#16956](https://github.com/ClickHouse/ClickHouse/pull/16956) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix optimization of group by with enabled setting `optimize_aggregators_of_group_by_keys` and joins. Fixes [#12604](https://github.com/ClickHouse/ClickHouse/issues/12604). [#16951](https://github.com/ClickHouse/ClickHouse/pull/16951) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix possible error `Illegal type of argument` for queries with `ORDER BY`. Fixes [#16580](https://github.com/ClickHouse/ClickHouse/issues/16580). [#16928](https://github.com/ClickHouse/ClickHouse/pull/16928) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix strange code in InterpreterShowAccessQuery. [#16866](https://github.com/ClickHouse/ClickHouse/pull/16866) ([tavplubix](https://github.com/tavplubix)).
+* Prevent clickhouse server crashes when using the function `timeSeriesGroupSum`. The function is removed from newer ClickHouse releases. [#16865](https://github.com/ClickHouse/ClickHouse/pull/16865) ([filimonov](https://github.com/filimonov)).
+* Fix rare silent crashes when query profiler is on and ClickHouse is installed on OS with glibc version that has (supposedly) broken asynchronous unwind tables for some functions. This fixes [#15301](https://github.com/ClickHouse/ClickHouse/issues/15301). This fixes [#13098](https://github.com/ClickHouse/ClickHouse/issues/13098). [#16846](https://github.com/ClickHouse/ClickHouse/pull/16846) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix crash when using `any` without any arguments. This is for [#16803](https://github.com/ClickHouse/ClickHouse/issues/16803) . cc @azat. [#16826](https://github.com/ClickHouse/ClickHouse/pull/16826) ([Amos Bird](https://github.com/amosbird)).
+* If no memory can be allocated while writing table metadata on disk, broken metadata file can be written. [#16772](https://github.com/ClickHouse/ClickHouse/pull/16772) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix trivial query optimization with partition predicate. [#16767](https://github.com/ClickHouse/ClickHouse/pull/16767) ([Azat Khuzhin](https://github.com/azat)).
+* Fix `IN` operator over several columns and tuples with enabled `transform_null_in` setting. Fixes [#15310](https://github.com/ClickHouse/ClickHouse/issues/15310). [#16722](https://github.com/ClickHouse/ClickHouse/pull/16722) ([Anton Popov](https://github.com/CurtizJ)).
+* Return number of affected rows for INSERT queries via MySQL protocol. Previously ClickHouse used to always return 0, it's fixed. Fixes [#16605](https://github.com/ClickHouse/ClickHouse/issues/16605). [#16715](https://github.com/ClickHouse/ClickHouse/pull/16715) ([Winter Zhang](https://github.com/zhang2014)).
+* Fix remote query failure when using 'if' suffix aggregate function. Fixes [#16574](https://github.com/ClickHouse/ClickHouse/issues/16574) Fixes [#16231](https://github.com/ClickHouse/ClickHouse/issues/16231) [#16610](https://github.com/ClickHouse/ClickHouse/pull/16610) ([Winter Zhang](https://github.com/zhang2014)).
+* Fix inconsistent behavior caused by `select_sequential_consistency` for optimized trivial count query and system.tables. [#16309](https://github.com/ClickHouse/ClickHouse/pull/16309) ([Hao Chen](https://github.com/haoch)).
+
+#### Improvement
+
+* Remove empty parts after they were pruned by TTL, mutation, or collapsing merge algorithm. [#16895](https://github.com/ClickHouse/ClickHouse/pull/16895) ([Anton Popov](https://github.com/CurtizJ)).
+* Enable compact format of directories for asynchronous sends in Distributed tables: `use_compact_format_in_distributed_parts_names` is set to 1 by default. [#16788](https://github.com/ClickHouse/ClickHouse/pull/16788) ([Azat Khuzhin](https://github.com/azat)).
+* Abort multipart upload if no data was written to S3. [#16840](https://github.com/ClickHouse/ClickHouse/pull/16840) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Reresolve the IP of the `format_avro_schema_registry_url` in case of errors. [#16985](https://github.com/ClickHouse/ClickHouse/pull/16985) ([filimonov](https://github.com/filimonov)).
+* Mask password in data_path in the system.distribution_queue. [#16727](https://github.com/ClickHouse/ClickHouse/pull/16727) ([Azat Khuzhin](https://github.com/azat)).
+* Throw error when use column transformer replaces non existing column. [#16183](https://github.com/ClickHouse/ClickHouse/pull/16183) ([hexiaoting](https://github.com/hexiaoting)).
+* Turn off parallel parsing when there is no enough memory for all threads to work simultaneously. Also there could be exceptions like "Memory limit exceeded" when somebody will try to insert extremely huge rows (> min_chunk_bytes_for_parallel_parsing), because each piece to parse has to be independent set of strings (one or more). [#16721](https://github.com/ClickHouse/ClickHouse/pull/16721) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Install script should always create subdirs in config folders. This is only relevant for Docker build with custom config. [#16936](https://github.com/ClickHouse/ClickHouse/pull/16936) ([filimonov](https://github.com/filimonov)).
+* Correct grammar in error message in JSONEachRow, JSONCompactEachRow, and RegexpRow input formats. [#17205](https://github.com/ClickHouse/ClickHouse/pull/17205) ([nico piderman](https://github.com/sneako)).
+* Set default `host` and `port` parameters for `SOURCE(CLICKHOUSE(...))` to current instance and set default `user` value to `'default'`. [#16997](https://github.com/ClickHouse/ClickHouse/pull/16997) ([vdimir](https://github.com/vdimir)).
+* Throw an informative error message when doing `ATTACH/DETACH TABLE <DICTIONARY>`. Before this PR, `detach table <dict>` works but leads to an ill-formed in-memory metadata. [#16885](https://github.com/ClickHouse/ClickHouse/pull/16885) ([Amos Bird](https://github.com/amosbird)).
+* Add cutToFirstSignificantSubdomainWithWWW(). [#16845](https://github.com/ClickHouse/ClickHouse/pull/16845) ([Azat Khuzhin](https://github.com/azat)).
+* Server refused to startup with exception message if wrong config is given (`metric_log`.`collect_interval_milliseconds` is missing). [#16815](https://github.com/ClickHouse/ClickHouse/pull/16815) ([Ivan](https://github.com/abyss7)).
+* Better exception message when configuration for distributed DDL is absent. This fixes [#5075](https://github.com/ClickHouse/ClickHouse/issues/5075). [#16769](https://github.com/ClickHouse/ClickHouse/pull/16769) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Usability improvement: better suggestions in syntax error message when `CODEC` expression is misplaced in `CREATE TABLE` query. This fixes [#12493](https://github.com/ClickHouse/ClickHouse/issues/12493). [#16768](https://github.com/ClickHouse/ClickHouse/pull/16768) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Remove empty directories for async INSERT at start of Distributed engine. [#16729](https://github.com/ClickHouse/ClickHouse/pull/16729) ([Azat Khuzhin](https://github.com/azat)).
+* Workaround for use S3 with nginx server as proxy. Nginx currenty does not accept urls with empty path like `http://domain.com?delete`, but vanilla aws-sdk-cpp produces this kind of urls. This commit uses patched aws-sdk-cpp version, which makes urls with "/" as path in this cases, like `http://domain.com/?delete`. [#16709](https://github.com/ClickHouse/ClickHouse/pull/16709) ([ianton-ru](https://github.com/ianton-ru)).
+* Allow `reinterpretAs*` functions to work for integers and floats of the same size. Implements [16640](https://github.com/ClickHouse/ClickHouse/issues/16640). [#16657](https://github.com/ClickHouse/ClickHouse/pull/16657) ([flynn](https://github.com/ucasFL)).
+* Now, `<auxiliary_zookeepers>` configuration can be changed in `config.xml` and reloaded without server startup. [#16627](https://github.com/ClickHouse/ClickHouse/pull/16627) ([Amos Bird](https://github.com/amosbird)).
+* Support SNI in https connections to remote resources. This will allow to connect to Cloudflare servers that require SNI. This fixes [#10055](https://github.com/ClickHouse/ClickHouse/issues/10055). [#16252](https://github.com/ClickHouse/ClickHouse/pull/16252) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Make it possible to connect to `clickhouse-server` secure endpoint which requires SNI. This is possible when `clickhouse-server` is hosted behind TLS proxy. [#16938](https://github.com/ClickHouse/ClickHouse/pull/16938) ([filimonov](https://github.com/filimonov)).
+* Fix possible stack overflow if a loop of materialized views is created. This closes [#15732](https://github.com/ClickHouse/ClickHouse/issues/15732). [#16048](https://github.com/ClickHouse/ClickHouse/pull/16048) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Simplify the implementation of background tasks processing for the MergeTree table engines family. There should be no visible changes for user. [#15983](https://github.com/ClickHouse/ClickHouse/pull/15983) ([alesapin](https://github.com/alesapin)).
+* Improvement for MaterializeMySQL (experimental feature). Throw exception about right sync privileges when MySQL sync user has error privileges. [#15977](https://github.com/ClickHouse/ClickHouse/pull/15977) ([TCeason](https://github.com/TCeason)).
+* Made `indexOf()` use BloomFilter. [#14977](https://github.com/ClickHouse/ClickHouse/pull/14977) ([achimbab](https://github.com/achimbab)).
+
+#### Performance Improvement
+
+* Use Floyd-Rivest algorithm, it is the best for the ClickHouse use case of partial sorting. Bechmarks are in https://github.com/danlark1/miniselect and [here](https://drive.google.com/drive/folders/1DHEaeXgZuX6AJ9eByeZ8iQVQv0ueP8XM). [#16825](https://github.com/ClickHouse/ClickHouse/pull/16825) ([Danila Kutenin](https://github.com/danlark1)).
+* Now `ReplicatedMergeTree` tree engines family uses a separate thread pool for replicated fetches. Size of the pool limited by setting `background_fetches_pool_size` which can be tuned with a server restart. The default value of the setting is 3 and it means that the maximum amount of parallel fetches is equal to 3 (and it allows to utilize 10G network). Fixes #520. [#16390](https://github.com/ClickHouse/ClickHouse/pull/16390) ([alesapin](https://github.com/alesapin)).
+* Fixed uncontrolled growth of the state of `quantileTDigest`. [#16680](https://github.com/ClickHouse/ClickHouse/pull/16680) ([hrissan](https://github.com/hrissan)).
+* Add `VIEW` subquery description to `EXPLAIN`. Limit push down optimisation for `VIEW`. Add local replicas of `Distributed` to query plan. [#14936](https://github.com/ClickHouse/ClickHouse/pull/14936) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix optimize_read_in_order/optimize_aggregation_in_order with max_threads > 0 and expression in ORDER BY. [#16637](https://github.com/ClickHouse/ClickHouse/pull/16637) ([Azat Khuzhin](https://github.com/azat)).
+* Fix performance of reading from `Merge` tables over huge number of `MergeTree` tables. Fixes [#7748](https://github.com/ClickHouse/ClickHouse/issues/7748). [#16988](https://github.com/ClickHouse/ClickHouse/pull/16988) ([Anton Popov](https://github.com/CurtizJ)).
+* Now we can safely prune partitions with exact match. Useful case: Suppose table is partitioned by `intHash64(x) % 100` and the query has condition on `intHash64(x) % 100` verbatim, not on x. [#16253](https://github.com/ClickHouse/ClickHouse/pull/16253) ([Amos Bird](https://github.com/amosbird)).
+
+#### Experimental Feature
+
+* Add `EmbeddedRocksDB` table engine (can be used for dictionaries). [#15073](https://github.com/ClickHouse/ClickHouse/pull/15073) ([sundyli](https://github.com/sundy-li)).
+
+#### Build/Testing/Packaging Improvement
+
+* Improvements in test coverage building images. [#17233](https://github.com/ClickHouse/ClickHouse/pull/17233) ([alesapin](https://github.com/alesapin)).
+* Update embedded timezone data to version 2020d (also update cctz to the latest master). [#17204](https://github.com/ClickHouse/ClickHouse/pull/17204) ([filimonov](https://github.com/filimonov)).
+* Fix UBSan report in Poco. This closes [#12719](https://github.com/ClickHouse/ClickHouse/issues/12719). [#16765](https://github.com/ClickHouse/ClickHouse/pull/16765) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Do not instrument 3rd-party libraries with UBSan. [#16764](https://github.com/ClickHouse/ClickHouse/pull/16764) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix UBSan report in cache dictionaries. This closes [#12641](https://github.com/ClickHouse/ClickHouse/issues/12641). [#16763](https://github.com/ClickHouse/ClickHouse/pull/16763) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix UBSan report when trying to convert infinite floating point number to integer. This closes [#14190](https://github.com/ClickHouse/ClickHouse/issues/14190). [#16677](https://github.com/ClickHouse/ClickHouse/pull/16677) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+
+
+## ClickHouse release 20.11
+
+### ClickHouse release v20.11.6.6-stable, 2020-12-24
+
+#### Bug Fix
+
+* Fixed issue when `clickhouse-odbc-bridge` process is unreachable by server on machines with dual `IPv4/IPv6 stack` and fixed issue when ODBC dictionary updates are performed using malformed queries and/or cause crashes. This possibly closes [#14489](https://github.com/ClickHouse/ClickHouse/issues/14489). [#18278](https://github.com/ClickHouse/ClickHouse/pull/18278) ([Denis Glazachev](https://github.com/traceon)).
+* Fixed key comparison between Enum and Int types. This fixes [#17989](https://github.com/ClickHouse/ClickHouse/issues/17989). [#18214](https://github.com/ClickHouse/ClickHouse/pull/18214) ([Amos Bird](https://github.com/amosbird)).
+* Fixed unique key convert crash in `MaterializeMySQL` database engine. This fixes [#18186](https://github.com/ClickHouse/ClickHouse/issues/18186) and fixes [#16372](https://github.com/ClickHouse/ClickHouse/issues/16372)  [#18211](https://github.com/ClickHouse/ClickHouse/pull/18211) ([Winter Zhang](https://github.com/zhang2014)).
+* Fixed `std::out_of_range: basic_string` in S3 URL parsing. [#18059](https://github.com/ClickHouse/ClickHouse/pull/18059) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Fixed the issue when some tables not synchronized to ClickHouse from MySQL caused by the fact that convertion MySQL prefix index wasn't supported for MaterializeMySQL. This fixes [#15187](https://github.com/ClickHouse/ClickHouse/issues/15187) and fixes [#17912](https://github.com/ClickHouse/ClickHouse/issues/17912)  [#17944](https://github.com/ClickHouse/ClickHouse/pull/17944) ([Winter Zhang](https://github.com/zhang2014)).
+* Fixed the issue when query optimization was producing wrong result if query contains `ARRAY JOIN`. [#17887](https://github.com/ClickHouse/ClickHouse/pull/17887) ([sundyli](https://github.com/sundy-li)).
+* Fix possible segfault in `topK` aggregate function. This closes [#17404](https://github.com/ClickHouse/ClickHouse/issues/17404). [#17845](https://github.com/ClickHouse/ClickHouse/pull/17845) ([Maksim Kita](https://github.com/kitaisreal)).
+* Do not restore parts from WAL if `in_memory_parts_enable_wal` is disabled. [#17802](https://github.com/ClickHouse/ClickHouse/pull/17802) ([detailyang](https://github.com/detailyang)).
+* Fixed problem when ClickHouse fails to resume connection to MySQL servers. [#17681](https://github.com/ClickHouse/ClickHouse/pull/17681) ([Alexander Kazakov](https://github.com/Akazz)).
+* Fixed inconsistent behaviour of `optimize_trivial_count_query` with partition predicate. [#17644](https://github.com/ClickHouse/ClickHouse/pull/17644) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed empty `system.stack_trace` table when server is running in daemon mode. [#17630](https://github.com/ClickHouse/ClickHouse/pull/17630) ([Amos Bird](https://github.com/amosbird)).
+* Fixed the behaviour when xxception `fmt::v7::format_error` can be logged in background for MergeTree tables. This fixes [#17613](https://github.com/ClickHouse/ClickHouse/issues/17613). [#17615](https://github.com/ClickHouse/ClickHouse/pull/17615) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed the behaviour when clickhouse-client is used in interactive mode with multiline queries and single line comment was erronously extended till the end of query. This fixes [#13654](https://github.com/ClickHouse/ClickHouse/issues/13654). [#17565](https://github.com/ClickHouse/ClickHouse/pull/17565) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed the issue when server can stop accepting connections in very rare cases. [#17542](https://github.com/ClickHouse/ClickHouse/pull/17542) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed alter query hang when the corresponding mutation was killed on the different replica. This fixes [#16953](https://github.com/ClickHouse/ClickHouse/issues/16953). [#17499](https://github.com/ClickHouse/ClickHouse/pull/17499) ([alesapin](https://github.com/alesapin)).
+* Fixed bug when mark cache size was underestimated by clickhouse. It may happen when there are a lot of tiny files with marks. [#17496](https://github.com/ClickHouse/ClickHouse/pull/17496) ([alesapin](https://github.com/alesapin)).
+* Fixed `ORDER BY` with enabled setting `optimize_redundant_functions_in_order_by`. [#17471](https://github.com/ClickHouse/ClickHouse/pull/17471) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed duplicates after `DISTINCT` which were possible because of incorrect optimization. This fixes [#17294](https://github.com/ClickHouse/ClickHouse/issues/17294). [#17296](https://github.com/ClickHouse/ClickHouse/pull/17296) ([li chengxiang](https://github.com/chengxianglibra)). [#17439](https://github.com/ClickHouse/ClickHouse/pull/17439) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed crash while reading from `JOIN` table with `LowCardinality` types. This fixes [#17228](https://github.com/ClickHouse/ClickHouse/issues/17228). [#17397](https://github.com/ClickHouse/ClickHouse/pull/17397) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed set index invalidation when there are const columns in the subquery. This fixes [#17246](https://github.com/ClickHouse/ClickHouse/issues/17246) . [#17249](https://github.com/ClickHouse/ClickHouse/pull/17249) ([Amos Bird](https://github.com/amosbird)).
+* Fixed possible wrong index analysis when the types of the index comparison are different. This fixes [#17122](https://github.com/ClickHouse/ClickHouse/issues/17122). [#17145](https://github.com/ClickHouse/ClickHouse/pull/17145) ([Amos Bird](https://github.com/amosbird)).
+* Fixed `ColumnConst` comparison which leads to crash. This fixes [#17088](https://github.com/ClickHouse/ClickHouse/issues/17088) . [#17135](https://github.com/ClickHouse/ClickHouse/pull/17135) ([Amos Bird](https://github.com/amosbird)).
+* Fixed bug when `ON CLUSTER` queries may hang forever for non-leader `ReplicatedMergeTreeTables`. [#17089](https://github.com/ClickHouse/ClickHouse/pull/17089) ([alesapin](https://github.com/alesapin)).
+* Fixed fuzzer-found bug in funciton `fuzzBits`. This fixes [#16980](https://github.com/ClickHouse/ClickHouse/issues/16980). [#17051](https://github.com/ClickHouse/ClickHouse/pull/17051) ([hexiaoting](https://github.com/hexiaoting)).
+* Avoid unnecessary network errors for remote queries which may be cancelled while execution, like queries with `LIMIT`. [#17006](https://github.com/ClickHouse/ClickHouse/pull/17006) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed wrong result in big integers (128, 256 bit) when casting from double. [#16986](https://github.com/ClickHouse/ClickHouse/pull/16986) ([Mike](https://github.com/myrrc)).
+* Reresolve the IP of the `format_avro_schema_registry_url` in case of errors. [#16985](https://github.com/ClickHouse/ClickHouse/pull/16985) ([filimonov](https://github.com/filimonov)).
+* Fixed possible server crash after `ALTER TABLE ... MODIFY COLUMN ... NewType` when `SELECT` have `WHERE` expression on altering column and alter doesn't finished yet. [#16968](https://github.com/ClickHouse/ClickHouse/pull/16968) ([Amos Bird](https://github.com/amosbird)).
+* Blame info was not calculated correctly in `clickhouse-git-import`. [#16959](https://github.com/ClickHouse/ClickHouse/pull/16959) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed order by optimization with monotonous functions. Fixes [#16107](https://github.com/ClickHouse/ClickHouse/issues/16107). [#16956](https://github.com/ClickHouse/ClickHouse/pull/16956) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed optimization of group by with enabled setting `optimize_aggregators_of_group_by_keys` and joins. This fixes [#12604](https://github.com/ClickHouse/ClickHouse/issues/12604). [#16951](https://github.com/ClickHouse/ClickHouse/pull/16951) ([Anton Popov](https://github.com/CurtizJ)).
+* Install script should always create subdirs in config folders. This is only relevant for Docker build with custom config. [#16936](https://github.com/ClickHouse/ClickHouse/pull/16936) ([filimonov](https://github.com/filimonov)).
+* Fixed possible error `Illegal type of argument` for queries with `ORDER BY`. This fixes [#16580](https://github.com/ClickHouse/ClickHouse/issues/16580). [#16928](https://github.com/ClickHouse/ClickHouse/pull/16928) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Abort multipart upload if no data was written to WriteBufferFromS3. [#16840](https://github.com/ClickHouse/ClickHouse/pull/16840) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Fixed crash when using `any` without any arguments. This fixes [#16803](https://github.com/ClickHouse/ClickHouse/issues/16803). [#16826](https://github.com/ClickHouse/ClickHouse/pull/16826) ([Amos Bird](https://github.com/amosbird)).
+* Fixed the behaviour when ClickHouse used to always return 0 insted of a number of affected rows for `INSERT` queries via MySQL protocol. This fixes [#16605](https://github.com/ClickHouse/ClickHouse/issues/16605). [#16715](https://github.com/ClickHouse/ClickHouse/pull/16715) ([Winter Zhang](https://github.com/zhang2014)).
+* Fixed uncontrolled growth of TDigest. [#16680](https://github.com/ClickHouse/ClickHouse/pull/16680) ([hrissan](https://github.com/hrissan)).
+* Fixed remote query failure when using suffix `if` in Aggregate function. This fixes [#16574](https://github.com/ClickHouse/ClickHouse/issues/16574) fixes [#16231](https://github.com/ClickHouse/ClickHouse/issues/16231) [#16610](https://github.com/ClickHouse/ClickHouse/pull/16610) ([Winter Zhang](https://github.com/zhang2014)).
+* Fixed inconsistent behavior caused by `select_sequential_consistency` for optimized trivial count query and system.tables. [#16309](https://github.com/ClickHouse/ClickHouse/pull/16309) ([Hao Chen](https://github.com/haoch)).
+* Throw error when use ColumnTransformer replace non exist column. [#16183](https://github.com/ClickHouse/ClickHouse/pull/16183) ([hexiaoting](https://github.com/hexiaoting)).
+
+
+### ClickHouse release v20.11.3.3-stable, 2020-11-13
+
+#### Bug Fix
+
+* Fix rare silent crashes when query profiler is on and ClickHouse is installed on OS with glibc version that has (supposedly) broken asynchronous unwind tables for some functions. This fixes [#15301](https://github.com/ClickHouse/ClickHouse/issues/15301). This fixes [#13098](https://github.com/ClickHouse/ClickHouse/issues/13098). [#16846](https://github.com/ClickHouse/ClickHouse/pull/16846) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+
+
+### ClickHouse release v20.11.2.1, 2020-11-11
+
+#### Backward Incompatible Change
+
+* If some `profile` was specified in `distributed_ddl` config section, then this profile could overwrite settings of `default` profile on server startup. It's fixed, now settings of distributed DDL queries should not affect global server settings. [#16635](https://github.com/ClickHouse/ClickHouse/pull/16635) ([tavplubix](https://github.com/tavplubix)).
+* Restrict to use of non-comparable data types (like `AggregateFunction`) in keys (Sorting key, Primary key, Partition key, and so on). [#16601](https://github.com/ClickHouse/ClickHouse/pull/16601) ([alesapin](https://github.com/alesapin)).
+* Remove `ANALYZE` and `AST` queries, and make the setting `enable_debug_queries` obsolete since now it is the part of full featured `EXPLAIN` query. [#16536](https://github.com/ClickHouse/ClickHouse/pull/16536) ([Ivan](https://github.com/abyss7)).
+* Aggregate functions `boundingRatio`, `rankCorr`, `retention`, `timeSeriesGroupSum`, `timeSeriesGroupRateSum`, `windowFunnel` were erroneously made case-insensitive. Now their names are made case sensitive as designed. Only functions that are specified in SQL standard or made for compatibility with other DBMS or functions similar to those should be case-insensitive. [#16407](https://github.com/ClickHouse/ClickHouse/pull/16407) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Make `rankCorr` function return nan on insufficient data [#16124](https://github.com/ClickHouse/ClickHouse/issues/16124). [#16135](https://github.com/ClickHouse/ClickHouse/pull/16135) ([hexiaoting](https://github.com/hexiaoting)).
+* When upgrading from versions older than 20.5, if rolling update is performed and cluster contains both versions 20.5 or greater and less than 20.5, if ClickHouse nodes with old versions are restarted and old version has been started up in presence of newer versions, it may lead to `Part ... intersects previous part` errors. To prevent this error, first install newer clickhouse-server packages on all cluster nodes and then do restarts (so, when clickhouse-server is restarted, it will start up with the new version).
+
+#### New Feature
+
+* Added support of LDAP as a user directory for locally non-existent users. [#12736](https://github.com/ClickHouse/ClickHouse/pull/12736) ([Denis Glazachev](https://github.com/traceon)).
+* Add `system.replicated_fetches` table which shows currently running background fetches. [#16428](https://github.com/ClickHouse/ClickHouse/pull/16428) ([alesapin](https://github.com/alesapin)).
+* Added setting `date_time_output_format`. [#15845](https://github.com/ClickHouse/ClickHouse/pull/15845) ([Maksim Kita](https://github.com/kitaisreal)).
+* Added minimal web UI to ClickHouse. [#16158](https://github.com/ClickHouse/ClickHouse/pull/16158) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Allows to read/write Single protobuf message at once (w/o length-delimiters). [#15199](https://github.com/ClickHouse/ClickHouse/pull/15199) ([filimonov](https://github.com/filimonov)).
+* Added initial OpenTelemetry support. ClickHouse now accepts OpenTelemetry traceparent headers over Native and HTTP protocols, and passes them downstream in some cases. The trace spans for executed queries are saved into the `system.opentelemetry_span_log` table. [#14195](https://github.com/ClickHouse/ClickHouse/pull/14195) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Allow specify primary key in column list of `CREATE TABLE` query. This is needed for compatibility with other SQL dialects. [#15823](https://github.com/ClickHouse/ClickHouse/pull/15823) ([Maksim Kita](https://github.com/kitaisreal)).
+* Implement `OFFSET offset_row_count {ROW | ROWS} FETCH {FIRST | NEXT} fetch_row_count {ROW | ROWS} {ONLY | WITH TIES}` in SELECT query with ORDER BY. This is the SQL-standard way to specify `LIMIT`. [#15855](https://github.com/ClickHouse/ClickHouse/pull/15855) ([hexiaoting](https://github.com/hexiaoting)).
+* `errorCodeToName` function - return variable name of the error (useful for analyzing query_log and similar). `system.errors` table - shows how many times errors has been happened (respects `system_events_show_zero_values`). [#16438](https://github.com/ClickHouse/ClickHouse/pull/16438) ([Azat Khuzhin](https://github.com/azat)).
+* Added function `untuple` which is a special function which can introduce new columns to the SELECT list by expanding a named tuple. [#16242](https://github.com/ClickHouse/ClickHouse/pull/16242) ([Nikolai Kochetov](https://github.com/KochetovNicolai), [Amos Bird](https://github.com/amosbird)).
+* Now we can provide identifiers via query parameters. And these parameters can be used as table objects or columns. [#16594](https://github.com/ClickHouse/ClickHouse/pull/16594) ([Amos Bird](https://github.com/amosbird)).
+* Added big integers (UInt256, Int128, Int256) and UUID data types support for MergeTree BloomFilter index. Big integers is an experimental feature. [#16642](https://github.com/ClickHouse/ClickHouse/pull/16642) ([Maksim Kita](https://github.com/kitaisreal)).
+* Add `farmFingerprint64` function (non-cryptographic string hashing). [#16570](https://github.com/ClickHouse/ClickHouse/pull/16570) ([Jacob Hayes](https://github.com/JacobHayes)).
+* Add `log_queries_min_query_duration_ms`, only queries slower than the value of this setting will go to `query_log`/`query_thread_log` (i.e. something like `slow_query_log` in mysql). [#16529](https://github.com/ClickHouse/ClickHouse/pull/16529) ([Azat Khuzhin](https://github.com/azat)).
+* Ability to create a docker image on the top of `Alpine`. Uses precompiled binary and glibc components from ubuntu 20.04. [#16479](https://github.com/ClickHouse/ClickHouse/pull/16479) ([filimonov](https://github.com/filimonov)).
+* Added `toUUIDOrNull`, `toUUIDOrZero` cast functions. [#16337](https://github.com/ClickHouse/ClickHouse/pull/16337) ([Maksim Kita](https://github.com/kitaisreal)).
+* Add `max_concurrent_queries_for_all_users` setting, see [#6636](https://github.com/ClickHouse/ClickHouse/issues/6636) for use cases. [#16154](https://github.com/ClickHouse/ClickHouse/pull/16154) ([nvartolomei](https://github.com/nvartolomei)).
+* Add a new option `print_query_id` to clickhouse-client. It helps generate arbitrary strings with the current query id generated by the client. Also print query id in clickhouse-client by default. [#15809](https://github.com/ClickHouse/ClickHouse/pull/15809) ([Amos Bird](https://github.com/amosbird)).
+* Add `tid` and `logTrace` functions. This closes [#9434](https://github.com/ClickHouse/ClickHouse/issues/9434). [#15803](https://github.com/ClickHouse/ClickHouse/pull/15803) ([flynn](https://github.com/ucasFL)).
+* Add function `formatReadableTimeDelta` that format time delta to human readable string ... [#15497](https://github.com/ClickHouse/ClickHouse/pull/15497) ([Filipe Caixeta](https://github.com/filipecaixeta)).
+* Added `disable_merges` option for volumes in multi-disk configuration. [#13956](https://github.com/ClickHouse/ClickHouse/pull/13956) ([Vladimir Chebotarev](https://github.com/excitoon)).
+
+#### Experimental Feature
+
+* New functions `encrypt`, `aes_encrypt_mysql`, `decrypt`, `aes_decrypt_mysql`. These functions are working slowly, so we consider it as an experimental feature. [#11844](https://github.com/ClickHouse/ClickHouse/pull/11844) ([Vasily Nemkov](https://github.com/Enmk)).
+
+#### Bug Fix
+
+* Mask password in data_path in the `system.distribution_queue`. [#16727](https://github.com/ClickHouse/ClickHouse/pull/16727) ([Azat Khuzhin](https://github.com/azat)).
+* Fix `IN` operator over several columns and tuples with enabled `transform_null_in` setting. Fixes [#15310](https://github.com/ClickHouse/ClickHouse/issues/15310). [#16722](https://github.com/ClickHouse/ClickHouse/pull/16722) ([Anton Popov](https://github.com/CurtizJ)).
+* The setting `max_parallel_replicas` worked incorrectly if the queried table has no sampling. This fixes [#5733](https://github.com/ClickHouse/ClickHouse/issues/5733). [#16675](https://github.com/ClickHouse/ClickHouse/pull/16675) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix optimize_read_in_order/optimize_aggregation_in_order with max_threads > 0 and expression in ORDER BY. [#16637](https://github.com/ClickHouse/ClickHouse/pull/16637) ([Azat Khuzhin](https://github.com/azat)).
+* Calculation of `DEFAULT` expressions was involving possible name collisions (that was very unlikely to encounter). This fixes [#9359](https://github.com/ClickHouse/ClickHouse/issues/9359). [#16612](https://github.com/ClickHouse/ClickHouse/pull/16612) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix `query_thread_log.query_duration_ms` unit. [#16563](https://github.com/ClickHouse/ClickHouse/pull/16563) ([Azat Khuzhin](https://github.com/azat)).
+* Fix a bug when using MySQL Master -> MySQL Slave -> ClickHouse MaterializeMySQL Engine. `MaterializeMySQL` is an experimental feature. [#16504](https://github.com/ClickHouse/ClickHouse/pull/16504) ([TCeason](https://github.com/TCeason)).
+* Specifically crafted argument of `round` function with `Decimal` was leading to integer division by zero. This fixes [#13338](https://github.com/ClickHouse/ClickHouse/issues/13338). [#16451](https://github.com/ClickHouse/ClickHouse/pull/16451) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix DROP TABLE for Distributed (racy with INSERT). [#16409](https://github.com/ClickHouse/ClickHouse/pull/16409) ([Azat Khuzhin](https://github.com/azat)).
+* Fix processing of very large entries in replication queue. Very large entries may appear in ALTER queries if table structure is extremely large (near 1 MB). This fixes [#16307](https://github.com/ClickHouse/ClickHouse/issues/16307). [#16332](https://github.com/ClickHouse/ClickHouse/pull/16332) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed the inconsistent behaviour when a part of return data could be dropped because the set for its filtration wasn't created. [#16308](https://github.com/ClickHouse/ClickHouse/pull/16308) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fix dictGet in sharding_key (and similar places, i.e. when the function context is stored permanently). [#16205](https://github.com/ClickHouse/ClickHouse/pull/16205) ([Azat Khuzhin](https://github.com/azat)).
+* Fix the exception thrown in `clickhouse-local` when trying to execute `OPTIMIZE` command. Fixes [#16076](https://github.com/ClickHouse/ClickHouse/issues/16076). [#16192](https://github.com/ClickHouse/ClickHouse/pull/16192) ([filimonov](https://github.com/filimonov)).
+* Fixes [#15780](https://github.com/ClickHouse/ClickHouse/issues/15780) regression, e.g. `indexOf([1, 2, 3], toLowCardinality(1))` now is prohibited but it should not be. [#16038](https://github.com/ClickHouse/ClickHouse/pull/16038) ([Mike](https://github.com/myrrc)).
+* Fix bug with MySQL database. When MySQL server used as database engine is down some queries raise Exception, because they try to get tables from disabled server, while it's unnecessary. For example, query `SELECT ... FROM system.parts` should work only with MergeTree tables and don't touch MySQL database at all. [#16032](https://github.com/ClickHouse/ClickHouse/pull/16032) ([Kruglov Pavel](https://github.com/Avogar)).
+* Now exception will be thrown when `ALTER MODIFY COLUMN ... DEFAULT ...` has incompatible default with column type. Fixes [#15854](https://github.com/ClickHouse/ClickHouse/issues/15854). [#15858](https://github.com/ClickHouse/ClickHouse/pull/15858) ([alesapin](https://github.com/alesapin)).
+* Fixed IPv4CIDRToRange/IPv6CIDRToRange functions to accept const IP-column values. [#15856](https://github.com/ClickHouse/ClickHouse/pull/15856) ([vladimir-golovchenko](https://github.com/vladimir-golovchenko)).
+
+#### Improvement
+
+* Treat `INTERVAL '1 hour'` as equivalent to `INTERVAL 1 HOUR`, to be compatible with Postgres and similar. This fixes [#15637](https://github.com/ClickHouse/ClickHouse/issues/15637). [#15978](https://github.com/ClickHouse/ClickHouse/pull/15978) ([flynn](https://github.com/ucasFL)).
+* Enable parsing enum values by their numeric ids for CSV, TSV and JSON input formats. [#15685](https://github.com/ClickHouse/ClickHouse/pull/15685) ([vivarum](https://github.com/vivarum)).
+* Better read task scheduling for JBOD architecture and `MergeTree` storage. New setting `read_backoff_min_concurrency` which serves as the lower limit to the number of reading threads. [#16423](https://github.com/ClickHouse/ClickHouse/pull/16423) ([Amos Bird](https://github.com/amosbird)).
+* Add missing support for `LowCardinality` in `Avro` format. [#16521](https://github.com/ClickHouse/ClickHouse/pull/16521) ([Mike](https://github.com/myrrc)).
+* Workaround for use `S3` with nginx server as proxy. Nginx currenty does not accept urls with empty path like `http://domain.com?delete`, but vanilla aws-sdk-cpp produces this kind of urls. This commit uses patched aws-sdk-cpp version, which makes urls with "/" as path in this cases, like `http://domain.com/?delete`. [#16814](https://github.com/ClickHouse/ClickHouse/pull/16814) ([ianton-ru](https://github.com/ianton-ru)).
+* Better diagnostics on parse errors in input data. Provide row number on `Cannot read all data` errors. [#16644](https://github.com/ClickHouse/ClickHouse/pull/16644) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Make the behaviour of `minMap` and `maxMap` more desireable. It will not skip zero values in the result. Fixes [#16087](https://github.com/ClickHouse/ClickHouse/issues/16087). [#16631](https://github.com/ClickHouse/ClickHouse/pull/16631) ([Ildus Kurbangaliev](https://github.com/ildus)).
+* Better update of ZooKeeper configuration in runtime. [#16630](https://github.com/ClickHouse/ClickHouse/pull/16630) ([sundyli](https://github.com/sundy-li)).
+* Apply SETTINGS clause as early as possible. It allows to modify more settings in the query. This closes [#3178](https://github.com/ClickHouse/ClickHouse/issues/3178). [#16619](https://github.com/ClickHouse/ClickHouse/pull/16619) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Now `event_time_microseconds` field stores in Decimal64, not UInt64. [#16617](https://github.com/ClickHouse/ClickHouse/pull/16617) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Now paratmeterized functions can be used in `APPLY` column transformer. [#16589](https://github.com/ClickHouse/ClickHouse/pull/16589) ([Amos Bird](https://github.com/amosbird)).
+* Improve scheduling of background task which removes data of dropped tables in `Atomic` databases. `Atomic` databases do not create broken symlink to table data directory if table actually has no data directory. [#16584](https://github.com/ClickHouse/ClickHouse/pull/16584) ([tavplubix](https://github.com/tavplubix)).
+* Subqueries in `WITH` section (CTE) can reference previous subqueries in `WITH` section by their name. [#16575](https://github.com/ClickHouse/ClickHouse/pull/16575) ([Amos Bird](https://github.com/amosbird)).
+* Add current_database into `system.query_thread_log`. [#16558](https://github.com/ClickHouse/ClickHouse/pull/16558) ([Azat Khuzhin](https://github.com/azat)).
+* Allow to fetch parts that are already committed or outdated in the current instance into the detached directory. It's useful when migrating tables from another cluster and having N to 1 shards mapping. It's also consistent with the current fetchPartition implementation. [#16538](https://github.com/ClickHouse/ClickHouse/pull/16538) ([Amos Bird](https://github.com/amosbird)).
+* Multiple improvements for `RabbitMQ`: Fixed bug for [#16263](https://github.com/ClickHouse/ClickHouse/issues/16263). Also minimized event loop lifetime. Added more efficient queues setup. [#16426](https://github.com/ClickHouse/ClickHouse/pull/16426) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix debug assertion in `quantileDeterministic` function. In previous version it may also transfer up to two times more data over the network. Although no bug existed. This fixes [#15683](https://github.com/ClickHouse/ClickHouse/issues/15683). [#16410](https://github.com/ClickHouse/ClickHouse/pull/16410) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add `TablesToDropQueueSize` metric. It's equal to number of dropped tables, that are waiting for background data removal. [#16364](https://github.com/ClickHouse/ClickHouse/pull/16364) ([tavplubix](https://github.com/tavplubix)).
+* Better diagnostics when client has dropped connection. In previous versions, `Attempt to read after EOF` and `Broken pipe` exceptions were logged in server. In new version, it's information message `Client has dropped the connection, cancel the query.`. [#16329](https://github.com/ClickHouse/ClickHouse/pull/16329) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add total_rows/total_bytes (from system.tables) support for Set/Join table engines. [#16306](https://github.com/ClickHouse/ClickHouse/pull/16306) ([Azat Khuzhin](https://github.com/azat)).
+* Now it's possible to specify `PRIMARY KEY` without `ORDER BY` for MergeTree table engines family. Closes [#15591](https://github.com/ClickHouse/ClickHouse/issues/15591). [#16284](https://github.com/ClickHouse/ClickHouse/pull/16284) ([alesapin](https://github.com/alesapin)).
+* If there is no tmp folder in the system (chroot, misconfigutation etc) `clickhouse-local` will create temporary subfolder in the current directory. [#16280](https://github.com/ClickHouse/ClickHouse/pull/16280) ([filimonov](https://github.com/filimonov)).
+* Add support for nested data types (like named tuple) as sub-types. Fixes [#15587](https://github.com/ClickHouse/ClickHouse/issues/15587). [#16262](https://github.com/ClickHouse/ClickHouse/pull/16262) ([Ivan](https://github.com/abyss7)).
+* Support for `database_atomic_wait_for_drop_and_detach_synchronously`/`NO DELAY`/`SYNC` for `DROP DATABASE`. [#16127](https://github.com/ClickHouse/ClickHouse/pull/16127) ([Azat Khuzhin](https://github.com/azat)).
+* Add `allow_nondeterministic_optimize_skip_unused_shards` (to allow non deterministic like `rand()` or `dictGet()` in sharding key). [#16105](https://github.com/ClickHouse/ClickHouse/pull/16105) ([Azat Khuzhin](https://github.com/azat)).
+* Fix `memory_profiler_step`/`max_untracked_memory` for queries via HTTP (test included). Fix the issue that adjusting this value globally in xml config does not help either, since those settings are not applied anyway, only default (4MB) value is [used](https://github.com/ClickHouse/ClickHouse/blob/17731245336d8c84f75e4c0894c5797ed7732190/src/Common/ThreadStatus.h#L104). Fix `query_id` for the most root ThreadStatus of the http query (by initializing QueryScope after reading query_id). [#16101](https://github.com/ClickHouse/ClickHouse/pull/16101) ([Azat Khuzhin](https://github.com/azat)).
+* Now it's allowed to execute `ALTER ... ON CLUSTER` queries regardless of the `<internal_replication>` setting in cluster config. [#16075](https://github.com/ClickHouse/ClickHouse/pull/16075) ([alesapin](https://github.com/alesapin)).
+* Fix rare issue when `clickhouse-client` may abort on exit due to loading of suggestions. This fixes [#16035](https://github.com/ClickHouse/ClickHouse/issues/16035). [#16047](https://github.com/ClickHouse/ClickHouse/pull/16047) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add support of `cache` layout for `Redis` dictionaries with complex key. [#15985](https://github.com/ClickHouse/ClickHouse/pull/15985) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix query hang (endless loop) in case of misconfiguration (`connections_with_failover_max_tries` set to 0). [#15876](https://github.com/ClickHouse/ClickHouse/pull/15876) ([Azat Khuzhin](https://github.com/azat)).
+* Change level of some log messages from information to debug, so information messages will not appear for every query. This closes [#5293](https://github.com/ClickHouse/ClickHouse/issues/5293). [#15816](https://github.com/ClickHouse/ClickHouse/pull/15816) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Remove `MemoryTrackingInBackground*` metrics to avoid potentially misleading results. This fixes [#15684](https://github.com/ClickHouse/ClickHouse/issues/15684). [#15813](https://github.com/ClickHouse/ClickHouse/pull/15813) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add reconnects to `zookeeper-dump-tree` tool. [#15711](https://github.com/ClickHouse/ClickHouse/pull/15711) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Allow explicitly specify columns list in `CREATE TABLE table AS table_function(...)` query. Fixes [#9249](https://github.com/ClickHouse/ClickHouse/issues/9249) Fixes [#14214](https://github.com/ClickHouse/ClickHouse/issues/14214). [#14295](https://github.com/ClickHouse/ClickHouse/pull/14295) ([tavplubix](https://github.com/tavplubix)).
+
+#### Performance Improvement
+
+* Do not merge parts across partitions in SELECT FINAL. [#15938](https://github.com/ClickHouse/ClickHouse/pull/15938) ([Kruglov Pavel](https://github.com/Avogar)).
+* Improve performance of `-OrNull` and `-OrDefault` aggregate functions. [#16661](https://github.com/ClickHouse/ClickHouse/pull/16661) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Improve performance of `quantileMerge`. In previous versions it was obnoxiously slow. This closes [#1463](https://github.com/ClickHouse/ClickHouse/issues/1463). [#16643](https://github.com/ClickHouse/ClickHouse/pull/16643) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Improve performance of logical functions a little. [#16347](https://github.com/ClickHouse/ClickHouse/pull/16347) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Improved performance of merges assignment in MergeTree table engines. Shouldn't be visible for the user. [#16191](https://github.com/ClickHouse/ClickHouse/pull/16191) ([alesapin](https://github.com/alesapin)).
+* Speedup hashed/sparse_hashed dictionary loading by preallocating the hash table. [#15454](https://github.com/ClickHouse/ClickHouse/pull/15454) ([Azat Khuzhin](https://github.com/azat)).
+* Now trivial count optimization becomes slightly non-trivial. Predicates that contain exact partition expr can be optimized too. This also fixes [#11092](https://github.com/ClickHouse/ClickHouse/issues/11092) which returns wrong count when `max_parallel_replicas > 1`. [#15074](https://github.com/ClickHouse/ClickHouse/pull/15074) ([Amos Bird](https://github.com/amosbird)).
+
+#### Build/Testing/Packaging Improvement
+
+* Add flaky check for stateless tests. It will detect potentially flaky functional tests in advance, before they are merged. [#16238](https://github.com/ClickHouse/ClickHouse/pull/16238) ([alesapin](https://github.com/alesapin)).
+* Use proper version for `croaring` instead of amalgamation. [#16285](https://github.com/ClickHouse/ClickHouse/pull/16285) ([sundyli](https://github.com/sundy-li)).
+* Improve generation of build files for `ya.make` build system (Arcadia). [#16700](https://github.com/ClickHouse/ClickHouse/pull/16700) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add MySQL BinLog file check tool for `MaterializeMySQL` database engine. `MaterializeMySQL` is an experimental feature. [#16223](https://github.com/ClickHouse/ClickHouse/pull/16223) ([Winter Zhang](https://github.com/zhang2014)).
+* Check for executable bit on non-executable files. People often accidentially commit executable files from Windows. [#15843](https://github.com/ClickHouse/ClickHouse/pull/15843) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Check for `#pragma once` in headers. [#15818](https://github.com/ClickHouse/ClickHouse/pull/15818) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix illegal code style `&vector[idx]` in libhdfs3. This fixes libcxx debug build. See also https://github.com/ClickHouse-Extras/libhdfs3/pull/8 . [#15815](https://github.com/ClickHouse/ClickHouse/pull/15815) ([Amos Bird](https://github.com/amosbird)).
+* Fix build of one miscellaneous example tool on Mac OS. Note that we don't build examples on Mac OS in our CI (we build only ClickHouse binary), so there is zero chance it will not break again. This fixes [#15804](https://github.com/ClickHouse/ClickHouse/issues/15804). [#15808](https://github.com/ClickHouse/ClickHouse/pull/15808) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Simplify Sys/V init script. [#14135](https://github.com/ClickHouse/ClickHouse/pull/14135) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Added `boost::program_options` to `db_generator` in order to increase its usability. This closes [#15940](https://github.com/ClickHouse/ClickHouse/issues/15940). [#15973](https://github.com/ClickHouse/ClickHouse/pull/15973) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+
+
+## ClickHouse release 20.10
+
+### ClickHouse release v20.10.7.4-stable, 2020-12-24
+                                                                                                                                                                                                                                                              
+#### Bug Fix                                                                                                                                                                                                                                                  
+                                                                                                                                                                                                                                                              
+* Fixed issue when `clickhouse-odbc-bridge` process is unreachable by server on machines with dual `IPv4/IPv6` stack and fixed issue when ODBC dictionary updates are performed using malformed queries and/or cause crashes. This possibly closes [#14489](https://github.com/ClickHouse/ClickHouse/issues/14489). [#18278](https://github.com/ClickHouse/ClickHouse/pull/18278) ([Denis Glazachev](https://github.com/traceon)).                                                                                                
+* Fix key comparison between Enum and Int types. This fixes [#17989](https://github.com/ClickHouse/ClickHouse/issues/17989). [#18214](https://github.com/ClickHouse/ClickHouse/pull/18214) ([Amos Bird](https://github.com/amosbird)).                        
+* Fixed unique key convert crash in `MaterializeMySQL` database engine. This fixes [#18186](https://github.com/ClickHouse/ClickHouse/issues/18186) and fixes [#16372](https://github.com/ClickHouse/ClickHouse/issues/16372)  [#18211](https://github.com/ClickHouse/ClickHouse/pull/18211) ([Winter Zhang](https://github.com/zhang2014)).
+* Fixed `std::out_of_range: basic_string` in S3 URL parsing. [#18059](https://github.com/ClickHouse/ClickHouse/pull/18059) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Fixed the issue when some tables not synchronized to ClickHouse from MySQL caused by the fact that convertion MySQL prefix index wasn't supported for MaterializeMySQL. This fixes [#15187](https://github.com/ClickHouse/ClickHouse/issues/15187) and fixes [#17912](https://github.com/ClickHouse/ClickHouse/issues/17912)  [#17944](https://github.com/ClickHouse/ClickHouse/pull/17944) ([Winter Zhang](https://github.com/zhang2014)).                                                                                                                                                                                
+* Fix possible segfault in `topK` aggregate function. This closes [#17404](https://github.com/ClickHouse/ClickHouse/issues/17404). [#17845](https://github.com/ClickHouse/ClickHouse/pull/17845) ([Maksim Kita](https://github.com/kitaisreal)).              
+* Do not restore parts from `WAL` if `in_memory_parts_enable_wal` is disabled. [#17802](https://github.com/ClickHouse/ClickHouse/pull/17802) ([detailyang](https://github.com/detailyang)).                                                                     
+* Fixed problem when ClickHouse fails to resume connection to MySQL servers. [#17681](https://github.com/ClickHouse/ClickHouse/pull/17681) ([Alexander Kazakov](https://github.com/Akazz)).                                                                   
+* Fixed empty `system.stack_trace` table when server is running in daemon mode. [#17630](https://github.com/ClickHouse/ClickHouse/pull/17630) ([Amos Bird](https://github.com/amosbird)).                                                                       
+* Fixed the behaviour when `clickhouse-client` is used in interactive mode with multiline queries and single line comment was erronously extended till the end of query. This fixes [#13654](https://github.com/ClickHouse/ClickHouse/issues/13654). [#17565](https://github.com/ClickHouse/ClickHouse/pull/17565) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed the issue when server can stop accepting connections in very rare cases. [#17542](https://github.com/ClickHouse/ClickHouse/pull/17542) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed `ALTER` query hang when the corresponding mutation was killed on the different replica. This fixes [#16953](https://github.com/ClickHouse/ClickHouse/issues/16953). [#17499](https://github.com/ClickHouse/ClickHouse/pull/17499) ([alesapin](https://github.com/alesapin)).
+* Fixed bug when mark cache size was underestimated by clickhouse. It may happen when there are a lot of tiny files with marks. [#17496](https://github.com/ClickHouse/ClickHouse/pull/17496) ([alesapin](https://github.com/alesapin)).
+* Fixed `ORDER BY` with enabled setting `optimize_redundant_functions_in_order_by`. [#17471](https://github.com/ClickHouse/ClickHouse/pull/17471) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed duplicates after `DISTINCT` which were possible because of incorrect optimization. Fixes [#17294](https://github.com/ClickHouse/ClickHouse/issues/17294). [#17296](https://github.com/ClickHouse/ClickHouse/pull/17296) ([li chengxiang](https://github.com/chengxianglibra)). [#17439](https://github.com/ClickHouse/ClickHouse/pull/17439) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed crash while reading from `JOIN` table with `LowCardinality` types. This fixes [#17228](https://github.com/ClickHouse/ClickHouse/issues/17228). [#17397](https://github.com/ClickHouse/ClickHouse/pull/17397) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed set index invalidation when there are const columns in the subquery. This fixes [#17246](https://github.com/ClickHouse/ClickHouse/issues/17246) . [#17249](https://github.com/ClickHouse/ClickHouse/pull/17249) ([Amos Bird](https://github.com/amosbird)).
+* Fixed `ColumnConst` comparison which leads to crash. This fixed [#17088](https://github.com/ClickHouse/ClickHouse/issues/17088) . [#17135](https://github.com/ClickHouse/ClickHouse/pull/17135) ([Amos Bird](https://github.com/amosbird)).
+* Fixed bug when `ON CLUSTER` queries may hang forever for non-leader `ReplicatedMergeTreeTables`. [#17089](https://github.com/ClickHouse/ClickHouse/pull/17089) ([alesapin](https://github.com/alesapin)).
+* Fixed fuzzer-found bug in function `fuzzBits`. This fixes [#16980](https://github.com/ClickHouse/ClickHouse/issues/16980). [#17051](https://github.com/ClickHouse/ClickHouse/pull/17051) ([hexiaoting](https://github.com/hexiaoting)).
+* Avoid unnecessary network errors for remote queries which may be cancelled while execution, like queries with `LIMIT`. [#17006](https://github.com/ClickHouse/ClickHouse/pull/17006) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed wrong result in big integers (128, 256 bit) when casting from double. [#16986](https://github.com/ClickHouse/ClickHouse/pull/16986) ([Mike](https://github.com/myrrc)).
+* Reresolve the IP of the `format_avro_schema_registry_url` in case of errors. [#16985](https://github.com/ClickHouse/ClickHouse/pull/16985) ([filimonov](https://github.com/filimonov)).
+* Fixed possible server crash after `ALTER TABLE ... MODIFY COLUMN ... NewType` when `SELECT` have `WHERE` expression on altering column and alter doesn't finished yet. [#16968](https://github.com/ClickHouse/ClickHouse/pull/16968) ([Amos Bird](https://github.com/amosbird)).
+* Blame info was not calculated correctly in `clickhouse-git-import`. [#16959](https://github.com/ClickHouse/ClickHouse/pull/16959) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed order by optimization with monotonous functions. This fixes [#16107](https://github.com/ClickHouse/ClickHouse/issues/16107). [#16956](https://github.com/ClickHouse/ClickHouse/pull/16956) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixrf optimization of group by with enabled setting `optimize_aggregators_of_group_by_keys` and joins. This fixes [#12604](https://github.com/ClickHouse/ClickHouse/issues/12604). [#16951](https://github.com/ClickHouse/ClickHouse/pull/16951) ([Anton Popov](https://github.com/CurtizJ)).
+* Install script should always create subdirs in config folders. This is only relevant for Docker build with custom config. [#16936](https://github.com/ClickHouse/ClickHouse/pull/16936) ([filimonov](https://github.com/filimonov)).
+* Fixrf possible error `Illegal type of argument` for queries with `ORDER BY`. This fixes [#16580](https://github.com/ClickHouse/ClickHouse/issues/16580). [#16928](https://github.com/ClickHouse/ClickHouse/pull/16928) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Abort multipart upload if no data was written to `WriteBufferFromS3`. [#16840](https://github.com/ClickHouse/ClickHouse/pull/16840) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Fixed crash when using `any` without any arguments. This fixes [#16803](https://github.com/ClickHouse/ClickHouse/issues/16803). [#16826](https://github.com/ClickHouse/ClickHouse/pull/16826) ([Amos Bird](https://github.com/amosbird)).
+* Fixed the behaviour when ClickHouse used to always return 0 insted of a number of affected rows for `INSERT` queries via MySQL protocol. This fixes [#16605](https://github.com/ClickHouse/ClickHouse/issues/16605). [#16715](https://github.com/ClickHouse/ClickHouse/pull/16715) ([Winter Zhang](https://github.com/zhang2014)).
+* Fixed uncontrolled growth of `TDigest`. [#16680](https://github.com/ClickHouse/ClickHouse/pull/16680) ([hrissan](https://github.com/hrissan)).
+* Fixed remote query failure when using suffix `if` in Aggregate function. This fixes [#16574](https://github.com/ClickHouse/ClickHouse/issues/16574) fixes [#16231](https://github.com/ClickHouse/ClickHouse/issues/16231) [#16610](https://github.com/ClickHouse/ClickHouse/pull/16610) ([Winter Zhang](https://github.com/zhang2014)).
+
+
+### ClickHouse release v20.10.4.1-stable, 2020-11-13
+
+#### Bug Fix
+
+* Fix rare silent crashes when query profiler is on and ClickHouse is installed on OS with glibc version that has (supposedly) broken asynchronous unwind tables for some functions. This fixes [#15301](https://github.com/ClickHouse/ClickHouse/issues/15301). This fixes [#13098](https://github.com/ClickHouse/ClickHouse/issues/13098). [#16846](https://github.com/ClickHouse/ClickHouse/pull/16846) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix `IN` operator over several columns and tuples with enabled `transform_null_in` setting. Fixes [#15310](https://github.com/ClickHouse/ClickHouse/issues/15310). [#16722](https://github.com/ClickHouse/ClickHouse/pull/16722) ([Anton Popov](https://github.com/CurtizJ)).
+* This will fix optimize_read_in_order/optimize_aggregation_in_order with max_threads>0 and expression in ORDER BY. [#16637](https://github.com/ClickHouse/ClickHouse/pull/16637) ([Azat Khuzhin](https://github.com/azat)).
+* Now when parsing AVRO from input the LowCardinality is removed from type. Fixes [#16188](https://github.com/ClickHouse/ClickHouse/issues/16188). [#16521](https://github.com/ClickHouse/ClickHouse/pull/16521) ([Mike](https://github.com/myrrc)).
+* Fix rapid growth of metadata when using MySQL Master -> MySQL Slave -> ClickHouse MaterializeMySQL Engine, and `slave_parallel_worker` enabled on MySQL Slave, by properly shrinking GTID sets. This fixes [#15951](https://github.com/ClickHouse/ClickHouse/issues/15951). [#16504](https://github.com/ClickHouse/ClickHouse/pull/16504) ([TCeason](https://github.com/TCeason)).
+* Fix DROP TABLE for Distributed (racy with INSERT). [#16409](https://github.com/ClickHouse/ClickHouse/pull/16409) ([Azat Khuzhin](https://github.com/azat)).
+* Fix processing of very large entries in replication queue. Very large entries may appear in ALTER queries if table structure is extremely large (near 1 MB). This fixes [#16307](https://github.com/ClickHouse/ClickHouse/issues/16307). [#16332](https://github.com/ClickHouse/ClickHouse/pull/16332) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix bug with MySQL database. When MySQL server used as database engine is down some queries raise Exception, because they try to get tables from disabled server, while it's unnecessary. For example, query `SELECT ... FROM system.parts` should work only with MergeTree tables and don't touch MySQL database at all. [#16032](https://github.com/ClickHouse/ClickHouse/pull/16032) ([Kruglov Pavel](https://github.com/Avogar)).
+
+#### Improvement
+
+* Workaround for use S3 with nginx server as proxy. Nginx currenty does not accept urls with empty path like http://domain.com?delete, but vanilla aws-sdk-cpp produces this kind of urls. This commit uses patched aws-sdk-cpp version, which makes urls with "/" as path in this cases, like http://domain.com/?delete. [#16813](https://github.com/ClickHouse/ClickHouse/pull/16813) ([ianton-ru](https://github.com/ianton-ru)).
+
+
+### ClickHouse release v20.10.3.30, 2020-10-28
+
+#### Backward Incompatible Change
+
+* Make `multiple_joins_rewriter_version` obsolete. Remove first version of joins rewriter. [#15472](https://github.com/ClickHouse/ClickHouse/pull/15472) ([Artem Zuikov](https://github.com/4ertus2)).
+* Change default value of `format_regexp_escaping_rule` setting (it's related to `Regexp` format) to `Raw` (it means - read whole subpattern as a value) to make the behaviour more like to what users expect. [#15426](https://github.com/ClickHouse/ClickHouse/pull/15426) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add support for nested multiline comments `/* comment /* comment */ */` in SQL. This conforms to the SQL standard. [#14655](https://github.com/ClickHouse/ClickHouse/pull/14655) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Added MergeTree settings (`max_replicated_merges_with_ttl_in_queue` and `max_number_of_merges_with_ttl_in_pool`) to control the number of merges with TTL in the background pool and replicated queue. This change breaks compatibility with older versions only if you use delete TTL. Otherwise, replication will stay compatible. You can avoid incompatibility issues if you update all shard replicas at once or execute `SYSTEM STOP TTL MERGES` until you finish the update of all replicas. If you'll get an incompatible entry in the replication queue, first of all, execute `SYSTEM STOP TTL MERGES` and after `ALTER TABLE ... DETACH PARTITION ...` the partition where incompatible TTL merge was assigned. Attach it back on a single replica. [#14490](https://github.com/ClickHouse/ClickHouse/pull/14490) ([alesapin](https://github.com/alesapin)).
+* When upgrading from versions older than 20.5, if rolling update is performed and cluster contains both versions 20.5 or greater and less than 20.5, if ClickHouse nodes with old versions are restarted and old version has been started up in presence of newer versions, it may lead to `Part ... intersects previous part` errors. To prevent this error, first install newer clickhouse-server packages on all cluster nodes and then do restarts (so, when clickhouse-server is restarted, it will start up with the new version).
+
+#### New Feature
+
+* Background data recompression. Add the ability to specify `TTL ... RECOMPRESS codec_name` for MergeTree table engines family. [#14494](https://github.com/ClickHouse/ClickHouse/pull/14494) ([alesapin](https://github.com/alesapin)).
+* Add parallel quorum inserts. This closes [#15601](https://github.com/ClickHouse/ClickHouse/issues/15601). [#15601](https://github.com/ClickHouse/ClickHouse/pull/15601) ([Latysheva Alexandra](https://github.com/alexelex)).
+* Settings for additional enforcement of data durability. Useful for non-replicated setups. [#11948](https://github.com/ClickHouse/ClickHouse/pull/11948) ([Anton Popov](https://github.com/CurtizJ)).
+* When duplicate block is written to replica where it does not exist locally (has not been fetched from replicas), don't ignore it and write locally to achieve the same effect as if it was successfully replicated. [#11684](https://github.com/ClickHouse/ClickHouse/pull/11684) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Now we support `WITH <identifier> AS (subquery) ... ` to introduce named subqueries in the query context. This closes [#2416](https://github.com/ClickHouse/ClickHouse/issues/2416). This closes [#4967](https://github.com/ClickHouse/ClickHouse/issues/4967). [#14771](https://github.com/ClickHouse/ClickHouse/pull/14771) ([Amos Bird](https://github.com/amosbird)).
+* Introduce `enable_global_with_statement` setting which propagates the first select's `WITH` statements to other select queries at the same level, and makes aliases in `WITH` statements visible to subqueries. [#15451](https://github.com/ClickHouse/ClickHouse/pull/15451) ([Amos Bird](https://github.com/amosbird)).
+* Secure inter-cluster query execution (with initial_user as current query user). [#13156](https://github.com/ClickHouse/ClickHouse/pull/13156) ([Azat Khuzhin](https://github.com/azat)). [#15551](https://github.com/ClickHouse/ClickHouse/pull/15551) ([Azat Khuzhin](https://github.com/azat)).
+* Add the ability to remove column properties and table TTLs. Introduced queries `ALTER TABLE MODIFY COLUMN col_name REMOVE what_to_remove` and `ALTER TABLE REMOVE TTL`. Both operations are lightweight and executed at the metadata level. [#14742](https://github.com/ClickHouse/ClickHouse/pull/14742) ([alesapin](https://github.com/alesapin)).
+* Added format `RawBLOB`. It is intended for input or output a single value without any escaping and delimiters. This closes [#15349](https://github.com/ClickHouse/ClickHouse/issues/15349). [#15364](https://github.com/ClickHouse/ClickHouse/pull/15364) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add the `reinterpretAsUUID` function that allows to convert a big-endian byte string to UUID. [#15480](https://github.com/ClickHouse/ClickHouse/pull/15480) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Implement `force_data_skipping_indices` setting. [#15642](https://github.com/ClickHouse/ClickHouse/pull/15642) ([Azat Khuzhin](https://github.com/azat)).
+* Add a setting `output_format_pretty_row_numbers` to numerate the result in Pretty formats. This closes [#15350](https://github.com/ClickHouse/ClickHouse/issues/15350). [#15443](https://github.com/ClickHouse/ClickHouse/pull/15443) ([flynn](https://github.com/ucasFL)).
+* Added query obfuscation tool. It allows to share more queries for better testing. This closes [#15268](https://github.com/ClickHouse/ClickHouse/issues/15268). [#15321](https://github.com/ClickHouse/ClickHouse/pull/15321) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add table function `null('structure')`. [#14797](https://github.com/ClickHouse/ClickHouse/pull/14797) ([vxider](https://github.com/Vxider)).
+* Added `formatReadableQuantity` function. It is useful for reading big numbers by human. [#14725](https://github.com/ClickHouse/ClickHouse/pull/14725) ([Artem Hnilov](https://github.com/BooBSD)).
+* Add format `LineAsString` that accepts a sequence of lines separated by newlines, every line is parsed as a whole as a single String field. [#14703](https://github.com/ClickHouse/ClickHouse/pull/14703) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)), [#13846](https://github.com/ClickHouse/ClickHouse/pull/13846) ([hexiaoting](https://github.com/hexiaoting)).
+* Add `JSONStrings` format which output data in arrays of strings. [#14333](https://github.com/ClickHouse/ClickHouse/pull/14333) ([hcz](https://github.com/hczhcz)).
+* Add support for "Raw" column format for `Regexp` format. It allows to simply extract subpatterns as a whole without any escaping rules. [#15363](https://github.com/ClickHouse/ClickHouse/pull/15363) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Allow configurable `NULL` representation for `TSV` output format. It is controlled by the setting `output_format_tsv_null_representation` which is `\N` by default. This closes [#9375](https://github.com/ClickHouse/ClickHouse/issues/9375). Note that the setting only controls output format and `\N` is the only supported `NULL` representation for `TSV` input format. [#14586](https://github.com/ClickHouse/ClickHouse/pull/14586) ([Kruglov Pavel](https://github.com/Avogar)).
+* Support Decimal data type for `MaterializeMySQL`. `MaterializeMySQL` is an experimental feature. [#14535](https://github.com/ClickHouse/ClickHouse/pull/14535) ([Winter Zhang](https://github.com/zhang2014)).
+* Add new feature: `SHOW DATABASES LIKE 'xxx'`. [#14521](https://github.com/ClickHouse/ClickHouse/pull/14521) ([hexiaoting](https://github.com/hexiaoting)).
+* Added a script to import (arbitrary) git repository to ClickHouse as a sample dataset. [#14471](https://github.com/ClickHouse/ClickHouse/pull/14471) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Now insert statements can have asterisk (or variants) with column transformers in the column list. [#14453](https://github.com/ClickHouse/ClickHouse/pull/14453) ([Amos Bird](https://github.com/amosbird)).
+* New query complexity limit settings `max_rows_to_read_leaf`, `max_bytes_to_read_leaf` for distributed queries to limit max rows/bytes read on the leaf nodes. Limit is applied for local reads only, *excluding* the final merge stage on the root node. [#14221](https://github.com/ClickHouse/ClickHouse/pull/14221) ([Roman Khavronenko](https://github.com/hagen1778)).
+* Allow user to specify settings for `ReplicatedMergeTree*` storage in `<replicated_merge_tree>` section of config file. It works similarly to `<merge_tree>` section. For `ReplicatedMergeTree*` storages settings from `<merge_tree>` and `<replicated_merge_tree>` are applied together, but settings from `<replicated_merge_tree>` has higher priority. Added `system.replicated_merge_tree_settings` table. [#13573](https://github.com/ClickHouse/ClickHouse/pull/13573) ([Amos Bird](https://github.com/amosbird)).
+* Add `mapPopulateSeries` function. [#13166](https://github.com/ClickHouse/ClickHouse/pull/13166) ([Ildus Kurbangaliev](https://github.com/ildus)).
+* Supporting MySQL types: `decimal` (as ClickHouse `Decimal`) and `datetime` with sub-second precision (as `DateTime64`). [#11512](https://github.com/ClickHouse/ClickHouse/pull/11512) ([Vasily Nemkov](https://github.com/Enmk)).
+* Introduce `event_time_microseconds` field to `system.text_log`, `system.trace_log`, `system.query_log` and `system.query_thread_log` tables. [#14760](https://github.com/ClickHouse/ClickHouse/pull/14760) ([Bharat Nallan](https://github.com/bharatnc)).
+* Add `event_time_microseconds` to `system.asynchronous_metric_log` & `system.metric_log` tables. [#14514](https://github.com/ClickHouse/ClickHouse/pull/14514) ([Bharat Nallan](https://github.com/bharatnc)).
+* Add `query_start_time_microseconds` field to `system.query_log` & `system.query_thread_log` tables. [#14252](https://github.com/ClickHouse/ClickHouse/pull/14252) ([Bharat Nallan](https://github.com/bharatnc)).
+
+#### Bug Fix
+
+* Fix the case when memory can be overallocated regardless to the limit. This closes [#14560](https://github.com/ClickHouse/ClickHouse/issues/14560). [#16206](https://github.com/ClickHouse/ClickHouse/pull/16206) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix `executable` dictionary source hang. In previous versions, when using some formats (e.g. `JSONEachRow`) data was not feed to a child process before it outputs at least something. This closes [#1697](https://github.com/ClickHouse/ClickHouse/issues/1697). This closes [#2455](https://github.com/ClickHouse/ClickHouse/issues/2455). [#14525](https://github.com/ClickHouse/ClickHouse/pull/14525) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix double free in case of exception in function `dictGet`. It could have happened if dictionary was loaded with error. [#16429](https://github.com/ClickHouse/ClickHouse/pull/16429) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix group by with totals/rollup/cube modifers and min/max functions over group by keys. Fixes [#16393](https://github.com/ClickHouse/ClickHouse/issues/16393). [#16397](https://github.com/ClickHouse/ClickHouse/pull/16397) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix async Distributed INSERT with prefer_localhost_replica=0 and internal_replication. [#16358](https://github.com/ClickHouse/ClickHouse/pull/16358) ([Azat Khuzhin](https://github.com/azat)).
+* Fix a very wrong code in TwoLevelStringHashTable implementation, which might lead to memory leak. [#16264](https://github.com/ClickHouse/ClickHouse/pull/16264) ([Amos Bird](https://github.com/amosbird)).
+* Fix segfault in some cases of wrong aggregation in lambdas. [#16082](https://github.com/ClickHouse/ClickHouse/pull/16082) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix `ALTER MODIFY ... ORDER BY` query hang for `ReplicatedVersionedCollapsingMergeTree`. This fixes [#15980](https://github.com/ClickHouse/ClickHouse/issues/15980). [#16011](https://github.com/ClickHouse/ClickHouse/pull/16011) ([alesapin](https://github.com/alesapin)).
+* `MaterializeMySQL` (experimental feature): Fix collate name & charset name parser and support `length = 0` for string type. [#16008](https://github.com/ClickHouse/ClickHouse/pull/16008) ([Winter Zhang](https://github.com/zhang2014)).
+* Allow to use `direct` layout for dictionaries with complex keys. [#16007](https://github.com/ClickHouse/ClickHouse/pull/16007) ([Anton Popov](https://github.com/CurtizJ)).
+* Prevent replica hang for 5-10 mins when replication error happens after a period of inactivity. [#15987](https://github.com/ClickHouse/ClickHouse/pull/15987) ([filimonov](https://github.com/filimonov)).
+* Fix rare segfaults when inserting into or selecting from MaterializedView and concurrently dropping target table (for Atomic database engine). [#15984](https://github.com/ClickHouse/ClickHouse/pull/15984) ([tavplubix](https://github.com/tavplubix)).
+* Fix ambiguity in parsing of settings profiles: `CREATE USER ... SETTINGS profile readonly` is now considered as using a profile named `readonly`, not a setting named `profile` with the readonly constraint. This fixes [#15628](https://github.com/ClickHouse/ClickHouse/issues/15628). [#15982](https://github.com/ClickHouse/ClickHouse/pull/15982) ([Vitaly Baranov](https://github.com/vitlibar)).
+* `MaterializeMySQL` (experimental feature): Fix crash on create database failure. [#15954](https://github.com/ClickHouse/ClickHouse/pull/15954) ([Winter Zhang](https://github.com/zhang2014)).
+* Fixed `DROP TABLE IF EXISTS` failure with `Table ... doesn't exist` error when table is concurrently renamed (for Atomic database engine). Fixed rare deadlock when concurrently executing some DDL queries with multiple tables (like `DROP DATABASE` and `RENAME TABLE`) - Fixed `DROP/DETACH DATABASE` failure with `Table ... doesn't exist` when concurrently executing `DROP/DETACH TABLE`. [#15934](https://github.com/ClickHouse/ClickHouse/pull/15934) ([tavplubix](https://github.com/tavplubix)).
+* Fix incorrect empty result for query from `Distributed` table if query has `WHERE`, `PREWHERE` and `GLOBAL IN`. Fixes [#15792](https://github.com/ClickHouse/ClickHouse/issues/15792). [#15933](https://github.com/ClickHouse/ClickHouse/pull/15933) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixes [#12513](https://github.com/ClickHouse/ClickHouse/issues/12513): difference expressions with same alias when query is reanalyzed. [#15886](https://github.com/ClickHouse/ClickHouse/pull/15886) ([Winter Zhang](https://github.com/zhang2014)).
+* Fix possible very rare deadlocks in RBAC implementation. [#15875](https://github.com/ClickHouse/ClickHouse/pull/15875) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix exception `Block structure mismatch` in `SELECT ... ORDER BY DESC` queries which were executed after `ALTER MODIFY COLUMN` query. Fixes [#15800](https://github.com/ClickHouse/ClickHouse/issues/15800). [#15852](https://github.com/ClickHouse/ClickHouse/pull/15852) ([alesapin](https://github.com/alesapin)).
+* `MaterializeMySQL` (experimental feature): Fix `select count()` inaccuracy. [#15767](https://github.com/ClickHouse/ClickHouse/pull/15767) ([tavplubix](https://github.com/tavplubix)).
+* Fix some cases of queries, in which only virtual columns are selected. Previously `Not found column _nothing in block` exception may be thrown. Fixes [#12298](https://github.com/ClickHouse/ClickHouse/issues/12298). [#15756](https://github.com/ClickHouse/ClickHouse/pull/15756) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix drop of materialized view with inner table in Atomic database (hangs all subsequent DROP TABLE due to hang of the worker thread, due to recursive DROP TABLE for inner table of MV). [#15743](https://github.com/ClickHouse/ClickHouse/pull/15743) ([Azat Khuzhin](https://github.com/azat)).
+* Possibility to move part to another disk/volume if the first attempt was failed. [#15723](https://github.com/ClickHouse/ClickHouse/pull/15723) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Fix error `Cannot find column` which may happen at insertion into `MATERIALIZED VIEW` in case if query for `MV` containes `ARRAY JOIN`. [#15717](https://github.com/ClickHouse/ClickHouse/pull/15717) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed too low default value of `max_replicated_logs_to_keep` setting, which might cause replicas to become lost too often. Improve lost replica recovery process by choosing the most up-to-date replica to clone. Also do not remove old parts from lost replica, detach them instead. [#15701](https://github.com/ClickHouse/ClickHouse/pull/15701) ([tavplubix](https://github.com/tavplubix)).
+* Fix rare race condition in dictionaries and tables from MySQL. [#15686](https://github.com/ClickHouse/ClickHouse/pull/15686) ([alesapin](https://github.com/alesapin)).
+* Fix (benign) race condition in AMQP-CPP. [#15667](https://github.com/ClickHouse/ClickHouse/pull/15667) ([alesapin](https://github.com/alesapin)).
+* Fix error `Cannot add simple transform to empty Pipe` which happened while reading from `Buffer` table which has different structure than destination table. It was possible if destination table returned empty result for query. Fixes [#15529](https://github.com/ClickHouse/ClickHouse/issues/15529). [#15662](https://github.com/ClickHouse/ClickHouse/pull/15662) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Proper error handling during insert into MergeTree with S3. MergeTree over S3 is an experimental feature. [#15657](https://github.com/ClickHouse/ClickHouse/pull/15657) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Fixed bug with S3 table function: region from URL was not applied to S3 client configuration. [#15646](https://github.com/ClickHouse/ClickHouse/pull/15646) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Fix the order of destruction for resources in `ReadFromStorage` step of query plan. It might cause crashes in rare cases. Possibly connected with [#15610](https://github.com/ClickHouse/ClickHouse/issues/15610). [#15645](https://github.com/ClickHouse/ClickHouse/pull/15645) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Subtract `ReadonlyReplica` metric when detach readonly tables. [#15592](https://github.com/ClickHouse/ClickHouse/pull/15592) ([sundyli](https://github.com/sundy-li)).
+* Fixed `Element ... is not a constant expression` error when using `JSON*` function result in `VALUES`, `LIMIT` or right side of `IN` operator. [#15589](https://github.com/ClickHouse/ClickHouse/pull/15589) ([tavplubix](https://github.com/tavplubix)).
+* Query will finish faster in case of exception. Cancel execution on remote replicas if exception happens. [#15578](https://github.com/ClickHouse/ClickHouse/pull/15578) ([Azat Khuzhin](https://github.com/azat)).
+* Prevent the possibility of error message `Could not calculate available disk space (statvfs), errno: 4, strerror: Interrupted system call`. This fixes [#15541](https://github.com/ClickHouse/ClickHouse/issues/15541). [#15557](https://github.com/ClickHouse/ClickHouse/pull/15557) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix `Database <db> doesn't exist.` in queries with IN and Distributed table when there's no database on initiator. [#15538](https://github.com/ClickHouse/ClickHouse/pull/15538) ([Artem Zuikov](https://github.com/4ertus2)).
+* Mutation might hang waiting for some non-existent part after `MOVE` or `REPLACE PARTITION` or, in rare cases, after `DETACH` or `DROP PARTITION`. It's fixed. [#15537](https://github.com/ClickHouse/ClickHouse/pull/15537) ([tavplubix](https://github.com/tavplubix)).
+* Fix bug when `ILIKE` operator stops being case insensitive if `LIKE` with the same pattern was executed. [#15536](https://github.com/ClickHouse/ClickHouse/pull/15536) ([alesapin](https://github.com/alesapin)).
+* Fix `Missing columns` errors when selecting columns which absent in data, but depend on other columns which also absent in data. Fixes [#15530](https://github.com/ClickHouse/ClickHouse/issues/15530). [#15532](https://github.com/ClickHouse/ClickHouse/pull/15532) ([alesapin](https://github.com/alesapin)).
+* Throw an error when a single parameter is passed to ReplicatedMergeTree instead of ignoring it. [#15516](https://github.com/ClickHouse/ClickHouse/pull/15516) ([nvartolomei](https://github.com/nvartolomei)).
+* Fix bug with event subscription in DDLWorker which rarely may lead to query hangs in `ON CLUSTER`. Introduced in [#13450](https://github.com/ClickHouse/ClickHouse/issues/13450). [#15477](https://github.com/ClickHouse/ClickHouse/pull/15477) ([alesapin](https://github.com/alesapin)).
+* Report proper error when the second argument of `boundingRatio` aggregate function has a wrong type. [#15407](https://github.com/ClickHouse/ClickHouse/pull/15407) ([detailyang](https://github.com/detailyang)).
+* Fixes [#15365](https://github.com/ClickHouse/ClickHouse/issues/15365): attach a database with MySQL engine throws exception (no query context). [#15384](https://github.com/ClickHouse/ClickHouse/pull/15384) ([Winter Zhang](https://github.com/zhang2014)).
+* Fix the case of multiple occurrences of column transformers in a select query. [#15378](https://github.com/ClickHouse/ClickHouse/pull/15378) ([Amos Bird](https://github.com/amosbird)).
+* Fixed compression in `S3` storage. [#15376](https://github.com/ClickHouse/ClickHouse/pull/15376) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Fix bug where queries like `SELECT toStartOfDay(today())` fail complaining about empty time_zone argument. [#15319](https://github.com/ClickHouse/ClickHouse/pull/15319) ([Bharat Nallan](https://github.com/bharatnc)).
+* Fix race condition during MergeTree table rename and background cleanup. [#15304](https://github.com/ClickHouse/ClickHouse/pull/15304) ([alesapin](https://github.com/alesapin)).
+* Fix rare race condition on server startup when system logs are enabled. [#15300](https://github.com/ClickHouse/ClickHouse/pull/15300) ([alesapin](https://github.com/alesapin)).
+* Fix hang of queries with a lot of subqueries to same table of `MySQL` engine. Previously, if there were more than 16 subqueries to same `MySQL` table in query, it hang forever. [#15299](https://github.com/ClickHouse/ClickHouse/pull/15299) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix MSan report in QueryLog. Uninitialized memory can be used for the field `memory_usage`. [#15258](https://github.com/ClickHouse/ClickHouse/pull/15258) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix 'Unknown identifier' in GROUP BY when query has JOIN over Merge table. [#15242](https://github.com/ClickHouse/ClickHouse/pull/15242) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix instance crash when using `joinGet` with `LowCardinality` types. This fixes [#15214](https://github.com/ClickHouse/ClickHouse/issues/15214). [#15220](https://github.com/ClickHouse/ClickHouse/pull/15220) ([Amos Bird](https://github.com/amosbird)).
+* Fix bug in table engine `Buffer` which doesn't allow to insert data of new structure into `Buffer` after `ALTER` query. Fixes [#15117](https://github.com/ClickHouse/ClickHouse/issues/15117). [#15192](https://github.com/ClickHouse/ClickHouse/pull/15192) ([alesapin](https://github.com/alesapin)).
+* Adjust Decimal field size in MySQL column definition packet. [#15152](https://github.com/ClickHouse/ClickHouse/pull/15152) ([maqroll](https://github.com/maqroll)).
+* Fixes `Data compressed with different methods` in `join_algorithm='auto'`. Keep LowCardinality as type for left table join key in `join_algorithm='partial_merge'`. [#15088](https://github.com/ClickHouse/ClickHouse/pull/15088) ([Artem Zuikov](https://github.com/4ertus2)).
+* Update `jemalloc` to fix `percpu_arena` with affinity mask. [#15035](https://github.com/ClickHouse/ClickHouse/pull/15035) ([Azat Khuzhin](https://github.com/azat)). [#14957](https://github.com/ClickHouse/ClickHouse/pull/14957) ([Azat Khuzhin](https://github.com/azat)).
+* We already use padded comparison between String and FixedString (https://github.com/ClickHouse/ClickHouse/blob/master/src/Functions/FunctionsComparison.h#L333). This PR applies the same logic to field comparison which corrects the usage of FixedString as primary keys. This fixes [#14908](https://github.com/ClickHouse/ClickHouse/issues/14908). [#15033](https://github.com/ClickHouse/ClickHouse/pull/15033) ([Amos Bird](https://github.com/amosbird)).
+* If function `bar` was called with specifically crafted arguments, buffer overflow was possible. This closes [#13926](https://github.com/ClickHouse/ClickHouse/issues/13926). [#15028](https://github.com/ClickHouse/ClickHouse/pull/15028) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed `Cannot rename ... errno: 22, strerror: Invalid argument` error on DDL query execution in Atomic database when running clickhouse-server in Docker on Mac OS. [#15024](https://github.com/ClickHouse/ClickHouse/pull/15024) ([tavplubix](https://github.com/tavplubix)).
+* Fix crash in RIGHT or FULL JOIN with join_algorith='auto' when memory limit exceeded and we should change HashJoin with MergeJoin. [#15002](https://github.com/ClickHouse/ClickHouse/pull/15002) ([Artem Zuikov](https://github.com/4ertus2)).
+* Now settings `number_of_free_entries_in_pool_to_execute_mutation` and `number_of_free_entries_in_pool_to_lower_max_size_of_merge` can be equal to `background_pool_size`. [#14975](https://github.com/ClickHouse/ClickHouse/pull/14975) ([alesapin](https://github.com/alesapin)).
+* Fix to make predicate push down work when subquery contains `finalizeAggregation` function. Fixes [#14847](https://github.com/ClickHouse/ClickHouse/issues/14847). [#14937](https://github.com/ClickHouse/ClickHouse/pull/14937) ([filimonov](https://github.com/filimonov)).
+* Publish CPU frequencies per logical core in `system.asynchronous_metrics`. This fixes [#14923](https://github.com/ClickHouse/ClickHouse/issues/14923). [#14924](https://github.com/ClickHouse/ClickHouse/pull/14924) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* `MaterializeMySQL` (experimental feature): Fixed `.metadata.tmp File exists` error. [#14898](https://github.com/ClickHouse/ClickHouse/pull/14898) ([Winter Zhang](https://github.com/zhang2014)).
+* Fix the issue when some invocations of `extractAllGroups` function may trigger "Memory limit exceeded" error. This fixes [#13383](https://github.com/ClickHouse/ClickHouse/issues/13383). [#14889](https://github.com/ClickHouse/ClickHouse/pull/14889) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix SIGSEGV for an attempt to INSERT into StorageFile with file descriptor. [#14887](https://github.com/ClickHouse/ClickHouse/pull/14887) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed segfault in `cache` dictionary [#14837](https://github.com/ClickHouse/ClickHouse/issues/14837). [#14879](https://github.com/ClickHouse/ClickHouse/pull/14879) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* `MaterializeMySQL` (experimental feature): Fixed bug in parsing MySQL binlog events, which causes `Attempt to read after eof` and `Packet payload is not fully read` in `MaterializeMySQL` database engine. [#14852](https://github.com/ClickHouse/ClickHouse/pull/14852) ([Winter Zhang](https://github.com/zhang2014)).
+* Fix rare error in `SELECT` queries when the queried column has `DEFAULT` expression which depends on the other column which also has `DEFAULT` and not present in select query and not exists on disk. Partially fixes [#14531](https://github.com/ClickHouse/ClickHouse/issues/14531). [#14845](https://github.com/ClickHouse/ClickHouse/pull/14845) ([alesapin](https://github.com/alesapin)).
+* Fix a problem where the server may get stuck on startup while talking to ZooKeeper, if the configuration files have to be fetched from ZK (using the `from_zk` include option). This fixes [#14814](https://github.com/ClickHouse/ClickHouse/issues/14814). [#14843](https://github.com/ClickHouse/ClickHouse/pull/14843) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Fix wrong monotonicity detection for shrunk `Int -> Int` cast of signed types. It might lead to incorrect query result. This bug is unveiled in [#14513](https://github.com/ClickHouse/ClickHouse/issues/14513). [#14783](https://github.com/ClickHouse/ClickHouse/pull/14783) ([Amos Bird](https://github.com/amosbird)).
+* `Replace` column transformer should replace identifiers with cloned ASTs. This fixes [#14695](https://github.com/ClickHouse/ClickHouse/issues/14695) . [#14734](https://github.com/ClickHouse/ClickHouse/pull/14734) ([Amos Bird](https://github.com/amosbird)).
+* Fixed missed default database name in metadata of materialized view when executing `ALTER ... MODIFY QUERY`. [#14664](https://github.com/ClickHouse/ClickHouse/pull/14664) ([tavplubix](https://github.com/tavplubix)).
+* Fix bug when `ALTER UPDATE` mutation with `Nullable` column in assignment expression and constant value (like `UPDATE x = 42`) leads to incorrect value in column or segfault. Fixes [#13634](https://github.com/ClickHouse/ClickHouse/issues/13634), [#14045](https://github.com/ClickHouse/ClickHouse/issues/14045). [#14646](https://github.com/ClickHouse/ClickHouse/pull/14646) ([alesapin](https://github.com/alesapin)).
+* Fix wrong Decimal multiplication result caused wrong decimal scale of result column. [#14603](https://github.com/ClickHouse/ClickHouse/pull/14603) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix function `has` with `LowCardinality` of `Nullable`. [#14591](https://github.com/ClickHouse/ClickHouse/pull/14591) ([Mike](https://github.com/myrrc)).
+* Cleanup data directory after Zookeeper exceptions during CreateQuery for StorageReplicatedMergeTree Engine. [#14563](https://github.com/ClickHouse/ClickHouse/pull/14563) ([Bharat Nallan](https://github.com/bharatnc)).
+* Fix rare segfaults in functions with combinator `-Resample`, which could appear in result of overflow with very large parameters. [#14562](https://github.com/ClickHouse/ClickHouse/pull/14562) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix a bug when converting `Nullable(String)` to Enum. Introduced by [#12745](https://github.com/ClickHouse/ClickHouse/pull/12745). This fixes [#14435](https://github.com/ClickHouse/ClickHouse/issues/14435). [#14530](https://github.com/ClickHouse/ClickHouse/pull/14530) ([Amos Bird](https://github.com/amosbird)).
+* Fixed the incorrect sorting order of `Nullable` column. This fixes [#14344](https://github.com/ClickHouse/ClickHouse/issues/14344). [#14495](https://github.com/ClickHouse/ClickHouse/pull/14495) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fix `currentDatabase()` function cannot be used in `ON CLUSTER` ddl query. [#14211](https://github.com/ClickHouse/ClickHouse/pull/14211) ([Winter Zhang](https://github.com/zhang2014)).
+* `MaterializeMySQL` (experimental feature): Fixed `Packet payload is not fully read` error in `MaterializeMySQL` database engine. [#14696](https://github.com/ClickHouse/ClickHouse/pull/14696) ([BohuTANG](https://github.com/BohuTANG)).
+
+#### Improvement
+
+* Enable `Atomic` database engine by default for newly created databases. [#15003](https://github.com/ClickHouse/ClickHouse/pull/15003) ([tavplubix](https://github.com/tavplubix)).
+* Add the ability to specify specialized codecs like `Delta`, `T64`, etc. for columns with subtypes. Implements [#12551](https://github.com/ClickHouse/ClickHouse/issues/12551), fixes [#11397](https://github.com/ClickHouse/ClickHouse/issues/11397), fixes [#4609](https://github.com/ClickHouse/ClickHouse/issues/4609). [#15089](https://github.com/ClickHouse/ClickHouse/pull/15089) ([alesapin](https://github.com/alesapin)).
+* Dynamic reload of zookeeper config. [#14678](https://github.com/ClickHouse/ClickHouse/pull/14678) ([sundyli](https://github.com/sundy-li)).
+* Now it's allowed to execute `ALTER ... ON CLUSTER` queries regardless of the `<internal_replication>` setting in cluster config. [#16075](https://github.com/ClickHouse/ClickHouse/pull/16075) ([alesapin](https://github.com/alesapin)).
+* Now `joinGet` supports multi-key lookup. Continuation of [#12418](https://github.com/ClickHouse/ClickHouse/issues/12418). [#13015](https://github.com/ClickHouse/ClickHouse/pull/13015) ([Amos Bird](https://github.com/amosbird)).
+* Wait for `DROP/DETACH TABLE` to actually finish if `NO DELAY` or `SYNC` is specified for `Atomic` database. [#15448](https://github.com/ClickHouse/ClickHouse/pull/15448) ([tavplubix](https://github.com/tavplubix)).
+* Now it's possible to change the type of version column for `VersionedCollapsingMergeTree` with `ALTER` query. [#15442](https://github.com/ClickHouse/ClickHouse/pull/15442) ([alesapin](https://github.com/alesapin)).
+* Unfold `{database}`, `{table}` and `{uuid}` macros in `zookeeper_path` on replicated table creation. Do not allow `RENAME TABLE` if it may break `zookeeper_path` after server restart. Fixes [#6917](https://github.com/ClickHouse/ClickHouse/issues/6917). [#15348](https://github.com/ClickHouse/ClickHouse/pull/15348) ([tavplubix](https://github.com/tavplubix)).
+* The function `now` allows an argument with timezone. This closes [15264](https://github.com/ClickHouse/ClickHouse/issues/15264). [#15285](https://github.com/ClickHouse/ClickHouse/pull/15285) ([flynn](https://github.com/ucasFL)).
+* Do not allow connections to ClickHouse server until all scripts in `/docker-entrypoint-initdb.d/` are executed. [#15244](https://github.com/ClickHouse/ClickHouse/pull/15244) ([Aleksei Kozharin](https://github.com/alekseik1)).
+* Added `optimize` setting to `EXPLAIN PLAN` query. If enabled, query plan level optimisations are applied. Enabled by default. [#15201](https://github.com/ClickHouse/ClickHouse/pull/15201) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Proper exception message for wrong number of arguments of CAST. This closes [#13992](https://github.com/ClickHouse/ClickHouse/issues/13992). [#15029](https://github.com/ClickHouse/ClickHouse/pull/15029) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add option to disable TTL move on data part insert. [#15000](https://github.com/ClickHouse/ClickHouse/pull/15000) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Ignore key constraints when doing mutations. Without this pull request, it's not possible to do mutations when `force_index_by_date = 1` or `force_primary_key = 1`. [#14973](https://github.com/ClickHouse/ClickHouse/pull/14973) ([Amos Bird](https://github.com/amosbird)).
+* Allow to drop Replicated table if previous drop attempt was failed due to ZooKeeper session expiration. This fixes [#11891](https://github.com/ClickHouse/ClickHouse/issues/11891). [#14926](https://github.com/ClickHouse/ClickHouse/pull/14926) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed excessive settings constraint violation when running SELECT with SETTINGS from a distributed table. [#14876](https://github.com/ClickHouse/ClickHouse/pull/14876) ([Amos Bird](https://github.com/amosbird)).
+* Provide a `load_balancing_first_offset` query setting to explicitly state what the first replica is. It's used together with `FIRST_OR_RANDOM` load balancing strategy, which allows to control replicas workload. [#14867](https://github.com/ClickHouse/ClickHouse/pull/14867) ([Amos Bird](https://github.com/amosbird)).
+* Show subqueries for `SET` and `JOIN` in `EXPLAIN` result. [#14856](https://github.com/ClickHouse/ClickHouse/pull/14856) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Allow using multi-volume storage configuration in storage `Distributed`. [#14839](https://github.com/ClickHouse/ClickHouse/pull/14839) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Construct `query_start_time` and `query_start_time_microseconds` from the same timespec. [#14831](https://github.com/ClickHouse/ClickHouse/pull/14831) ([Bharat Nallan](https://github.com/bharatnc)).
+* Support for disabling persistency for `StorageJoin` and `StorageSet`, this feature is controlled by setting `disable_set_and_join_persistency`. And this PR solved issue [#6318](https://github.com/ClickHouse/ClickHouse/issues/6318). [#14776](https://github.com/ClickHouse/ClickHouse/pull/14776) ([vxider](https://github.com/Vxider)).
+* Now `COLUMNS` can be used to wrap over a list of columns and apply column transformers afterwards. [#14775](https://github.com/ClickHouse/ClickHouse/pull/14775) ([Amos Bird](https://github.com/amosbird)).
+* Add `merge_algorithm` to `system.merges` table to improve merging inspections. [#14705](https://github.com/ClickHouse/ClickHouse/pull/14705) ([Amos Bird](https://github.com/amosbird)).
+* Fix potential memory leak caused by zookeeper exists watch. [#14693](https://github.com/ClickHouse/ClickHouse/pull/14693) ([hustnn](https://github.com/hustnn)).
+* Allow parallel execution of distributed DDL. [#14684](https://github.com/ClickHouse/ClickHouse/pull/14684) ([Azat Khuzhin](https://github.com/azat)).
+* Add `QueryMemoryLimitExceeded` event counter. This closes [#14589](https://github.com/ClickHouse/ClickHouse/issues/14589). [#14647](https://github.com/ClickHouse/ClickHouse/pull/14647) ([fastio](https://github.com/fastio)).
+* Fix some trailing whitespaces in query formatting. [#14595](https://github.com/ClickHouse/ClickHouse/pull/14595) ([Azat Khuzhin](https://github.com/azat)).
+* ClickHouse treats partition expr and key expr differently. Partition expr is used to construct an minmax index containing related columns, while primary key expr is stored as an expr. Sometimes user might partition a table at coarser levels, such as `partition by i / 1000`. However, binary operators are not monotonic and this PR tries to fix that. It might also benifit other use cases. [#14513](https://github.com/ClickHouse/ClickHouse/pull/14513) ([Amos Bird](https://github.com/amosbird)).
+* Add an option to skip access checks for `DiskS3`. `s3` disk is an experimental feature. [#14497](https://github.com/ClickHouse/ClickHouse/pull/14497) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Speed up server shutdown process if there are ongoing S3 requests. [#14496](https://github.com/ClickHouse/ClickHouse/pull/14496) ([Pavel Kovalenko](https://github.com/Jokser)).
+* `SYSTEM RELOAD CONFIG` now throws an exception if failed to reload and continues using the previous users.xml. The background periodic reloading also continues using the previous users.xml if failed to reload. [#14492](https://github.com/ClickHouse/ClickHouse/pull/14492) ([Vitaly Baranov](https://github.com/vitlibar)).
+* For INSERTs with inline data in VALUES format in the script mode of `clickhouse-client`, support semicolon as the data terminator, in addition to the new line. Closes [#12288](https://github.com/ClickHouse/ClickHouse/issues/12288). [#13192](https://github.com/ClickHouse/ClickHouse/pull/13192) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Support custom codecs in compact parts. [#12183](https://github.com/ClickHouse/ClickHouse/pull/12183) ([Anton Popov](https://github.com/CurtizJ)).
+
+#### Performance Improvement
+
+* Enable compact parts by default for small parts. This will allow to process frequent inserts slightly more efficiently (4..100 times). [#11913](https://github.com/ClickHouse/ClickHouse/pull/11913) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Improve `quantileTDigest` performance. This fixes [#2668](https://github.com/ClickHouse/ClickHouse/issues/2668). [#15542](https://github.com/ClickHouse/ClickHouse/pull/15542) ([Kruglov Pavel](https://github.com/Avogar)).
+* Significantly reduce memory usage in AggregatingInOrderTransform/optimize_aggregation_in_order. [#15543](https://github.com/ClickHouse/ClickHouse/pull/15543) ([Azat Khuzhin](https://github.com/azat)).
+* Faster 256-bit multiplication. [#15418](https://github.com/ClickHouse/ClickHouse/pull/15418) ([Artem Zuikov](https://github.com/4ertus2)).
+* Improve performance of 256-bit types using (u)int64_t as base type for wide integers. Original wide integers use 8-bit types as base. [#14859](https://github.com/ClickHouse/ClickHouse/pull/14859) ([Artem Zuikov](https://github.com/4ertus2)).
+* Explicitly use a temporary disk to store vertical merge temporary data. [#15639](https://github.com/ClickHouse/ClickHouse/pull/15639) ([Grigory Pervakov](https://github.com/GrigoryPervakov)).
+* Use one S3 DeleteObjects request instead of multiple DeleteObject in a loop. No any functionality changes, so covered by existing tests like integration/test_log_family_s3. [#15238](https://github.com/ClickHouse/ClickHouse/pull/15238) ([ianton-ru](https://github.com/ianton-ru)).
+* Fix `DateTime <op> DateTime` mistakenly choosing the slow generic implementation. This fixes [#15153](https://github.com/ClickHouse/ClickHouse/issues/15153). [#15178](https://github.com/ClickHouse/ClickHouse/pull/15178) ([Amos Bird](https://github.com/amosbird)).
+* Improve performance of GROUP BY key of type `FixedString`. [#15034](https://github.com/ClickHouse/ClickHouse/pull/15034) ([Amos Bird](https://github.com/amosbird)).
+* Only `mlock` code segment when starting clickhouse-server. In previous versions, all mapped regions were locked in memory, including debug info. Debug info is usually splitted to a separate file but if it isn't, it led to +2..3 GiB memory usage. [#14929](https://github.com/ClickHouse/ClickHouse/pull/14929) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* ClickHouse binary become smaller due to link time optimization.
+
+#### Build/Testing/Packaging Improvement
+
+* Now we use clang-11 for production ClickHouse build. [#15239](https://github.com/ClickHouse/ClickHouse/pull/15239) ([alesapin](https://github.com/alesapin)).
+* Now we use clang-11 to build ClickHouse in CI. [#14846](https://github.com/ClickHouse/ClickHouse/pull/14846) ([alesapin](https://github.com/alesapin)).
+* Switch binary builds (Linux, Darwin, AArch64, FreeDSD) to clang-11. [#15622](https://github.com/ClickHouse/ClickHouse/pull/15622) ([Ilya Yatsishin](https://github.com/qoega)).
+* Now all test images use `llvm-symbolizer-11`. [#15069](https://github.com/ClickHouse/ClickHouse/pull/15069) ([alesapin](https://github.com/alesapin)).
+* Allow to build with llvm-11. [#15366](https://github.com/ClickHouse/ClickHouse/pull/15366) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Switch from `clang-tidy-10` to `clang-tidy-11`. [#14922](https://github.com/ClickHouse/ClickHouse/pull/14922) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Use LLVM's experimental pass manager by default. [#15608](https://github.com/ClickHouse/ClickHouse/pull/15608) ([Danila Kutenin](https://github.com/danlark1)).
+* Don't allow any C++ translation unit to build more than 10 minutes or to use more than 10 GB or memory. This fixes [#14925](https://github.com/ClickHouse/ClickHouse/issues/14925). [#15060](https://github.com/ClickHouse/ClickHouse/pull/15060) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Make performance test more stable and representative by splitting test runs and profile runs. [#15027](https://github.com/ClickHouse/ClickHouse/pull/15027) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Attempt to make performance test more reliable. It is done by remapping the executable memory of the process on the fly with `madvise` to use transparent huge pages - it can lower the number of iTLB misses which is the main source of instabilities in performance tests. [#14685](https://github.com/ClickHouse/ClickHouse/pull/14685) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Convert to python3. This closes [#14886](https://github.com/ClickHouse/ClickHouse/issues/14886). [#15007](https://github.com/ClickHouse/ClickHouse/pull/15007) ([Azat Khuzhin](https://github.com/azat)).
+* Fail early in functional tests if server failed to respond. This closes [#15262](https://github.com/ClickHouse/ClickHouse/issues/15262). [#15267](https://github.com/ClickHouse/ClickHouse/pull/15267) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Allow to run AArch64 version of clickhouse-server without configs. This facilitates [#15174](https://github.com/ClickHouse/ClickHouse/issues/15174). [#15266](https://github.com/ClickHouse/ClickHouse/pull/15266) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Improvements in CI docker images: get rid of ZooKeeper and single script for test configs installation. [#15215](https://github.com/ClickHouse/ClickHouse/pull/15215) ([alesapin](https://github.com/alesapin)).
+* Fix CMake options forwarding in fast test script. Fixes error in [#14711](https://github.com/ClickHouse/ClickHouse/issues/14711). [#15155](https://github.com/ClickHouse/ClickHouse/pull/15155) ([alesapin](https://github.com/alesapin)).
+* Added a script to perform hardware benchmark in a single command. [#15115](https://github.com/ClickHouse/ClickHouse/pull/15115) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Splitted huge test `test_dictionaries_all_layouts_and_sources` into smaller ones. [#15110](https://github.com/ClickHouse/ClickHouse/pull/15110) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Maybe fix MSan report in base64 (on servers with AVX-512). This fixes [#14006](https://github.com/ClickHouse/ClickHouse/issues/14006). [#15030](https://github.com/ClickHouse/ClickHouse/pull/15030) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Reformat and cleanup code in all integration test *.py files. [#14864](https://github.com/ClickHouse/ClickHouse/pull/14864) ([Bharat Nallan](https://github.com/bharatnc)).
+* Fix MaterializeMySQL empty transaction unstable test case found in CI. [#14854](https://github.com/ClickHouse/ClickHouse/pull/14854) ([Winter Zhang](https://github.com/zhang2014)).
+* Attempt to speed up build a little. [#14808](https://github.com/ClickHouse/ClickHouse/pull/14808) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Speed up build a little by removing unused headers. [#14714](https://github.com/ClickHouse/ClickHouse/pull/14714) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix build failure in OSX. [#14761](https://github.com/ClickHouse/ClickHouse/pull/14761) ([Winter Zhang](https://github.com/zhang2014)).
+* Enable ccache by default in cmake if it's found in OS. [#14575](https://github.com/ClickHouse/ClickHouse/pull/14575) ([alesapin](https://github.com/alesapin)).
+* Control CI builds configuration from the ClickHouse repository. [#14547](https://github.com/ClickHouse/ClickHouse/pull/14547) ([alesapin](https://github.com/alesapin)).
+* In CMake files: - Moved some options' descriptions' parts to comments above. - Replace 0 -> `OFF`, 1 -> `ON` in `option`s default values. - Added some descriptions and links to docs to the options. - Replaced `FUZZER` option (there is another option `ENABLE_FUZZING` which also enables same functionality). - Removed `ENABLE_GTEST_LIBRARY` option as there is `ENABLE_TESTS`. See the full description in PR: [#14711](https://github.com/ClickHouse/ClickHouse/pull/14711) ([Mike](https://github.com/myrrc)).
+* Make binary a bit smaller (~50 Mb for debug version). [#14555](https://github.com/ClickHouse/ClickHouse/pull/14555) ([Artem Zuikov](https://github.com/4ertus2)).
+* Use std::filesystem::path in ConfigProcessor for concatenating file paths. [#14558](https://github.com/ClickHouse/ClickHouse/pull/14558) ([Bharat Nallan](https://github.com/bharatnc)).
+* Fix debug assertion in `bitShiftLeft()` when called with negative big integer. [#14697](https://github.com/ClickHouse/ClickHouse/pull/14697) ([Artem Zuikov](https://github.com/4ertus2)).
+
+
+## ClickHouse release 20.9
+
+### ClickHouse release v20.9.5.5-stable, 2020-11-13
+
+#### Bug Fix
+
+* Fix rare silent crashes when query profiler is on and ClickHouse is installed on OS with glibc version that has (supposedly) broken asynchronous unwind tables for some functions. This fixes [#15301](https://github.com/ClickHouse/ClickHouse/issues/15301). This fixes [#13098](https://github.com/ClickHouse/ClickHouse/issues/13098). [#16846](https://github.com/ClickHouse/ClickHouse/pull/16846) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Now when parsing AVRO from input the LowCardinality is removed from type. Fixes [#16188](https://github.com/ClickHouse/ClickHouse/issues/16188). [#16521](https://github.com/ClickHouse/ClickHouse/pull/16521) ([Mike](https://github.com/myrrc)).
+* Fix rapid growth of metadata when using MySQL Master -> MySQL Slave -> ClickHouse MaterializeMySQL Engine, and `slave_parallel_worker` enabled on MySQL Slave, by properly shrinking GTID sets. This fixes [#15951](https://github.com/ClickHouse/ClickHouse/issues/15951). [#16504](https://github.com/ClickHouse/ClickHouse/pull/16504) ([TCeason](https://github.com/TCeason)).
+* Fix DROP TABLE for Distributed (racy with INSERT). [#16409](https://github.com/ClickHouse/ClickHouse/pull/16409) ([Azat Khuzhin](https://github.com/azat)).
+* Fix processing of very large entries in replication queue. Very large entries may appear in ALTER queries if table structure is extremely large (near 1 MB). This fixes [#16307](https://github.com/ClickHouse/ClickHouse/issues/16307). [#16332](https://github.com/ClickHouse/ClickHouse/pull/16332) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed the inconsistent behaviour when a part of return data could be dropped because the set for its filtration wasn't created. [#16308](https://github.com/ClickHouse/ClickHouse/pull/16308) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fix bug with MySQL database. When MySQL server used as database engine is down some queries raise Exception, because they try to get tables from disabled server, while it's unnecessary. For example, query `SELECT ... FROM system.parts` should work only with MergeTree tables and don't touch MySQL database at all. [#16032](https://github.com/ClickHouse/ClickHouse/pull/16032) ([Kruglov Pavel](https://github.com/Avogar)).
+
+
+### ClickHouse release v20.9.4.76-stable (2020-10-29)
+
+#### Bug Fix
+
+* Fix double free in case of exception in function `dictGet`. It could have happened if dictionary was loaded with error. [#16429](https://github.com/ClickHouse/ClickHouse/pull/16429) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix group by with totals/rollup/cube modifers and min/max functions over group by keys. Fixes [#16393](https://github.com/ClickHouse/ClickHouse/issues/16393). [#16397](https://github.com/ClickHouse/ClickHouse/pull/16397) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix async Distributed INSERT w/ prefer_localhost_replica=0 and internal_replication. [#16358](https://github.com/ClickHouse/ClickHouse/pull/16358) ([Azat Khuzhin](https://github.com/azat)).
+* Fix a very wrong code in TwoLevelStringHashTable implementation, which might lead to memory leak. I'm suprised how this bug can lurk for so long.... [#16264](https://github.com/ClickHouse/ClickHouse/pull/16264) ([Amos Bird](https://github.com/amosbird)).
+* Fix the case when memory can be overallocated regardless to the limit. This closes [#14560](https://github.com/ClickHouse/ClickHouse/issues/14560). [#16206](https://github.com/ClickHouse/ClickHouse/pull/16206) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix `ALTER MODIFY ... ORDER BY` query hang for `ReplicatedVersionedCollapsingMergeTree`. This fixes [#15980](https://github.com/ClickHouse/ClickHouse/issues/15980). [#16011](https://github.com/ClickHouse/ClickHouse/pull/16011) ([alesapin](https://github.com/alesapin)).
+* Fix collate name & charset name parser and support `length = 0` for string type. [#16008](https://github.com/ClickHouse/ClickHouse/pull/16008) ([Winter Zhang](https://github.com/zhang2014)).
+* Allow to use direct layout for dictionaries with complex keys. [#16007](https://github.com/ClickHouse/ClickHouse/pull/16007) ([Anton Popov](https://github.com/CurtizJ)).
+* Prevent replica hang for 5-10 mins when replication error happens after a period of inactivity. [#15987](https://github.com/ClickHouse/ClickHouse/pull/15987) ([filimonov](https://github.com/filimonov)).
+* Fix rare segfaults when inserting into or selecting from MaterializedView and concurrently dropping target table (for Atomic database engine). [#15984](https://github.com/ClickHouse/ClickHouse/pull/15984) ([tavplubix](https://github.com/tavplubix)).
+* Fix ambiguity in parsing of settings profiles: `CREATE USER ... SETTINGS profile readonly` is now considered as using a profile named `readonly`, not a setting named `profile` with the readonly constraint. This fixes [#15628](https://github.com/ClickHouse/ClickHouse/issues/15628). [#15982](https://github.com/ClickHouse/ClickHouse/pull/15982) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix a crash when database creation fails. [#15954](https://github.com/ClickHouse/ClickHouse/pull/15954) ([Winter Zhang](https://github.com/zhang2014)).
+* Fixed `DROP TABLE IF EXISTS` failure with `Table ... doesn't exist` error when table is concurrently renamed (for Atomic database engine). Fixed rare deadlock when concurrently executing some DDL queries with multiple tables (like `DROP DATABASE` and `RENAME TABLE`) Fixed `DROP/DETACH DATABASE` failure with `Table ... doesn't exist` when concurrently executing `DROP/DETACH TABLE`. [#15934](https://github.com/ClickHouse/ClickHouse/pull/15934) ([tavplubix](https://github.com/tavplubix)).
+* Fix incorrect empty result for query from `Distributed` table if query has `WHERE`, `PREWHERE` and `GLOBAL IN`. Fixes [#15792](https://github.com/ClickHouse/ClickHouse/issues/15792). [#15933](https://github.com/ClickHouse/ClickHouse/pull/15933) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix possible deadlocks in RBAC. [#15875](https://github.com/ClickHouse/ClickHouse/pull/15875) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix exception `Block structure mismatch` in `SELECT ... ORDER BY DESC` queries which were executed after `ALTER MODIFY COLUMN` query. Fixes [#15800](https://github.com/ClickHouse/ClickHouse/issues/15800). [#15852](https://github.com/ClickHouse/ClickHouse/pull/15852) ([alesapin](https://github.com/alesapin)).
+* Fix `select count()` inaccuracy for MaterializeMySQL. [#15767](https://github.com/ClickHouse/ClickHouse/pull/15767) ([tavplubix](https://github.com/tavplubix)).
+* Fix some cases of queries, in which only virtual columns are selected. Previously `Not found column _nothing in block` exception may be thrown. Fixes [#12298](https://github.com/ClickHouse/ClickHouse/issues/12298). [#15756](https://github.com/ClickHouse/ClickHouse/pull/15756) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed too low default value of `max_replicated_logs_to_keep` setting, which might cause replicas to become lost too often. Improve lost replica recovery process by choosing the most up-to-date replica to clone. Also do not remove old parts from lost replica, detach them instead. [#15701](https://github.com/ClickHouse/ClickHouse/pull/15701) ([tavplubix](https://github.com/tavplubix)).
+* Fix error `Cannot add simple transform to empty Pipe` which happened while reading from `Buffer` table which has different structure than destination table. It was possible if destination table returned empty result for query. Fixes [#15529](https://github.com/ClickHouse/ClickHouse/issues/15529). [#15662](https://github.com/ClickHouse/ClickHouse/pull/15662) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed bug with globs in S3 table function, region from URL was not applied to S3 client configuration. [#15646](https://github.com/ClickHouse/ClickHouse/pull/15646) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Decrement the `ReadonlyReplica` metric when detaching read-only tables. This fixes [#15598](https://github.com/ClickHouse/ClickHouse/issues/15598). [#15592](https://github.com/ClickHouse/ClickHouse/pull/15592) ([sundyli](https://github.com/sundy-li)).
+* Throw an error when a single parameter is passed to ReplicatedMergeTree instead of ignoring it. [#15516](https://github.com/ClickHouse/ClickHouse/pull/15516) ([nvartolomei](https://github.com/nvartolomei)).
+
+#### Improvement
+
+* Now it's allowed to execute `ALTER ... ON CLUSTER` queries regardless of the `<internal_replication>` setting in cluster config. [#16075](https://github.com/ClickHouse/ClickHouse/pull/16075) ([alesapin](https://github.com/alesapin)).
+* Unfold `{database}`, `{table}` and `{uuid}` macros in `ReplicatedMergeTree` arguments on table creation. [#16160](https://github.com/ClickHouse/ClickHouse/pull/16160) ([tavplubix](https://github.com/tavplubix)).
+
+
+### ClickHouse release v20.9.3.45-stable (2020-10-09)
+
+#### Bug Fix
+
+* Fix error `Cannot find column` which may happen at insertion into `MATERIALIZED VIEW` in case if query for `MV` containes `ARRAY JOIN`. [#15717](https://github.com/ClickHouse/ClickHouse/pull/15717) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix race condition in AMQP-CPP. [#15667](https://github.com/ClickHouse/ClickHouse/pull/15667) ([alesapin](https://github.com/alesapin)).
+* Fix the order of destruction for resources in `ReadFromStorage` step of query plan. It might cause crashes in rare cases. Possibly connected with [#15610](https://github.com/ClickHouse/ClickHouse/issues/15610). [#15645](https://github.com/ClickHouse/ClickHouse/pull/15645) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed `Element ... is not a constant expression` error when using `JSON*` function result in `VALUES`, `LIMIT` or right side of `IN` operator. [#15589](https://github.com/ClickHouse/ClickHouse/pull/15589) ([tavplubix](https://github.com/tavplubix)).
+* Prevent the possibility of error message `Could not calculate available disk space (statvfs), errno: 4, strerror: Interrupted system call`. This fixes [#15541](https://github.com/ClickHouse/ClickHouse/issues/15541). [#15557](https://github.com/ClickHouse/ClickHouse/pull/15557) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Significantly reduce memory usage in AggregatingInOrderTransform/optimize_aggregation_in_order. [#15543](https://github.com/ClickHouse/ClickHouse/pull/15543) ([Azat Khuzhin](https://github.com/azat)).
+* Mutation might hang waiting for some non-existent part after `MOVE` or `REPLACE PARTITION` or, in rare cases, after `DETACH` or `DROP PARTITION`. It's fixed. [#15537](https://github.com/ClickHouse/ClickHouse/pull/15537) ([tavplubix](https://github.com/tavplubix)).
+* Fix bug when `ILIKE` operator stops being case insensitive if `LIKE` with the same pattern was executed. [#15536](https://github.com/ClickHouse/ClickHouse/pull/15536) ([alesapin](https://github.com/alesapin)).
+* Fix `Missing columns` errors when selecting columns which absent in data, but depend on other columns which also absent in data. Fixes [#15530](https://github.com/ClickHouse/ClickHouse/issues/15530). [#15532](https://github.com/ClickHouse/ClickHouse/pull/15532) ([alesapin](https://github.com/alesapin)).
+* Fix bug with event subscription in DDLWorker which rarely may lead to query hangs in `ON CLUSTER`. Introduced in [#13450](https://github.com/ClickHouse/ClickHouse/issues/13450). [#15477](https://github.com/ClickHouse/ClickHouse/pull/15477) ([alesapin](https://github.com/alesapin)).
+* Report proper error when the second argument of `boundingRatio` aggregate function has a wrong type. [#15407](https://github.com/ClickHouse/ClickHouse/pull/15407) ([detailyang](https://github.com/detailyang)).
+* Fix bug where queries like `SELECT toStartOfDay(today())` fail complaining about empty time_zone argument. [#15319](https://github.com/ClickHouse/ClickHouse/pull/15319) ([Bharat Nallan](https://github.com/bharatnc)).
+* Fix race condition during MergeTree table rename and background cleanup. [#15304](https://github.com/ClickHouse/ClickHouse/pull/15304) ([alesapin](https://github.com/alesapin)).
+* Fix rare race condition on server startup when system.logs are enabled. [#15300](https://github.com/ClickHouse/ClickHouse/pull/15300) ([alesapin](https://github.com/alesapin)).
+* Fix MSan report in QueryLog. Uninitialized memory can be used for the field `memory_usage`. [#15258](https://github.com/ClickHouse/ClickHouse/pull/15258) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix instance crash when using joinGet with LowCardinality types. This fixes [#15214](https://github.com/ClickHouse/ClickHouse/issues/15214). [#15220](https://github.com/ClickHouse/ClickHouse/pull/15220) ([Amos Bird](https://github.com/amosbird)).
+* Fix bug in table engine `Buffer` which doesn't allow to insert data of new structure into `Buffer` after `ALTER` query. Fixes [#15117](https://github.com/ClickHouse/ClickHouse/issues/15117). [#15192](https://github.com/ClickHouse/ClickHouse/pull/15192) ([alesapin](https://github.com/alesapin)).
+* Adjust decimals field size in mysql column definition packet. [#15152](https://github.com/ClickHouse/ClickHouse/pull/15152) ([maqroll](https://github.com/maqroll)).
+* Fixed `Cannot rename ... errno: 22, strerror: Invalid argument` error on DDL query execution in Atomic database when running clickhouse-server in docker on Mac OS. [#15024](https://github.com/ClickHouse/ClickHouse/pull/15024) ([tavplubix](https://github.com/tavplubix)).
+* Fix to make predicate push down work when subquery contains finalizeAggregation function. Fixes [#14847](https://github.com/ClickHouse/ClickHouse/issues/14847). [#14937](https://github.com/ClickHouse/ClickHouse/pull/14937) ([filimonov](https://github.com/filimonov)).
+* Fix a problem where the server may get stuck on startup while talking to ZooKeeper, if the configuration files have to be fetched from ZK (using the `from_zk` include option). This fixes [#14814](https://github.com/ClickHouse/ClickHouse/issues/14814). [#14843](https://github.com/ClickHouse/ClickHouse/pull/14843) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+
+#### Improvement
+
+* Now it's possible to change the type of version column for `VersionedCollapsingMergeTree` with `ALTER` query. [#15442](https://github.com/ClickHouse/ClickHouse/pull/15442) ([alesapin](https://github.com/alesapin)).
+
+
+### ClickHouse release v20.9.2.20, 2020-09-22
+
+#### Backward Incompatible Change
+
+* When upgrading from versions older than 20.5, if rolling update is performed and cluster contains both versions 20.5 or greater and less than 20.5, if ClickHouse nodes with old versions are restarted and old version has been started up in presence of newer versions, it may lead to `Part ... intersects previous part` errors. To prevent this error, first install newer clickhouse-server packages on all cluster nodes and then do restarts (so, when clickhouse-server is restarted, it will start up with the new version).
+
+#### New Feature
+
+* Added column transformers `EXCEPT`, `REPLACE`, `APPLY`, which can be applied to the list of selected columns (after `*` or `COLUMNS(...)`). For example, you can write `SELECT * EXCEPT(URL) REPLACE(number + 1 AS number)`. Another example: `select * apply(length) apply(max) from wide_string_table` to find out the maxium length of all string columns. [#14233](https://github.com/ClickHouse/ClickHouse/pull/14233) ([Amos Bird](https://github.com/amosbird)).
+* Added an aggregate function `rankCorr` which computes a rank correlation coefficient. [#11769](https://github.com/ClickHouse/ClickHouse/pull/11769) ([antikvist](https://github.com/antikvist)) [#14411](https://github.com/ClickHouse/ClickHouse/pull/14411) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Added table function `view` which turns a subquery into a table object. This helps passing queries around. For instance, it can be used in remote/cluster table functions. [#12567](https://github.com/ClickHouse/ClickHouse/pull/12567) ([Amos Bird](https://github.com/amosbird)).
+
+#### Bug Fix
+
+* Fix bug when `ALTER UPDATE` mutation with Nullable column in assignment expression and constant value (like `UPDATE x = 42`) leads to incorrect value in column or segfault. Fixes [#13634](https://github.com/ClickHouse/ClickHouse/issues/13634), [#14045](https://github.com/ClickHouse/ClickHouse/issues/14045). [#14646](https://github.com/ClickHouse/ClickHouse/pull/14646) ([alesapin](https://github.com/alesapin)).
+* Fix wrong Decimal multiplication result caused wrong decimal scale of result column. [#14603](https://github.com/ClickHouse/ClickHouse/pull/14603) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fixed the incorrect sorting order of `Nullable` column. This fixes [#14344](https://github.com/ClickHouse/ClickHouse/issues/14344). [#14495](https://github.com/ClickHouse/ClickHouse/pull/14495) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fixed inconsistent comparison with primary key of type `FixedString` on index analysis if they're compered with a string of less size. This fixes [#14908](https://github.com/ClickHouse/ClickHouse/issues/14908). [#15033](https://github.com/ClickHouse/ClickHouse/pull/15033) ([Amos Bird](https://github.com/amosbird)).
+* Fix bug which leads to wrong merges assignment if table has partitions with a single part. [#14444](https://github.com/ClickHouse/ClickHouse/pull/14444) ([alesapin](https://github.com/alesapin)).
+* If function `bar` was called with specifically crafted arguments, buffer overflow was possible. This closes [#13926](https://github.com/ClickHouse/ClickHouse/issues/13926). [#15028](https://github.com/ClickHouse/ClickHouse/pull/15028) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Publish CPU frequencies per logical core in `system.asynchronous_metrics`. This fixes [#14923](https://github.com/ClickHouse/ClickHouse/issues/14923). [#14924](https://github.com/ClickHouse/ClickHouse/pull/14924) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Fixed `.metadata.tmp File exists` error when using `MaterializeMySQL` database engine. [#14898](https://github.com/ClickHouse/ClickHouse/pull/14898) ([Winter Zhang](https://github.com/zhang2014)).
+* Fix the issue when some invocations of `extractAllGroups` function may trigger "Memory limit exceeded" error. This fixes [#13383](https://github.com/ClickHouse/ClickHouse/issues/13383). [#14889](https://github.com/ClickHouse/ClickHouse/pull/14889) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix SIGSEGV for an attempt to INSERT into StorageFile(fd). [#14887](https://github.com/ClickHouse/ClickHouse/pull/14887) ([Azat Khuzhin](https://github.com/azat)).
+* Fix rare error in `SELECT` queries when the queried column has `DEFAULT` expression which depends on the other column which also has `DEFAULT` and not present in select query and not exists on disk. Partially fixes [#14531](https://github.com/ClickHouse/ClickHouse/issues/14531). [#14845](https://github.com/ClickHouse/ClickHouse/pull/14845) ([alesapin](https://github.com/alesapin)).
+* Fix wrong monotonicity detection for shrunk `Int -> Int` cast of signed types. It might lead to incorrect query result. This bug is unveiled in [#14513](https://github.com/ClickHouse/ClickHouse/issues/14513). [#14783](https://github.com/ClickHouse/ClickHouse/pull/14783) ([Amos Bird](https://github.com/amosbird)).
+* Fixed missed default database name in metadata of materialized view when executing `ALTER ... MODIFY QUERY`. [#14664](https://github.com/ClickHouse/ClickHouse/pull/14664) ([tavplubix](https://github.com/tavplubix)).
+* Fix possibly incorrect result of function `has` when LowCardinality and Nullable types are involved. [#14591](https://github.com/ClickHouse/ClickHouse/pull/14591) ([Mike](https://github.com/myrrc)).
+* Cleanup data directory after Zookeeper exceptions during CREATE query for tables with ReplicatedMergeTree Engine. [#14563](https://github.com/ClickHouse/ClickHouse/pull/14563) ([Bharat Nallan](https://github.com/bharatnc)).
+* Fix rare segfaults in functions with combinator `-Resample`, which could appear in result of overflow with very large parameters. [#14562](https://github.com/ClickHouse/ClickHouse/pull/14562) ([Anton Popov](https://github.com/CurtizJ)).
+* Check for array size overflow in `topK` aggregate function. Without this check the user may send a query with carefully crafted parameters that will lead to server crash. This closes [#14452](https://github.com/ClickHouse/ClickHouse/issues/14452). [#14467](https://github.com/ClickHouse/ClickHouse/pull/14467) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Proxy restart/start/stop/reload of SysVinit to systemd (if it is used). [#14460](https://github.com/ClickHouse/ClickHouse/pull/14460) ([Azat Khuzhin](https://github.com/azat)).
+* Stop query execution if exception happened in `PipelineExecutor` itself. This could prevent rare possible query hung. [#14334](https://github.com/ClickHouse/ClickHouse/pull/14334) [#14402](https://github.com/ClickHouse/ClickHouse/pull/14402) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix crash during `ALTER` query for table which was created `AS table_function`. Fixes [#14212](https://github.com/ClickHouse/ClickHouse/issues/14212). [#14326](https://github.com/ClickHouse/ClickHouse/pull/14326) ([alesapin](https://github.com/alesapin)).
+* Fix exception during ALTER LIVE VIEW query with REFRESH command. LIVE VIEW is an experimental feature. [#14320](https://github.com/ClickHouse/ClickHouse/pull/14320) ([Bharat Nallan](https://github.com/bharatnc)).
+* Fix QueryPlan lifetime (for EXPLAIN PIPELINE graph=1) for queries with nested interpreter. [#14315](https://github.com/ClickHouse/ClickHouse/pull/14315) ([Azat Khuzhin](https://github.com/azat)).
+* Better check for tuple size in SSD cache complex key external dictionaries. This fixes [#13981](https://github.com/ClickHouse/ClickHouse/issues/13981). [#14313](https://github.com/ClickHouse/ClickHouse/pull/14313) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Disallows `CODEC` on `ALIAS` column type. Fixes [#13911](https://github.com/ClickHouse/ClickHouse/issues/13911). [#14263](https://github.com/ClickHouse/ClickHouse/pull/14263) ([Bharat Nallan](https://github.com/bharatnc)).
+* Fix GRANT ALL statement when executed on a non-global level. [#13987](https://github.com/ClickHouse/ClickHouse/pull/13987) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix arrayJoin() capturing in lambda (exception with logical error message was thrown). [#13792](https://github.com/ClickHouse/ClickHouse/pull/13792) ([Azat Khuzhin](https://github.com/azat)).
+
+#### Experimental Feature
+
+* Added `db-generator` tool for random database generation by given SELECT queries. It may faciliate reproducing issues when there is only incomplete bug report from the user. [#14442](https://github.com/ClickHouse/ClickHouse/pull/14442) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)) [#10973](https://github.com/ClickHouse/ClickHouse/issues/10973) ([ZeDRoman](https://github.com/ZeDRoman)).
+
+#### Improvement
+
+* Allow using multi-volume storage configuration in storage Distributed. [#14839](https://github.com/ClickHouse/ClickHouse/pull/14839) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Disallow empty time_zone argument in `toStartOf*` type of functions. [#14509](https://github.com/ClickHouse/ClickHouse/pull/14509) ([Bharat Nallan](https://github.com/bharatnc)).
+* MySQL handler returns `OK` for queries like `SET @@var = value`. Such statement is ignored. It is needed because some MySQL drivers send `SET @@` query for setup after handshake https://github.com/ClickHouse/ClickHouse/issues/9336#issuecomment-686222422 . [#14469](https://github.com/ClickHouse/ClickHouse/pull/14469) ([BohuTANG](https://github.com/BohuTANG)).
+* Now TTLs will be applied during merge if they were not previously materialized. [#14438](https://github.com/ClickHouse/ClickHouse/pull/14438) ([alesapin](https://github.com/alesapin)).
+* Now `clickhouse-obfuscator` supports UUID type as proposed in [#13163](https://github.com/ClickHouse/ClickHouse/issues/13163). [#14409](https://github.com/ClickHouse/ClickHouse/pull/14409) ([dimarub2000](https://github.com/dimarub2000)).
+* Added new setting `system_events_show_zero_values` as proposed in [#11384](https://github.com/ClickHouse/ClickHouse/issues/11384). [#14404](https://github.com/ClickHouse/ClickHouse/pull/14404) ([dimarub2000](https://github.com/dimarub2000)).
+* Implicitly convert primary key to not null in `MaterializeMySQL` (Same as `MySQL`). Fixes [#14114](https://github.com/ClickHouse/ClickHouse/issues/14114). [#14397](https://github.com/ClickHouse/ClickHouse/pull/14397) ([Winter Zhang](https://github.com/zhang2014)).
+* Replace wide integers (256 bit) from boost multiprecision with implementation from https://github.com/cerevra/int. 256bit integers are experimental. [#14229](https://github.com/ClickHouse/ClickHouse/pull/14229) ([Artem Zuikov](https://github.com/4ertus2)).
+* Add default compression codec for parts in `system.part_log` with the name `default_compression_codec`. [#14116](https://github.com/ClickHouse/ClickHouse/pull/14116) ([alesapin](https://github.com/alesapin)).
+* Add precision argument for `DateTime` type. It allows to use `DateTime` name instead of `DateTime64`. [#13761](https://github.com/ClickHouse/ClickHouse/pull/13761) ([Winter Zhang](https://github.com/zhang2014)).
+* Added requirepass authorization for `Redis` external dictionary. [#13688](https://github.com/ClickHouse/ClickHouse/pull/13688) ([Ivan Torgashov](https://github.com/it1804)).
+* Improvements in `RabbitMQ` engine: added connection and channels failure handling, proper commits, insert failures handling, better exchanges, queue durability and queue resume opportunity, new queue settings. Fixed tests. [#12761](https://github.com/ClickHouse/ClickHouse/pull/12761) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Support custom codecs in compact parts. [#12183](https://github.com/ClickHouse/ClickHouse/pull/12183) ([Anton Popov](https://github.com/CurtizJ)).
+
+#### Performance Improvement
+
+* Optimize queries with LIMIT/LIMIT BY/ORDER BY for distributed with GROUP BY sharding_key (under `optimize_skip_unused_shards` and `optimize_distributed_group_by_sharding_key`). [#10373](https://github.com/ClickHouse/ClickHouse/pull/10373) ([Azat Khuzhin](https://github.com/azat)).
+* Creating sets for multiple `JOIN` and `IN` in parallel. It may slightly improve performance for queries with several different `IN subquery` expressions. [#14412](https://github.com/ClickHouse/ClickHouse/pull/14412) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Improve Kafka engine performance by providing independent thread for each consumer. Separate thread pool for streaming engines (like Kafka). [#13939](https://github.com/ClickHouse/ClickHouse/pull/13939) ([fastio](https://github.com/fastio)).
+
+#### Build/Testing/Packaging Improvement
+
+* Lower binary size in debug build by removing debug info from `Functions`. This is needed only for one internal project in Yandex who is using very old linker. [#14549](https://github.com/ClickHouse/ClickHouse/pull/14549) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Prepare for build with clang 11. [#14455](https://github.com/ClickHouse/ClickHouse/pull/14455) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix the logic in backport script. In previous versions it was triggered for any labels of 100% red color. It was strange. [#14433](https://github.com/ClickHouse/ClickHouse/pull/14433) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Integration tests use default base config. All config changes are explicit with main_configs, user_configs and dictionaries parameters for instance. [#13647](https://github.com/ClickHouse/ClickHouse/pull/13647) ([Ilya Yatsishin](https://github.com/qoega)).
+
+
+
+## ClickHouse release 20.8
+
+### ClickHouse release v20.8.10.13-lts, 2020-12-24
+
+#### Bug Fix
+
+* When server log rotation was configured using `logger.size` parameter with numeric value larger than 2^32, the logs were not rotated properly. [#17905](https://github.com/ClickHouse/ClickHouse/pull/17905) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Fixed incorrect initialization of `max_compress_block_size` in MergeTreeWriterSettings with `min_compress_block_size`. [#17833](https://github.com/ClickHouse/ClickHouse/pull/17833) ([flynn](https://github.com/ucasFL)).
+* Fixed problem when ClickHouse fails to resume connection to MySQL servers. [#17681](https://github.com/ClickHouse/ClickHouse/pull/17681) ([Alexander Kazakov](https://github.com/Akazz)).
+* Fixed `ALTER` query hang when the corresponding mutation was killed on the different replica. This fixes [#16953](https://github.com/ClickHouse/ClickHouse/issues/16953). [#17499](https://github.com/ClickHouse/ClickHouse/pull/17499) ([alesapin](https://github.com/alesapin)).
+* Fixed a bug when mark cache size was underestimated by ClickHouse. It may happen when there are a lot of tiny files with marks. [#17496](https://github.com/ClickHouse/ClickHouse/pull/17496) ([alesapin](https://github.com/alesapin)).
+* Fixed `ORDER BY` with enabled setting `optimize_redundant_functions_in_order_by`. [#17471](https://github.com/ClickHouse/ClickHouse/pull/17471) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed `ColumnConst` comparison which leads to crash. This fixed [#17088](https://github.com/ClickHouse/ClickHouse/issues/17088) . [#17135](https://github.com/ClickHouse/ClickHouse/pull/17135) ([Amos Bird](https://github.com/amosbird)).
+* Fixed bug when `ON CLUSTER` queries may hang forever for non-leader ReplicatedMergeTreeTables. [#17089](https://github.com/ClickHouse/ClickHouse/pull/17089) ([alesapin](https://github.com/alesapin)).
+* Avoid unnecessary network errors for remote queries which may be cancelled while execution, like queries with `LIMIT`. [#17006](https://github.com/ClickHouse/ClickHouse/pull/17006) ([Azat Khuzhin](https://github.com/azat)).
+* Reresolve the IP of the `format_avro_schema_registry_url` in case of errors. [#16985](https://github.com/ClickHouse/ClickHouse/pull/16985) ([filimonov](https://github.com/filimonov)).
+* Fixed possible server crash after `ALTER TABLE ... MODIFY COLUMN ... NewType` when `SELECT` have `WHERE` expression on altering column and alter doesn't finished yet. [#16968](https://github.com/ClickHouse/ClickHouse/pull/16968) ([Amos Bird](https://github.com/amosbird)).
+* Install script should always create subdirs in config folders. This is only relevant for Docker build with custom config. [#16936](https://github.com/ClickHouse/ClickHouse/pull/16936) ([filimonov](https://github.com/filimonov)).
+* Fixed possible error `Illegal type of argument` for queries with `ORDER BY`. Fixes [#16580](https://github.com/ClickHouse/ClickHouse/issues/16580). [#16928](https://github.com/ClickHouse/ClickHouse/pull/16928) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Abort multipart upload if no data was written to WriteBufferFromS3. [#16840](https://github.com/ClickHouse/ClickHouse/pull/16840) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Fixed crash when using `any` without any arguments. This fixes [#16803](https://github.com/ClickHouse/ClickHouse/issues/16803). [#16826](https://github.com/ClickHouse/ClickHouse/pull/16826) ([Amos Bird](https://github.com/amosbird)).
+* Fixed `IN` operator over several columns and tuples with enabled `transform_null_in` setting. Fixes [#15310](https://github.com/ClickHouse/ClickHouse/issues/15310). [#16722](https://github.com/ClickHouse/ClickHouse/pull/16722) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed inconsistent behaviour of `optimize_read_in_order/optimize_aggregation_in_order` with max_threads > 0 and expression in ORDER BY. [#16637](https://github.com/ClickHouse/ClickHouse/pull/16637) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed the issue when query optimization was producing wrong result if query contains `ARRAY JOIN`. [#17887](https://github.com/ClickHouse/ClickHouse/pull/17887) ([sundyli](https://github.com/sundy-li)).
+* Query is finished faster in case of exception. Cancel execution on remote replicas if exception happens. [#15578](https://github.com/ClickHouse/ClickHouse/pull/15578) ([Azat Khuzhin](https://github.com/azat)).
+
+
+### ClickHouse release v20.8.6.6-lts, 2020-11-13
+
+#### Bug Fix
+
+* Fix rare silent crashes when query profiler is on and ClickHouse is installed on OS with glibc version that has (supposedly) broken asynchronous unwind tables for some functions. This fixes [#15301](https://github.com/ClickHouse/ClickHouse/issues/15301). This fixes [#13098](https://github.com/ClickHouse/ClickHouse/issues/13098). [#16846](https://github.com/ClickHouse/ClickHouse/pull/16846) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Now when parsing AVRO from input the LowCardinality is removed from type. Fixes [#16188](https://github.com/ClickHouse/ClickHouse/issues/16188). [#16521](https://github.com/ClickHouse/ClickHouse/pull/16521) ([Mike](https://github.com/myrrc)).
+* Fix rapid growth of metadata when using MySQL Master -> MySQL Slave -> ClickHouse MaterializeMySQL Engine, and `slave_parallel_worker` enabled on MySQL Slave, by properly shrinking GTID sets. This fixes [#15951](https://github.com/ClickHouse/ClickHouse/issues/15951). [#16504](https://github.com/ClickHouse/ClickHouse/pull/16504) ([TCeason](https://github.com/TCeason)).
+* Fix DROP TABLE for Distributed (racy with INSERT). [#16409](https://github.com/ClickHouse/ClickHouse/pull/16409) ([Azat Khuzhin](https://github.com/azat)).
+* Fix processing of very large entries in replication queue. Very large entries may appear in ALTER queries if table structure is extremely large (near 1 MB). This fixes [#16307](https://github.com/ClickHouse/ClickHouse/issues/16307). [#16332](https://github.com/ClickHouse/ClickHouse/pull/16332) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed the inconsistent behaviour when a part of return data could be dropped because the set for its filtration wasn't created. [#16308](https://github.com/ClickHouse/ClickHouse/pull/16308) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fix bug with MySQL database. When MySQL server used as database engine is down some queries raise Exception, because they try to get tables from disabled server, while it's unnecessary. For example, query `SELECT ... FROM system.parts` should work only with MergeTree tables and don't touch MySQL database at all. [#16032](https://github.com/ClickHouse/ClickHouse/pull/16032) ([Kruglov Pavel](https://github.com/Avogar)).
+
+
+### ClickHouse release v20.8.5.45-lts, 2020-10-29
+
+#### Bug Fix
+
+* Fix double free in case of exception in function `dictGet`. It could have happened if dictionary was loaded with error. [#16429](https://github.com/ClickHouse/ClickHouse/pull/16429) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix group by with totals/rollup/cube modifers and min/max functions over group by keys. Fixes [#16393](https://github.com/ClickHouse/ClickHouse/issues/16393). [#16397](https://github.com/ClickHouse/ClickHouse/pull/16397) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix async Distributed INSERT w/ prefer_localhost_replica=0 and internal_replication. [#16358](https://github.com/ClickHouse/ClickHouse/pull/16358) ([Azat Khuzhin](https://github.com/azat)).
+* Fix a possible memory leak during `GROUP BY` with string keys, caused by an error in `TwoLevelStringHashTable` implementation. [#16264](https://github.com/ClickHouse/ClickHouse/pull/16264) ([Amos Bird](https://github.com/amosbird)).
+* Fix the case when memory can be overallocated regardless to the limit. This closes [#14560](https://github.com/ClickHouse/ClickHouse/issues/14560). [#16206](https://github.com/ClickHouse/ClickHouse/pull/16206) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix `ALTER MODIFY ... ORDER BY` query hang for `ReplicatedVersionedCollapsingMergeTree`. This fixes [#15980](https://github.com/ClickHouse/ClickHouse/issues/15980). [#16011](https://github.com/ClickHouse/ClickHouse/pull/16011) ([alesapin](https://github.com/alesapin)).
+* Fix collate name & charset name parser and support `length = 0` for string type. [#16008](https://github.com/ClickHouse/ClickHouse/pull/16008) ([Winter Zhang](https://github.com/zhang2014)).
+* Allow to use direct layout for dictionaries with complex keys. [#16007](https://github.com/ClickHouse/ClickHouse/pull/16007) ([Anton Popov](https://github.com/CurtizJ)).
+* Prevent replica hang for 5-10 mins when replication error happens after a period of inactivity. [#15987](https://github.com/ClickHouse/ClickHouse/pull/15987) ([filimonov](https://github.com/filimonov)).
+* Fix rare segfaults when inserting into or selecting from MaterializedView and concurrently dropping target table (for Atomic database engine). [#15984](https://github.com/ClickHouse/ClickHouse/pull/15984) ([tavplubix](https://github.com/tavplubix)).
+* Fix ambiguity in parsing of settings profiles: `CREATE USER ... SETTINGS profile readonly` is now considered as using a profile named `readonly`, not a setting named `profile` with the readonly constraint. This fixes [#15628](https://github.com/ClickHouse/ClickHouse/issues/15628). [#15982](https://github.com/ClickHouse/ClickHouse/pull/15982) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix a crash when database creation fails. [#15954](https://github.com/ClickHouse/ClickHouse/pull/15954) ([Winter Zhang](https://github.com/zhang2014)).
+* Fixed `DROP TABLE IF EXISTS` failure with `Table ... doesn't exist` error when table is concurrently renamed (for Atomic database engine). Fixed rare deadlock when concurrently executing some DDL queries with multiple tables (like `DROP DATABASE` and `RENAME TABLE`) Fixed `DROP/DETACH DATABASE` failure with `Table ... doesn't exist` when concurrently executing `DROP/DETACH TABLE`. [#15934](https://github.com/ClickHouse/ClickHouse/pull/15934) ([tavplubix](https://github.com/tavplubix)).
+* Fix incorrect empty result for query from `Distributed` table if query has `WHERE`, `PREWHERE` and `GLOBAL IN`. Fixes [#15792](https://github.com/ClickHouse/ClickHouse/issues/15792). [#15933](https://github.com/ClickHouse/ClickHouse/pull/15933) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix possible deadlocks in RBAC. [#15875](https://github.com/ClickHouse/ClickHouse/pull/15875) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix exception `Block structure mismatch` in `SELECT ... ORDER BY DESC` queries which were executed after `ALTER MODIFY COLUMN` query. Fixes [#15800](https://github.com/ClickHouse/ClickHouse/issues/15800). [#15852](https://github.com/ClickHouse/ClickHouse/pull/15852) ([alesapin](https://github.com/alesapin)).
+* Fix some cases of queries, in which only virtual columns are selected. Previously `Not found column _nothing in block` exception may be thrown. Fixes [#12298](https://github.com/ClickHouse/ClickHouse/issues/12298). [#15756](https://github.com/ClickHouse/ClickHouse/pull/15756) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix error `Cannot find column` which may happen at insertion into `MATERIALIZED VIEW` in case if query for `MV` containes `ARRAY JOIN`. [#15717](https://github.com/ClickHouse/ClickHouse/pull/15717) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed too low default value of `max_replicated_logs_to_keep` setting, which might cause replicas to become lost too often. Improve lost replica recovery process by choosing the most up-to-date replica to clone. Also do not remove old parts from lost replica, detach them instead. [#15701](https://github.com/ClickHouse/ClickHouse/pull/15701) ([tavplubix](https://github.com/tavplubix)).
+* Fix error `Cannot add simple transform to empty Pipe` which happened while reading from `Buffer` table which has different structure than destination table. It was possible if destination table returned empty result for query. Fixes [#15529](https://github.com/ClickHouse/ClickHouse/issues/15529). [#15662](https://github.com/ClickHouse/ClickHouse/pull/15662) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed bug with globs in S3 table function, region from URL was not applied to S3 client configuration. [#15646](https://github.com/ClickHouse/ClickHouse/pull/15646) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Decrement the `ReadonlyReplica` metric when detaching read-only tables. This fixes [#15598](https://github.com/ClickHouse/ClickHouse/issues/15598). [#15592](https://github.com/ClickHouse/ClickHouse/pull/15592) ([sundyli](https://github.com/sundy-li)).
+* Throw an error when a single parameter is passed to ReplicatedMergeTree instead of ignoring it. [#15516](https://github.com/ClickHouse/ClickHouse/pull/15516) ([nvartolomei](https://github.com/nvartolomei)).
+
+#### Improvement
+
+* Now it's allowed to execute `ALTER ... ON CLUSTER` queries regardless of the `<internal_replication>` setting in cluster config. [#16075](https://github.com/ClickHouse/ClickHouse/pull/16075) ([alesapin](https://github.com/alesapin)).
+* Unfold `{database}`, `{table}` and `{uuid}` macros in `ReplicatedMergeTree` arguments on table creation. [#16159](https://github.com/ClickHouse/ClickHouse/pull/16159) ([tavplubix](https://github.com/tavplubix)).
+
+
+### ClickHouse release v20.8.4.11-lts, 2020-10-09
+
+#### Bug Fix
+
+* Fix the order of destruction for resources in `ReadFromStorage` step of query plan. It might cause crashes in rare cases. Possibly connected with [#15610](https://github.com/ClickHouse/ClickHouse/issues/15610). [#15645](https://github.com/ClickHouse/ClickHouse/pull/15645) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed `Element ... is not a constant expression` error when using `JSON*` function result in `VALUES`, `LIMIT` or right side of `IN` operator. [#15589](https://github.com/ClickHouse/ClickHouse/pull/15589) ([tavplubix](https://github.com/tavplubix)).
+* Prevent the possibility of error message `Could not calculate available disk space (statvfs), errno: 4, strerror: Interrupted system call`. This fixes [#15541](https://github.com/ClickHouse/ClickHouse/issues/15541). [#15557](https://github.com/ClickHouse/ClickHouse/pull/15557) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Significantly reduce memory usage in AggregatingInOrderTransform/optimize_aggregation_in_order. [#15543](https://github.com/ClickHouse/ClickHouse/pull/15543) ([Azat Khuzhin](https://github.com/azat)).
+* Mutation might hang waiting for some non-existent part after `MOVE` or `REPLACE PARTITION` or, in rare cases, after `DETACH` or `DROP PARTITION`. It's fixed. [#15537](https://github.com/ClickHouse/ClickHouse/pull/15537) ([tavplubix](https://github.com/tavplubix)).
+* Fix bug when `ILIKE` operator stops being case insensitive if `LIKE` with the same pattern was executed. [#15536](https://github.com/ClickHouse/ClickHouse/pull/15536) ([alesapin](https://github.com/alesapin)).
+* Fix `Missing columns` errors when selecting columns which absent in data, but depend on other columns which also absent in data. Fixes [#15530](https://github.com/ClickHouse/ClickHouse/issues/15530). [#15532](https://github.com/ClickHouse/ClickHouse/pull/15532) ([alesapin](https://github.com/alesapin)).
+* Fix bug with event subscription in DDLWorker which rarely may lead to query hangs in `ON CLUSTER`. Introduced in [#13450](https://github.com/ClickHouse/ClickHouse/issues/13450). [#15477](https://github.com/ClickHouse/ClickHouse/pull/15477) ([alesapin](https://github.com/alesapin)).
+* Report proper error when the second argument of `boundingRatio` aggregate function has a wrong type. [#15407](https://github.com/ClickHouse/ClickHouse/pull/15407) ([detailyang](https://github.com/detailyang)).
+* Fix race condition during MergeTree table rename and background cleanup. [#15304](https://github.com/ClickHouse/ClickHouse/pull/15304) ([alesapin](https://github.com/alesapin)).
+* Fix rare race condition on server startup when system.logs are enabled. [#15300](https://github.com/ClickHouse/ClickHouse/pull/15300) ([alesapin](https://github.com/alesapin)).
+* Fix MSan report in QueryLog. Uninitialized memory can be used for the field `memory_usage`. [#15258](https://github.com/ClickHouse/ClickHouse/pull/15258) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix instance crash when using joinGet with LowCardinality types. This fixes [#15214](https://github.com/ClickHouse/ClickHouse/issues/15214). [#15220](https://github.com/ClickHouse/ClickHouse/pull/15220) ([Amos Bird](https://github.com/amosbird)).
+* Fix bug in table engine `Buffer` which doesn't allow to insert data of new structure into `Buffer` after `ALTER` query. Fixes [#15117](https://github.com/ClickHouse/ClickHouse/issues/15117). [#15192](https://github.com/ClickHouse/ClickHouse/pull/15192) ([alesapin](https://github.com/alesapin)).
+* Adjust decimals field size in mysql column definition packet. [#15152](https://github.com/ClickHouse/ClickHouse/pull/15152) ([maqroll](https://github.com/maqroll)).
+* We already use padded comparison between String and FixedString (https://github.com/ClickHouse/ClickHouse/blob/master/src/Functions/FunctionsComparison.h#L333). This PR applies the same logic to field comparison which corrects the usage of FixedString as primary keys. This fixes [#14908](https://github.com/ClickHouse/ClickHouse/issues/14908). [#15033](https://github.com/ClickHouse/ClickHouse/pull/15033) ([Amos Bird](https://github.com/amosbird)).
+* If function `bar` was called with specifically crafted arguments, buffer overflow was possible. This closes [#13926](https://github.com/ClickHouse/ClickHouse/issues/13926). [#15028](https://github.com/ClickHouse/ClickHouse/pull/15028) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed `Cannot rename ... errno: 22, strerror: Invalid argument` error on DDL query execution in Atomic database when running clickhouse-server in docker on Mac OS. [#15024](https://github.com/ClickHouse/ClickHouse/pull/15024) ([tavplubix](https://github.com/tavplubix)).
+* Now settings `number_of_free_entries_in_pool_to_execute_mutation` and `number_of_free_entries_in_pool_to_lower_max_size_of_merge` can be equal to `background_pool_size`. [#14975](https://github.com/ClickHouse/ClickHouse/pull/14975) ([alesapin](https://github.com/alesapin)).
+* Fix to make predicate push down work when subquery contains finalizeAggregation function. Fixes [#14847](https://github.com/ClickHouse/ClickHouse/issues/14847). [#14937](https://github.com/ClickHouse/ClickHouse/pull/14937) ([filimonov](https://github.com/filimonov)).
+* Publish CPU frequencies per logical core in `system.asynchronous_metrics`. This fixes [#14923](https://github.com/ClickHouse/ClickHouse/issues/14923). [#14924](https://github.com/ClickHouse/ClickHouse/pull/14924) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Fixed `.metadata.tmp File exists` error when using `MaterializeMySQL` database engine. [#14898](https://github.com/ClickHouse/ClickHouse/pull/14898) ([Winter Zhang](https://github.com/zhang2014)).
+* Fix a problem where the server may get stuck on startup while talking to ZooKeeper, if the configuration files have to be fetched from ZK (using the `from_zk` include option). This fixes [#14814](https://github.com/ClickHouse/ClickHouse/issues/14814). [#14843](https://github.com/ClickHouse/ClickHouse/pull/14843) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Fix wrong monotonicity detection for shrunk `Int -> Int` cast of signed types. It might lead to incorrect query result. This bug is unveiled in [#14513](https://github.com/ClickHouse/ClickHouse/issues/14513). [#14783](https://github.com/ClickHouse/ClickHouse/pull/14783) ([Amos Bird](https://github.com/amosbird)).
+* Fixed the incorrect sorting order of `Nullable` column. This fixes [#14344](https://github.com/ClickHouse/ClickHouse/issues/14344). [#14495](https://github.com/ClickHouse/ClickHouse/pull/14495) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+
+#### Improvement
+
+* Now it's possible to change the type of version column for `VersionedCollapsingMergeTree` with `ALTER` query. [#15442](https://github.com/ClickHouse/ClickHouse/pull/15442) ([alesapin](https://github.com/alesapin)).
+
+
+### ClickHouse release v20.8.3.18-stable, 2020-09-18
+
+#### Bug Fix
+
+* Fix the issue when some invocations of `extractAllGroups` function may trigger "Memory limit exceeded" error. This fixes [#13383](https://github.com/ClickHouse/ClickHouse/issues/13383). [#14889](https://github.com/ClickHouse/ClickHouse/pull/14889) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix SIGSEGV for an attempt to INSERT into StorageFile(fd). [#14887](https://github.com/ClickHouse/ClickHouse/pull/14887) ([Azat Khuzhin](https://github.com/azat)).
+* Fix rare error in `SELECT` queries when the queried column has `DEFAULT` expression which depends on the other column which also has `DEFAULT` and not present in select query and not exists on disk. Partially fixes [#14531](https://github.com/ClickHouse/ClickHouse/issues/14531). [#14845](https://github.com/ClickHouse/ClickHouse/pull/14845) ([alesapin](https://github.com/alesapin)).
+* Fixed missed default database name in metadata of materialized view when executing `ALTER ... MODIFY QUERY`. [#14664](https://github.com/ClickHouse/ClickHouse/pull/14664) ([tavplubix](https://github.com/tavplubix)).
+* Fix bug when `ALTER UPDATE` mutation with Nullable column in assignment expression and constant value (like `UPDATE x = 42`) leads to incorrect value in column or segfault. Fixes [#13634](https://github.com/ClickHouse/ClickHouse/issues/13634), [#14045](https://github.com/ClickHouse/ClickHouse/issues/14045). [#14646](https://github.com/ClickHouse/ClickHouse/pull/14646) ([alesapin](https://github.com/alesapin)).
+* Fix wrong Decimal multiplication result caused wrong decimal scale of result column. [#14603](https://github.com/ClickHouse/ClickHouse/pull/14603) ([Artem Zuikov](https://github.com/4ertus2)).
+* Added the checker as neither calling `lc->isNullable()` nor calling `ls->getDictionaryPtr()->isNullable()` would return the correct result. [#14591](https://github.com/ClickHouse/ClickHouse/pull/14591) ([myrrc](https://github.com/myrrc)).
+* Cleanup data directory after Zookeeper exceptions during CreateQuery for StorageReplicatedMergeTree Engine. [#14563](https://github.com/ClickHouse/ClickHouse/pull/14563) ([Bharat Nallan](https://github.com/bharatnc)).
+* Fix rare segfaults in functions with combinator -Resample, which could appear in result of overflow with very large parameters. [#14562](https://github.com/ClickHouse/ClickHouse/pull/14562) ([Anton Popov](https://github.com/CurtizJ)).
+
+#### Improvement
+
+* Speed up server shutdown process if there are ongoing S3 requests. [#14858](https://github.com/ClickHouse/ClickHouse/pull/14858) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Allow using multi-volume storage configuration in storage Distributed. [#14839](https://github.com/ClickHouse/ClickHouse/pull/14839) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Speed up server shutdown process if there are ongoing S3 requests. [#14496](https://github.com/ClickHouse/ClickHouse/pull/14496) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Support custom codecs in compact parts. [#12183](https://github.com/ClickHouse/ClickHouse/pull/12183) ([Anton Popov](https://github.com/CurtizJ)).
+
+
+### ClickHouse release v20.8.2.3-stable, 2020-09-08
+
+#### Backward Incompatible Change
+
+* Now `OPTIMIZE FINAL` query doesn't recalculate TTL for parts that were added before TTL was created. Use `ALTER TABLE ... MATERIALIZE TTL` once to calculate them, after that `OPTIMIZE FINAL` will evaluate TTL's properly. This behavior never worked for replicated tables. [#14220](https://github.com/ClickHouse/ClickHouse/pull/14220) ([alesapin](https://github.com/alesapin)).
+* Extend `parallel_distributed_insert_select` setting, adding an option to run `INSERT` into local table. The setting changes type from `Bool` to `UInt64`, so the values `false` and `true` are no longer supported. If you have these values in server configuration, the server will not start. Please replace them with `0` and `1`, respectively. [#14060](https://github.com/ClickHouse/ClickHouse/pull/14060) ([Azat Khuzhin](https://github.com/azat)).
+* Remove support for the `ODBCDriver` input/output format. This was a deprecated format once used for communication with the ClickHouse ODBC driver, now long superseded by the `ODBCDriver2` format. Resolves [#13629](https://github.com/ClickHouse/ClickHouse/issues/13629). [#13847](https://github.com/ClickHouse/ClickHouse/pull/13847) ([hexiaoting](https://github.com/hexiaoting)).
+* When upgrading from versions older than 20.5, if rolling update is performed and cluster contains both versions 20.5 or greater and less than 20.5, if ClickHouse nodes with old versions are restarted and old version has been started up in presence of newer versions, it may lead to `Part ... intersects previous part` errors. To prevent this error, first install newer clickhouse-server packages on all cluster nodes and then do restarts (so, when clickhouse-server is restarted, it will start up with the new version).
+
+#### New Feature
+
+* Add the ability to specify `Default` compression codec for columns that correspond to settings specified in `config.xml`. Implements: [#9074](https://github.com/ClickHouse/ClickHouse/issues/9074). [#14049](https://github.com/ClickHouse/ClickHouse/pull/14049) ([alesapin](https://github.com/alesapin)).
+* Support Kerberos authentication in Kafka, using `krb5` and `cyrus-sasl` libraries. [#12771](https://github.com/ClickHouse/ClickHouse/pull/12771) ([Ilya Golshtein](https://github.com/ilejn)).
+* Add function `normalizeQuery` that replaces literals, sequences of literals and complex aliases with placeholders. Add function `normalizedQueryHash` that returns identical 64bit hash values for similar queries. It helps to analyze query log. This closes [#11271](https://github.com/ClickHouse/ClickHouse/issues/11271). [#13816](https://github.com/ClickHouse/ClickHouse/pull/13816) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add `time_zones` table. [#13880](https://github.com/ClickHouse/ClickHouse/pull/13880) ([Bharat Nallan](https://github.com/bharatnc)).
+* Add function `defaultValueOfTypeName` that returns the default value for a given type. [#13877](https://github.com/ClickHouse/ClickHouse/pull/13877) ([hcz](https://github.com/hczhcz)).
+* Add `countDigits(x)` function that count number of decimal digits in integer or decimal column. Add `isDecimalOverflow(d, [p])` function that checks if the value in Decimal column is out of its (or specified) precision. [#14151](https://github.com/ClickHouse/ClickHouse/pull/14151) ([Artem Zuikov](https://github.com/4ertus2)).
+* Add `quantileExactLow` and `quantileExactHigh` implementations with respective aliases for `medianExactLow` and `medianExactHigh`. [#13818](https://github.com/ClickHouse/ClickHouse/pull/13818) ([Bharat Nallan](https://github.com/bharatnc)).
+* Added `date_trunc` function that truncates a date/time value to a specified date/time part. [#13888](https://github.com/ClickHouse/ClickHouse/pull/13888) ([Vladimir Golovchenko](https://github.com/vladimir-golovchenko)).
+* Add new optional section `<user_directories>` to the main config. [#13425](https://github.com/ClickHouse/ClickHouse/pull/13425) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Add `ALTER SAMPLE BY` statement that allows to change table sample clause. [#13280](https://github.com/ClickHouse/ClickHouse/pull/13280) ([Amos Bird](https://github.com/amosbird)).
+* Function `position` now supports optional `start_pos` argument. [#13237](https://github.com/ClickHouse/ClickHouse/pull/13237) ([vdimir](https://github.com/vdimir)).
+
+#### Bug Fix
+
+* Fix visible data clobbering by progress bar in client in interactive mode. This fixes [#12562](https://github.com/ClickHouse/ClickHouse/issues/12562) and [#13369](https://github.com/ClickHouse/ClickHouse/issues/13369) and [#13584](https://github.com/ClickHouse/ClickHouse/issues/13584) and fixes [#12964](https://github.com/ClickHouse/ClickHouse/issues/12964). [#13691](https://github.com/ClickHouse/ClickHouse/pull/13691) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed incorrect sorting order if `LowCardinality` column when sorting by multiple columns. This fixes [#13958](https://github.com/ClickHouse/ClickHouse/issues/13958). [#14223](https://github.com/ClickHouse/ClickHouse/pull/14223) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Check for array size overflow in `topK` aggregate function. Without this check the user may send a query with carefully crafted parameters that will lead to server crash. This closes [#14452](https://github.com/ClickHouse/ClickHouse/issues/14452). [#14467](https://github.com/ClickHouse/ClickHouse/pull/14467) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix bug which can lead to wrong merges assignment if table has partitions with a single part. [#14444](https://github.com/ClickHouse/ClickHouse/pull/14444) ([alesapin](https://github.com/alesapin)).
+* Stop query execution if exception happened in `PipelineExecutor` itself. This could prevent rare possible query hung. Continuation of [#14334](https://github.com/ClickHouse/ClickHouse/issues/14334). [#14402](https://github.com/ClickHouse/ClickHouse/pull/14402) [#14334](https://github.com/ClickHouse/ClickHouse/pull/14334) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix crash during `ALTER` query for table which was created `AS table_function`. Fixes [#14212](https://github.com/ClickHouse/ClickHouse/issues/14212). [#14326](https://github.com/ClickHouse/ClickHouse/pull/14326) ([alesapin](https://github.com/alesapin)).
+* Fix exception during ALTER LIVE VIEW query with REFRESH command. Live view is an experimental feature. [#14320](https://github.com/ClickHouse/ClickHouse/pull/14320) ([Bharat Nallan](https://github.com/bharatnc)).
+* Fix QueryPlan lifetime (for EXPLAIN PIPELINE graph=1) for queries with nested interpreter. [#14315](https://github.com/ClickHouse/ClickHouse/pull/14315) ([Azat Khuzhin](https://github.com/azat)).
+* Fix segfault in `clickhouse-odbc-bridge` during schema fetch from some external sources. This PR fixes [#13861](https://github.com/ClickHouse/ClickHouse/issues/13861). [#14267](https://github.com/ClickHouse/ClickHouse/pull/14267) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix crash in mark inclusion search introduced in [#12277](https://github.com/ClickHouse/ClickHouse/pull/12277). [#14225](https://github.com/ClickHouse/ClickHouse/pull/14225) ([Amos Bird](https://github.com/amosbird)).
+* Fix creation of tables with named tuples. This fixes [#13027](https://github.com/ClickHouse/ClickHouse/issues/13027). [#14143](https://github.com/ClickHouse/ClickHouse/pull/14143) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix formatting of minimal negative decimal numbers. This fixes [#14111](https://github.com/ClickHouse/ClickHouse/issues/14111). [#14119](https://github.com/ClickHouse/ClickHouse/pull/14119) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Fix `DistributedFilesToInsert` metric (zeroed when it should not). [#14095](https://github.com/ClickHouse/ClickHouse/pull/14095) ([Azat Khuzhin](https://github.com/azat)).
+* Fix `pointInPolygon` with const 2d array as polygon. [#14079](https://github.com/ClickHouse/ClickHouse/pull/14079) ([Alexey Ilyukhov](https://github.com/livace)).
+* Fixed wrong mount point in extra info for `Poco::Exception: no space left on device`. [#14050](https://github.com/ClickHouse/ClickHouse/pull/14050) ([tavplubix](https://github.com/tavplubix)).
+* Fix GRANT ALL statement when executed on a non-global level. [#13987](https://github.com/ClickHouse/ClickHouse/pull/13987) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix parser to reject create table as table function with engine. [#13940](https://github.com/ClickHouse/ClickHouse/pull/13940) ([hcz](https://github.com/hczhcz)).
+* Fix wrong results in select queries with `DISTINCT` keyword and subqueries with UNION ALL in case `optimize_duplicate_order_by_and_distinct` setting is enabled. [#13925](https://github.com/ClickHouse/ClickHouse/pull/13925) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fixed potential deadlock when renaming `Distributed` table. [#13922](https://github.com/ClickHouse/ClickHouse/pull/13922) ([tavplubix](https://github.com/tavplubix)).
+* Fix incorrect sorting for `FixedString` columns when sorting by multiple columns. Fixes [#13182](https://github.com/ClickHouse/ClickHouse/issues/13182). [#13887](https://github.com/ClickHouse/ClickHouse/pull/13887) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix potentially imprecise result of `topK`/`topKWeighted` merge (with non-default parameters). [#13817](https://github.com/ClickHouse/ClickHouse/pull/13817) ([Azat Khuzhin](https://github.com/azat)).
+* Fix reading from MergeTree table with INDEX of type SET fails when comparing against NULL. This fixes [#13686](https://github.com/ClickHouse/ClickHouse/issues/13686). [#13793](https://github.com/ClickHouse/ClickHouse/pull/13793) ([Amos Bird](https://github.com/amosbird)).
+* Fix `arrayJoin` capturing in lambda (LOGICAL_ERROR). [#13792](https://github.com/ClickHouse/ClickHouse/pull/13792) ([Azat Khuzhin](https://github.com/azat)).
+* Add step overflow check in function `range`. [#13790](https://github.com/ClickHouse/ClickHouse/pull/13790) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed `Directory not empty` error when concurrently executing `DROP DATABASE` and `CREATE TABLE`. [#13756](https://github.com/ClickHouse/ClickHouse/pull/13756) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add range check for `h3KRing` function. This fixes [#13633](https://github.com/ClickHouse/ClickHouse/issues/13633). [#13752](https://github.com/ClickHouse/ClickHouse/pull/13752) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix race condition between DETACH and background merges. Parts may revive after detach. This is continuation of [#8602](https://github.com/ClickHouse/ClickHouse/issues/8602) that did not fix the issue but introduced a test that started to fail in very rare cases, demonstrating the issue. [#13746](https://github.com/ClickHouse/ClickHouse/pull/13746) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix logging Settings.Names/Values when log_queries_min_type > QUERY_START. [#13737](https://github.com/ClickHouse/ClickHouse/pull/13737) ([Azat Khuzhin](https://github.com/azat)).
+* Fixes `/replicas_status` endpoint response status code when verbose=1. [#13722](https://github.com/ClickHouse/ClickHouse/pull/13722) ([javi santana](https://github.com/javisantana)).
+* Fix incorrect message in `clickhouse-server.init` while checking user and group. [#13711](https://github.com/ClickHouse/ClickHouse/pull/13711) ([ylchou](https://github.com/ylchou)).
+* Do not optimize any(arrayJoin()) -> arrayJoin() under `optimize_move_functions_out_of_any` setting. [#13681](https://github.com/ClickHouse/ClickHouse/pull/13681) ([Azat Khuzhin](https://github.com/azat)).
+* Fix crash in JOIN with StorageMerge and `set enable_optimize_predicate_expression=1`. [#13679](https://github.com/ClickHouse/ClickHouse/pull/13679) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix typo in error message about `The value of 'number_of_free_entries_in_pool_to_lower_max_size_of_merge' setting`. [#13678](https://github.com/ClickHouse/ClickHouse/pull/13678) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Concurrent `ALTER ... REPLACE/MOVE PARTITION ...` queries might cause deadlock. It's fixed. [#13626](https://github.com/ClickHouse/ClickHouse/pull/13626) ([tavplubix](https://github.com/tavplubix)).
+* Fixed the behaviour when sometimes cache-dictionary returned default value instead of present value from source. [#13624](https://github.com/ClickHouse/ClickHouse/pull/13624) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fix secondary indices corruption in compact parts. Compact parts are experimental feature. [#13538](https://github.com/ClickHouse/ClickHouse/pull/13538) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix premature `ON CLUSTER` timeouts for queries that must be executed on a single replica. Fixes [#6704](https://github.com/ClickHouse/ClickHouse/issues/6704), [#7228](https://github.com/ClickHouse/ClickHouse/issues/7228), [#13361](https://github.com/ClickHouse/ClickHouse/issues/13361), [#11884](https://github.com/ClickHouse/ClickHouse/issues/11884). [#13450](https://github.com/ClickHouse/ClickHouse/pull/13450) ([alesapin](https://github.com/alesapin)).
+* Fix wrong code in function `netloc`. This fixes [#13335](https://github.com/ClickHouse/ClickHouse/issues/13335). [#13446](https://github.com/ClickHouse/ClickHouse/pull/13446) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix possible race in `StorageMemory`. [#13416](https://github.com/ClickHouse/ClickHouse/pull/13416) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix missing or excessive headers in `TSV/CSVWithNames` formats in HTTP protocol. This fixes [#12504](https://github.com/ClickHouse/ClickHouse/issues/12504). [#13343](https://github.com/ClickHouse/ClickHouse/pull/13343) ([Azat Khuzhin](https://github.com/azat)).
+* Fix parsing row policies from users.xml when names of databases or tables contain dots. This fixes [#5779](https://github.com/ClickHouse/ClickHouse/issues/5779), [#12527](https://github.com/ClickHouse/ClickHouse/issues/12527). [#13199](https://github.com/ClickHouse/ClickHouse/pull/13199) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix access to `redis` dictionary after connection was dropped once. It may happen with `cache` and `direct` dictionary layouts. [#13082](https://github.com/ClickHouse/ClickHouse/pull/13082) ([Anton Popov](https://github.com/CurtizJ)).
+* Removed wrong auth access check when using ClickHouseDictionarySource to query remote tables. [#12756](https://github.com/ClickHouse/ClickHouse/pull/12756) ([sundyli](https://github.com/sundy-li)).
+* Properly distinguish subqueries in some cases for common subexpression elimination. [#8333](https://github.com/ClickHouse/ClickHouse/issues/8333). [#8367](https://github.com/ClickHouse/ClickHouse/pull/8367) ([Amos Bird](https://github.com/amosbird)).
+
+#### Improvement
+
+* Disallows `CODEC` on `ALIAS` column type. Fixes [#13911](https://github.com/ClickHouse/ClickHouse/issues/13911). [#14263](https://github.com/ClickHouse/ClickHouse/pull/14263) ([Bharat Nallan](https://github.com/bharatnc)).
+* When waiting for a dictionary update to complete, use the timeout specified by `query_wait_timeout_milliseconds` setting instead of a hard-coded value. [#14105](https://github.com/ClickHouse/ClickHouse/pull/14105) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Add setting `min_index_granularity_bytes` that protects against accidentally creating a table with very low `index_granularity_bytes` setting. [#14139](https://github.com/ClickHouse/ClickHouse/pull/14139) ([Bharat Nallan](https://github.com/bharatnc)).
+* Now it's possible to fetch partitions from clusters that use different ZooKeeper: `ALTER TABLE table_name FETCH PARTITION partition_expr FROM 'zk-name:/path-in-zookeeper'`. It's useful for shipping data to new clusters. [#14155](https://github.com/ClickHouse/ClickHouse/pull/14155) ([Amos Bird](https://github.com/amosbird)).
+* Slightly better performance of Memory table if it was constructed from a huge number of very small blocks (that's unlikely). Author of the idea: [Mark Papadakis](https://github.com/markpapadakis). Closes [#14043](https://github.com/ClickHouse/ClickHouse/issues/14043). [#14056](https://github.com/ClickHouse/ClickHouse/pull/14056) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Conditional aggregate functions (for example: `avgIf`, `sumIf`, `maxIf`) should return `NULL` when miss rows and use nullable arguments. [#13964](https://github.com/ClickHouse/ClickHouse/pull/13964) ([Winter Zhang](https://github.com/zhang2014)).
+* Increase limit in -Resample combinator to 1M. [#13947](https://github.com/ClickHouse/ClickHouse/pull/13947) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Corrected an error in AvroConfluent format that caused the Kafka table engine to stop processing messages when an abnormally small, malformed, message was received. [#13941](https://github.com/ClickHouse/ClickHouse/pull/13941) ([Gervasio Varela](https://github.com/gervarela)).
+* Fix wrong error for long queries. It was possible to get syntax error other than `Max query size exceeded` for correct query. [#13928](https://github.com/ClickHouse/ClickHouse/pull/13928) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Better error message for null value of `TabSeparated` format. [#13906](https://github.com/ClickHouse/ClickHouse/pull/13906) ([jiang tao](https://github.com/tomjiang1987)).
+* Function `arrayCompact` will compare NaNs bitwise if the type of array elements is Float32/Float64. In previous versions NaNs were always not equal if the type of array elements is Float32/Float64 and were always equal if the type is more complex, like Nullable(Float64). This closes [#13857](https://github.com/ClickHouse/ClickHouse/issues/13857). [#13868](https://github.com/ClickHouse/ClickHouse/pull/13868) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix data race in `lgamma` function. This race was caught only in `tsan`, no side effects a really happened. [#13842](https://github.com/ClickHouse/ClickHouse/pull/13842) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Avoid too slow queries when arrays are manipulated as fields. Throw exception instead. [#13753](https://github.com/ClickHouse/ClickHouse/pull/13753) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Added Redis requirepass authorization (for redis dictionary source). [#13688](https://github.com/ClickHouse/ClickHouse/pull/13688) ([Ivan Torgashov](https://github.com/it1804)).
+* Add MergeTree Write-Ahead-Log (WAL) dump tool. WAL is an experimental feature. [#13640](https://github.com/ClickHouse/ClickHouse/pull/13640) ([BohuTANG](https://github.com/BohuTANG)).
+* In previous versions `lcm` function may produce assertion violation in debug build if called with specifically crafted arguments. This fixes [#13368](https://github.com/ClickHouse/ClickHouse/issues/13368). [#13510](https://github.com/ClickHouse/ClickHouse/pull/13510) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Provide monotonicity for `toDate/toDateTime` functions in more cases. Monotonicity information is used for index analysis (more complex queries will be able to use index). Now the input arguments are saturated more naturally and provides better monotonicity. [#13497](https://github.com/ClickHouse/ClickHouse/pull/13497) ([Amos Bird](https://github.com/amosbird)).
+* Support compound identifiers for custom settings. Custom settings is an integration point of ClickHouse codebase with other codebases (no benefits for ClickHouse itself) [#13496](https://github.com/ClickHouse/ClickHouse/pull/13496) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Move parts from DiskLocal to DiskS3 in parallel. `DiskS3` is an experimental feature. [#13459](https://github.com/ClickHouse/ClickHouse/pull/13459) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Enable mixed granularity parts by default. [#13449](https://github.com/ClickHouse/ClickHouse/pull/13449) ([alesapin](https://github.com/alesapin)).
+* Proper remote host checking in S3 redirects (security-related thing). [#13404](https://github.com/ClickHouse/ClickHouse/pull/13404) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Add `QueryTimeMicroseconds`, `SelectQueryTimeMicroseconds` and `InsertQueryTimeMicroseconds` to system.events. [#13336](https://github.com/ClickHouse/ClickHouse/pull/13336) ([ianton-ru](https://github.com/ianton-ru)).
+* Fix debug assertion when Decimal has too large negative exponent. Fixes [#13188](https://github.com/ClickHouse/ClickHouse/issues/13188). [#13228](https://github.com/ClickHouse/ClickHouse/pull/13228) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Added cache layer for DiskS3 (cache to local disk mark and index files). `DiskS3` is an experimental feature. [#13076](https://github.com/ClickHouse/ClickHouse/pull/13076) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Fix readline so it dumps history to file now. [#13600](https://github.com/ClickHouse/ClickHouse/pull/13600) ([Amos Bird](https://github.com/amosbird)).
+* Create `system` database with `Atomic` engine by default (a preparation to enable `Atomic` database engine by default everywhere). [#13680](https://github.com/ClickHouse/ClickHouse/pull/13680) ([tavplubix](https://github.com/tavplubix)).
+
+#### Performance Improvement
+
+* Slightly optimize very short queries with `LowCardinality`. [#14129](https://github.com/ClickHouse/ClickHouse/pull/14129) ([Anton Popov](https://github.com/CurtizJ)).
+* Enable parallel INSERTs for table engines `Null`, `Memory`, `Distributed` and `Buffer` when the setting `max_insert_threads` is set. [#14120](https://github.com/ClickHouse/ClickHouse/pull/14120) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fail fast if `max_rows_to_read` limit is exceeded on parts scan. The motivation behind this change is to skip ranges scan for all selected parts if it is clear that `max_rows_to_read` is already exceeded. The change is quite noticeable for queries over big number of parts. [#13677](https://github.com/ClickHouse/ClickHouse/pull/13677) ([Roman Khavronenko](https://github.com/hagen1778)).
+* Slightly improve performance of aggregation by UInt8/UInt16 keys. [#13099](https://github.com/ClickHouse/ClickHouse/pull/13099) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Optimize `has()`, `indexOf()` and `countEqual()` functions for `Array(LowCardinality(T))` and constant right arguments. [#12550](https://github.com/ClickHouse/ClickHouse/pull/12550) ([myrrc](https://github.com/myrrc)).
+* When performing trivial `INSERT SELECT` queries, automatically set `max_threads` to 1 or `max_insert_threads`, and set `max_block_size` to `min_insert_block_size_rows`. Related to [#5907](https://github.com/ClickHouse/ClickHouse/issues/5907). [#12195](https://github.com/ClickHouse/ClickHouse/pull/12195) ([flynn](https://github.com/ucasFL)).
+
+#### Experimental Feature
+
+* ClickHouse can work as MySQL replica - it is implemented by `MaterializeMySQL` database engine. Implements [#4006](https://github.com/ClickHouse/ClickHouse/issues/4006). [#10851](https://github.com/ClickHouse/ClickHouse/pull/10851) ([Winter Zhang](https://github.com/zhang2014)).
+* Add types `Int128`, `Int256`, `UInt256` and related functions for them. Extend Decimals with Decimal256 (precision up to 76 digits). New types are under the setting `allow_experimental_bigint_types`. It is working extremely slow and bad. The implementation is incomplete. Please don't use this feature. [#13097](https://github.com/ClickHouse/ClickHouse/pull/13097) ([Artem Zuikov](https://github.com/4ertus2)).
+
+#### Build/Testing/Packaging Improvement
+
+* Added `clickhouse install` script, that is useful if you only have a single binary. [#13528](https://github.com/ClickHouse/ClickHouse/pull/13528) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Allow to run `clickhouse` binary without configuration. [#13515](https://github.com/ClickHouse/ClickHouse/pull/13515) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Enable check for typos in code with `codespell`. [#13513](https://github.com/ClickHouse/ClickHouse/pull/13513) [#13511](https://github.com/ClickHouse/ClickHouse/pull/13511) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Enable Shellcheck in CI as a linter of .sh tests. This closes [#13168](https://github.com/ClickHouse/ClickHouse/issues/13168). [#13530](https://github.com/ClickHouse/ClickHouse/pull/13530) [#13529](https://github.com/ClickHouse/ClickHouse/pull/13529) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add a CMake option to fail configuration instead of auto-reconfiguration, enabled by default. [#13687](https://github.com/ClickHouse/ClickHouse/pull/13687) ([Konstantin](https://github.com/podshumok)).
+* Expose version of embedded tzdata via TZDATA_VERSION in system.build_options. [#13648](https://github.com/ClickHouse/ClickHouse/pull/13648) ([filimonov](https://github.com/filimonov)).
+* Improve generation of system.time_zones table during build. Closes [#14209](https://github.com/ClickHouse/ClickHouse/issues/14209). [#14215](https://github.com/ClickHouse/ClickHouse/pull/14215) ([filimonov](https://github.com/filimonov)).
+* Build ClickHouse with the most fresh tzdata from package repository. [#13623](https://github.com/ClickHouse/ClickHouse/pull/13623) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add the ability to write js-style comments in skip_list.json. [#14159](https://github.com/ClickHouse/ClickHouse/pull/14159) ([alesapin](https://github.com/alesapin)).
+* Ensure that there is no copy-pasted GPL code. [#13514](https://github.com/ClickHouse/ClickHouse/pull/13514) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Switch tests docker images to use test-base parent. [#14167](https://github.com/ClickHouse/ClickHouse/pull/14167) ([Ilya Yatsishin](https://github.com/qoega)).
+* Adding retry logic when bringing up docker-compose cluster; Increasing COMPOSE_HTTP_TIMEOUT. [#14112](https://github.com/ClickHouse/ClickHouse/pull/14112) ([vzakaznikov](https://github.com/vzakaznikov)).
+* Enabled `system.text_log` in stress test to find more bugs. [#13855](https://github.com/ClickHouse/ClickHouse/pull/13855) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Testflows LDAP module: adding missing certificates and dhparam.pem for openldap4. [#13780](https://github.com/ClickHouse/ClickHouse/pull/13780) ([vzakaznikov](https://github.com/vzakaznikov)).
+* ZooKeeper cannot work reliably in unit tests in CI infrastructure. Using unit tests for ZooKeeper interaction with real ZooKeeper is bad idea from the start (unit tests are not supposed to verify complex distributed systems). We already using integration tests for this purpose and they are better suited. [#13745](https://github.com/ClickHouse/ClickHouse/pull/13745) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Added docker image for style check. Added style check that all docker and docker compose files are located in docker directory. [#13724](https://github.com/ClickHouse/ClickHouse/pull/13724) ([Ilya Yatsishin](https://github.com/qoega)).
+* Fix cassandra build on Mac OS. [#13708](https://github.com/ClickHouse/ClickHouse/pull/13708) ([Ilya Yatsishin](https://github.com/qoega)).
+* Fix link error in shared build. [#13700](https://github.com/ClickHouse/ClickHouse/pull/13700) ([Amos Bird](https://github.com/amosbird)).
+* Updating LDAP user authentication suite to check that it works with RBAC. [#13656](https://github.com/ClickHouse/ClickHouse/pull/13656) ([vzakaznikov](https://github.com/vzakaznikov)).
+* Removed `-DENABLE_CURL_CLIENT` for `contrib/aws`. [#13628](https://github.com/ClickHouse/ClickHouse/pull/13628) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Increasing health-check timeouts for ClickHouse nodes and adding support to dump docker-compose logs if unhealthy containers found. [#13612](https://github.com/ClickHouse/ClickHouse/pull/13612) ([vzakaznikov](https://github.com/vzakaznikov)).
+* Make sure [#10977](https://github.com/ClickHouse/ClickHouse/issues/10977) is invalid. [#13539](https://github.com/ClickHouse/ClickHouse/pull/13539) ([Amos Bird](https://github.com/amosbird)).
+* Skip PR's from robot-clickhouse. [#13489](https://github.com/ClickHouse/ClickHouse/pull/13489) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Move Dockerfiles from integration tests to `docker/test` directory. docker_compose files are available in `runner` docker container. Docker images are built in CI and not in integration tests. [#13448](https://github.com/ClickHouse/ClickHouse/pull/13448) ([Ilya Yatsishin](https://github.com/qoega)).
+
+
+## ClickHouse release 20.7
+
+### ClickHouse release v20.7.2.30-stable, 2020-08-31
+
+#### Backward Incompatible Change
+
+* Function `modulo` (operator `%`) with at least one floating point number as argument will calculate remainder of division directly on floating point numbers without converting both arguments to integers. It makes behaviour compatible with most of DBMS. This also applicable for Date and DateTime data types. Added alias `mod`. This closes [#7323](https://github.com/ClickHouse/ClickHouse/issues/7323). [#12585](https://github.com/ClickHouse/ClickHouse/pull/12585) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Deprecate special printing of zero Date/DateTime values as `0000-00-00` and `0000-00-00 00:00:00`. [#12442](https://github.com/ClickHouse/ClickHouse/pull/12442) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* The function `groupArrayMoving*` was not working for distributed queries. It's result was calculated within incorrect data type (without promotion to the largest type). The function `groupArrayMovingAvg` was returning integer number that was inconsistent with the `avg` function. This fixes [#12568](https://github.com/ClickHouse/ClickHouse/issues/12568). [#12622](https://github.com/ClickHouse/ClickHouse/pull/12622) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add sanity check for MergeTree settings. If the settings are incorrect, the server will refuse to start or to create a table, printing detailed explanation to the user. [#13153](https://github.com/ClickHouse/ClickHouse/pull/13153) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Protect from the cases when user may set `background_pool_size` to value lower than `number_of_free_entries_in_pool_to_execute_mutation` or `number_of_free_entries_in_pool_to_lower_max_size_of_merge`. In these cases ALTERs won't work or the maximum size of merge will be too limited. It will throw exception explaining what to do. This closes [#10897](https://github.com/ClickHouse/ClickHouse/issues/10897). [#12728](https://github.com/ClickHouse/ClickHouse/pull/12728) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* When upgrading from versions older than 20.5, if rolling update is performed and cluster contains both versions 20.5 or greater and less than 20.5, if ClickHouse nodes with old versions are restarted and old version has been started up in presence of newer versions, it may lead to `Part ... intersects previous part` errors. To prevent this error, first install newer clickhouse-server packages on all cluster nodes and then do restarts (so, when clickhouse-server is restarted, it will start up with the new version).
+
+#### New Feature
+
+* Polygon dictionary type that provides efficient "reverse geocoding" lookups - to find the region by coordinates in a dictionary of many polygons (world map). It is using carefully optimized algorithm with recursive grids to maintain low CPU and memory usage. [#9278](https://github.com/ClickHouse/ClickHouse/pull/9278) ([achulkov2](https://github.com/achulkov2)).
+* Added support of LDAP authentication for preconfigured users ("Simple Bind" method). [#11234](https://github.com/ClickHouse/ClickHouse/pull/11234) ([Denis Glazachev](https://github.com/traceon)).
+* Introduce setting `alter_partition_verbose_result` which outputs information about touched parts for some types of `ALTER TABLE ... PARTITION ...` queries (currently `ATTACH` and `FREEZE`). Closes [#8076](https://github.com/ClickHouse/ClickHouse/issues/8076). [#13017](https://github.com/ClickHouse/ClickHouse/pull/13017) ([alesapin](https://github.com/alesapin)).
+* Add `bayesAB` function for bayesian-ab-testing. [#12327](https://github.com/ClickHouse/ClickHouse/pull/12327) ([achimbab](https://github.com/achimbab)).
+* Added `system.crash_log` table into which stack traces for fatal errors are collected. This table should be empty. [#12316](https://github.com/ClickHouse/ClickHouse/pull/12316) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Added http headers `X-ClickHouse-Database` and `X-ClickHouse-Format` which may be used to set default database and output format. [#12981](https://github.com/ClickHouse/ClickHouse/pull/12981) ([hcz](https://github.com/hczhcz)).
+* Add `minMap` and `maxMap` functions support to `SimpleAggregateFunction`. [#12662](https://github.com/ClickHouse/ClickHouse/pull/12662) ([Ildus Kurbangaliev](https://github.com/ildus)).
+* Add setting `allow_non_metadata_alters` which restricts to execute `ALTER` queries which modify data on disk. Disabled be default. Closes [#11547](https://github.com/ClickHouse/ClickHouse/issues/11547). [#12635](https://github.com/ClickHouse/ClickHouse/pull/12635) ([alesapin](https://github.com/alesapin)).
+* A function `formatRow` is added to support turning arbitrary expressions into a string via given format. It's useful for manipulating SQL outputs and is quite versatile combined with the `columns` function. [#12574](https://github.com/ClickHouse/ClickHouse/pull/12574) ([Amos Bird](https://github.com/amosbird)).
+* Add `FROM_UNIXTIME` function for compatibility with MySQL, related to [12149](https://github.com/ClickHouse/ClickHouse/issues/12149). [#12484](https://github.com/ClickHouse/ClickHouse/pull/12484) ([flynn](https://github.com/ucasFL)).
+* Allow Nullable types as keys in MergeTree tables if `allow_nullable_key` table setting is enabled. Closes [#5319](https://github.com/ClickHouse/ClickHouse/issues/5319). [#12433](https://github.com/ClickHouse/ClickHouse/pull/12433) ([Amos Bird](https://github.com/amosbird)).
+* Integration with [COS](https://intl.cloud.tencent.com/product/cos). [#12386](https://github.com/ClickHouse/ClickHouse/pull/12386) ([fastio](https://github.com/fastio)).
+* Add `mapAdd` and `mapSubtract` functions for adding/subtracting key-mapped values. [#11735](https://github.com/ClickHouse/ClickHouse/pull/11735) ([Ildus Kurbangaliev](https://github.com/ildus)).
+
+#### Bug Fix
+
+* Fix premature `ON CLUSTER` timeouts for queries that must be executed on a single replica. Fixes [#6704](https://github.com/ClickHouse/ClickHouse/issues/6704), [#7228](https://github.com/ClickHouse/ClickHouse/issues/7228), [#13361](https://github.com/ClickHouse/ClickHouse/issues/13361), [#11884](https://github.com/ClickHouse/ClickHouse/issues/11884). [#13450](https://github.com/ClickHouse/ClickHouse/pull/13450) ([alesapin](https://github.com/alesapin)).
+* Fix crash in mark inclusion search introduced in [#12277](https://github.com/ClickHouse/ClickHouse/pull/12277). [#14225](https://github.com/ClickHouse/ClickHouse/pull/14225) ([Amos Bird](https://github.com/amosbird)).
+* Fix race condition in external dictionaries with cache layout which can lead server crash. [#12566](https://github.com/ClickHouse/ClickHouse/pull/12566) ([alesapin](https://github.com/alesapin)).
+* Fix visible data clobbering by progress bar in client in interactive mode. This fixes [#12562](https://github.com/ClickHouse/ClickHouse/issues/12562) and [#13369](https://github.com/ClickHouse/ClickHouse/issues/13369) and [#13584](https://github.com/ClickHouse/ClickHouse/issues/13584) and fixes [#12964](https://github.com/ClickHouse/ClickHouse/issues/12964). [#13691](https://github.com/ClickHouse/ClickHouse/pull/13691) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed incorrect sorting order for `LowCardinality` columns when ORDER BY multiple columns is used. This fixes [#13958](https://github.com/ClickHouse/ClickHouse/issues/13958). [#14223](https://github.com/ClickHouse/ClickHouse/pull/14223) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Removed hardcoded timeout, which wrongly overruled `query_wait_timeout_milliseconds` setting for cache-dictionary. [#14105](https://github.com/ClickHouse/ClickHouse/pull/14105) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fixed wrong mount point in extra info for `Poco::Exception: no space left on device`. [#14050](https://github.com/ClickHouse/ClickHouse/pull/14050) ([tavplubix](https://github.com/tavplubix)).
+* Fix wrong query optimization of select queries with `DISTINCT` keyword when subqueries also have `DISTINCT` in case `optimize_duplicate_order_by_and_distinct` setting is enabled. [#13925](https://github.com/ClickHouse/ClickHouse/pull/13925) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fixed potential deadlock when renaming `Distributed` table. [#13922](https://github.com/ClickHouse/ClickHouse/pull/13922) ([tavplubix](https://github.com/tavplubix)).
+* Fix incorrect sorting for `FixedString` columns when ORDER BY multiple columns is used. Fixes [#13182](https://github.com/ClickHouse/ClickHouse/issues/13182). [#13887](https://github.com/ClickHouse/ClickHouse/pull/13887) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix potentially lower precision of `topK`/`topKWeighted` aggregations (with non-default parameters). [#13817](https://github.com/ClickHouse/ClickHouse/pull/13817) ([Azat Khuzhin](https://github.com/azat)).
+* Fix reading from MergeTree table with INDEX of type SET fails when compared against NULL. This fixes [#13686](https://github.com/ClickHouse/ClickHouse/issues/13686). [#13793](https://github.com/ClickHouse/ClickHouse/pull/13793) ([Amos Bird](https://github.com/amosbird)).
+* Fix step overflow in function `range()`. [#13790](https://github.com/ClickHouse/ClickHouse/pull/13790) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed `Directory not empty` error when concurrently executing `DROP DATABASE` and `CREATE TABLE`. [#13756](https://github.com/ClickHouse/ClickHouse/pull/13756) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add range check for `h3KRing` function. This fixes [#13633](https://github.com/ClickHouse/ClickHouse/issues/13633). [#13752](https://github.com/ClickHouse/ClickHouse/pull/13752) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix race condition between DETACH and background merges. Parts may revive after detach. This is continuation of [#8602](https://github.com/ClickHouse/ClickHouse/issues/8602) that did not fix the issue but introduced a test that started to fail in very rare cases, demonstrating the issue. [#13746](https://github.com/ClickHouse/ClickHouse/pull/13746) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix logging Settings.Names/Values when `log_queries_min_type` greater than `QUERY_START`. [#13737](https://github.com/ClickHouse/ClickHouse/pull/13737) ([Azat Khuzhin](https://github.com/azat)).
+* Fix incorrect message in `clickhouse-server.init` while checking user and group. [#13711](https://github.com/ClickHouse/ClickHouse/pull/13711) ([ylchou](https://github.com/ylchou)).
+* Do not optimize `any(arrayJoin())` to `arrayJoin()` under `optimize_move_functions_out_of_any`. [#13681](https://github.com/ClickHouse/ClickHouse/pull/13681) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed possible deadlock in concurrent `ALTER ... REPLACE/MOVE PARTITION ...` queries. [#13626](https://github.com/ClickHouse/ClickHouse/pull/13626) ([tavplubix](https://github.com/tavplubix)).
+* Fixed the behaviour when sometimes cache-dictionary returned default value instead of present value from source. [#13624](https://github.com/ClickHouse/ClickHouse/pull/13624) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fix secondary indices corruption in compact parts (compact parts is an experimental feature). [#13538](https://github.com/ClickHouse/ClickHouse/pull/13538) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix wrong code in function `netloc`. This fixes [#13335](https://github.com/ClickHouse/ClickHouse/issues/13335). [#13446](https://github.com/ClickHouse/ClickHouse/pull/13446) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix error in `parseDateTimeBestEffort` function when unix timestamp was passed as an argument. This fixes [#13362](https://github.com/ClickHouse/ClickHouse/issues/13362). [#13441](https://github.com/ClickHouse/ClickHouse/pull/13441) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix invalid return type for comparison of tuples with `NULL` elements. Fixes [#12461](https://github.com/ClickHouse/ClickHouse/issues/12461). [#13420](https://github.com/ClickHouse/ClickHouse/pull/13420) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix wrong optimization caused `aggregate function any(x) is found inside another aggregate function in query` error with `SET optimize_move_functions_out_of_any = 1` and aliases inside `any()`. [#13419](https://github.com/ClickHouse/ClickHouse/pull/13419) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix possible race in `StorageMemory`. [#13416](https://github.com/ClickHouse/ClickHouse/pull/13416) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix empty output for `Arrow` and `Parquet` formats in case if query return zero rows. It was done because empty output is not valid for this formats. [#13399](https://github.com/ClickHouse/ClickHouse/pull/13399) ([hcz](https://github.com/hczhcz)).
+* Fix select queries with constant columns and prefix of primary key in `ORDER BY` clause. [#13396](https://github.com/ClickHouse/ClickHouse/pull/13396) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix `PrettyCompactMonoBlock` for clickhouse-local. Fix extremes/totals with `PrettyCompactMonoBlock`. Fixes [#7746](https://github.com/ClickHouse/ClickHouse/issues/7746). [#13394](https://github.com/ClickHouse/ClickHouse/pull/13394) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed deadlock in system.text_log. [#12452](https://github.com/ClickHouse/ClickHouse/pull/12452) ([alexey-milovidov](https://github.com/alexey-milovidov)). It is a part of [#12339](https://github.com/ClickHouse/ClickHouse/issues/12339). This fixes [#12325](https://github.com/ClickHouse/ClickHouse/issues/12325). [#13386](https://github.com/ClickHouse/ClickHouse/pull/13386) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fixed `File(TSVWithNames*)` (header was written multiple times), fixed `clickhouse-local --format CSVWithNames*` (lacks header, broken after [#12197](https://github.com/ClickHouse/ClickHouse/issues/12197)), fixed `clickhouse-local --format CSVWithNames*` with zero rows (lacks header). [#13343](https://github.com/ClickHouse/ClickHouse/pull/13343) ([Azat Khuzhin](https://github.com/azat)).
+* Fix segfault when function `groupArrayMovingSum` deserializes empty state. Fixes [#13339](https://github.com/ClickHouse/ClickHouse/issues/13339). [#13341](https://github.com/ClickHouse/ClickHouse/pull/13341) ([alesapin](https://github.com/alesapin)).
+* Throw error on `arrayJoin()` function in `JOIN ON` section. [#13330](https://github.com/ClickHouse/ClickHouse/pull/13330) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix crash in `LEFT ASOF JOIN` with `join_use_nulls=1`. [#13291](https://github.com/ClickHouse/ClickHouse/pull/13291) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix possible error `Totals having transform was already added to pipeline` in case of a query from delayed replica. [#13290](https://github.com/ClickHouse/ClickHouse/pull/13290) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* The server may crash if user passed specifically crafted arguments to the function `h3ToChildren`. This fixes [#13275](https://github.com/ClickHouse/ClickHouse/issues/13275). [#13277](https://github.com/ClickHouse/ClickHouse/pull/13277) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix potentially low performance and slightly incorrect result for `uniqExact`, `topK`, `sumDistinct` and similar aggregate functions called on Float types with `NaN` values. It also triggered assert in debug build. This fixes [#12491](https://github.com/ClickHouse/ClickHouse/issues/12491). [#13254](https://github.com/ClickHouse/ClickHouse/pull/13254) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix assertion in KeyCondition when primary key contains expression with monotonic function and query contains comparison with constant whose type is different. This fixes [#12465](https://github.com/ClickHouse/ClickHouse/issues/12465). [#13251](https://github.com/ClickHouse/ClickHouse/pull/13251) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Return passed number for numbers with MSB set in function roundUpToPowerOfTwoOrZero(). It prevents potential errors in case of overflow of array sizes. [#13234](https://github.com/ClickHouse/ClickHouse/pull/13234) ([Azat Khuzhin](https://github.com/azat)).
+* Fix function if with nullable constexpr as cond that is not literal NULL. Fixes [#12463](https://github.com/ClickHouse/ClickHouse/issues/12463). [#13226](https://github.com/ClickHouse/ClickHouse/pull/13226) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix assert in `arrayElement` function in case of array elements are Nullable and array subscript is also Nullable. This fixes [#12172](https://github.com/ClickHouse/ClickHouse/issues/12172). [#13224](https://github.com/ClickHouse/ClickHouse/pull/13224) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix DateTime64 conversion functions with constant argument. [#13205](https://github.com/ClickHouse/ClickHouse/pull/13205) ([Azat Khuzhin](https://github.com/azat)).
+* Fix parsing row policies from users.xml when names of databases or tables contain dots. This fixes [#5779](https://github.com/ClickHouse/ClickHouse/issues/5779), [#12527](https://github.com/ClickHouse/ClickHouse/issues/12527). [#13199](https://github.com/ClickHouse/ClickHouse/pull/13199) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix access to `redis` dictionary after connection was dropped once. It may happen with `cache` and `direct` dictionary layouts. [#13082](https://github.com/ClickHouse/ClickHouse/pull/13082) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix wrong index analysis with functions. It could lead to some data parts being skipped when reading from `MergeTree` tables. Fixes [#13060](https://github.com/ClickHouse/ClickHouse/issues/13060). Fixes [#12406](https://github.com/ClickHouse/ClickHouse/issues/12406). [#13081](https://github.com/ClickHouse/ClickHouse/pull/13081) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix error `Cannot convert column because it is constant but values of constants are different in source and result` for remote queries which use deterministic functions in scope of query, but not deterministic between queries, like `now()`, `now64()`, `randConstant()`. Fixes [#11327](https://github.com/ClickHouse/ClickHouse/issues/11327). [#13075](https://github.com/ClickHouse/ClickHouse/pull/13075) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix crash which was possible for queries with `ORDER BY` tuple and small `LIMIT`. Fixes [#12623](https://github.com/ClickHouse/ClickHouse/issues/12623). [#13009](https://github.com/ClickHouse/ClickHouse/pull/13009) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix `Block structure mismatch` error for queries with `UNION` and `JOIN`. Fixes [#12602](https://github.com/ClickHouse/ClickHouse/issues/12602). [#12989](https://github.com/ClickHouse/ClickHouse/pull/12989) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Corrected `merge_with_ttl_timeout` logic which did not work well when expiration affected more than one partition over one time interval. (Authored by @excitoon). [#12982](https://github.com/ClickHouse/ClickHouse/pull/12982) ([Alexander Kazakov](https://github.com/Akazz)).
+* Fix columns duplication for range hashed dictionary created from DDL query. This fixes [#10605](https://github.com/ClickHouse/ClickHouse/issues/10605). [#12857](https://github.com/ClickHouse/ClickHouse/pull/12857) ([alesapin](https://github.com/alesapin)).
+* Fix unnecessary limiting for the number of threads for selects from local replica. [#12840](https://github.com/ClickHouse/ClickHouse/pull/12840) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix rare bug when `ALTER DELETE` and `ALTER MODIFY COLUMN` queries executed simultaneously as a single mutation. Bug leads to an incorrect amount of rows in `count.txt` and as a consequence incorrect data in part. Also, fix a small bug with simultaneous `ALTER RENAME COLUMN` and `ALTER ADD COLUMN`. [#12760](https://github.com/ClickHouse/ClickHouse/pull/12760) ([alesapin](https://github.com/alesapin)).
+* Wrong credentials being used when using `clickhouse` dictionary source to query remote tables. [#12756](https://github.com/ClickHouse/ClickHouse/pull/12756) ([sundyli](https://github.com/sundy-li)).
+* Fix `CAST(Nullable(String), Enum())`. [#12745](https://github.com/ClickHouse/ClickHouse/pull/12745) ([Azat Khuzhin](https://github.com/azat)).
+* Fix performance with large tuples, which are interpreted as functions in `IN` section. The case when user writes `WHERE x IN tuple(1, 2, ...)` instead of `WHERE x IN (1, 2, ...)` for some obscure reason. [#12700](https://github.com/ClickHouse/ClickHouse/pull/12700) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix memory tracking for input_format_parallel_parsing (by attaching thread to group). [#12672](https://github.com/ClickHouse/ClickHouse/pull/12672) ([Azat Khuzhin](https://github.com/azat)).
+* Fix wrong optimization `optimize_move_functions_out_of_any=1` in case of `any(func(<lambda>))`. [#12664](https://github.com/ClickHouse/ClickHouse/pull/12664) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fixed [#10572](https://github.com/ClickHouse/ClickHouse/issues/10572) fix bloom filter index with const expression. [#12659](https://github.com/ClickHouse/ClickHouse/pull/12659) ([Winter Zhang](https://github.com/zhang2014)).
+* Fix SIGSEGV in StorageKafka when broker is unavailable (and not only). [#12658](https://github.com/ClickHouse/ClickHouse/pull/12658) ([Azat Khuzhin](https://github.com/azat)).
+* Add support for function `if` with `Array(UUID)` arguments. This fixes [#11066](https://github.com/ClickHouse/ClickHouse/issues/11066). [#12648](https://github.com/ClickHouse/ClickHouse/pull/12648) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* CREATE USER IF NOT EXISTS now doesn't throw exception if the user exists. This fixes [#12507](https://github.com/ClickHouse/ClickHouse/issues/12507). [#12646](https://github.com/ClickHouse/ClickHouse/pull/12646) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Exception `There is no supertype...` can be thrown during `ALTER ... UPDATE` in unexpected cases (e.g. when subtracting from UInt64 column). This fixes [#7306](https://github.com/ClickHouse/ClickHouse/issues/7306). This fixes [#4165](https://github.com/ClickHouse/ClickHouse/issues/4165). [#12633](https://github.com/ClickHouse/ClickHouse/pull/12633) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix possible `Pipeline stuck` error for queries with external sorting. Fixes [#12617](https://github.com/ClickHouse/ClickHouse/issues/12617). [#12618](https://github.com/ClickHouse/ClickHouse/pull/12618) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix error `Output of TreeExecutor is not sorted` for `OPTIMIZE DEDUPLICATE`. Fixes [#11572](https://github.com/ClickHouse/ClickHouse/issues/11572). [#12613](https://github.com/ClickHouse/ClickHouse/pull/12613) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix the issue when alias on result of function `any` can be lost during query optimization. [#12593](https://github.com/ClickHouse/ClickHouse/pull/12593) ([Anton Popov](https://github.com/CurtizJ)).
+* Remove data for Distributed tables (blocks from async INSERTs) on DROP TABLE. [#12556](https://github.com/ClickHouse/ClickHouse/pull/12556) ([Azat Khuzhin](https://github.com/azat)).
+* Now ClickHouse will recalculate checksums for parts when file `checksums.txt` is absent. Broken since [#9827](https://github.com/ClickHouse/ClickHouse/issues/9827). [#12545](https://github.com/ClickHouse/ClickHouse/pull/12545) ([alesapin](https://github.com/alesapin)).
+* Fix bug which lead to broken old parts after `ALTER DELETE` query when `enable_mixed_granularity_parts=1`. Fixes [#12536](https://github.com/ClickHouse/ClickHouse/issues/12536). [#12543](https://github.com/ClickHouse/ClickHouse/pull/12543) ([alesapin](https://github.com/alesapin)).
+* Fixing race condition in live view tables which could cause data duplication. LIVE VIEW is an experimental feature. [#12519](https://github.com/ClickHouse/ClickHouse/pull/12519) ([vzakaznikov](https://github.com/vzakaznikov)).
+* Fix backwards compatibility in binary format of `AggregateFunction(avg, ...)` values. This fixes [#12342](https://github.com/ClickHouse/ClickHouse/issues/12342). [#12486](https://github.com/ClickHouse/ClickHouse/pull/12486) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix crash in JOIN with dictionary when we are joining over expression of dictionary key: `t JOIN dict ON expr(dict.id) = t.id`. Disable dictionary join optimisation for this case. [#12458](https://github.com/ClickHouse/ClickHouse/pull/12458) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix overflow when very large LIMIT or OFFSET is specified. This fixes [#10470](https://github.com/ClickHouse/ClickHouse/issues/10470). This fixes [#11372](https://github.com/ClickHouse/ClickHouse/issues/11372). [#12427](https://github.com/ClickHouse/ClickHouse/pull/12427) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* kafka: fix SIGSEGV if there is a message with error in the middle of the batch. [#12302](https://github.com/ClickHouse/ClickHouse/pull/12302) ([Azat Khuzhin](https://github.com/azat)).
+
+#### Improvement
+
+* Keep smaller amount of logs in ZooKeeper. Avoid excessive growing of ZooKeeper nodes in case of offline replicas when having many servers/tables/inserts. [#13100](https://github.com/ClickHouse/ClickHouse/pull/13100) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Now exceptions forwarded to the client if an error happened during ALTER or mutation. Closes [#11329](https://github.com/ClickHouse/ClickHouse/issues/11329). [#12666](https://github.com/ClickHouse/ClickHouse/pull/12666) ([alesapin](https://github.com/alesapin)).
+* Add `QueryTimeMicroseconds`, `SelectQueryTimeMicroseconds` and `InsertQueryTimeMicroseconds` to `system.events`, along with system.metrics, processes, query_log, etc. [#13028](https://github.com/ClickHouse/ClickHouse/pull/13028) ([ianton-ru](https://github.com/ianton-ru)).
+* Added `SelectedRows` and `SelectedBytes` to `system.events`, along with system.metrics, processes, query_log, etc. [#12638](https://github.com/ClickHouse/ClickHouse/pull/12638) ([ianton-ru](https://github.com/ianton-ru)).
+* Added `current_database` information to `system.query_log`. [#12652](https://github.com/ClickHouse/ClickHouse/pull/12652) ([Amos Bird](https://github.com/amosbird)).
+* Allow `TabSeparatedRaw` as input format. [#12009](https://github.com/ClickHouse/ClickHouse/pull/12009) ([hcz](https://github.com/hczhcz)).
+* Now `joinGet` supports multi-key lookup. [#12418](https://github.com/ClickHouse/ClickHouse/pull/12418) ([Amos Bird](https://github.com/amosbird)).
+* Allow `*Map` aggregate functions to work on Arrays with NULLs. Fixes [#13157](https://github.com/ClickHouse/ClickHouse/issues/13157). [#13225](https://github.com/ClickHouse/ClickHouse/pull/13225) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Avoid overflow in parsing of DateTime values that will lead to negative unix timestamp in their timezone (for example, `1970-01-01 00:00:00` in Moscow). Saturate to zero instead. This fixes [#3470](https://github.com/ClickHouse/ClickHouse/issues/3470). This fixes [#4172](https://github.com/ClickHouse/ClickHouse/issues/4172). [#12443](https://github.com/ClickHouse/ClickHouse/pull/12443) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* AvroConfluent: Skip Kafka tombstone records - Support skipping broken records [#13203](https://github.com/ClickHouse/ClickHouse/pull/13203) ([Andrew Onyshchuk](https://github.com/oandrew)).
+* Fix wrong error for long queries. It was possible to get syntax error other than `Max query size exceeded` for correct query. [#13928](https://github.com/ClickHouse/ClickHouse/pull/13928) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix data race in `lgamma` function. This race was caught only in `tsan`, no side effects really happened. [#13842](https://github.com/ClickHouse/ClickHouse/pull/13842) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix a 'Week'-interval formatting for ATTACH/ALTER/CREATE QUOTA-statements. [#13417](https://github.com/ClickHouse/ClickHouse/pull/13417) ([vladimir-golovchenko](https://github.com/vladimir-golovchenko)).
+* Now broken parts are also reported when encountered in compact part processing. Compact parts is an experimental feature. [#13282](https://github.com/ClickHouse/ClickHouse/pull/13282) ([Amos Bird](https://github.com/amosbird)).
+* Fix assert in `geohashesInBox`. This fixes [#12554](https://github.com/ClickHouse/ClickHouse/issues/12554). [#13229](https://github.com/ClickHouse/ClickHouse/pull/13229) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix assert in `parseDateTimeBestEffort`. This fixes [#12649](https://github.com/ClickHouse/ClickHouse/issues/12649). [#13227](https://github.com/ClickHouse/ClickHouse/pull/13227) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Minor optimization in Processors/PipelineExecutor: breaking out of a loop because it makes sense to do so. [#13058](https://github.com/ClickHouse/ClickHouse/pull/13058) ([Mark Papadakis](https://github.com/markpapadakis)).
+* Support TRUNCATE table without TABLE keyword. [#12653](https://github.com/ClickHouse/ClickHouse/pull/12653) ([Winter Zhang](https://github.com/zhang2014)).
+* Fix explain query format overwrite by default. This fixes [#12541](https://github.com/ClickHouse/ClickHouse/issues/12432). [#12541](https://github.com/ClickHouse/ClickHouse/pull/12541) ([BohuTANG](https://github.com/BohuTANG)).
+* Allow to set JOIN kind and type in more standad way: `LEFT SEMI JOIN` instead of `SEMI LEFT JOIN`. For now both are correct. [#12520](https://github.com/ClickHouse/ClickHouse/pull/12520) ([Artem Zuikov](https://github.com/4ertus2)).
+* Changes default value for `multiple_joins_rewriter_version` to 2. It enables new multiple joins rewriter that knows about column names. [#12469](https://github.com/ClickHouse/ClickHouse/pull/12469) ([Artem Zuikov](https://github.com/4ertus2)).
+* Add several metrics for requests to S3 storages. [#12464](https://github.com/ClickHouse/ClickHouse/pull/12464) ([ianton-ru](https://github.com/ianton-ru)).
+* Use correct default secure port for clickhouse-benchmark with `--secure` argument. This fixes [#11044](https://github.com/ClickHouse/ClickHouse/issues/11044). [#12440](https://github.com/ClickHouse/ClickHouse/pull/12440) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Rollback insertion errors in `Log`, `TinyLog`, `StripeLog` engines. In previous versions insertion error lead to inconsisent table state (this works as documented and it is normal for these table engines). This fixes [#12402](https://github.com/ClickHouse/ClickHouse/issues/12402). [#12426](https://github.com/ClickHouse/ClickHouse/pull/12426) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Implement `RENAME DATABASE` and `RENAME DICTIONARY` for `Atomic` database engine - Add implicit `{uuid}` macro, which can be used in ZooKeeper path for `ReplicatedMergeTree`. It works with `CREATE ... ON CLUSTER ...` queries. Set `show_table_uuid_in_table_create_query_if_not_nil` to `true` to use it. - Make `ReplicatedMergeTree` engine arguments optional, `/clickhouse/tables/{uuid}/{shard}/` and `{replica}` are used by default. Closes [#12135](https://github.com/ClickHouse/ClickHouse/issues/12135). - Minor fixes. - These changes break backward compatibility of `Atomic` database engine. Previously created `Atomic` databases must be manually converted to new format. Atomic database is an experimental feature. [#12343](https://github.com/ClickHouse/ClickHouse/pull/12343) ([tavplubix](https://github.com/tavplubix)).
+* Separated `AWSAuthV4Signer` into different logger, removed excessive `AWSClient: AWSClient` from log messages. [#12320](https://github.com/ClickHouse/ClickHouse/pull/12320) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Better exception message in disk access storage. [#12625](https://github.com/ClickHouse/ClickHouse/pull/12625) ([alesapin](https://github.com/alesapin)).
+* Better exception for function `in` with invalid number of arguments. [#12529](https://github.com/ClickHouse/ClickHouse/pull/12529) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix error message about adaptive granularity. [#12624](https://github.com/ClickHouse/ClickHouse/pull/12624) ([alesapin](https://github.com/alesapin)).
+* Fix SETTINGS parse after FORMAT. [#12480](https://github.com/ClickHouse/ClickHouse/pull/12480) ([Azat Khuzhin](https://github.com/azat)).
+* If MergeTree table does not contain ORDER BY or PARTITION BY, it was possible to request ALTER to CLEAR all the columns and ALTER will stuck. Fixed [#7941](https://github.com/ClickHouse/ClickHouse/issues/7941). [#12382](https://github.com/ClickHouse/ClickHouse/pull/12382) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Avoid re-loading completion from the history file after each query (to avoid history overlaps with other client sessions). [#13086](https://github.com/ClickHouse/ClickHouse/pull/13086) ([Azat Khuzhin](https://github.com/azat)).
+
+#### Performance Improvement
+
+* Lower memory usage for some operations up to 2 times. [#12424](https://github.com/ClickHouse/ClickHouse/pull/12424) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Optimize PK lookup for queries that match exact PK range. [#12277](https://github.com/ClickHouse/ClickHouse/pull/12277) ([Ivan Babrou](https://github.com/bobrik)).
+* Slightly optimize very short queries with `LowCardinality`. [#14129](https://github.com/ClickHouse/ClickHouse/pull/14129) ([Anton Popov](https://github.com/CurtizJ)).
+* Slightly improve performance of aggregation by UInt8/UInt16 keys. [#13091](https://github.com/ClickHouse/ClickHouse/pull/13091) and [#13055](https://github.com/ClickHouse/ClickHouse/pull/13055) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Push down `LIMIT` step for query plan (inside subqueries). [#13016](https://github.com/ClickHouse/ClickHouse/pull/13016) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Parallel primary key lookup and skipping index stages on parts, as described in [#11564](https://github.com/ClickHouse/ClickHouse/issues/11564). [#12589](https://github.com/ClickHouse/ClickHouse/pull/12589) ([Ivan Babrou](https://github.com/bobrik)).
+* Converting String-type arguments of function "if" and "transform" into enum if `set optimize_if_transform_strings_to_enum = 1`. [#12515](https://github.com/ClickHouse/ClickHouse/pull/12515) ([Artem Zuikov](https://github.com/4ertus2)).
+* Replaces monotonic functions with its argument in `ORDER BY` if `set optimize_monotonous_functions_in_order_by=1`. [#12467](https://github.com/ClickHouse/ClickHouse/pull/12467) ([Artem Zuikov](https://github.com/4ertus2)).
+* Add order by optimization that rewrites `ORDER BY x, f(x)` with `ORDER by x` if `set optimize_redundant_functions_in_order_by = 1`. [#12404](https://github.com/ClickHouse/ClickHouse/pull/12404) ([Artem Zuikov](https://github.com/4ertus2)).
+* Allow pushdown predicate when subquery contains `WITH` clause. This fixes [#12293](https://github.com/ClickHouse/ClickHouse/issues/12293) [#12663](https://github.com/ClickHouse/ClickHouse/pull/12663) ([Winter Zhang](https://github.com/zhang2014)).
+* Improve performance of reading from compact parts. Compact parts is an experimental feature. [#12492](https://github.com/ClickHouse/ClickHouse/pull/12492) ([Anton Popov](https://github.com/CurtizJ)).
+* Attempt to implement streaming optimization in `DiskS3`. DiskS3 is an experimental feature. [#12434](https://github.com/ClickHouse/ClickHouse/pull/12434) ([Vladimir Chebotarev](https://github.com/excitoon)).
+
+#### Build/Testing/Packaging Improvement
+
+* Use `shellcheck` for sh tests linting. [#13200](https://github.com/ClickHouse/ClickHouse/pull/13200) [#13207](https://github.com/ClickHouse/ClickHouse/pull/13207) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add script which set labels for pull requests in GitHub hook. [#13183](https://github.com/ClickHouse/ClickHouse/pull/13183) ([alesapin](https://github.com/alesapin)).
+* Remove some of recursive submodules. See [#13378](https://github.com/ClickHouse/ClickHouse/issues/13378). [#13379](https://github.com/ClickHouse/ClickHouse/pull/13379) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Ensure that all the submodules are from proper URLs. Continuation of [#13379](https://github.com/ClickHouse/ClickHouse/issues/13379). This fixes [#13378](https://github.com/ClickHouse/ClickHouse/issues/13378). [#13397](https://github.com/ClickHouse/ClickHouse/pull/13397) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Added support for user-declared settings, which can be accessed from inside queries. This is needed when ClickHouse engine is used as a component of another system. [#13013](https://github.com/ClickHouse/ClickHouse/pull/13013) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Added testing for RBAC functionality of INSERT privilege in TestFlows. Expanded tables on which SELECT is being tested. Added Requirements to match new table engine tests. [#13340](https://github.com/ClickHouse/ClickHouse/pull/13340) ([MyroTk](https://github.com/MyroTk)).
+* Fix timeout error during server restart in the stress test. [#13321](https://github.com/ClickHouse/ClickHouse/pull/13321) ([alesapin](https://github.com/alesapin)).
+* Now fast test will wait server with retries. [#13284](https://github.com/ClickHouse/ClickHouse/pull/13284) ([alesapin](https://github.com/alesapin)).
+* Function `materialize()` (the function for ClickHouse testing) will work for NULL as expected - by transforming it to non-constant column. [#13212](https://github.com/ClickHouse/ClickHouse/pull/13212) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix libunwind build in AArch64. This fixes [#13204](https://github.com/ClickHouse/ClickHouse/issues/13204). [#13208](https://github.com/ClickHouse/ClickHouse/pull/13208) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Even more retries in zkutil gtest to prevent test flakiness. [#13165](https://github.com/ClickHouse/ClickHouse/pull/13165) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Small fixes to the RBAC TestFlows. [#13152](https://github.com/ClickHouse/ClickHouse/pull/13152) ([vzakaznikov](https://github.com/vzakaznikov)).
+* Fixing `00960_live_view_watch_events_live.py` test. [#13108](https://github.com/ClickHouse/ClickHouse/pull/13108) ([vzakaznikov](https://github.com/vzakaznikov)).
+* Improve cache purge in documentation deploy script. [#13107](https://github.com/ClickHouse/ClickHouse/pull/13107) ([alesapin](https://github.com/alesapin)).
+* Rewrote some orphan tests to gtest. Removed useless includes from tests. [#13073](https://github.com/ClickHouse/ClickHouse/pull/13073) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Added tests for RBAC functionality of `SELECT` privilege in TestFlows. [#13061](https://github.com/ClickHouse/ClickHouse/pull/13061) ([Ritaank Tiwari](https://github.com/ritaank)).
+* Rerun some tests in fast test check. [#12992](https://github.com/ClickHouse/ClickHouse/pull/12992) ([alesapin](https://github.com/alesapin)).
+* Fix MSan error in "rdkafka" library. This closes [#12990](https://github.com/ClickHouse/ClickHouse/issues/12990). Updated `rdkafka` to version 1.5 (master). [#12991](https://github.com/ClickHouse/ClickHouse/pull/12991) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix UBSan report in base64 if tests were run on server with AVX-512. This fixes [#12318](https://github.com/ClickHouse/ClickHouse/issues/12318). Author: @qoega. [#12441](https://github.com/ClickHouse/ClickHouse/pull/12441) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix UBSan report in HDFS library. This closes [#12330](https://github.com/ClickHouse/ClickHouse/issues/12330). [#12453](https://github.com/ClickHouse/ClickHouse/pull/12453) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Check an ability that we able to restore the backup from an old version to the new version. This closes [#8979](https://github.com/ClickHouse/ClickHouse/issues/8979). [#12959](https://github.com/ClickHouse/ClickHouse/pull/12959) ([alesapin](https://github.com/alesapin)).
+* Do not build helper_container image inside integrational tests. Build docker container in CI and use pre-built helper_container in integration tests. [#12953](https://github.com/ClickHouse/ClickHouse/pull/12953) ([Ilya Yatsishin](https://github.com/qoega)).
+* Add a test for `ALTER TABLE CLEAR COLUMN` query for primary key columns. [#12951](https://github.com/ClickHouse/ClickHouse/pull/12951) ([alesapin](https://github.com/alesapin)).
+* Increased timeouts in testflows tests. [#12949](https://github.com/ClickHouse/ClickHouse/pull/12949) ([vzakaznikov](https://github.com/vzakaznikov)).
+* Fix build of test under Mac OS X. This closes [#12767](https://github.com/ClickHouse/ClickHouse/issues/12767). [#12772](https://github.com/ClickHouse/ClickHouse/pull/12772) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Connector-ODBC updated to mysql-connector-odbc-8.0.21. [#12739](https://github.com/ClickHouse/ClickHouse/pull/12739) ([Ilya Yatsishin](https://github.com/qoega)).
+* Adding RBAC syntax tests in TestFlows. [#12642](https://github.com/ClickHouse/ClickHouse/pull/12642) ([vzakaznikov](https://github.com/vzakaznikov)).
+* Improve performance of TestKeeper. This will speedup tests with heavy usage of Replicated tables. [#12505](https://github.com/ClickHouse/ClickHouse/pull/12505) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Now we check that server is able to start after stress tests run. This fixes [#12473](https://github.com/ClickHouse/ClickHouse/issues/12473). [#12496](https://github.com/ClickHouse/ClickHouse/pull/12496) ([alesapin](https://github.com/alesapin)).
+* Update fmtlib to master (7.0.1). [#12446](https://github.com/ClickHouse/ClickHouse/pull/12446) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add docker image for fast tests. [#12294](https://github.com/ClickHouse/ClickHouse/pull/12294) ([alesapin](https://github.com/alesapin)).
+* Rework configuration paths for integration tests. [#12285](https://github.com/ClickHouse/ClickHouse/pull/12285) ([Ilya Yatsishin](https://github.com/qoega)).
+* Add compiler option to control that stack frames are not too large. This will help to run the code in fibers with small stack size. [#11524](https://github.com/ClickHouse/ClickHouse/pull/11524) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Update gitignore-files. [#13447](https://github.com/ClickHouse/ClickHouse/pull/13447) ([vladimir-golovchenko](https://github.com/vladimir-golovchenko)).
+
+
+## ClickHouse release 20.6
+
+### ClickHouse release v20.6.3.28-stable
+
+#### Backward Incompatible Change
+
+* When upgrading from versions older than 20.5, if rolling update is performed and cluster contains both versions 20.5 or greater and less than 20.5, if ClickHouse nodes with old versions are restarted and old version has been started up in presence of newer versions, it may lead to `Part ... intersects previous part` errors. To prevent this error, first install newer clickhouse-server packages on all cluster nodes and then do restarts (so, when clickhouse-server is restarted, it will start up with the new version).
+
+#### New Feature
+
+* Added an initial implementation of `EXPLAIN` query. Syntax: `EXPLAIN SELECT ...`. This fixes [#1118](https://github.com/ClickHouse/ClickHouse/issues/1118). [#11873](https://github.com/ClickHouse/ClickHouse/pull/11873) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Added storage `RabbitMQ`. [#11069](https://github.com/ClickHouse/ClickHouse/pull/11069) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Implemented PostgreSQL-like `ILIKE` operator for [#11710](https://github.com/ClickHouse/ClickHouse/issues/11710). [#12125](https://github.com/ClickHouse/ClickHouse/pull/12125) ([Mike](https://github.com/myrrc)).
+* Supported RIGHT and FULL JOIN with `SET join_algorithm = 'partial_merge'`. Only ALL strictness is allowed (ANY, SEMI, ANTI, ASOF are not). [#12118](https://github.com/ClickHouse/ClickHouse/pull/12118) ([Artem Zuikov](https://github.com/4ertus2)).
+* Added a function `initializeAggregation` to initialize an aggregation based on a single value. [#12109](https://github.com/ClickHouse/ClickHouse/pull/12109) ([Guillaume Tassery](https://github.com/YiuRULE)).
+* Supported `ALTER TABLE ... [ADD|MODIFY] COLUMN ... FIRST` [#4006](https://github.com/ClickHouse/ClickHouse/issues/4006). [#12073](https://github.com/ClickHouse/ClickHouse/pull/12073) ([Winter Zhang](https://github.com/zhang2014)).
+* Added function `parseDateTimeBestEffortUS`. [#12028](https://github.com/ClickHouse/ClickHouse/pull/12028) ([flynn](https://github.com/ucasFL)).
+* Support format `ORC` for output (was supported only for input). [#11662](https://github.com/ClickHouse/ClickHouse/pull/11662) ([Kruglov Pavel](https://github.com/Avogar)).
+
+#### Bug Fix
+
+* Fixed `aggregate function any(x) is found inside another aggregate function in query` error with `SET optimize_move_functions_out_of_any = 1` and aliases inside `any()`. [#13419](https://github.com/ClickHouse/ClickHouse/pull/13419) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fixed `PrettyCompactMonoBlock` for clickhouse-local. Fixed extremes/totals with `PrettyCompactMonoBlock`. This fixes [#7746](https://github.com/ClickHouse/ClickHouse/issues/7746). [#13394](https://github.com/ClickHouse/ClickHouse/pull/13394) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed possible error `Totals having transform was already added to pipeline` in case of a query from delayed replica. [#13290](https://github.com/ClickHouse/ClickHouse/pull/13290) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* The server may crash if user passed specifically crafted arguments to the function `h3ToChildren`. This fixes [#13275](https://github.com/ClickHouse/ClickHouse/issues/13275). [#13277](https://github.com/ClickHouse/ClickHouse/pull/13277) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed potentially low performance and slightly incorrect result for `uniqExact`, `topK`, `sumDistinct` and similar aggregate functions called on Float types with NaN values. It also triggered assert in debug build. This fixes [#12491](https://github.com/ClickHouse/ClickHouse/issues/12491). [#13254](https://github.com/ClickHouse/ClickHouse/pull/13254) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed function if with nullable constexpr as cond that is not literal NULL. Fixes [#12463](https://github.com/ClickHouse/ClickHouse/issues/12463). [#13226](https://github.com/ClickHouse/ClickHouse/pull/13226) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed assert in `arrayElement` function in case of array elements are Nullable and array subscript is also Nullable. This fixes [#12172](https://github.com/ClickHouse/ClickHouse/issues/12172). [#13224](https://github.com/ClickHouse/ClickHouse/pull/13224) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed `DateTime64` conversion functions with constant argument. [#13205](https://github.com/ClickHouse/ClickHouse/pull/13205) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed wrong index analysis with functions. It could lead to pruning wrong parts, while reading from `MergeTree` tables. Fixes [#13060](https://github.com/ClickHouse/ClickHouse/issues/13060). Fixes [#12406](https://github.com/ClickHouse/ClickHouse/issues/12406). [#13081](https://github.com/ClickHouse/ClickHouse/pull/13081) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed error `Cannot convert column because it is constant but values of constants are different in source and result` for remote queries which use deterministic functions in scope of query, but not deterministic between queries, like `now()`, `now64()`, `randConstant()`. Fixes [#11327](https://github.com/ClickHouse/ClickHouse/issues/11327). [#13075](https://github.com/ClickHouse/ClickHouse/pull/13075) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed unnecessary limiting for the number of threads for selects from local replica. [#12840](https://github.com/ClickHouse/ClickHouse/pull/12840) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed rare bug when `ALTER DELETE` and `ALTER MODIFY COLUMN` queries executed simultaneously as a single mutation. Bug leads to an incorrect amount of rows in `count.txt` and as a consequence incorrect data in part. Also, fix a small bug with simultaneous `ALTER RENAME COLUMN` and `ALTER ADD COLUMN`. [#12760](https://github.com/ClickHouse/ClickHouse/pull/12760) ([alesapin](https://github.com/alesapin)).
+* Fixed `CAST(Nullable(String), Enum())`. [#12745](https://github.com/ClickHouse/ClickHouse/pull/12745) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed a performance with large tuples, which are interpreted as functions in `IN` section. The case when user write `WHERE x IN tuple(1, 2, ...)` instead of `WHERE x IN (1, 2, ...)` for some obscure reason. [#12700](https://github.com/ClickHouse/ClickHouse/pull/12700) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed memory tracking for `input_format_parallel_parsing` (by attaching thread to group). [#12672](https://github.com/ClickHouse/ClickHouse/pull/12672) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed bloom filter index with const expression. This fixes [#10572](https://github.com/ClickHouse/ClickHouse/issues/10572). [#12659](https://github.com/ClickHouse/ClickHouse/pull/12659) ([Winter Zhang](https://github.com/zhang2014)).
+* Fixed `SIGSEGV` in `StorageKafka` when broker is unavailable (and not only). [#12658](https://github.com/ClickHouse/ClickHouse/pull/12658) ([Azat Khuzhin](https://github.com/azat)).
+* Added support for function `if` with `Array(UUID)` arguments. This fixes [#11066](https://github.com/ClickHouse/ClickHouse/issues/11066). [#12648](https://github.com/ClickHouse/ClickHouse/pull/12648) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* `CREATE USER IF NOT EXISTS` now doesn't throw exception if the user exists. This fixes [#12507](https://github.com/ClickHouse/ClickHouse/issues/12507). [#12646](https://github.com/ClickHouse/ClickHouse/pull/12646) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Better exception message in disk access storage. [#12625](https://github.com/ClickHouse/ClickHouse/pull/12625) ([alesapin](https://github.com/alesapin)).
+* The function `groupArrayMoving*` was not working for distributed queries. It's result was calculated within incorrect data type (without promotion to the largest type). The function `groupArrayMovingAvg` was returning integer number that was inconsistent with the `avg` function. This fixes [#12568](https://github.com/ClickHouse/ClickHouse/issues/12568). [#12622](https://github.com/ClickHouse/ClickHouse/pull/12622) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed lack of aliases with function `any`. [#12593](https://github.com/ClickHouse/ClickHouse/pull/12593) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed race condition in external dictionaries with cache layout which can lead server crash. [#12566](https://github.com/ClickHouse/ClickHouse/pull/12566) ([alesapin](https://github.com/alesapin)).
+* Remove data for Distributed tables (blocks from async INSERTs) on DROP TABLE. [#12556](https://github.com/ClickHouse/ClickHouse/pull/12556) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed bug which lead to broken old parts after `ALTER DELETE` query when `enable_mixed_granularity_parts=1`. Fixes [#12536](https://github.com/ClickHouse/ClickHouse/issues/12536). [#12543](https://github.com/ClickHouse/ClickHouse/pull/12543) ([alesapin](https://github.com/alesapin)).
+* Better exception for function `in` with invalid number of arguments. [#12529](https://github.com/ClickHouse/ClickHouse/pull/12529) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixing race condition in live view tables which could cause data duplication. [#12519](https://github.com/ClickHouse/ClickHouse/pull/12519) ([vzakaznikov](https://github.com/vzakaznikov)).
+* Fixed performance issue, while reading from compact parts. [#12492](https://github.com/ClickHouse/ClickHouse/pull/12492) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed backwards compatibility in binary format of `AggregateFunction(avg, ...)` values. This fixes [#12342](https://github.com/ClickHouse/ClickHouse/issues/12342). [#12486](https://github.com/ClickHouse/ClickHouse/pull/12486) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed SETTINGS parse after FORMAT. [#12480](https://github.com/ClickHouse/ClickHouse/pull/12480) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed the deadlock if `text_log` is enabled. [#12452](https://github.com/ClickHouse/ClickHouse/pull/12452) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed overflow when very large `LIMIT` or `OFFSET` is specified. This fixes [#10470](https://github.com/ClickHouse/ClickHouse/issues/10470). This fixes [#11372](https://github.com/ClickHouse/ClickHouse/issues/11372). [#12427](https://github.com/ClickHouse/ClickHouse/pull/12427) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed possible segfault if `StorageMerge`. This fixes [#12054](https://github.com/ClickHouse/ClickHouse/issues/12054). [#12401](https://github.com/ClickHouse/ClickHouse/pull/12401) ([tavplubix](https://github.com/tavplubix)).
+* Reverted change introduced in [#11079](https://github.com/ClickHouse/ClickHouse/issues/11079) to resolve [#12098](https://github.com/ClickHouse/ClickHouse/issues/12098). [#12397](https://github.com/ClickHouse/ClickHouse/pull/12397) ([Mike](https://github.com/myrrc)).
+* Additional check for arguments of bloom filter index. This fixes [#11408](https://github.com/ClickHouse/ClickHouse/issues/11408). [#12388](https://github.com/ClickHouse/ClickHouse/pull/12388) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Avoid exception when negative or floating point constant is used in WHERE condition for indexed tables. This fixes [#11905](https://github.com/ClickHouse/ClickHouse/issues/11905). [#12384](https://github.com/ClickHouse/ClickHouse/pull/12384) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Allowed to `CLEAR` column even if there are depending `DEFAULT` expressions. This fixes [#12333](https://github.com/ClickHouse/ClickHouse/issues/12333). [#12378](https://github.com/ClickHouse/ClickHouse/pull/12378) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix `TOTALS/ROLLUP/CUBE` for aggregate functions with `-State` and `Nullable` arguments. This fixes [#12163](https://github.com/ClickHouse/ClickHouse/issues/12163). [#12376](https://github.com/ClickHouse/ClickHouse/pull/12376) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed error message and exit codes for `ALTER RENAME COLUMN` queries, when `RENAME` is not allowed. Fixes [#12301](https://github.com/ClickHouse/ClickHouse/issues/12301) and [#12303](https://github.com/ClickHouse/ClickHouse/issues/12303). [#12335](https://github.com/ClickHouse/ClickHouse/pull/12335) ([alesapin](https://github.com/alesapin)).
+* Fixed very rare race condition in `ReplicatedMergeTreeQueue`. [#12315](https://github.com/ClickHouse/ClickHouse/pull/12315) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* When using codec `Delta` or `DoubleDelta` with non fixed width types, exception with code `LOGICAL_ERROR` was returned instead of exception with code `BAD_ARGUMENTS` (we ensure that exceptions with code logical error never happen). This fixes [#12110](https://github.com/ClickHouse/ClickHouse/issues/12110). [#12308](https://github.com/ClickHouse/ClickHouse/pull/12308) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed order of columns in `WITH FILL` modifier. Previously order of columns of `ORDER BY` statement wasn't respected. [#12306](https://github.com/ClickHouse/ClickHouse/pull/12306) ([Anton Popov](https://github.com/CurtizJ)).
+* Avoid "bad cast" exception when there is an expression that filters data by virtual columns (like `_table` in `Merge` tables) or by "index" columns in system tables such as filtering by database name when querying from `system.tables`, and this expression returns `Nullable` type. This fixes [#12166](https://github.com/ClickHouse/ClickHouse/issues/12166). [#12305](https://github.com/ClickHouse/ClickHouse/pull/12305) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed `TTL` after renaming column, on which depends TTL expression. [#12304](https://github.com/ClickHouse/ClickHouse/pull/12304) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed SIGSEGV if there is an message with error in the middle of the batch in `Kafka` Engine. [#12302](https://github.com/ClickHouse/ClickHouse/pull/12302) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed the situation when some threads might randomly hang for a few seconds during `DNS` cache updating. [#12296](https://github.com/ClickHouse/ClickHouse/pull/12296) ([tavplubix](https://github.com/tavplubix)).
+* Fixed typo in setting name. [#12292](https://github.com/ClickHouse/ClickHouse/pull/12292) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Show error after `TrieDictionary` failed to load. [#12290](https://github.com/ClickHouse/ClickHouse/pull/12290) ([Vitaly Baranov](https://github.com/vitlibar)).
+* The function `arrayFill` worked incorrectly for empty arrays that may lead to crash. This fixes [#12263](https://github.com/ClickHouse/ClickHouse/issues/12263). [#12279](https://github.com/ClickHouse/ClickHouse/pull/12279) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Implement conversions to the common type for `LowCardinality` types. This allows to execute UNION ALL of tables with columns of LowCardinality and other columns. This fixes [#8212](https://github.com/ClickHouse/ClickHouse/issues/8212). This fixes [#4342](https://github.com/ClickHouse/ClickHouse/issues/4342). [#12275](https://github.com/ClickHouse/ClickHouse/pull/12275) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed the behaviour on reaching redirect limit in request to `S3` storage. [#12256](https://github.com/ClickHouse/ClickHouse/pull/12256) ([ianton-ru](https://github.com/ianton-ru)).
+* Fixed the behaviour when during multiple sequential inserts in `StorageFile` header for some special types was written more than once. This fixed [#6155](https://github.com/ClickHouse/ClickHouse/issues/6155). [#12197](https://github.com/ClickHouse/ClickHouse/pull/12197) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fixed logical functions for UInt8 values when they are not equal to 0 or 1. [#12196](https://github.com/ClickHouse/ClickHouse/pull/12196) ([Alexander Kazakov](https://github.com/Akazz)).
+* Cap max_memory_usage* limits to the process resident memory. [#12182](https://github.com/ClickHouse/ClickHouse/pull/12182) ([Azat Khuzhin](https://github.com/azat)).
+* Fix dictGet arguments check during `GROUP BY` injective functions elimination. [#12179](https://github.com/ClickHouse/ClickHouse/pull/12179) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed the behaviour when `SummingMergeTree` engine sums up columns from partition key. Added an exception in case of explicit definition of columns to sum which intersects with partition key columns. This fixes [#7867](https://github.com/ClickHouse/ClickHouse/issues/7867). [#12173](https://github.com/ClickHouse/ClickHouse/pull/12173) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Don't split the dictionary source's table name into schema and table name itself if ODBC connection doesn't support schema. [#12165](https://github.com/ClickHouse/ClickHouse/pull/12165) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fixed wrong logic in `ALTER DELETE` that leads to deleting of records when condition evaluates to NULL. This fixes [#9088](https://github.com/ClickHouse/ClickHouse/issues/9088). This closes [#12106](https://github.com/ClickHouse/ClickHouse/issues/12106). [#12153](https://github.com/ClickHouse/ClickHouse/pull/12153) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed transform of query to send to external DBMS (e.g. MySQL, ODBC) in presense of aliases. This fixes [#12032](https://github.com/ClickHouse/ClickHouse/issues/12032). [#12151](https://github.com/ClickHouse/ClickHouse/pull/12151) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed bad code in redundant ORDER BY optimization. The bug was introduced in [#10067](https://github.com/ClickHouse/ClickHouse/issues/10067). [#12148](https://github.com/ClickHouse/ClickHouse/pull/12148) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed potential overflow in integer division. This fixes [#12119](https://github.com/ClickHouse/ClickHouse/issues/12119). [#12140](https://github.com/ClickHouse/ClickHouse/pull/12140) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed potential infinite loop in `greatCircleDistance`, `geoDistance`. This fixes [#12117](https://github.com/ClickHouse/ClickHouse/issues/12117). [#12137](https://github.com/ClickHouse/ClickHouse/pull/12137) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Normalize "pid" file handling. In previous versions the server may refuse to start if it was killed without proper shutdown and if there is another process that has the same pid as previously runned server. Also pid file may be removed in unsuccessful server startup even if there is another server running. This fixes [#3501](https://github.com/ClickHouse/ClickHouse/issues/3501). [#12133](https://github.com/ClickHouse/ClickHouse/pull/12133) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed bug which leads to incorrect table metadata in ZooKeepeer for ReplicatedVersionedCollapsingMergeTree tables. Fixes [#12093](https://github.com/ClickHouse/ClickHouse/issues/12093). [#12121](https://github.com/ClickHouse/ClickHouse/pull/12121) ([alesapin](https://github.com/alesapin)).
+* Avoid "There is no query" exception for materialized views with joins or with subqueries attached to system logs (system.query_log, metric_log, etc) or to engine=Buffer underlying table. [#12120](https://github.com/ClickHouse/ClickHouse/pull/12120) ([filimonov](https://github.com/filimonov)).
+* Fixed handling dependency of table with ENGINE=Dictionary on dictionary. This fixes [#10994](https://github.com/ClickHouse/ClickHouse/issues/10994). This fixes [#10397](https://github.com/ClickHouse/ClickHouse/issues/10397). [#12116](https://github.com/ClickHouse/ClickHouse/pull/12116) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Format `Parquet` now properly works with `LowCardinality` and `LowCardinality(Nullable)` types. Fixes [#12086](https://github.com/ClickHouse/ClickHouse/issues/12086), [#8406](https://github.com/ClickHouse/ClickHouse/issues/8406). [#12108](https://github.com/ClickHouse/ClickHouse/pull/12108) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed performance for selects with `UNION` caused by wrong limit for the total number of threads. Fixes [#12030](https://github.com/ClickHouse/ClickHouse/issues/12030). [#12103](https://github.com/ClickHouse/ClickHouse/pull/12103) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed segfault with `-StateResample` combinators. [#12092](https://github.com/ClickHouse/ClickHouse/pull/12092) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed empty `result_rows` and `result_bytes` metrics in `system.quey_log` for selects. Fixes [#11595](https://github.com/ClickHouse/ClickHouse/issues/11595). [#12089](https://github.com/ClickHouse/ClickHouse/pull/12089) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed unnecessary limiting the number of threads for selects from `VIEW`. Fixes [#11937](https://github.com/ClickHouse/ClickHouse/issues/11937). [#12085](https://github.com/ClickHouse/ClickHouse/pull/12085) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed SIGSEGV in StorageKafka on DROP TABLE. [#12075](https://github.com/ClickHouse/ClickHouse/pull/12075) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed possible crash while using wrong type for `PREWHERE`. Fixes [#12053](https://github.com/ClickHouse/ClickHouse/issues/12053), [#12060](https://github.com/ClickHouse/ClickHouse/issues/12060). [#12060](https://github.com/ClickHouse/ClickHouse/pull/12060) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed error `Cannot capture column` for higher-order functions with `Tuple(LowCardinality)` argument. Fixes [#9766](https://github.com/ClickHouse/ClickHouse/issues/9766). [#12055](https://github.com/ClickHouse/ClickHouse/pull/12055) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed constraints check if constraint is a constant expression. This fixes [#11360](https://github.com/ClickHouse/ClickHouse/issues/11360). [#12042](https://github.com/ClickHouse/ClickHouse/pull/12042) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed wrong result and potential crash when invoking function `if` with arguments of type `FixedString` with different sizes. This fixes [#11362](https://github.com/ClickHouse/ClickHouse/issues/11362). [#12021](https://github.com/ClickHouse/ClickHouse/pull/12021) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+
+#### Improvement
+
+* Allowed to set `JOIN` kind and type in more standard way: `LEFT SEMI JOIN` instead of `SEMI LEFT JOIN`. For now both are correct. [#12520](https://github.com/ClickHouse/ClickHouse/pull/12520) ([Artem Zuikov](https://github.com/4ertus2)).
+* lifetime_rows/lifetime_bytes for Buffer engine. [#12421](https://github.com/ClickHouse/ClickHouse/pull/12421) ([Azat Khuzhin](https://github.com/azat)).
+* Write the detail exception message to the client instead of 'MySQL server has gone away'. [#12383](https://github.com/ClickHouse/ClickHouse/pull/12383) ([BohuTANG](https://github.com/BohuTANG)).
+* Allows to change a charset which is used for printing grids borders. Available charsets are following: UTF-8, ASCII. Setting `output_format_pretty_grid_charset` enables this feature. [#12372](https://github.com/ClickHouse/ClickHouse/pull/12372) ([Sabyanin Maxim](https://github.com/s-mx)).
+* Supported MySQL 'SELECT DATABASE()' [#9336](https://github.com/ClickHouse/ClickHouse/issues/9336) 2. Add MySQL replacement query integration test. [#12314](https://github.com/ClickHouse/ClickHouse/pull/12314) ([BohuTANG](https://github.com/BohuTANG)).
+* Added `KILL QUERY [connection_id]` for the MySQL client/driver to cancel the long query, issue [#12038](https://github.com/ClickHouse/ClickHouse/issues/12038). [#12152](https://github.com/ClickHouse/ClickHouse/pull/12152) ([BohuTANG](https://github.com/BohuTANG)).
+* Added support for `%g` (two digit ISO year) and `%G` (four digit ISO year) substitutions in `formatDateTime` function. [#12136](https://github.com/ClickHouse/ClickHouse/pull/12136) ([vivarum](https://github.com/vivarum)).
+* Added 'type' column in system.disks. [#12115](https://github.com/ClickHouse/ClickHouse/pull/12115) ([ianton-ru](https://github.com/ianton-ru)).
+* Improved `REVOKE` command: now it requires grant/admin option for only access which will be revoked. For example, to execute `REVOKE ALL ON *.* FROM user1` now it doesn't require to have full access rights granted with grant option. Added command `REVOKE ALL FROM user1` - it revokes all granted roles from `user1`. [#12083](https://github.com/ClickHouse/ClickHouse/pull/12083) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Added replica priority for load_balancing (for manual prioritization of the load balancing). [#11995](https://github.com/ClickHouse/ClickHouse/pull/11995) ([Azat Khuzhin](https://github.com/azat)).
+* Switched paths in S3 metadata to relative which allows to handle S3 blobs more easily. [#11892](https://github.com/ClickHouse/ClickHouse/pull/11892) ([Vladimir Chebotarev](https://github.com/excitoon)).
+
+#### Performance Improvement
+
+* Improved performace of 'ORDER BY' and 'GROUP BY' by prefix of sorting key (enabled with `optimize_aggregation_in_order` setting, disabled by default). [#11696](https://github.com/ClickHouse/ClickHouse/pull/11696) ([Anton Popov](https://github.com/CurtizJ)).
+* Removed injective functions inside `uniq*()` if `set optimize_injective_functions_inside_uniq=1`. [#12337](https://github.com/ClickHouse/ClickHouse/pull/12337) ([Ruslan Kamalov](https://github.com/kamalov-ruslan)).
+* Index not used for IN operator with literals, performance regression introduced around v19.3. This fixes [#10574](https://github.com/ClickHouse/ClickHouse/issues/10574). [#12062](https://github.com/ClickHouse/ClickHouse/pull/12062) ([nvartolomei](https://github.com/nvartolomei)).
+* Implemented single part uploads for DiskS3 (experimental feature). [#12026](https://github.com/ClickHouse/ClickHouse/pull/12026) ([Vladimir Chebotarev](https://github.com/excitoon)).
+
+#### Experimental Feature
+* Added new in-memory format of parts in `MergeTree`-family tables, which stores data in memory. Parts are written on disk at first merge. Part will be created in in-memory format if its size in rows or bytes is below thresholds `min_rows_for_compact_part` and `min_bytes_for_compact_part`. Also optional support of Write-Ahead-Log is available, which is enabled by default and is controlled by setting `in_memory_parts_enable_wal`. [#10697](https://github.com/ClickHouse/ClickHouse/pull/10697) ([Anton Popov](https://github.com/CurtizJ)).
+
+#### Build/Testing/Packaging Improvement
+
+* Implement AST-based query fuzzing mode for clickhouse-client. See [this label](https://github.com/ClickHouse/ClickHouse/issues?q=label%3Afuzz+is%3Aissue) for the list of issues we recently found by fuzzing. Most of them were found by this tool, and a couple by SQLancer and `00746_sql_fuzzy.pl`. [#12111](https://github.com/ClickHouse/ClickHouse/pull/12111) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Add new type of tests based on Testflows framework. [#12090](https://github.com/ClickHouse/ClickHouse/pull/12090) ([vzakaznikov](https://github.com/vzakaznikov)).
+* Added S3 HTTPS integration test. [#12412](https://github.com/ClickHouse/ClickHouse/pull/12412) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Log sanitizer trap messages from separate thread. This will prevent possible deadlock under thread sanitizer. [#12313](https://github.com/ClickHouse/ClickHouse/pull/12313) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Now functional and stress tests will be able to run with old version of `clickhouse-test` script. [#12287](https://github.com/ClickHouse/ClickHouse/pull/12287) ([alesapin](https://github.com/alesapin)).
+* Remove strange file creation during build in `orc`. [#12258](https://github.com/ClickHouse/ClickHouse/pull/12258) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Place common docker compose files to integration docker container. [#12168](https://github.com/ClickHouse/ClickHouse/pull/12168) ([Ilya Yatsishin](https://github.com/qoega)).
+* Fix warnings from CodeQL. `CodeQL` is another static analyzer that we will use along with `clang-tidy` and `PVS-Studio` that we use already. [#12138](https://github.com/ClickHouse/ClickHouse/pull/12138) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Minor CMake fixes for UNBUNDLED build. [#12131](https://github.com/ClickHouse/ClickHouse/pull/12131) ([Matwey V. Kornilov](https://github.com/matwey)).
+* Added a showcase of the minimal Docker image without using any Linux distribution. [#12126](https://github.com/ClickHouse/ClickHouse/pull/12126) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Perform an upgrade of system packages in the `clickhouse-server` docker image. [#12124](https://github.com/ClickHouse/ClickHouse/pull/12124) ([Ivan Blinkov](https://github.com/blinkov)).
+* Add `UNBUNDLED` flag to `system.build_options` table. Move skip lists for `clickhouse-test` to clickhouse repo. [#12107](https://github.com/ClickHouse/ClickHouse/pull/12107) ([alesapin](https://github.com/alesapin)).
+* Regular check by [Anchore Container Analysis](https://docs.anchore.com) security analysis tool that looks for [CVE](https://cve.mitre.org/) in `clickhouse-server` Docker image. Also confirms that `Dockerfile` is buildable. Runs daily on `master` and on pull-requests to `Dockerfile`. [#12102](https://github.com/ClickHouse/ClickHouse/pull/12102) ([Ivan Blinkov](https://github.com/blinkov)).
+* Daily check by [GitHub CodeQL](https://securitylab.github.com/tools/codeql) security analysis tool that looks for [CWE](https://cwe.mitre.org/). [#12101](https://github.com/ClickHouse/ClickHouse/pull/12101) ([Ivan Blinkov](https://github.com/blinkov)).
+* Install `ca-certificates` before the first `apt-get update` in Dockerfile. [#12095](https://github.com/ClickHouse/ClickHouse/pull/12095) ([Ivan Blinkov](https://github.com/blinkov)).
+
+## ClickHouse release 20.5
+
+### ClickHouse release v20.5.4.40-stable 2020-08-10
+
+#### Bug Fix
+
+* Fixed wrong index analysis with functions. It could lead to pruning wrong parts, while reading from `MergeTree` tables. Fixes [#13060](https://github.com/ClickHouse/ClickHouse/issues/13060). Fixes [#12406](https://github.com/ClickHouse/ClickHouse/issues/12406). [#13081](https://github.com/ClickHouse/ClickHouse/pull/13081) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed unnecessary limiting for the number of threads for selects from local replica. [#12840](https://github.com/ClickHouse/ClickHouse/pull/12840) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed performance with large tuples, which are interpreted as functions in `IN` section. The case when user write `WHERE x IN tuple(1, 2, ...)` instead of `WHERE x IN (1, 2, ...)` for some obscure reason. [#12700](https://github.com/ClickHouse/ClickHouse/pull/12700) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed memory tracking for input_format_parallel_parsing (by attaching thread to group). [#12672](https://github.com/ClickHouse/ClickHouse/pull/12672) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed bloom filter index with const expression. This fixes [#10572](https://github.com/ClickHouse/ClickHouse/issues/10572). [#12659](https://github.com/ClickHouse/ClickHouse/pull/12659) ([Winter Zhang](https://github.com/zhang2014)).
+* Fixed `SIGSEGV` in `StorageKafka` when broker is unavailable (and not only). [#12658](https://github.com/ClickHouse/ClickHouse/pull/12658) ([Azat Khuzhin](https://github.com/azat)).
+* Added support for function `if` with `Array(UUID)` arguments. This fixes [#11066](https://github.com/ClickHouse/ClickHouse/issues/11066). [#12648](https://github.com/ClickHouse/ClickHouse/pull/12648) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed lack of aliases with function `any`. [#12593](https://github.com/ClickHouse/ClickHouse/pull/12593) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed race condition in external dictionaries with cache layout which can lead server crash. [#12566](https://github.com/ClickHouse/ClickHouse/pull/12566) ([alesapin](https://github.com/alesapin)).
+* Remove data for Distributed tables (blocks from async INSERTs) on DROP TABLE. [#12556](https://github.com/ClickHouse/ClickHouse/pull/12556) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed bug which lead to broken old parts after `ALTER DELETE` query when `enable_mixed_granularity_parts=1`. Fixes [#12536](https://github.com/ClickHouse/ClickHouse/issues/12536). [#12543](https://github.com/ClickHouse/ClickHouse/pull/12543) ([alesapin](https://github.com/alesapin)).
+* Better exception for function `in` with invalid number of arguments. [#12529](https://github.com/ClickHouse/ClickHouse/pull/12529) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed race condition in live view tables which could cause data duplication. [#12519](https://github.com/ClickHouse/ClickHouse/pull/12519) ([vzakaznikov](https://github.com/vzakaznikov)).
+* Fixed performance issue, while reading from compact parts. [#12492](https://github.com/ClickHouse/ClickHouse/pull/12492) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed backwards compatibility in binary format of `AggregateFunction(avg, ...)` values. This fixes [#12342](https://github.com/ClickHouse/ClickHouse/issues/12342). [#12486](https://github.com/ClickHouse/ClickHouse/pull/12486) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed the deadlock if `text_log` is enabled. [#12452](https://github.com/ClickHouse/ClickHouse/pull/12452) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed overflow when very large LIMIT or OFFSET is specified. This fixes [#10470](https://github.com/ClickHouse/ClickHouse/issues/10470). This fixes [#11372](https://github.com/ClickHouse/ClickHouse/issues/11372). [#12427](https://github.com/ClickHouse/ClickHouse/pull/12427) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed possible segfault if StorageMerge. Closes [#12054](https://github.com/ClickHouse/ClickHouse/issues/12054). [#12401](https://github.com/ClickHouse/ClickHouse/pull/12401) ([tavplubix](https://github.com/tavplubix)).
+* Reverts change introduced in [#11079](https://github.com/ClickHouse/ClickHouse/issues/11079) to resolve [#12098](https://github.com/ClickHouse/ClickHouse/issues/12098). [#12397](https://github.com/ClickHouse/ClickHouse/pull/12397) ([Mike](https://github.com/myrrc)).
+* Avoid exception when negative or floating point constant is used in WHERE condition for indexed tables. This fixes [#11905](https://github.com/ClickHouse/ClickHouse/issues/11905). [#12384](https://github.com/ClickHouse/ClickHouse/pull/12384) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Allow to CLEAR column even if there are depending DEFAULT expressions. This fixes [#12333](https://github.com/ClickHouse/ClickHouse/issues/12333). [#12378](https://github.com/ClickHouse/ClickHouse/pull/12378) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed TOTALS/ROLLUP/CUBE for aggregate functions with `-State` and `Nullable` arguments. This fixes [#12163](https://github.com/ClickHouse/ClickHouse/issues/12163). [#12376](https://github.com/ClickHouse/ClickHouse/pull/12376) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed SIGSEGV if there is an message with error in the middle of the batch in `Kafka` Engine. [#12302](https://github.com/ClickHouse/ClickHouse/pull/12302) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed the behaviour when `SummingMergeTree` engine sums up columns from partition key. Added an exception in case of explicit definition of columns to sum which intersects with partition key columns. This fixes [#7867](https://github.com/ClickHouse/ClickHouse/issues/7867). [#12173](https://github.com/ClickHouse/ClickHouse/pull/12173) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fixed transform of query to send to external DBMS (e.g. MySQL, ODBC) in presense of aliases. This fixes [#12032](https://github.com/ClickHouse/ClickHouse/issues/12032). [#12151](https://github.com/ClickHouse/ClickHouse/pull/12151) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed bug which leads to incorrect table metadata in ZooKeepeer for ReplicatedVersionedCollapsingMergeTree tables. Fixes [#12093](https://github.com/ClickHouse/ClickHouse/issues/12093). [#12121](https://github.com/ClickHouse/ClickHouse/pull/12121) ([alesapin](https://github.com/alesapin)).
+* Fixed unnecessary limiting the number of threads for selects from `VIEW`. Fixes [#11937](https://github.com/ClickHouse/ClickHouse/issues/11937). [#12085](https://github.com/ClickHouse/ClickHouse/pull/12085) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed crash in JOIN with LowCardinality type with `join_algorithm=partial_merge`. [#12035](https://github.com/ClickHouse/ClickHouse/pull/12035) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fixed wrong result for `if()` with NULLs in condition. [#11807](https://github.com/ClickHouse/ClickHouse/pull/11807) ([Artem Zuikov](https://github.com/4ertus2)).
+
+#### Performance Improvement
+
+* Index not used for IN operator with literals, performance regression introduced around v19.3. This fixes [#10574](https://github.com/ClickHouse/ClickHouse/issues/10574). [#12062](https://github.com/ClickHouse/ClickHouse/pull/12062) ([nvartolomei](https://github.com/nvartolomei)).
+
+#### Build/Testing/Packaging Improvement
+
+* Install `ca-certificates` before the first `apt-get update` in Dockerfile. [#12095](https://github.com/ClickHouse/ClickHouse/pull/12095) ([Ivan Blinkov](https://github.com/blinkov)).
+
+
+### ClickHouse release v20.5.2.7-stable 2020-07-02
+
+#### Backward Incompatible Change
+
+* Return non-Nullable result from COUNT(DISTINCT), and `uniq` aggregate functions family. If all passed values are NULL, return zero instead. This improves SQL compatibility. [#11661](https://github.com/ClickHouse/ClickHouse/pull/11661) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Added a check for the case when user-level setting is specified in a wrong place. User-level settings should be specified in `users.xml` inside `<profile>` section for specific user profile (or in `<default>` for default settings). The server won't start with exception message in log. This fixes [#9051](https://github.com/ClickHouse/ClickHouse/issues/9051). If you want to skip the check, you can either move settings to the appropriate place or add `<skip_check_for_incorrect_settings>1</skip_check_for_incorrect_settings>` to config.xml. [#11449](https://github.com/ClickHouse/ClickHouse/pull/11449) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* The setting `input_format_with_names_use_header` is enabled by default. It will affect parsing of input formats `-WithNames` and `-WithNamesAndTypes`. [#10937](https://github.com/ClickHouse/ClickHouse/pull/10937) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Remove `experimental_use_processors` setting. It is enabled by default. [#10924](https://github.com/ClickHouse/ClickHouse/pull/10924) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Update `zstd` to 1.4.4. It has some minor improvements in performance and compression ratio. If you run replicas with different versions of ClickHouse you may see reasonable error messages `Data after merge is not byte-identical to data on another replicas.` with explanation. These messages are Ok and you should not worry. This change is backward compatible but we list it here in changelog in case you will wonder about these messages. [#10663](https://github.com/ClickHouse/ClickHouse/pull/10663) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Added a check for meaningless codecs and a setting `allow_suspicious_codecs` to control this check. This closes [#4966](https://github.com/ClickHouse/ClickHouse/issues/4966). [#10645](https://github.com/ClickHouse/ClickHouse/pull/10645) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Several Kafka setting changes their defaults. See [#11388](https://github.com/ClickHouse/ClickHouse/pull/11388).
+* When upgrading from versions older than 20.5, if rolling update is performed and cluster contains both versions 20.5 or greater and less than 20.5, if ClickHouse nodes with old versions are restarted and old version has been started up in presence of newer versions, it may lead to `Part ... intersects previous part` errors. To prevent this error, first install newer clickhouse-server packages on all cluster nodes and then do restarts (so, when clickhouse-server is restarted, it will start up with the new version).
+
+#### New Feature
+
+* `TTL DELETE WHERE` and `TTL GROUP BY` for automatic data coarsening and rollup in tables. [#10537](https://github.com/ClickHouse/ClickHouse/pull/10537) ([expl0si0nn](https://github.com/expl0si0nn)).
+* Implementation of PostgreSQL wire protocol. [#10242](https://github.com/ClickHouse/ClickHouse/pull/10242) ([Movses](https://github.com/MovElb)).
+* Added system tables for users, roles, grants, settings profiles, quotas, row policies; added commands SHOW USER, SHOW [CURRENT|ENABLED] ROLES, SHOW SETTINGS PROFILES. [#10387](https://github.com/ClickHouse/ClickHouse/pull/10387) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Support writes in ODBC Table function [#10554](https://github.com/ClickHouse/ClickHouse/pull/10554) ([ageraab](https://github.com/ageraab)). [#10901](https://github.com/ClickHouse/ClickHouse/pull/10901) ([tavplubix](https://github.com/tavplubix)).
+* Add query performance metrics based on Linux `perf_events` (these metrics are calculated with hardware CPU counters and OS counters). It is optional and requires `CAP_SYS_ADMIN` to be set on clickhouse binary. [#9545](https://github.com/ClickHouse/ClickHouse/pull/9545) [Andrey Skobtsov](https://github.com/And42). [#11226](https://github.com/ClickHouse/ClickHouse/pull/11226) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Now support `NULL` and `NOT NULL` modifiers for data types in `CREATE` query. [#11057](https://github.com/ClickHouse/ClickHouse/pull/11057) ([Павел Потемкин](https://github.com/Potya)).
+* Add `ArrowStream` input and output format. [#11088](https://github.com/ClickHouse/ClickHouse/pull/11088) ([hcz](https://github.com/hczhcz)).
+* Support Cassandra as external dictionary source. [#4978](https://github.com/ClickHouse/ClickHouse/pull/4978) ([favstovol](https://github.com/favstovol)).
+* Added a new layout `direct` which loads all the data directly from the source for each query, without storing or caching data. [#10622](https://github.com/ClickHouse/ClickHouse/pull/10622) ([Artem Streltsov](https://github.com/kekekekule)).
+* Added new `complex_key_direct` layout to dictionaries, that does not store anything locally during query execution. [#10850](https://github.com/ClickHouse/ClickHouse/pull/10850) ([Artem Streltsov](https://github.com/kekekekule)).
+* Added support for MySQL style global variables syntax (stub). This is needed for compatibility of MySQL protocol. [#11832](https://github.com/ClickHouse/ClickHouse/pull/11832) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Added syntax highligting to `clickhouse-client` using `replxx`. [#11422](https://github.com/ClickHouse/ClickHouse/pull/11422) ([Tagir Kuskarov](https://github.com/kuskarov)).
+* `minMap` and `maxMap` functions were added. [#11603](https://github.com/ClickHouse/ClickHouse/pull/11603) ([Ildus Kurbangaliev](https://github.com/ildus)).
+* Add the `system.asynchronous_metric_log` table that logs historical metrics from `system.asynchronous_metrics`. [#11588](https://github.com/ClickHouse/ClickHouse/pull/11588) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Add functions `extractAllGroupsHorizontal(haystack, re)` and `extractAllGroupsVertical(haystack, re)`. [#11554](https://github.com/ClickHouse/ClickHouse/pull/11554) ([Vasily Nemkov](https://github.com/Enmk)).
+* Add SHOW CLUSTER(S) queries. [#11467](https://github.com/ClickHouse/ClickHouse/pull/11467) ([hexiaoting](https://github.com/hexiaoting)).
+* Add `netloc` function for extracting network location, similar to `urlparse(url)`, `netloc` in python. [#11356](https://github.com/ClickHouse/ClickHouse/pull/11356) ([Guillaume Tassery](https://github.com/YiuRULE)).
+* Add 2 more virtual columns for engine=Kafka to access message headers. [#11283](https://github.com/ClickHouse/ClickHouse/pull/11283) ([filimonov](https://github.com/filimonov)).
+* Add `_timestamp_ms` virtual column for Kafka engine (type is `Nullable(DateTime64(3))`). [#11260](https://github.com/ClickHouse/ClickHouse/pull/11260) ([filimonov](https://github.com/filimonov)).
+* Add function `randomFixedString`. [#10866](https://github.com/ClickHouse/ClickHouse/pull/10866) ([Andrei Nekrashevich](https://github.com/xolm)).
+* Add function `fuzzBits` that randomly flips bits in a string with given probability. [#11237](https://github.com/ClickHouse/ClickHouse/pull/11237) ([Andrei Nekrashevich](https://github.com/xolm)).
+* Allow comparison of numbers with constant string in comparison operators, IN and VALUES sections. [#11647](https://github.com/ClickHouse/ClickHouse/pull/11647) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add `round_robin` load_balancing mode. [#11645](https://github.com/ClickHouse/ClickHouse/pull/11645) ([Azat Khuzhin](https://github.com/azat)).
+* Add `cast_keep_nullable` setting. If set `CAST(something_nullable AS Type)` return `Nullable(Type)`. [#11733](https://github.com/ClickHouse/ClickHouse/pull/11733) ([Artem Zuikov](https://github.com/4ertus2)).
+* Added column `position` to `system.columns` table and `column_position` to `system.parts_columns` table. It contains ordinal position of a column in a table starting with 1. This closes [#7744](https://github.com/ClickHouse/ClickHouse/issues/7744). [#11655](https://github.com/ClickHouse/ClickHouse/pull/11655) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* ON CLUSTER support for SYSTEM {FLUSH DISTRIBUTED,STOP/START DISTRIBUTED SEND}. [#11415](https://github.com/ClickHouse/ClickHouse/pull/11415) ([Azat Khuzhin](https://github.com/azat)).
+* Add system.distribution_queue table. [#11394](https://github.com/ClickHouse/ClickHouse/pull/11394) ([Azat Khuzhin](https://github.com/azat)).
+* Support for all format settings in Kafka, expose some setting on table level, adjust the defaults for better performance. [#11388](https://github.com/ClickHouse/ClickHouse/pull/11388) ([filimonov](https://github.com/filimonov)).
+* Add `port` function (to extract port from URL). [#11120](https://github.com/ClickHouse/ClickHouse/pull/11120) ([Azat Khuzhin](https://github.com/azat)).
+* Now `dictGet*` functions accept table names. [#11050](https://github.com/ClickHouse/ClickHouse/pull/11050) ([Vitaly Baranov](https://github.com/vitlibar)).
+* The `clickhouse-format` tool is now able to format multiple queries when the `-n` argument is used. [#10852](https://github.com/ClickHouse/ClickHouse/pull/10852) ([Darío](https://github.com/dgrr)).
+* Possibility to configure proxy-resolver for DiskS3. [#10744](https://github.com/ClickHouse/ClickHouse/pull/10744) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Make `pointInPolygon` work with non-constant polygon. PointInPolygon now can take Array(Array(Tuple(..., ...))) as second argument, array of polygon and holes. [#10623](https://github.com/ClickHouse/ClickHouse/pull/10623) ([Alexey Ilyukhov](https://github.com/livace)) [#11421](https://github.com/ClickHouse/ClickHouse/pull/11421) ([Alexey Ilyukhov](https://github.com/livace)).
+* Added `move_ttl_info` to `system.parts` in order to provide introspection of move TTL functionality. [#10591](https://github.com/ClickHouse/ClickHouse/pull/10591) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Possibility to work with S3 through proxies. [#10576](https://github.com/ClickHouse/ClickHouse/pull/10576) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Add `NCHAR` and `NVARCHAR` synonims for data types. [#11025](https://github.com/ClickHouse/ClickHouse/pull/11025) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Resolved [#7224](https://github.com/ClickHouse/ClickHouse/issues/7224): added `FailedQuery`, `FailedSelectQuery` and `FailedInsertQuery` metrics to `system.events` table. [#11151](https://github.com/ClickHouse/ClickHouse/pull/11151) ([Nikita Orlov](https://github.com/naorlov)).
+* Add more `jemalloc` statistics to `system.asynchronous_metrics`, and ensure that we see up-to-date values for them. [#11748](https://github.com/ClickHouse/ClickHouse/pull/11748) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Allow to specify default S3 credentials and custom auth headers. [#11134](https://github.com/ClickHouse/ClickHouse/pull/11134) ([Grigory Pervakov](https://github.com/GrigoryPervakov)).
+* Added new functions to import/export DateTime64 as Int64 with various precision: `to-/fromUnixTimestamp64Milli/-Micro/-Nano`. [#10923](https://github.com/ClickHouse/ClickHouse/pull/10923) ([Vasily Nemkov](https://github.com/Enmk)).
+* Allow specifying `mongodb://` URI for MongoDB dictionaries. [#10915](https://github.com/ClickHouse/ClickHouse/pull/10915) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* OFFSET keyword can now be used without an affiliated LIMIT clause. [#10802](https://github.com/ClickHouse/ClickHouse/pull/10802) ([Guillaume Tassery](https://github.com/YiuRULE)).
+* Added `system.licenses` table. This table contains licenses of third-party libraries that are located in `contrib` directory. This closes [#2890](https://github.com/ClickHouse/ClickHouse/issues/2890). [#10795](https://github.com/ClickHouse/ClickHouse/pull/10795) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* New function function toStartOfSecond(DateTime64) -> DateTime64 that nullifies sub-second part of DateTime64 value. [#10722](https://github.com/ClickHouse/ClickHouse/pull/10722) ([Vasily Nemkov](https://github.com/Enmk)).
+* Add new input format `JSONAsString` that accepts a sequence of JSON objects separated by newlines, spaces and/or commas. [#10607](https://github.com/ClickHouse/ClickHouse/pull/10607) ([Kruglov Pavel](https://github.com/Avogar)).
+* Allowed to profile memory with finer granularity steps than 4 MiB. Added sampling memory profiler to capture random allocations/deallocations. [#10598](https://github.com/ClickHouse/ClickHouse/pull/10598) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* `SimpleAggregateFunction` now also supports `sumMap`. [#10000](https://github.com/ClickHouse/ClickHouse/pull/10000) ([Ildus Kurbangaliev](https://github.com/ildus)).
+* Support `ALTER RENAME COLUMN` for the distributed table engine. Continuation of [#10727](https://github.com/ClickHouse/ClickHouse/issues/10727). Fixes [#10747](https://github.com/ClickHouse/ClickHouse/issues/10747). [#10887](https://github.com/ClickHouse/ClickHouse/pull/10887) ([alesapin](https://github.com/alesapin)).
+
+#### Bug Fix
+
+* Fix UBSan report in Decimal parse. This fixes [#7540](https://github.com/ClickHouse/ClickHouse/issues/7540). [#10512](https://github.com/ClickHouse/ClickHouse/pull/10512) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix potential floating point exception when parsing DateTime64. This fixes [#11374](https://github.com/ClickHouse/ClickHouse/issues/11374). [#11875](https://github.com/ClickHouse/ClickHouse/pull/11875) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix rare crash caused by using `Nullable` column in prewhere condition. [#11895](https://github.com/ClickHouse/ClickHouse/pull/11895) [#11608](https://github.com/ClickHouse/ClickHouse/issues/11608) [#11869](https://github.com/ClickHouse/ClickHouse/pull/11869) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Don't allow arrayJoin inside higher order functions. It was leading to broken protocol synchronization. This closes [#3933](https://github.com/ClickHouse/ClickHouse/issues/3933). [#11846](https://github.com/ClickHouse/ClickHouse/pull/11846) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix wrong result of comparison of FixedString with constant String. This fixes [#11393](https://github.com/ClickHouse/ClickHouse/issues/11393). This bug appeared in version 20.4. [#11828](https://github.com/ClickHouse/ClickHouse/pull/11828) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix wrong result for `if` with NULLs in condition. [#11807](https://github.com/ClickHouse/ClickHouse/pull/11807) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix using too many threads for queries. [#11788](https://github.com/ClickHouse/ClickHouse/pull/11788) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed `Scalar doesn't exist` exception when using `WITH <scalar subquery> ...` in `SELECT ... FROM merge_tree_table ...` [#11621](https://github.com/ClickHouse/ClickHouse/issues/11621). [#11767](https://github.com/ClickHouse/ClickHouse/pull/11767) ([Amos Bird](https://github.com/amosbird)).
+* Fix unexpected behaviour of queries like `SELECT *, xyz.*` which were success while an error expected. [#11753](https://github.com/ClickHouse/ClickHouse/pull/11753) ([hexiaoting](https://github.com/hexiaoting)).
+* Now replicated fetches will be cancelled during metadata alter. [#11744](https://github.com/ClickHouse/ClickHouse/pull/11744) ([alesapin](https://github.com/alesapin)).
+* Parse metadata stored in zookeeper before checking for equality. [#11739](https://github.com/ClickHouse/ClickHouse/pull/11739) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed LOGICAL_ERROR caused by wrong type deduction of complex literals in Values input format. [#11732](https://github.com/ClickHouse/ClickHouse/pull/11732) ([tavplubix](https://github.com/tavplubix)).
+* Fix `ORDER BY ... WITH FILL` over const columns. [#11697](https://github.com/ClickHouse/ClickHouse/pull/11697) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix very rare race condition in SYSTEM SYNC REPLICA. If the replicated table is created and at the same time from the separate connection another client is issuing `SYSTEM SYNC REPLICA` command on that table (this is unlikely, because another client should be aware that the table is created), it's possible to get nullptr dereference. [#11691](https://github.com/ClickHouse/ClickHouse/pull/11691) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Pass proper timeouts when communicating with XDBC bridge. Recently timeouts were not respected when checking bridge liveness and receiving meta info. [#11690](https://github.com/ClickHouse/ClickHouse/pull/11690) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix `LIMIT n WITH TIES` usage together with `ORDER BY` statement, which contains aliases. [#11689](https://github.com/ClickHouse/ClickHouse/pull/11689) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix possible `Pipeline stuck` for selects with parallel `FINAL`. Fixes [#11636](https://github.com/ClickHouse/ClickHouse/issues/11636). [#11682](https://github.com/ClickHouse/ClickHouse/pull/11682) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix error which leads to an incorrect state of `system.mutations`. It may show that whole mutation is already done but the server still has `MUTATE_PART` tasks in the replication queue and tries to execute them. This fixes [#11611](https://github.com/ClickHouse/ClickHouse/issues/11611). [#11681](https://github.com/ClickHouse/ClickHouse/pull/11681) ([alesapin](https://github.com/alesapin)).
+* Fix syntax hilite in CREATE USER query. [#11664](https://github.com/ClickHouse/ClickHouse/pull/11664) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add support for regular expressions with case-insensitive flags. This fixes [#11101](https://github.com/ClickHouse/ClickHouse/issues/11101) and fixes [#11506](https://github.com/ClickHouse/ClickHouse/issues/11506). [#11649](https://github.com/ClickHouse/ClickHouse/pull/11649) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Remove trivial count query optimization if row-level security is set. In previous versions the user get total count of records in a table instead filtered. This fixes [#11352](https://github.com/ClickHouse/ClickHouse/issues/11352). [#11644](https://github.com/ClickHouse/ClickHouse/pull/11644) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix bloom filters for String (data skipping indices). [#11638](https://github.com/ClickHouse/ClickHouse/pull/11638) ([Azat Khuzhin](https://github.com/azat)).
+* Without `-q` option the database does not get created at startup. [#11604](https://github.com/ClickHouse/ClickHouse/pull/11604) ([giordyb](https://github.com/giordyb)).
+* Fix error `Block structure mismatch` for queries with sampling reading from `Buffer` table. [#11602](https://github.com/ClickHouse/ClickHouse/pull/11602) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix wrong exit code of the clickhouse-client, when `exception.code() % 256 == 0`. [#11601](https://github.com/ClickHouse/ClickHouse/pull/11601) ([filimonov](https://github.com/filimonov)).
+* Fix race conditions in CREATE/DROP of different replicas of ReplicatedMergeTree. Continue to work if the table was not removed completely from ZooKeeper or not created successfully. This fixes [#11432](https://github.com/ClickHouse/ClickHouse/issues/11432). [#11592](https://github.com/ClickHouse/ClickHouse/pull/11592) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix trivial error in log message about "Mark cache size was lowered" at server startup. This closes [#11399](https://github.com/ClickHouse/ClickHouse/issues/11399). [#11589](https://github.com/ClickHouse/ClickHouse/pull/11589) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix error `Size of offsets doesn't match size of column` for queries with `PREWHERE column in (subquery)` and `ARRAY JOIN`. [#11580](https://github.com/ClickHouse/ClickHouse/pull/11580) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed rare segfault in `SHOW CREATE TABLE` Fixes [#11490](https://github.com/ClickHouse/ClickHouse/issues/11490). [#11579](https://github.com/ClickHouse/ClickHouse/pull/11579) ([tavplubix](https://github.com/tavplubix)).
+* All queries in HTTP session have had the same query_id. It is fixed. [#11578](https://github.com/ClickHouse/ClickHouse/pull/11578) ([tavplubix](https://github.com/tavplubix)).
+* Now clickhouse-server docker container will prefer IPv6 checking server aliveness. [#11550](https://github.com/ClickHouse/ClickHouse/pull/11550) ([Ivan Starkov](https://github.com/istarkov)).
+* Fix the error `Data compressed with different methods` that can happen if `min_bytes_to_use_direct_io` is enabled and PREWHERE is active and using SAMPLE or high number of threads. This fixes [#11539](https://github.com/ClickHouse/ClickHouse/issues/11539). [#11540](https://github.com/ClickHouse/ClickHouse/pull/11540) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix shard_num/replica_num for `<node>` (breaks use_compact_format_in_distributed_parts_names). [#11528](https://github.com/ClickHouse/ClickHouse/pull/11528) ([Azat Khuzhin](https://github.com/azat)).
+* Fix async INSERT into Distributed for prefer_localhost_replica=0 and w/o internal_replication. [#11527](https://github.com/ClickHouse/ClickHouse/pull/11527) ([Azat Khuzhin](https://github.com/azat)).
+* Fix memory leak when exception is thrown in the middle of aggregation with `-State` functions. This fixes [#8995](https://github.com/ClickHouse/ClickHouse/issues/8995). [#11496](https://github.com/ClickHouse/ClickHouse/pull/11496) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix `Pipeline stuck` exception for `INSERT SELECT FINAL` where `SELECT` (`max_threads`>1) has multiple streams but `INSERT` has only one (`max_insert_threads`==0). [#11455](https://github.com/ClickHouse/ClickHouse/pull/11455) ([Azat Khuzhin](https://github.com/azat)).
+* Fix wrong result in queries like `select count() from t, u`. [#11454](https://github.com/ClickHouse/ClickHouse/pull/11454) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix return compressed size for codecs. [#11448](https://github.com/ClickHouse/ClickHouse/pull/11448) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix server crash when a column has compression codec with non-literal arguments. Fixes [#11365](https://github.com/ClickHouse/ClickHouse/issues/11365). [#11431](https://github.com/ClickHouse/ClickHouse/pull/11431) ([alesapin](https://github.com/alesapin)).
+* Fix potential uninitialized memory read in MergeTree shutdown if table was not created successfully. [#11420](https://github.com/ClickHouse/ClickHouse/pull/11420) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix crash in JOIN over `LowCarinality(T)` and `Nullable(T)`. [#11380](https://github.com/ClickHouse/ClickHouse/issues/11380). [#11414](https://github.com/ClickHouse/ClickHouse/pull/11414) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix error code for wrong `USING` key. [#11373](https://github.com/ClickHouse/ClickHouse/issues/11373). [#11404](https://github.com/ClickHouse/ClickHouse/pull/11404) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fixed `geohashesInBox` with arguments outside of latitude/longitude range. [#11403](https://github.com/ClickHouse/ClickHouse/pull/11403) ([Vasily Nemkov](https://github.com/Enmk)).
+* Better errors for `joinGet()` functions. [#11389](https://github.com/ClickHouse/ClickHouse/pull/11389) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix possible `Pipeline stuck` error for queries with external sort and limit. Fixes [#11359](https://github.com/ClickHouse/ClickHouse/issues/11359). [#11366](https://github.com/ClickHouse/ClickHouse/pull/11366) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Remove redundant lock during parts send in ReplicatedMergeTree. [#11354](https://github.com/ClickHouse/ClickHouse/pull/11354) ([alesapin](https://github.com/alesapin)).
+* Fix support for `\G` (vertical output) in clickhouse-client in multiline mode. This closes [#9933](https://github.com/ClickHouse/ClickHouse/issues/9933). [#11350](https://github.com/ClickHouse/ClickHouse/pull/11350) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix potential segfault when using `Lazy` database. [#11348](https://github.com/ClickHouse/ClickHouse/pull/11348) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix crash in direct selects from `Join` table engine (without JOIN) and wrong nullability. [#11340](https://github.com/ClickHouse/ClickHouse/pull/11340) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix crash in `quantilesExactWeightedArray`. [#11337](https://github.com/ClickHouse/ClickHouse/pull/11337) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Now merges stopped before change metadata in `ALTER` queries. [#11335](https://github.com/ClickHouse/ClickHouse/pull/11335) ([alesapin](https://github.com/alesapin)).
+* Make writing to `MATERIALIZED VIEW` with setting `parallel_view_processing = 1` parallel again. Fixes [#10241](https://github.com/ClickHouse/ClickHouse/issues/10241). [#11330](https://github.com/ClickHouse/ClickHouse/pull/11330) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix `visitParamExtractRaw` when extracted JSON has strings with unbalanced { or [. [#11318](https://github.com/ClickHouse/ClickHouse/pull/11318) ([Ewout](https://github.com/devwout)).
+* Fix very rare race condition in ThreadPool. [#11314](https://github.com/ClickHouse/ClickHouse/pull/11314) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix insignificant data race in `clickhouse-copier`. Found by integration tests. [#11313](https://github.com/ClickHouse/ClickHouse/pull/11313) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix potential uninitialized memory in conversion. Example: `SELECT toIntervalSecond(now64())`. [#11311](https://github.com/ClickHouse/ClickHouse/pull/11311) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix the issue when index analysis cannot work if a table has Array column in primary key and if a query is filtering by this column with `empty` or `notEmpty` functions. This fixes [#11286](https://github.com/ClickHouse/ClickHouse/issues/11286). [#11303](https://github.com/ClickHouse/ClickHouse/pull/11303) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix bug when query speed estimation can be incorrect and the limit of `min_execution_speed` may not work or work incorrectly if the query is throttled by `max_network_bandwidth`, `max_execution_speed` or `priority` settings. Change the default value of `timeout_before_checking_execution_speed` to non-zero, because otherwise the settings `min_execution_speed` and `max_execution_speed` have no effect. This fixes [#11297](https://github.com/ClickHouse/ClickHouse/issues/11297). This fixes [#5732](https://github.com/ClickHouse/ClickHouse/issues/5732). This fixes [#6228](https://github.com/ClickHouse/ClickHouse/issues/6228). Usability improvement: avoid concatenation of exception message with progress bar in `clickhouse-client`. [#11296](https://github.com/ClickHouse/ClickHouse/pull/11296) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix crash when `SET DEFAULT ROLE` is called with wrong arguments. This fixes [#10586](https://github.com/ClickHouse/ClickHouse/issues/10586). [#11278](https://github.com/ClickHouse/ClickHouse/pull/11278) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix crash while reading malformed data in `Protobuf` format. This fixes [#5957](https://github.com/ClickHouse/ClickHouse/issues/5957), fixes [#11203](https://github.com/ClickHouse/ClickHouse/issues/11203). [#11258](https://github.com/ClickHouse/ClickHouse/pull/11258) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fixed a bug when `cache` dictionary could return default value instead of normal (when there are only expired keys). This affects only string fields. [#11233](https://github.com/ClickHouse/ClickHouse/pull/11233) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fix error `Block structure mismatch in QueryPipeline` while reading from `VIEW` with constants in inner query. Fixes [#11181](https://github.com/ClickHouse/ClickHouse/issues/11181). [#11205](https://github.com/ClickHouse/ClickHouse/pull/11205) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix possible exception `Invalid status for associated output`. [#11200](https://github.com/ClickHouse/ClickHouse/pull/11200) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Now `primary.idx` will be checked if it's defined in `CREATE` query. [#11199](https://github.com/ClickHouse/ClickHouse/pull/11199) ([alesapin](https://github.com/alesapin)).
+* Fix possible error `Cannot capture column` for higher-order functions with `Array(Array(LowCardinality))` captured argument. [#11185](https://github.com/ClickHouse/ClickHouse/pull/11185) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed `S3` globbing which could fail in case of more than 1000 keys and some backends. [#11179](https://github.com/ClickHouse/ClickHouse/pull/11179) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* If data skipping index is dependent on columns that are going to be modified during background merge (for SummingMergeTree, AggregatingMergeTree as well as for TTL GROUP BY), it was calculated incorrectly. This issue is fixed by moving index calculation after merge so the index is calculated on merged data. [#11162](https://github.com/ClickHouse/ClickHouse/pull/11162) ([Azat Khuzhin](https://github.com/azat)).
+* Fix for the hang which was happening sometimes during DROP of table engine=Kafka (or during server restarts). [#11145](https://github.com/ClickHouse/ClickHouse/pull/11145) ([filimonov](https://github.com/filimonov)).
+* Fix excessive reserving of threads for simple queries (optimization for reducing the number of threads, which was partly broken after changes in pipeline). [#11114](https://github.com/ClickHouse/ClickHouse/pull/11114) ([Azat Khuzhin](https://github.com/azat)).
+* Remove logging from mutation finalization task if nothing was finalized. [#11109](https://github.com/ClickHouse/ClickHouse/pull/11109) ([alesapin](https://github.com/alesapin)).
+* Fixed deadlock during server startup after update with changes in structure of system log tables. [#11106](https://github.com/ClickHouse/ClickHouse/pull/11106) ([alesapin](https://github.com/alesapin)).
+* Fixed memory leak in registerDiskS3. [#11074](https://github.com/ClickHouse/ClickHouse/pull/11074) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Fix error `No such name in Block::erase()` when JOIN appears with PREWHERE or `optimize_move_to_prewhere` makes PREWHERE from WHERE. [#11051](https://github.com/ClickHouse/ClickHouse/pull/11051) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fixes the potential missed data during termination of Kafka engine table. [#11048](https://github.com/ClickHouse/ClickHouse/pull/11048) ([filimonov](https://github.com/filimonov)).
+* Fixed parseDateTime64BestEffort argument resolution bugs. [#10925](https://github.com/ClickHouse/ClickHouse/issues/10925). [#11038](https://github.com/ClickHouse/ClickHouse/pull/11038) ([Vasily Nemkov](https://github.com/Enmk)).
+* Now it's possible to `ADD/DROP` and `RENAME` the same one column in a single `ALTER` query. Exception message for simultaneous `MODIFY` and `RENAME` became more clear. Partially fixes [#10669](https://github.com/ClickHouse/ClickHouse/issues/10669). [#11037](https://github.com/ClickHouse/ClickHouse/pull/11037) ([alesapin](https://github.com/alesapin)).
+* Fixed parsing of S3 URLs. [#11036](https://github.com/ClickHouse/ClickHouse/pull/11036) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Fix memory tracking for two-level `GROUP BY` when there is a `LIMIT`. [#11022](https://github.com/ClickHouse/ClickHouse/pull/11022) ([Azat Khuzhin](https://github.com/azat)).
+* Fix very rare potential use-after-free error in MergeTree if table was not created successfully. [#10986](https://github.com/ClickHouse/ClickHouse/pull/10986) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix metadata (relative path for rename) and data (relative path for symlink) handling for Atomic database. [#10980](https://github.com/ClickHouse/ClickHouse/pull/10980) ([Azat Khuzhin](https://github.com/azat)).
+* Fix server crash on concurrent `ALTER` and `DROP DATABASE` queries with `Atomic` database engine. [#10968](https://github.com/ClickHouse/ClickHouse/pull/10968) ([tavplubix](https://github.com/tavplubix)).
+* Fix incorrect raw data size in method getRawData(). [#10964](https://github.com/ClickHouse/ClickHouse/pull/10964) ([Igr](https://github.com/ObjatieGroba)).
+* Fix incompatibility of two-level aggregation between versions 20.1 and earlier. This incompatibility happens when different versions of ClickHouse are used on initiator node and remote nodes and the size of GROUP BY result is large and aggregation is performed by a single String field. It leads to several unmerged rows for a single key in result. [#10952](https://github.com/ClickHouse/ClickHouse/pull/10952) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Avoid sending partially written files by the DistributedBlockOutputStream. [#10940](https://github.com/ClickHouse/ClickHouse/pull/10940) ([Azat Khuzhin](https://github.com/azat)).
+* Fix crash in `SELECT count(notNullIn(NULL, []))`. [#10920](https://github.com/ClickHouse/ClickHouse/pull/10920) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix for the hang which was happening sometimes during DROP of table engine=Kafka (or during server restarts). [#10910](https://github.com/ClickHouse/ClickHouse/pull/10910) ([filimonov](https://github.com/filimonov)).
+* Now it's possible to execute multiple `ALTER RENAME` like `a TO b, c TO a`. [#10895](https://github.com/ClickHouse/ClickHouse/pull/10895) ([alesapin](https://github.com/alesapin)).
+* Fix possible race which could happen when you get result from aggregate function state from multiple thread for the same column. The only way (which I found) it can happen is when you use `finalizeAggregation` function while reading from table with `Memory` engine which stores `AggregateFunction` state for `quanite*` function. [#10890](https://github.com/ClickHouse/ClickHouse/pull/10890) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix backward compatibility with tuples in Distributed tables. [#10889](https://github.com/ClickHouse/ClickHouse/pull/10889) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix SIGSEGV in StringHashTable (if such key does not exist). [#10870](https://github.com/ClickHouse/ClickHouse/pull/10870) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed `WATCH` hangs after `LiveView` table was dropped from database with `Atomic` engine. [#10859](https://github.com/ClickHouse/ClickHouse/pull/10859) ([tavplubix](https://github.com/tavplubix)).
+* Fixed bug in `ReplicatedMergeTree` which might cause some `ALTER` on `OPTIMIZE` query to hang waiting for some replica after it become inactive. [#10849](https://github.com/ClickHouse/ClickHouse/pull/10849) ([tavplubix](https://github.com/tavplubix)).
+* Now constraints are updated if the column participating in `CONSTRAINT` expression was renamed. Fixes [#10844](https://github.com/ClickHouse/ClickHouse/issues/10844). [#10847](https://github.com/ClickHouse/ClickHouse/pull/10847) ([alesapin](https://github.com/alesapin)).
+* Fix potential read of uninitialized memory in cache dictionary. [#10834](https://github.com/ClickHouse/ClickHouse/pull/10834) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix columns order after Block::sortColumns() (also add a test that shows that it affects some real use case - Buffer engine). [#10826](https://github.com/ClickHouse/ClickHouse/pull/10826) ([Azat Khuzhin](https://github.com/azat)).
+* Fix the issue with ODBC bridge when no quoting of identifiers is requested. This fixes [#7984](https://github.com/ClickHouse/ClickHouse/issues/7984). [#10821](https://github.com/ClickHouse/ClickHouse/pull/10821) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix UBSan and MSan report in DateLUT. [#10798](https://github.com/ClickHouse/ClickHouse/pull/10798) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Make use of `src_type` for correct type conversion in key conditions. Fixes [#6287](https://github.com/ClickHouse/ClickHouse/issues/6287). [#10791](https://github.com/ClickHouse/ClickHouse/pull/10791) ([Andrew Onyshchuk](https://github.com/oandrew)).
+* Get rid of old libunwind patches. https://github.com/ClickHouse-Extras/libunwind/commit/500aa227911bd185a94bfc071d68f4d3b03cb3b1#r39048012 This allows to disable `-fno-omit-frame-pointer` in `clang` builds that improves performance at least by 1% in average. [#10761](https://github.com/ClickHouse/ClickHouse/pull/10761) ([Amos Bird](https://github.com/amosbird)).
+* Fix avgWeighted when using floating-point weight over multiple shards. [#10758](https://github.com/ClickHouse/ClickHouse/pull/10758) ([Baudouin Giard](https://github.com/bgiard)).
+* Fix `parallel_view_processing` behavior. Now all insertions into `MATERIALIZED VIEW` without exception should be finished if exception happened. Fixes [#10241](https://github.com/ClickHouse/ClickHouse/issues/10241). [#10757](https://github.com/ClickHouse/ClickHouse/pull/10757) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix combinator -OrNull and -OrDefault when combined with -State. [#10741](https://github.com/ClickHouse/ClickHouse/pull/10741) ([hcz](https://github.com/hczhcz)).
+* Fix crash in `generateRandom` with nested types. Fixes [#10583](https://github.com/ClickHouse/ClickHouse/issues/10583). [#10734](https://github.com/ClickHouse/ClickHouse/pull/10734) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix data corruption for `LowCardinality(FixedString)` key column in `SummingMergeTree` which could have happened after merge. Fixes [#10489](https://github.com/ClickHouse/ClickHouse/issues/10489). [#10721](https://github.com/ClickHouse/ClickHouse/pull/10721) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix usage of primary key wrapped into a function with 'FINAL' modifier and 'ORDER BY' optimization. [#10715](https://github.com/ClickHouse/ClickHouse/pull/10715) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix possible buffer overflow in function `h3EdgeAngle`. [#10711](https://github.com/ClickHouse/ClickHouse/pull/10711) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix disappearing totals. Totals could have being filtered if query had had join or subquery with external where condition. Fixes [#10674](https://github.com/ClickHouse/ClickHouse/issues/10674). [#10698](https://github.com/ClickHouse/ClickHouse/pull/10698) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix atomicity of HTTP insert. This fixes [#9666](https://github.com/ClickHouse/ClickHouse/issues/9666). [#10687](https://github.com/ClickHouse/ClickHouse/pull/10687) ([Andrew Onyshchuk](https://github.com/oandrew)).
+* Fix multiple usages of `IN` operator with the identical set in one query. [#10686](https://github.com/ClickHouse/ClickHouse/pull/10686) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed bug, which causes http requests stuck on client close when `readonly=2` and `cancel_http_readonly_queries_on_client_close=1`. Fixes [#7939](https://github.com/ClickHouse/ClickHouse/issues/7939), [#7019](https://github.com/ClickHouse/ClickHouse/issues/7019), [#7736](https://github.com/ClickHouse/ClickHouse/issues/7736), [#7091](https://github.com/ClickHouse/ClickHouse/issues/7091). [#10684](https://github.com/ClickHouse/ClickHouse/pull/10684) ([tavplubix](https://github.com/tavplubix)).
+* Fix order of parameters in AggregateTransform constructor. [#10667](https://github.com/ClickHouse/ClickHouse/pull/10667) ([palasonic1](https://github.com/palasonic1)).
+* Fix the lack of parallel execution of remote queries with `distributed_aggregation_memory_efficient` enabled. Fixes [#10655](https://github.com/ClickHouse/ClickHouse/issues/10655). [#10664](https://github.com/ClickHouse/ClickHouse/pull/10664) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix possible incorrect number of rows for queries with `LIMIT`. Fixes [#10566](https://github.com/ClickHouse/ClickHouse/issues/10566), [#10709](https://github.com/ClickHouse/ClickHouse/issues/10709). [#10660](https://github.com/ClickHouse/ClickHouse/pull/10660) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix bug which locks concurrent alters when table has a lot of parts. [#10659](https://github.com/ClickHouse/ClickHouse/pull/10659) ([alesapin](https://github.com/alesapin)).
+* Fix nullptr dereference in StorageBuffer if server was shutdown before table startup. [#10641](https://github.com/ClickHouse/ClickHouse/pull/10641) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix predicates optimization for distributed queries (`enable_optimize_predicate_expression=1`) for queries with `HAVING` section (i.e. when filtering on the server initiator is required), by preserving the order of expressions (and this is enough to fix), and also force aggregator use column names over indexes. Fixes: [#10613](https://github.com/ClickHouse/ClickHouse/issues/10613), [#11413](https://github.com/ClickHouse/ClickHouse/issues/11413). [#10621](https://github.com/ClickHouse/ClickHouse/pull/10621) ([Azat Khuzhin](https://github.com/azat)).
+* Fix optimize_skip_unused_shards with LowCardinality. [#10611](https://github.com/ClickHouse/ClickHouse/pull/10611) ([Azat Khuzhin](https://github.com/azat)).
+* Fix segfault in StorageBuffer when exception on server startup. Fixes [#10550](https://github.com/ClickHouse/ClickHouse/issues/10550). [#10609](https://github.com/ClickHouse/ClickHouse/pull/10609) ([tavplubix](https://github.com/tavplubix)).
+* On `SYSTEM DROP DNS CACHE` query also drop caches, which are used to check if user is allowed to connect from some IP addresses. [#10608](https://github.com/ClickHouse/ClickHouse/pull/10608) ([tavplubix](https://github.com/tavplubix)).
+* Fixed incorrect scalar results inside inner query of `MATERIALIZED VIEW` in case if this query contained dependent table. [#10603](https://github.com/ClickHouse/ClickHouse/pull/10603) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed handling condition variable for synchronous mutations. In some cases signals to that condition variable could be lost. [#10588](https://github.com/ClickHouse/ClickHouse/pull/10588) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Fixes possible crash `createDictionary()` is called before `loadStoredObject()` has finished. [#10587](https://github.com/ClickHouse/ClickHouse/pull/10587) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix error `the BloomFilter false positive must be a double number between 0 and 1` [#10551](https://github.com/ClickHouse/ClickHouse/issues/10551). [#10569](https://github.com/ClickHouse/ClickHouse/pull/10569) ([Winter Zhang](https://github.com/zhang2014)).
+* Fix SELECT of column ALIAS which default expression type different from column type. [#10563](https://github.com/ClickHouse/ClickHouse/pull/10563) ([Azat Khuzhin](https://github.com/azat)).
+* Implemented comparison between DateTime64 and String values (just like for DateTime). [#10560](https://github.com/ClickHouse/ClickHouse/pull/10560) ([Vasily Nemkov](https://github.com/Enmk)).
+* Fix index corruption, which may occur in some cases after merge compact parts into another compact part. [#10531](https://github.com/ClickHouse/ClickHouse/pull/10531) ([Anton Popov](https://github.com/CurtizJ)).
+* Disable GROUP BY sharding_key optimization by default (`optimize_distributed_group_by_sharding_key` had been introduced and turned of by default, due to trickery of sharding_key analyzing, simple example is `if` in sharding key) and fix it for WITH ROLLUP/CUBE/TOTALS. [#10516](https://github.com/ClickHouse/ClickHouse/pull/10516) ([Azat Khuzhin](https://github.com/azat)).
+* Fixes: [#10263](https://github.com/ClickHouse/ClickHouse/issues/10263) (after that PR dist send via INSERT had been postponing on each INSERT) Fixes: [#8756](https://github.com/ClickHouse/ClickHouse/issues/8756) (that PR breaks distributed sends with all of the following conditions met (unlikely setup for now I guess): `internal_replication == false`, multiple local shards (activates the hardlinking code) and `distributed_storage_policy` (makes `link(2)` fails on `EXDEV`)). [#10486](https://github.com/ClickHouse/ClickHouse/pull/10486) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed error with "max_rows_to_sort" limit. [#10268](https://github.com/ClickHouse/ClickHouse/pull/10268) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Get dictionary and check access rights only once per each call of any function reading external dictionaries. [#10928](https://github.com/ClickHouse/ClickHouse/pull/10928) ([Vitaly Baranov](https://github.com/vitlibar)).
+
+#### Improvement
+
+* Apply `TTL` for old data, after `ALTER MODIFY TTL` query. This behaviour is controlled by setting `materialize_ttl_after_modify`, which is enabled by default. [#11042](https://github.com/ClickHouse/ClickHouse/pull/11042) ([Anton Popov](https://github.com/CurtizJ)).
+* When parsing C-style backslash escapes in string literals, VALUES and various text formats (this is an extension to SQL standard that is endemic for ClickHouse and MySQL), keep backslash if unknown escape sequence is found (e.g. `\%` or `\w`) that will make usage of `LIKE` and `match` regular expressions more convenient (it's enough to write `name LIKE 'used\_cars'` instead of `name LIKE 'used\\_cars'`) and more compatible at the same time. This fixes [#10922](https://github.com/ClickHouse/ClickHouse/issues/10922). [#11208](https://github.com/ClickHouse/ClickHouse/pull/11208) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* When reading Decimal value, cut extra digits after point. This behaviour is more compatible with MySQL and PostgreSQL. This fixes [#10202](https://github.com/ClickHouse/ClickHouse/issues/10202). [#11831](https://github.com/ClickHouse/ClickHouse/pull/11831) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Allow to DROP replicated table if the metadata in ZooKeeper was already removed and does not exist (this is also the case when using TestKeeper for testing and the server was restarted). Allow to RENAME replicated table even if there is an error communicating with ZooKeeper. This fixes [#10720](https://github.com/ClickHouse/ClickHouse/issues/10720). [#11652](https://github.com/ClickHouse/ClickHouse/pull/11652) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Slightly improve diagnostic of reading decimal from string. This closes [#10202](https://github.com/ClickHouse/ClickHouse/issues/10202). [#11829](https://github.com/ClickHouse/ClickHouse/pull/11829) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix sleep invocation in signal handler. It was sleeping for less amount of time than expected. [#11825](https://github.com/ClickHouse/ClickHouse/pull/11825) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* (Only Linux) OS related performance metrics (for CPU and I/O) will work even without `CAP_NET_ADMIN` capability. [#10544](https://github.com/ClickHouse/ClickHouse/pull/10544) ([Alexander Kazakov](https://github.com/Akazz)).
+* Added `hostname` as an alias to function `hostName`. This feature was suggested by Victor Tarnavskiy from Yandex.Metrica. [#11821](https://github.com/ClickHouse/ClickHouse/pull/11821) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Added support for distributed `DDL` (update/delete/drop partition) on cross replication clusters. [#11703](https://github.com/ClickHouse/ClickHouse/pull/11703) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Emit warning instead of error in server log at startup if we cannot listen one of the listen addresses (e.g. IPv6 is unavailable inside Docker). Note that if server fails to listen all listed addresses, it will refuse to startup as before. This fixes [#4406](https://github.com/ClickHouse/ClickHouse/issues/4406). [#11687](https://github.com/ClickHouse/ClickHouse/pull/11687) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Default user and database creation on docker image starting. [#10637](https://github.com/ClickHouse/ClickHouse/pull/10637) ([Paramtamtam](https://github.com/tarampampam)).
+* When multiline query is printed to server log, the lines are joined. Make it to work correct in case of multiline string literals, identifiers and single-line comments. This fixes [#3853](https://github.com/ClickHouse/ClickHouse/issues/3853). [#11686](https://github.com/ClickHouse/ClickHouse/pull/11686) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Multiple names are now allowed in commands: CREATE USER, CREATE ROLE, ALTER USER, SHOW CREATE USER, SHOW GRANTS and so on. [#11670](https://github.com/ClickHouse/ClickHouse/pull/11670) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Add support for distributed DDL (`UPDATE/DELETE/DROP PARTITION`) on cross replication clusters. [#11508](https://github.com/ClickHouse/ClickHouse/pull/11508) ([frank lee](https://github.com/etah000)).
+* Clear password from command line in `clickhouse-client` and `clickhouse-benchmark` if the user has specified it with explicit value. This prevents password exposure by `ps` and similar tools. [#11665](https://github.com/ClickHouse/ClickHouse/pull/11665) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Don't use debug info from ELF file if it doesn't correspond to the running binary. It is needed to avoid printing wrong function names and source locations in stack traces. This fixes [#7514](https://github.com/ClickHouse/ClickHouse/issues/7514). [#11657](https://github.com/ClickHouse/ClickHouse/pull/11657) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Return NULL/zero when value is not parsed completely in parseDateTimeBestEffortOrNull/Zero functions. This fixes [#7876](https://github.com/ClickHouse/ClickHouse/issues/7876). [#11653](https://github.com/ClickHouse/ClickHouse/pull/11653) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Skip empty parameters in requested URL. They may appear when you write `http://localhost:8123/?&a=b` or `http://localhost:8123/?a=b&&c=d`. This closes [#10749](https://github.com/ClickHouse/ClickHouse/issues/10749). [#11651](https://github.com/ClickHouse/ClickHouse/pull/11651) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Allow using `groupArrayArray` and `groupUniqArrayArray` as `SimpleAggregateFunction`. [#11650](https://github.com/ClickHouse/ClickHouse/pull/11650) ([Volodymyr Kuznetsov](https://github.com/ksvladimir)).
+* Allow comparison with constant strings by implicit conversions when analysing index conditions on other types. This may close [#11630](https://github.com/ClickHouse/ClickHouse/issues/11630). [#11648](https://github.com/ClickHouse/ClickHouse/pull/11648) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* https://github.com/ClickHouse/ClickHouse/pull/7572#issuecomment-642815377 Support config default HTTPHandlers. [#11628](https://github.com/ClickHouse/ClickHouse/pull/11628) ([Winter Zhang](https://github.com/zhang2014)).
+* Make more input formats to work with Kafka engine. Fix the issue with premature flushes. Fix the performance issue when `kafka_num_consumers` is greater than number of partitions in topic. [#11599](https://github.com/ClickHouse/ClickHouse/pull/11599) ([filimonov](https://github.com/filimonov)).
+* Improve `multiple_joins_rewriter_version=2` logic. Fix unknown columns error for lambda aliases. [#11587](https://github.com/ClickHouse/ClickHouse/pull/11587) ([Artem Zuikov](https://github.com/4ertus2)).
+* Better exception message when cannot parse columns declaration list. This closes [#10403](https://github.com/ClickHouse/ClickHouse/issues/10403). [#11537](https://github.com/ClickHouse/ClickHouse/pull/11537) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Improve `enable_optimize_predicate_expression=1` logic for VIEW. [#11513](https://github.com/ClickHouse/ClickHouse/pull/11513) ([Artem Zuikov](https://github.com/4ertus2)).
+* Adding support for PREWHERE in live view tables. [#11495](https://github.com/ClickHouse/ClickHouse/pull/11495) ([vzakaznikov](https://github.com/vzakaznikov)).
+* Automatically update DNS cache, which is used to check if user is allowed to connect from an address. [#11487](https://github.com/ClickHouse/ClickHouse/pull/11487) ([tavplubix](https://github.com/tavplubix)).
+* OPTIMIZE FINAL will force merge even if concurrent merges are performed. This closes [#11309](https://github.com/ClickHouse/ClickHouse/issues/11309) and closes [#11322](https://github.com/ClickHouse/ClickHouse/issues/11322). [#11346](https://github.com/ClickHouse/ClickHouse/pull/11346) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Suppress output of cancelled queries in clickhouse-client. In previous versions result may continue to print in terminal even after you press Ctrl+C to cancel query. This closes [#9473](https://github.com/ClickHouse/ClickHouse/issues/9473). [#11342](https://github.com/ClickHouse/ClickHouse/pull/11342) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Now history file is updated after each query and there is no race condition if multiple clients use one history file. This fixes [#9897](https://github.com/ClickHouse/ClickHouse/issues/9897). [#11453](https://github.com/ClickHouse/ClickHouse/pull/11453) ([Tagir Kuskarov](https://github.com/kuskarov)).
+* Better log messages in while reloading configuration. [#11341](https://github.com/ClickHouse/ClickHouse/pull/11341) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Remove trailing whitespaces from formatted queries in `clickhouse-client` or `clickhouse-format` in some cases. [#11325](https://github.com/ClickHouse/ClickHouse/pull/11325) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add setting "output_format_pretty_max_value_width". If value is longer, it will be cut to avoid output of too large values in terminal. This closes [#11140](https://github.com/ClickHouse/ClickHouse/issues/11140). [#11324](https://github.com/ClickHouse/ClickHouse/pull/11324) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Better exception message in case when there is shortage of memory mappings. This closes [#11027](https://github.com/ClickHouse/ClickHouse/issues/11027). [#11316](https://github.com/ClickHouse/ClickHouse/pull/11316) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Support (U)Int8, (U)Int16, Date in ASOF JOIN. [#11301](https://github.com/ClickHouse/ClickHouse/pull/11301) ([Artem Zuikov](https://github.com/4ertus2)).
+* Support kafka_client_id parameter for Kafka tables. It also changes the default `client.id` used by ClickHouse when communicating with Kafka to be more verbose and usable. [#11252](https://github.com/ClickHouse/ClickHouse/pull/11252) ([filimonov](https://github.com/filimonov)).
+* Keep the value of `DistributedFilesToInsert` metric on exceptions. In previous versions, the value was set when we are going to send some files, but it is zero, if there was an exception and some files are still pending. Now it corresponds to the number of pending files in filesystem. [#11220](https://github.com/ClickHouse/ClickHouse/pull/11220) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add support for multi-word data type names (such as `DOUBLE PRECISION` and `CHAR VARYING`) for better SQL compatibility. [#11214](https://github.com/ClickHouse/ClickHouse/pull/11214) ([Павел Потемкин](https://github.com/Potya)).
+* Provide synonyms for some data types. [#10856](https://github.com/ClickHouse/ClickHouse/pull/10856) ([Павел Потемкин](https://github.com/Potya)).
+* The query log is now enabled by default. [#11184](https://github.com/ClickHouse/ClickHouse/pull/11184) ([Ivan Blinkov](https://github.com/blinkov)).
+* Show authentication type in table system.users and while executing SHOW CREATE USER query. [#11080](https://github.com/ClickHouse/ClickHouse/pull/11080) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Remove data on explicit `DROP DATABASE` for `Memory` database engine. Fixes [#10557](https://github.com/ClickHouse/ClickHouse/issues/10557). [#11021](https://github.com/ClickHouse/ClickHouse/pull/11021) ([tavplubix](https://github.com/tavplubix)).
+* Set thread names for internal threads of rdkafka library. Make logs from rdkafka available in server logs. [#10983](https://github.com/ClickHouse/ClickHouse/pull/10983) ([Azat Khuzhin](https://github.com/azat)).
+* Support for unicode whitespaces in queries. This helps when queries are copy-pasted from Word or from web page. This fixes [#10896](https://github.com/ClickHouse/ClickHouse/issues/10896). [#10903](https://github.com/ClickHouse/ClickHouse/pull/10903) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Allow large UInt types as the index in function `tupleElement`. [#10874](https://github.com/ClickHouse/ClickHouse/pull/10874) ([hcz](https://github.com/hczhcz)).
+* Respect prefer_localhost_replica/load_balancing on INSERT into Distributed. [#10867](https://github.com/ClickHouse/ClickHouse/pull/10867) ([Azat Khuzhin](https://github.com/azat)).
+* Introduce `min_insert_block_size_rows_for_materialized_views`, `min_insert_block_size_bytes_for_materialized_views` settings. This settings are similar to `min_insert_block_size_rows` and `min_insert_block_size_bytes`, but applied only for blocks inserted into `MATERIALIZED VIEW`. It helps to control blocks squashing while pushing to MVs and avoid excessive memory usage. [#10858](https://github.com/ClickHouse/ClickHouse/pull/10858) ([Azat Khuzhin](https://github.com/azat)).
+* Get rid of exception from replicated queue during server shutdown. Fixes [#10819](https://github.com/ClickHouse/ClickHouse/issues/10819). [#10841](https://github.com/ClickHouse/ClickHouse/pull/10841) ([alesapin](https://github.com/alesapin)).
+* Ensure that `varSamp`, `varPop` cannot return negative results due to numerical errors and that `stddevSamp`, `stddevPop` cannot be calculated from negative variance. This fixes [#10532](https://github.com/ClickHouse/ClickHouse/issues/10532). [#10829](https://github.com/ClickHouse/ClickHouse/pull/10829) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Better DNS exception message. This fixes [#10813](https://github.com/ClickHouse/ClickHouse/issues/10813). [#10828](https://github.com/ClickHouse/ClickHouse/pull/10828) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Change HTTP response code in case of some parse errors to 400 Bad Request. This fix [#10636](https://github.com/ClickHouse/ClickHouse/issues/10636). [#10640](https://github.com/ClickHouse/ClickHouse/pull/10640) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Print a message if clickhouse-client is newer than clickhouse-server. [#10627](https://github.com/ClickHouse/ClickHouse/pull/10627) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Adding support for `INSERT INTO [db.]table WATCH` query. [#10498](https://github.com/ClickHouse/ClickHouse/pull/10498) ([vzakaznikov](https://github.com/vzakaznikov)).
+* Allow to pass quota_key in clickhouse-client. This closes [#10227](https://github.com/ClickHouse/ClickHouse/issues/10227). [#10270](https://github.com/ClickHouse/ClickHouse/pull/10270) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+
+#### Performance Improvement
+
+* Allow multiple replicas to assign merges, mutations, partition drop, move and replace concurrently. This closes [#10367](https://github.com/ClickHouse/ClickHouse/issues/10367). [#11639](https://github.com/ClickHouse/ClickHouse/pull/11639) ([alexey-milovidov](https://github.com/alexey-milovidov)) [#11795](https://github.com/ClickHouse/ClickHouse/pull/11795) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Optimization of GROUP BY with respect to table sorting key, enabled with `optimize_aggregation_in_order` setting. [#9113](https://github.com/ClickHouse/ClickHouse/pull/9113) ([dimarub2000](https://github.com/dimarub2000)).
+* Selects with final are executed in parallel. Added setting `max_final_threads` to limit the number of threads used. [#10463](https://github.com/ClickHouse/ClickHouse/pull/10463) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Improve performance for INSERT queries via `INSERT SELECT` or INSERT with clickhouse-client when small blocks are generated (typical case with parallel parsing). This fixes [#11275](https://github.com/ClickHouse/ClickHouse/issues/11275). Fix the issue that CONSTRAINTs were not working for DEFAULT fields. This fixes [#11273](https://github.com/ClickHouse/ClickHouse/issues/11273). Fix the issue that CONSTRAINTS were ignored for TEMPORARY tables. This fixes [#11274](https://github.com/ClickHouse/ClickHouse/issues/11274). [#11276](https://github.com/ClickHouse/ClickHouse/pull/11276) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Optimization that eliminates min/max/any aggregators of GROUP BY keys in SELECT section, enabled with `optimize_aggregators_of_group_by_keys` setting. [#11667](https://github.com/ClickHouse/ClickHouse/pull/11667) ([xPoSx](https://github.com/xPoSx)). [#11806](https://github.com/ClickHouse/ClickHouse/pull/11806) ([Azat Khuzhin](https://github.com/azat)).
+* New optimization that takes all operations out of `any` function, enabled with `optimize_move_functions_out_of_any` [#11529](https://github.com/ClickHouse/ClickHouse/pull/11529) ([Ruslan](https://github.com/kamalov-ruslan)).
+* Improve performance of `clickhouse-client` in interactive mode when Pretty formats are used. In previous versions, significant amount of time can be spent calculating visible width of UTF-8 string. This closes [#11323](https://github.com/ClickHouse/ClickHouse/issues/11323). [#11323](https://github.com/ClickHouse/ClickHouse/pull/11323) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Improved performance for queries with `ORDER BY` and small `LIMIT` (less, then `max_block_size`). [#11171](https://github.com/ClickHouse/ClickHouse/pull/11171) ([Albert Kidrachev](https://github.com/Provet)).
+* Add runtime CPU detection to select and dispatch the best function implementation. Add support for codegeneration for multiple targets. This closes [#1017](https://github.com/ClickHouse/ClickHouse/issues/1017). [#10058](https://github.com/ClickHouse/ClickHouse/pull/10058) ([DimasKovas](https://github.com/DimasKovas)).
+* Enable `mlock` of clickhouse binary by default. It will prevent clickhouse executable from being paged out under high IO load. [#11139](https://github.com/ClickHouse/ClickHouse/pull/11139) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Make queries with `sum` aggregate function and without GROUP BY keys to run multiple times faster. [#10992](https://github.com/ClickHouse/ClickHouse/pull/10992) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Improving radix sort (used in `ORDER BY` with simple keys) by removing some redundant data moves. [#10981](https://github.com/ClickHouse/ClickHouse/pull/10981) ([Arslan Gumerov](https://github.com/g-arslan)).
+* Sort bigger parts of the left table in MergeJoin. Buffer left blocks in memory. Add `partial_merge_join_left_table_buffer_bytes` setting to manage the left blocks buffers sizes. [#10601](https://github.com/ClickHouse/ClickHouse/pull/10601) ([Artem Zuikov](https://github.com/4ertus2)).
+* Remove duplicate ORDER BY and DISTINCT from subqueries, this optimization is enabled with `optimize_duplicate_order_by_and_distinct` [#10067](https://github.com/ClickHouse/ClickHouse/pull/10067) ([Mikhail Malafeev](https://github.com/demo-99)).
+* This feature eliminates functions of other keys in GROUP BY section, enabled with `optimize_group_by_function_keys` [#10051](https://github.com/ClickHouse/ClickHouse/pull/10051) ([xPoSx](https://github.com/xPoSx)).
+* New optimization that takes arithmetic operations out of aggregate functions, enabled with `optimize_arithmetic_operations_in_aggregate_functions` [#10047](https://github.com/ClickHouse/ClickHouse/pull/10047) ([Ruslan](https://github.com/kamalov-ruslan)).
+* Use HTTP client for S3 based on Poco instead of curl. This will improve performance and lower memory usage of s3 storage and table functions. [#11230](https://github.com/ClickHouse/ClickHouse/pull/11230) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Fix Kafka performance issue related to reschedules based on limits, which were always applied. [#11149](https://github.com/ClickHouse/ClickHouse/pull/11149) ([filimonov](https://github.com/filimonov)).
+* Enable percpu_arena:percpu for jemalloc (This will reduce memory fragmentation due to thread pool). [#11084](https://github.com/ClickHouse/ClickHouse/pull/11084) ([Azat Khuzhin](https://github.com/azat)).
+* Optimize memory usage when reading a response from an S3 HTTP client. [#11561](https://github.com/ClickHouse/ClickHouse/pull/11561) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Adjust the default Kafka settings for better performance. [#11388](https://github.com/ClickHouse/ClickHouse/pull/11388) ([filimonov](https://github.com/filimonov)).
+
+#### Experimental Feature
+
+* Add data type `Point` (Tuple(Float64, Float64)) and `Polygon` (Array(Array(Tuple(Float64, Float64))). [#10678](https://github.com/ClickHouse/ClickHouse/pull/10678) ([Alexey Ilyukhov](https://github.com/livace)).
+* Add's a `hasSubstr` function that allows for look for subsequences in arrays. Note: this function is likely to be renamed without further notice. [#11071](https://github.com/ClickHouse/ClickHouse/pull/11071) ([Ryad Zenine](https://github.com/r-zenine)).
+* Added OpenCL support and bitonic sort algorithm, which can be used for sorting integer types of data in single column. Needs to be build with flag `-DENABLE_OPENCL=1`. For using bitonic sort algorithm instead of others you need to set `bitonic_sort` for Setting's option `special_sort` and make sure that OpenCL is available. This feature does not improve performance or anything else, it is only provided as an example and for demonstration purposes. It is likely to be removed in near future if there will be no further development in this direction. [#10232](https://github.com/ClickHouse/ClickHouse/pull/10232) ([Ri](https://github.com/margaritiko)).
+
+#### Build/Testing/Packaging Improvement
+
+* Enable clang-tidy for programs and utils. [#10991](https://github.com/ClickHouse/ClickHouse/pull/10991) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Remove dependency on `tzdata`: do not fail if `/usr/share/zoneinfo` directory does not exist. Note that all timezones work in ClickHouse even without tzdata installed in system. [#11827](https://github.com/ClickHouse/ClickHouse/pull/11827) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Added MSan and UBSan stress tests. Note that we already have MSan, UBSan for functional tests and "stress" test is another kind of tests. [#10871](https://github.com/ClickHouse/ClickHouse/pull/10871) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Print compiler build id in crash messages. It will make us slightly more certain about what binary has crashed. Added new function `buildId`. [#11824](https://github.com/ClickHouse/ClickHouse/pull/11824) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Added a test to ensure that mutations continue to work after FREEZE query. [#11820](https://github.com/ClickHouse/ClickHouse/pull/11820) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Don't allow tests with "fail" substring in their names because it makes looking at the tests results in browser less convenient when you type Ctrl+F and search for "fail". [#11817](https://github.com/ClickHouse/ClickHouse/pull/11817) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Removes unused imports from HTTPHandlerFactory. [#11660](https://github.com/ClickHouse/ClickHouse/pull/11660) ([Bharat Nallan](https://github.com/bharatnc)).
+* Added a random sampling of instances where copier is executed. It is needed to avoid `Too many simultaneous queries` error. Also increased timeout and decreased fault probability. [#11573](https://github.com/ClickHouse/ClickHouse/pull/11573) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fix missed include. [#11525](https://github.com/ClickHouse/ClickHouse/pull/11525) ([Matwey V. Kornilov](https://github.com/matwey)).
+* Speed up build by removing old example programs. Also found some orphan functional test. [#11486](https://github.com/ClickHouse/ClickHouse/pull/11486) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Increase ccache size for builds in CI. [#11450](https://github.com/ClickHouse/ClickHouse/pull/11450) ([alesapin](https://github.com/alesapin)).
+* Leave only unit_tests_dbms in deb build. [#11429](https://github.com/ClickHouse/ClickHouse/pull/11429) ([Ilya Yatsishin](https://github.com/qoega)).
+* Update librdkafka to version [1.4.2](https://github.com/edenhill/librdkafka/releases/tag/v1.4.2). [#11256](https://github.com/ClickHouse/ClickHouse/pull/11256) ([filimonov](https://github.com/filimonov)).
+* Refactor CMake build files. [#11390](https://github.com/ClickHouse/ClickHouse/pull/11390) ([Ivan](https://github.com/abyss7)).
+* Fix several flaky integration tests. [#11355](https://github.com/ClickHouse/ClickHouse/pull/11355) ([alesapin](https://github.com/alesapin)).
+* Add support for unit tests run with UBSan. [#11345](https://github.com/ClickHouse/ClickHouse/pull/11345) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Remove redundant timeout from integration test `test_insertion_sync_fails_with_timeout`. [#11343](https://github.com/ClickHouse/ClickHouse/pull/11343) ([alesapin](https://github.com/alesapin)).
+* Better check for hung queries in clickhouse-test. [#11321](https://github.com/ClickHouse/ClickHouse/pull/11321) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Emit a warning if server was build in debug or with sanitizers. [#11304](https://github.com/ClickHouse/ClickHouse/pull/11304) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Now clickhouse-test check the server aliveness before tests run. [#11285](https://github.com/ClickHouse/ClickHouse/pull/11285) ([alesapin](https://github.com/alesapin)).
+* Fix potentially flacky test `00731_long_merge_tree_select_opened_files.sh`. It does not fail frequently but we have discovered potential race condition in this test while experimenting with ThreadFuzzer: [#9814](https://github.com/ClickHouse/ClickHouse/issues/9814) See [link](https://clickhouse-test-reports.s3.yandex.net/9814/40e3023e215df22985d275bf85f4d2290897b76b/functional_stateless_tests_(unbundled).html#fail1) for the example. [#11270](https://github.com/ClickHouse/ClickHouse/pull/11270) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Repeat test in CI if `curl` invocation was timed out. It is possible due to system hangups for 10+ seconds that are typical in our CI infrastructure. This fixes [#11267](https://github.com/ClickHouse/ClickHouse/issues/11267). [#11268](https://github.com/ClickHouse/ClickHouse/pull/11268) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add a test for Join table engine from @donmikel. This closes [#9158](https://github.com/ClickHouse/ClickHouse/issues/9158). [#11265](https://github.com/ClickHouse/ClickHouse/pull/11265) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix several non significant errors in unit tests. [#11262](https://github.com/ClickHouse/ClickHouse/pull/11262) ([alesapin](https://github.com/alesapin)).
+* Now parts of linker command for `cctz` library will not be shuffled with other libraries. [#11213](https://github.com/ClickHouse/ClickHouse/pull/11213) ([alesapin](https://github.com/alesapin)).
+* Split /programs/server into actual program and library. [#11186](https://github.com/ClickHouse/ClickHouse/pull/11186) ([Ivan](https://github.com/abyss7)).
+* Improve build scripts for protobuf & gRPC. [#11172](https://github.com/ClickHouse/ClickHouse/pull/11172) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Enable performance test that was not working. [#11158](https://github.com/ClickHouse/ClickHouse/pull/11158) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Create root S3 bucket for tests before any CH instance is started. [#11142](https://github.com/ClickHouse/ClickHouse/pull/11142) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Add performance test for non-constant polygons. [#11141](https://github.com/ClickHouse/ClickHouse/pull/11141) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixing `00979_live_view_watch_continuous_aggregates` test. [#11024](https://github.com/ClickHouse/ClickHouse/pull/11024) ([vzakaznikov](https://github.com/vzakaznikov)).
+* Add ability to run zookeeper in integration tests over tmpfs. [#11002](https://github.com/ClickHouse/ClickHouse/pull/11002) ([alesapin](https://github.com/alesapin)).
+* Wait for odbc-bridge with exponential backoff. Previous wait time of 200 ms was not enough in our CI environment. [#10990](https://github.com/ClickHouse/ClickHouse/pull/10990) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix non-deterministic test. [#10989](https://github.com/ClickHouse/ClickHouse/pull/10989) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Added a test for empty external data. [#10926](https://github.com/ClickHouse/ClickHouse/pull/10926) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Database is recreated for every test. This improves separation of tests. [#10902](https://github.com/ClickHouse/ClickHouse/pull/10902) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Added more asserts in columns code. [#10833](https://github.com/ClickHouse/ClickHouse/pull/10833) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Better cooperation with sanitizers. Print information about query_id in the message of sanitizer failure. [#10832](https://github.com/ClickHouse/ClickHouse/pull/10832) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix obvious race condition in "Split build smoke test" check. [#10820](https://github.com/ClickHouse/ClickHouse/pull/10820) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix (false) MSan report in MergeTreeIndexFullText. The issue first appeared in [#9968](https://github.com/ClickHouse/ClickHouse/issues/9968). [#10801](https://github.com/ClickHouse/ClickHouse/pull/10801) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add MSan suppression for MariaDB Client library. [#10800](https://github.com/ClickHouse/ClickHouse/pull/10800) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* GRPC make couldn't find protobuf files, changed make file by adding the right link. [#10794](https://github.com/ClickHouse/ClickHouse/pull/10794) ([mnkonkova](https://github.com/mnkonkova)).
+* Enable extra warnings (`-Weverything`) for base, utils, programs. Note that we already have it for the most of the code. [#10779](https://github.com/ClickHouse/ClickHouse/pull/10779) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Suppressions of warnings from libraries was mistakenly declared as public in [#10396](https://github.com/ClickHouse/ClickHouse/issues/10396). [#10776](https://github.com/ClickHouse/ClickHouse/pull/10776) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Restore a patch that was accidentially deleted in [#10396](https://github.com/ClickHouse/ClickHouse/issues/10396). [#10774](https://github.com/ClickHouse/ClickHouse/pull/10774) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix performance tests errors, part 2. [#10773](https://github.com/ClickHouse/ClickHouse/pull/10773) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix performance test errors. [#10766](https://github.com/ClickHouse/ClickHouse/pull/10766) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Update cross-builds to use clang-10 compiler. [#10724](https://github.com/ClickHouse/ClickHouse/pull/10724) ([Ivan](https://github.com/abyss7)).
+* Update instruction to install RPM packages. This was suggested by Denis (TG login @ldviolet) and implemented by Arkady Shejn. [#10707](https://github.com/ClickHouse/ClickHouse/pull/10707) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Trying to fix `tests/queries/0_stateless/01246_insert_into_watch_live_view.py` test. [#10670](https://github.com/ClickHouse/ClickHouse/pull/10670) ([vzakaznikov](https://github.com/vzakaznikov)).
+* Fixing and re-enabling 00979_live_view_watch_continuous_aggregates.py test. [#10658](https://github.com/ClickHouse/ClickHouse/pull/10658) ([vzakaznikov](https://github.com/vzakaznikov)).
+* Fix OOM in ASan stress test. [#10646](https://github.com/ClickHouse/ClickHouse/pull/10646) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix UBSan report (adding zero to nullptr) in HashTable that appeared after migration to clang-10. [#10638](https://github.com/ClickHouse/ClickHouse/pull/10638) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Remove external call to `ld` (bfd) linker during tzdata processing in compile time. [#10634](https://github.com/ClickHouse/ClickHouse/pull/10634) ([alesapin](https://github.com/alesapin)).
+* Allow to use `lld` to link blobs (resources). [#10632](https://github.com/ClickHouse/ClickHouse/pull/10632) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix UBSan report in `LZ4` library. [#10631](https://github.com/ClickHouse/ClickHouse/pull/10631) ([alexey-milovidov](https://github.com/alexey-milovidov)). See also [https://github.com/lz4/lz4/issues/857](https://github.com/lz4/lz4/issues/857)
+* Update LZ4 to the latest dev branch. [#10630](https://github.com/ClickHouse/ClickHouse/pull/10630) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Added auto-generated machine-readable file with the list of stable versions. [#10628](https://github.com/ClickHouse/ClickHouse/pull/10628) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix `capnproto` version check for `capnp::UnalignedFlatArrayMessageReader`. [#10618](https://github.com/ClickHouse/ClickHouse/pull/10618) ([Matwey V. Kornilov](https://github.com/matwey)).
+* Lower memory usage in tests. [#10617](https://github.com/ClickHouse/ClickHouse/pull/10617) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixing hard coded timeouts in new live view tests. [#10604](https://github.com/ClickHouse/ClickHouse/pull/10604) ([vzakaznikov](https://github.com/vzakaznikov)).
+* Increasing timeout when opening a client in tests/queries/0_stateless/helpers/client.py. [#10599](https://github.com/ClickHouse/ClickHouse/pull/10599) ([vzakaznikov](https://github.com/vzakaznikov)).
+* Enable ThinLTO for clang builds, continuation of [#10435](https://github.com/ClickHouse/ClickHouse/pull/10435). [#10585](https://github.com/ClickHouse/ClickHouse/pull/10585) ([Amos Bird](https://github.com/amosbird)).
+* Adding fuzzers and preparing for oss-fuzz integration. [#10546](https://github.com/ClickHouse/ClickHouse/pull/10546) ([kyprizel](https://github.com/kyprizel)).
+* Fix FreeBSD build. [#10150](https://github.com/ClickHouse/ClickHouse/pull/10150) ([Ivan](https://github.com/abyss7)).
+* Add new build for query tests using pytest framework. [#10039](https://github.com/ClickHouse/ClickHouse/pull/10039) ([Ivan](https://github.com/abyss7)).
+
+
+## ClickHouse release v20.4
+
+### ClickHouse release v20.4.8.99-stable 2020-08-10
+
+#### Bug Fix
+
+* Fixed error in `parseDateTimeBestEffort` function when unix timestamp was passed as an argument. This fixes [#13362](https://github.com/ClickHouse/ClickHouse/issues/13362). [#13441](https://github.com/ClickHouse/ClickHouse/pull/13441) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed potentially low performance and slightly incorrect result for `uniqExact`, `topK`, `sumDistinct` and similar aggregate functions called on Float types with NaN values. It also triggered assert in debug build. This fixes [#12491](https://github.com/ClickHouse/ClickHouse/issues/12491). [#13254](https://github.com/ClickHouse/ClickHouse/pull/13254) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed function if with nullable constexpr as cond that is not literal NULL. Fixes [#12463](https://github.com/ClickHouse/ClickHouse/issues/12463). [#13226](https://github.com/ClickHouse/ClickHouse/pull/13226) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed assert in `arrayElement` function in case of array elements are Nullable and array subscript is also Nullable. This fixes [#12172](https://github.com/ClickHouse/ClickHouse/issues/12172). [#13224](https://github.com/ClickHouse/ClickHouse/pull/13224) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed wrong index analysis with functions. It could lead to pruning wrong parts, while reading from `MergeTree` tables. Fixes [#13060](https://github.com/ClickHouse/ClickHouse/issues/13060). Fixes [#12406](https://github.com/ClickHouse/ClickHouse/issues/12406). [#13081](https://github.com/ClickHouse/ClickHouse/pull/13081) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed unnecessary limiting for the number of threads for selects from local replica. [#12840](https://github.com/ClickHouse/ClickHouse/pull/12840) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed possible extra overflow row in data which could appear for queries `WITH TOTALS`. [#12747](https://github.com/ClickHouse/ClickHouse/pull/12747) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed performance with large tuples, which are interpreted as functions in `IN` section. The case when user write `WHERE x IN tuple(1, 2, ...)` instead of `WHERE x IN (1, 2, ...)` for some obscure reason. [#12700](https://github.com/ClickHouse/ClickHouse/pull/12700) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed memory tracking for `input_format_parallel_parsing` (by attaching thread to group). [#12672](https://github.com/ClickHouse/ClickHouse/pull/12672) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed [#12293](https://github.com/ClickHouse/ClickHouse/issues/12293) allow push predicate when subquery contains with clause. [#12663](https://github.com/ClickHouse/ClickHouse/pull/12663) ([Winter Zhang](https://github.com/zhang2014)).
+* Fixed [#10572](https://github.com/ClickHouse/ClickHouse/issues/10572) fix bloom filter index with const expression. [#12659](https://github.com/ClickHouse/ClickHouse/pull/12659) ([Winter Zhang](https://github.com/zhang2014)).
+* Fixed `SIGSEGV` in `StorageKafka` when broker is unavailable (and not only). [#12658](https://github.com/ClickHouse/ClickHouse/pull/12658) ([Azat Khuzhin](https://github.com/azat)).
+* Added support for function `if` with `Array(UUID)` arguments. This fixes [#11066](https://github.com/ClickHouse/ClickHouse/issues/11066). [#12648](https://github.com/ClickHouse/ClickHouse/pull/12648) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed race condition in external dictionaries with cache layout which can lead server crash. [#12566](https://github.com/ClickHouse/ClickHouse/pull/12566) ([alesapin](https://github.com/alesapin)).
+* Removed data for Distributed tables (blocks from async INSERTs) on DROP TABLE. [#12556](https://github.com/ClickHouse/ClickHouse/pull/12556) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed bug which lead to broken old parts after `ALTER DELETE` query when `enable_mixed_granularity_parts=1`. Fixes [#12536](https://github.com/ClickHouse/ClickHouse/issues/12536). [#12543](https://github.com/ClickHouse/ClickHouse/pull/12543) ([alesapin](https://github.com/alesapin)).
+* Better exception for function `in` with invalid number of arguments. [#12529](https://github.com/ClickHouse/ClickHouse/pull/12529) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed performance issue, while reading from compact parts. [#12492](https://github.com/ClickHouse/ClickHouse/pull/12492) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed crash in JOIN with dictionary when we are joining over expression of dictionary key: `t JOIN dict ON expr(dict.id) = t.id`. Disable dictionary join optimisation for this case. [#12458](https://github.com/ClickHouse/ClickHouse/pull/12458) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fixed possible segfault if StorageMerge. Closes [#12054](https://github.com/ClickHouse/ClickHouse/issues/12054). [#12401](https://github.com/ClickHouse/ClickHouse/pull/12401) ([tavplubix](https://github.com/tavplubix)).
+* Fixed order of columns in `WITH FILL` modifier. Previously order of columns of `ORDER BY` statement wasn't respected. [#12306](https://github.com/ClickHouse/ClickHouse/pull/12306) ([Anton Popov](https://github.com/CurtizJ)).
+* Avoid "bad cast" exception when there is an expression that filters data by virtual columns (like `_table` in `Merge` tables) or by "index" columns in system tables such as filtering by database name when querying from `system.tables`, and this expression returns `Nullable` type. This fixes [#12166](https://github.com/ClickHouse/ClickHouse/issues/12166). [#12305](https://github.com/ClickHouse/ClickHouse/pull/12305) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Show error after TrieDictionary failed to load. [#12290](https://github.com/ClickHouse/ClickHouse/pull/12290) ([Vitaly Baranov](https://github.com/vitlibar)).
+* The function `arrayFill` worked incorrectly for empty arrays that may lead to crash. This fixes [#12263](https://github.com/ClickHouse/ClickHouse/issues/12263). [#12279](https://github.com/ClickHouse/ClickHouse/pull/12279) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Implemented conversions to the common type for `LowCardinality` types. This allows to execute UNION ALL of tables with columns of LowCardinality and other columns. This fixes [#8212](https://github.com/ClickHouse/ClickHouse/issues/8212). This fixes [#4342](https://github.com/ClickHouse/ClickHouse/issues/4342). [#12275](https://github.com/ClickHouse/ClickHouse/pull/12275) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed the behaviour when during multiple sequential inserts in `StorageFile` header for some special types was written more than once. This fixed [#6155](https://github.com/ClickHouse/ClickHouse/issues/6155). [#12197](https://github.com/ClickHouse/ClickHouse/pull/12197) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fixed logical functions for UInt8 values when they are not equal to 0 or 1. [#12196](https://github.com/ClickHouse/ClickHouse/pull/12196) ([Alexander Kazakov](https://github.com/Akazz)).
+* Cap max_memory_usage* limits to the process resident memory. [#12182](https://github.com/ClickHouse/ClickHouse/pull/12182) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed `dictGet` arguments check during GROUP BY injective functions elimination. [#12179](https://github.com/ClickHouse/ClickHouse/pull/12179) ([Azat Khuzhin](https://github.com/azat)).
+* Don't split the dictionary source's table name into schema and table name itself if ODBC connection doesn't support schema. [#12165](https://github.com/ClickHouse/ClickHouse/pull/12165) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fixed wrong logic in `ALTER DELETE` that leads to deleting of records when condition evaluates to NULL. This fixes [#9088](https://github.com/ClickHouse/ClickHouse/issues/9088). This closes [#12106](https://github.com/ClickHouse/ClickHouse/issues/12106). [#12153](https://github.com/ClickHouse/ClickHouse/pull/12153) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed transform of query to send to external DBMS (e.g. MySQL, ODBC) in presense of aliases. This fixes [#12032](https://github.com/ClickHouse/ClickHouse/issues/12032). [#12151](https://github.com/ClickHouse/ClickHouse/pull/12151) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed potential overflow in integer division. This fixes [#12119](https://github.com/ClickHouse/ClickHouse/issues/12119). [#12140](https://github.com/ClickHouse/ClickHouse/pull/12140) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed potential infinite loop in `greatCircleDistance`, `geoDistance`. This fixes [#12117](https://github.com/ClickHouse/ClickHouse/issues/12117). [#12137](https://github.com/ClickHouse/ClickHouse/pull/12137) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Normalize "pid" file handling. In previous versions the server may refuse to start if it was killed without proper shutdown and if there is another process that has the same pid as previously runned server. Also pid file may be removed in unsuccessful server startup even if there is another server running. This fixes [#3501](https://github.com/ClickHouse/ClickHouse/issues/3501). [#12133](https://github.com/ClickHouse/ClickHouse/pull/12133) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed handling dependency of table with ENGINE=Dictionary on dictionary. This fixes [#10994](https://github.com/ClickHouse/ClickHouse/issues/10994). This fixes [#10397](https://github.com/ClickHouse/ClickHouse/issues/10397). [#12116](https://github.com/ClickHouse/ClickHouse/pull/12116) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fixed performance for selects with `UNION` caused by wrong limit for the total number of threads. Fixes [#12030](https://github.com/ClickHouse/ClickHouse/issues/12030). [#12103](https://github.com/ClickHouse/ClickHouse/pull/12103) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed segfault with `-StateResample` combinators. [#12092](https://github.com/ClickHouse/ClickHouse/pull/12092) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed empty `result_rows` and `result_bytes` metrics in `system.quey_log` for selects. Fixes [#11595](https://github.com/ClickHouse/ClickHouse/issues/11595). [#12089](https://github.com/ClickHouse/ClickHouse/pull/12089) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed unnecessary limiting the number of threads for selects from `VIEW`. Fixes [#11937](https://github.com/ClickHouse/ClickHouse/issues/11937). [#12085](https://github.com/ClickHouse/ClickHouse/pull/12085) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed possible crash while using wrong type for `PREWHERE`. Fixes [#12053](https://github.com/ClickHouse/ClickHouse/issues/12053), [#12060](https://github.com/ClickHouse/ClickHouse/issues/12060). [#12060](https://github.com/ClickHouse/ClickHouse/pull/12060) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed error `Expected single dictionary argument for function` for function `defaultValueOfArgumentType` with `LowCardinality` type. Fixes [#11808](https://github.com/ClickHouse/ClickHouse/issues/11808). [#12056](https://github.com/ClickHouse/ClickHouse/pull/12056) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed error `Cannot capture column` for higher-order functions with `Tuple(LowCardinality)` argument. Fixes [#9766](https://github.com/ClickHouse/ClickHouse/issues/9766). [#12055](https://github.com/ClickHouse/ClickHouse/pull/12055) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Parse tables metadata in parallel when loading database. This fixes slow server startup when there are large number of tables. [#12045](https://github.com/ClickHouse/ClickHouse/pull/12045) ([tavplubix](https://github.com/tavplubix)).
+* Make `topK` aggregate function return Enum for Enum types. This fixes [#3740](https://github.com/ClickHouse/ClickHouse/issues/3740). [#12043](https://github.com/ClickHouse/ClickHouse/pull/12043) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed constraints check if constraint is a constant expression. This fixes [#11360](https://github.com/ClickHouse/ClickHouse/issues/11360). [#12042](https://github.com/ClickHouse/ClickHouse/pull/12042) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed incorrect comparison of tuples with `Nullable` columns. Fixes [#11985](https://github.com/ClickHouse/ClickHouse/issues/11985). [#12039](https://github.com/ClickHouse/ClickHouse/pull/12039) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed calculation of access rights when allow_introspection_functions=0. [#12031](https://github.com/ClickHouse/ClickHouse/pull/12031) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fixed wrong result and potential crash when invoking function `if` with arguments of type `FixedString` with different sizes. This fixes [#11362](https://github.com/ClickHouse/ClickHouse/issues/11362). [#12021](https://github.com/ClickHouse/ClickHouse/pull/12021) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* A query with function `neighbor` as the only returned expression may return empty result if the function is called with offset `-9223372036854775808`. This fixes [#11367](https://github.com/ClickHouse/ClickHouse/issues/11367). [#12019](https://github.com/ClickHouse/ClickHouse/pull/12019) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed calculation of access rights when allow_ddl=0. [#12015](https://github.com/ClickHouse/ClickHouse/pull/12015) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fixed potential array size overflow in generateRandom that may lead to crash. This fixes [#11371](https://github.com/ClickHouse/ClickHouse/issues/11371). [#12013](https://github.com/ClickHouse/ClickHouse/pull/12013) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed potential floating point exception. This closes [#11378](https://github.com/ClickHouse/ClickHouse/issues/11378). [#12005](https://github.com/ClickHouse/ClickHouse/pull/12005) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed wrong setting name in log message at server startup. [#11997](https://github.com/ClickHouse/ClickHouse/pull/11997) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed `Query parameter was not set` in `Values` format. Fixes [#11918](https://github.com/ClickHouse/ClickHouse/issues/11918). [#11936](https://github.com/ClickHouse/ClickHouse/pull/11936) ([tavplubix](https://github.com/tavplubix)).
+* Keep aliases for substitutions in query (parametrized queries). This fixes [#11914](https://github.com/ClickHouse/ClickHouse/issues/11914). [#11916](https://github.com/ClickHouse/ClickHouse/pull/11916) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed bug with no moves when changing storage policy from default one. [#11893](https://github.com/ClickHouse/ClickHouse/pull/11893) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Fixed potential floating point exception when parsing `DateTime64`. This fixes [#11374](https://github.com/ClickHouse/ClickHouse/issues/11374). [#11875](https://github.com/ClickHouse/ClickHouse/pull/11875) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed memory accounting via HTTP interface (can be significant with `wait_end_of_query=1`). [#11840](https://github.com/ClickHouse/ClickHouse/pull/11840) ([Azat Khuzhin](https://github.com/azat)).
+* Parse metadata stored in zookeeper before checking for equality. [#11739](https://github.com/ClickHouse/ClickHouse/pull/11739) ([Azat Khuzhin](https://github.com/azat)).
+
+#### Performance Improvement
+
+* Index not used for IN operator with literals, performance regression introduced around v19.3. This fixes [#10574](https://github.com/ClickHouse/ClickHouse/issues/10574). [#12062](https://github.com/ClickHouse/ClickHouse/pull/12062) ([nvartolomei](https://github.com/nvartolomei)).
+
+#### Build/Testing/Packaging Improvement
+
+* Install `ca-certificates` before the first `apt-get update` in Dockerfile. [#12095](https://github.com/ClickHouse/ClickHouse/pull/12095) ([Ivan Blinkov](https://github.com/blinkov)).
+
+
+### ClickHouse release v20.4.6.53-stable 2020-06-25
+
+#### Bug Fix
+
+* Fix rare crash caused by using `Nullable` column in prewhere condition. Continuation of [#11608](https://github.com/ClickHouse/ClickHouse/issues/11608). [#11869](https://github.com/ClickHouse/ClickHouse/pull/11869) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Don't allow arrayJoin inside higher order functions. It was leading to broken protocol synchronization. This closes [#3933](https://github.com/ClickHouse/ClickHouse/issues/3933). [#11846](https://github.com/ClickHouse/ClickHouse/pull/11846) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix wrong result of comparison of FixedString with constant String. This fixes [#11393](https://github.com/ClickHouse/ClickHouse/issues/11393). This bug appeared in version 20.4. [#11828](https://github.com/ClickHouse/ClickHouse/pull/11828) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix wrong result for `if()` with NULLs in condition. [#11807](https://github.com/ClickHouse/ClickHouse/pull/11807) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix using too many threads for queries. [#11788](https://github.com/ClickHouse/ClickHouse/pull/11788) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix unexpected behaviour of queries like `SELECT *, xyz.*` which were success while an error expected. [#11753](https://github.com/ClickHouse/ClickHouse/pull/11753) ([hexiaoting](https://github.com/hexiaoting)).
+* Now replicated fetches will be cancelled during metadata alter. [#11744](https://github.com/ClickHouse/ClickHouse/pull/11744) ([alesapin](https://github.com/alesapin)).
+* Fixed LOGICAL_ERROR caused by wrong type deduction of complex literals in Values input format. [#11732](https://github.com/ClickHouse/ClickHouse/pull/11732) ([tavplubix](https://github.com/tavplubix)).
+* Fix `ORDER BY ... WITH FILL` over const columns. [#11697](https://github.com/ClickHouse/ClickHouse/pull/11697) ([Anton Popov](https://github.com/CurtizJ)).
+* Pass proper timeouts when communicating with XDBC bridge. Recently timeouts were not respected when checking bridge liveness and receiving meta info. [#11690](https://github.com/ClickHouse/ClickHouse/pull/11690) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix `LIMIT n WITH TIES` usage together with `ORDER BY` statement, which contains aliases. [#11689](https://github.com/ClickHouse/ClickHouse/pull/11689) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix error which leads to an incorrect state of `system.mutations`. It may show that whole mutation is already done but the server still has `MUTATE_PART` tasks in the replication queue and tries to execute them. This fixes [#11611](https://github.com/ClickHouse/ClickHouse/issues/11611). [#11681](https://github.com/ClickHouse/ClickHouse/pull/11681) ([alesapin](https://github.com/alesapin)).
+* Add support for regular expressions with case-insensitive flags. This fixes [#11101](https://github.com/ClickHouse/ClickHouse/issues/11101) and fixes [#11506](https://github.com/ClickHouse/ClickHouse/issues/11506). [#11649](https://github.com/ClickHouse/ClickHouse/pull/11649) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Remove trivial count query optimization if row-level security is set. In previous versions the user get total count of records in a table instead filtered. This fixes [#11352](https://github.com/ClickHouse/ClickHouse/issues/11352). [#11644](https://github.com/ClickHouse/ClickHouse/pull/11644) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix bloom filters for String (data skipping indices). [#11638](https://github.com/ClickHouse/ClickHouse/pull/11638) ([Azat Khuzhin](https://github.com/azat)).
+* Fix rare crash caused by using `Nullable` column in prewhere condition. (Probably it is connected with [#11572](https://github.com/ClickHouse/ClickHouse/issues/11572) somehow). [#11608](https://github.com/ClickHouse/ClickHouse/pull/11608) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix error `Block structure mismatch` for queries with sampling reading from `Buffer` table. [#11602](https://github.com/ClickHouse/ClickHouse/pull/11602) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix wrong exit code of the clickhouse-client, when exception.code() % 256 = 0. [#11601](https://github.com/ClickHouse/ClickHouse/pull/11601) ([filimonov](https://github.com/filimonov)).
+* Fix trivial error in log message about "Mark cache size was lowered" at server startup. This closes [#11399](https://github.com/ClickHouse/ClickHouse/issues/11399). [#11589](https://github.com/ClickHouse/ClickHouse/pull/11589) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix error `Size of offsets doesn't match size of column` for queries with `PREWHERE column in (subquery)` and `ARRAY JOIN`. [#11580](https://github.com/ClickHouse/ClickHouse/pull/11580) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed rare segfault in `SHOW CREATE TABLE` Fixes [#11490](https://github.com/ClickHouse/ClickHouse/issues/11490). [#11579](https://github.com/ClickHouse/ClickHouse/pull/11579) ([tavplubix](https://github.com/tavplubix)).
+* All queries in HTTP session have had the same query_id. It is fixed. [#11578](https://github.com/ClickHouse/ClickHouse/pull/11578) ([tavplubix](https://github.com/tavplubix)).
+* Now clickhouse-server docker container will prefer IPv6 checking server aliveness. [#11550](https://github.com/ClickHouse/ClickHouse/pull/11550) ([Ivan Starkov](https://github.com/istarkov)).
+* Fix shard_num/replica_num for `<node>` (breaks use_compact_format_in_distributed_parts_names). [#11528](https://github.com/ClickHouse/ClickHouse/pull/11528) ([Azat Khuzhin](https://github.com/azat)).
+* Fix race condition which may lead to an exception during table drop. It's a bit tricky and not dangerous at all. If you want an explanation, just notice me in telegram. [#11523](https://github.com/ClickHouse/ClickHouse/pull/11523) ([alesapin](https://github.com/alesapin)).
+* Fix memory leak when exception is thrown in the middle of aggregation with -State functions. This fixes [#8995](https://github.com/ClickHouse/ClickHouse/issues/8995). [#11496](https://github.com/ClickHouse/ClickHouse/pull/11496) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* If data skipping index is dependent on columns that are going to be modified during background merge (for SummingMergeTree, AggregatingMergeTree as well as for TTL GROUP BY), it was calculated incorrectly. This issue is fixed by moving index calculation after merge so the index is calculated on merged data. [#11162](https://github.com/ClickHouse/ClickHouse/pull/11162) ([Azat Khuzhin](https://github.com/azat)).
+* Get rid of old libunwind patches. https://github.com/ClickHouse-Extras/libunwind/commit/500aa227911bd185a94bfc071d68f4d3b03cb3b1#r39048012 This allows to disable `-fno-omit-frame-pointer` in `clang` builds that improves performance at least by 1% in average. [#10761](https://github.com/ClickHouse/ClickHouse/pull/10761) ([Amos Bird](https://github.com/amosbird)).
+* Fix usage of primary key wrapped into a function with 'FINAL' modifier and 'ORDER BY' optimization. [#10715](https://github.com/ClickHouse/ClickHouse/pull/10715) ([Anton Popov](https://github.com/CurtizJ)).
+
+#### Build/Testing/Packaging Improvement
+
+* Fix several non significant errors in unit tests. [#11262](https://github.com/ClickHouse/ClickHouse/pull/11262) ([alesapin](https://github.com/alesapin)).
+* Fix (false) MSan report in MergeTreeIndexFullText. The issue first appeared in [#9968](https://github.com/ClickHouse/ClickHouse/issues/9968). [#10801](https://github.com/ClickHouse/ClickHouse/pull/10801) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+
+
+### ClickHouse release v20.4.5.36-stable 2020-06-10
+
+#### Bug Fix
+
+* Fix the error `Data compressed with different methods` that can happen if `min_bytes_to_use_direct_io` is enabled and PREWHERE is active and using SAMPLE or high number of threads. This fixes [#11539](https://github.com/ClickHouse/ClickHouse/issues/11539). [#11540](https://github.com/ClickHouse/ClickHouse/pull/11540) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix return compressed size for codecs. [#11448](https://github.com/ClickHouse/ClickHouse/pull/11448) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix server crash when a column has compression codec with non-literal arguments. Fixes [#11365](https://github.com/ClickHouse/ClickHouse/issues/11365). [#11431](https://github.com/ClickHouse/ClickHouse/pull/11431) ([alesapin](https://github.com/alesapin)).
+* Fix pointInPolygon with nan as point. Fixes [#11375](https://github.com/ClickHouse/ClickHouse/issues/11375). [#11421](https://github.com/ClickHouse/ClickHouse/pull/11421) ([Alexey Ilyukhov](https://github.com/livace)).
+* Fix potential uninitialized memory read in MergeTree shutdown if table was not created successfully. [#11420](https://github.com/ClickHouse/ClickHouse/pull/11420) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed geohashesInBox with arguments outside of latitude/longitude range. [#11403](https://github.com/ClickHouse/ClickHouse/pull/11403) ([Vasily Nemkov](https://github.com/Enmk)).
+* Fix possible `Pipeline stuck` error for queries with external sort and limit. Fixes [#11359](https://github.com/ClickHouse/ClickHouse/issues/11359). [#11366](https://github.com/ClickHouse/ClickHouse/pull/11366) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Remove redundant lock during parts send in ReplicatedMergeTree. [#11354](https://github.com/ClickHouse/ClickHouse/pull/11354) ([alesapin](https://github.com/alesapin)).
+* Fix support for `\G` (vertical output) in clickhouse-client in multiline mode. This closes [#9933](https://github.com/ClickHouse/ClickHouse/issues/9933). [#11350](https://github.com/ClickHouse/ClickHouse/pull/11350) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix potential segfault when using `Lazy` database. [#11348](https://github.com/ClickHouse/ClickHouse/pull/11348) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix crash in `quantilesExactWeightedArray`. [#11337](https://github.com/ClickHouse/ClickHouse/pull/11337) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Now merges stopped before change metadata in `ALTER` queries. [#11335](https://github.com/ClickHouse/ClickHouse/pull/11335) ([alesapin](https://github.com/alesapin)).
+* Make writing to `MATERIALIZED VIEW` with setting `parallel_view_processing = 1` parallel again. Fixes [#10241](https://github.com/ClickHouse/ClickHouse/issues/10241). [#11330](https://github.com/ClickHouse/ClickHouse/pull/11330) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix visitParamExtractRaw when extracted JSON has strings with unbalanced { or [. [#11318](https://github.com/ClickHouse/ClickHouse/pull/11318) ([Ewout](https://github.com/devwout)).
+* Fix very rare race condition in ThreadPool. [#11314](https://github.com/ClickHouse/ClickHouse/pull/11314) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix insignificant data race in clickhouse-copier. Found by integration tests. [#11313](https://github.com/ClickHouse/ClickHouse/pull/11313) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix potential uninitialized memory in conversion. Example: `SELECT toIntervalSecond(now64())`. [#11311](https://github.com/ClickHouse/ClickHouse/pull/11311) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix the issue when index analysis cannot work if a table has Array column in primary key and if a query is filtering by this column with `empty` or `notEmpty` functions. This fixes [#11286](https://github.com/ClickHouse/ClickHouse/issues/11286). [#11303](https://github.com/ClickHouse/ClickHouse/pull/11303) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix bug when query speed estimation can be incorrect and the limit of `min_execution_speed` may not work or work incorrectly if the query is throttled by `max_network_bandwidth`, `max_execution_speed` or `priority` settings. Change the default value of `timeout_before_checking_execution_speed` to non-zero, because otherwise the settings `min_execution_speed` and `max_execution_speed` have no effect. This fixes [#11297](https://github.com/ClickHouse/ClickHouse/issues/11297). This fixes [#5732](https://github.com/ClickHouse/ClickHouse/issues/5732). This fixes [#6228](https://github.com/ClickHouse/ClickHouse/issues/6228). Usability improvement: avoid concatenation of exception message with progress bar in `clickhouse-client`. [#11296](https://github.com/ClickHouse/ClickHouse/pull/11296) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix crash when SET DEFAULT ROLE is called with wrong arguments. This fixes [#10586](https://github.com/ClickHouse/ClickHouse/issues/10586). [#11278](https://github.com/ClickHouse/ClickHouse/pull/11278) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix crash while reading malformed data in Protobuf format. This fixes [#5957](https://github.com/ClickHouse/ClickHouse/issues/5957), fixes [#11203](https://github.com/ClickHouse/ClickHouse/issues/11203). [#11258](https://github.com/ClickHouse/ClickHouse/pull/11258) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fixed a bug when cache-dictionary could return default value instead of normal (when there are only expired keys). This affects only string fields. [#11233](https://github.com/ClickHouse/ClickHouse/pull/11233) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fix error `Block structure mismatch in QueryPipeline` while reading from `VIEW` with constants in inner query. Fixes [#11181](https://github.com/ClickHouse/ClickHouse/issues/11181). [#11205](https://github.com/ClickHouse/ClickHouse/pull/11205) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix possible exception `Invalid status for associated output`. [#11200](https://github.com/ClickHouse/ClickHouse/pull/11200) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix possible error `Cannot capture column` for higher-order functions with `Array(Array(LowCardinality))` captured argument. [#11185](https://github.com/ClickHouse/ClickHouse/pull/11185) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed S3 globbing which could fail in case of more than 1000 keys and some backends. [#11179](https://github.com/ClickHouse/ClickHouse/pull/11179) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* If data skipping index is dependent on columns that are going to be modified during background merge (for SummingMergeTree, AggregatingMergeTree as well as for TTL GROUP BY), it was calculated incorrectly. This issue is fixed by moving index calculation after merge so the index is calculated on merged data. [#11162](https://github.com/ClickHouse/ClickHouse/pull/11162) ([Azat Khuzhin](https://github.com/azat)).
+* Fix Kafka performance issue related to reschedules based on limits, which were always applied. [#11149](https://github.com/ClickHouse/ClickHouse/pull/11149) ([filimonov](https://github.com/filimonov)).
+* Fix for the hang which was happening sometimes during DROP of table engine=Kafka (or during server restarts). [#11145](https://github.com/ClickHouse/ClickHouse/pull/11145) ([filimonov](https://github.com/filimonov)).
+* Fix excessive reserving of threads for simple queries (optimization for reducing the number of threads, which was partly broken after changes in pipeline). [#11114](https://github.com/ClickHouse/ClickHouse/pull/11114) ([Azat Khuzhin](https://github.com/azat)).
+* Fix predicates optimization for distributed queries (`enable_optimize_predicate_expression=1`) for queries with `HAVING` section (i.e. when filtering on the server initiator is required), by preserving the order of expressions (and this is enough to fix), and also force aggregator use column names over indexes. Fixes: [#10613](https://github.com/ClickHouse/ClickHouse/issues/10613), [#11413](https://github.com/ClickHouse/ClickHouse/issues/11413). [#10621](https://github.com/ClickHouse/ClickHouse/pull/10621) ([Azat Khuzhin](https://github.com/azat)).
+
+#### Build/Testing/Packaging Improvement
+
+* Fix several flaky integration tests. [#11355](https://github.com/ClickHouse/ClickHouse/pull/11355) ([alesapin](https://github.com/alesapin)).
+
+### ClickHouse release v20.4.4.18-stable 2020-05-26
+
+No changes compared to v20.4.3.16-stable.
+
+### ClickHouse release v20.4.3.16-stable 2020-05-23
+
+#### Bug Fix
+
+* Removed logging from mutation finalization task if nothing was finalized. [#11109](https://github.com/ClickHouse/ClickHouse/pull/11109) ([alesapin](https://github.com/alesapin)).
+* Fixed memory leak in registerDiskS3. [#11074](https://github.com/ClickHouse/ClickHouse/pull/11074) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Fixed the potential missed data during termination of Kafka engine table. [#11048](https://github.com/ClickHouse/ClickHouse/pull/11048) ([filimonov](https://github.com/filimonov)).
+* Fixed `parseDateTime64BestEffort` argument resolution bugs. [#11038](https://github.com/ClickHouse/ClickHouse/pull/11038) ([Vasily Nemkov](https://github.com/Enmk)).
+* Fixed very rare potential use-after-free error in `MergeTree` if table was not created successfully. [#10986](https://github.com/ClickHouse/ClickHouse/pull/10986), [#10970](https://github.com/ClickHouse/ClickHouse/pull/10970) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed metadata (relative path for rename) and data (relative path for symlink) handling for Atomic database. [#10980](https://github.com/ClickHouse/ClickHouse/pull/10980) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed server crash on concurrent `ALTER` and `DROP DATABASE` queries with `Atomic` database engine. [#10968](https://github.com/ClickHouse/ClickHouse/pull/10968) ([tavplubix](https://github.com/tavplubix)).
+* Fixed incorrect raw data size in `getRawData()` method. [#10964](https://github.com/ClickHouse/ClickHouse/pull/10964) ([Igr](https://github.com/ObjatieGroba)).
+* Fixed incompatibility of two-level aggregation between versions 20.1 and earlier. This incompatibility happens when different versions of ClickHouse are used on initiator node and remote nodes and the size of GROUP BY result is large and aggregation is performed by a single String field. It leads to several unmerged rows for a single key in result. [#10952](https://github.com/ClickHouse/ClickHouse/pull/10952) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed sending partially written files by the `DistributedBlockOutputStream`. [#10940](https://github.com/ClickHouse/ClickHouse/pull/10940) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed crash in `SELECT count(notNullIn(NULL, []))`. [#10920](https://github.com/ClickHouse/ClickHouse/pull/10920) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed the hang which was happening sometimes during `DROP` of `Kafka` table engine. (or during server restarts). [#10910](https://github.com/ClickHouse/ClickHouse/pull/10910) ([filimonov](https://github.com/filimonov)).
+* Fixed the impossibility of executing multiple `ALTER RENAME` like `a TO b, c TO a`. [#10895](https://github.com/ClickHouse/ClickHouse/pull/10895) ([alesapin](https://github.com/alesapin)).
+* Fixed possible race which could happen when you get result from aggregate function state from multiple thread for the same column. The only way it can happen is when you use `finalizeAggregation` function while reading from table with `Memory` engine which stores `AggregateFunction` state for `quantile*` function. [#10890](https://github.com/ClickHouse/ClickHouse/pull/10890) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed backward compatibility with tuples in Distributed tables. [#10889](https://github.com/ClickHouse/ClickHouse/pull/10889) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed `SIGSEGV` in `StringHashTable` if such a key does not exist. [#10870](https://github.com/ClickHouse/ClickHouse/pull/10870) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed `WATCH` hangs after `LiveView` table was dropped from database with `Atomic` engine. [#10859](https://github.com/ClickHouse/ClickHouse/pull/10859) ([tavplubix](https://github.com/tavplubix)).
+* Fixed bug in `ReplicatedMergeTree` which might cause some `ALTER` on `OPTIMIZE` query to hang waiting for some replica after it become inactive. [#10849](https://github.com/ClickHouse/ClickHouse/pull/10849) ([tavplubix](https://github.com/tavplubix)).
+* Now constraints are updated if the column participating in `CONSTRAINT` expression was renamed. Fixes [#10844](https://github.com/ClickHouse/ClickHouse/issues/10844). [#10847](https://github.com/ClickHouse/ClickHouse/pull/10847) ([alesapin](https://github.com/alesapin)).
+* Fixed potential read of uninitialized memory in cache-dictionary. [#10834](https://github.com/ClickHouse/ClickHouse/pull/10834) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed columns order after `Block::sortColumns()`. [#10826](https://github.com/ClickHouse/ClickHouse/pull/10826) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed the issue with `ODBC` bridge when no quoting of identifiers is requested. Fixes [#7984](https://github.com/ClickHouse/ClickHouse/issues/7984). [#10821](https://github.com/ClickHouse/ClickHouse/pull/10821) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed `UBSan` and `MSan` report in `DateLUT`. [#10798](https://github.com/ClickHouse/ClickHouse/pull/10798) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed incorrect type conversion in key conditions. Fixes [#6287](https://github.com/ClickHouse/ClickHouse/issues/6287). [#10791](https://github.com/ClickHouse/ClickHouse/pull/10791) ([Andrew Onyshchuk](https://github.com/oandrew)).
+* Fixed `parallel_view_processing` behavior. Now all insertions into `MATERIALIZED VIEW` without exception should be finished if exception happened. Fixes [#10241](https://github.com/ClickHouse/ClickHouse/issues/10241). [#10757](https://github.com/ClickHouse/ClickHouse/pull/10757) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed combinator `-OrNull` and `-OrDefault` when combined with `-State`. [#10741](https://github.com/ClickHouse/ClickHouse/pull/10741) ([hcz](https://github.com/hczhcz)).
+* Fixed possible buffer overflow in function `h3EdgeAngle`. [#10711](https://github.com/ClickHouse/ClickHouse/pull/10711) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed bug which locks concurrent alters when table has a lot of parts. [#10659](https://github.com/ClickHouse/ClickHouse/pull/10659) ([alesapin](https://github.com/alesapin)).
+* Fixed `nullptr` dereference in `StorageBuffer` if server was shutdown before table startup. [#10641](https://github.com/ClickHouse/ClickHouse/pull/10641) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed `optimize_skip_unused_shards` with `LowCardinality`. [#10611](https://github.com/ClickHouse/ClickHouse/pull/10611) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed handling condition variable for synchronous mutations. In some cases signals to that condition variable could be lost. [#10588](https://github.com/ClickHouse/ClickHouse/pull/10588) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Fixed possible crash when `createDictionary()` is called before `loadStoredObject()` has finished. [#10587](https://github.com/ClickHouse/ClickHouse/pull/10587) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fixed `SELECT` of column `ALIAS` which default expression type different from column type. [#10563](https://github.com/ClickHouse/ClickHouse/pull/10563) ([Azat Khuzhin](https://github.com/azat)).
+* Implemented comparison between DateTime64 and String values. [#10560](https://github.com/ClickHouse/ClickHouse/pull/10560) ([Vasily Nemkov](https://github.com/Enmk)).
+* Disable `GROUP BY` sharding_key optimization by default (`optimize_distributed_group_by_sharding_key` had been introduced and turned of by default, due to trickery of sharding_key analyzing, simple example is `if` in sharding key) and fix it for `WITH ROLLUP/CUBE/TOTALS`. [#10516](https://github.com/ClickHouse/ClickHouse/pull/10516) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed [#10263](https://github.com/ClickHouse/ClickHouse/issues/10263). [#10486](https://github.com/ClickHouse/ClickHouse/pull/10486) ([Azat Khuzhin](https://github.com/azat)).
+* Added tests about `max_rows_to_sort` setting. [#10268](https://github.com/ClickHouse/ClickHouse/pull/10268) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Added backward compatibility for create bloom filter index. [#10551](https://github.com/ClickHouse/ClickHouse/issues/10551). [#10569](https://github.com/ClickHouse/ClickHouse/pull/10569) ([Winter Zhang](https://github.com/zhang2014)).
+
+### ClickHouse release v20.4.2.9, 2020-05-12
+
+#### Backward Incompatible Change
+* System tables (e.g. system.query_log, system.trace_log, system.metric_log) are using compact data part format for parts smaller than 10 MiB in size. Compact data part format is supported since version 20.3. If you are going to downgrade to version less than 20.3, you should manually delete table data for system logs in `/var/lib/clickhouse/data/system/`.
+* When string comparison involves FixedString and compared arguments are of different sizes, do comparison as if smaller string is padded to the length of the larger. This is intented for SQL compatibility if we imagine that FixedString data type corresponds to SQL CHAR. This closes [#9272](https://github.com/ClickHouse/ClickHouse/issues/9272). [#10363](https://github.com/ClickHouse/ClickHouse/pull/10363) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Make SHOW CREATE TABLE multiline. Now it is more readable and more like MySQL. [#10049](https://github.com/ClickHouse/ClickHouse/pull/10049) ([Azat Khuzhin](https://github.com/azat))
+* Added a setting `validate_polygons` that is used in `pointInPolygon` function and enabled by default. [#9857](https://github.com/ClickHouse/ClickHouse/pull/9857) ([alexey-milovidov](https://github.com/alexey-milovidov))
+
+#### New Feature
+* Add support for secured connection from ClickHouse to Zookeeper [#10184](https://github.com/ClickHouse/ClickHouse/pull/10184) ([Konstantin Lebedev](https://github.com/xzkostyan))
+* Support custom HTTP handlers. See [#5436](https://github.com/ClickHouse/ClickHouse/issues/5436) for description. [#7572](https://github.com/ClickHouse/ClickHouse/pull/7572) ([Winter Zhang](https://github.com/zhang2014))
+* Add MessagePack Input/Output format. [#9889](https://github.com/ClickHouse/ClickHouse/pull/9889) ([Kruglov Pavel](https://github.com/Avogar))
+* Add Regexp input format. [#9196](https://github.com/ClickHouse/ClickHouse/pull/9196) ([Kruglov Pavel](https://github.com/Avogar))
+* Added output format `Markdown` for embedding tables in markdown documents. [#10317](https://github.com/ClickHouse/ClickHouse/pull/10317) ([Kruglov Pavel](https://github.com/Avogar))
+* Added support for custom settings section in dictionaries. Also fixes issue [#2829](https://github.com/ClickHouse/ClickHouse/issues/2829). [#10137](https://github.com/ClickHouse/ClickHouse/pull/10137) ([Artem Streltsov](https://github.com/kekekekule))
+* Added custom settings support in DDL-queries for `CREATE DICTIONARY` [#10465](https://github.com/ClickHouse/ClickHouse/pull/10465) ([Artem Streltsov](https://github.com/kekekekule))
+* Add simple server-wide memory profiler that will collect allocation contexts when server memory usage becomes higher than the next allocation threshold. [#10444](https://github.com/ClickHouse/ClickHouse/pull/10444) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Add setting `always_fetch_merged_part` which restrict replica to merge parts by itself and always prefer dowloading from other replicas. [#10379](https://github.com/ClickHouse/ClickHouse/pull/10379) ([alesapin](https://github.com/alesapin))
+* Add function `JSONExtractKeysAndValuesRaw` which extracts raw data from JSON objects [#10378](https://github.com/ClickHouse/ClickHouse/pull/10378) ([hcz](https://github.com/hczhcz))
+* Add memory usage from OS to `system.asynchronous_metrics`. [#10361](https://github.com/ClickHouse/ClickHouse/pull/10361) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Added generic variants for functions `least` and `greatest`. Now they work with arbitrary number of arguments of arbitrary types. This fixes [#4767](https://github.com/ClickHouse/ClickHouse/issues/4767) [#10318](https://github.com/ClickHouse/ClickHouse/pull/10318) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Now ClickHouse controls timeouts of dictionary sources on its side. Two new settings added to cache dictionary configuration: `strict_max_lifetime_seconds`, which is `max_lifetime` by default, and `query_wait_timeout_milliseconds`, which is one minute by default. The first settings is also useful with `allow_read_expired_keys` settings (to forbid reading very expired keys). [#10337](https://github.com/ClickHouse/ClickHouse/pull/10337) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
+* Add log_queries_min_type to filter which entries will be written to query_log [#10053](https://github.com/ClickHouse/ClickHouse/pull/10053) ([Azat Khuzhin](https://github.com/azat))
+* Added function `isConstant`. This function checks whether its argument is constant expression and returns 1 or 0. It is intended for development, debugging and demonstration purposes. [#10198](https://github.com/ClickHouse/ClickHouse/pull/10198) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* add joinGetOrNull to return NULL when key is missing instead of returning the default value. [#10094](https://github.com/ClickHouse/ClickHouse/pull/10094) ([Amos Bird](https://github.com/amosbird))
+* Consider `NULL` to be equal to `NULL` in `IN` operator, if the option `transform_null_in` is set. [#10085](https://github.com/ClickHouse/ClickHouse/pull/10085) ([achimbab](https://github.com/achimbab))
+* Add `ALTER TABLE ... RENAME COLUMN` for MergeTree table engines family. [#9948](https://github.com/ClickHouse/ClickHouse/pull/9948) ([alesapin](https://github.com/alesapin))
+* Support parallel distributed INSERT SELECT. [#9759](https://github.com/ClickHouse/ClickHouse/pull/9759) ([vxider](https://github.com/Vxider))
+* Add ability to query Distributed over Distributed (w/o `distributed_group_by_no_merge`) ... [#9923](https://github.com/ClickHouse/ClickHouse/pull/9923) ([Azat Khuzhin](https://github.com/azat))
+* Add function `arrayReduceInRanges` which aggregates array elements in given ranges. [#9598](https://github.com/ClickHouse/ClickHouse/pull/9598) ([hcz](https://github.com/hczhcz))
+* Add Dictionary Status on prometheus exporter. [#9622](https://github.com/ClickHouse/ClickHouse/pull/9622) ([Guillaume Tassery](https://github.com/YiuRULE))
+* Add function `arrayAUC` [#8698](https://github.com/ClickHouse/ClickHouse/pull/8698) ([taiyang-li](https://github.com/taiyang-li))
+* Support `DROP VIEW` statement for better TPC-H compatibility. [#9831](https://github.com/ClickHouse/ClickHouse/pull/9831) ([Amos Bird](https://github.com/amosbird))
+* Add 'strict_order' option to windowFunnel() [#9773](https://github.com/ClickHouse/ClickHouse/pull/9773) ([achimbab](https://github.com/achimbab))
+* Support `DATE` and `TIMESTAMP` SQL operators, e.g. `SELECT date '2001-01-01'` [#9691](https://github.com/ClickHouse/ClickHouse/pull/9691) ([Artem Zuikov](https://github.com/4ertus2))
+
+#### Experimental Feature
+* Added experimental database engine Atomic. It supports non-blocking `DROP` and `RENAME TABLE` queries and atomic `EXCHANGE TABLES t1 AND t2` query [#7512](https://github.com/ClickHouse/ClickHouse/pull/7512) ([tavplubix](https://github.com/tavplubix))
+* Initial support for ReplicatedMergeTree over S3 (it works in suboptimal way) [#10126](https://github.com/ClickHouse/ClickHouse/pull/10126) ([Pavel Kovalenko](https://github.com/Jokser))
+
+#### Bug Fix
+* Fixed incorrect scalar results inside inner query of `MATERIALIZED VIEW` in case if this query contained dependent table [#10603](https://github.com/ClickHouse/ClickHouse/pull/10603) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fixed bug, which caused HTTP requests to get stuck on client closing connection when `readonly=2` and `cancel_http_readonly_queries_on_client_close=1`. [#10684](https://github.com/ClickHouse/ClickHouse/pull/10684) ([tavplubix](https://github.com/tavplubix))
+* Fix segfault in StorageBuffer when exception is thrown on server startup. Fixes [#10550](https://github.com/ClickHouse/ClickHouse/issues/10550) [#10609](https://github.com/ClickHouse/ClickHouse/pull/10609) ([tavplubix](https://github.com/tavplubix))
+* The query`SYSTEM DROP DNS CACHE` now also drops caches used to check if user is allowed to connect from some IP addresses [#10608](https://github.com/ClickHouse/ClickHouse/pull/10608) ([tavplubix](https://github.com/tavplubix))
+* Fix usage of multiple `IN` operators with an identical set in one query. Fixes [#10539](https://github.com/ClickHouse/ClickHouse/issues/10539) [#10686](https://github.com/ClickHouse/ClickHouse/pull/10686) ([Anton Popov](https://github.com/CurtizJ))
+* Fix crash in `generateRandom` with nested types. Fixes [#10583](https://github.com/ClickHouse/ClickHouse/issues/10583). [#10734](https://github.com/ClickHouse/ClickHouse/pull/10734) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fix data corruption for `LowCardinality(FixedString)` key column in `SummingMergeTree` which could have happened after merge. Fixes [#10489](https://github.com/ClickHouse/ClickHouse/issues/10489). [#10721](https://github.com/ClickHouse/ClickHouse/pull/10721) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fix logic for aggregation_memory_efficient_merge_threads setting. [#10667](https://github.com/ClickHouse/ClickHouse/pull/10667) ([palasonic1](https://github.com/palasonic1))
+* Fix disappearing totals. Totals could have being filtered if query had `JOIN` or subquery with external `WHERE` condition. Fixes [#10674](https://github.com/ClickHouse/ClickHouse/issues/10674) [#10698](https://github.com/ClickHouse/ClickHouse/pull/10698) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fix the lack of parallel execution of remote queries with `distributed_aggregation_memory_efficient` enabled. Fixes [#10655](https://github.com/ClickHouse/ClickHouse/issues/10655) [#10664](https://github.com/ClickHouse/ClickHouse/pull/10664) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fix possible incorrect number of rows for queries with `LIMIT`. Fixes [#10566](https://github.com/ClickHouse/ClickHouse/issues/10566), [#10709](https://github.com/ClickHouse/ClickHouse/issues/10709) [#10660](https://github.com/ClickHouse/ClickHouse/pull/10660) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fix index corruption, which may occur in some cases after merging compact parts into another compact part. [#10531](https://github.com/ClickHouse/ClickHouse/pull/10531) ([Anton Popov](https://github.com/CurtizJ))
+* Fix the situation, when mutation finished all parts, but hung up in `is_done=0`. [#10526](https://github.com/ClickHouse/ClickHouse/pull/10526) ([alesapin](https://github.com/alesapin))
+* Fix overflow at beginning of unix epoch for timezones with fractional offset from UTC. Fixes [#9335](https://github.com/ClickHouse/ClickHouse/issues/9335). [#10513](https://github.com/ClickHouse/ClickHouse/pull/10513) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Better diagnostics for input formats. Fixes [#10204](https://github.com/ClickHouse/ClickHouse/issues/10204) [#10418](https://github.com/ClickHouse/ClickHouse/pull/10418) ([tavplubix](https://github.com/tavplubix))
+* Fix numeric overflow in `simpleLinearRegression()` over large integers [#10474](https://github.com/ClickHouse/ClickHouse/pull/10474) ([hcz](https://github.com/hczhcz))
+* Fix use-after-free in Distributed shutdown, avoid waiting for sending all batches [#10491](https://github.com/ClickHouse/ClickHouse/pull/10491) ([Azat Khuzhin](https://github.com/azat))
+* Add CA certificates to clickhouse-server docker image [#10476](https://github.com/ClickHouse/ClickHouse/pull/10476) ([filimonov](https://github.com/filimonov))
+* Fix a rare endless loop that might have occurred when using the `addressToLine` function or AggregateFunctionState columns. [#10466](https://github.com/ClickHouse/ClickHouse/pull/10466) ([Alexander Kuzmenkov](https://github.com/akuzm))
+* Handle zookeeper "no node error" during distributed query [#10050](https://github.com/ClickHouse/ClickHouse/pull/10050) ([Daniel Chen](https://github.com/Phantomape))
+* Fix bug when server cannot attach table after column's default was altered. [#10441](https://github.com/ClickHouse/ClickHouse/pull/10441) ([alesapin](https://github.com/alesapin))
+* Implicitly cast the default expression type to the column type for the ALIAS columns [#10563](https://github.com/ClickHouse/ClickHouse/pull/10563) ([Azat Khuzhin](https://github.com/azat))
+* Don't remove metadata directory if `ATTACH DATABASE` fails [#10442](https://github.com/ClickHouse/ClickHouse/pull/10442) ([Winter Zhang](https://github.com/zhang2014))
+* Avoid dependency on system tzdata. Fixes loading of `Africa/Casablanca` timezone on CentOS 8. Fixes [#10211](https://github.com/ClickHouse/ClickHouse/issues/10211) [#10425](https://github.com/ClickHouse/ClickHouse/pull/10425) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix some issues if data is inserted with quorum and then gets deleted (DROP PARTITION, TTL, etc.). It led to stuck of INSERTs or false-positive exceptions in SELECTs. Fixes [#9946](https://github.com/ClickHouse/ClickHouse/issues/9946) [#10188](https://github.com/ClickHouse/ClickHouse/pull/10188) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
+* Check the number and type of arguments when creating BloomFilter index [#9623](https://github.com/ClickHouse/ClickHouse/issues/9623) [#10431](https://github.com/ClickHouse/ClickHouse/pull/10431) ([Winter Zhang](https://github.com/zhang2014))
+* Prefer `fallback_to_stale_replicas` over `skip_unavailable_shards`, otherwise when both settings specified and there are no up-to-date replicas the query will fail (patch from @alex-zaitsev ) [#10422](https://github.com/ClickHouse/ClickHouse/pull/10422) ([Azat Khuzhin](https://github.com/azat))
+* Fix the issue when a query with ARRAY JOIN, ORDER BY and LIMIT may return incomplete result. Fixes [#10226](https://github.com/ClickHouse/ClickHouse/issues/10226). [#10427](https://github.com/ClickHouse/ClickHouse/pull/10427) ([Vadim Plakhtinskiy](https://github.com/VadimPlh))
+* Add database name to dictionary name after DETACH/ATTACH. Fixes system.dictionaries table and `SYSTEM RELOAD` query [#10415](https://github.com/ClickHouse/ClickHouse/pull/10415) ([Azat Khuzhin](https://github.com/azat))
+* Fix possible incorrect result for extremes in processors pipeline. [#10131](https://github.com/ClickHouse/ClickHouse/pull/10131) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fix possible segfault when the setting `distributed_group_by_no_merge` is enabled (introduced in 20.3.7.46 by [#10131](https://github.com/ClickHouse/ClickHouse/issues/10131)). [#10399](https://github.com/ClickHouse/ClickHouse/pull/10399) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fix wrong flattening of `Array(Tuple(...))` data types. Fixes [#10259](https://github.com/ClickHouse/ClickHouse/issues/10259) [#10390](https://github.com/ClickHouse/ClickHouse/pull/10390) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix column names of constants inside JOIN that may clash with names of constants outside of JOIN [#9950](https://github.com/ClickHouse/ClickHouse/pull/9950) ([Alexander Kuzmenkov](https://github.com/akuzm))
+* Fix order of columns after Block::sortColumns() [#10826](https://github.com/ClickHouse/ClickHouse/pull/10826) ([Azat Khuzhin](https://github.com/azat))
+* Fix possible `Pipeline stuck` error in `ConcatProcessor` which may happen in remote query. [#10381](https://github.com/ClickHouse/ClickHouse/pull/10381) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Don't make disk reservations for aggregations. Fixes [#9241](https://github.com/ClickHouse/ClickHouse/issues/9241) [#10375](https://github.com/ClickHouse/ClickHouse/pull/10375) ([Azat Khuzhin](https://github.com/azat))
+* Fix wrong behaviour of datetime functions for timezones that has altered between positive and negative offsets from UTC (e.g. Pacific/Kiritimati). Fixes [#7202](https://github.com/ClickHouse/ClickHouse/issues/7202) [#10369](https://github.com/ClickHouse/ClickHouse/pull/10369) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Avoid infinite loop in `dictIsIn` function. Fixes #515 [#10365](https://github.com/ClickHouse/ClickHouse/pull/10365) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Disable GROUP BY sharding_key optimization by default and fix it for WITH ROLLUP/CUBE/TOTALS [#10516](https://github.com/ClickHouse/ClickHouse/pull/10516) ([Azat Khuzhin](https://github.com/azat))
+* Check for error code when checking parts and don't mark part as broken if the error is like "not enough memory". Fixes [#6269](https://github.com/ClickHouse/ClickHouse/issues/6269) [#10364](https://github.com/ClickHouse/ClickHouse/pull/10364) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Show information about not loaded dictionaries in system tables. [#10234](https://github.com/ClickHouse/ClickHouse/pull/10234) ([Vitaly Baranov](https://github.com/vitlibar))
+* Fix nullptr dereference in StorageBuffer if server was shutdown before table startup. [#10641](https://github.com/ClickHouse/ClickHouse/pull/10641) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fixed `DROP` vs `OPTIMIZE` race in `ReplicatedMergeTree`. `DROP` could left some garbage in replica path in ZooKeeper if there was concurrent `OPTIMIZE` query. [#10312](https://github.com/ClickHouse/ClickHouse/pull/10312) ([tavplubix](https://github.com/tavplubix))
+* Fix 'Logical error: CROSS JOIN has expressions' error for queries with comma and names joins mix. Fixes [#9910](https://github.com/ClickHouse/ClickHouse/issues/9910) [#10311](https://github.com/ClickHouse/ClickHouse/pull/10311) ([Artem Zuikov](https://github.com/4ertus2))
+* Fix queries with `max_bytes_before_external_group_by`. [#10302](https://github.com/ClickHouse/ClickHouse/pull/10302) ([Artem Zuikov](https://github.com/4ertus2))
+* Fix the issue with limiting maximum recursion depth in parser in certain cases. This fixes [#10283](https://github.com/ClickHouse/ClickHouse/issues/10283) This fix may introduce minor incompatibility: long and deep queries via clickhouse-client may refuse to work, and you should adjust settings `max_query_size` and `max_parser_depth` accordingly. [#10295](https://github.com/ClickHouse/ClickHouse/pull/10295) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Allow to use `count(*)` with multiple JOINs. Fixes [#9853](https://github.com/ClickHouse/ClickHouse/issues/9853) [#10291](https://github.com/ClickHouse/ClickHouse/pull/10291) ([Artem Zuikov](https://github.com/4ertus2))
+* Fix error `Pipeline stuck` with `max_rows_to_group_by` and `group_by_overflow_mode = 'break'`. [#10279](https://github.com/ClickHouse/ClickHouse/pull/10279) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fix 'Cannot add column' error while creating `range_hashed` dictionary using DDL query. Fixes [#10093](https://github.com/ClickHouse/ClickHouse/issues/10093). [#10235](https://github.com/ClickHouse/ClickHouse/pull/10235) ([alesapin](https://github.com/alesapin))
+* Fix rare possible exception `Cannot drain connections: cancel first`. [#10239](https://github.com/ClickHouse/ClickHouse/pull/10239) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fixed bug where ClickHouse would throw "Unknown function lambda." error message when user tries to run ALTER UPDATE/DELETE on tables with ENGINE = Replicated*. Check for nondeterministic functions now handles lambda expressions correctly. [#10237](https://github.com/ClickHouse/ClickHouse/pull/10237) ([Alexander Kazakov](https://github.com/Akazz))
+* Fixed reasonably rare segfault in StorageSystemTables that happens when SELECT ... FROM system.tables is run on a database with Lazy engine. [#10209](https://github.com/ClickHouse/ClickHouse/pull/10209) ([Alexander Kazakov](https://github.com/Akazz))
+* Fix possible infinite query execution when the query actually should stop on LIMIT, while reading from infinite source like `system.numbers` or `system.zeros`. [#10206](https://github.com/ClickHouse/ClickHouse/pull/10206) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fixed "generateRandom" function for Date type. This fixes [#9973](https://github.com/ClickHouse/ClickHouse/issues/9973). Fix an edge case when dates with year 2106 are inserted to MergeTree tables with old-style partitioning but partitions are named with year 1970. [#10218](https://github.com/ClickHouse/ClickHouse/pull/10218) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Convert types if the table definition of a View does not correspond to the SELECT query. This fixes [#10180](https://github.com/ClickHouse/ClickHouse/issues/10180) and [#10022](https://github.com/ClickHouse/ClickHouse/issues/10022) [#10217](https://github.com/ClickHouse/ClickHouse/pull/10217) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix `parseDateTimeBestEffort` for strings in RFC-2822 when day of week is Tuesday or Thursday. This fixes [#10082](https://github.com/ClickHouse/ClickHouse/issues/10082) [#10214](https://github.com/ClickHouse/ClickHouse/pull/10214) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix column names of constants inside JOIN that may clash with names of constants outside of JOIN. [#10207](https://github.com/ClickHouse/ClickHouse/pull/10207) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix move-to-prewhere optimization in presense of arrayJoin functions (in certain cases). This fixes [#10092](https://github.com/ClickHouse/ClickHouse/issues/10092) [#10195](https://github.com/ClickHouse/ClickHouse/pull/10195) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix issue with separator appearing in SCRAMBLE for native mysql-connector-java (JDBC) [#10140](https://github.com/ClickHouse/ClickHouse/pull/10140) ([BohuTANG](https://github.com/BohuTANG))
+* Fix using the current database for an access checking when the database isn't specified. [#10192](https://github.com/ClickHouse/ClickHouse/pull/10192) ([Vitaly Baranov](https://github.com/vitlibar))
+* Fix ALTER of tables with compact parts. [#10130](https://github.com/ClickHouse/ClickHouse/pull/10130) ([Anton Popov](https://github.com/CurtizJ))
+* Add the ability to relax the restriction on non-deterministic functions usage in mutations with `allow_nondeterministic_mutations` setting. [#10186](https://github.com/ClickHouse/ClickHouse/pull/10186) ([filimonov](https://github.com/filimonov))
+* Fix `DROP TABLE` invoked for dictionary [#10165](https://github.com/ClickHouse/ClickHouse/pull/10165) ([Azat Khuzhin](https://github.com/azat))
+* Convert blocks if structure does not match when doing `INSERT` into Distributed table [#10135](https://github.com/ClickHouse/ClickHouse/pull/10135) ([Azat Khuzhin](https://github.com/azat))
+* The number of rows was logged incorrectly (as sum across all parts) when inserted block is split by parts with partition key. [#10138](https://github.com/ClickHouse/ClickHouse/pull/10138) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Add some arguments check and support identifier arguments for MySQL Database Engine [#10077](https://github.com/ClickHouse/ClickHouse/pull/10077) ([Winter Zhang](https://github.com/zhang2014))
+* Fix incorrect `index_granularity_bytes` check while creating new replica. Fixes [#10098](https://github.com/ClickHouse/ClickHouse/issues/10098). [#10121](https://github.com/ClickHouse/ClickHouse/pull/10121) ([alesapin](https://github.com/alesapin))
+* Fix bug in `CHECK TABLE` query when table contain skip indices. [#10068](https://github.com/ClickHouse/ClickHouse/pull/10068) ([alesapin](https://github.com/alesapin))
+* Fix Distributed-over-Distributed with the only one shard in a nested table [#9997](https://github.com/ClickHouse/ClickHouse/pull/9997) ([Azat Khuzhin](https://github.com/azat))
+* Fix possible rows loss for queries with `JOIN` and `UNION ALL`. Fixes [#9826](https://github.com/ClickHouse/ClickHouse/issues/9826), [#10113](https://github.com/ClickHouse/ClickHouse/issues/10113). ... [#10099](https://github.com/ClickHouse/ClickHouse/pull/10099) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fix bug in dictionary when local clickhouse server is used as source. It may caused memory corruption if types in dictionary and source are not compatible. [#10071](https://github.com/ClickHouse/ClickHouse/pull/10071) ([alesapin](https://github.com/alesapin))
+* Fixed replicated tables startup when updating from an old ClickHouse version where `/table/replicas/replica_name/metadata` node doesn't exist. Fixes [#10037](https://github.com/ClickHouse/ClickHouse/issues/10037). [#10095](https://github.com/ClickHouse/ClickHouse/pull/10095) ([alesapin](https://github.com/alesapin))
+* Fix error `Cannot clone block with columns because block has 0 columns ... While executing GroupingAggregatedTransform`. It happened when setting `distributed_aggregation_memory_efficient` was enabled, and distributed query read aggregating data with mixed single and two-level aggregation from different shards.  [#10063](https://github.com/ClickHouse/ClickHouse/pull/10063) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fix deadlock when database with materialized view failed attach at start [#10054](https://github.com/ClickHouse/ClickHouse/pull/10054) ([Azat Khuzhin](https://github.com/azat))
+* Fix a segmentation fault that could occur in GROUP BY over string keys containing trailing zero bytes ([#8636](https://github.com/ClickHouse/ClickHouse/issues/8636), [#8925](https://github.com/ClickHouse/ClickHouse/issues/8925)). ... [#10025](https://github.com/ClickHouse/ClickHouse/pull/10025) ([Alexander Kuzmenkov](https://github.com/akuzm))
+* Fix wrong results of distributed queries when alias could override qualified column name. Fixes [#9672](https://github.com/ClickHouse/ClickHouse/issues/9672) [#9714](https://github.com/ClickHouse/ClickHouse/issues/9714) [#9972](https://github.com/ClickHouse/ClickHouse/pull/9972) ([Artem Zuikov](https://github.com/4ertus2))
+* Fix possible deadlock in `SYSTEM RESTART REPLICAS` [#9955](https://github.com/ClickHouse/ClickHouse/pull/9955) ([tavplubix](https://github.com/tavplubix))
+* Fix the number of threads used for remote query execution (performance regression, since 20.3). This happened when query from `Distributed` table was executed simultaneously on local and remote shards. Fixes [#9965](https://github.com/ClickHouse/ClickHouse/issues/9965) [#9971](https://github.com/ClickHouse/ClickHouse/pull/9971) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fixed `DeleteOnDestroy` logic in `ATTACH PART` which could lead to automatic removal of attached part and added few tests [#9410](https://github.com/ClickHouse/ClickHouse/pull/9410) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Fix a bug with `ON CLUSTER` DDL queries freezing on server startup. [#9927](https://github.com/ClickHouse/ClickHouse/pull/9927) ([Gagan Arneja](https://github.com/garneja))
+* Fix bug in which the necessary tables weren't retrieved at one of the processing stages of queries to some databases. Fixes [#9699](https://github.com/ClickHouse/ClickHouse/issues/9699). [#9949](https://github.com/ClickHouse/ClickHouse/pull/9949) ([achulkov2](https://github.com/achulkov2))
+* Fix 'Not found column in block' error when `JOIN` appears with `TOTALS`. Fixes [#9839](https://github.com/ClickHouse/ClickHouse/issues/9839) [#9939](https://github.com/ClickHouse/ClickHouse/pull/9939) ([Artem Zuikov](https://github.com/4ertus2))
+* Fix parsing multiple hosts set in the CREATE USER command [#9924](https://github.com/ClickHouse/ClickHouse/pull/9924) ([Vitaly Baranov](https://github.com/vitlibar))
+* Fix `TRUNCATE` for Join table engine ([#9917](https://github.com/ClickHouse/ClickHouse/issues/9917)). [#9920](https://github.com/ClickHouse/ClickHouse/pull/9920) ([Amos Bird](https://github.com/amosbird))
+* Fix race condition between drop and optimize in `ReplicatedMergeTree`. [#9901](https://github.com/ClickHouse/ClickHouse/pull/9901) ([alesapin](https://github.com/alesapin))
+* Fix `DISTINCT` for Distributed when `optimize_skip_unused_shards` is set. [#9808](https://github.com/ClickHouse/ClickHouse/pull/9808) ([Azat Khuzhin](https://github.com/azat))
+* Fix "scalar doesn't exist" error in ALTERs ([#9878](https://github.com/ClickHouse/ClickHouse/issues/9878)). ... [#9904](https://github.com/ClickHouse/ClickHouse/pull/9904) ([Amos Bird](https://github.com/amosbird))
+* Fix error with qualified names in `distributed_product_mode=\'local\'`. Fixes [#4756](https://github.com/ClickHouse/ClickHouse/issues/4756) [#9891](https://github.com/ClickHouse/ClickHouse/pull/9891) ([Artem Zuikov](https://github.com/4ertus2))
+* For INSERT queries shards now do clamp the settings from the initiator to their constraints instead of throwing an exception. This fix allows to send INSERT queries to a shard with another constraints. This change improves fix [#9447](https://github.com/ClickHouse/ClickHouse/issues/9447). [#9852](https://github.com/ClickHouse/ClickHouse/pull/9852) ([Vitaly Baranov](https://github.com/vitlibar))
+* Add some retries when commiting offsets to Kafka broker, since it can reject commit if during `offsets.commit.timeout.ms` there were no enough replicas available for the `__consumer_offsets` topic [#9884](https://github.com/ClickHouse/ClickHouse/pull/9884) ([filimonov](https://github.com/filimonov))
+* Fix Distributed engine behavior when virtual columns of the underlying table used in `WHERE` [#9847](https://github.com/ClickHouse/ClickHouse/pull/9847) ([Azat Khuzhin](https://github.com/azat))
+* Fixed some cases when timezone of the function argument wasn't used properly. [#9574](https://github.com/ClickHouse/ClickHouse/pull/9574) ([Vasily Nemkov](https://github.com/Enmk))
+* Fix 'Different expressions with the same alias' error when query has PREWHERE and WHERE on distributed table and `SET distributed_product_mode = 'local'`. [#9871](https://github.com/ClickHouse/ClickHouse/pull/9871) ([Artem Zuikov](https://github.com/4ertus2))
+* Fix mutations excessive memory consumption for tables with a composite primary key. This fixes [#9850](https://github.com/ClickHouse/ClickHouse/issues/9850). [#9860](https://github.com/ClickHouse/ClickHouse/pull/9860) ([alesapin](https://github.com/alesapin))
+* Fix calculating grants for introspection functions from the setting `allow_introspection_functions`. [#9840](https://github.com/ClickHouse/ClickHouse/pull/9840) ([Vitaly Baranov](https://github.com/vitlibar))
+* Fix max_distributed_connections (w/ and w/o Processors) [#9673](https://github.com/ClickHouse/ClickHouse/pull/9673) ([Azat Khuzhin](https://github.com/azat))
+* Fix possible exception `Got 0 in totals chunk, expected 1` on client. It happened for queries with `JOIN` in case if right joined table had zero rows. Example: `select * from system.one t1 join system.one t2 on t1.dummy = t2.dummy limit 0 FORMAT TabSeparated;`. Fixes [#9777](https://github.com/ClickHouse/ClickHouse/issues/9777). ... [#9823](https://github.com/ClickHouse/ClickHouse/pull/9823) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fix 'COMMA to CROSS JOIN rewriter is not enabled or cannot rewrite query' error in case of subqueries with COMMA JOIN out of tables lists (i.e. in WHERE). Fixes [#9782](https://github.com/ClickHouse/ClickHouse/issues/9782) [#9830](https://github.com/ClickHouse/ClickHouse/pull/9830) ([Artem Zuikov](https://github.com/4ertus2))
+* Fix server crashing when `optimize_skip_unused_shards` is set and expression for key can't be converted to its field type [#9804](https://github.com/ClickHouse/ClickHouse/pull/9804) ([Azat Khuzhin](https://github.com/azat))
+* Fix empty string handling in `splitByString`. [#9767](https://github.com/ClickHouse/ClickHouse/pull/9767) ([hcz](https://github.com/hczhcz))
+* Fix broken `ALTER TABLE DELETE COLUMN` query for compact parts. [#9779](https://github.com/ClickHouse/ClickHouse/pull/9779) ([alesapin](https://github.com/alesapin))
+* Fixed missing `rows_before_limit_at_least` for queries over http (with processors pipeline). Fixes [#9730](https://github.com/ClickHouse/ClickHouse/issues/9730) [#9757](https://github.com/ClickHouse/ClickHouse/pull/9757) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fix excessive memory consumption in `ALTER` queries (mutations). This fixes [#9533](https://github.com/ClickHouse/ClickHouse/issues/9533) and [#9670](https://github.com/ClickHouse/ClickHouse/issues/9670). [#9754](https://github.com/ClickHouse/ClickHouse/pull/9754) ([alesapin](https://github.com/alesapin))
+* Fix possible permanent "Cannot schedule a task" error. [#9154](https://github.com/ClickHouse/ClickHouse/pull/9154) ([Azat Khuzhin](https://github.com/azat))
+* Fix bug in backquoting in external dictionaries DDL. Fixes [#9619](https://github.com/ClickHouse/ClickHouse/issues/9619). [#9734](https://github.com/ClickHouse/ClickHouse/pull/9734) ([alesapin](https://github.com/alesapin))
+* Fixed data race in `text_log`. It does not correspond to any real bug. [#9726](https://github.com/ClickHouse/ClickHouse/pull/9726) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix bug in a replication that doesn't allow replication to work if the user has executed mutations on the previous version. This fixes [#9645](https://github.com/ClickHouse/ClickHouse/issues/9645). [#9652](https://github.com/ClickHouse/ClickHouse/pull/9652) ([alesapin](https://github.com/alesapin))
+* Fixed incorrect internal function names for `sumKahan` and `sumWithOverflow`. It led to exception while using this functions in remote queries. [#9636](https://github.com/ClickHouse/ClickHouse/pull/9636) ([Azat Khuzhin](https://github.com/azat))
+* Add setting `use_compact_format_in_distributed_parts_names` which allows to write files for `INSERT` queries into `Distributed` table with more compact format. This fixes [#9647](https://github.com/ClickHouse/ClickHouse/issues/9647). [#9653](https://github.com/ClickHouse/ClickHouse/pull/9653) ([alesapin](https://github.com/alesapin))
+* Fix RIGHT and FULL JOIN with LowCardinality in JOIN keys. [#9610](https://github.com/ClickHouse/ClickHouse/pull/9610) ([Artem Zuikov](https://github.com/4ertus2))
+* Fix possible exceptions `Size of filter doesn't match size of column` and `Invalid number of rows in Chunk` in `MergeTreeRangeReader`. They could appear while executing `PREWHERE` in some cases. [#9612](https://github.com/ClickHouse/ClickHouse/pull/9612) ([Anton Popov](https://github.com/CurtizJ))
+* Allow `ALTER ON CLUSTER` of Distributed tables with internal replication. This fixes [#3268](https://github.com/ClickHouse/ClickHouse/issues/3268) [#9617](https://github.com/ClickHouse/ClickHouse/pull/9617) ([shinoi2](https://github.com/shinoi2))
+* Fix issue when timezone was not preserved if you write a simple arithmetic expression like `time + 1` (in contrast to an expression like `time + INTERVAL 1 SECOND`). This fixes [#5743](https://github.com/ClickHouse/ClickHouse/issues/5743) [#9323](https://github.com/ClickHouse/ClickHouse/pull/9323) ([alexey-milovidov](https://github.com/alexey-milovidov))
+
+#### Improvement
+* Use time zone when comparing DateTime with string literal. This fixes [#5206](https://github.com/ClickHouse/ClickHouse/issues/5206). [#10515](https://github.com/ClickHouse/ClickHouse/pull/10515) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Print verbose diagnostic info if Decimal value cannot be parsed from text input format. [#10205](https://github.com/ClickHouse/ClickHouse/pull/10205) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Add tasks/memory metrics for distributed/buffer schedule pools [#10449](https://github.com/ClickHouse/ClickHouse/pull/10449) ([Azat Khuzhin](https://github.com/azat))
+* Display result as soon as it's ready for SELECT DISTINCT queries in clickhouse-local and HTTP interface. This fixes [#8951](https://github.com/ClickHouse/ClickHouse/issues/8951) [#9559](https://github.com/ClickHouse/ClickHouse/pull/9559) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Allow to use `SAMPLE OFFSET` query instead of `cityHash64(PRIMARY KEY) % N == n` for splitting in `clickhouse-copier`. To use this feature, pass `--experimental-use-sample-offset 1` as a command line argument. [#10414](https://github.com/ClickHouse/ClickHouse/pull/10414) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
+* Allow to parse BOM in TSV if the first column cannot contain BOM in its value. This fixes [#10301](https://github.com/ClickHouse/ClickHouse/issues/10301) [#10424](https://github.com/ClickHouse/ClickHouse/pull/10424) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Add Avro nested fields insert support [#10354](https://github.com/ClickHouse/ClickHouse/pull/10354) ([Andrew Onyshchuk](https://github.com/oandrew))
+* Allowed to alter column in non-modifying data mode when the same type is specified. [#10382](https://github.com/ClickHouse/ClickHouse/pull/10382) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Auto `distributed_group_by_no_merge` on GROUP BY sharding key (if `optimize_skip_unused_shards` is set) [#10341](https://github.com/ClickHouse/ClickHouse/pull/10341) ([Azat Khuzhin](https://github.com/azat))
+* Optimize queries with LIMIT/LIMIT BY/ORDER BY for distributed with GROUP BY sharding_key [#10373](https://github.com/ClickHouse/ClickHouse/pull/10373) ([Azat Khuzhin](https://github.com/azat))
+* Added a setting `max_server_memory_usage` to limit total memory usage of the server. The metric `MemoryTracking` is now calculated without a drift. The setting `max_memory_usage_for_all_queries` is now obsolete and does nothing. This closes [#10293](https://github.com/ClickHouse/ClickHouse/issues/10293). [#10362](https://github.com/ClickHouse/ClickHouse/pull/10362) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Add config option `system_tables_lazy_load`. If it's set to false, then system tables with logs are loaded at the server startup. [Alexander Burmak](https://github.com/Alex-Burmak), [Svyatoslav Tkhon Il Pak](https://github.com/DeifyTheGod), [#9642](https://github.com/ClickHouse/ClickHouse/pull/9642) [#10359](https://github.com/ClickHouse/ClickHouse/pull/10359) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Use background thread pool (background_schedule_pool_size) for distributed sends [#10263](https://github.com/ClickHouse/ClickHouse/pull/10263) ([Azat Khuzhin](https://github.com/azat))
+* Use background thread pool for background buffer flushes. [#10315](https://github.com/ClickHouse/ClickHouse/pull/10315) ([Azat Khuzhin](https://github.com/azat))
+* Support for one special case of removing incompletely written parts. This fixes [#9940](https://github.com/ClickHouse/ClickHouse/issues/9940). [#10221](https://github.com/ClickHouse/ClickHouse/pull/10221) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Use isInjective() over manual list of such functions for GROUP BY optimization. [#10342](https://github.com/ClickHouse/ClickHouse/pull/10342) ([Azat Khuzhin](https://github.com/azat))
+* Avoid printing error message in log if client sends RST packet immediately on connect. It is typical behaviour of IPVS balancer with keepalived and VRRP. This fixes [#1851](https://github.com/ClickHouse/ClickHouse/issues/1851) [#10274](https://github.com/ClickHouse/ClickHouse/pull/10274) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Allow to parse `+inf` for floating point types. This closes [#1839](https://github.com/ClickHouse/ClickHouse/issues/1839) [#10272](https://github.com/ClickHouse/ClickHouse/pull/10272) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Implemented `generateRandom` table function for Nested types. This closes [#9903](https://github.com/ClickHouse/ClickHouse/issues/9903) [#10219](https://github.com/ClickHouse/ClickHouse/pull/10219) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Provide `max_allowed_packed` in MySQL compatibility interface that will help some clients to communicate with ClickHouse via MySQL protocol. [#10199](https://github.com/ClickHouse/ClickHouse/pull/10199) ([BohuTANG](https://github.com/BohuTANG))
+* Allow literals for GLOBAL IN (i.e. `SELECT * FROM remote('localhost', system.one) WHERE dummy global in (0)`) [#10196](https://github.com/ClickHouse/ClickHouse/pull/10196) ([Azat Khuzhin](https://github.com/azat))
+* Fix various small issues in interactive mode of clickhouse-client [#10194](https://github.com/ClickHouse/ClickHouse/pull/10194) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Avoid superfluous dictionaries load (system.tables, DROP/SHOW CREATE TABLE) [#10164](https://github.com/ClickHouse/ClickHouse/pull/10164) ([Azat Khuzhin](https://github.com/azat))
+* Update to RWLock: timeout parameter for getLock() + implementation reworked to be phase fair [#10073](https://github.com/ClickHouse/ClickHouse/pull/10073) ([Alexander Kazakov](https://github.com/Akazz))
+* Enhanced compatibility with native mysql-connector-java(JDBC) [#10021](https://github.com/ClickHouse/ClickHouse/pull/10021) ([BohuTANG](https://github.com/BohuTANG))
+* The function `toString` is considered monotonic and can be used for index analysis even when applied in tautological cases with String or LowCardinality(String) argument. [#10110](https://github.com/ClickHouse/ClickHouse/pull/10110) ([Amos Bird](https://github.com/amosbird))
+* Add `ON CLUSTER` clause support to commands `{CREATE|DROP} USER/ROLE/ROW POLICY/SETTINGS PROFILE/QUOTA`, `GRANT`. [#9811](https://github.com/ClickHouse/ClickHouse/pull/9811) ([Vitaly Baranov](https://github.com/vitlibar))
+* Virtual hosted-style support for S3 URI [#9998](https://github.com/ClickHouse/ClickHouse/pull/9998) ([Pavel Kovalenko](https://github.com/Jokser))
+* Now layout type for dictionaries with no arguments can be specified without round brackets in dictionaries DDL-queries. Fixes [#10057](https://github.com/ClickHouse/ClickHouse/issues/10057). [#10064](https://github.com/ClickHouse/ClickHouse/pull/10064) ([alesapin](https://github.com/alesapin))
+* Add ability to use number ranges with leading zeros in filepath [#9989](https://github.com/ClickHouse/ClickHouse/pull/9989) ([Olga Khvostikova](https://github.com/stavrolia))
+* Better memory usage in CROSS JOIN. [#10029](https://github.com/ClickHouse/ClickHouse/pull/10029) ([Artem Zuikov](https://github.com/4ertus2))
+* Try to connect to all shards in cluster when getting structure of remote table and skip_unavailable_shards is set. [#7278](https://github.com/ClickHouse/ClickHouse/pull/7278) ([nvartolomei](https://github.com/nvartolomei))
+* Add `total_rows`/`total_bytes` into the `system.tables` table. [#9919](https://github.com/ClickHouse/ClickHouse/pull/9919) ([Azat Khuzhin](https://github.com/azat))
+* System log tables now use polymorpic parts by default. [#9905](https://github.com/ClickHouse/ClickHouse/pull/9905) ([Anton Popov](https://github.com/CurtizJ))
+* Add type column into system.settings/merge_tree_settings [#9909](https://github.com/ClickHouse/ClickHouse/pull/9909) ([Azat Khuzhin](https://github.com/azat))
+* Check for available CPU instructions at server startup as early as possible. [#9888](https://github.com/ClickHouse/ClickHouse/pull/9888) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Remove `ORDER BY` stage from mutations because we read from a single ordered part in a single thread. Also add check that the rows in mutation are ordered by sorting key and this order is not violated. [#9886](https://github.com/ClickHouse/ClickHouse/pull/9886) ([alesapin](https://github.com/alesapin))
+* Implement operator LIKE for FixedString at left hand side. This is needed to better support TPC-DS queries. [#9890](https://github.com/ClickHouse/ClickHouse/pull/9890) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Add `force_optimize_skip_unused_shards_no_nested` that will disable `force_optimize_skip_unused_shards` for nested Distributed table [#9812](https://github.com/ClickHouse/ClickHouse/pull/9812) ([Azat Khuzhin](https://github.com/azat))
+* Now columns size is calculated only once for MergeTree data parts. [#9827](https://github.com/ClickHouse/ClickHouse/pull/9827) ([alesapin](https://github.com/alesapin))
+* Evaluate constant expressions for `optimize_skip_unused_shards` (i.e. `SELECT * FROM foo_dist WHERE key=xxHash32(0)`) [#8846](https://github.com/ClickHouse/ClickHouse/pull/8846) ([Azat Khuzhin](https://github.com/azat))
+* Check for using `Date` or `DateTime` column from TTL expressions was removed. [#9967](https://github.com/ClickHouse/ClickHouse/pull/9967) ([Vladimir Chebotarev](https://github.com/excitoon))
+* DiskS3 hard links optimal implementation. [#9760](https://github.com/ClickHouse/ClickHouse/pull/9760) ([Pavel Kovalenko](https://github.com/Jokser))
+* If `set multiple_joins_rewriter_version = 2` enables second version of multiple JOIN rewrites that keeps not clashed column names as is. It supports multiple JOINs with `USING` and allow `select *` for JOINs with subqueries. [#9739](https://github.com/ClickHouse/ClickHouse/pull/9739) ([Artem Zuikov](https://github.com/4ertus2))
+* Implementation of "non-blocking" alter for StorageMergeTree [#9606](https://github.com/ClickHouse/ClickHouse/pull/9606) ([alesapin](https://github.com/alesapin))
+* Add MergeTree full support for DiskS3 [#9646](https://github.com/ClickHouse/ClickHouse/pull/9646) ([Pavel Kovalenko](https://github.com/Jokser))
+* Extend `splitByString` to support empty strings as separators. [#9742](https://github.com/ClickHouse/ClickHouse/pull/9742) ([hcz](https://github.com/hczhcz))
+* Add a `timestamp_ns` column to `system.trace_log`. It contains a high-definition timestamp of the trace event, and allows to build timelines of thread profiles ("flame charts"). [#9696](https://github.com/ClickHouse/ClickHouse/pull/9696) ([Alexander Kuzmenkov](https://github.com/akuzm))
+* When the setting `send_logs_level` is enabled, avoid intermixing of log messages and query progress. [#9634](https://github.com/ClickHouse/ClickHouse/pull/9634) ([Azat Khuzhin](https://github.com/azat))
+* Added support of `MATERIALIZE TTL IN PARTITION`. [#9581](https://github.com/ClickHouse/ClickHouse/pull/9581) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Support complex types inside Avro nested fields [#10502](https://github.com/ClickHouse/ClickHouse/pull/10502) ([Andrew Onyshchuk](https://github.com/oandrew))
+
+#### Performance Improvement
+* Better insert logic for right table for Partial MergeJoin. [#10467](https://github.com/ClickHouse/ClickHouse/pull/10467) ([Artem Zuikov](https://github.com/4ertus2))
+* Improved performance of row-oriented formats (more than 10% for CSV and more than 35% for Avro in case of narrow tables). [#10503](https://github.com/ClickHouse/ClickHouse/pull/10503) ([Andrew Onyshchuk](https://github.com/oandrew))
+* Improved performance of queries with explicitly defined sets at right side of IN operator and tuples on the left side. [#10385](https://github.com/ClickHouse/ClickHouse/pull/10385) ([Anton Popov](https://github.com/CurtizJ))
+* Use less memory for hash table in HashJoin. [#10416](https://github.com/ClickHouse/ClickHouse/pull/10416) ([Artem Zuikov](https://github.com/4ertus2))
+* Special HashJoin over StorageDictionary. Allow rewrite `dictGet()` functions with JOINs. It's not backward incompatible itself but could uncover [#8400](https://github.com/ClickHouse/ClickHouse/issues/8400) on some installations. [#10133](https://github.com/ClickHouse/ClickHouse/pull/10133) ([Artem Zuikov](https://github.com/4ertus2))
+* Enable parallel insert of materialized view when its target table supports. [#10052](https://github.com/ClickHouse/ClickHouse/pull/10052) ([vxider](https://github.com/Vxider))
+* Improved performance of index analysis with monotonic functions. [#9607](https://github.com/ClickHouse/ClickHouse/pull/9607)[#10026](https://github.com/ClickHouse/ClickHouse/pull/10026) ([Anton Popov](https://github.com/CurtizJ))
+* Using SSE2 or SSE4.2 SIMD intrinsics to speed up tokenization in bloom filters. [#9968](https://github.com/ClickHouse/ClickHouse/pull/9968) ([Vasily Nemkov](https://github.com/Enmk))
+* Improved performance of queries with explicitly defined sets at right side of `IN` operator. This fixes performance regression in version 20.3. [#9740](https://github.com/ClickHouse/ClickHouse/pull/9740) ([Anton Popov](https://github.com/CurtizJ))
+* Now clickhouse-copier splits each partition in number of pieces and copies them independently. [#9075](https://github.com/ClickHouse/ClickHouse/pull/9075) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
+* Adding more aggregation methods. For example TPC-H query 1 will now pick `FixedHashMap<UInt16, AggregateDataPtr>` and gets 25% performance gain [#9829](https://github.com/ClickHouse/ClickHouse/pull/9829) ([Amos Bird](https://github.com/amosbird))
+* Use single row counter for multiple streams in pre-limit transform. This helps to avoid uniting pipeline streams in queries with `limit` but without `order by` (like `select f(x) from (select x from t limit 1000000000)`) and use multiple threads for further processing. [#9602](https://github.com/ClickHouse/ClickHouse/pull/9602) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+
+#### Build/Testing/Packaging Improvement
+* Use a fork of AWS SDK libraries from ClickHouse-Extras [#10527](https://github.com/ClickHouse/ClickHouse/pull/10527) ([Pavel Kovalenko](https://github.com/Jokser))
+* Add integration tests for new ALTER RENAME COLUMN query. [#10654](https://github.com/ClickHouse/ClickHouse/pull/10654) ([vzakaznikov](https://github.com/vzakaznikov))
+* Fix possible signed integer overflow in invocation of function `now64` with wrong arguments. This fixes [#8973](https://github.com/ClickHouse/ClickHouse/issues/8973) [#10511](https://github.com/ClickHouse/ClickHouse/pull/10511) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Split fuzzer and sanitizer configurations to make build config compatible with Oss-fuzz. [#10494](https://github.com/ClickHouse/ClickHouse/pull/10494) ([kyprizel](https://github.com/kyprizel))
+* Fixes for clang-tidy on clang-10. [#10420](https://github.com/ClickHouse/ClickHouse/pull/10420) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Display absolute paths in error messages. Otherwise KDevelop fails to navigate to correct file and opens a new file instead. [#10434](https://github.com/ClickHouse/ClickHouse/pull/10434) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Added `ASAN_OPTIONS` environment variable to investigate errors in CI stress tests with Address sanitizer. [#10440](https://github.com/ClickHouse/ClickHouse/pull/10440) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
+* Enable ThinLTO for clang builds (experimental). [#10435](https://github.com/ClickHouse/ClickHouse/pull/10435) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Remove accidential dependency on Z3 that may be introduced if the system has Z3 solver installed. [#10426](https://github.com/ClickHouse/ClickHouse/pull/10426) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Move integration tests docker files to docker/ directory. [#10335](https://github.com/ClickHouse/ClickHouse/pull/10335) ([Ilya Yatsishin](https://github.com/qoega))
+* Allow to use `clang-10` in CI. It ensures that [#10238](https://github.com/ClickHouse/ClickHouse/issues/10238) is fixed. [#10384](https://github.com/ClickHouse/ClickHouse/pull/10384) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Update OpenSSL to upstream master. Fixed the issue when TLS connections may fail with the message `OpenSSL SSL_read: error:14094438:SSL routines:ssl3_read_bytes:tlsv1 alert internal error` and `SSL Exception: error:2400006E:random number generator::error retrieving entropy`. The issue was present in version 20.1. [#8956](https://github.com/ClickHouse/ClickHouse/pull/8956) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix clang-10 build. [#10238](https://github.com/ClickHouse/ClickHouse/issues/10238) [#10370](https://github.com/ClickHouse/ClickHouse/pull/10370) ([Amos Bird](https://github.com/amosbird))
+* Add performance test for [Parallel INSERT for materialized view](https://github.com/ClickHouse/ClickHouse/pull/10052). [#10345](https://github.com/ClickHouse/ClickHouse/pull/10345) ([vxider](https://github.com/Vxider))
+* Fix flaky test `test_settings_constraints_distributed.test_insert_clamps_settings`. [#10346](https://github.com/ClickHouse/ClickHouse/pull/10346) ([Vitaly Baranov](https://github.com/vitlibar))
+* Add util to test results upload in CI ClickHouse [#10330](https://github.com/ClickHouse/ClickHouse/pull/10330) ([Ilya Yatsishin](https://github.com/qoega))
+* Convert test results to JSONEachRow format in junit_to_html tool [#10323](https://github.com/ClickHouse/ClickHouse/pull/10323) ([Ilya Yatsishin](https://github.com/qoega))
+* Update cctz. [#10215](https://github.com/ClickHouse/ClickHouse/pull/10215) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Allow to create HTML report from the purest JUnit XML report. [#10247](https://github.com/ClickHouse/ClickHouse/pull/10247) ([Ilya Yatsishin](https://github.com/qoega))
+* Update the check for minimal compiler version. Fix the root cause of the issue [#10250](https://github.com/ClickHouse/ClickHouse/issues/10250) [#10256](https://github.com/ClickHouse/ClickHouse/pull/10256) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Initial support for live view tables over distributed [#10179](https://github.com/ClickHouse/ClickHouse/pull/10179) ([vzakaznikov](https://github.com/vzakaznikov))
+* Fix (false) MSan report in MergeTreeIndexFullText. The issue first appeared in [#9968](https://github.com/ClickHouse/ClickHouse/issues/9968). [#10801](https://github.com/ClickHouse/ClickHouse/pull/10801) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* clickhouse-docker-util [#10151](https://github.com/ClickHouse/ClickHouse/pull/10151) ([filimonov](https://github.com/filimonov))
+* Update pdqsort to recent version [#10171](https://github.com/ClickHouse/ClickHouse/pull/10171) ([Ivan](https://github.com/abyss7))
+* Update libdivide to v3.0 [#10169](https://github.com/ClickHouse/ClickHouse/pull/10169) ([Ivan](https://github.com/abyss7))
+* Add check with enabled polymorphic parts. [#10086](https://github.com/ClickHouse/ClickHouse/pull/10086) ([Anton Popov](https://github.com/CurtizJ))
+* Add cross-compile build for FreeBSD. This fixes [#9465](https://github.com/ClickHouse/ClickHouse/issues/9465) [#9643](https://github.com/ClickHouse/ClickHouse/pull/9643) ([Ivan](https://github.com/abyss7))
+* Add performance test for [#6924](https://github.com/ClickHouse/ClickHouse/issues/6924) [#6980](https://github.com/ClickHouse/ClickHouse/pull/6980) ([filimonov](https://github.com/filimonov))
+* Add support of `/dev/null` in the `File` engine for better performance testing [#8455](https://github.com/ClickHouse/ClickHouse/pull/8455) ([Amos Bird](https://github.com/amosbird))
+* Move all folders inside /dbms one level up [#9974](https://github.com/ClickHouse/ClickHouse/pull/9974) ([Ivan](https://github.com/abyss7))
+* Add a test that checks that read from MergeTree with single thread is performed in order. Addition to [#9670](https://github.com/ClickHouse/ClickHouse/issues/9670) [#9762](https://github.com/ClickHouse/ClickHouse/pull/9762) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix the `00964_live_view_watch_events_heartbeat.py` test to avoid race condition. [#9944](https://github.com/ClickHouse/ClickHouse/pull/9944) ([vzakaznikov](https://github.com/vzakaznikov))
+* Fix integration test `test_settings_constraints` [#9962](https://github.com/ClickHouse/ClickHouse/pull/9962) ([Vitaly Baranov](https://github.com/vitlibar))
+* Every function in its own file, part 12. [#9922](https://github.com/ClickHouse/ClickHouse/pull/9922) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Added performance test for the case of extremely slow analysis of array of tuples. [#9872](https://github.com/ClickHouse/ClickHouse/pull/9872) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Update zstd to 1.4.4. It has some minor improvements in performance and compression ratio. If you run replicas with different versions of ClickHouse you may see reasonable error messages `Data after merge is not byte-identical to data on another replicas.` with explanation. These messages are Ok and you should not worry. [#10663](https://github.com/ClickHouse/ClickHouse/pull/10663) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix TSan report in `system.stack_trace`. [#9832](https://github.com/ClickHouse/ClickHouse/pull/9832) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Removed dependency on `clock_getres`. [#9833](https://github.com/ClickHouse/ClickHouse/pull/9833) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Added identifier names check with clang-tidy. [#9799](https://github.com/ClickHouse/ClickHouse/pull/9799) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Update "builder" docker image. This image is not used in CI but is useful for developers. [#9809](https://github.com/ClickHouse/ClickHouse/pull/9809) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Remove old `performance-test` tool that is no longer used in CI. `clickhouse-performance-test` is great but now we are using way superior tool that is doing comparison testing with sophisticated statistical formulas to achieve confident results regardless to various changes in environment. [#9796](https://github.com/ClickHouse/ClickHouse/pull/9796) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Added most of clang-static-analyzer checks. [#9765](https://github.com/ClickHouse/ClickHouse/pull/9765) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Update Poco to 1.9.3 in preparation for MongoDB URI support. [#6892](https://github.com/ClickHouse/ClickHouse/pull/6892) ([Alexander Kuzmenkov](https://github.com/akuzm))
+* Fix build with `-DUSE_STATIC_LIBRARIES=0 -DENABLE_JEMALLOC=0` [#9651](https://github.com/ClickHouse/ClickHouse/pull/9651) ([Artem Zuikov](https://github.com/4ertus2))
+* For change log script, if merge commit was cherry-picked to release branch, take PR name from commit description. [#9708](https://github.com/ClickHouse/ClickHouse/pull/9708) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Support `vX.X-conflicts` tag in backport script. [#9705](https://github.com/ClickHouse/ClickHouse/pull/9705) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fix `auto-label` for backporting script. [#9685](https://github.com/ClickHouse/ClickHouse/pull/9685) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Use libc++ in Darwin cross-build to make it consistent with native build. [#9665](https://github.com/ClickHouse/ClickHouse/pull/9665) ([Hui Wang](https://github.com/huiwang))
+* Fix flacky test `01017_uniqCombined_memory_usage`. Continuation of [#7236](https://github.com/ClickHouse/ClickHouse/issues/7236). [#9667](https://github.com/ClickHouse/ClickHouse/pull/9667) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix build for native MacOS Clang compiler [#9649](https://github.com/ClickHouse/ClickHouse/pull/9649) ([Ivan](https://github.com/abyss7))
+* Allow to add various glitches around `pthread_mutex_lock`, `pthread_mutex_unlock` functions. [#9635](https://github.com/ClickHouse/ClickHouse/pull/9635) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Add support for `clang-tidy` in `packager` script. [#9625](https://github.com/ClickHouse/ClickHouse/pull/9625) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Add ability to use unbundled msgpack. [#10168](https://github.com/ClickHouse/ClickHouse/pull/10168) ([Azat Khuzhin](https://github.com/azat))
+
+
+## ClickHouse release v20.3
+
+
+### ClickHouse release v20.3.21.2-lts, 2020-11-02
+
+#### Bug Fix
+
+* Fix dictGet in sharding_key (and similar places, i.e. when the function context is stored permanently). [#16205](https://github.com/ClickHouse/ClickHouse/pull/16205) ([Azat Khuzhin](https://github.com/azat)).
+* Fix incorrect empty result for query from `Distributed` table if query has `WHERE`, `PREWHERE` and `GLOBAL IN`. Fixes [#15792](https://github.com/ClickHouse/ClickHouse/issues/15792). [#15933](https://github.com/ClickHouse/ClickHouse/pull/15933) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix missing or excessive headers in `TSV/CSVWithNames` formats. This fixes [#12504](https://github.com/ClickHouse/ClickHouse/issues/12504). [#13343](https://github.com/ClickHouse/ClickHouse/pull/13343) ([Azat Khuzhin](https://github.com/azat)).
+
+
+### ClickHouse release v20.3.20.6-lts, 2020-10-09
+
+#### Bug Fix
+
+* Mutation might hang waiting for some non-existent part after `MOVE` or `REPLACE PARTITION` or, in rare cases, after `DETACH` or `DROP PARTITION`. It's fixed. [#15724](https://github.com/ClickHouse/ClickHouse/pull/15724), [#15537](https://github.com/ClickHouse/ClickHouse/pull/15537) ([tavplubix](https://github.com/tavplubix)).
+* Fix hang of queries with a lot of subqueries to same table of `MySQL` engine. Previously, if there were more than 16 subqueries to same `MySQL` table in query, it hang forever. [#15299](https://github.com/ClickHouse/ClickHouse/pull/15299) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix 'Unknown identifier' in GROUP BY when query has JOIN over Merge table. [#15242](https://github.com/ClickHouse/ClickHouse/pull/15242) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix to make predicate push down work when subquery contains finalizeAggregation function. Fixes [#14847](https://github.com/ClickHouse/ClickHouse/issues/14847). [#14937](https://github.com/ClickHouse/ClickHouse/pull/14937) ([filimonov](https://github.com/filimonov)).
+* Concurrent `ALTER ... REPLACE/MOVE PARTITION ...` queries might cause deadlock. It's fixed. [#13626](https://github.com/ClickHouse/ClickHouse/pull/13626) ([tavplubix](https://github.com/tavplubix)).
+
+
+### ClickHouse release v20.3.19.4-lts, 2020-09-18
+
+#### Bug Fix
+
+* Fix rare error in `SELECT` queries when the queried column has `DEFAULT` expression which depends on the other column which also has `DEFAULT` and not present in select query and not exists on disk. Partially fixes [#14531](https://github.com/ClickHouse/ClickHouse/issues/14531). [#14845](https://github.com/ClickHouse/ClickHouse/pull/14845) ([alesapin](https://github.com/alesapin)).
+* Fix bug when `ALTER UPDATE` mutation with Nullable column in assignment expression and constant value (like `UPDATE x = 42`) leads to incorrect value in column or segfault. Fixes [#13634](https://github.com/ClickHouse/ClickHouse/issues/13634), [#14045](https://github.com/ClickHouse/ClickHouse/issues/14045). [#14646](https://github.com/ClickHouse/ClickHouse/pull/14646) ([alesapin](https://github.com/alesapin)).
+* Fix wrong Decimal multiplication result caused wrong decimal scale of result column. [#14603](https://github.com/ClickHouse/ClickHouse/pull/14603) ([Artem Zuikov](https://github.com/4ertus2)).
+
+#### Improvement
+
+* Support custom codecs in compact parts. [#12183](https://github.com/ClickHouse/ClickHouse/pull/12183) ([Anton Popov](https://github.com/CurtizJ)).
+
+
+### ClickHouse release v20.3.18.10-lts, 2020-09-08
+
+#### Bug Fix
+
+* Stop query execution if exception happened in `PipelineExecutor` itself. This could prevent rare possible query hung. Continuation of [#14334](https://github.com/ClickHouse/ClickHouse/issues/14334). [#14402](https://github.com/ClickHouse/ClickHouse/pull/14402) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed the behaviour when sometimes cache-dictionary returned default value instead of present value from source. [#13624](https://github.com/ClickHouse/ClickHouse/pull/13624) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fix parsing row policies from users.xml when names of databases or tables contain dots. This fixes [#5779](https://github.com/ClickHouse/ClickHouse/issues/5779), [#12527](https://github.com/ClickHouse/ClickHouse/issues/12527). [#13199](https://github.com/ClickHouse/ClickHouse/pull/13199) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix CAST(Nullable(String), Enum()). [#12745](https://github.com/ClickHouse/ClickHouse/pull/12745) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed data race in `text_log`. It does not correspond to any real bug. [#9726](https://github.com/ClickHouse/ClickHouse/pull/9726) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+
+#### Improvement
+
+* Fix wrong error for long queries. It was possible to get syntax error other than `Max query size exceeded` for correct query. [#13928](https://github.com/ClickHouse/ClickHouse/pull/13928) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Return NULL/zero when value is not parsed completely in parseDateTimeBestEffortOrNull/Zero functions. This fixes [#7876](https://github.com/ClickHouse/ClickHouse/issues/7876). [#11653](https://github.com/ClickHouse/ClickHouse/pull/11653) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+
+#### Performance Improvement
+
+* Slightly optimize very short queries with LowCardinality. [#14129](https://github.com/ClickHouse/ClickHouse/pull/14129) ([Anton Popov](https://github.com/CurtizJ)).
+
+#### Build/Testing/Packaging Improvement
+
+* Fix UBSan report (adding zero to nullptr) in HashTable that appeared after migration to clang-10. [#10638](https://github.com/ClickHouse/ClickHouse/pull/10638) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+
+
+### ClickHouse release v20.3.17.173-lts, 2020-08-15
+
+#### Bug Fix
+
+* Fix crash in JOIN with StorageMerge and `set enable_optimize_predicate_expression=1`. [#13679](https://github.com/ClickHouse/ClickHouse/pull/13679) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix invalid return type for comparison of tuples with `NULL` elements. Fixes [#12461](https://github.com/ClickHouse/ClickHouse/issues/12461). [#13420](https://github.com/ClickHouse/ClickHouse/pull/13420) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix queries with constant columns and `ORDER BY` prefix of primary key. [#13396](https://github.com/ClickHouse/ClickHouse/pull/13396) ([Anton Popov](https://github.com/CurtizJ)).
+* Return passed number for numbers with MSB set in roundUpToPowerOfTwoOrZero(). [#13234](https://github.com/ClickHouse/ClickHouse/pull/13234) ([Azat Khuzhin](https://github.com/azat)).
+
+
+### ClickHouse release v20.3.16.165-lts 2020-08-10
+
+#### Bug Fix
+
+* Fixed error in `parseDateTimeBestEffort` function when unix timestamp was passed as an argument. This fixes [#13362](https://github.com/ClickHouse/ClickHouse/issues/13362). [#13441](https://github.com/ClickHouse/ClickHouse/pull/13441) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed potentially low performance and slightly incorrect result for `uniqExact`, `topK`, `sumDistinct` and similar aggregate functions called on Float types with `NaN` values. It also triggered assert in debug build. This fixes [#12491](https://github.com/ClickHouse/ClickHouse/issues/12491). [#13254](https://github.com/ClickHouse/ClickHouse/pull/13254) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed function if with nullable constexpr as cond that is not literal NULL. Fixes [#12463](https://github.com/ClickHouse/ClickHouse/issues/12463). [#13226](https://github.com/ClickHouse/ClickHouse/pull/13226) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed assert in `arrayElement` function in case of array elements are Nullable and array subscript is also Nullable. This fixes [#12172](https://github.com/ClickHouse/ClickHouse/issues/12172). [#13224](https://github.com/ClickHouse/ClickHouse/pull/13224) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed unnecessary limiting for the number of threads for selects from local replica. [#12840](https://github.com/ClickHouse/ClickHouse/pull/12840) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed possible extra overflow row in data which could appear for queries `WITH TOTALS`. [#12747](https://github.com/ClickHouse/ClickHouse/pull/12747) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed performance with large tuples, which are interpreted as functions in `IN` section. The case when user write `WHERE x IN tuple(1, 2, ...)` instead of `WHERE x IN (1, 2, ...)` for some obscure reason. [#12700](https://github.com/ClickHouse/ClickHouse/pull/12700) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed memory tracking for input_format_parallel_parsing (by attaching thread to group). [#12672](https://github.com/ClickHouse/ClickHouse/pull/12672) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed [#12293](https://github.com/ClickHouse/ClickHouse/issues/12293) allow push predicate when subquery contains with clause. [#12663](https://github.com/ClickHouse/ClickHouse/pull/12663) ([Winter Zhang](https://github.com/zhang2014)).
+* Fixed [#10572](https://github.com/ClickHouse/ClickHouse/issues/10572) fix bloom filter index with const expression. [#12659](https://github.com/ClickHouse/ClickHouse/pull/12659) ([Winter Zhang](https://github.com/zhang2014)).
+* Fixed SIGSEGV in StorageKafka when broker is unavailable (and not only). [#12658](https://github.com/ClickHouse/ClickHouse/pull/12658) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed race condition in external dictionaries with cache layout which can lead server crash. [#12566](https://github.com/ClickHouse/ClickHouse/pull/12566) ([alesapin](https://github.com/alesapin)).
+* Fixed bug which lead to broken old parts after `ALTER DELETE` query when `enable_mixed_granularity_parts=1`. Fixes [#12536](https://github.com/ClickHouse/ClickHouse/issues/12536). [#12543](https://github.com/ClickHouse/ClickHouse/pull/12543) ([alesapin](https://github.com/alesapin)).
+* Better exception for function `in` with invalid number of arguments. [#12529](https://github.com/ClickHouse/ClickHouse/pull/12529) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed performance issue, while reading from compact parts. [#12492](https://github.com/ClickHouse/ClickHouse/pull/12492) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed the deadlock if `text_log` is enabled. [#12452](https://github.com/ClickHouse/ClickHouse/pull/12452) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed possible segfault if StorageMerge. Closes [#12054](https://github.com/ClickHouse/ClickHouse/issues/12054). [#12401](https://github.com/ClickHouse/ClickHouse/pull/12401) ([tavplubix](https://github.com/tavplubix)).
+* Fixed `TOTALS/ROLLUP/CUBE` for aggregate functions with `-State` and `Nullable` arguments. This fixes [#12163](https://github.com/ClickHouse/ClickHouse/issues/12163). [#12376](https://github.com/ClickHouse/ClickHouse/pull/12376) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed order of columns in `WITH FILL` modifier. Previously order of columns of `ORDER BY` statement wasn't respected. [#12306](https://github.com/ClickHouse/ClickHouse/pull/12306) ([Anton Popov](https://github.com/CurtizJ)).
+* Avoid "bad cast" exception when there is an expression that filters data by virtual columns (like `_table` in `Merge` tables) or by "index" columns in system tables such as filtering by database name when querying from `system.tables`, and this expression returns `Nullable` type. This fixes [#12166](https://github.com/ClickHouse/ClickHouse/issues/12166). [#12305](https://github.com/ClickHouse/ClickHouse/pull/12305) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Show error after `TrieDictionary` failed to load. [#12290](https://github.com/ClickHouse/ClickHouse/pull/12290) ([Vitaly Baranov](https://github.com/vitlibar)).
+* The function `arrayFill` worked incorrectly for empty arrays that may lead to crash. This fixes [#12263](https://github.com/ClickHouse/ClickHouse/issues/12263). [#12279](https://github.com/ClickHouse/ClickHouse/pull/12279) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Implement conversions to the common type for `LowCardinality` types. This allows to execute UNION ALL of tables with columns of LowCardinality and other columns. This fixes [#8212](https://github.com/ClickHouse/ClickHouse/issues/8212). This fixes [#4342](https://github.com/ClickHouse/ClickHouse/issues/4342). [#12275](https://github.com/ClickHouse/ClickHouse/pull/12275) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed the behaviour when during multiple sequential inserts in `StorageFile` header for some special types was written more than once. This fixed [#6155](https://github.com/ClickHouse/ClickHouse/issues/6155). [#12197](https://github.com/ClickHouse/ClickHouse/pull/12197) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fixed logical functions for UInt8 values when they are not equal to 0 or 1. [#12196](https://github.com/ClickHouse/ClickHouse/pull/12196) ([Alexander Kazakov](https://github.com/Akazz)).
+* Fixed `dictGet` arguments check during GROUP BY injective functions elimination. [#12179](https://github.com/ClickHouse/ClickHouse/pull/12179) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed wrong logic in `ALTER DELETE` that leads to deleting of records when condition evaluates to NULL. This fixes [#9088](https://github.com/ClickHouse/ClickHouse/issues/9088). This closes [#12106](https://github.com/ClickHouse/ClickHouse/issues/12106). [#12153](https://github.com/ClickHouse/ClickHouse/pull/12153) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed transform of query to send to external DBMS (e.g. MySQL, ODBC) in presense of aliases. This fixes [#12032](https://github.com/ClickHouse/ClickHouse/issues/12032). [#12151](https://github.com/ClickHouse/ClickHouse/pull/12151) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed potential overflow in integer division. This fixes [#12119](https://github.com/ClickHouse/ClickHouse/issues/12119). [#12140](https://github.com/ClickHouse/ClickHouse/pull/12140) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed potential infinite loop in `greatCircleDistance`, `geoDistance`. This fixes [#12117](https://github.com/ClickHouse/ClickHouse/issues/12117). [#12137](https://github.com/ClickHouse/ClickHouse/pull/12137) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Avoid `There is no query` exception for materialized views with joins or with subqueries attached to system logs (system.query_log, metric_log, etc) or to engine=Buffer underlying table. [#12120](https://github.com/ClickHouse/ClickHouse/pull/12120) ([filimonov](https://github.com/filimonov)).
+* Fixed performance for selects with `UNION` caused by wrong limit for the total number of threads. Fixes [#12030](https://github.com/ClickHouse/ClickHouse/issues/12030). [#12103](https://github.com/ClickHouse/ClickHouse/pull/12103) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed segfault with `-StateResample` combinators. [#12092](https://github.com/ClickHouse/ClickHouse/pull/12092) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed unnecessary limiting the number of threads for selects from `VIEW`. Fixes [#11937](https://github.com/ClickHouse/ClickHouse/issues/11937). [#12085](https://github.com/ClickHouse/ClickHouse/pull/12085) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed possible crash while using wrong type for `PREWHERE`. Fixes [#12053](https://github.com/ClickHouse/ClickHouse/issues/12053), [#12060](https://github.com/ClickHouse/ClickHouse/issues/12060). [#12060](https://github.com/ClickHouse/ClickHouse/pull/12060) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed error `Expected single dictionary argument for function` for function `defaultValueOfArgumentType` with `LowCardinality` type. Fixes [#11808](https://github.com/ClickHouse/ClickHouse/issues/11808). [#12056](https://github.com/ClickHouse/ClickHouse/pull/12056) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed error `Cannot capture column` for higher-order functions with `Tuple(LowCardinality)` argument. Fixes [#9766](https://github.com/ClickHouse/ClickHouse/issues/9766). [#12055](https://github.com/ClickHouse/ClickHouse/pull/12055) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Parse tables metadata in parallel when loading database. This fixes slow server startup when there are large number of tables. [#12045](https://github.com/ClickHouse/ClickHouse/pull/12045) ([tavplubix](https://github.com/tavplubix)).
+* Make `topK` aggregate function return Enum for Enum types. This fixes [#3740](https://github.com/ClickHouse/ClickHouse/issues/3740). [#12043](https://github.com/ClickHouse/ClickHouse/pull/12043) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed constraints check if constraint is a constant expression. This fixes [#11360](https://github.com/ClickHouse/ClickHouse/issues/11360). [#12042](https://github.com/ClickHouse/ClickHouse/pull/12042) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed incorrect comparison of tuples with `Nullable` columns. Fixes [#11985](https://github.com/ClickHouse/ClickHouse/issues/11985). [#12039](https://github.com/ClickHouse/ClickHouse/pull/12039) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed wrong result and potential crash when invoking function `if` with arguments of type `FixedString` with different sizes. This fixes [#11362](https://github.com/ClickHouse/ClickHouse/issues/11362). [#12021](https://github.com/ClickHouse/ClickHouse/pull/12021) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* A query with function `neighbor` as the only returned expression may return empty result if the function is called with offset `-9223372036854775808`. This fixes [#11367](https://github.com/ClickHouse/ClickHouse/issues/11367). [#12019](https://github.com/ClickHouse/ClickHouse/pull/12019) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed potential array size overflow in generateRandom that may lead to crash. This fixes [#11371](https://github.com/ClickHouse/ClickHouse/issues/11371). [#12013](https://github.com/ClickHouse/ClickHouse/pull/12013) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed potential floating point exception. This closes [#11378](https://github.com/ClickHouse/ClickHouse/issues/11378). [#12005](https://github.com/ClickHouse/ClickHouse/pull/12005) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed wrong setting name in log message at server startup. [#11997](https://github.com/ClickHouse/ClickHouse/pull/11997) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed `Query parameter was not set` in `Values` format. Fixes [#11918](https://github.com/ClickHouse/ClickHouse/issues/11918). [#11936](https://github.com/ClickHouse/ClickHouse/pull/11936) ([tavplubix](https://github.com/tavplubix)).
+* Keep aliases for substitutions in query (parametrized queries). This fixes [#11914](https://github.com/ClickHouse/ClickHouse/issues/11914). [#11916](https://github.com/ClickHouse/ClickHouse/pull/11916) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed potential floating point exception when parsing DateTime64. This fixes [#11374](https://github.com/ClickHouse/ClickHouse/issues/11374). [#11875](https://github.com/ClickHouse/ClickHouse/pull/11875) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed memory accounting via `HTTP` interface (can be significant with `wait_end_of_query=1`). [#11840](https://github.com/ClickHouse/ClickHouse/pull/11840) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed wrong result for `if()` with NULLs in condition. [#11807](https://github.com/ClickHouse/ClickHouse/pull/11807) ([Artem Zuikov](https://github.com/4ertus2)).
+* Parse metadata stored in zookeeper before checking for equality. [#11739](https://github.com/ClickHouse/ClickHouse/pull/11739) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed `LIMIT n WITH TIES` usage together with `ORDER BY` statement, which contains aliases. [#11689](https://github.com/ClickHouse/ClickHouse/pull/11689) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix potential read of uninitialized memory in cache dictionary. [#10834](https://github.com/ClickHouse/ClickHouse/pull/10834) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+
+#### Performance Improvement
+
+* Index not used for IN operator with literals, performance regression introduced around v19.3. This fixes [#10574](https://github.com/ClickHouse/ClickHouse/issues/10574). [#12062](https://github.com/ClickHouse/ClickHouse/pull/12062) ([nvartolomei](https://github.com/nvartolomei)).
+
+
+### ClickHouse release v20.3.12.112-lts 2020-06-25
+
+#### Bug Fix
+
+* Fix rare crash caused by using `Nullable` column in prewhere condition. Continuation of [#11608](https://github.com/ClickHouse/ClickHouse/issues/11608). [#11869](https://github.com/ClickHouse/ClickHouse/pull/11869) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Don't allow arrayJoin inside higher order functions. It was leading to broken protocol synchronization. This closes [#3933](https://github.com/ClickHouse/ClickHouse/issues/3933). [#11846](https://github.com/ClickHouse/ClickHouse/pull/11846) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix using too many threads for queries. [#11788](https://github.com/ClickHouse/ClickHouse/pull/11788) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix unexpected behaviour of queries like `SELECT *, xyz.*` which were success while an error expected. [#11753](https://github.com/ClickHouse/ClickHouse/pull/11753) ([hexiaoting](https://github.com/hexiaoting)).
+* Now replicated fetches will be cancelled during metadata alter. [#11744](https://github.com/ClickHouse/ClickHouse/pull/11744) ([alesapin](https://github.com/alesapin)).
+* Fixed LOGICAL_ERROR caused by wrong type deduction of complex literals in Values input format. [#11732](https://github.com/ClickHouse/ClickHouse/pull/11732) ([tavplubix](https://github.com/tavplubix)).
+* Fix `ORDER BY ... WITH FILL` over const columns. [#11697](https://github.com/ClickHouse/ClickHouse/pull/11697) ([Anton Popov](https://github.com/CurtizJ)).
+* Pass proper timeouts when communicating with XDBC bridge. Recently timeouts were not respected when checking bridge liveness and receiving meta info. [#11690](https://github.com/ClickHouse/ClickHouse/pull/11690) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix error which leads to an incorrect state of `system.mutations`. It may show that whole mutation is already done but the server still has `MUTATE_PART` tasks in the replication queue and tries to execute them. This fixes [#11611](https://github.com/ClickHouse/ClickHouse/issues/11611). [#11681](https://github.com/ClickHouse/ClickHouse/pull/11681) ([alesapin](https://github.com/alesapin)).
+* Add support for regular expressions with case-insensitive flags. This fixes [#11101](https://github.com/ClickHouse/ClickHouse/issues/11101) and fixes [#11506](https://github.com/ClickHouse/ClickHouse/issues/11506). [#11649](https://github.com/ClickHouse/ClickHouse/pull/11649) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Remove trivial count query optimization if row-level security is set. In previous versions the user get total count of records in a table instead filtered. This fixes [#11352](https://github.com/ClickHouse/ClickHouse/issues/11352). [#11644](https://github.com/ClickHouse/ClickHouse/pull/11644) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix bloom filters for String (data skipping indices). [#11638](https://github.com/ClickHouse/ClickHouse/pull/11638) ([Azat Khuzhin](https://github.com/azat)).
+* Fix rare crash caused by using `Nullable` column in prewhere condition. (Probably it is connected with [#11572](https://github.com/ClickHouse/ClickHouse/issues/11572) somehow). [#11608](https://github.com/ClickHouse/ClickHouse/pull/11608) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix error `Block structure mismatch` for queries with sampling reading from `Buffer` table. [#11602](https://github.com/ClickHouse/ClickHouse/pull/11602) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix wrong exit code of the clickhouse-client, when exception.code() % 256 = 0. [#11601](https://github.com/ClickHouse/ClickHouse/pull/11601) ([filimonov](https://github.com/filimonov)).
+* Fix trivial error in log message about "Mark cache size was lowered" at server startup. This closes [#11399](https://github.com/ClickHouse/ClickHouse/issues/11399). [#11589](https://github.com/ClickHouse/ClickHouse/pull/11589) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix error `Size of offsets doesn't match size of column` for queries with `PREWHERE column in (subquery)` and `ARRAY JOIN`. [#11580](https://github.com/ClickHouse/ClickHouse/pull/11580) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* All queries in HTTP session have had the same query_id. It is fixed. [#11578](https://github.com/ClickHouse/ClickHouse/pull/11578) ([tavplubix](https://github.com/tavplubix)).
+* Now clickhouse-server docker container will prefer IPv6 checking server aliveness. [#11550](https://github.com/ClickHouse/ClickHouse/pull/11550) ([Ivan Starkov](https://github.com/istarkov)).
+* Fix shard_num/replica_num for `<node>` (breaks use_compact_format_in_distributed_parts_names). [#11528](https://github.com/ClickHouse/ClickHouse/pull/11528) ([Azat Khuzhin](https://github.com/azat)).
+* Fix memory leak when exception is thrown in the middle of aggregation with -State functions. This fixes [#8995](https://github.com/ClickHouse/ClickHouse/issues/8995). [#11496](https://github.com/ClickHouse/ClickHouse/pull/11496) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix wrong results of distributed queries when alias could override qualified column name. Fixes [#9672](https://github.com/ClickHouse/ClickHouse/issues/9672) [#9714](https://github.com/ClickHouse/ClickHouse/issues/9714). [#9972](https://github.com/ClickHouse/ClickHouse/pull/9972) ([Artem Zuikov](https://github.com/4ertus2)).
+
+
+### ClickHouse release v20.3.11.97-lts 2020-06-10
+
+#### New Feature
+
+* Now ClickHouse controls timeouts of dictionary sources on its side. Two new settings added to cache dictionary configuration: `strict_max_lifetime_seconds`, which is `max_lifetime` by default and `query_wait_timeout_milliseconds`, which is one minute by default. The first settings is also useful with `allow_read_expired_keys` settings (to forbid reading very expired keys). [#10337](https://github.com/ClickHouse/ClickHouse/pull/10337) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+
+#### Bug Fix
+
+* Fix the error `Data compressed with different methods` that can happen if `min_bytes_to_use_direct_io` is enabled and PREWHERE is active and using SAMPLE or high number of threads. This fixes [#11539](https://github.com/ClickHouse/ClickHouse/issues/11539). [#11540](https://github.com/ClickHouse/ClickHouse/pull/11540) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix return compressed size for codecs. [#11448](https://github.com/ClickHouse/ClickHouse/pull/11448) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix server crash when a column has compression codec with non-literal arguments. Fixes [#11365](https://github.com/ClickHouse/ClickHouse/issues/11365). [#11431](https://github.com/ClickHouse/ClickHouse/pull/11431) ([alesapin](https://github.com/alesapin)).
+* Fix pointInPolygon with nan as point. Fixes [#11375](https://github.com/ClickHouse/ClickHouse/issues/11375). [#11421](https://github.com/ClickHouse/ClickHouse/pull/11421) ([Alexey Ilyukhov](https://github.com/livace)).
+* Fix crash in JOIN over LowCarinality(T) and Nullable(T). [#11380](https://github.com/ClickHouse/ClickHouse/issues/11380). [#11414](https://github.com/ClickHouse/ClickHouse/pull/11414) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix error code for wrong `USING` key. [#11373](https://github.com/ClickHouse/ClickHouse/issues/11373). [#11404](https://github.com/ClickHouse/ClickHouse/pull/11404) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fixed geohashesInBox with arguments outside of latitude/longitude range. [#11403](https://github.com/ClickHouse/ClickHouse/pull/11403) ([Vasily Nemkov](https://github.com/Enmk)).
+* Better errors for `joinGet()` functions. [#11389](https://github.com/ClickHouse/ClickHouse/pull/11389) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix possible `Pipeline stuck` error for queries with external sort and limit. Fixes [#11359](https://github.com/ClickHouse/ClickHouse/issues/11359). [#11366](https://github.com/ClickHouse/ClickHouse/pull/11366) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Remove redundant lock during parts send in ReplicatedMergeTree. [#11354](https://github.com/ClickHouse/ClickHouse/pull/11354) ([alesapin](https://github.com/alesapin)).
+* Fix support for `\G` (vertical output) in clickhouse-client in multiline mode. This closes [#9933](https://github.com/ClickHouse/ClickHouse/issues/9933). [#11350](https://github.com/ClickHouse/ClickHouse/pull/11350) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix crash in direct selects from StorageJoin (without JOIN) and wrong nullability. [#11340](https://github.com/ClickHouse/ClickHouse/pull/11340) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix crash in `quantilesExactWeightedArray`. [#11337](https://github.com/ClickHouse/ClickHouse/pull/11337) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Now merges stopped before change metadata in `ALTER` queries. [#11335](https://github.com/ClickHouse/ClickHouse/pull/11335) ([alesapin](https://github.com/alesapin)).
+* Make writing to `MATERIALIZED VIEW` with setting `parallel_view_processing = 1` parallel again. Fixes [#10241](https://github.com/ClickHouse/ClickHouse/issues/10241). [#11330](https://github.com/ClickHouse/ClickHouse/pull/11330) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix visitParamExtractRaw when extracted JSON has strings with unbalanced { or [. [#11318](https://github.com/ClickHouse/ClickHouse/pull/11318) ([Ewout](https://github.com/devwout)).
+* Fix very rare race condition in ThreadPool. [#11314](https://github.com/ClickHouse/ClickHouse/pull/11314) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix potential uninitialized memory in conversion. Example: `SELECT toIntervalSecond(now64())`. [#11311](https://github.com/ClickHouse/ClickHouse/pull/11311) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix the issue when index analysis cannot work if a table has Array column in primary key and if a query is filtering by this column with `empty` or `notEmpty` functions. This fixes [#11286](https://github.com/ClickHouse/ClickHouse/issues/11286). [#11303](https://github.com/ClickHouse/ClickHouse/pull/11303) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix bug when query speed estimation can be incorrect and the limit of `min_execution_speed` may not work or work incorrectly if the query is throttled by `max_network_bandwidth`, `max_execution_speed` or `priority` settings. Change the default value of `timeout_before_checking_execution_speed` to non-zero, because otherwise the settings `min_execution_speed` and `max_execution_speed` have no effect. This fixes [#11297](https://github.com/ClickHouse/ClickHouse/issues/11297). This fixes [#5732](https://github.com/ClickHouse/ClickHouse/issues/5732). This fixes [#6228](https://github.com/ClickHouse/ClickHouse/issues/6228). Usability improvement: avoid concatenation of exception message with progress bar in `clickhouse-client`. [#11296](https://github.com/ClickHouse/ClickHouse/pull/11296) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix crash while reading malformed data in Protobuf format. This fixes [#5957](https://github.com/ClickHouse/ClickHouse/issues/5957), fixes [#11203](https://github.com/ClickHouse/ClickHouse/issues/11203). [#11258](https://github.com/ClickHouse/ClickHouse/pull/11258) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fixed a bug when cache-dictionary could return default value instead of normal (when there are only expired keys). This affects only string fields. [#11233](https://github.com/ClickHouse/ClickHouse/pull/11233) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fix error `Block structure mismatch in QueryPipeline` while reading from `VIEW` with constants in inner query. Fixes [#11181](https://github.com/ClickHouse/ClickHouse/issues/11181). [#11205](https://github.com/ClickHouse/ClickHouse/pull/11205) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix possible exception `Invalid status for associated output`. [#11200](https://github.com/ClickHouse/ClickHouse/pull/11200) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix possible error `Cannot capture column` for higher-order functions with `Array(Array(LowCardinality))` captured argument. [#11185](https://github.com/ClickHouse/ClickHouse/pull/11185) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed S3 globbing which could fail in case of more than 1000 keys and some backends. [#11179](https://github.com/ClickHouse/ClickHouse/pull/11179) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* If data skipping index is dependent on columns that are going to be modified during background merge (for SummingMergeTree, AggregatingMergeTree as well as for TTL GROUP BY), it was calculated incorrectly. This issue is fixed by moving index calculation after merge so the index is calculated on merged data. [#11162](https://github.com/ClickHouse/ClickHouse/pull/11162) ([Azat Khuzhin](https://github.com/azat)).
+* Fix excessive reserving of threads for simple queries (optimization for reducing the number of threads, which was partly broken after changes in pipeline). [#11114](https://github.com/ClickHouse/ClickHouse/pull/11114) ([Azat Khuzhin](https://github.com/azat)).
+* Fix predicates optimization for distributed queries (`enable_optimize_predicate_expression=1`) for queries with `HAVING` section (i.e. when filtering on the server initiator is required), by preserving the order of expressions (and this is enough to fix), and also force aggregator use column names over indexes. Fixes: [#10613](https://github.com/ClickHouse/ClickHouse/issues/10613), [#11413](https://github.com/ClickHouse/ClickHouse/issues/11413). [#10621](https://github.com/ClickHouse/ClickHouse/pull/10621) ([Azat Khuzhin](https://github.com/azat)).
+* Introduce commit retry logic to decrease the possibility of getting duplicates from Kafka in rare cases when offset commit was failed. [#9884](https://github.com/ClickHouse/ClickHouse/pull/9884) ([filimonov](https://github.com/filimonov)).
+
+#### Performance Improvement
+
+* Get dictionary and check access rights only once per each call of any function reading external dictionaries. [#10928](https://github.com/ClickHouse/ClickHouse/pull/10928) ([Vitaly Baranov](https://github.com/vitlibar)).
+
+#### Build/Testing/Packaging Improvement
+
+* Fix several flaky integration tests. [#11355](https://github.com/ClickHouse/ClickHouse/pull/11355) ([alesapin](https://github.com/alesapin)).
+
+### ClickHouse release v20.3.10.75-lts 2020-05-23
+
+#### Bug Fix
+
+* Removed logging from mutation finalization task if nothing was finalized. [#11109](https://github.com/ClickHouse/ClickHouse/pull/11109) ([alesapin](https://github.com/alesapin)).
+* Fixed `parseDateTime64BestEffort` argument resolution bugs. [#11038](https://github.com/ClickHouse/ClickHouse/pull/11038) ([Vasily Nemkov](https://github.com/Enmk)).
+* Fixed incorrect raw data size in method `getRawData()`. [#10964](https://github.com/ClickHouse/ClickHouse/pull/10964) ([Igr](https://github.com/ObjatieGroba)).
+* Fixed incompatibility of two-level aggregation between versions 20.1 and earlier. This incompatibility happens when different versions of ClickHouse are used on initiator node and remote nodes and the size of `GROUP BY` result is large and aggregation is performed by a single `String` field. It leads to several unmerged rows for a single key in result. [#10952](https://github.com/ClickHouse/ClickHouse/pull/10952) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed backward compatibility with tuples in `Distributed` tables. [#10889](https://github.com/ClickHouse/ClickHouse/pull/10889) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed `SIGSEGV` in `StringHashTable` if such a key does not exist. [#10870](https://github.com/ClickHouse/ClickHouse/pull/10870) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed bug in `ReplicatedMergeTree` which might cause some `ALTER` on `OPTIMIZE` query to hang waiting for some replica after it become inactive. [#10849](https://github.com/ClickHouse/ClickHouse/pull/10849) ([tavplubix](https://github.com/tavplubix)).
+* Fixed columns order after `Block::sortColumns()`. [#10826](https://github.com/ClickHouse/ClickHouse/pull/10826) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed the issue with `ODBC` bridge when no quoting of identifiers is requested. Fixes [#7984](https://github.com/ClickHouse/ClickHouse/issues/7984). [#10821](https://github.com/ClickHouse/ClickHouse/pull/10821) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed `UBSan` and `MSan` report in `DateLUT`. [#10798](https://github.com/ClickHouse/ClickHouse/pull/10798) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed incorrect type conversion in key conditions. Fixes [#6287](https://github.com/ClickHouse/ClickHouse/issues/6287). [#10791](https://github.com/ClickHouse/ClickHouse/pull/10791) ([Andrew Onyshchuk](https://github.com/oandrew))
+* Fixed `parallel_view_processing` behavior. Now all insertions into `MATERIALIZED VIEW` without exception should be finished if exception happened. Fixes [#10241](https://github.com/ClickHouse/ClickHouse/issues/10241). [#10757](https://github.com/ClickHouse/ClickHouse/pull/10757) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed combinator -`OrNull` and `-OrDefault` when combined with `-State`. [#10741](https://github.com/ClickHouse/ClickHouse/pull/10741) ([hcz](https://github.com/hczhcz)).
+* Fixed crash in `generateRandom` with nested types. Fixes [#10583](https://github.com/ClickHouse/ClickHouse/issues/10583). [#10734](https://github.com/ClickHouse/ClickHouse/pull/10734) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed data corruption for `LowCardinality(FixedString)` key column in `SummingMergeTree` which could have happened after merge. Fixes [#10489](https://github.com/ClickHouse/ClickHouse/issues/10489). [#10721](https://github.com/ClickHouse/ClickHouse/pull/10721) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed possible buffer overflow in function `h3EdgeAngle`. [#10711](https://github.com/ClickHouse/ClickHouse/pull/10711) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed disappearing totals. Totals could have being filtered if query had had join or subquery with external where condition. Fixes [#10674](https://github.com/ClickHouse/ClickHouse/issues/10674). [#10698](https://github.com/ClickHouse/ClickHouse/pull/10698) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed multiple usages of `IN` operator with the identical set in one query. [#10686](https://github.com/ClickHouse/ClickHouse/pull/10686) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed bug, which causes http requests stuck on client close when `readonly=2` and `cancel_http_readonly_queries_on_client_close=1`. Fixes [#7939](https://github.com/ClickHouse/ClickHouse/issues/7939), [#7019](https://github.com/ClickHouse/ClickHouse/issues/7019), [#7736](https://github.com/ClickHouse/ClickHouse/issues/7736), [#7091](https://github.com/ClickHouse/ClickHouse/issues/7091). [#10684](https://github.com/ClickHouse/ClickHouse/pull/10684) ([tavplubix](https://github.com/tavplubix)).
+* Fixed order of parameters in `AggregateTransform` constructor. [#10667](https://github.com/ClickHouse/ClickHouse/pull/10667) ([palasonic1](https://github.com/palasonic1)).
+* Fixed the lack of parallel execution of remote queries with `distributed_aggregation_memory_efficient` enabled. Fixes [#10655](https://github.com/ClickHouse/ClickHouse/issues/10655). [#10664](https://github.com/ClickHouse/ClickHouse/pull/10664) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed possible incorrect number of rows for queries with `LIMIT`. Fixes [#10566](https://github.com/ClickHouse/ClickHouse/issues/10566), [#10709](https://github.com/ClickHouse/ClickHouse/issues/10709). [#10660](https://github.com/ClickHouse/ClickHouse/pull/10660) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed a bug which locks concurrent alters when table has a lot of parts. [#10659](https://github.com/ClickHouse/ClickHouse/pull/10659) ([alesapin](https://github.com/alesapin)).
+* Fixed a bug when on `SYSTEM DROP DNS CACHE` query also drop caches, which are used to check if user is allowed to connect from some IP addresses. [#10608](https://github.com/ClickHouse/ClickHouse/pull/10608) ([tavplubix](https://github.com/tavplubix)).
+* Fixed incorrect scalar results inside inner query of `MATERIALIZED VIEW` in case if this query contained dependent table. [#10603](https://github.com/ClickHouse/ClickHouse/pull/10603) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed `SELECT` of column `ALIAS` which default expression type different from column type. [#10563](https://github.com/ClickHouse/ClickHouse/pull/10563) ([Azat Khuzhin](https://github.com/azat)).
+* Implemented comparison between DateTime64 and String values. [#10560](https://github.com/ClickHouse/ClickHouse/pull/10560) ([Vasily Nemkov](https://github.com/Enmk)).
+* Fixed index corruption, which may occur in some cases after merge compact parts into another compact part. [#10531](https://github.com/ClickHouse/ClickHouse/pull/10531) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed the situation, when mutation finished all parts, but hung up in `is_done=0`. [#10526](https://github.com/ClickHouse/ClickHouse/pull/10526) ([alesapin](https://github.com/alesapin)).
+* Fixed overflow at beginning of unix epoch for timezones with fractional offset from `UTC`. This fixes [#9335](https://github.com/ClickHouse/ClickHouse/issues/9335). [#10513](https://github.com/ClickHouse/ClickHouse/pull/10513) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed improper shutdown of `Distributed` storage. [#10491](https://github.com/ClickHouse/ClickHouse/pull/10491) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed numeric overflow in `simpleLinearRegression` over large integers. [#10474](https://github.com/ClickHouse/ClickHouse/pull/10474) ([hcz](https://github.com/hczhcz)).
+
+
+#### Build/Testing/Packaging Improvement
+
+* Fix UBSan report in LZ4 library. [#10631](https://github.com/ClickHouse/ClickHouse/pull/10631) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix clang-10 build. [#10238](https://github.com/ClickHouse/ClickHouse/issues/10238). [#10370](https://github.com/ClickHouse/ClickHouse/pull/10370) ([Amos Bird](https://github.com/amosbird)).
+* Added failing tests about `max_rows_to_sort` setting. [#10268](https://github.com/ClickHouse/ClickHouse/pull/10268) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Added some improvements in printing diagnostic info in input formats. Fixes [#10204](https://github.com/ClickHouse/ClickHouse/issues/10204). [#10418](https://github.com/ClickHouse/ClickHouse/pull/10418) ([tavplubix](https://github.com/tavplubix)).
+* Added CA certificates to clickhouse-server docker image. [#10476](https://github.com/ClickHouse/ClickHouse/pull/10476) ([filimonov](https://github.com/filimonov)).
+
+#### Bug fix
+
+* Fix error `the BloomFilter false positive must be a double number between 0 and 1` [#10551](https://github.com/ClickHouse/ClickHouse/issues/10551). [#10569](https://github.com/ClickHouse/ClickHouse/pull/10569) ([Winter Zhang](https://github.com/zhang2014)).
+
+
+### ClickHouse release v20.3.8.53, 2020-04-23
+
+#### Bug Fix
+* Fixed wrong behaviour of datetime functions for timezones that has altered between positive and negative offsets from UTC (e.g. Pacific/Kiritimati). This fixes [#7202](https://github.com/ClickHouse/ClickHouse/issues/7202) [#10369](https://github.com/ClickHouse/ClickHouse/pull/10369) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix possible segfault with `distributed_group_by_no_merge` enabled (introduced in 20.3.7.46 by [#10131](https://github.com/ClickHouse/ClickHouse/issues/10131)). [#10399](https://github.com/ClickHouse/ClickHouse/pull/10399) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fix wrong flattening of `Array(Tuple(...))` data types. This fixes [#10259](https://github.com/ClickHouse/ClickHouse/issues/10259) [#10390](https://github.com/ClickHouse/ClickHouse/pull/10390) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Drop disks reservation in Aggregator. This fixes bug in disk space reservation, which may cause big external aggregation to fail even if it could be completed successfully [#10375](https://github.com/ClickHouse/ClickHouse/pull/10375) ([Azat Khuzhin](https://github.com/azat))
+* Fixed `DROP` vs `OPTIMIZE` race in `ReplicatedMergeTree`. `DROP` could left some garbage in replica path in ZooKeeper if there was concurrent `OPTIMIZE` query. [#10312](https://github.com/ClickHouse/ClickHouse/pull/10312) ([tavplubix](https://github.com/tavplubix))
+* Fix bug when server cannot attach table after column default was altered. [#10441](https://github.com/ClickHouse/ClickHouse/pull/10441) ([alesapin](https://github.com/alesapin))
+* Do not remove metadata directory when attach database fails before loading tables.  [#10442](https://github.com/ClickHouse/ClickHouse/pull/10442) ([Winter Zhang](https://github.com/zhang2014))
+* Fixed several bugs when some data was inserted with quorum, then deleted somehow (DROP PARTITION, TTL) and this leaded to the stuck of INSERTs or false-positive exceptions in SELECTs. This fixes [#9946](https://github.com/ClickHouse/ClickHouse/issues/9946) [#10188](https://github.com/ClickHouse/ClickHouse/pull/10188) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
+* Fix possible `Pipeline stuck` error in `ConcatProcessor` which could have happened in remote query. [#10381](https://github.com/ClickHouse/ClickHouse/pull/10381) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fixed wrong behavior in HashTable that caused compilation error when trying to read HashMap from buffer. [#10386](https://github.com/ClickHouse/ClickHouse/pull/10386) ([palasonic1](https://github.com/palasonic1))
+* Allow to use `count(*)` with multiple JOINs. Fixes [#9853](https://github.com/ClickHouse/ClickHouse/issues/9853) [#10291](https://github.com/ClickHouse/ClickHouse/pull/10291) ([Artem Zuikov](https://github.com/4ertus2))
+* Prefer `fallback_to_stale_replicas` over `skip_unavailable_shards`, otherwise when both settings specified and there are no up-to-date replicas the query will fail (patch from @alex-zaitsev). Fixes: [#2564](https://github.com/ClickHouse/ClickHouse/issues/2564). [#10422](https://github.com/ClickHouse/ClickHouse/pull/10422) ([Azat Khuzhin](https://github.com/azat))
+* Fix the issue when a query with ARRAY JOIN, ORDER BY and LIMIT may return incomplete result. This fixes [#10226](https://github.com/ClickHouse/ClickHouse/issues/10226). Author: [Vadim Plakhtinskiy](https://github.com/VadimPlh). [#10427](https://github.com/ClickHouse/ClickHouse/pull/10427) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Check the number and type of arguments when creating BloomFilter index [#9623](https://github.com/ClickHouse/ClickHouse/issues/9623) [#10431](https://github.com/ClickHouse/ClickHouse/pull/10431) ([Winter Zhang](https://github.com/zhang2014))
+
+#### Performance Improvement
+* Improved performance of queries with explicitly defined sets at right side of `IN` operator and tuples in the left side. This fixes performance regression in version 20.3. [#9740](https://github.com/ClickHouse/ClickHouse/pull/9740), [#10385](https://github.com/ClickHouse/ClickHouse/pull/10385) ([Anton Popov](https://github.com/CurtizJ))
+
+### ClickHouse release v20.3.7.46, 2020-04-17
+
+#### Bug Fix
+
+* Fix `Logical error: CROSS JOIN has expressions` error for queries with comma and names joins mix. [#10311](https://github.com/ClickHouse/ClickHouse/pull/10311) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix queries with `max_bytes_before_external_group_by`. [#10302](https://github.com/ClickHouse/ClickHouse/pull/10302) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix move-to-prewhere optimization in presense of arrayJoin functions (in certain cases). This fixes [#10092](https://github.com/ClickHouse/ClickHouse/issues/10092). [#10195](https://github.com/ClickHouse/ClickHouse/pull/10195) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add the ability to relax the restriction on non-deterministic functions usage in mutations with `allow_nondeterministic_mutations` setting. [#10186](https://github.com/ClickHouse/ClickHouse/pull/10186) ([filimonov](https://github.com/filimonov)).
+
+### ClickHouse release v20.3.6.40, 2020-04-16
+
+#### New Feature
+
+* Added function `isConstant`. This function checks whether its argument is constant expression and returns 1 or 0. It is intended for development, debugging and demonstration purposes. [#10198](https://github.com/ClickHouse/ClickHouse/pull/10198) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+
+#### Bug Fix
+
+* Fix error `Pipeline stuck` with `max_rows_to_group_by` and `group_by_overflow_mode = 'break'`. [#10279](https://github.com/ClickHouse/ClickHouse/pull/10279) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix rare possible exception `Cannot drain connections: cancel first`. [#10239](https://github.com/ClickHouse/ClickHouse/pull/10239) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed bug where ClickHouse would throw "Unknown function lambda." error message when user tries to run ALTER UPDATE/DELETE on tables with ENGINE = Replicated*. Check for nondeterministic functions now handles lambda expressions correctly. [#10237](https://github.com/ClickHouse/ClickHouse/pull/10237) ([Alexander Kazakov](https://github.com/Akazz)).
+* Fixed "generateRandom" function for Date type. This fixes [#9973](https://github.com/ClickHouse/ClickHouse/issues/9973). Fix an edge case when dates with year 2106 are inserted to MergeTree tables with old-style partitioning but partitions are named with year 1970. [#10218](https://github.com/ClickHouse/ClickHouse/pull/10218) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Convert types if the table definition of a View does not correspond to the SELECT query. This fixes [#10180](https://github.com/ClickHouse/ClickHouse/issues/10180) and [#10022](https://github.com/ClickHouse/ClickHouse/issues/10022). [#10217](https://github.com/ClickHouse/ClickHouse/pull/10217) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix `parseDateTimeBestEffort` for strings in RFC-2822 when day of week is Tuesday or Thursday. This fixes [#10082](https://github.com/ClickHouse/ClickHouse/issues/10082). [#10214](https://github.com/ClickHouse/ClickHouse/pull/10214) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix column names of constants inside JOIN that may clash with names of constants outside of JOIN. [#10207](https://github.com/ClickHouse/ClickHouse/pull/10207) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix possible inifinite query execution when the query actually should stop on LIMIT, while reading from infinite source like `system.numbers` or `system.zeros`. [#10206](https://github.com/ClickHouse/ClickHouse/pull/10206) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix using the current database for access checking when the database isn't specified. [#10192](https://github.com/ClickHouse/ClickHouse/pull/10192) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Convert blocks if structure does not match on INSERT into Distributed(). [#10135](https://github.com/ClickHouse/ClickHouse/pull/10135) ([Azat Khuzhin](https://github.com/azat)).
+* Fix possible incorrect result for extremes in processors pipeline. [#10131](https://github.com/ClickHouse/ClickHouse/pull/10131) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix some kinds of alters with compact parts. [#10130](https://github.com/ClickHouse/ClickHouse/pull/10130) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix incorrect `index_granularity_bytes` check while creating new replica. Fixes [#10098](https://github.com/ClickHouse/ClickHouse/issues/10098). [#10121](https://github.com/ClickHouse/ClickHouse/pull/10121) ([alesapin](https://github.com/alesapin)).
+* Fix SIGSEGV on INSERT into Distributed table when its structure differs from the underlying tables. [#10105](https://github.com/ClickHouse/ClickHouse/pull/10105) ([Azat Khuzhin](https://github.com/azat)).
+* Fix possible rows loss for queries with `JOIN` and `UNION ALL`. Fixes [#9826](https://github.com/ClickHouse/ClickHouse/issues/9826), [#10113](https://github.com/ClickHouse/ClickHouse/issues/10113). [#10099](https://github.com/ClickHouse/ClickHouse/pull/10099) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed replicated tables startup when updating from an old ClickHouse version where `/table/replicas/replica_name/metadata` node doesn't exist. Fixes [#10037](https://github.com/ClickHouse/ClickHouse/issues/10037). [#10095](https://github.com/ClickHouse/ClickHouse/pull/10095) ([alesapin](https://github.com/alesapin)).
+* Add some arguments check and support identifier arguments for MySQL Database Engine. [#10077](https://github.com/ClickHouse/ClickHouse/pull/10077) ([Winter Zhang](https://github.com/zhang2014)).
+* Fix bug in clickhouse dictionary source from localhost clickhouse server. The bug may lead to memory corruption if types in dictionary and source are not compatible. [#10071](https://github.com/ClickHouse/ClickHouse/pull/10071) ([alesapin](https://github.com/alesapin)).
+* Fix bug in `CHECK TABLE` query when table contain skip indices. [#10068](https://github.com/ClickHouse/ClickHouse/pull/10068) ([alesapin](https://github.com/alesapin)).
+* Fix error `Cannot clone block with columns because block has 0 columns ... While executing GroupingAggregatedTransform`. It happened when setting `distributed_aggregation_memory_efficient` was enabled, and distributed query read aggregating data with different level from different shards (mixed single and two level aggregation). [#10063](https://github.com/ClickHouse/ClickHouse/pull/10063) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix a segmentation fault that could occur in GROUP BY over string keys containing trailing zero bytes ([#8636](https://github.com/ClickHouse/ClickHouse/issues/8636), [#8925](https://github.com/ClickHouse/ClickHouse/issues/8925)). [#10025](https://github.com/ClickHouse/ClickHouse/pull/10025) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Fix the number of threads used for remote query execution (performance regression, since 20.3). This happened when query from `Distributed` table was executed simultaneously on local and remote shards. Fixes [#9965](https://github.com/ClickHouse/ClickHouse/issues/9965). [#9971](https://github.com/ClickHouse/ClickHouse/pull/9971) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix bug in which the necessary tables weren't retrieved at one of the processing stages of queries to some databases. Fixes [#9699](https://github.com/ClickHouse/ClickHouse/issues/9699). [#9949](https://github.com/ClickHouse/ClickHouse/pull/9949) ([achulkov2](https://github.com/achulkov2)).
+* Fix 'Not found column in block' error when `JOIN` appears with `TOTALS`. Fixes [#9839](https://github.com/ClickHouse/ClickHouse/issues/9839). [#9939](https://github.com/ClickHouse/ClickHouse/pull/9939) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix a bug with `ON CLUSTER` DDL queries freezing on server startup. [#9927](https://github.com/ClickHouse/ClickHouse/pull/9927) ([Gagan Arneja](https://github.com/garneja)).
+* Fix parsing multiple hosts set in the CREATE USER command, e.g. `CREATE USER user6 HOST NAME REGEXP 'lo.?*host', NAME REGEXP 'lo*host'`. [#9924](https://github.com/ClickHouse/ClickHouse/pull/9924) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix `TRUNCATE` for Join table engine ([#9917](https://github.com/ClickHouse/ClickHouse/issues/9917)). [#9920](https://github.com/ClickHouse/ClickHouse/pull/9920) ([Amos Bird](https://github.com/amosbird)).
+* Fix "scalar doesn't exist" error in ALTERs ([#9878](https://github.com/ClickHouse/ClickHouse/issues/9878)). [#9904](https://github.com/ClickHouse/ClickHouse/pull/9904) ([Amos Bird](https://github.com/amosbird)).
+* Fix race condition between drop and optimize in `ReplicatedMergeTree`. [#9901](https://github.com/ClickHouse/ClickHouse/pull/9901) ([alesapin](https://github.com/alesapin)).
+* Fix error with qualified names in `distributed_product_mode='local'`. Fixes [#4756](https://github.com/ClickHouse/ClickHouse/issues/4756). [#9891](https://github.com/ClickHouse/ClickHouse/pull/9891) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix calculating grants for introspection functions from the setting 'allow_introspection_functions'. [#9840](https://github.com/ClickHouse/ClickHouse/pull/9840) ([Vitaly Baranov](https://github.com/vitlibar)).
+
+#### Build/Testing/Packaging Improvement
+
+* Fix integration test `test_settings_constraints`. [#9962](https://github.com/ClickHouse/ClickHouse/pull/9962) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Removed dependency on `clock_getres`. [#9833](https://github.com/ClickHouse/ClickHouse/pull/9833) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+
+
+### ClickHouse release v20.3.5.21, 2020-03-27
+
+#### Bug Fix
+
+* Fix 'Different expressions with the same alias' error when query has PREWHERE and WHERE on distributed table and `SET distributed_product_mode = 'local'`. [#9871](https://github.com/ClickHouse/ClickHouse/pull/9871) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix mutations excessive memory consumption for tables with a composite primary key. This fixes [#9850](https://github.com/ClickHouse/ClickHouse/issues/9850). [#9860](https://github.com/ClickHouse/ClickHouse/pull/9860) ([alesapin](https://github.com/alesapin)).
+* For INSERT queries shard now clamps the settings got from the initiator to the shard's constaints instead of throwing an exception. This fix allows to send INSERT queries to a shard with another constraints. This change improves fix [#9447](https://github.com/ClickHouse/ClickHouse/issues/9447). [#9852](https://github.com/ClickHouse/ClickHouse/pull/9852) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix 'COMMA to CROSS JOIN rewriter is not enabled or cannot rewrite query' error in case of subqueries with COMMA JOIN out of tables lists (i.e. in WHERE). Fixes [#9782](https://github.com/ClickHouse/ClickHouse/issues/9782). [#9830](https://github.com/ClickHouse/ClickHouse/pull/9830) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix possible exception `Got 0 in totals chunk, expected 1` on client. It happened for queries with `JOIN` in case if right joined table had zero rows. Example: `select * from system.one t1 join system.one t2 on t1.dummy = t2.dummy limit 0 FORMAT TabSeparated;`. Fixes [#9777](https://github.com/ClickHouse/ClickHouse/issues/9777). [#9823](https://github.com/ClickHouse/ClickHouse/pull/9823) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix SIGSEGV with optimize_skip_unused_shards when type cannot be converted. [#9804](https://github.com/ClickHouse/ClickHouse/pull/9804) ([Azat Khuzhin](https://github.com/azat)).
+* Fix broken `ALTER TABLE DELETE COLUMN` query for compact parts. [#9779](https://github.com/ClickHouse/ClickHouse/pull/9779) ([alesapin](https://github.com/alesapin)).
+* Fix max_distributed_connections (w/ and w/o Processors). [#9673](https://github.com/ClickHouse/ClickHouse/pull/9673) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed a few cases when timezone of the function argument wasn't used properly. [#9574](https://github.com/ClickHouse/ClickHouse/pull/9574) ([Vasily Nemkov](https://github.com/Enmk)).
+
+#### Improvement
+
+* Remove order by stage from mutations because we read from a single ordered part in a single thread. Also add check that the order of rows in mutation is ordered in sorting key order and this order is not violated. [#9886](https://github.com/ClickHouse/ClickHouse/pull/9886) ([alesapin](https://github.com/alesapin)).
+
+
+### ClickHouse release v20.3.4.10, 2020-03-20
+
+#### Bug Fix
+* This release also contains all bug fixes from 20.1.8.41
+* Fix missing `rows_before_limit_at_least` for queries over http (with processors pipeline). This fixes [#9730](https://github.com/ClickHouse/ClickHouse/issues/9730). [#9757](https://github.com/ClickHouse/ClickHouse/pull/9757) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+
+
+### ClickHouse release v20.3.3.6, 2020-03-17
+
+#### Bug Fix
+* This release also contains all bug fixes from 20.1.7.38
+* Fix bug in a replication that doesn't allow replication to work if the user has executed mutations on the previous version. This fixes [#9645](https://github.com/ClickHouse/ClickHouse/issues/9645). [#9652](https://github.com/ClickHouse/ClickHouse/pull/9652) ([alesapin](https://github.com/alesapin)). It makes version 20.3 backward compatible again.
+* Add setting `use_compact_format_in_distributed_parts_names` which allows to write files for `INSERT` queries into `Distributed` table with more compact format. This fixes [#9647](https://github.com/ClickHouse/ClickHouse/issues/9647). [#9653](https://github.com/ClickHouse/ClickHouse/pull/9653) ([alesapin](https://github.com/alesapin)). It makes version 20.3 backward compatible again.
+
+### ClickHouse release v20.3.2.1, 2020-03-12
+
+#### Backward Incompatible Change
+
+* Fixed the issue `file name too long` when sending data for `Distributed` tables for a large number of replicas. Fixed the issue that replica credentials were exposed in the server log. The format of directory name on disk was changed to `[shard{shard_index}[_replica{replica_index}]]`. [#8911](https://github.com/ClickHouse/ClickHouse/pull/8911) ([Mikhail Korotov](https://github.com/millb)) After you upgrade to the new version, you will not be able to downgrade without manual intervention, because old server version does not recognize the new directory format. If you want to downgrade, you have to manually rename the corresponding directories to the old format. This change is relevant only if you have used asynchronous `INSERT`s to `Distributed` tables. In the version 20.3.3 we will introduce a setting that will allow you to enable the new format gradually.
+* Changed the format of replication log entries for mutation commands. You have to wait for old mutations to process before installing the new version.
+* Implement simple memory profiler that dumps stacktraces to `system.trace_log` every N bytes over soft allocation limit [#8765](https://github.com/ClickHouse/ClickHouse/pull/8765) ([Ivan](https://github.com/abyss7)) [#9472](https://github.com/ClickHouse/ClickHouse/pull/9472) ([alexey-milovidov](https://github.com/alexey-milovidov)) The column of `system.trace_log` was renamed from `timer_type` to `trace_type`. This will require changes in third-party performance analysis and flamegraph processing tools.
+* Use OS thread id everywhere instead of internal thread number. This fixes [#7477](https://github.com/ClickHouse/ClickHouse/issues/7477) Old `clickhouse-client` cannot receive logs that are send from the server when the setting `send_logs_level` is enabled, because the names and types of the structured log messages were changed. On the other hand, different server versions can send logs with different types to each other. When you don't use the `send_logs_level` setting, you should not care. [#8954](https://github.com/ClickHouse/ClickHouse/pull/8954) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Remove `indexHint` function [#9542](https://github.com/ClickHouse/ClickHouse/pull/9542) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Remove `findClusterIndex`, `findClusterValue` functions. This fixes [#8641](https://github.com/ClickHouse/ClickHouse/issues/8641). If you were using these functions, send an email to `clickhouse-feedback@yandex-team.com` [#9543](https://github.com/ClickHouse/ClickHouse/pull/9543) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Now it's not allowed to create columns or add columns with `SELECT` subquery as default expression. [#9481](https://github.com/ClickHouse/ClickHouse/pull/9481) ([alesapin](https://github.com/alesapin))
+* Require aliases for subqueries in JOIN. [#9274](https://github.com/ClickHouse/ClickHouse/pull/9274) ([Artem Zuikov](https://github.com/4ertus2))
+* Improved `ALTER MODIFY/ADD` queries logic. Now you cannot `ADD` column without type, `MODIFY` default expression doesn't change type of column and `MODIFY` type doesn't loose default expression value. Fixes [#8669](https://github.com/ClickHouse/ClickHouse/issues/8669). [#9227](https://github.com/ClickHouse/ClickHouse/pull/9227) ([alesapin](https://github.com/alesapin))
+* Require server to be restarted to apply the changes in logging configuration. This is a temporary workaround to avoid the bug where the server logs to a deleted log file (see [#8696](https://github.com/ClickHouse/ClickHouse/issues/8696)). [#8707](https://github.com/ClickHouse/ClickHouse/pull/8707) ([Alexander Kuzmenkov](https://github.com/akuzm))
+* The setting `experimental_use_processors` is enabled by default. This setting enables usage of the new query pipeline. This is internal refactoring and we expect no visible changes. If you will see any issues, set it to back zero. [#8768](https://github.com/ClickHouse/ClickHouse/pull/8768) ([alexey-milovidov](https://github.com/alexey-milovidov))
+
+#### New Feature
+* Add `Avro` and `AvroConfluent` input/output formats [#8571](https://github.com/ClickHouse/ClickHouse/pull/8571) ([Andrew Onyshchuk](https://github.com/oandrew)) [#8957](https://github.com/ClickHouse/ClickHouse/pull/8957) ([Andrew Onyshchuk](https://github.com/oandrew)) [#8717](https://github.com/ClickHouse/ClickHouse/pull/8717) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Multi-threaded and non-blocking updates of expired keys in `cache` dictionaries (with optional permission to read old ones). [#8303](https://github.com/ClickHouse/ClickHouse/pull/8303) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
+* Add query `ALTER ... MATERIALIZE TTL`. It runs mutation that forces to remove expired data by TTL and recalculates meta-information about TTL in all parts. [#8775](https://github.com/ClickHouse/ClickHouse/pull/8775) ([Anton Popov](https://github.com/CurtizJ))
+* Switch from HashJoin to MergeJoin (on disk) if needed [#9082](https://github.com/ClickHouse/ClickHouse/pull/9082) ([Artem Zuikov](https://github.com/4ertus2))
+* Added `MOVE PARTITION` command for `ALTER TABLE` [#4729](https://github.com/ClickHouse/ClickHouse/issues/4729) [#6168](https://github.com/ClickHouse/ClickHouse/pull/6168) ([Guillaume Tassery](https://github.com/YiuRULE))
+* Reloading storage configuration from configuration file on the fly. [#8594](https://github.com/ClickHouse/ClickHouse/pull/8594) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Allowed to change `storage_policy` to not less rich one. [#8107](https://github.com/ClickHouse/ClickHouse/pull/8107) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Added support for globs/wildcards for S3 storage and table function. [#8851](https://github.com/ClickHouse/ClickHouse/pull/8851) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Implement `bitAnd`, `bitOr`, `bitXor`, `bitNot` for `FixedString(N)` datatype. [#9091](https://github.com/ClickHouse/ClickHouse/pull/9091) ([Guillaume Tassery](https://github.com/YiuRULE))
+* Added function `bitCount`. This fixes [#8702](https://github.com/ClickHouse/ClickHouse/issues/8702). [#8708](https://github.com/ClickHouse/ClickHouse/pull/8708) ([alexey-milovidov](https://github.com/alexey-milovidov)) [#8749](https://github.com/ClickHouse/ClickHouse/pull/8749) ([ikopylov](https://github.com/ikopylov))
+* Add `generateRandom` table function to generate random rows with given schema. Allows to populate arbitrary test table with data. [#8994](https://github.com/ClickHouse/ClickHouse/pull/8994) ([Ilya Yatsishin](https://github.com/qoega))
+* `JSONEachRowFormat`: support special case when objects enclosed in top-level array. [#8860](https://github.com/ClickHouse/ClickHouse/pull/8860) ([Kruglov Pavel](https://github.com/Avogar))
+* Now it's possible to create a column with `DEFAULT` expression which depends on a column with default `ALIAS` expression. [#9489](https://github.com/ClickHouse/ClickHouse/pull/9489) ([alesapin](https://github.com/alesapin))
+* Allow to specify `--limit` more than the source data size in `clickhouse-obfuscator`. The data will repeat itself with different random seed. [#9155](https://github.com/ClickHouse/ClickHouse/pull/9155) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Added `groupArraySample` function (similar to `groupArray`) with reservior sampling algorithm. [#8286](https://github.com/ClickHouse/ClickHouse/pull/8286) ([Amos Bird](https://github.com/amosbird))
+* Now you can monitor the size of update queue in `cache`/`complex_key_cache` dictionaries via system metrics. [#9413](https://github.com/ClickHouse/ClickHouse/pull/9413) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
+* Allow to use CRLF as a line separator in CSV output format with setting `output_format_csv_crlf_end_of_line` is set to 1 [#8934](https://github.com/ClickHouse/ClickHouse/pull/8934) [#8935](https://github.com/ClickHouse/ClickHouse/pull/8935) [#8963](https://github.com/ClickHouse/ClickHouse/pull/8963) ([Mikhail Korotov](https://github.com/millb))
+* Implement more functions of the [H3](https://github.com/uber/h3) API: `h3GetBaseCell`, `h3HexAreaM2`, `h3IndexesAreNeighbors`, `h3ToChildren`, `h3ToString` and `stringToH3` [#8938](https://github.com/ClickHouse/ClickHouse/pull/8938) ([Nico Mandery](https://github.com/nmandery))
+* New setting introduced: `max_parser_depth` to control maximum stack size and allow large complex queries. This fixes [#6681](https://github.com/ClickHouse/ClickHouse/issues/6681) and [#7668](https://github.com/ClickHouse/ClickHouse/issues/7668). [#8647](https://github.com/ClickHouse/ClickHouse/pull/8647) ([Maxim Smirnov](https://github.com/qMBQx8GH))
+* Add a setting `force_optimize_skip_unused_shards` setting to throw if skipping of unused shards is not possible [#8805](https://github.com/ClickHouse/ClickHouse/pull/8805) ([Azat Khuzhin](https://github.com/azat))
+* Allow to configure multiple disks/volumes for storing data for send in `Distributed` engine [#8756](https://github.com/ClickHouse/ClickHouse/pull/8756) ([Azat Khuzhin](https://github.com/azat))
+* Support storage policy (`<tmp_policy>`) for storing temporary data. [#8750](https://github.com/ClickHouse/ClickHouse/pull/8750) ([Azat Khuzhin](https://github.com/azat))
+* Added `X-ClickHouse-Exception-Code` HTTP header that is set if exception was thrown before sending data. This implements [#4971](https://github.com/ClickHouse/ClickHouse/issues/4971). [#8786](https://github.com/ClickHouse/ClickHouse/pull/8786) ([Mikhail Korotov](https://github.com/millb))
+* Added function `ifNotFinite`. It is just a syntactic sugar: `ifNotFinite(x, y) = isFinite(x) ? x : y`. [#8710](https://github.com/ClickHouse/ClickHouse/pull/8710) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Added `last_successful_update_time` column in `system.dictionaries` table [#9394](https://github.com/ClickHouse/ClickHouse/pull/9394) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
+* Add `blockSerializedSize` function (size on disk without compression) [#8952](https://github.com/ClickHouse/ClickHouse/pull/8952) ([Azat Khuzhin](https://github.com/azat))
+* Add function `moduloOrZero` [#9358](https://github.com/ClickHouse/ClickHouse/pull/9358) ([hcz](https://github.com/hczhcz))
+* Added system tables `system.zeros` and `system.zeros_mt` as well as tale functions `zeros()` and `zeros_mt()`. Tables (and table functions) contain single column with name `zero` and type `UInt8`. This column contains zeros. It is needed for test purposes as the fastest method to generate many rows. This fixes [#6604](https://github.com/ClickHouse/ClickHouse/issues/6604) [#9593](https://github.com/ClickHouse/ClickHouse/pull/9593) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+
+#### Experimental Feature
+* Add new compact format of parts in `MergeTree`-family tables in which all columns are stored in one file. It helps to increase performance of small and frequent inserts. The old format (one file per column) is now called wide. Data storing format is controlled by settings `min_bytes_for_wide_part` and `min_rows_for_wide_part`. [#8290](https://github.com/ClickHouse/ClickHouse/pull/8290) ([Anton Popov](https://github.com/CurtizJ))
+* Support for S3 storage for `Log`, `TinyLog` and `StripeLog` tables. [#8862](https://github.com/ClickHouse/ClickHouse/pull/8862) ([Pavel Kovalenko](https://github.com/Jokser))
+
+#### Bug Fix
+* Fixed inconsistent whitespaces in log messages. [#9322](https://github.com/ClickHouse/ClickHouse/pull/9322) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix bug in which arrays of unnamed tuples were flattened as Nested structures on table creation. [#8866](https://github.com/ClickHouse/ClickHouse/pull/8866) ([achulkov2](https://github.com/achulkov2))
+* Fixed the issue when "Too many open files" error may happen if there are too many files matching glob pattern in `File` table or `file` table function. Now files are opened lazily. This fixes [#8857](https://github.com/ClickHouse/ClickHouse/issues/8857) [#8861](https://github.com/ClickHouse/ClickHouse/pull/8861) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* DROP TEMPORARY TABLE now drops only temporary table. [#8907](https://github.com/ClickHouse/ClickHouse/pull/8907) ([Vitaly Baranov](https://github.com/vitlibar))
+* Remove outdated partition when we shutdown the server or DETACH/ATTACH a table. [#8602](https://github.com/ClickHouse/ClickHouse/pull/8602) ([Guillaume Tassery](https://github.com/YiuRULE))
+* For how the default disk calculates the free space from `data` subdirectory. Fixed the issue when the amount of free space is not calculated correctly if the `data` directory is mounted to a separate device (rare case). This fixes [#7441](https://github.com/ClickHouse/ClickHouse/issues/7441) [#9257](https://github.com/ClickHouse/ClickHouse/pull/9257) ([Mikhail Korotov](https://github.com/millb))
+* Allow comma (cross) join with IN () inside. [#9251](https://github.com/ClickHouse/ClickHouse/pull/9251) ([Artem Zuikov](https://github.com/4ertus2))
+* Allow to rewrite CROSS to INNER JOIN if there's [NOT] LIKE operator in WHERE section. [#9229](https://github.com/ClickHouse/ClickHouse/pull/9229) ([Artem Zuikov](https://github.com/4ertus2))
+* Fix possible incorrect result after `GROUP BY` with enabled setting `distributed_aggregation_memory_efficient`. Fixes [#9134](https://github.com/ClickHouse/ClickHouse/issues/9134). [#9289](https://github.com/ClickHouse/ClickHouse/pull/9289) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Found keys were counted as missed in metrics of cache dictionaries. [#9411](https://github.com/ClickHouse/ClickHouse/pull/9411) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
+* Fix replication protocol incompatibility introduced in [#8598](https://github.com/ClickHouse/ClickHouse/issues/8598). [#9412](https://github.com/ClickHouse/ClickHouse/pull/9412) ([alesapin](https://github.com/alesapin))
+* Fixed race condition on `queue_task_handle` at the startup of `ReplicatedMergeTree` tables. [#9552](https://github.com/ClickHouse/ClickHouse/pull/9552) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* The token `NOT` didn't work in `SHOW TABLES NOT LIKE` query [#8727](https://github.com/ClickHouse/ClickHouse/issues/8727) [#8940](https://github.com/ClickHouse/ClickHouse/pull/8940) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Added range check to function `h3EdgeLengthM`. Without this check, buffer overflow is possible. [#8945](https://github.com/ClickHouse/ClickHouse/pull/8945) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fixed up a bug in batched calculations of ternary logical OPs on multiple arguments (more than 10). [#8718](https://github.com/ClickHouse/ClickHouse/pull/8718) ([Alexander Kazakov](https://github.com/Akazz))
+* Fix error of PREWHERE optimization, which could lead to segfaults or `Inconsistent number of columns got from MergeTreeRangeReader` exception. [#9024](https://github.com/ClickHouse/ClickHouse/pull/9024) ([Anton Popov](https://github.com/CurtizJ))
+* Fix unexpected `Timeout exceeded while reading from socket` exception, which randomly happens on secure connection before timeout actually exceeded and when query profiler is enabled. Also add `connect_timeout_with_failover_secure_ms` settings (default 100ms), which is similar to `connect_timeout_with_failover_ms`, but is used for secure connections (because SSL handshake is slower, than ordinary TCP connection) [#9026](https://github.com/ClickHouse/ClickHouse/pull/9026) ([tavplubix](https://github.com/tavplubix))
+* Fix bug with mutations finalization, when mutation may hang in state with `parts_to_do=0` and `is_done=0`. [#9022](https://github.com/ClickHouse/ClickHouse/pull/9022) ([alesapin](https://github.com/alesapin))
+* Use new ANY JOIN logic with `partial_merge_join` setting. It's possible to make `ANY|ALL|SEMI LEFT` and `ALL INNER` joins with `partial_merge_join=1` now. [#8932](https://github.com/ClickHouse/ClickHouse/pull/8932) ([Artem Zuikov](https://github.com/4ertus2))
+* Shard now clamps the settings got from the initiator to the shard's constaints instead of throwing an exception. This fix allows to send queries to a shard with another constraints. [#9447](https://github.com/ClickHouse/ClickHouse/pull/9447) ([Vitaly Baranov](https://github.com/vitlibar))
+* Fixed memory management problem in `MergeTreeReadPool`. [#8791](https://github.com/ClickHouse/ClickHouse/pull/8791) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Fix `toDecimal*OrNull()` functions family when called with string `e`. Fixes [#8312](https://github.com/ClickHouse/ClickHouse/issues/8312) [#8764](https://github.com/ClickHouse/ClickHouse/pull/8764) ([Artem Zuikov](https://github.com/4ertus2))
+* Make sure that `FORMAT Null` sends no data to the client. [#8767](https://github.com/ClickHouse/ClickHouse/pull/8767) ([Alexander Kuzmenkov](https://github.com/akuzm))
+* Fix bug that timestamp in `LiveViewBlockInputStream` will not updated. `LIVE VIEW` is an experimental feature. [#8644](https://github.com/ClickHouse/ClickHouse/pull/8644) ([vxider](https://github.com/Vxider)) [#8625](https://github.com/ClickHouse/ClickHouse/pull/8625) ([vxider](https://github.com/Vxider))
+* Fixed `ALTER MODIFY TTL` wrong behavior which did not allow to delete old TTL expressions. [#8422](https://github.com/ClickHouse/ClickHouse/pull/8422) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Fixed UBSan report in MergeTreeIndexSet. This fixes [#9250](https://github.com/ClickHouse/ClickHouse/issues/9250) [#9365](https://github.com/ClickHouse/ClickHouse/pull/9365) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fixed the behaviour of `match` and `extract` functions when haystack has zero bytes. The behaviour was wrong when haystack was constant. This fixes [#9160](https://github.com/ClickHouse/ClickHouse/issues/9160) [#9163](https://github.com/ClickHouse/ClickHouse/pull/9163) ([alexey-milovidov](https://github.com/alexey-milovidov)) [#9345](https://github.com/ClickHouse/ClickHouse/pull/9345) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Avoid throwing from destructor in Apache Avro 3rd-party library. [#9066](https://github.com/ClickHouse/ClickHouse/pull/9066) ([Andrew Onyshchuk](https://github.com/oandrew))
+* Don't commit a batch polled from `Kafka` partially as it can lead to holes in data. [#8876](https://github.com/ClickHouse/ClickHouse/pull/8876) ([filimonov](https://github.com/filimonov))
+* Fix `joinGet` with nullable return types. [#8919](https://github.com/ClickHouse/ClickHouse/issues/8919) [#9014](https://github.com/ClickHouse/ClickHouse/pull/9014) ([Amos Bird](https://github.com/amosbird))
+* Fix data incompatibility when compressed with `T64` codec. [#9016](https://github.com/ClickHouse/ClickHouse/pull/9016) ([Artem Zuikov](https://github.com/4ertus2)) Fix data type ids in `T64` compression codec that leads to wrong (de)compression in affected versions. [#9033](https://github.com/ClickHouse/ClickHouse/pull/9033) ([Artem Zuikov](https://github.com/4ertus2))
+* Add setting `enable_early_constant_folding` and disable it in some cases that leads to errors. [#9010](https://github.com/ClickHouse/ClickHouse/pull/9010) ([Artem Zuikov](https://github.com/4ertus2))
+* Fix pushdown predicate optimizer with VIEW and enable the test [#9011](https://github.com/ClickHouse/ClickHouse/pull/9011) ([Winter Zhang](https://github.com/zhang2014))
+* Fix segfault in `Merge` tables, that can happen when reading from `File` storages [#9387](https://github.com/ClickHouse/ClickHouse/pull/9387) ([tavplubix](https://github.com/tavplubix))
+* Added a check for storage policy in `ATTACH PARTITION FROM`, `REPLACE PARTITION`, `MOVE TO TABLE`. Otherwise it could make data of part inaccessible after restart and prevent ClickHouse to start. [#9383](https://github.com/ClickHouse/ClickHouse/pull/9383) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Fix alters if there is TTL set for table. [#8800](https://github.com/ClickHouse/ClickHouse/pull/8800) ([Anton Popov](https://github.com/CurtizJ))
+* Fix race condition that can happen when `SYSTEM RELOAD ALL DICTIONARIES` is executed while some dictionary is being modified/added/removed. [#8801](https://github.com/ClickHouse/ClickHouse/pull/8801) ([Vitaly Baranov](https://github.com/vitlibar))
+* In previous versions `Memory` database engine use empty data path, so tables are created in `path` directory (e.g. `/var/lib/clickhouse/`), not in data directory of database (e.g. `/var/lib/clickhouse/db_name`). [#8753](https://github.com/ClickHouse/ClickHouse/pull/8753) ([tavplubix](https://github.com/tavplubix))
+* Fixed wrong log messages about missing default disk or policy. [#9530](https://github.com/ClickHouse/ClickHouse/pull/9530) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Fix not(has()) for the bloom_filter index of array types. [#9407](https://github.com/ClickHouse/ClickHouse/pull/9407) ([achimbab](https://github.com/achimbab))
+* Allow first column(s) in a table with `Log` engine be an alias [#9231](https://github.com/ClickHouse/ClickHouse/pull/9231) ([Ivan](https://github.com/abyss7))
+* Fix order of ranges while reading from `MergeTree` table in one thread. It could lead to exceptions from `MergeTreeRangeReader` or wrong query results. [#9050](https://github.com/ClickHouse/ClickHouse/pull/9050) ([Anton Popov](https://github.com/CurtizJ))
+* Make `reinterpretAsFixedString` to return `FixedString` instead of `String`. [#9052](https://github.com/ClickHouse/ClickHouse/pull/9052) ([Andrew Onyshchuk](https://github.com/oandrew))
+* Avoid extremely rare cases when the user can get wrong error message (`Success` instead of detailed error description). [#9457](https://github.com/ClickHouse/ClickHouse/pull/9457) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Do not crash when using `Template` format with empty row template. [#8785](https://github.com/ClickHouse/ClickHouse/pull/8785) ([Alexander Kuzmenkov](https://github.com/akuzm))
+* Metadata files for system tables could be created in wrong place [#8653](https://github.com/ClickHouse/ClickHouse/pull/8653) ([tavplubix](https://github.com/tavplubix)) Fixes [#8581](https://github.com/ClickHouse/ClickHouse/issues/8581).
+* Fix data race on exception_ptr in cache dictionary [#8303](https://github.com/ClickHouse/ClickHouse/issues/8303). [#9379](https://github.com/ClickHouse/ClickHouse/pull/9379) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
+* Do not throw an exception for query `ATTACH TABLE IF NOT EXISTS`. Previously it was thrown if table already exists, despite the `IF NOT EXISTS` clause. [#8967](https://github.com/ClickHouse/ClickHouse/pull/8967) ([Anton Popov](https://github.com/CurtizJ))
+* Fixed missing closing paren in exception message. [#8811](https://github.com/ClickHouse/ClickHouse/pull/8811) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Avoid message `Possible deadlock avoided` at the startup of clickhouse-client in interactive mode. [#9455](https://github.com/ClickHouse/ClickHouse/pull/9455) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fixed the issue when padding at the end of base64 encoded value can be malformed. Update base64 library. This fixes [#9491](https://github.com/ClickHouse/ClickHouse/issues/9491), closes [#9492](https://github.com/ClickHouse/ClickHouse/issues/9492) [#9500](https://github.com/ClickHouse/ClickHouse/pull/9500) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Prevent losing data in `Kafka` in rare cases when exception happens after reading suffix but before commit. Fixes [#9378](https://github.com/ClickHouse/ClickHouse/issues/9378) [#9507](https://github.com/ClickHouse/ClickHouse/pull/9507) ([filimonov](https://github.com/filimonov))
+* Fixed exception in `DROP TABLE IF EXISTS` [#8663](https://github.com/ClickHouse/ClickHouse/pull/8663) ([Nikita Vasilev](https://github.com/nikvas0))
+* Fix crash when a user tries to `ALTER MODIFY SETTING` for old-formated `MergeTree` table engines family. [#9435](https://github.com/ClickHouse/ClickHouse/pull/9435) ([alesapin](https://github.com/alesapin))
+* Support for UInt64 numbers that don't fit in Int64 in JSON-related functions. Update SIMDJSON to master. This fixes [#9209](https://github.com/ClickHouse/ClickHouse/issues/9209) [#9344](https://github.com/ClickHouse/ClickHouse/pull/9344) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fixed execution of inversed predicates when non-strictly monotinic functional index is used. [#9223](https://github.com/ClickHouse/ClickHouse/pull/9223) ([Alexander Kazakov](https://github.com/Akazz))
+* Don't try to fold `IN` constant in `GROUP BY` [#8868](https://github.com/ClickHouse/ClickHouse/pull/8868) ([Amos Bird](https://github.com/amosbird))
+* Fix bug in `ALTER DELETE` mutations which leads to index corruption. This fixes [#9019](https://github.com/ClickHouse/ClickHouse/issues/9019) and [#8982](https://github.com/ClickHouse/ClickHouse/issues/8982). Additionally fix extremely rare race conditions in `ReplicatedMergeTree` `ALTER` queries. [#9048](https://github.com/ClickHouse/ClickHouse/pull/9048) ([alesapin](https://github.com/alesapin))
+* When the setting `compile_expressions` is enabled, you can get `unexpected column` in `LLVMExecutableFunction` when we use `Nullable` type [#8910](https://github.com/ClickHouse/ClickHouse/pull/8910) ([Guillaume Tassery](https://github.com/YiuRULE))
+* Multiple fixes for `Kafka` engine: 1) fix duplicates that were appearing during consumer group rebalance. 2) Fix rare 'holes' appeared when data were polled from several partitions with one poll and committed partially (now we always process / commit the whole polled block of messages). 3) Fix flushes by block size (before that only flushing by timeout was working properly). 4) better subscription procedure (with assignment feedback). 5) Make tests work faster (with default intervals and timeouts). Due to the fact that data was not flushed by block size before (as it should according to documentation), that PR may lead to some performance degradation with default settings (due to more often & tinier flushes which are less optimal). If you encounter the performance issue after that change - please increase `kafka_max_block_size` in the table to the bigger value ( for example `CREATE TABLE ...Engine=Kafka ... SETTINGS ... kafka_max_block_size=524288`). Fixes [#7259](https://github.com/ClickHouse/ClickHouse/issues/7259) [#8917](https://github.com/ClickHouse/ClickHouse/pull/8917) ([filimonov](https://github.com/filimonov))
+* Fix `Parameter out of bound` exception in some queries after PREWHERE optimizations. [#8914](https://github.com/ClickHouse/ClickHouse/pull/8914) ([Baudouin Giard](https://github.com/bgiard))
+* Fixed the case of mixed-constness of arguments of function `arrayZip`. [#8705](https://github.com/ClickHouse/ClickHouse/pull/8705) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* When executing `CREATE` query, fold constant expressions in storage engine arguments. Replace empty database name with current database. Fixes [#6508](https://github.com/ClickHouse/ClickHouse/issues/6508), [#3492](https://github.com/ClickHouse/ClickHouse/issues/3492) [#9262](https://github.com/ClickHouse/ClickHouse/pull/9262) ([tavplubix](https://github.com/tavplubix))
+* Now it's not possible to create or add columns with simple cyclic aliases like `a DEFAULT b, b DEFAULT a`. [#9603](https://github.com/ClickHouse/ClickHouse/pull/9603) ([alesapin](https://github.com/alesapin))
+* Fixed a bug with double move which may corrupt original part. This is relevant if you use `ALTER TABLE MOVE` [#8680](https://github.com/ClickHouse/ClickHouse/pull/8680) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Allow `interval` identifier to correctly parse without backticks. Fixed issue when a query cannot be executed even if the `interval` identifier is enclosed in backticks or double quotes. This fixes [#9124](https://github.com/ClickHouse/ClickHouse/issues/9124). [#9142](https://github.com/ClickHouse/ClickHouse/pull/9142) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fixed fuzz test and incorrect behaviour of `bitTestAll`/`bitTestAny` functions. [#9143](https://github.com/ClickHouse/ClickHouse/pull/9143) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix possible crash/wrong number of rows in `LIMIT n WITH TIES` when there are a lot of rows equal to n'th row. [#9464](https://github.com/ClickHouse/ClickHouse/pull/9464) ([tavplubix](https://github.com/tavplubix))
+* Fix mutations with parts written with enabled `insert_quorum`. [#9463](https://github.com/ClickHouse/ClickHouse/pull/9463) ([alesapin](https://github.com/alesapin))
+* Fix data race at destruction of `Poco::HTTPServer`. It could happen when server is started and immediately shut down. [#9468](https://github.com/ClickHouse/ClickHouse/pull/9468) ([Anton Popov](https://github.com/CurtizJ))
+* Fix bug in which a misleading error message was shown when running `SHOW CREATE TABLE a_table_that_does_not_exist`. [#8899](https://github.com/ClickHouse/ClickHouse/pull/8899) ([achulkov2](https://github.com/achulkov2))
+* Fixed `Parameters are out of bound` exception in some rare cases when we have a constant in the `SELECT` clause when we have an `ORDER BY` and a `LIMIT` clause. [#8892](https://github.com/ClickHouse/ClickHouse/pull/8892) ([Guillaume Tassery](https://github.com/YiuRULE))
+* Fix mutations finalization, when already done mutation can have status `is_done=0`. [#9217](https://github.com/ClickHouse/ClickHouse/pull/9217) ([alesapin](https://github.com/alesapin))
+* Prevent from executing `ALTER ADD INDEX` for MergeTree tables with old syntax, because it doesn't work. [#8822](https://github.com/ClickHouse/ClickHouse/pull/8822) ([Mikhail Korotov](https://github.com/millb))
+* During server startup do not access table, which `LIVE VIEW` depends on, so server will be able to start. Also remove `LIVE VIEW` dependencies when detaching `LIVE VIEW`. `LIVE VIEW` is an experimental feature. [#8824](https://github.com/ClickHouse/ClickHouse/pull/8824) ([tavplubix](https://github.com/tavplubix))
+* Fix possible segfault in `MergeTreeRangeReader`, while executing `PREWHERE`. [#9106](https://github.com/ClickHouse/ClickHouse/pull/9106) ([Anton Popov](https://github.com/CurtizJ))
+* Fix possible mismatched checksums with column TTLs. [#9451](https://github.com/ClickHouse/ClickHouse/pull/9451) ([Anton Popov](https://github.com/CurtizJ))
+* Fixed a bug when parts were not being moved in background by TTL rules in case when there is only one volume. [#8672](https://github.com/ClickHouse/ClickHouse/pull/8672) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Fixed the issue `Method createColumn() is not implemented for data type Set`. This fixes [#7799](https://github.com/ClickHouse/ClickHouse/issues/7799). [#8674](https://github.com/ClickHouse/ClickHouse/pull/8674) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Now we will try finalize mutations more frequently. [#9427](https://github.com/ClickHouse/ClickHouse/pull/9427) ([alesapin](https://github.com/alesapin))
+* Fix `intDiv` by minus one constant [#9351](https://github.com/ClickHouse/ClickHouse/pull/9351) ([hcz](https://github.com/hczhcz))
+* Fix possible race condition in `BlockIO`. [#9356](https://github.com/ClickHouse/ClickHouse/pull/9356) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fix bug leading to server termination when trying to use / drop `Kafka` table created with wrong parameters. [#9513](https://github.com/ClickHouse/ClickHouse/pull/9513) ([filimonov](https://github.com/filimonov))
+* Added workaround if OS returns wrong result for `timer_create` function. [#8837](https://github.com/ClickHouse/ClickHouse/pull/8837) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fixed error in usage of `min_marks_for_seek` parameter. Fixed the error message when there is no sharding key in Distributed table and we try to skip unused shards. [#8908](https://github.com/ClickHouse/ClickHouse/pull/8908) ([Azat Khuzhin](https://github.com/azat))
+
+#### Improvement
+* Implement `ALTER MODIFY/DROP` queries on top of mutations for `ReplicatedMergeTree*` engines family. Now `ALTERS` blocks only at the metadata update stage, and don't block after that. [#8701](https://github.com/ClickHouse/ClickHouse/pull/8701) ([alesapin](https://github.com/alesapin))
+* Add ability to rewrite CROSS to INNER JOINs with `WHERE` section containing unqialified names. [#9512](https://github.com/ClickHouse/ClickHouse/pull/9512) ([Artem Zuikov](https://github.com/4ertus2))
+* Make `SHOW TABLES` and `SHOW DATABASES` queries support the `WHERE` expressions and `FROM`/`IN` [#9076](https://github.com/ClickHouse/ClickHouse/pull/9076) ([sundyli](https://github.com/sundy-li))
+* Added a setting `deduplicate_blocks_in_dependent_materialized_views`. [#9070](https://github.com/ClickHouse/ClickHouse/pull/9070) ([urykhy](https://github.com/urykhy))
+* After recent changes MySQL client started to print binary strings in hex thereby making them not readable ([#9032](https://github.com/ClickHouse/ClickHouse/issues/9032)). The workaround in ClickHouse is to mark string columns as UTF-8, which is not always, but usually the case. [#9079](https://github.com/ClickHouse/ClickHouse/pull/9079) ([Yuriy Baranov](https://github.com/yurriy))
+* Add support of String and FixedString keys for `sumMap` [#8903](https://github.com/ClickHouse/ClickHouse/pull/8903) ([Baudouin Giard](https://github.com/bgiard))
+* Support string keys in SummingMergeTree maps [#8933](https://github.com/ClickHouse/ClickHouse/pull/8933) ([Baudouin Giard](https://github.com/bgiard))
+* Signal termination of thread to the thread pool even if the thread has thrown exception [#8736](https://github.com/ClickHouse/ClickHouse/pull/8736) ([Ding Xiang Fei](https://github.com/dingxiangfei2009))
+* Allow to set `query_id` in `clickhouse-benchmark` [#9416](https://github.com/ClickHouse/ClickHouse/pull/9416) ([Anton Popov](https://github.com/CurtizJ))
+* Don't allow strange expressions in `ALTER TABLE ... PARTITION partition` query. This addresses [#7192](https://github.com/ClickHouse/ClickHouse/issues/7192) [#8835](https://github.com/ClickHouse/ClickHouse/pull/8835) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* The table `system.table_engines` now provides information about feature support (like `supports_ttl` or `supports_sort_order`). [#8830](https://github.com/ClickHouse/ClickHouse/pull/8830) ([Max Akhmedov](https://github.com/zlobober))
+* Enable `system.metric_log` by default. It will contain rows with values of ProfileEvents, CurrentMetrics collected with "collect_interval_milliseconds" interval (one second by default). The table is very small (usually in order of megabytes) and collecting this data by default is reasonable. [#9225](https://github.com/ClickHouse/ClickHouse/pull/9225) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Initialize query profiler for all threads in a group, e.g. it allows to fully profile insert-queries. Fixes [#6964](https://github.com/ClickHouse/ClickHouse/issues/6964) [#8874](https://github.com/ClickHouse/ClickHouse/pull/8874) ([Ivan](https://github.com/abyss7))
+* Now temporary `LIVE VIEW` is created by `CREATE LIVE VIEW name WITH TIMEOUT [42] ...` instead of `CREATE TEMPORARY LIVE VIEW ...`, because the previous syntax was not consistent with `CREATE TEMPORARY TABLE ...` [#9131](https://github.com/ClickHouse/ClickHouse/pull/9131) ([tavplubix](https://github.com/tavplubix))
+* Add text_log.level configuration parameter to limit entries that goes to `system.text_log` table [#8809](https://github.com/ClickHouse/ClickHouse/pull/8809) ([Azat Khuzhin](https://github.com/azat))
+* Allow to put downloaded part to a disks/volumes according to TTL rules [#8598](https://github.com/ClickHouse/ClickHouse/pull/8598) ([Vladimir Chebotarev](https://github.com/excitoon))
+* For external MySQL dictionaries, allow to mutualize MySQL connection pool to "share" them among dictionaries. This option significantly reduces the number of connections to MySQL servers. [#9409](https://github.com/ClickHouse/ClickHouse/pull/9409) ([Clément Rodriguez](https://github.com/clemrodriguez))
+* Show nearest query execution time for quantiles in `clickhouse-benchmark` output instead of interpolated values. It's better to show values that correspond to the execution time of some queries. [#8712](https://github.com/ClickHouse/ClickHouse/pull/8712) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Possibility to add key & timestamp for the message when inserting data to Kafka. Fixes [#7198](https://github.com/ClickHouse/ClickHouse/issues/7198) [#8969](https://github.com/ClickHouse/ClickHouse/pull/8969) ([filimonov](https://github.com/filimonov))
+* If server is run from terminal, highlight thread number, query id and log priority by colors. This is for improved readability of correlated log messages for developers. [#8961](https://github.com/ClickHouse/ClickHouse/pull/8961) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Better exception message while loading tables for `Ordinary` database. [#9527](https://github.com/ClickHouse/ClickHouse/pull/9527) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Implement `arraySlice` for arrays with aggregate function states. This fixes [#9388](https://github.com/ClickHouse/ClickHouse/issues/9388) [#9391](https://github.com/ClickHouse/ClickHouse/pull/9391) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Allow constant functions and constant arrays to be used on the right side of IN operator. [#8813](https://github.com/ClickHouse/ClickHouse/pull/8813) ([Anton Popov](https://github.com/CurtizJ))
+* If zookeeper exception has happened while fetching data for system.replicas, display it in a separate column. This implements [#9137](https://github.com/ClickHouse/ClickHouse/issues/9137) [#9138](https://github.com/ClickHouse/ClickHouse/pull/9138) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Atomically remove MergeTree data parts on destroy. [#8402](https://github.com/ClickHouse/ClickHouse/pull/8402) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Support row-level security for Distributed tables. [#8926](https://github.com/ClickHouse/ClickHouse/pull/8926) ([Ivan](https://github.com/abyss7))
+* Now we recognize suffix (like KB, KiB...) in settings values. [#8072](https://github.com/ClickHouse/ClickHouse/pull/8072) ([Mikhail Korotov](https://github.com/millb))
+* Prevent out of memory while constructing result of a large JOIN. [#8637](https://github.com/ClickHouse/ClickHouse/pull/8637) ([Artem Zuikov](https://github.com/4ertus2))
+* Added names of clusters to suggestions in interactive mode in `clickhouse-client`. [#8709](https://github.com/ClickHouse/ClickHouse/pull/8709) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Initialize query profiler for all threads in a group, e.g. it allows to fully profile insert-queries [#8820](https://github.com/ClickHouse/ClickHouse/pull/8820) ([Ivan](https://github.com/abyss7))
+* Added column `exception_code` in `system.query_log` table. [#8770](https://github.com/ClickHouse/ClickHouse/pull/8770) ([Mikhail Korotov](https://github.com/millb))
+* Enabled MySQL compatibility server on port `9004` in the default server configuration file. Fixed password generation command in the example in configuration. [#8771](https://github.com/ClickHouse/ClickHouse/pull/8771) ([Yuriy Baranov](https://github.com/yurriy))
+* Prevent abort on shutdown if the filesystem is readonly. This fixes [#9094](https://github.com/ClickHouse/ClickHouse/issues/9094) [#9100](https://github.com/ClickHouse/ClickHouse/pull/9100) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Better exception message when length is required in HTTP POST query. [#9453](https://github.com/ClickHouse/ClickHouse/pull/9453) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Add `_path` and `_file` virtual columns to `HDFS` and `File` engines and `hdfs` and `file` table functions [#8489](https://github.com/ClickHouse/ClickHouse/pull/8489) ([Olga Khvostikova](https://github.com/stavrolia))
+* Fix error `Cannot find column` while inserting into `MATERIALIZED VIEW` in case if new column was added to view's internal table. [#8766](https://github.com/ClickHouse/ClickHouse/pull/8766) [#8788](https://github.com/ClickHouse/ClickHouse/pull/8788) ([vzakaznikov](https://github.com/vzakaznikov)) [#8788](https://github.com/ClickHouse/ClickHouse/issues/8788) [#8806](https://github.com/ClickHouse/ClickHouse/pull/8806) ([Nikolai Kochetov](https://github.com/KochetovNicolai)) [#8803](https://github.com/ClickHouse/ClickHouse/pull/8803) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fix progress over native client-server protocol, by send progress after final update (like logs). This may be relevant only to some third-party tools that are using native protocol. [#9495](https://github.com/ClickHouse/ClickHouse/pull/9495) ([Azat Khuzhin](https://github.com/azat))
+* Add a system metric tracking the number of client connections using MySQL protocol ([#9013](https://github.com/ClickHouse/ClickHouse/issues/9013)). [#9015](https://github.com/ClickHouse/ClickHouse/pull/9015) ([Eugene Klimov](https://github.com/Slach))
+* From now on, HTTP responses will have `X-ClickHouse-Timezone` header set to the same timezone value that `SELECT timezone()` would report. [#9493](https://github.com/ClickHouse/ClickHouse/pull/9493) ([Denis Glazachev](https://github.com/traceon))
+
+#### Performance Improvement
+* Improve performance of analysing index with IN [#9261](https://github.com/ClickHouse/ClickHouse/pull/9261) ([Anton Popov](https://github.com/CurtizJ))
+* Simpler and more efficient code in Logical Functions + code cleanups. A followup to [#8718](https://github.com/ClickHouse/ClickHouse/issues/8718) [#8728](https://github.com/ClickHouse/ClickHouse/pull/8728) ([Alexander Kazakov](https://github.com/Akazz))
+* Overall performance improvement (in range of 5%..200% for affected queries) by ensuring even more strict aliasing with C++20 features. [#9304](https://github.com/ClickHouse/ClickHouse/pull/9304) ([Amos Bird](https://github.com/amosbird))
+* More strict aliasing for inner loops of comparison functions. [#9327](https://github.com/ClickHouse/ClickHouse/pull/9327) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* More strict aliasing for inner loops of arithmetic functions. [#9325](https://github.com/ClickHouse/ClickHouse/pull/9325) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* A ~3 times faster implementation for ColumnVector::replicate(), via which ColumnConst::convertToFullColumn() is implemented. Also will be useful in tests when materializing constants. [#9293](https://github.com/ClickHouse/ClickHouse/pull/9293) ([Alexander Kazakov](https://github.com/Akazz))
+* Another minor performance improvement to `ColumnVector::replicate()` (this speeds up the `materialize` function and higher order functions) an even further improvement to [#9293](https://github.com/ClickHouse/ClickHouse/issues/9293) [#9442](https://github.com/ClickHouse/ClickHouse/pull/9442) ([Alexander Kazakov](https://github.com/Akazz))
+* Improved performance of `stochasticLinearRegression` aggregate function. This patch is contributed by Intel. [#8652](https://github.com/ClickHouse/ClickHouse/pull/8652) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Improve performance of `reinterpretAsFixedString` function. [#9342](https://github.com/ClickHouse/ClickHouse/pull/9342) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Do not send blocks to client for `Null` format in processors pipeline. [#8797](https://github.com/ClickHouse/ClickHouse/pull/8797) ([Nikolai Kochetov](https://github.com/KochetovNicolai)) [#8767](https://github.com/ClickHouse/ClickHouse/pull/8767) ([Alexander Kuzmenkov](https://github.com/akuzm))
+
+#### Build/Testing/Packaging Improvement
+* Exception handling now works correctly on Windows Subsystem for Linux. See https://github.com/ClickHouse-Extras/libunwind/pull/3 This fixes [#6480](https://github.com/ClickHouse/ClickHouse/issues/6480) [#9564](https://github.com/ClickHouse/ClickHouse/pull/9564) ([sobolevsv](https://github.com/sobolevsv))
+* Replace `readline` with `replxx` for interactive line editing in `clickhouse-client` [#8416](https://github.com/ClickHouse/ClickHouse/pull/8416) ([Ivan](https://github.com/abyss7))
+* Better build time and less template instantiations in FunctionsComparison. [#9324](https://github.com/ClickHouse/ClickHouse/pull/9324) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Added integration with `clang-tidy` in CI. See also [#6044](https://github.com/ClickHouse/ClickHouse/issues/6044) [#9566](https://github.com/ClickHouse/ClickHouse/pull/9566) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Now we link ClickHouse in CI using `lld` even for `gcc`. [#9049](https://github.com/ClickHouse/ClickHouse/pull/9049) ([alesapin](https://github.com/alesapin))
+* Allow to randomize thread scheduling and insert glitches when `THREAD_FUZZER_*` environment variables are set. This helps testing. [#9459](https://github.com/ClickHouse/ClickHouse/pull/9459) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Enable secure sockets in stateless tests [#9288](https://github.com/ClickHouse/ClickHouse/pull/9288) ([tavplubix](https://github.com/tavplubix))
+* Make SPLIT_SHARED_LIBRARIES=OFF more robust [#9156](https://github.com/ClickHouse/ClickHouse/pull/9156) ([Azat Khuzhin](https://github.com/azat))
+* Make "performance_introspection_and_logging" test reliable to random server stuck. This may happen in CI environment. See also [#9515](https://github.com/ClickHouse/ClickHouse/issues/9515) [#9528](https://github.com/ClickHouse/ClickHouse/pull/9528) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Validate XML in style check. [#9550](https://github.com/ClickHouse/ClickHouse/pull/9550) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fixed race condition in test `00738_lock_for_inner_table`. This test relied on sleep. [#9555](https://github.com/ClickHouse/ClickHouse/pull/9555) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Remove performance tests of type `once`. This is needed to run all performance tests in statistical comparison mode (more reliable). [#9557](https://github.com/ClickHouse/ClickHouse/pull/9557) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Added performance test for arithmetic functions. [#9326](https://github.com/ClickHouse/ClickHouse/pull/9326) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Added performance test for `sumMap` and `sumMapWithOverflow` aggregate functions. Follow-up for [#8933](https://github.com/ClickHouse/ClickHouse/issues/8933) [#8947](https://github.com/ClickHouse/ClickHouse/pull/8947) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Ensure style of ErrorCodes by style check. [#9370](https://github.com/ClickHouse/ClickHouse/pull/9370) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Add script for tests history. [#8796](https://github.com/ClickHouse/ClickHouse/pull/8796) ([alesapin](https://github.com/alesapin))
+* Add GCC warning `-Wsuggest-override` to locate and fix all places where `override` keyword must be used. [#8760](https://github.com/ClickHouse/ClickHouse/pull/8760) ([kreuzerkrieg](https://github.com/kreuzerkrieg))
+* Ignore weak symbol under Mac OS X because it must be defined [#9538](https://github.com/ClickHouse/ClickHouse/pull/9538) ([Deleted user](https://github.com/ghost))
+* Normalize running time of some queries in performance tests. This is done in preparation to run all the performance tests in comparison mode. [#9565](https://github.com/ClickHouse/ClickHouse/pull/9565) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix some tests to support pytest with query tests [#9062](https://github.com/ClickHouse/ClickHouse/pull/9062) ([Ivan](https://github.com/abyss7))
+* Enable SSL in build with MSan, so server will not fail at startup when running stateless tests [#9531](https://github.com/ClickHouse/ClickHouse/pull/9531) ([tavplubix](https://github.com/tavplubix))
+* Fix database substitution in test results [#9384](https://github.com/ClickHouse/ClickHouse/pull/9384) ([Ilya Yatsishin](https://github.com/qoega))
+* Build fixes for miscellaneous platforms [#9381](https://github.com/ClickHouse/ClickHouse/pull/9381) ([proller](https://github.com/proller)) [#8755](https://github.com/ClickHouse/ClickHouse/pull/8755) ([proller](https://github.com/proller)) [#8631](https://github.com/ClickHouse/ClickHouse/pull/8631) ([proller](https://github.com/proller))
+* Added disks section to stateless-with-coverage test docker image [#9213](https://github.com/ClickHouse/ClickHouse/pull/9213) ([Pavel Kovalenko](https://github.com/Jokser))
+* Get rid of in-source-tree files when building with GRPC [#9588](https://github.com/ClickHouse/ClickHouse/pull/9588) ([Amos Bird](https://github.com/amosbird))
+* Slightly faster build time by removing SessionCleaner from Context. Make the code of SessionCleaner more simple. [#9232](https://github.com/ClickHouse/ClickHouse/pull/9232) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Updated checking for hung queries in clickhouse-test script [#8858](https://github.com/ClickHouse/ClickHouse/pull/8858) ([Alexander Kazakov](https://github.com/Akazz))
+* Removed some useless files from repository. [#8843](https://github.com/ClickHouse/ClickHouse/pull/8843) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Changed type of math perftests from `once` to `loop`. [#8783](https://github.com/ClickHouse/ClickHouse/pull/8783) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Add docker image which allows to build interactive code browser HTML report for our codebase. [#8781](https://github.com/ClickHouse/ClickHouse/pull/8781) ([alesapin](https://github.com/alesapin)) See [Woboq Code Browser](https://clickhouse-test-reports.s3.yandex.net/codebrowser/html_report///ClickHouse/dbms/index.html)
+* Suppress some test failures under MSan. [#8780](https://github.com/ClickHouse/ClickHouse/pull/8780) ([Alexander Kuzmenkov](https://github.com/akuzm))
+* Speedup "exception while insert" test. This test often time out in debug-with-coverage build. [#8711](https://github.com/ClickHouse/ClickHouse/pull/8711) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Updated `libcxx` and `libcxxabi` to master. In preparation to [#9304](https://github.com/ClickHouse/ClickHouse/issues/9304) [#9308](https://github.com/ClickHouse/ClickHouse/pull/9308) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix flacky test `00910_zookeeper_test_alter_compression_codecs`. [#9525](https://github.com/ClickHouse/ClickHouse/pull/9525) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Clean up duplicated linker flags. Make sure the linker won't look up an unexpected symbol. [#9433](https://github.com/ClickHouse/ClickHouse/pull/9433) ([Amos Bird](https://github.com/amosbird))
+* Add `clickhouse-odbc` driver into test images. This allows to test interaction of ClickHouse with ClickHouse via its own ODBC driver. [#9348](https://github.com/ClickHouse/ClickHouse/pull/9348) ([filimonov](https://github.com/filimonov))
+* Fix several bugs in unit tests. [#9047](https://github.com/ClickHouse/ClickHouse/pull/9047) ([alesapin](https://github.com/alesapin))
+* Enable `-Wmissing-include-dirs` GCC warning to eliminate all non-existing includes - mostly as a result of CMake scripting errors [#8704](https://github.com/ClickHouse/ClickHouse/pull/8704) ([kreuzerkrieg](https://github.com/kreuzerkrieg))
+* Describe reasons if query profiler cannot work. This is intended for [#9049](https://github.com/ClickHouse/ClickHouse/issues/9049) [#9144](https://github.com/ClickHouse/ClickHouse/pull/9144) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Update OpenSSL to upstream master. Fixed the issue when TLS connections may fail with the message `OpenSSL SSL_read: error:14094438:SSL routines:ssl3_read_bytes:tlsv1 alert internal error` and `SSL Exception: error:2400006E:random number generator::error retrieving entropy`. The issue was present in version 20.1. [#8956](https://github.com/ClickHouse/ClickHouse/pull/8956) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Update Dockerfile for server [#8893](https://github.com/ClickHouse/ClickHouse/pull/8893) ([Ilya Mazaev](https://github.com/ne-ray))
+* Minor fixes in build-gcc-from-sources script [#8774](https://github.com/ClickHouse/ClickHouse/pull/8774) ([Michael Nacharov](https://github.com/mnach))
+* Replace `numbers` to `zeros` in perftests where `number` column is not used. This will lead to more clean test results. [#9600](https://github.com/ClickHouse/ClickHouse/pull/9600) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fix stack overflow issue when using initializer_list in Column constructors. [#9367](https://github.com/ClickHouse/ClickHouse/pull/9367) ([Deleted user](https://github.com/ghost))
+* Upgrade librdkafka to v1.3.0. Enable bundled `rdkafka` and `gsasl` libraries on Mac OS X. [#9000](https://github.com/ClickHouse/ClickHouse/pull/9000) ([Andrew Onyshchuk](https://github.com/oandrew))
+* build fix on GCC 9.2.0 [#9306](https://github.com/ClickHouse/ClickHouse/pull/9306) ([vxider](https://github.com/Vxider))
+
+
+## ClickHouse release v20.1
+
+### ClickHouse release v20.1.16.120-stable 2020-60-26
+
+#### Bug Fix
+
+* Fix rare crash caused by using `Nullable` column in prewhere condition. Continuation of [#11608](https://github.com/ClickHouse/ClickHouse/issues/11608). [#11869](https://github.com/ClickHouse/ClickHouse/pull/11869) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Don't allow arrayJoin inside higher order functions. It was leading to broken protocol synchronization. This closes [#3933](https://github.com/ClickHouse/ClickHouse/issues/3933). [#11846](https://github.com/ClickHouse/ClickHouse/pull/11846) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix unexpected behaviour of queries like `SELECT *, xyz.*` which were success while an error expected. [#11753](https://github.com/ClickHouse/ClickHouse/pull/11753) ([hexiaoting](https://github.com/hexiaoting)).
+* Fixed LOGICAL_ERROR caused by wrong type deduction of complex literals in Values input format. [#11732](https://github.com/ClickHouse/ClickHouse/pull/11732) ([tavplubix](https://github.com/tavplubix)).
+* Fix `ORDER BY ... WITH FILL` over const columns. [#11697](https://github.com/ClickHouse/ClickHouse/pull/11697) ([Anton Popov](https://github.com/CurtizJ)).
+* Pass proper timeouts when communicating with XDBC bridge. Recently timeouts were not respected when checking bridge liveness and receiving meta info. [#11690](https://github.com/ClickHouse/ClickHouse/pull/11690) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add support for regular expressions with case-insensitive flags. This fixes [#11101](https://github.com/ClickHouse/ClickHouse/issues/11101) and fixes [#11506](https://github.com/ClickHouse/ClickHouse/issues/11506). [#11649](https://github.com/ClickHouse/ClickHouse/pull/11649) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix bloom filters for String (data skipping indices). [#11638](https://github.com/ClickHouse/ClickHouse/pull/11638) ([Azat Khuzhin](https://github.com/azat)).
+* Fix rare crash caused by using `Nullable` column in prewhere condition. (Probably it is connected with [#11572](https://github.com/ClickHouse/ClickHouse/issues/11572) somehow). [#11608](https://github.com/ClickHouse/ClickHouse/pull/11608) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix wrong exit code of the clickhouse-client, when exception.code() % 256 = 0. [#11601](https://github.com/ClickHouse/ClickHouse/pull/11601) ([filimonov](https://github.com/filimonov)).
+* Fix trivial error in log message about "Mark cache size was lowered" at server startup. This closes [#11399](https://github.com/ClickHouse/ClickHouse/issues/11399). [#11589](https://github.com/ClickHouse/ClickHouse/pull/11589) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Now clickhouse-server docker container will prefer IPv6 checking server aliveness. [#11550](https://github.com/ClickHouse/ClickHouse/pull/11550) ([Ivan Starkov](https://github.com/istarkov)).
+* Fix memory leak when exception is thrown in the middle of aggregation with -State functions. This fixes [#8995](https://github.com/ClickHouse/ClickHouse/issues/8995). [#11496](https://github.com/ClickHouse/ClickHouse/pull/11496) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix usage of primary key wrapped into a function with 'FINAL' modifier and 'ORDER BY' optimization. [#10715](https://github.com/ClickHouse/ClickHouse/pull/10715) ([Anton Popov](https://github.com/CurtizJ)).
+
+
+### ClickHouse release v20.1.15.109-stable 2020-06-19
+
+#### Bug Fix
+
+* Fix excess lock for structure during alter. [#11790](https://github.com/ClickHouse/ClickHouse/pull/11790) ([alesapin](https://github.com/alesapin)).
+
+
+### ClickHouse release v20.1.14.107-stable 2020-06-11
+
+#### Bug Fix
+
+* Fix error `Size of offsets doesn't match size of column` for queries with `PREWHERE column in (subquery)` and `ARRAY JOIN`. [#11580](https://github.com/ClickHouse/ClickHouse/pull/11580) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+
+
+### ClickHouse release v20.1.13.105-stable 2020-06-10
+
+#### Bug Fix
+
+* Fix the error `Data compressed with different methods` that can happen if `min_bytes_to_use_direct_io` is enabled and PREWHERE is active and using SAMPLE or high number of threads. This fixes [#11539](https://github.com/ClickHouse/ClickHouse/issues/11539). [#11540](https://github.com/ClickHouse/ClickHouse/pull/11540) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix return compressed size for codecs. [#11448](https://github.com/ClickHouse/ClickHouse/pull/11448) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix server crash when a column has compression codec with non-literal arguments. Fixes [#11365](https://github.com/ClickHouse/ClickHouse/issues/11365). [#11431](https://github.com/ClickHouse/ClickHouse/pull/11431) ([alesapin](https://github.com/alesapin)).
+* Fix pointInPolygon with nan as point. Fixes [#11375](https://github.com/ClickHouse/ClickHouse/issues/11375). [#11421](https://github.com/ClickHouse/ClickHouse/pull/11421) ([Alexey Ilyukhov](https://github.com/livace)).
+* Fixed geohashesInBox with arguments outside of latitude/longitude range. [#11403](https://github.com/ClickHouse/ClickHouse/pull/11403) ([Vasily Nemkov](https://github.com/Enmk)).
+* Fix possible `Pipeline stuck` error for queries with external sort and limit. Fixes [#11359](https://github.com/ClickHouse/ClickHouse/issues/11359). [#11366](https://github.com/ClickHouse/ClickHouse/pull/11366) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix crash in `quantilesExactWeightedArray`. [#11337](https://github.com/ClickHouse/ClickHouse/pull/11337) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Make writing to `MATERIALIZED VIEW` with setting `parallel_view_processing = 1` parallel again. Fixes [#10241](https://github.com/ClickHouse/ClickHouse/issues/10241). [#11330](https://github.com/ClickHouse/ClickHouse/pull/11330) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix visitParamExtractRaw when extracted JSON has strings with unbalanced { or [. [#11318](https://github.com/ClickHouse/ClickHouse/pull/11318) ([Ewout](https://github.com/devwout)).
+* Fix very rare race condition in ThreadPool. [#11314](https://github.com/ClickHouse/ClickHouse/pull/11314) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix potential uninitialized memory in conversion. Example: `SELECT toIntervalSecond(now64())`. [#11311](https://github.com/ClickHouse/ClickHouse/pull/11311) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix the issue when index analysis cannot work if a table has Array column in primary key and if a query is filtering by this column with `empty` or `notEmpty` functions. This fixes [#11286](https://github.com/ClickHouse/ClickHouse/issues/11286). [#11303](https://github.com/ClickHouse/ClickHouse/pull/11303) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix bug when query speed estimation can be incorrect and the limit of `min_execution_speed` may not work or work incorrectly if the query is throttled by `max_network_bandwidth`, `max_execution_speed` or `priority` settings. Change the default value of `timeout_before_checking_execution_speed` to non-zero, because otherwise the settings `min_execution_speed` and `max_execution_speed` have no effect. This fixes [#11297](https://github.com/ClickHouse/ClickHouse/issues/11297). This fixes [#5732](https://github.com/ClickHouse/ClickHouse/issues/5732). This fixes [#6228](https://github.com/ClickHouse/ClickHouse/issues/6228). Usability improvement: avoid concatenation of exception message with progress bar in `clickhouse-client`. [#11296](https://github.com/ClickHouse/ClickHouse/pull/11296) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix crash while reading malformed data in Protobuf format. This fixes [#5957](https://github.com/ClickHouse/ClickHouse/issues/5957), fixes [#11203](https://github.com/ClickHouse/ClickHouse/issues/11203). [#11258](https://github.com/ClickHouse/ClickHouse/pull/11258) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix possible error `Cannot capture column` for higher-order functions with `Array(Array(LowCardinality))` captured argument. [#11185](https://github.com/ClickHouse/ClickHouse/pull/11185) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* If data skipping index is dependent on columns that are going to be modified during background merge (for SummingMergeTree, AggregatingMergeTree as well as for TTL GROUP BY), it was calculated incorrectly. This issue is fixed by moving index calculation after merge so the index is calculated on merged data. [#11162](https://github.com/ClickHouse/ClickHouse/pull/11162) ([Azat Khuzhin](https://github.com/azat)).
+* Remove logging from mutation finalization task if nothing was finalized. [#11109](https://github.com/ClickHouse/ClickHouse/pull/11109) ([alesapin](https://github.com/alesapin)).
+* Fixed parseDateTime64BestEffort argument resolution bugs. [#10925](https://github.com/ClickHouse/ClickHouse/issues/10925). [#11038](https://github.com/ClickHouse/ClickHouse/pull/11038) ([Vasily Nemkov](https://github.com/Enmk)).
+* Fix incorrect raw data size in method getRawData(). [#10964](https://github.com/ClickHouse/ClickHouse/pull/10964) ([Igr](https://github.com/ObjatieGroba)).
+* Fix backward compatibility with tuples in Distributed tables. [#10889](https://github.com/ClickHouse/ClickHouse/pull/10889) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix SIGSEGV in StringHashTable (if such key does not exist). [#10870](https://github.com/ClickHouse/ClickHouse/pull/10870) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed bug in `ReplicatedMergeTree` which might cause some `ALTER` on `OPTIMIZE` query to hang waiting for some replica after it become inactive. [#10849](https://github.com/ClickHouse/ClickHouse/pull/10849) ([tavplubix](https://github.com/tavplubix)).
+* Fix columns order after Block::sortColumns() (also add a test that shows that it affects some real use case - Buffer engine). [#10826](https://github.com/ClickHouse/ClickHouse/pull/10826) ([Azat Khuzhin](https://github.com/azat)).
+* Fix the issue with ODBC bridge when no quoting of identifiers is requested. This fixes [#7984](https://github.com/ClickHouse/ClickHouse/issues/7984). [#10821](https://github.com/ClickHouse/ClickHouse/pull/10821) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix UBSan and MSan report in DateLUT. [#10798](https://github.com/ClickHouse/ClickHouse/pull/10798) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* - Make use of `src_type` for correct type conversion in key conditions. Fixes [#6287](https://github.com/ClickHouse/ClickHouse/issues/6287). [#10791](https://github.com/ClickHouse/ClickHouse/pull/10791) ([Andrew Onyshchuk](https://github.com/oandrew)).
+* Fix `parallel_view_processing` behavior. Now all insertions into `MATERIALIZED VIEW` without exception should be finished if exception happened. Fixes [#10241](https://github.com/ClickHouse/ClickHouse/issues/10241). [#10757](https://github.com/ClickHouse/ClickHouse/pull/10757) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix combinator -OrNull and -OrDefault when combined with -State. [#10741](https://github.com/ClickHouse/ClickHouse/pull/10741) ([hcz](https://github.com/hczhcz)).
+* Fix disappearing totals. Totals could have being filtered if query had had join or subquery with external where condition. Fixes [#10674](https://github.com/ClickHouse/ClickHouse/issues/10674). [#10698](https://github.com/ClickHouse/ClickHouse/pull/10698) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix multiple usages of `IN` operator with the identical set in one query. [#10686](https://github.com/ClickHouse/ClickHouse/pull/10686) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix order of parameters in AggregateTransform constructor. [#10667](https://github.com/ClickHouse/ClickHouse/pull/10667) ([palasonic1](https://github.com/palasonic1)).
+* Fix the lack of parallel execution of remote queries with `distributed_aggregation_memory_efficient` enabled. Fixes [#10655](https://github.com/ClickHouse/ClickHouse/issues/10655). [#10664](https://github.com/ClickHouse/ClickHouse/pull/10664) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix predicates optimization for distributed queries (`enable_optimize_predicate_expression=1`) for queries with `HAVING` section (i.e. when filtering on the server initiator is required), by preserving the order of expressions (and this is enough to fix), and also force aggregator use column names over indexes. Fixes: [#10613](https://github.com/ClickHouse/ClickHouse/issues/10613), [#11413](https://github.com/ClickHouse/ClickHouse/issues/11413). [#10621](https://github.com/ClickHouse/ClickHouse/pull/10621) ([Azat Khuzhin](https://github.com/azat)).
+* Fix error `the BloomFilter false positive must be a double number between 0 and 1` [#10551](https://github.com/ClickHouse/ClickHouse/issues/10551). [#10569](https://github.com/ClickHouse/ClickHouse/pull/10569) ([Winter Zhang](https://github.com/zhang2014)).
+* Fix SELECT of column ALIAS which default expression type different from column type. [#10563](https://github.com/ClickHouse/ClickHouse/pull/10563) ([Azat Khuzhin](https://github.com/azat)).
+* * Implemented comparison between DateTime64 and String values (just like for DateTime). [#10560](https://github.com/ClickHouse/ClickHouse/pull/10560) ([Vasily Nemkov](https://github.com/Enmk)).
+
+
+### ClickHouse release v20.1.12.86, 2020-05-26
+
+#### Bug Fix
+
+* Fixed incompatibility of two-level aggregation between versions 20.1 and earlier. This incompatibility happens when different versions of ClickHouse are used on initiator node and remote nodes and the size of GROUP BY result is large and aggregation is performed by a single String field. It leads to several unmerged rows for a single key in result. [#10952](https://github.com/ClickHouse/ClickHouse/pull/10952) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed data corruption for `LowCardinality(FixedString)` key column in `SummingMergeTree` which could have happened after merge. Fixes [#10489](https://github.com/ClickHouse/ClickHouse/issues/10489). [#10721](https://github.com/ClickHouse/ClickHouse/pull/10721) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed bug, which causes http requests stuck on client close when `readonly=2` and `cancel_http_readonly_queries_on_client_close=1`. Fixes [#7939](https://github.com/ClickHouse/ClickHouse/issues/7939), [#7019](https://github.com/ClickHouse/ClickHouse/issues/7019), [#7736](https://github.com/ClickHouse/ClickHouse/issues/7736), [#7091](https://github.com/ClickHouse/ClickHouse/issues/7091). [#10684](https://github.com/ClickHouse/ClickHouse/pull/10684) ([tavplubix](https://github.com/tavplubix)).
+* Fixed a bug when on `SYSTEM DROP DNS CACHE` query also drop caches, which are used to check if user is allowed to connect from some IP addresses. [#10608](https://github.com/ClickHouse/ClickHouse/pull/10608) ([tavplubix](https://github.com/tavplubix)).
+* Fixed incorrect scalar results inside inner query of `MATERIALIZED VIEW` in case if this query contained dependent table. [#10603](https://github.com/ClickHouse/ClickHouse/pull/10603) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed the situation when mutation finished all parts, but hung up in `is_done=0`. [#10526](https://github.com/ClickHouse/ClickHouse/pull/10526) ([alesapin](https://github.com/alesapin)).
+* Fixed overflow at beginning of unix epoch for timezones with fractional offset from UTC. This fixes [#9335](https://github.com/ClickHouse/ClickHouse/issues/9335). [#10513](https://github.com/ClickHouse/ClickHouse/pull/10513) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed improper shutdown of Distributed storage. [#10491](https://github.com/ClickHouse/ClickHouse/pull/10491) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed numeric overflow in `simpleLinearRegression` over large integers. [#10474](https://github.com/ClickHouse/ClickHouse/pull/10474) ([hcz](https://github.com/hczhcz)).
+* Fixed removing metadata directory when attach database fails. [#10442](https://github.com/ClickHouse/ClickHouse/pull/10442) ([Winter Zhang](https://github.com/zhang2014)).
+* Added a check of number and type of arguments when creating `BloomFilter` index [#9623](https://github.com/ClickHouse/ClickHouse/issues/9623). [#10431](https://github.com/ClickHouse/ClickHouse/pull/10431) ([Winter Zhang](https://github.com/zhang2014)).
+* Fixed the issue when a query with `ARRAY JOIN`, `ORDER BY` and `LIMIT` may return incomplete result. This fixes [#10226](https://github.com/ClickHouse/ClickHouse/issues/10226). [#10427](https://github.com/ClickHouse/ClickHouse/pull/10427) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Prefer `fallback_to_stale_replicas` over `skip_unavailable_shards`. [#10422](https://github.com/ClickHouse/ClickHouse/pull/10422) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed wrong flattening of `Array(Tuple(...))` data types. This fixes [#10259](https://github.com/ClickHouse/ClickHouse/issues/10259). [#10390](https://github.com/ClickHouse/ClickHouse/pull/10390) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed wrong behavior in `HashTable` that caused compilation error when trying to read HashMap from buffer. [#10386](https://github.com/ClickHouse/ClickHouse/pull/10386) ([palasonic1](https://github.com/palasonic1)).
+* Fixed possible `Pipeline stuck` error in `ConcatProcessor` which could have happened in remote query. [#10381](https://github.com/ClickHouse/ClickHouse/pull/10381) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed error `Pipeline stuck` with `max_rows_to_group_by` and `group_by_overflow_mode = 'break'`. [#10279](https://github.com/ClickHouse/ClickHouse/pull/10279) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed several bugs when some data was inserted with quorum, then deleted somehow (DROP PARTITION, TTL) and this leaded to the stuck of INSERTs or false-positive exceptions in SELECTs. This fixes [#9946](https://github.com/ClickHouse/ClickHouse/issues/9946). [#10188](https://github.com/ClickHouse/ClickHouse/pull/10188) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fixed incompatibility when versions prior to 18.12.17 are used on remote servers and newer is used on initiating server, and GROUP BY both fixed and non-fixed keys, and when two-level group by method is activated. [#3254](https://github.com/ClickHouse/ClickHouse/pull/3254) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+
+#### Build/Testing/Packaging Improvement
+
+* Added CA certificates to clickhouse-server docker image. [#10476](https://github.com/ClickHouse/ClickHouse/pull/10476) ([filimonov](https://github.com/filimonov)).
+
+
+### ClickHouse release v20.1.10.70, 2020-04-17
+
+#### Bug Fix
+
+* Fix rare possible exception `Cannot drain connections: cancel first`. [#10239](https://github.com/ClickHouse/ClickHouse/pull/10239) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed bug where ClickHouse would throw `'Unknown function lambda.'` error message when user tries to run `ALTER UPDATE/DELETE` on tables with `ENGINE = Replicated*`. Check for nondeterministic functions now handles lambda expressions correctly. [#10237](https://github.com/ClickHouse/ClickHouse/pull/10237) ([Alexander Kazakov](https://github.com/Akazz)).
+* Fix `parseDateTimeBestEffort` for strings in RFC-2822 when day of week is Tuesday or Thursday. This fixes [#10082](https://github.com/ClickHouse/ClickHouse/issues/10082). [#10214](https://github.com/ClickHouse/ClickHouse/pull/10214) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix column names of constants inside `JOIN` that may clash with names of constants outside of `JOIN`. [#10207](https://github.com/ClickHouse/ClickHouse/pull/10207) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix possible inifinite query execution when the query actually should stop on LIMIT, while reading from infinite source like `system.numbers` or `system.zeros`. [#10206](https://github.com/ClickHouse/ClickHouse/pull/10206) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix move-to-prewhere optimization in presense of `arrayJoin` functions (in certain cases). This fixes [#10092](https://github.com/ClickHouse/ClickHouse/issues/10092). [#10195](https://github.com/ClickHouse/ClickHouse/pull/10195) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add the ability to relax the restriction on non-deterministic functions usage in mutations with `allow_nondeterministic_mutations` setting. [#10186](https://github.com/ClickHouse/ClickHouse/pull/10186) ([filimonov](https://github.com/filimonov)).
+* Convert blocks if structure does not match on `INSERT` into table with `Distributed` engine. [#10135](https://github.com/ClickHouse/ClickHouse/pull/10135) ([Azat Khuzhin](https://github.com/azat)).
+* Fix `SIGSEGV` on `INSERT` into `Distributed` table when its structure differs from the underlying tables. [#10105](https://github.com/ClickHouse/ClickHouse/pull/10105) ([Azat Khuzhin](https://github.com/azat)).
+* Fix possible rows loss for queries with `JOIN` and `UNION ALL`. Fixes [#9826](https://github.com/ClickHouse/ClickHouse/issues/9826), [#10113](https://github.com/ClickHouse/ClickHouse/issues/10113). [#10099](https://github.com/ClickHouse/ClickHouse/pull/10099) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Add arguments check and support identifier arguments for MySQL Database Engine. [#10077](https://github.com/ClickHouse/ClickHouse/pull/10077) ([Winter Zhang](https://github.com/zhang2014)).
+* Fix bug in clickhouse dictionary source from localhost clickhouse server. The bug may lead to memory corruption if types in dictionary and source are not compatible. [#10071](https://github.com/ClickHouse/ClickHouse/pull/10071) ([alesapin](https://github.com/alesapin)).
+* Fix error `Cannot clone block with columns because block has 0 columns ... While executing GroupingAggregatedTransform`. It happened when setting `distributed_aggregation_memory_efficient` was enabled, and distributed query read aggregating data with different level from different shards (mixed single and two level aggregation). [#10063](https://github.com/ClickHouse/ClickHouse/pull/10063) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix a segmentation fault that could occur in `GROUP BY` over string keys containing trailing zero bytes ([#8636](https://github.com/ClickHouse/ClickHouse/issues/8636), [#8925](https://github.com/ClickHouse/ClickHouse/issues/8925)). [#10025](https://github.com/ClickHouse/ClickHouse/pull/10025) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Fix bug in which the necessary tables weren't retrieved at one of the processing stages of queries to some databases. Fixes [#9699](https://github.com/ClickHouse/ClickHouse/issues/9699). [#9949](https://github.com/ClickHouse/ClickHouse/pull/9949) ([achulkov2](https://github.com/achulkov2)).
+* Fix `'Not found column in block'` error when `JOIN` appears with `TOTALS`. Fixes [#9839](https://github.com/ClickHouse/ClickHouse/issues/9839). [#9939](https://github.com/ClickHouse/ClickHouse/pull/9939) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix a bug with `ON CLUSTER` DDL queries freezing on server startup. [#9927](https://github.com/ClickHouse/ClickHouse/pull/9927) ([Gagan Arneja](https://github.com/garneja)).
+* Fix `TRUNCATE` for Join table engine ([#9917](https://github.com/ClickHouse/ClickHouse/issues/9917)). [#9920](https://github.com/ClickHouse/ClickHouse/pull/9920) ([Amos Bird](https://github.com/amosbird)).
+* Fix `'scalar doesn't exist'` error in ALTER queries ([#9878](https://github.com/ClickHouse/ClickHouse/issues/9878)). [#9904](https://github.com/ClickHouse/ClickHouse/pull/9904) ([Amos Bird](https://github.com/amosbird)).
+* Fix race condition between drop and optimize in `ReplicatedMergeTree`. [#9901](https://github.com/ClickHouse/ClickHouse/pull/9901) ([alesapin](https://github.com/alesapin)).
+* Fixed `DeleteOnDestroy` logic in `ATTACH PART` which could lead to automatic removal of attached part and added few tests. [#9410](https://github.com/ClickHouse/ClickHouse/pull/9410) ([Vladimir Chebotarev](https://github.com/excitoon)).
+
+#### Build/Testing/Packaging Improvement
+
+* Fix unit test `collapsing_sorted_stream`. [#9367](https://github.com/ClickHouse/ClickHouse/pull/9367) ([Deleted user](https://github.com/ghost)).
+
+### ClickHouse release v20.1.9.54, 2020-03-28
+
+#### Bug Fix
+
+* Fix `'Different expressions with the same alias'` error when query has `PREWHERE` and `WHERE` on distributed table and `SET distributed_product_mode = 'local'`. [#9871](https://github.com/ClickHouse/ClickHouse/pull/9871) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix mutations excessive memory consumption for tables with a composite primary key. This fixes [#9850](https://github.com/ClickHouse/ClickHouse/issues/9850). [#9860](https://github.com/ClickHouse/ClickHouse/pull/9860) ([alesapin](https://github.com/alesapin)).
+* For INSERT queries shard now clamps the settings got from the initiator to the shard's constaints instead of throwing an exception. This fix allows to send `INSERT` queries to a shard with another constraints. This change improves fix [#9447](https://github.com/ClickHouse/ClickHouse/issues/9447). [#9852](https://github.com/ClickHouse/ClickHouse/pull/9852) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix possible exception `Got 0 in totals chunk, expected 1` on client. It happened for queries with `JOIN` in case if right joined table had zero rows. Example: `select * from system.one t1 join system.one t2 on t1.dummy = t2.dummy limit 0 FORMAT TabSeparated;`. Fixes [#9777](https://github.com/ClickHouse/ClickHouse/issues/9777). [#9823](https://github.com/ClickHouse/ClickHouse/pull/9823) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix `SIGSEGV` with `optimize_skip_unused_shards` when type cannot be converted. [#9804](https://github.com/ClickHouse/ClickHouse/pull/9804) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed a few cases when timezone of the function argument wasn't used properly. [#9574](https://github.com/ClickHouse/ClickHouse/pull/9574) ([Vasily Nemkov](https://github.com/Enmk)).
+
+#### Improvement
+
+* Remove `ORDER BY` stage from mutations because we read from a single ordered part in a single thread. Also add check that the order of rows in mutation is ordered in sorting key order and this order is not violated. [#9886](https://github.com/ClickHouse/ClickHouse/pull/9886) ([alesapin](https://github.com/alesapin)).
+
+#### Build/Testing/Packaging Improvement
+
+* Clean up duplicated linker flags. Make sure the linker won't look up an unexpected symbol. [#9433](https://github.com/ClickHouse/ClickHouse/pull/9433) ([Amos Bird](https://github.com/amosbird)).
+
+### ClickHouse release v20.1.8.41, 2020-03-20
+
+#### Bug Fix
+* Fix possible permanent `Cannot schedule a task` error (due to unhandled exception in `ParallelAggregatingBlockInputStream::Handler::onFinish/onFinishThread`). This fixes [#6833](https://github.com/ClickHouse/ClickHouse/issues/6833). [#9154](https://github.com/ClickHouse/ClickHouse/pull/9154) ([Azat Khuzhin](https://github.com/azat))
+* Fix excessive memory consumption in `ALTER` queries (mutations). This fixes [#9533](https://github.com/ClickHouse/ClickHouse/issues/9533) and [#9670](https://github.com/ClickHouse/ClickHouse/issues/9670). [#9754](https://github.com/ClickHouse/ClickHouse/pull/9754) ([alesapin](https://github.com/alesapin))
+* Fix bug in backquoting in external dictionaries DDL. This fixes [#9619](https://github.com/ClickHouse/ClickHouse/issues/9619). [#9734](https://github.com/ClickHouse/ClickHouse/pull/9734) ([alesapin](https://github.com/alesapin))
+
+### ClickHouse release v20.1.7.38, 2020-03-18
+
+#### Bug Fix
+* Fixed incorrect internal function names for `sumKahan` and `sumWithOverflow`. I lead to exception while using this functions in remote queries. [#9636](https://github.com/ClickHouse/ClickHouse/pull/9636) ([Azat Khuzhin](https://github.com/azat)). This issue was in all ClickHouse releases.
+* Allow `ALTER ON CLUSTER` of `Distributed` tables with internal replication. This fixes [#3268](https://github.com/ClickHouse/ClickHouse/issues/3268). [#9617](https://github.com/ClickHouse/ClickHouse/pull/9617) ([shinoi2](https://github.com/shinoi2)). This issue was in all ClickHouse releases.
+* Fix possible exceptions `Size of filter doesn't match size of column` and `Invalid number of rows in Chunk` in `MergeTreeRangeReader`. They could appear while executing `PREWHERE` in some cases. Fixes [#9132](https://github.com/ClickHouse/ClickHouse/issues/9132). [#9612](https://github.com/ClickHouse/ClickHouse/pull/9612) ([Anton Popov](https://github.com/CurtizJ))
+* Fixed the issue: timezone was not preserved if you write a simple arithmetic expression like `time + 1` (in contrast to an expression like `time + INTERVAL 1 SECOND`). This fixes [#5743](https://github.com/ClickHouse/ClickHouse/issues/5743). [#9323](https://github.com/ClickHouse/ClickHouse/pull/9323) ([alexey-milovidov](https://github.com/alexey-milovidov)). This issue was in all ClickHouse releases.
+* Now it's not possible to create or add columns with simple cyclic aliases like `a DEFAULT b, b DEFAULT a`. [#9603](https://github.com/ClickHouse/ClickHouse/pull/9603) ([alesapin](https://github.com/alesapin))
+* Fixed the issue when padding at the end of base64 encoded value can be malformed. Update base64 library. This fixes [#9491](https://github.com/ClickHouse/ClickHouse/issues/9491), closes [#9492](https://github.com/ClickHouse/ClickHouse/issues/9492) [#9500](https://github.com/ClickHouse/ClickHouse/pull/9500) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix data race at destruction of `Poco::HTTPServer`. It could happen when server is started and immediately shut down. [#9468](https://github.com/ClickHouse/ClickHouse/pull/9468) ([Anton Popov](https://github.com/CurtizJ))
+* Fix possible crash/wrong number of rows in `LIMIT n WITH TIES` when there are a lot of rows equal to n'th row. [#9464](https://github.com/ClickHouse/ClickHouse/pull/9464) ([tavplubix](https://github.com/tavplubix))
+* Fix possible mismatched checksums with column TTLs. [#9451](https://github.com/ClickHouse/ClickHouse/pull/9451) ([Anton Popov](https://github.com/CurtizJ))
+* Fix crash when a user tries to `ALTER MODIFY SETTING` for old-formated `MergeTree` table engines family. [#9435](https://github.com/ClickHouse/ClickHouse/pull/9435) ([alesapin](https://github.com/alesapin))
+* Now we will try finalize mutations more frequently. [#9427](https://github.com/ClickHouse/ClickHouse/pull/9427) ([alesapin](https://github.com/alesapin))
+* Fix replication protocol incompatibility introduced in [#8598](https://github.com/ClickHouse/ClickHouse/issues/8598). [#9412](https://github.com/ClickHouse/ClickHouse/pull/9412) ([alesapin](https://github.com/alesapin))
+* Fix not(has()) for the bloom_filter index of array types. [#9407](https://github.com/ClickHouse/ClickHouse/pull/9407) ([achimbab](https://github.com/achimbab))
+* Fixed the behaviour of `match` and `extract` functions when haystack has zero bytes. The behaviour was wrong when haystack was constant. This fixes [#9160](https://github.com/ClickHouse/ClickHouse/issues/9160) [#9163](https://github.com/ClickHouse/ClickHouse/pull/9163) ([alexey-milovidov](https://github.com/alexey-milovidov)) [#9345](https://github.com/ClickHouse/ClickHouse/pull/9345) ([alexey-milovidov](https://github.com/alexey-milovidov))
+
+#### Build/Testing/Packaging Improvement
+
+* Exception handling now works correctly on Windows Subsystem for Linux. See https://github.com/ClickHouse-Extras/libunwind/pull/3 This fixes [#6480](https://github.com/ClickHouse/ClickHouse/issues/6480) [#9564](https://github.com/ClickHouse/ClickHouse/pull/9564) ([sobolevsv](https://github.com/sobolevsv))
+
+
+### ClickHouse release v20.1.6.30, 2020-03-05
+
+#### Bug Fix
+
+* Fix data incompatibility when compressed with `T64` codec.
+[#9039](https://github.com/ClickHouse/ClickHouse/pull/9039) [(abyss7)](https://github.com/abyss7)
+* Fix order of ranges while reading from MergeTree table in one thread. Fixes [#8964](https://github.com/ClickHouse/ClickHouse/issues/8964).
+[#9050](https://github.com/ClickHouse/ClickHouse/pull/9050) [(CurtizJ)](https://github.com/CurtizJ)
+* Fix possible segfault in `MergeTreeRangeReader`, while executing `PREWHERE`. Fixes [#9064](https://github.com/ClickHouse/ClickHouse/issues/9064).
+[#9106](https://github.com/ClickHouse/ClickHouse/pull/9106) [(CurtizJ)](https://github.com/CurtizJ)
+* Fix `reinterpretAsFixedString` to return `FixedString` instead of `String`.
+[#9052](https://github.com/ClickHouse/ClickHouse/pull/9052) [(oandrew)](https://github.com/oandrew)
+* Fix `joinGet` with nullable return types. Fixes [#8919](https://github.com/ClickHouse/ClickHouse/issues/8919)
+[#9014](https://github.com/ClickHouse/ClickHouse/pull/9014) [(amosbird)](https://github.com/amosbird)
+* Fix fuzz test and incorrect behaviour of bitTestAll/bitTestAny functions.
+[#9143](https://github.com/ClickHouse/ClickHouse/pull/9143) [(alexey-milovidov)](https://github.com/alexey-milovidov)
+* Fix the behaviour of match and extract functions when haystack has zero bytes. The behaviour was wrong when haystack was constant. Fixes [#9160](https://github.com/ClickHouse/ClickHouse/issues/9160)
+[#9163](https://github.com/ClickHouse/ClickHouse/pull/9163) [(alexey-milovidov)](https://github.com/alexey-milovidov)
+* Fixed execution of inversed predicates when non-strictly monotinic functional index is used. Fixes [#9034](https://github.com/ClickHouse/ClickHouse/issues/9034)
+[#9223](https://github.com/ClickHouse/ClickHouse/pull/9223) [(Akazz)](https://github.com/Akazz)
+* Allow to rewrite `CROSS` to `INNER JOIN` if there's `[NOT] LIKE` operator in `WHERE` section. Fixes [#9191](https://github.com/ClickHouse/ClickHouse/issues/9191)
+[#9229](https://github.com/ClickHouse/ClickHouse/pull/9229) [(4ertus2)](https://github.com/4ertus2)
+* Allow first column(s) in a table with Log engine be an alias.
+[#9231](https://github.com/ClickHouse/ClickHouse/pull/9231) [(abyss7)](https://github.com/abyss7)
+* Allow comma join with `IN()` inside. Fixes [#7314](https://github.com/ClickHouse/ClickHouse/issues/7314).
+[#9251](https://github.com/ClickHouse/ClickHouse/pull/9251) [(4ertus2)](https://github.com/4ertus2)
+* Improve `ALTER MODIFY/ADD` queries logic. Now you cannot `ADD` column without type, `MODIFY` default expression doesn't change type of column and `MODIFY` type doesn't loose default expression value. Fixes [#8669](https://github.com/ClickHouse/ClickHouse/issues/8669).
+[#9227](https://github.com/ClickHouse/ClickHouse/pull/9227)  [(alesapin)](https://github.com/alesapin)
+* Fix mutations finalization, when already done mutation can have status is_done=0.
+[#9217](https://github.com/ClickHouse/ClickHouse/pull/9217) [(alesapin)](https://github.com/alesapin)
+* Support "Processors" pipeline for system.numbers and system.numbers_mt. This also fixes the bug when `max_execution_time` is not respected.
+[#7796](https://github.com/ClickHouse/ClickHouse/pull/7796)  [(KochetovNicolai)](https://github.com/KochetovNicolai)
+* Fix wrong counting of `DictCacheKeysRequestedFound` metric.
+[#9411](https://github.com/ClickHouse/ClickHouse/pull/9411) [(nikitamikhaylov)](https://github.com/nikitamikhaylov)
+* Added a check for storage policy in `ATTACH PARTITION FROM`, `REPLACE PARTITION`, `MOVE TO TABLE` which otherwise could make data of part inaccessible after restart and prevent ClickHouse to start.
+[#9383](https://github.com/ClickHouse/ClickHouse/pull/9383) [(excitoon)](https://github.com/excitoon)
+* Fixed UBSan report in `MergeTreeIndexSet`. This fixes [#9250](https://github.com/ClickHouse/ClickHouse/issues/9250)
+[#9365](https://github.com/ClickHouse/ClickHouse/pull/9365) [(alexey-milovidov)](https://github.com/alexey-milovidov)
+* Fix possible datarace in BlockIO.
+[#9356](https://github.com/ClickHouse/ClickHouse/pull/9356) [(KochetovNicolai)](https://github.com/KochetovNicolai)
+* Support for `UInt64` numbers that don't fit in Int64 in JSON-related functions. Update `SIMDJSON` to master. This fixes [#9209](https://github.com/ClickHouse/ClickHouse/issues/9209)
+[#9344](https://github.com/ClickHouse/ClickHouse/pull/9344) [(alexey-milovidov)](https://github.com/alexey-milovidov)
+* Fix the issue when the amount of free space is not calculated correctly if the data directory is mounted to a separate device. For default disk calculate the free space from data subdirectory. This fixes [#7441](https://github.com/ClickHouse/ClickHouse/issues/7441)
+[#9257](https://github.com/ClickHouse/ClickHouse/pull/9257) [(millb)](https://github.com/millb)
+* Fix the issue when TLS connections may fail with the message `OpenSSL SSL_read: error:14094438:SSL routines:ssl3_read_bytes:tlsv1 alert internal error and SSL Exception: error:2400006E:random number generator::error retrieving entropy.` Update OpenSSL to upstream master.
+[#8956](https://github.com/ClickHouse/ClickHouse/pull/8956) [(alexey-milovidov)](https://github.com/alexey-milovidov)
+* When executing `CREATE` query, fold constant expressions in storage engine arguments. Replace empty database name with current database. Fixes [#6508](https://github.com/ClickHouse/ClickHouse/issues/6508), [#3492](https://github.com/ClickHouse/ClickHouse/issues/3492). Also fix check for local address in ClickHouseDictionarySource.
+[#9262](https://github.com/ClickHouse/ClickHouse/pull/9262) [(tabplubix)](https://github.com/tavplubix)
+* Fix segfault in `StorageMerge`, which can happen when reading from StorageFile.
+[#9387](https://github.com/ClickHouse/ClickHouse/pull/9387) [(tabplubix)](https://github.com/tavplubix)
+* Prevent losing data in `Kafka` in rare cases when exception happens after reading suffix but before commit. Fixes [#9378](https://github.com/ClickHouse/ClickHouse/issues/9378). Related: [#7175](https://github.com/ClickHouse/ClickHouse/issues/7175)
+[#9507](https://github.com/ClickHouse/ClickHouse/pull/9507) [(filimonov)](https://github.com/filimonov)
+* Fix bug leading to server termination when trying to use / drop `Kafka` table created with wrong parameters. Fixes [#9494](https://github.com/ClickHouse/ClickHouse/issues/9494). Incorporates [#9507](https://github.com/ClickHouse/ClickHouse/issues/9507).
+[#9513](https://github.com/ClickHouse/ClickHouse/pull/9513) [(filimonov)](https://github.com/filimonov)
+
+#### New Feature
+* Add `deduplicate_blocks_in_dependent_materialized_views` option to control the behaviour of idempotent inserts into tables with materialized views. This new feature was added to the bugfix release by a special request from Altinity.
+[#9070](https://github.com/ClickHouse/ClickHouse/pull/9070) [(urykhy)](https://github.com/urykhy)
+
+### ClickHouse release v20.1.2.4, 2020-01-22
+
+#### Backward Incompatible Change
+* Make the setting `merge_tree_uniform_read_distribution` obsolete. The server still recognizes this setting but it has no effect. [#8308](https://github.com/ClickHouse/ClickHouse/pull/8308) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Changed return type of the function `greatCircleDistance` to `Float32` because now the result of calculation is `Float32`. [#7993](https://github.com/ClickHouse/ClickHouse/pull/7993) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Now it's expected that query parameters are represented in "escaped" format. For example, to pass string `a<tab>b` you have to write `a\tb` or `a\<tab>b` and respectively, `a%5Ctb` or `a%5C%09b` in URL. This is needed to add the possibility to pass NULL as `\N`. This fixes [#7488](https://github.com/ClickHouse/ClickHouse/issues/7488). [#8517](https://github.com/ClickHouse/ClickHouse/pull/8517) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Enable `use_minimalistic_part_header_in_zookeeper` setting for `ReplicatedMergeTree` by default. This will significantly reduce amount of data stored in ZooKeeper. This setting is supported since version 19.1 and we already use it in production in multiple services without any issues for more than half a year. Disable this setting if you have a chance to downgrade to versions older than 19.1. [#6850](https://github.com/ClickHouse/ClickHouse/pull/6850) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Data skipping indices are production ready and enabled by default. The settings `allow_experimental_data_skipping_indices`, `allow_experimental_cross_to_join_conversion` and `allow_experimental_multiple_joins_emulation` are now obsolete and do nothing. [#7974](https://github.com/ClickHouse/ClickHouse/pull/7974) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Add new `ANY JOIN` logic for `StorageJoin` consistent with `JOIN` operation. To upgrade without changes in behaviour you need add `SETTINGS any_join_distinct_right_table_keys = 1` to Engine Join tables metadata or recreate these tables after upgrade. [#8400](https://github.com/ClickHouse/ClickHouse/pull/8400) ([Artem Zuikov](https://github.com/4ertus2))
+* Require server to be restarted to apply the changes in logging configuration. This is a temporary workaround to avoid the bug where the server logs to a deleted log file (see [#8696](https://github.com/ClickHouse/ClickHouse/issues/8696)). [#8707](https://github.com/ClickHouse/ClickHouse/pull/8707) ([Alexander Kuzmenkov](https://github.com/akuzm))
+
+#### New Feature
+* Added information about part paths to `system.merges`. [#8043](https://github.com/ClickHouse/ClickHouse/pull/8043) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Add ability to execute `SYSTEM RELOAD DICTIONARY` query in `ON CLUSTER` mode. [#8288](https://github.com/ClickHouse/ClickHouse/pull/8288) ([Guillaume Tassery](https://github.com/YiuRULE))
+* Add ability to execute `CREATE DICTIONARY` queries in `ON CLUSTER` mode. [#8163](https://github.com/ClickHouse/ClickHouse/pull/8163) ([alesapin](https://github.com/alesapin))
+* Now user's profile in `users.xml` can inherit multiple profiles. [#8343](https://github.com/ClickHouse/ClickHouse/pull/8343) ([Mikhail f. Shiryaev](https://github.com/Felixoid))
+* Added `system.stack_trace` table that allows to look at stack traces of all server threads. This is useful for developers to introspect server state. This fixes [#7576](https://github.com/ClickHouse/ClickHouse/issues/7576). [#8344](https://github.com/ClickHouse/ClickHouse/pull/8344) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Add `DateTime64` datatype with configurable sub-second precision. [#7170](https://github.com/ClickHouse/ClickHouse/pull/7170) ([Vasily Nemkov](https://github.com/Enmk))
+* Add table function `clusterAllReplicas` which allows to query all the nodes in the cluster. [#8493](https://github.com/ClickHouse/ClickHouse/pull/8493) ([kiran sunkari](https://github.com/kiransunkari))
+* Add aggregate function `categoricalInformationValue` which calculates the information value of a discrete feature. [#8117](https://github.com/ClickHouse/ClickHouse/pull/8117) ([hcz](https://github.com/hczhcz))
+* Speed up parsing of data files in `CSV`, `TSV` and `JSONEachRow` format by doing it in parallel. [#7780](https://github.com/ClickHouse/ClickHouse/pull/7780) ([Alexander Kuzmenkov](https://github.com/akuzm))
+* Add function `bankerRound` which performs banker's rounding. [#8112](https://github.com/ClickHouse/ClickHouse/pull/8112) ([hcz](https://github.com/hczhcz))
+* Support more languages in embedded dictionary for region names: 'ru', 'en', 'ua', 'uk', 'by', 'kz', 'tr', 'de', 'uz', 'lv', 'lt', 'et', 'pt', 'he', 'vi'. [#8189](https://github.com/ClickHouse/ClickHouse/pull/8189) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Improvements in consistency of `ANY JOIN` logic. Now `t1 ANY LEFT JOIN t2` equals `t2 ANY RIGHT JOIN t1`. [#7665](https://github.com/ClickHouse/ClickHouse/pull/7665) ([Artem Zuikov](https://github.com/4ertus2))
+* Add setting `any_join_distinct_right_table_keys` which enables old behaviour for `ANY INNER JOIN`. [#7665](https://github.com/ClickHouse/ClickHouse/pull/7665) ([Artem Zuikov](https://github.com/4ertus2))
+* Add new `SEMI` and `ANTI JOIN`. Old `ANY INNER JOIN` behaviour now available as `SEMI LEFT JOIN`. [#7665](https://github.com/ClickHouse/ClickHouse/pull/7665) ([Artem Zuikov](https://github.com/4ertus2))
+* Added `Distributed` format for `File` engine and `file` table function which allows to read from `.bin` files generated by asynchronous  inserts into `Distributed` table. [#8535](https://github.com/ClickHouse/ClickHouse/pull/8535) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Add optional reset column argument for `runningAccumulate` which allows to reset aggregation results for each new key value. [#8326](https://github.com/ClickHouse/ClickHouse/pull/8326) ([Sergey Kononenko](https://github.com/kononencheg))
+* Add ability to use ClickHouse as Prometheus endpoint. [#7900](https://github.com/ClickHouse/ClickHouse/pull/7900) ([vdimir](https://github.com/Vdimir))
+* Add section `<remote_url_allow_hosts>` in `config.xml` which restricts allowed hosts for remote table engines and table functions `URL`, `S3`, `HDFS`. [#7154](https://github.com/ClickHouse/ClickHouse/pull/7154) ([Mikhail Korotov](https://github.com/millb))
+* Added function `greatCircleAngle` which calculates the distance on a sphere in degrees. [#8105](https://github.com/ClickHouse/ClickHouse/pull/8105) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Changed Earth radius to be consistent with H3 library. [#8105](https://github.com/ClickHouse/ClickHouse/pull/8105) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Added `JSONCompactEachRow` and `JSONCompactEachRowWithNamesAndTypes` formats for input and output. [#7841](https://github.com/ClickHouse/ClickHouse/pull/7841) ([Mikhail Korotov](https://github.com/millb))
+* Added feature for file-related table engines and table functions (`File`, `S3`, `URL`, `HDFS`) which allows to read and write `gzip` files based on additional engine parameter or file extension. [#7840](https://github.com/ClickHouse/ClickHouse/pull/7840) ([Andrey Bodrov](https://github.com/apbodrov))
+* Added the `randomASCII(length)` function, generating a string with a random set of [ASCII](https://en.wikipedia.org/wiki/ASCII#Printable_characters) printable characters. [#8401](https://github.com/ClickHouse/ClickHouse/pull/8401) ([BayoNet](https://github.com/BayoNet))
+* Added function `JSONExtractArrayRaw` which returns an array on unparsed json array elements from `JSON` string. [#8081](https://github.com/ClickHouse/ClickHouse/pull/8081) ([Oleg Matrokhin](https://github.com/errx))
+* Add `arrayZip` function which allows to combine multiple arrays of equal lengths into one array of tuples. [#8149](https://github.com/ClickHouse/ClickHouse/pull/8149) ([Winter Zhang](https://github.com/zhang2014))
+* Add ability to move data between disks according to configured `TTL`-expressions for `*MergeTree` table engines family. [#8140](https://github.com/ClickHouse/ClickHouse/pull/8140) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Added new aggregate function `avgWeighted` which allows to calculate weighted average. [#7898](https://github.com/ClickHouse/ClickHouse/pull/7898) ([Andrey Bodrov](https://github.com/apbodrov))
+* Now parallel parsing is enabled by default for `TSV`, `TSKV`, `CSV` and `JSONEachRow` formats. [#7894](https://github.com/ClickHouse/ClickHouse/pull/7894) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
+* Add several geo functions from `H3` library: `h3GetResolution`, `h3EdgeAngle`, `h3EdgeLength`, `h3IsValid` and `h3kRing`. [#8034](https://github.com/ClickHouse/ClickHouse/pull/8034) ([Konstantin Malanchev](https://github.com/hombit))
+* Added support for brotli (`br`) compression in file-related storages and table functions. This fixes [#8156](https://github.com/ClickHouse/ClickHouse/issues/8156). [#8526](https://github.com/ClickHouse/ClickHouse/pull/8526) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Add `groupBit*` functions for the `SimpleAggregationFunction` type. [#8485](https://github.com/ClickHouse/ClickHouse/pull/8485) ([Guillaume Tassery](https://github.com/YiuRULE))
+
+#### Bug Fix
+* Fix rename of tables with `Distributed` engine. Fixes issue [#7868](https://github.com/ClickHouse/ClickHouse/issues/7868). [#8306](https://github.com/ClickHouse/ClickHouse/pull/8306) ([tavplubix](https://github.com/tavplubix))
+* Now dictionaries support `EXPRESSION` for attributes in arbitrary string in non-ClickHouse SQL dialect. [#8098](https://github.com/ClickHouse/ClickHouse/pull/8098) ([alesapin](https://github.com/alesapin))
+* Fix broken `INSERT SELECT FROM mysql(...)` query. This fixes [#8070](https://github.com/ClickHouse/ClickHouse/issues/8070) and [#7960](https://github.com/ClickHouse/ClickHouse/issues/7960). [#8234](https://github.com/ClickHouse/ClickHouse/pull/8234) ([tavplubix](https://github.com/tavplubix))
+* Fix error "Mismatch column sizes" when inserting default `Tuple` from `JSONEachRow`. This fixes [#5653](https://github.com/ClickHouse/ClickHouse/issues/5653). [#8606](https://github.com/ClickHouse/ClickHouse/pull/8606) ([tavplubix](https://github.com/tavplubix))
+* Now an exception will be thrown in case of using `WITH TIES` alongside `LIMIT BY`. Also add ability to use `TOP` with `LIMIT BY`. This fixes [#7472](https://github.com/ClickHouse/ClickHouse/issues/7472). [#7637](https://github.com/ClickHouse/ClickHouse/pull/7637) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
+* Fix unintendent dependency from fresh glibc version in `clickhouse-odbc-bridge` binary. [#8046](https://github.com/ClickHouse/ClickHouse/pull/8046) ([Amos Bird](https://github.com/amosbird))
+* Fix bug in check function of `*MergeTree` engines family. Now it doesn't fail in case when we have equal amount of rows in last granule and last mark (non-final). [#8047](https://github.com/ClickHouse/ClickHouse/pull/8047) ([alesapin](https://github.com/alesapin))
+* Fix insert into `Enum*` columns after `ALTER` query, when underlying numeric type is equal to table specified type. This fixes [#7836](https://github.com/ClickHouse/ClickHouse/issues/7836). [#7908](https://github.com/ClickHouse/ClickHouse/pull/7908) ([Anton Popov](https://github.com/CurtizJ))
+* Allowed non-constant negative "size" argument for function `substring`. It was not allowed by mistake. This fixes [#4832](https://github.com/ClickHouse/ClickHouse/issues/4832). [#7703](https://github.com/ClickHouse/ClickHouse/pull/7703) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix parsing bug when wrong number of arguments passed to `(O|J)DBC` table engine. [#7709](https://github.com/ClickHouse/ClickHouse/pull/7709) ([alesapin](https://github.com/alesapin))
+* Using command name of the running clickhouse process when sending logs to syslog. In previous versions, empty string was used instead of command name. [#8460](https://github.com/ClickHouse/ClickHouse/pull/8460) ([Michael Nacharov](https://github.com/mnach))
+* Fix check of allowed hosts for `localhost`. This PR fixes the solution provided in [#8241](https://github.com/ClickHouse/ClickHouse/pull/8241). [#8342](https://github.com/ClickHouse/ClickHouse/pull/8342) ([Vitaly Baranov](https://github.com/vitlibar))
+* Fix rare crash in `argMin` and `argMax` functions for long string arguments, when result is used in `runningAccumulate` function. This fixes [#8325](https://github.com/ClickHouse/ClickHouse/issues/8325) [#8341](https://github.com/ClickHouse/ClickHouse/pull/8341) ([dinosaur](https://github.com/769344359))
+* Fix memory overcommit for tables with `Buffer` engine. [#8345](https://github.com/ClickHouse/ClickHouse/pull/8345) ([Azat Khuzhin](https://github.com/azat))
+* Fixed potential bug in functions that can take `NULL` as one of the arguments and return non-NULL. [#8196](https://github.com/ClickHouse/ClickHouse/pull/8196) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Better metrics calculations in thread pool for background processes for `MergeTree` table engines. [#8194](https://github.com/ClickHouse/ClickHouse/pull/8194) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Fix function `IN` inside `WHERE` statement when row-level table filter is present. Fixes [#6687](https://github.com/ClickHouse/ClickHouse/issues/6687) [#8357](https://github.com/ClickHouse/ClickHouse/pull/8357) ([Ivan](https://github.com/abyss7))
+* Now an exception is thrown if the integral value is not parsed completely for settings values. [#7678](https://github.com/ClickHouse/ClickHouse/pull/7678) ([Mikhail Korotov](https://github.com/millb))
+* Fix exception when aggregate function is used in query to distributed table with more than two local shards. [#8164](https://github.com/ClickHouse/ClickHouse/pull/8164) ([小路](https://github.com/nicelulu))
+* Now bloom filter can handle zero length arrays and doesn't perform redundant calculations. [#8242](https://github.com/ClickHouse/ClickHouse/pull/8242) ([achimbab](https://github.com/achimbab))
+* Fixed checking if a client host is allowed by matching the client host to `host_regexp` specified in `users.xml`. [#8241](https://github.com/ClickHouse/ClickHouse/pull/8241) ([Vitaly Baranov](https://github.com/vitlibar))
+* Relax ambiguous column check that leads to false positives in multiple `JOIN ON` section. [#8385](https://github.com/ClickHouse/ClickHouse/pull/8385) ([Artem Zuikov](https://github.com/4ertus2))
+* Fixed possible server crash (`std::terminate`) when the server cannot send or write data in `JSON` or `XML` format with values of `String` data type (that require `UTF-8` validation) or when compressing result data with Brotli algorithm or in some other rare cases. This fixes [#7603](https://github.com/ClickHouse/ClickHouse/issues/7603) [#8384](https://github.com/ClickHouse/ClickHouse/pull/8384) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix race condition in `StorageDistributedDirectoryMonitor` found by CI. This fixes [#8364](https://github.com/ClickHouse/ClickHouse/issues/8364). [#8383](https://github.com/ClickHouse/ClickHouse/pull/8383) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Now background merges in `*MergeTree` table engines family preserve storage policy volume order more accurately. [#8549](https://github.com/ClickHouse/ClickHouse/pull/8549) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Now table engine `Kafka` works properly with `Native` format. This fixes [#6731](https://github.com/ClickHouse/ClickHouse/issues/6731) [#7337](https://github.com/ClickHouse/ClickHouse/issues/7337) [#8003](https://github.com/ClickHouse/ClickHouse/issues/8003). [#8016](https://github.com/ClickHouse/ClickHouse/pull/8016) ([filimonov](https://github.com/filimonov))
+* Fixed formats with headers (like `CSVWithNames`) which were throwing exception about EOF for table engine `Kafka`. [#8016](https://github.com/ClickHouse/ClickHouse/pull/8016) ([filimonov](https://github.com/filimonov))
+* Fixed a bug with making set from subquery in right part of `IN` section. This fixes [#5767](https://github.com/ClickHouse/ClickHouse/issues/5767) and [#2542](https://github.com/ClickHouse/ClickHouse/issues/2542). [#7755](https://github.com/ClickHouse/ClickHouse/pull/7755) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
+* Fix possible crash while reading from storage `File`. [#7756](https://github.com/ClickHouse/ClickHouse/pull/7756) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fixed reading of the files in `Parquet` format containing columns of type `list`. [#8334](https://github.com/ClickHouse/ClickHouse/pull/8334) ([maxulan](https://github.com/maxulan))
+* Fix error `Not found column` for distributed queries with `PREWHERE` condition dependent on sampling key if `max_parallel_replicas > 1`. [#7913](https://github.com/ClickHouse/ClickHouse/pull/7913) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fix error `Not found column` if query used `PREWHERE` dependent on table's alias and the result set was empty because of primary key condition. [#7911](https://github.com/ClickHouse/ClickHouse/pull/7911) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fixed return type for functions `rand` and `randConstant` in case of `Nullable` argument. Now functions always return `UInt32` and never `Nullable(UInt32)`. [#8204](https://github.com/ClickHouse/ClickHouse/pull/8204) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Disabled predicate push-down for `WITH FILL` expression. This fixes [#7784](https://github.com/ClickHouse/ClickHouse/issues/7784). [#7789](https://github.com/ClickHouse/ClickHouse/pull/7789) ([Winter Zhang](https://github.com/zhang2014))
+* Fixed incorrect `count()` result for `SummingMergeTree` when `FINAL` section is used. [#3280](https://github.com/ClickHouse/ClickHouse/issues/3280) [#7786](https://github.com/ClickHouse/ClickHouse/pull/7786) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
+* Fix possible incorrect result for constant functions from remote servers. It happened for queries with functions like `version()`, `uptime()`, etc. which returns different constant values for different servers. This fixes [#7666](https://github.com/ClickHouse/ClickHouse/issues/7666). [#7689](https://github.com/ClickHouse/ClickHouse/pull/7689) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fix complicated bug in push-down predicate optimization which leads to wrong results. This fixes a lot of issues on push-down predicate optimization. [#8503](https://github.com/ClickHouse/ClickHouse/pull/8503) ([Winter Zhang](https://github.com/zhang2014))
+* Fix crash in `CREATE TABLE .. AS dictionary` query. [#8508](https://github.com/ClickHouse/ClickHouse/pull/8508) ([Azat Khuzhin](https://github.com/azat))
+* Several improvements ClickHouse grammar in `.g4` file. [#8294](https://github.com/ClickHouse/ClickHouse/pull/8294) ([taiyang-li](https://github.com/taiyang-li))
+* Fix bug that leads to crashes in `JOIN`s with tables with engine `Join`. This fixes [#7556](https://github.com/ClickHouse/ClickHouse/issues/7556) [#8254](https://github.com/ClickHouse/ClickHouse/issues/8254) [#7915](https://github.com/ClickHouse/ClickHouse/issues/7915) [#8100](https://github.com/ClickHouse/ClickHouse/issues/8100). [#8298](https://github.com/ClickHouse/ClickHouse/pull/8298) ([Artem Zuikov](https://github.com/4ertus2))
+* Fix redundant dictionaries reload on `CREATE DATABASE`. [#7916](https://github.com/ClickHouse/ClickHouse/pull/7916) ([Azat Khuzhin](https://github.com/azat))
+* Limit maximum number of streams for read from `StorageFile` and `StorageHDFS`. Fixes [#7650](https://github.com/ClickHouse/ClickHouse/issues/7650). [#7981](https://github.com/ClickHouse/ClickHouse/pull/7981) ([alesapin](https://github.com/alesapin))
+* Fix bug in `ALTER ... MODIFY ... CODEC` query, when user specify both default expression and codec. Fixes [8593](https://github.com/ClickHouse/ClickHouse/issues/8593). [#8614](https://github.com/ClickHouse/ClickHouse/pull/8614) ([alesapin](https://github.com/alesapin))
+* Fix error in background merge of columns with `SimpleAggregateFunction(LowCardinality)` type. [#8613](https://github.com/ClickHouse/ClickHouse/pull/8613) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fixed type check in function `toDateTime64`. [#8375](https://github.com/ClickHouse/ClickHouse/pull/8375) ([Vasily Nemkov](https://github.com/Enmk))
+* Now server do not crash on `LEFT` or `FULL JOIN` with and Join engine and unsupported `join_use_nulls` settings. [#8479](https://github.com/ClickHouse/ClickHouse/pull/8479) ([Artem Zuikov](https://github.com/4ertus2))
+* Now `DROP DICTIONARY IF EXISTS db.dict` query doesn't throw exception if `db` doesn't exist. [#8185](https://github.com/ClickHouse/ClickHouse/pull/8185) ([Vitaly Baranov](https://github.com/vitlibar))
+* Fix possible crashes in table functions (`file`, `mysql`, `remote`) caused by usage of reference to removed `IStorage` object. Fix incorrect parsing of columns specified at insertion into table function. [#7762](https://github.com/ClickHouse/ClickHouse/pull/7762) ([tavplubix](https://github.com/tavplubix))
+* Ensure network be up before starting `clickhouse-server`. This fixes [#7507](https://github.com/ClickHouse/ClickHouse/issues/7507). [#8570](https://github.com/ClickHouse/ClickHouse/pull/8570) ([Zhichang Yu](https://github.com/yuzhichang))
+* Fix timeouts handling for secure connections, so queries doesn't hang indefenitely. This fixes [#8126](https://github.com/ClickHouse/ClickHouse/issues/8126). [#8128](https://github.com/ClickHouse/ClickHouse/pull/8128) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix `clickhouse-copier`'s redundant contention between concurrent workers. [#7816](https://github.com/ClickHouse/ClickHouse/pull/7816) ([Ding Xiang Fei](https://github.com/dingxiangfei2009))
+* Now mutations doesn't skip attached parts, even if their mutation version were larger than current mutation version. [#7812](https://github.com/ClickHouse/ClickHouse/pull/7812) ([Zhichang Yu](https://github.com/yuzhichang)) [#8250](https://github.com/ClickHouse/ClickHouse/pull/8250) ([alesapin](https://github.com/alesapin))
+* Ignore redundant copies of `*MergeTree` data parts after move to another disk and server restart. [#7810](https://github.com/ClickHouse/ClickHouse/pull/7810) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Fix crash in `FULL JOIN` with `LowCardinality` in `JOIN` key. [#8252](https://github.com/ClickHouse/ClickHouse/pull/8252) ([Artem Zuikov](https://github.com/4ertus2))
+* Forbidden to use column name more than once in insert query like `INSERT INTO tbl (x, y, x)`. This fixes [#5465](https://github.com/ClickHouse/ClickHouse/issues/5465), [#7681](https://github.com/ClickHouse/ClickHouse/issues/7681). [#7685](https://github.com/ClickHouse/ClickHouse/pull/7685) ([alesapin](https://github.com/alesapin))
+* Added fallback for detection the number of physical CPU cores for unknown CPUs (using the number of logical CPU cores). This fixes [#5239](https://github.com/ClickHouse/ClickHouse/issues/5239). [#7726](https://github.com/ClickHouse/ClickHouse/pull/7726) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix `There's no column` error for materialized and alias columns. [#8210](https://github.com/ClickHouse/ClickHouse/pull/8210) ([Artem Zuikov](https://github.com/4ertus2))
+* Fixed sever crash when `EXISTS` query was used without `TABLE` or `DICTIONARY` qualifier. Just like `EXISTS t`. This fixes [#8172](https://github.com/ClickHouse/ClickHouse/issues/8172). This bug was introduced in version 19.17. [#8213](https://github.com/ClickHouse/ClickHouse/pull/8213) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix rare bug with error `"Sizes of columns doesn't match"` that might appear when using `SimpleAggregateFunction` column. [#7790](https://github.com/ClickHouse/ClickHouse/pull/7790) ([Boris Granveaud](https://github.com/bgranvea))
+* Fix bug where user with empty `allow_databases` got access to all databases (and same for `allow_dictionaries`). [#7793](https://github.com/ClickHouse/ClickHouse/pull/7793) ([DeifyTheGod](https://github.com/DeifyTheGod))
+* Fix client crash when server already disconnected from client. [#8071](https://github.com/ClickHouse/ClickHouse/pull/8071) ([Azat Khuzhin](https://github.com/azat))
+* Fix `ORDER BY` behaviour in case of sorting by primary key prefix and non primary key suffix. [#7759](https://github.com/ClickHouse/ClickHouse/pull/7759) ([Anton Popov](https://github.com/CurtizJ))
+* Check if qualified column present in the table. This fixes [#6836](https://github.com/ClickHouse/ClickHouse/issues/6836). [#7758](https://github.com/ClickHouse/ClickHouse/pull/7758) ([Artem Zuikov](https://github.com/4ertus2))
+* Fixed behavior with `ALTER MOVE` ran immediately after merge finish moves superpart of specified. Fixes [#8103](https://github.com/ClickHouse/ClickHouse/issues/8103). [#8104](https://github.com/ClickHouse/ClickHouse/pull/8104) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Fix possible server crash while using `UNION` with different number of columns. Fixes [#7279](https://github.com/ClickHouse/ClickHouse/issues/7279). [#7929](https://github.com/ClickHouse/ClickHouse/pull/7929) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fix size of result substring for function `substr` with negative size. [#8589](https://github.com/ClickHouse/ClickHouse/pull/8589) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Now server does not execute part mutation in `MergeTree` if there are not enough free threads in background pool.  [#8588](https://github.com/ClickHouse/ClickHouse/pull/8588) ([tavplubix](https://github.com/tavplubix))
+* Fix a minor typo on formatting `UNION ALL` AST. [#7999](https://github.com/ClickHouse/ClickHouse/pull/7999) ([litao91](https://github.com/litao91))
+* Fixed incorrect bloom filter results for negative numbers. This fixes [#8317](https://github.com/ClickHouse/ClickHouse/issues/8317). [#8566](https://github.com/ClickHouse/ClickHouse/pull/8566) ([Winter Zhang](https://github.com/zhang2014))
+* Fixed potential buffer overflow in decompress. Malicious user can pass fabricated compressed data that will cause read after buffer. This issue was found by Eldar Zaitov from Yandex information security team. [#8404](https://github.com/ClickHouse/ClickHouse/pull/8404) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix incorrect result because of integers overflow in `arrayIntersect`. [#7777](https://github.com/ClickHouse/ClickHouse/pull/7777) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Now `OPTIMIZE TABLE` query will not wait for offline replicas to perform the operation. [#8314](https://github.com/ClickHouse/ClickHouse/pull/8314) ([javi santana](https://github.com/javisantana))
+* Fixed `ALTER TTL` parser for `Replicated*MergeTree` tables. [#8318](https://github.com/ClickHouse/ClickHouse/pull/8318) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Fix communication between server and client, so server read temporary tables info after query failure. [#8084](https://github.com/ClickHouse/ClickHouse/pull/8084) ([Azat Khuzhin](https://github.com/azat))
+* Fix `bitmapAnd` function error when intersecting an aggregated bitmap and a scalar bitmap. [#8082](https://github.com/ClickHouse/ClickHouse/pull/8082) ([Yue Huang](https://github.com/moon03432))
+* Refine the definition of `ZXid` according to the ZooKeeper Programmer's Guide which fixes bug in `clickhouse-cluster-copier`. [#8088](https://github.com/ClickHouse/ClickHouse/pull/8088) ([Ding Xiang Fei](https://github.com/dingxiangfei2009))
+* `odbc` table function now respects `external_table_functions_use_nulls` setting. [#7506](https://github.com/ClickHouse/ClickHouse/pull/7506) ([Vasily Nemkov](https://github.com/Enmk))
+* Fixed bug that lead to a rare data race. [#8143](https://github.com/ClickHouse/ClickHouse/pull/8143) ([Alexander Kazakov](https://github.com/Akazz))
+* Now `SYSTEM RELOAD DICTIONARY` reloads a dictionary completely, ignoring `update_field`. This fixes [#7440](https://github.com/ClickHouse/ClickHouse/issues/7440). [#8037](https://github.com/ClickHouse/ClickHouse/pull/8037) ([Vitaly Baranov](https://github.com/vitlibar))
+* Add ability to check if dictionary exists in create query. [#8032](https://github.com/ClickHouse/ClickHouse/pull/8032) ([alesapin](https://github.com/alesapin))
+* Fix `Float*` parsing in `Values` format. This fixes [#7817](https://github.com/ClickHouse/ClickHouse/issues/7817). [#7870](https://github.com/ClickHouse/ClickHouse/pull/7870) ([tavplubix](https://github.com/tavplubix))
+* Fix crash when we cannot reserve space in some background operations of `*MergeTree` table engines family. [#7873](https://github.com/ClickHouse/ClickHouse/pull/7873) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Fix crash of merge operation when table contains `SimpleAggregateFunction(LowCardinality)` column. This fixes [#8515](https://github.com/ClickHouse/ClickHouse/issues/8515). [#8522](https://github.com/ClickHouse/ClickHouse/pull/8522) ([Azat Khuzhin](https://github.com/azat))
+* Restore support of all ICU locales and add the ability to apply collations for constant expressions. Also add language name to `system.collations` table. [#8051](https://github.com/ClickHouse/ClickHouse/pull/8051) ([alesapin](https://github.com/alesapin))
+* Fix bug when external dictionaries with zero minimal lifetime (`LIFETIME(MIN 0 MAX N)`, `LIFETIME(N)`) don't update in background. [#7983](https://github.com/ClickHouse/ClickHouse/pull/7983) ([alesapin](https://github.com/alesapin))
+* Fix crash when external dictionary with ClickHouse source has subquery in query. [#8351](https://github.com/ClickHouse/ClickHouse/pull/8351) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Fix incorrect parsing of file extension in table with engine `URL`. This fixes [#8157](https://github.com/ClickHouse/ClickHouse/issues/8157). [#8419](https://github.com/ClickHouse/ClickHouse/pull/8419) ([Andrey Bodrov](https://github.com/apbodrov))
+* Fix `CHECK TABLE` query for `*MergeTree` tables without key. Fixes [#7543](https://github.com/ClickHouse/ClickHouse/issues/7543). [#7979](https://github.com/ClickHouse/ClickHouse/pull/7979) ([alesapin](https://github.com/alesapin))
+* Fixed conversion of `Float64` to MySQL type. [#8079](https://github.com/ClickHouse/ClickHouse/pull/8079) ([Yuriy Baranov](https://github.com/yurriy))
+* Now if table was not completely dropped because of server crash, server will try to restore and load it. [#8176](https://github.com/ClickHouse/ClickHouse/pull/8176) ([tavplubix](https://github.com/tavplubix))
+* Fixed crash in table function `file` while inserting into file that doesn't exist. Now in this case file would be created and then insert would be processed. [#8177](https://github.com/ClickHouse/ClickHouse/pull/8177) ([Olga Khvostikova](https://github.com/stavrolia))
+* Fix rare deadlock which can happen when `trace_log` is in enabled. [#7838](https://github.com/ClickHouse/ClickHouse/pull/7838) ([filimonov](https://github.com/filimonov))
+* Add ability to work with different types besides `Date` in `RangeHashed` external dictionary created from DDL query. Fixes [7899](https://github.com/ClickHouse/ClickHouse/issues/7899). [#8275](https://github.com/ClickHouse/ClickHouse/pull/8275) ([alesapin](https://github.com/alesapin))
+* Fixes crash when `now64()` is called with result of another function. [#8270](https://github.com/ClickHouse/ClickHouse/pull/8270) ([Vasily Nemkov](https://github.com/Enmk))
+* Fixed bug with detecting client IP for connections through mysql wire protocol. [#7743](https://github.com/ClickHouse/ClickHouse/pull/7743) ([Dmitry Muzyka](https://github.com/dmitriy-myz))
+* Fix empty array handling in `arraySplit` function. This fixes [#7708](https://github.com/ClickHouse/ClickHouse/issues/7708). [#7747](https://github.com/ClickHouse/ClickHouse/pull/7747) ([hcz](https://github.com/hczhcz))
+* Fixed the issue when `pid-file` of another running `clickhouse-server` may be deleted. [#8487](https://github.com/ClickHouse/ClickHouse/pull/8487) ([Weiqing Xu](https://github.com/weiqxu))
+* Fix dictionary reload if it has `invalidate_query`, which stopped updates and some exception on previous update tries. [#8029](https://github.com/ClickHouse/ClickHouse/pull/8029) ([alesapin](https://github.com/alesapin))
+* Fixed error in function `arrayReduce` that may lead to "double free" and error in aggregate function combinator `Resample` that may lead to memory leak. Added aggregate function `aggThrow`. This function can be used for testing purposes. [#8446](https://github.com/ClickHouse/ClickHouse/pull/8446) ([alexey-milovidov](https://github.com/alexey-milovidov))
+
+#### Improvement
+* Improved logging when working with `S3` table engine. [#8251](https://github.com/ClickHouse/ClickHouse/pull/8251) ([Grigory Pervakov](https://github.com/GrigoryPervakov))
+* Printed help message when no arguments are passed when calling `clickhouse-local`. This fixes [#5335](https://github.com/ClickHouse/ClickHouse/issues/5335). [#8230](https://github.com/ClickHouse/ClickHouse/pull/8230) ([Andrey Nagorny](https://github.com/Melancholic))
+* Add setting `mutations_sync` which allows to wait `ALTER UPDATE/DELETE` queries synchronously. [#8237](https://github.com/ClickHouse/ClickHouse/pull/8237) ([alesapin](https://github.com/alesapin))
+* Allow to set up relative `user_files_path` in `config.xml` (in the way similar to `format_schema_path`). [#7632](https://github.com/ClickHouse/ClickHouse/pull/7632) ([hcz](https://github.com/hczhcz))
+* Add exception for illegal types for conversion functions with `-OrZero` postfix. [#7880](https://github.com/ClickHouse/ClickHouse/pull/7880) ([Andrey Konyaev](https://github.com/akonyaev90))
+* Simplify format of the header of data sending to a shard in a distributed query. [#8044](https://github.com/ClickHouse/ClickHouse/pull/8044) ([Vitaly Baranov](https://github.com/vitlibar))
+* `Live View` table engine refactoring. [#8519](https://github.com/ClickHouse/ClickHouse/pull/8519) ([vzakaznikov](https://github.com/vzakaznikov))
+* Add additional checks for external dictionaries created from DDL-queries. [#8127](https://github.com/ClickHouse/ClickHouse/pull/8127) ([alesapin](https://github.com/alesapin))
+* Fix error `Column ... already exists` while using `FINAL` and `SAMPLE` together, e.g. `select count() from table final sample 1/2`. Fixes [#5186](https://github.com/ClickHouse/ClickHouse/issues/5186). [#7907](https://github.com/ClickHouse/ClickHouse/pull/7907) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Now table the first argument of `joinGet` function can be table identifier. [#7707](https://github.com/ClickHouse/ClickHouse/pull/7707) ([Amos Bird](https://github.com/amosbird))
+* Allow using `MaterializedView` with subqueries above `Kafka` tables. [#8197](https://github.com/ClickHouse/ClickHouse/pull/8197) ([filimonov](https://github.com/filimonov))
+* Now background moves between disks run it the seprate thread pool. [#7670](https://github.com/ClickHouse/ClickHouse/pull/7670) ([Vladimir Chebotarev](https://github.com/excitoon))
+* `SYSTEM RELOAD DICTIONARY` now executes synchronously. [#8240](https://github.com/ClickHouse/ClickHouse/pull/8240) ([Vitaly Baranov](https://github.com/vitlibar))
+* Stack traces now display physical addresses (offsets in object file) instead of virtual memory addresses (where the object file was loaded). That allows the use of `addr2line` when binary is position independent and ASLR is active. This fixes [#8360](https://github.com/ClickHouse/ClickHouse/issues/8360). [#8387](https://github.com/ClickHouse/ClickHouse/pull/8387) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Support new syntax for row-level security filters: `<table name='table_name'>…</table>`. Fixes [#5779](https://github.com/ClickHouse/ClickHouse/issues/5779). [#8381](https://github.com/ClickHouse/ClickHouse/pull/8381) ([Ivan](https://github.com/abyss7))
+* Now `cityHash` function can work with `Decimal` and `UUID` types. Fixes [#5184](https://github.com/ClickHouse/ClickHouse/issues/5184). [#7693](https://github.com/ClickHouse/ClickHouse/pull/7693) ([Mikhail Korotov](https://github.com/millb))
+* Removed fixed index granularity (it was 1024) from system logs because it's obsolete after implementation of adaptive granularity. [#7698](https://github.com/ClickHouse/ClickHouse/pull/7698) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Enabled MySQL compatibility server when ClickHouse is compiled without SSL. [#7852](https://github.com/ClickHouse/ClickHouse/pull/7852) ([Yuriy Baranov](https://github.com/yurriy))
+* Now server checksums distributed batches, which gives more verbose errors in case of corrupted data in batch. [#7914](https://github.com/ClickHouse/ClickHouse/pull/7914) ([Azat Khuzhin](https://github.com/azat))
+* Support `DROP DATABASE`, `DETACH TABLE`, `DROP TABLE` and `ATTACH TABLE` for `MySQL` database engine. [#8202](https://github.com/ClickHouse/ClickHouse/pull/8202) ([Winter Zhang](https://github.com/zhang2014))
+* Add authentication in S3 table function and table engine. [#7623](https://github.com/ClickHouse/ClickHouse/pull/7623) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Added check for extra parts of `MergeTree` at different disks, in order to not allow to miss data parts at undefined disks. [#8118](https://github.com/ClickHouse/ClickHouse/pull/8118) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Enable SSL support for Mac client and server. [#8297](https://github.com/ClickHouse/ClickHouse/pull/8297) ([Ivan](https://github.com/abyss7))
+* Now ClickHouse can work as MySQL federated server (see https://dev.mysql.com/doc/refman/5.7/en/federated-create-server.html). [#7717](https://github.com/ClickHouse/ClickHouse/pull/7717) ([Maxim Fedotov](https://github.com/MaxFedotov))
+* `clickhouse-client` now only enable `bracketed-paste` when multiquery is on and multiline is off. This fixes [#7757](https://github.com/ClickHouse/ClickHouse/issues/7757). [#7761](https://github.com/ClickHouse/ClickHouse/pull/7761) ([Amos Bird](https://github.com/amosbird))
+* Support `Array(Decimal)` in `if` function. [#7721](https://github.com/ClickHouse/ClickHouse/pull/7721) ([Artem Zuikov](https://github.com/4ertus2))
+* Support Decimals in `arrayDifference`, `arrayCumSum` and `arrayCumSumNegative` functions. [#7724](https://github.com/ClickHouse/ClickHouse/pull/7724) ([Artem Zuikov](https://github.com/4ertus2))
+* Added `lifetime` column to `system.dictionaries` table. [#6820](https://github.com/ClickHouse/ClickHouse/issues/6820) [#7727](https://github.com/ClickHouse/ClickHouse/pull/7727) ([kekekekule](https://github.com/kekekekule))
+* Improved check for existing parts on different disks for `*MergeTree` table engines. Addresses [#7660](https://github.com/ClickHouse/ClickHouse/issues/7660). [#8440](https://github.com/ClickHouse/ClickHouse/pull/8440) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Integration with `AWS SDK` for `S3` interactions which allows to use all S3 features out of the box. [#8011](https://github.com/ClickHouse/ClickHouse/pull/8011) ([Pavel Kovalenko](https://github.com/Jokser))
+* Added support for subqueries in `Live View` tables. [#7792](https://github.com/ClickHouse/ClickHouse/pull/7792) ([vzakaznikov](https://github.com/vzakaznikov))
+* Check for using `Date` or `DateTime` column from `TTL` expressions was removed. [#7920](https://github.com/ClickHouse/ClickHouse/pull/7920) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Information about disk was added to `system.detached_parts` table. [#7833](https://github.com/ClickHouse/ClickHouse/pull/7833) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Now settings `max_(table|partition)_size_to_drop` can be changed without a restart. [#7779](https://github.com/ClickHouse/ClickHouse/pull/7779) ([Grigory Pervakov](https://github.com/GrigoryPervakov))
+* Slightly better usability of error messages. Ask user not to remove the lines below `Stack trace:`. [#7897](https://github.com/ClickHouse/ClickHouse/pull/7897) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Better reading messages from `Kafka` engine in various formats after [#7935](https://github.com/ClickHouse/ClickHouse/issues/7935). [#8035](https://github.com/ClickHouse/ClickHouse/pull/8035) ([Ivan](https://github.com/abyss7))
+* Better compatibility with MySQL clients which don't support `sha2_password` auth plugin. [#8036](https://github.com/ClickHouse/ClickHouse/pull/8036) ([Yuriy Baranov](https://github.com/yurriy))
+* Support more column types in MySQL compatibility server. [#7975](https://github.com/ClickHouse/ClickHouse/pull/7975) ([Yuriy Baranov](https://github.com/yurriy))
+* Implement `ORDER BY` optimization for `Merge`, `Buffer` and `Materilized View` storages with underlying `MergeTree` tables. [#8130](https://github.com/ClickHouse/ClickHouse/pull/8130) ([Anton Popov](https://github.com/CurtizJ))
+* Now we always use POSIX implementation of `getrandom` to have better compatibility with old kernels (< 3.17). [#7940](https://github.com/ClickHouse/ClickHouse/pull/7940) ([Amos Bird](https://github.com/amosbird))
+* Better check for valid destination in a move TTL rule. [#8410](https://github.com/ClickHouse/ClickHouse/pull/8410) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Better checks for broken insert batches for `Distributed` table engine. [#7933](https://github.com/ClickHouse/ClickHouse/pull/7933) ([Azat Khuzhin](https://github.com/azat))
+* Add column with array of parts name which mutations must process in future to `system.mutations` table. [#8179](https://github.com/ClickHouse/ClickHouse/pull/8179) ([alesapin](https://github.com/alesapin))
+* Parallel merge sort optimization for processors. [#8552](https://github.com/ClickHouse/ClickHouse/pull/8552) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* The settings `mark_cache_min_lifetime` is now obsolete and does nothing. In previous versions, mark cache can grow in memory larger than `mark_cache_size` to accomodate data within `mark_cache_min_lifetime` seconds. That was leading to confusion and higher memory usage than expected, that is especially bad on memory constrained systems. If you will see performance degradation after installing this release, you should increase the `mark_cache_size`. [#8484](https://github.com/ClickHouse/ClickHouse/pull/8484) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Preparation to use `tid` everywhere. This is needed for [#7477](https://github.com/ClickHouse/ClickHouse/issues/7477). [#8276](https://github.com/ClickHouse/ClickHouse/pull/8276) ([alexey-milovidov](https://github.com/alexey-milovidov))
+
+#### Performance Improvement
+* Performance optimizations in processors pipeline. [#7988](https://github.com/ClickHouse/ClickHouse/pull/7988) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Non-blocking updates of expired keys in cache dictionaries (with permission to read old ones). [#8303](https://github.com/ClickHouse/ClickHouse/pull/8303) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
+* Compile ClickHouse without `-fno-omit-frame-pointer` globally to spare one more register. [#8097](https://github.com/ClickHouse/ClickHouse/pull/8097) ([Amos Bird](https://github.com/amosbird))
+* Speedup `greatCircleDistance` function and add performance tests for it. [#7307](https://github.com/ClickHouse/ClickHouse/pull/7307) ([Olga Khvostikova](https://github.com/stavrolia))
+* Improved performance of function `roundDown`. [#8465](https://github.com/ClickHouse/ClickHouse/pull/8465) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Improved performance of `max`, `min`, `argMin`, `argMax` for `DateTime64` data type. [#8199](https://github.com/ClickHouse/ClickHouse/pull/8199) ([Vasily Nemkov](https://github.com/Enmk))
+* Improved performance of sorting without a limit or with big limit and external sorting. [#8545](https://github.com/ClickHouse/ClickHouse/pull/8545) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Improved performance of formatting floating point numbers up to 6 times. [#8542](https://github.com/ClickHouse/ClickHouse/pull/8542) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Improved performance of `modulo` function. [#7750](https://github.com/ClickHouse/ClickHouse/pull/7750) ([Amos Bird](https://github.com/amosbird))
+* Optimized `ORDER BY` and merging with single column key. [#8335](https://github.com/ClickHouse/ClickHouse/pull/8335) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Better implementation for `arrayReduce`, `-Array` and `-State` combinators.  [#7710](https://github.com/ClickHouse/ClickHouse/pull/7710) ([Amos Bird](https://github.com/amosbird))
+* Now `PREWHERE` should be optimized to be at least as efficient as `WHERE`. [#7769](https://github.com/ClickHouse/ClickHouse/pull/7769) ([Amos Bird](https://github.com/amosbird))
+* Improve the way `round` and `roundBankers` handling negative numbers. [#8229](https://github.com/ClickHouse/ClickHouse/pull/8229) ([hcz](https://github.com/hczhcz))
+* Improved decoding performance of `DoubleDelta` and `Gorilla` codecs by roughly 30-40%. This fixes [#7082](https://github.com/ClickHouse/ClickHouse/issues/7082). [#8019](https://github.com/ClickHouse/ClickHouse/pull/8019) ([Vasily Nemkov](https://github.com/Enmk))
+* Improved performance of `base64` related functions. [#8444](https://github.com/ClickHouse/ClickHouse/pull/8444) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Added a function `geoDistance`. It is similar to `greatCircleDistance` but uses approximation to WGS-84 ellipsoid model. The performance of both functions are near the same. [#8086](https://github.com/ClickHouse/ClickHouse/pull/8086) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Faster `min` and `max` aggregation functions for `Decimal` data type. [#8144](https://github.com/ClickHouse/ClickHouse/pull/8144) ([Artem Zuikov](https://github.com/4ertus2))
+* Vectorize processing `arrayReduce`. [#7608](https://github.com/ClickHouse/ClickHouse/pull/7608) ([Amos Bird](https://github.com/amosbird))
+* `if` chains are now optimized as `multiIf`. [#8355](https://github.com/ClickHouse/ClickHouse/pull/8355) ([kamalov-ruslan](https://github.com/kamalov-ruslan))
+* Fix performance regression of `Kafka` table engine introduced in 19.15. This fixes [#7261](https://github.com/ClickHouse/ClickHouse/issues/7261). [#7935](https://github.com/ClickHouse/ClickHouse/pull/7935) ([filimonov](https://github.com/filimonov))
+* Removed "pie" code generation that `gcc` from Debian packages occasionally brings by default. [#8483](https://github.com/ClickHouse/ClickHouse/pull/8483) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Parallel parsing data formats [#6553](https://github.com/ClickHouse/ClickHouse/pull/6553) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
+* Enable optimized parser of `Values` with expressions by default (`input_format_values_deduce_templates_of_expressions=1`). [#8231](https://github.com/ClickHouse/ClickHouse/pull/8231) ([tavplubix](https://github.com/tavplubix))
+
+#### Build/Testing/Packaging Improvement
+* Build fixes for `ARM` and in minimal mode. [#8304](https://github.com/ClickHouse/ClickHouse/pull/8304) ([proller](https://github.com/proller))
+* Add coverage file flush for `clickhouse-server` when std::atexit is not called. Also slightly improved logging in stateless tests with coverage. [#8267](https://github.com/ClickHouse/ClickHouse/pull/8267) ([alesapin](https://github.com/alesapin))
+* Update LLVM library in contrib. Avoid using LLVM from OS packages. [#8258](https://github.com/ClickHouse/ClickHouse/pull/8258) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Make bundled `curl` build fully quiet. [#8232](https://github.com/ClickHouse/ClickHouse/pull/8232) [#8203](https://github.com/ClickHouse/ClickHouse/pull/8203) ([Pavel Kovalenko](https://github.com/Jokser))
+* Fix some `MemorySanitizer` warnings. [#8235](https://github.com/ClickHouse/ClickHouse/pull/8235) ([Alexander Kuzmenkov](https://github.com/akuzm))
+* Use `add_warning` and `no_warning` macros in `CMakeLists.txt`. [#8604](https://github.com/ClickHouse/ClickHouse/pull/8604) ([Ivan](https://github.com/abyss7))
+* Add support of Minio S3 Compatible object (https://min.io/) for better integration tests. [#7863](https://github.com/ClickHouse/ClickHouse/pull/7863) [#7875](https://github.com/ClickHouse/ClickHouse/pull/7875) ([Pavel Kovalenko](https://github.com/Jokser))
+* Imported `libc` headers to contrib. It allows to make builds more consistent across various systems (only for `x86_64-linux-gnu`). [#5773](https://github.com/ClickHouse/ClickHouse/pull/5773) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Remove `-fPIC` from some libraries. [#8464](https://github.com/ClickHouse/ClickHouse/pull/8464) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Clean `CMakeLists.txt` for curl. See https://github.com/ClickHouse/ClickHouse/pull/8011#issuecomment-569478910 [#8459](https://github.com/ClickHouse/ClickHouse/pull/8459) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Silent warnings in `CapNProto` library. [#8220](https://github.com/ClickHouse/ClickHouse/pull/8220) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Add performance tests for short string optimized hash tables. [#7679](https://github.com/ClickHouse/ClickHouse/pull/7679) ([Amos Bird](https://github.com/amosbird))
+* Now ClickHouse will build on `AArch64` even if `MADV_FREE` is not available. This fixes [#8027](https://github.com/ClickHouse/ClickHouse/issues/8027). [#8243](https://github.com/ClickHouse/ClickHouse/pull/8243) ([Amos Bird](https://github.com/amosbird))
+* Update `zlib-ng` to fix memory sanitizer problems. [#7182](https://github.com/ClickHouse/ClickHouse/pull/7182) [#8206](https://github.com/ClickHouse/ClickHouse/pull/8206) ([Alexander Kuzmenkov](https://github.com/akuzm))
+* Enable internal MySQL library on non-Linux system, because usage of OS packages is very fragile and usually doesn't work at all. This fixes [#5765](https://github.com/ClickHouse/ClickHouse/issues/5765). [#8426](https://github.com/ClickHouse/ClickHouse/pull/8426) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fixed build on some systems after enabling `libc++`. This supersedes [#8374](https://github.com/ClickHouse/ClickHouse/issues/8374). [#8380](https://github.com/ClickHouse/ClickHouse/pull/8380) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Make `Field` methods more type-safe to find more errors. [#7386](https://github.com/ClickHouse/ClickHouse/pull/7386) [#8209](https://github.com/ClickHouse/ClickHouse/pull/8209) ([Alexander Kuzmenkov](https://github.com/akuzm))
+* Added missing files to the `libc-headers` submodule. [#8507](https://github.com/ClickHouse/ClickHouse/pull/8507) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix wrong `JSON` quoting in performance test output. [#8497](https://github.com/ClickHouse/ClickHouse/pull/8497) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Now stack trace is displayed for `std::exception` and `Poco::Exception`. In previous versions it was available only for `DB::Exception`. This improves diagnostics. [#8501](https://github.com/ClickHouse/ClickHouse/pull/8501) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Porting `clock_gettime` and `clock_nanosleep` for fresh glibc versions. [#8054](https://github.com/ClickHouse/ClickHouse/pull/8054) ([Amos Bird](https://github.com/amosbird))
+* Enable `part_log` in example config for developers. [#8609](https://github.com/ClickHouse/ClickHouse/pull/8609) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix async nature of reload in `01036_no_superfluous_dict_reload_on_create_database*`. [#8111](https://github.com/ClickHouse/ClickHouse/pull/8111) ([Azat Khuzhin](https://github.com/azat))
+* Fixed codec performance tests. [#8615](https://github.com/ClickHouse/ClickHouse/pull/8615) ([Vasily Nemkov](https://github.com/Enmk))
+* Add install scripts for `.tgz` build and documentation for them. [#8612](https://github.com/ClickHouse/ClickHouse/pull/8612) [#8591](https://github.com/ClickHouse/ClickHouse/pull/8591) ([alesapin](https://github.com/alesapin))
+* Removed old `ZSTD` test (it was created in year 2016 to reproduce the bug that pre 1.0 version of ZSTD has had). This fixes [#8618](https://github.com/ClickHouse/ClickHouse/issues/8618). [#8619](https://github.com/ClickHouse/ClickHouse/pull/8619) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fixed build on Mac OS Catalina. [#8600](https://github.com/ClickHouse/ClickHouse/pull/8600) ([meo](https://github.com/meob))
+* Increased number of rows in codec performance tests to make results noticeable. [#8574](https://github.com/ClickHouse/ClickHouse/pull/8574) ([Vasily Nemkov](https://github.com/Enmk))
+* In debug builds, treat `LOGICAL_ERROR` exceptions as assertion failures, so that they are easier to notice. [#8475](https://github.com/ClickHouse/ClickHouse/pull/8475) ([Alexander Kuzmenkov](https://github.com/akuzm))
+* Make formats-related performance test more deterministic. [#8477](https://github.com/ClickHouse/ClickHouse/pull/8477) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Update `lz4` to fix a MemorySanitizer failure. [#8181](https://github.com/ClickHouse/ClickHouse/pull/8181) ([Alexander Kuzmenkov](https://github.com/akuzm))
+* Suppress a known MemorySanitizer false positive in exception handling. [#8182](https://github.com/ClickHouse/ClickHouse/pull/8182) ([Alexander Kuzmenkov](https://github.com/akuzm))
+* Update `gcc` and `g++` to version 9 in `build/docker/build.sh` [#7766](https://github.com/ClickHouse/ClickHouse/pull/7766) ([TLightSky](https://github.com/tlightsky))
+* Add performance test case to test that `PREWHERE` is worse than `WHERE`.  [#7768](https://github.com/ClickHouse/ClickHouse/pull/7768) ([Amos Bird](https://github.com/amosbird))
+* Progress towards fixing one flacky test. [#8621](https://github.com/ClickHouse/ClickHouse/pull/8621) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Avoid MemorySanitizer report for data from `libunwind`. [#8539](https://github.com/ClickHouse/ClickHouse/pull/8539) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Updated `libc++` to the latest version. [#8324](https://github.com/ClickHouse/ClickHouse/pull/8324) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Build ICU library from sources. This fixes [#6460](https://github.com/ClickHouse/ClickHouse/issues/6460). [#8219](https://github.com/ClickHouse/ClickHouse/pull/8219) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Switched from `libressl` to `openssl`. ClickHouse should support TLS 1.3 and SNI after this change. This fixes [#8171](https://github.com/ClickHouse/ClickHouse/issues/8171). [#8218](https://github.com/ClickHouse/ClickHouse/pull/8218) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fixed UBSan report when using `chacha20_poly1305` from SSL (happens on connect to https://yandex.ru/). [#8214](https://github.com/ClickHouse/ClickHouse/pull/8214) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix mode of default password file for `.deb` linux distros. [#8075](https://github.com/ClickHouse/ClickHouse/pull/8075) ([proller](https://github.com/proller))
+* Improved expression for getting `clickhouse-server` PID in `clickhouse-test`. [#8063](https://github.com/ClickHouse/ClickHouse/pull/8063) ([Alexander Kazakov](https://github.com/Akazz))
+* Updated contrib/googletest to v1.10.0. [#8587](https://github.com/ClickHouse/ClickHouse/pull/8587) ([Alexander Burmak](https://github.com/Alex-Burmak))
+* Fixed ThreadSaninitizer report in `base64` library. Also updated this library to the latest version, but it doesn't matter. This fixes [#8397](https://github.com/ClickHouse/ClickHouse/issues/8397). [#8403](https://github.com/ClickHouse/ClickHouse/pull/8403) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix `00600_replace_running_query` for processors. [#8272](https://github.com/ClickHouse/ClickHouse/pull/8272) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Remove support for `tcmalloc` to make `CMakeLists.txt` simpler. [#8310](https://github.com/ClickHouse/ClickHouse/pull/8310) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Release gcc builds now use `libc++` instead of `libstdc++`. Recently `libc++` was used only with clang. This will improve consistency of build configurations and portability. [#8311](https://github.com/ClickHouse/ClickHouse/pull/8311) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Enable ICU library for build with MemorySanitizer. [#8222](https://github.com/ClickHouse/ClickHouse/pull/8222) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Suppress warnings from `CapNProto` library. [#8224](https://github.com/ClickHouse/ClickHouse/pull/8224) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Removed special cases of code for `tcmalloc`, because it's no longer supported. [#8225](https://github.com/ClickHouse/ClickHouse/pull/8225) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* In CI coverage task, kill the server gracefully to allow it to save the coverage report. This fixes incomplete coverage reports we've been seeing lately. [#8142](https://github.com/ClickHouse/ClickHouse/pull/8142) ([alesapin](https://github.com/alesapin))
+* Performance tests for all codecs against `Float64` and `UInt64` values. [#8349](https://github.com/ClickHouse/ClickHouse/pull/8349) ([Vasily Nemkov](https://github.com/Enmk))
+* `termcap` is very much deprecated and lead to various problems (f.g. missing "up" cap and echoing `^J` instead of multi line) . Favor `terminfo` or bundled `ncurses`. [#7737](https://github.com/ClickHouse/ClickHouse/pull/7737) ([Amos Bird](https://github.com/amosbird))
+* Fix `test_storage_s3` integration test. [#7734](https://github.com/ClickHouse/ClickHouse/pull/7734) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Support `StorageFile(<format>, null) ` to insert block into given format file without actually write to disk. This is required for performance tests. [#8455](https://github.com/ClickHouse/ClickHouse/pull/8455) ([Amos Bird](https://github.com/amosbird))
+* Added argument `--print-time` to functional tests which prints execution time per test. [#8001](https://github.com/ClickHouse/ClickHouse/pull/8001) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Added asserts to `KeyCondition` while evaluating RPN. This will fix warning from gcc-9. [#8279](https://github.com/ClickHouse/ClickHouse/pull/8279) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Dump cmake options in CI builds. [#8273](https://github.com/ClickHouse/ClickHouse/pull/8273) ([Alexander Kuzmenkov](https://github.com/akuzm))
+* Don't generate debug info for some fat libraries. [#8271](https://github.com/ClickHouse/ClickHouse/pull/8271) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Make `log_to_console.xml` always log to stderr, regardless of is it interactive or not. [#8395](https://github.com/ClickHouse/ClickHouse/pull/8395) ([Alexander Kuzmenkov](https://github.com/akuzm))
+* Removed some unused features from `clickhouse-performance-test` tool. [#8555](https://github.com/ClickHouse/ClickHouse/pull/8555) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Now we will also search for `lld-X` with corresponding `clang-X` version. [#8092](https://github.com/ClickHouse/ClickHouse/pull/8092) ([alesapin](https://github.com/alesapin))
+* Parquet build improvement. [#8421](https://github.com/ClickHouse/ClickHouse/pull/8421) ([maxulan](https://github.com/maxulan))
+* More GCC warnings [#8221](https://github.com/ClickHouse/ClickHouse/pull/8221) ([kreuzerkrieg](https://github.com/kreuzerkrieg))
+* Package for Arch Linux now allows to run ClickHouse server, and not only client. [#8534](https://github.com/ClickHouse/ClickHouse/pull/8534) ([Vladimir Chebotarev](https://github.com/excitoon))
+* Fix test with processors. Tiny performance fixes. [#7672](https://github.com/ClickHouse/ClickHouse/pull/7672) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+* Update contrib/protobuf. [#8256](https://github.com/ClickHouse/ClickHouse/pull/8256) ([Matwey V. Kornilov](https://github.com/matwey))
+* In preparation of switching to c++20 as a new year celebration. "May the C++ force be with ClickHouse." [#8447](https://github.com/ClickHouse/ClickHouse/pull/8447) ([Amos Bird](https://github.com/amosbird))
+
+#### Experimental Feature
+* Added experimental setting `min_bytes_to_use_mmap_io`. It allows to read big files without copying data from kernel to userspace. The setting is disabled by default. Recommended threshold is about 64 MB, because mmap/munmap is slow. [#8520](https://github.com/ClickHouse/ClickHouse/pull/8520) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Reworked quotas as a part of access control system. Added new table `system.quotas`, new functions `currentQuota`, `currentQuotaKey`, new SQL syntax `CREATE QUOTA`, `ALTER QUOTA`, `DROP QUOTA`, `SHOW QUOTA`. [#7257](https://github.com/ClickHouse/ClickHouse/pull/7257) ([Vitaly Baranov](https://github.com/vitlibar))
+* Allow skipping unknown settings with warnings instead of throwing exceptions. [#7653](https://github.com/ClickHouse/ClickHouse/pull/7653) ([Vitaly Baranov](https://github.com/vitlibar))
+* Reworked row policies as a part of access control system. Added new table `system.row_policies`, new function `currentRowPolicies()`, new SQL syntax `CREATE POLICY`, `ALTER POLICY`, `DROP POLICY`, `SHOW CREATE POLICY`, `SHOW POLICIES`. [#7808](https://github.com/ClickHouse/ClickHouse/pull/7808) ([Vitaly Baranov](https://github.com/vitlibar))
+
+#### Security Fix
+* Fixed the possibility of reading directories structure in tables with `File` table engine. This fixes [#8536](https://github.com/ClickHouse/ClickHouse/issues/8536). [#8537](https://github.com/ClickHouse/ClickHouse/pull/8537) ([alexey-milovidov](https://github.com/alexey-milovidov))
+
+## [Changelog for 2019](https://github.com/ClickHouse/ClickHouse/blob/master/docs/en/whats-new/changelog/2019.md)
diff --git a/docs/en/whats-new/changelog/index.md b/docs/en/whats-new/changelog/index.md
index c13441a8bd5..08fe7e3b8dc 100644
--- a/docs/en/whats-new/changelog/index.md
+++ b/docs/en/whats-new/changelog/index.md
@@ -1,7 +1,7 @@
 ---
 toc_folder_title: Changelog
 toc_priority: 74
-toc_title: '2020'
+toc_title: '2021'
 ---
 
 {% include "content/changelog.md" %}

From 8f5d5ebbff6ecae2e37cc0b055c1f28e192cdedd Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <mikhaylovnikitka@gmail.com>
Date: Mon, 18 Jan 2021 16:14:30 +0300
Subject: [PATCH 126/611] Update arcadia_skip_list.txt

---
 tests/queries/0_stateless/arcadia_skip_list.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/queries/0_stateless/arcadia_skip_list.txt b/tests/queries/0_stateless/arcadia_skip_list.txt
index 0fd9814d36a..b6b178b43f4 100644
--- a/tests/queries/0_stateless/arcadia_skip_list.txt
+++ b/tests/queries/0_stateless/arcadia_skip_list.txt
@@ -185,4 +185,5 @@
 01639_distributed_sync_insert_zero_rows
 01644_distributed_async_insert_fsync_smoke
 01552_impl_aggfunc_cloneresize
+01650_fetch_patition_with_macro_in_zk_path
 01651_bugs_from_15889

From f6630ddc4cac9292eefe42edc726e418d04b6cd2 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Mon, 18 Jan 2021 16:15:00 +0300
Subject: [PATCH 127/611] Disable msan for epoll array in libuv

---
 contrib/libuv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/libuv b/contrib/libuv
index 84438304f41..bc14c44b626 160000
--- a/contrib/libuv
+++ b/contrib/libuv
@@ -1 +1 @@
-Subproject commit 84438304f41d8ea6670ee5409f4d6c63ca784f28
+Subproject commit bc14c44b6269c458f2cc7e09eb300f4b64899903

From e495284a0a5ecfeb0e0ead42f3eb8f57a8fac7aa Mon Sep 17 00:00:00 2001
From: Dmitriy <sevirov@yandex-team.ru>
Date: Mon, 18 Jan 2021 16:43:00 +0300
Subject: [PATCH 128/611] Edit and translate to Russian
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Внес поправки в английскую версию и выполнил перевод на русский язык
---
 .../database-engines/materialize-mysql.md     |  31 ++--
 docs/en/whats-new/roadmap.md                  |   2 +-
 docs/ru/engines/database-engines/index.md     |   9 +-
 .../database-engines/materialize-mysql.md     | 157 ++++++++++++++++++
 docs/ru/whats-new/roadmap.md                  |  11 +-
 5 files changed, 191 insertions(+), 19 deletions(-)
 create mode 100644 docs/ru/engines/database-engines/materialize-mysql.md

diff --git a/docs/en/engines/database-engines/materialize-mysql.md b/docs/en/engines/database-engines/materialize-mysql.md
index 964668a2d9d..e1fc83cdab5 100644
--- a/docs/en/engines/database-engines/materialize-mysql.md
+++ b/docs/en/engines/database-engines/materialize-mysql.md
@@ -5,15 +5,15 @@ toc_title: MaterializeMySQL
 
 # MaterializeMySQL {#materialize-mysql}
 
- Creates ClickHouse database with all the tables existing in MySQL, and all the data in those tables. 
+Creates ClickHouse database with all the tables existing in MySQL, and all the data in those tables.
 
- ClickHouse server works as MySQL replica. It reads binlog and performs DDL and DML queries.   
+ClickHouse server works as MySQL replica. It reads binlog and performs DDL and DML queries.
 
 ## Creating a Database {#creating-a-database}
 
 ``` sql
 CREATE DATABASE [IF NOT EXISTS] db_name [ON CLUSTER cluster]
-ENGINE = MaterializeMySQL('host:port', ['database' | database], 'user', 'password') [SETTINGS ...]
+ENGINE = MaterializeMySQL('host:port', ['database' | database], 'user', 'password') [SETTINGS ...];
 ```
 
 **Engine Parameters**
@@ -25,12 +25,12 @@ ENGINE = MaterializeMySQL('host:port', ['database' | database], 'user', 'passwor
 
 ## Virtual columns {#virtual-columns}
 
- When working with the `MaterializeMySQL` database engine, [ReplacingMergeTree](../../engines/table-engines/mergetree-family/replacingmergetree.md) tables are used with virtual `_sign` and `_version` columns.
+When working with the `MaterializeMySQL` database engine, [ReplacingMergeTree](../../engines/table-engines/mergetree-family/replacingmergetree.md) tables are used with virtual `_sign` and `_version` columns.
  
- - `_version` — Transaction counter. Type [UInt64](../../sql-reference/data-types/int-uint.md). 
- - `_sign` — Deletion mark. Type [Int8](../../sql-reference/data-types/int-uint.md). Possible values: 
-     - `1` — Row is not deleted, 
-     - `-1` — Row is deleted.
+- `_version` — Transaction counter. Type [UInt64](../../sql-reference/data-types/int-uint.md).
+- `_sign` — Deletion mark. Type [Int8](../../sql-reference/data-types/int-uint.md). Possible values:
+    - `1` — Row is not deleted, 
+    - `-1` — Row is deleted.
 
 ## Data Types Support {#data_types-support}
 
@@ -61,7 +61,7 @@ Other types are not supported. If MySQL table contains a column of such type, Cl
 
 MySQL DDL queries are converted into the corresponding ClickHouse DDL queries ([ALTER](../../sql-reference/statements/alter/index.md), [CREATE](../../sql-reference/statements/create/index.md), [DROP](../../sql-reference/statements/drop.md), [RENAME](../../sql-reference/statements/rename.md)). If ClickHouse cannot parse some DDL query, the query is ignored.
 
-###  Data Replication {#data-replication}
+### Data Replication {#data-replication}
 
 MaterializeMySQL does not support direct `INSERT`, `DELETE` and `UPDATE` queries. However, they are supported in terms of data replication:
 
@@ -77,7 +77,7 @@ MaterializeMySQL does not support direct `INSERT`, `DELETE` and `UPDATE` queries
 
 - If `_version` is not specified in the `SELECT` query, [FINAL](../../sql-reference/statements/select/from.md#select-from-final) modifier is used. So only rows with `MAX(_version)` are selected.
 
-- If `_sign` is not specified in the `SELECT` query, `WHERE _sign=1` is used by default, so the deleted rows are not included into the result set. 
+- If `_sign` is not specified in the `SELECT` query, `WHERE _sign=1` is used by default. So the deleted rows are not included into the result set.
 
 ### Index Conversion {#index-conversion}
 
@@ -85,12 +85,12 @@ MySQL `PRIMARY KEY` and `INDEX` clauses are converted into `ORDER BY` tuples in
 
 ClickHouse has only one physical order, which is determined by `ORDER BY` clause. To create a new physical order, use [materialized views](../../sql-reference/statements/create/view.md#materialized).
 
- **Notes**
+**Notes**
 
- - Rows with `_sign=-1` are not deleted physically from the tables. 
- - Cascade `UPDATE/DELETE` queries are not supported by the `MaterializeMySQL` engine.
- - Replication can be easily broken.
- - Manual operations on database and tables are forbidden.
+- Rows with `_sign=-1` are not deleted physically from the tables.
+- Cascade `UPDATE/DELETE` queries are not supported by the `MaterializeMySQL` engine.
+- Replication can be easily broken.
+- Manual operations on database and tables are forbidden.
 
 ## Examples of Use {#examples-of-use}
 
@@ -105,6 +105,7 @@ mysql> ALTER TABLE db.test ADD COLUMN c VARCHAR(16);
 mysql> UPDATE db.test SET c='Wow!', b=222;
 mysql> SELECT * FROM test;
 ```
+
 ```text
 +---+------+------+ 
 | a |    b |    c |
diff --git a/docs/en/whats-new/roadmap.md b/docs/en/whats-new/roadmap.md
index 9024afb046b..4abc36b5136 100644
--- a/docs/en/whats-new/roadmap.md
+++ b/docs/en/whats-new/roadmap.md
@@ -5,6 +5,6 @@ toc_title: Roadmap
 
 # Roadmap {#roadmap}
 
-The roadmap for year 2021 is published for open discussion [here](https://github.com/ClickHouse/ClickHouse/issues/17623).
+The roadmap for the year 2021 is published for open discussion [here](https://github.com/ClickHouse/ClickHouse/issues/17623).
 
 {## [Original article](https://clickhouse.tech/docs/en/roadmap/) ##}
diff --git a/docs/ru/engines/database-engines/index.md b/docs/ru/engines/database-engines/index.md
index d3dd729e302..16608d9fd29 100644
--- a/docs/ru/engines/database-engines/index.md
+++ b/docs/ru/engines/database-engines/index.md
@@ -4,7 +4,6 @@ toc_priority: 27
 toc_title: "\u0412\u0432\u0435\u0434\u0435\u043d\u0438\u0435"
 ---
 
-
 # Движки баз данных {#dvizhki-baz-dannykh}
 
 Движки баз данных обеспечивают работу с таблицами.
@@ -13,4 +12,10 @@ toc_title: "\u0412\u0432\u0435\u0434\u0435\u043d\u0438\u0435"
 
 Также можно использовать следующие движки баз данных:
 
--   [MySQL](mysql.md)
+-   [MySQL](../../engines/database-engines/mysql.md)
+
+-   [Lazy](../../engines/database-engines/lazy.md)
+
+-   [MaterializeMySQL](../../engines/database-engines/materialize-mysql.md)
+
+[Оригинальная статья](https://clickhouse.tech/docs/ru/database_engines/) <!--hide-->
diff --git a/docs/ru/engines/database-engines/materialize-mysql.md b/docs/ru/engines/database-engines/materialize-mysql.md
new file mode 100644
index 00000000000..24ddd2218c5
--- /dev/null
+++ b/docs/ru/engines/database-engines/materialize-mysql.md
@@ -0,0 +1,157 @@
+---
+toc_priority: 29
+toc_title: MaterializeMySQL
+---
+
+# MaterializeMySQL {#materialize-mysql}
+
+Создает базу данных ClickHouse со всеми таблицами, существующими в MySQL, и всеми данными в этих таблицах.
+
+Сервер ClickHouse работает как реплика MySQL. Он читает файл binlog и выполняет DDL and DML-запросы.
+
+## Создание базы данных {#creating-a-database}
+
+``` sql
+CREATE DATABASE [IF NOT EXISTS] db_name [ON CLUSTER cluster]
+ENGINE = MaterializeMySQL('host:port', ['database' | database], 'user', 'password') [SETTINGS ...];
+```
+
+**Параметры движка**
+
+-   `host:port` — адрес сервера MySQL.
+-   `database` — имя базы данных на удалённом сервере.
+-   `user` — пользователь MySQL.
+-   `password` — пароль пользователя.
+
+## Виртуальные столбцы {#virtual-columns}
+
+При работе с движком баз данных `MaterializeMySQL` таблицы семейства [ReplacingMergeTree](../../engines/table-engines/mergetree-family/replacingmergetree.md) используются с виртуальными столбцами `_sign` и `_version`.
+ 
+- `_version` — счетчик транзакций. Тип [UInt64](../../sql-reference/data-types/int-uint.md).
+- `_sign` — метка удаления. Тип [Int8](../../sql-reference/data-types/int-uint.md). Возможные значения:
+    - `1` — строка не удалена, 
+    - `-1` — строка удалена.
+
+## Поддержка типов данных {#data_types-support}
+
+| MySQL                   | ClickHouse                                                   |
+|-------------------------|--------------------------------------------------------------|
+| TINY                    | [Int8](../../sql-reference/data-types/int-uint.md)           |
+| SHORT                   | [Int16](../../sql-reference/data-types/int-uint.md)          |
+| INT24                   | [Int32](../../sql-reference/data-types/int-uint.md)          |
+| LONG                    | [UInt32](../../sql-reference/data-types/int-uint.md)         |
+| LONGLONG                | [UInt64](../../sql-reference/data-types/int-uint.md)         |
+| FLOAT                   | [Float32](../../sql-reference/data-types/float.md)           |
+| DOUBLE                  | [Float64](../../sql-reference/data-types/float.md)           |
+| DECIMAL, NEWDECIMAL     | [Decimal](../../sql-reference/data-types/decimal.md)         |
+| DATE, NEWDATE           | [Date](../../sql-reference/data-types/date.md)               |
+| DATETIME, TIMESTAMP     | [DateTime](../../sql-reference/data-types/datetime.md)       |
+| DATETIME2, TIMESTAMP2   | [DateTime64](../../sql-reference/data-types/datetime64.md)   |
+| STRING                  | [String](../../sql-reference/data-types/string.md)           |
+| VARCHAR, VAR_STRING     | [String](../../sql-reference/data-types/string.md)           |
+| BLOB                    | [String](../../sql-reference/data-types/string.md)           |
+
+Другие типы не поддерживаются. Если таблица MySQL содержит столбец такого типа, ClickHouse выдаст исключение "необработанный тип данных" и остановит репликацию.
+
+Тип [Nullable](../../sql-reference/data-types/nullable.md) поддерживается.
+
+## Особенности и рекомендации {#specifics-and-recommendations}
+
+### DDL-запросы {#ddl-queries}
+
+DDL-запросы в MySQL конвертируются в соответствующие DDL-запросы в ClickHouse ([ALTER](../../sql-reference/statements/alter/index.md), [CREATE](../../sql-reference/statements/create/index.md), [DROP](../../sql-reference/statements/drop.md), [RENAME](../../sql-reference/statements/rename.md)). Если ClickHouse не может спарсить какой-либо DDL-запрос, то он игнорируется.
+
+### Репликация данных {#data-replication}
+
+Движок MaterializeMySQL не поддерживает прямые запросы `INSERT`, `DELETE` и `UPDATE`. Однако они поддерживаются с точки зрения репликации данных:
+
+- Запрос `INSERT` в MySQL конвертируется в `INSERT` с `_sign=1`.
+
+- Запрос `DELETE` в MySQL конвертируется в `INSERT` с `_sign=-1`.
+
+- Запрос `UPDATE` в MySQL конвертируется в `INSERT` с `_sign=-1` и `INSERT` с `_sign=1`.
+
+### Выборка из таблиц движка MaterializeMySQL {#select}
+
+Запрос `SELECT` из таблиц движка MaterializeMySQL имеет некоторую специфику:
+
+- Если `_version` не указан в запросе `SELECT`, то используется модификатор [FINAL](../../sql-reference/statements/select/from.md#select-from-final). Таким образом, выбираются только строки с `MAX(_version)`.
+
+- Если `_sign` не указан в запросе `SELECT`, то по умолчанию используется `WHERE _sign=1`. Таким образом, удаленные строки не включаются в результирующий набор. 
+
+### Индекс конверсии {#index-conversion}
+
+Секции `PRIMARY KEY` и `INDEX` в MySQL конвертируются в кортежи `ORDER BY` в таблицах ClickHouse.
+
+ClickHouse имеет только один физический порядок, который определяется секцией `ORDER BY`. Чтобы создать новый физический порядок, используйте [материализованные представления](../../sql-reference/statements/create/view.md#materialized).
+
+**Примечание**
+
+- Строки с `_sign=-1` физически не удаляются из таблиц.
+- Каскадные запросы `UPDATE/DELETE` не поддерживаются движком `MaterializeMySQL`.
+- Репликация может быть легко нарушена.
+- Операции вручную с базами данных и таблицами запрещены.
+
+## Примеры использования {#examples-of-use}
+
+Запросы в MySQL:
+
+``` sql
+mysql> CREATE DATABASE db;
+mysql> CREATE TABLE db.test (a INT PRIMARY KEY, b INT);
+mysql> INSERT INTO db.test VALUES (1, 11), (2, 22);
+mysql> DELETE FROM db.test WHERE a=1;
+mysql> ALTER TABLE db.test ADD COLUMN c VARCHAR(16);
+mysql> UPDATE db.test SET c='Wow!', b=222;
+mysql> SELECT * FROM test;
+```
+
+```text
++---+------+------+ 
+| a |    b |    c |
++---+------+------+ 
+| 2 |  222 | Wow! |
++---+------+------+
+```
+
+База данных в ClickHouse, обмен данными с сервером MySQL:
+
+База данных и созданная таблица:
+
+``` sql
+CREATE DATABASE mysql ENGINE = MaterializeMySQL('localhost:3306', 'db', 'user', '***');
+SHOW TABLES FROM mysql;
+```
+
+``` text
+┌─name─┐
+│ test │
+└──────┘
+```
+
+После вставки данных:
+
+``` sql
+SELECT * FROM mysql.test;
+```
+
+``` text
+┌─a─┬──b─┐ 
+│ 1 │ 11 │ 
+│ 2 │ 22 │ 
+└───┴────┘
+```
+
+После удаления данных, добавления столбца и обновления:
+
+``` sql
+SELECT * FROM mysql.test;
+```
+
+``` text
+┌─a─┬───b─┬─c────┐ 
+│ 2 │ 222 │ Wow! │ 
+└───┴─────┴──────┘
+```
+
+[Оригинальная статья](https://clickhouse.tech/docs/ru/database_engines/materialize-mysql/) <!--hide-->
diff --git a/docs/ru/whats-new/roadmap.md b/docs/ru/whats-new/roadmap.md
index 2c383b2ad5d..f80d210e19b 120000
--- a/docs/ru/whats-new/roadmap.md
+++ b/docs/ru/whats-new/roadmap.md
@@ -1 +1,10 @@
-../../en/whats-new/roadmap.md
\ No newline at end of file
+---
+toc_priority: 74
+toc_title: План
+---
+
+# План {#roadmap}
+
+План на 2021 год опубликован для открытого обсуждения [здесь](https://github.com/ClickHouse/ClickHouse/issues/17623).
+
+{## [Оригинальная статья](https://clickhouse.tech/docs/ru/roadmap/) ##}
\ No newline at end of file

From 071a6aeb4d79e3343c7054285d2c36222ace65ea Mon Sep 17 00:00:00 2001
From: tavplubix <tavplubix@gmail.com>
Date: Mon, 18 Jan 2021 16:53:33 +0300
Subject: [PATCH 129/611] trigger CI

---
 src/Databases/MySQL/MaterializeMySQLSyncThread.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp b/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp
index 9f4de9ea35a..5b7ba99baf9 100644
--- a/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp
+++ b/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp
@@ -110,6 +110,7 @@ static void checkMySQLVariables(const mysqlxx::Pool::Entry & connection)
             {"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)

From 8bafe9cca39e6da7b1198371c78f66fd55c94104 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Mon, 18 Jan 2021 17:59:59 +0300
Subject: [PATCH 130/611] Support split for ActionsDAG.

---
 src/Interpreters/ActionsDAG.cpp | 206 ++++++++++++++++++++++++++++++++
 src/Interpreters/ActionsDAG.h   |   2 +
 2 files changed, 208 insertions(+)

diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index fe0bba2bf3e..e145b7df13e 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -798,6 +798,212 @@ ActionsDAGPtr ActionsDAG::merge(ActionsDAG && first, ActionsDAG && second)
     return std::make_shared<ActionsDAG>(std::move(first));
 }
 
+std::pair<ActionsDAGPtr, ActionsDAGPtr> ActionsDAG::split(std::unordered_set<const Node *> split_nodes) const
+{
+    /// 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;
+
+    /// List of nodes from current actions which are not inputs, but will be in second part.
+    std::vector<const Node *> new_inputs;
+
+    struct Frame
+    {
+        const Node * node;
+        size_t next_child_to_visit = 0;
+    };
+
+    struct Data
+    {
+        bool needed_by_split_node = false;
+        bool visited = false;
+        bool used_in_result = false;
+
+        /// Copies of node in one of the DAGs.
+        /// For COLUMN and INPUT both copies may exist.
+        Node * to_second = nullptr;
+        Node * to_first = nullptr;
+    };
+
+    std::stack<Frame> stack;
+    std::unordered_map<const Node *, Data> data;
+
+    for (const auto & node : index)
+        data[node].used_in_result = true;
+
+    /// DFS. Decide if node is needed by split.
+    for (const auto & node : nodes)
+    {
+        if (split_nodes.count(&node) == 0)
+            continue;
+
+        auto & cur_data = data[&node];
+        if (cur_data.needed_by_split_node)
+            continue;
+
+        cur_data.needed_by_split_node = true;
+        stack.push({.node = &node});
+
+        while (!stack.empty())
+        {
+            auto & cur_node = stack.top().node;
+            stack.pop();
+
+            for (const auto * child : cur_node->children)
+            {
+                auto & child_data = data[child];
+                if (!child_data.needed_by_split_node)
+                {
+                    child_data.needed_by_split_node = true;
+                    stack.push({.node = child});
+                }
+            }
+        }
+    }
+
+    /// DFS. Move nodes to one of the DAGs.
+    for (const auto & node : nodes)
+    {
+        if (!data[&node].visited)
+            stack.push({.node = &node});
+
+        while (!stack.empty())
+        {
+            auto & cur = stack.top();
+            auto & cur_data = data[cur.node];
+
+            /// 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];
+                auto & child_data = data[child];
+
+                if (!child_data.visited)
+                {
+                    stack.push({.node = child});
+                    break;
+                }
+
+                ++cur.next_child_to_visit;
+            }
+
+            /// Make a copy part.
+            if (cur.next_child_to_visit == cur.node->children.size())
+            {
+                cur_data.visited = true;
+                stack.pop();
+
+                if (!cur_data.needed_by_split_node)
+                {
+                    auto & copy = second_nodes.emplace_back(*cur.node);
+                    cur_data.to_second = &copy;
+
+                    /// Replace children to newly created nodes.
+                    for (auto & child : copy.children)
+                    {
+                        auto & child_data = data[child];
+
+                        /// If children is not created, int may be from split part.
+                        if (!child_data.to_second)
+                        {
+                            if (child->type == ActionType::COLUMN) /// Just create new node for COLUMN action.
+                            {
+                                child_data.to_second = &second_nodes.emplace_back(*child);
+                            }
+                            else
+                            {
+                                /// Node from first part is added as new input.
+                                Node input_node;
+                                input_node.type = ActionType::INPUT;
+                                input_node.result_type = child->result_type;
+                                input_node.result_name = child->result_name;
+                                child_data.to_second = &second_nodes.emplace_back(std::move(input_node));
+
+                                /// If it is already an input, it was created by other branch.
+                                assert(child->type != ActionType::INPUT);
+                                new_inputs.push_back(child);
+                            }
+                        }
+
+                        child = child_data.to_second;
+                    }
+
+                    /// Every input should be in both DAGs.
+                    if (copy.type == ActionType::INPUT)
+                    {
+                        auto & input_copy = first_nodes.emplace_back(*cur.node);
+                        assert(cur_data.to_first == nullptr);
+                        cur_data.to_first = &input_copy;
+                    }
+                }
+                else
+                {
+                    auto & copy = first_nodes.emplace_back(*cur.node);
+                    cur_data.to_first = &copy;
+
+                    /// Replace children to newly created nodes.
+                    for (auto & child : copy.children)
+                    {
+                        child = data[child].to_first;
+                        assert(child != nullptr);
+                    }
+
+                    if (cur_data.used_in_result || copy.type == ActionType::INPUT)
+                    {
+                        /// If this node is needed in result, add it as input.
+                        Node input_node;
+                        input_node.type = ActionType::INPUT;
+                        input_node.result_type = node.result_type;
+                        input_node.result_name = node.result_name;
+                        cur_data.to_second = &second_nodes.emplace_back(std::move(input_node));
+
+                        if (copy.type != ActionType::INPUT)
+                            new_inputs.push_back(cur.node);
+                    }
+                }
+            }
+        }
+    }
+
+    for (auto * node : index)
+        second_index.insert(data[node].to_second);
+
+    Inputs second_inputs;
+    Inputs first_inputs;
+
+    for (auto * input : inputs)
+    {
+        const auto & cur = data[input];
+        second_inputs.push_back(cur.to_second);
+        first_index.insert(cur.to_first);
+
+        first_inputs.push_back(cur.to_first);
+    }
+
+    for (const auto * input : new_inputs)
+    {
+        const auto & cur = data[input];
+        second_inputs.push_back(cur.to_second);
+        first_index.insert(cur.to_first);
+    }
+
+    auto first_actions = cloneEmpty();
+    first_actions->nodes.swap(first_nodes);
+    first_actions->index.swap(first_index);
+    first_actions->inputs.swap(first_inputs);
+
+    auto second_actions = cloneEmpty();
+    second_actions->nodes.swap(second_nodes);
+    second_actions->index.swap(second_index);
+    second_actions->inputs.swap(second_inputs);
+
+    return {std::move(first_actions), std::move(second_actions)};
+}
+
 ActionsDAGPtr ActionsDAG::splitActionsBeforeArrayJoin(const NameSet & array_joined_columns)
 {
     /// Split DAG into two parts.
diff --git a/src/Interpreters/ActionsDAG.h b/src/Interpreters/ActionsDAG.h
index 6a26927374e..9ab00e14d2e 100644
--- a/src/Interpreters/ActionsDAG.h
+++ b/src/Interpreters/ActionsDAG.h
@@ -253,6 +253,8 @@ public:
     /// Otherwise, any two actions may be combined.
     static ActionsDAGPtr merge(ActionsDAG && first, ActionsDAG && second);
 
+    std::pair<ActionsDAGPtr, ActionsDAGPtr> split(std::unordered_set<const Node *> split_nodes) const;
+
 private:
     Node & addNode(Node node, bool can_replace = false);
     Node & getNode(const std::string & name);

From 179158ac5a3ef389a6fb4044a642539c1bb015ef Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Mon, 18 Jan 2021 18:24:05 +0300
Subject: [PATCH 131/611] Update run-fuzzer.sh

---
 docker/test/fuzzer/run-fuzzer.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index fc8caaced54..5e9286ac61e 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -74,11 +74,13 @@ 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 master | grep -P 'tests/queries/0_stateless/*.sql' | sed -r -e 's!^!ch/!' | sort -R)
+    NEW_TESTS=$(git diff --name-only master | grep -P 'tests/queries/0_stateless/.*\.sql' | sed -r -e 's!^!ch/!' | sort -R)
     cd ..
     if [[ -n "$NEW_TESTS" ]]
     then
         NEW_TESTS_OPT="--interleave-queries-file ${NEW_TESTS}"
+    else
+        NEW_TESTS_OPT=""
     fi
 
     ./clickhouse-server --config-file db/config.xml -- --path db 2>&1 | tail -100000 > server.log &

From 0d335144338408441f39e90e111d15e80bf89b5e Mon Sep 17 00:00:00 2001
From: Dmitriy <sevirov@yandex-team.ru>
Date: Mon, 18 Jan 2021 18:24:17 +0300
Subject: [PATCH 132/611] Edit and translate to Russian
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Внес поправки в английскую версию и выполнил перевод на русский язык.
---
 docs/en/operations/settings/settings.md       |  6 +--
 .../functions/string-functions.md             |  2 +-
 .../mergetree-family/mergetree.md             |  1 +
 docs/ru/operations/settings/settings.md       | 10 +++++
 .../functions/string-functions.md             | 42 +++++++++++++++++++
 .../sql-reference/statements/create/table.md  | 12 +++++-
 6 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index d3a4d50d21c..c6e13451cef 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -2530,12 +2530,12 @@ See examples in [UNION](../../sql-reference/statements/select/union.md).
 
 ## data_type_default_nullable {#data_type_default_nullable}
 
-Allows data types without explicit modifiers [NULL or NOT NULL](../../sql-reference/statements/create/table.md#null-modifiers) in column definition will be [Nullable](../../sql-reference/data-types/nullable.md#data_type-nullable).
+Allows data type without explicit modifiers [NULL or NOT NULL](../../sql-reference/statements/create/table.md#null-modifiers) in column definition will be [Nullable](../../sql-reference/data-types/nullable.md#data_type-nullable).
 
 Possible values:
 
-- 1 — The data types in column definitions are set to `Nullable` by default.
-- 0 — The data types in column definitions are set to not `Nullable` by default.
+- 1 — The data type in column definition is set to `Nullable` by default.
+- 0 — The data type in column definition is set to not `Nullable` by default.
 
 Default value: `0`.
 
diff --git a/docs/en/sql-reference/functions/string-functions.md b/docs/en/sql-reference/functions/string-functions.md
index 83f2705693a..2b93dd924a3 100644
--- a/docs/en/sql-reference/functions/string-functions.md
+++ b/docs/en/sql-reference/functions/string-functions.md
@@ -574,7 +574,7 @@ encodeXMLComponent(x)
 
 -   `x` — The sequence of characters. [String](../../sql-reference/data-types/string.md).
 
-**Returned value(s)**
+**Returned value**
 
 -   The sequence of characters with escape characters.
 
diff --git a/docs/ru/engines/table-engines/mergetree-family/mergetree.md b/docs/ru/engines/table-engines/mergetree-family/mergetree.md
index c7bd64c4ab1..9b2a5eafca3 100644
--- a/docs/ru/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/ru/engines/table-engines/mergetree-family/mergetree.md
@@ -88,6 +88,7 @@ ORDER BY expr
     -   `merge_max_block_size` — максимальное количество строк в блоке для операций слияния. Значение по умолчанию: 8192.
     -   `storage_policy` — политика хранения данных. Смотрите [Хранение данных таблицы на нескольких блочных устройствах](#table_engine-mergetree-multiple-volumes).
     -   `min_bytes_for_wide_part`, `min_rows_for_wide_part` — минимальное количество байт/строк в куске данных для хранения в формате `Wide`. Можно задать одну или обе настройки или не задавать ни одной. Подробнее см. в разделе [Хранение данных](#mergetree-data-storage).
+	-   `max_parts_in_total` — максимальное количество кусков во всех партициях.
 	-   `max_compress_block_size` — максимальный размер блоков несжатых данных перед сжатием для записи в таблицу. Вы также можете задать этот параметр в глобальных настройках (смотрите [max_compress_block_size](../../../operations/settings/settings.md#max-compress-block-size)). Настройка, которая задается при создании таблицы, имеет более высокий приоритет, чем глобальная.
 	-   `min_compress_block_size` — минимальный размер блоков несжатых данных, необходимых для сжатия при записи следующей засечки. Вы также можете задать этот параметр в глобальных настройках (смотрите [min_compress_block_size](../../../operations/settings/settings.md#min-compress-block-size)). Настройка, которая задается при создании таблицы, имеет более высокий приоритет, чем глобальная.
 
diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index aa549fc5776..9118af01b04 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -2396,6 +2396,16 @@ WHERE 0
 
 Смотрите примеры в разделе [UNION](../../sql-reference/statements/select/union.md).
 
+## data_type_default_nullable {#data_type_default_nullable}
+
+Позволяет использовать по умолчанию тип данных [Nullable](../../sql-reference/data-types/nullable.md#data_type-nullable) в определении столбца без явных модификаторов [NULL или NOT NULL](../../sql-reference/statements/create/table.md#null-modifiers).
+
+Возможные значения:
+
+- 1 — тип данных в определении столбца задан по умолчанию как `Nullable`.
+- 0 — тип данных в определении столбца не задан по умолчанию как `Nullable`.
+
+Значение по умолчанию: `0`.
 
 ## execute_merges_on_single_replica_time_threshold {#execute-merges-on-single-replica-time-threshold}
 
diff --git a/docs/ru/sql-reference/functions/string-functions.md b/docs/ru/sql-reference/functions/string-functions.md
index cc488fb2d9c..cba5c1bc27f 100644
--- a/docs/ru/sql-reference/functions/string-functions.md
+++ b/docs/ru/sql-reference/functions/string-functions.md
@@ -555,4 +555,46 @@ SELECT normalizedQueryHash('SELECT 1 AS `xyz`') != normalizedQueryHash('SELECT 1
 └─────┘
 ```
 
+## encodeXMLComponent {#encode-xml-component}
+
+Экранирует символы для размещения строки в текстовом узле XML или атрибуте.
+
+Следующие пять встроенных XML-элементов будут заменены: `<`, `&`, `>`, `"`, `'`.
+
+**Синтаксис** 
+
+``` sql
+encodeXMLComponent(x)
+```
+
+**Параметры** 
+
+-   `x` — последовательность символов. [String](../../sql-reference/data-types/string.md).
+
+**Возвращаемое значение**
+
+-   Последовательность символов, включая и экранируемые.
+
+Тип: [String](../../sql-reference/data-types/string.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT encodeXMLComponent('Hello, "world"!');
+SELECT encodeXMLComponent('<123>');
+SELECT encodeXMLComponent('&clickhouse');
+SELECT encodeXMLComponent('\'foo\'');
+```
+
+Результат:
+
+``` text
+Hello, &quot;world&quot;!
+&lt;123&gt;
+&amp;clickhouse
+&apos;foo&apos;
+```
+
 [Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/functions/string_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/statements/create/table.md b/docs/ru/sql-reference/statements/create/table.md
index d54ec189a1a..eb93875d4ee 100644
--- a/docs/ru/sql-reference/statements/create/table.md
+++ b/docs/ru/sql-reference/statements/create/table.md
@@ -10,8 +10,8 @@ toc_title: "\u0422\u0430\u0431\u043b\u0438\u0446\u0430"
 ``` 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],
+    name1 [type1] [NULL|NOT NULL] [DEFAULT|MATERIALIZED|ALIAS expr1] [compression_codec] [TTL expr1],
+    name2 [type2] [NULL|NOT NULL] [DEFAULT|MATERIALIZED|ALIAS expr2] [compression_codec] [TTL expr2],
     ...
 ) ENGINE = engine
 ```
@@ -44,6 +44,14 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name ENGINE = engine AS SELECT ...
 
 После секции `ENGINE` в запросе могут использоваться и другие секции в зависимости от движка. Подробную документацию по созданию таблиц смотрите в описаниях [движков таблиц](../../../engines/table-engines/index.md#table_engines).
 
+## Модификаторы NULL или NOT NULL {#null-modifiers}
+
+Модификаторы `NULL` and `NOT NULL` после установления типа данных в определении столбца позволяют или не позволяют ему быть типом [Nullable](../../../sql-reference/data-types/nullable.md#data_type-nullable). 
+
+Если тип не `Nullable` и указан модификатор `NULL`, то столбец будет иметь тип `Nullable`; если `NOT NULL`, то не `Nullable`. Например, `INT NULL` то же, что и `Nullable(INT)`. Если тип `Nullable` и указаны модификаторы `NULL` или `NOT NULL`, то будет вызвано исключение.
+
+Смотрите также настройку [data_type_default_nullable](../../../operations/settings/settings.md#data_type_default_nullable).
+
 ### Значения по умолчанию {#create-default-values}
 
 В описании столбца, может быть указано выражение для значения по умолчанию, одного из следующих видов:

From dcf1c1a07151ea845a556db485e6f54d51cc65d9 Mon Sep 17 00:00:00 2001
From: Dmitriy <sevirov@yandex-team.ru>
Date: Mon, 18 Jan 2021 18:36:14 +0300
Subject: [PATCH 133/611] Update roadmap.md and materialize-mysql.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Правлю ссылки.
---
 docs/en/engines/database-engines/materialize-mysql.md |  2 +-
 docs/ru/engines/database-engines/materialize-mysql.md |  2 +-
 docs/ru/whats-new/roadmap.md                          | 11 +----------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/docs/en/engines/database-engines/materialize-mysql.md b/docs/en/engines/database-engines/materialize-mysql.md
index e1fc83cdab5..069fb9c55d3 100644
--- a/docs/en/engines/database-engines/materialize-mysql.md
+++ b/docs/en/engines/database-engines/materialize-mysql.md
@@ -13,7 +13,7 @@ ClickHouse server works as MySQL replica. It reads binlog and performs DDL and D
 
 ``` sql
 CREATE DATABASE [IF NOT EXISTS] db_name [ON CLUSTER cluster]
-ENGINE = MaterializeMySQL('host:port', ['database' | database], 'user', 'password') [SETTINGS ...];
+ENGINE = MaterializeMySQL('host:port', ['database' | database], 'user', 'password') [SETTINGS ...]
 ```
 
 **Engine Parameters**
diff --git a/docs/ru/engines/database-engines/materialize-mysql.md b/docs/ru/engines/database-engines/materialize-mysql.md
index 24ddd2218c5..e899f453b5f 100644
--- a/docs/ru/engines/database-engines/materialize-mysql.md
+++ b/docs/ru/engines/database-engines/materialize-mysql.md
@@ -13,7 +13,7 @@ toc_title: MaterializeMySQL
 
 ``` sql
 CREATE DATABASE [IF NOT EXISTS] db_name [ON CLUSTER cluster]
-ENGINE = MaterializeMySQL('host:port', ['database' | database], 'user', 'password') [SETTINGS ...];
+ENGINE = MaterializeMySQL('host:port', ['database' | database], 'user', 'password') [SETTINGS ...]
 ```
 
 **Параметры движка**
diff --git a/docs/ru/whats-new/roadmap.md b/docs/ru/whats-new/roadmap.md
index f80d210e19b..2c383b2ad5d 120000
--- a/docs/ru/whats-new/roadmap.md
+++ b/docs/ru/whats-new/roadmap.md
@@ -1,10 +1 @@
----
-toc_priority: 74
-toc_title: План
----
-
-# План {#roadmap}
-
-План на 2021 год опубликован для открытого обсуждения [здесь](https://github.com/ClickHouse/ClickHouse/issues/17623).
-
-{## [Оригинальная статья](https://clickhouse.tech/docs/ru/roadmap/) ##}
\ No newline at end of file
+../../en/whats-new/roadmap.md
\ No newline at end of file

From b75dd0baddf3066bfde0cc6a5fccea370bdcdeb4 Mon Sep 17 00:00:00 2001
From: sevirov <72220289+sevirov@users.noreply.github.com>
Date: Mon, 18 Jan 2021 19:00:46 +0300
Subject: [PATCH 134/611] DOCSUP-5604: Edit and translate to Russian (#18929)

Co-authored-by: Alexander Kazakov <Akazz@users.noreply.github.com>
---
 .../external-dicts-dict-sources.md            | 16 +++++-----
 .../external-dicts-dict-sources.md            | 29 ++++++++++++-------
 2 files changed, 26 insertions(+), 19 deletions(-)

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 b86f0d6bc4e..7cd26a9dffb 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
@@ -93,7 +93,7 @@ Setting fields:
 -   `path` – The absolute path to the file.
 -   `format` – The file format. All the formats described in “[Formats](../../../interfaces/formats.md#formats)” are supported.
 
-When dictionary with FILE source is created via DDL command (`CREATE DICTIONARY ...`), source of the dictionary have to be located in `user_files` directory, to prevent DB users accessing arbitrary file on clickhouse node.
+When dictionary with source `FILE` is created via DDL command (`CREATE DICTIONARY ...`), the source file needs to be located in `user_files` directory, to prevent DB users accessing arbitrary file on ClickHouse node.
 
 ## Executable File {#dicts-external_dicts_dict_sources-executable}
 
@@ -115,7 +115,7 @@ Setting fields:
 -   `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 “[Formats](../../../interfaces/formats.md#formats)” are supported.
 
-That dictionary source can be configured only via XML configuration. Creating dictionaries with executable source via DDL is disabled, otherwise, the DB user would be able to execute arbitrary binary on clickhouse node.
+That dictionary source can be configured only via XML configuration. Creating dictionaries with executable source via DDL is disabled, otherwise, the DB user would be able to execute arbitrary binary on ClickHouse node.
 
 ## Http(s) {#dicts-external_dicts_dict_sources-http}
 
@@ -160,14 +160,14 @@ Setting fields:
 -   `url` – The source URL.
 -   `format` – The file format. All the formats described in “[Formats](../../../interfaces/formats.md#formats)” are supported.
 -   `credentials` – Basic HTTP authentication. Optional parameter.
-    -   `user` – Username required for the authentication.
-    -   `password` – Password required for the authentication.
+-   `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.
+-   `header` – Single HTTP header entry.
+-   `name` – Identifiant name used for the header send on the request.
+-   `value` – Value set for a specific identifiant name.
 
-When creating a dictionary using the DDL command (`CREATE DICTIONARY ...`) remote hosts for HTTP dictionaries checked with the `remote_url_allow_hosts` section from config to prevent database users to access arbitrary HTTP server. 
+When creating a dictionary using the DDL command (`CREATE DICTIONARY ...`) remote hosts for HTTP dictionaries are checked against the contents of `remote_url_allow_hosts` section from config to prevent database users to access arbitrary HTTP server.
 
 ## ODBC {#dicts-external_dicts_dict_sources-odbc}
 
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 1367216e401..3bb11b638b2 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
@@ -90,8 +90,10 @@ SOURCE(FILE(path '/opt/dictionaries/os.tsv' format 'TabSeparated'))
 
 Поля настройки:
 
--   `path` — Абсолютный путь к файлу.
--   `format` — Формат файла. Поддерживаются все форматы, описанные в разделе «[Форматы](../../../interfaces/formats.md#formats)».
+-   `path` — абсолютный путь к файлу.
+-   `format` — формат файла. Поддерживаются все форматы, описанные в разделе «[Форматы](../../../interfaces/formats.md#formats)».
+
+Если словарь с источником `FILE` создается с помощью DDL-команды (`CREATE DICTIONARY ...`), источник словаря должен быть расположен в каталоге `user_files`. Иначе пользователи базы данных будут иметь доступ к произвольному файлу на узле ClickHouse.
 
 ## Исполняемый файл {#dicts-external_dicts_dict_sources-executable}
 
@@ -108,16 +110,12 @@ SOURCE(FILE(path '/opt/dictionaries/os.tsv' format 'TabSeparated'))
 </source>
 ```
 
-или
-
-``` sql
-SOURCE(EXECUTABLE(command 'cat /opt/dictionaries/os.tsv' format 'TabSeparated'))
-```
-
 Поля настройки:
 
--   `command` — Абсолютный путь к исполняемому файлу или имя файла (если каталог программы прописан в `PATH`).
--   `format` — Формат файла. Поддерживаются все форматы, описанные в разделе «[Форматы](../../../interfaces/formats.md#formats)».
+-   `command` — абсолютный путь к исполняемому файлу или имя файла (если каталог программы прописан в `PATH`).
+-   `format` — формат файла. Поддерживаются все форматы, описанные в разделе «[Форматы](../../../interfaces/formats.md#formats)».
+
+Этот источник словаря может быть настроен только с помощью XML-конфигурации. Создание словарей с исполняемым источником с помощью DDL отключено. Иначе пользователь базы данных сможет выполнить произвольный бинарный файл на узле ClickHouse.
 
 ## HTTP(s) {#dicts-external_dicts_dict_sources-http}
 
@@ -160,7 +158,16 @@ SOURCE(HTTP(
 Поля настройки:
 
 -   `url` — URL источника.
--   `format` — Формат файла. Поддерживаются все форматы, описанные в разделе «[Форматы](../../../interfaces/formats.md#formats)».
+-   `format` — формат файла. Поддерживаются все форматы, описанные в разделе «[Форматы](../../../interfaces/formats.md#formats)».
+-   `credentials` – базовая HTTP-аутентификация. Необязательный параметр.
+-   `user` – имя пользователя, необходимое для аутентификации.
+-   `password` – пароль, необходимый для аутентификации.
+-   `headers` – все пользовательские записи HTTP-заголовков, используемые для HTTP-запроса. Необязательный параметр.
+-   `header` – одна запись HTTP-заголовка.
+-   `name` – идентифицирующее имя, используемое для отправки заголовка запроса.
+-   `value` – значение, заданное для конкретного идентифицирующего имени.
+
+При создании словаря с помощью DDL-команды (`CREATE DICTIONARY ...`) удаленные хосты для HTTP-словарей проверяются в разделе `remote_url_allow_hosts` из конфигурации сервера. Иначе пользователи базы данных будут иметь доступ к произвольному HTTP-серверу.
 
 ## ODBC {#dicts-external_dicts_dict_sources-odbc}
 

From cf3a89cd7b722d3ba00af7deec52aebac14a1b0d Mon Sep 17 00:00:00 2001
From: gyuton <40863448+gyuton@users.noreply.github.com>
Date: Mon, 18 Jan 2021 19:01:07 +0300
Subject: [PATCH 135/611] DOCSUP-4710: Added support numeric parameters in
 number and string data types (#18696)

Co-authored-by: Alexander Kazakov <Akazz@users.noreply.github.com>
---
 docs/en/sql-reference/data-types/float.md    | 17 +++++++---
 docs/en/sql-reference/data-types/int-uint.md | 33 +++++++++++++-------
 docs/en/sql-reference/data-types/string.md   |  2 ++
 docs/ru/sql-reference/data-types/float.md    | 19 +++++++----
 docs/ru/sql-reference/data-types/int-uint.md | 33 +++++++++++++-------
 docs/ru/sql-reference/data-types/string.md   |  2 ++
 6 files changed, 71 insertions(+), 35 deletions(-)

diff --git a/docs/en/sql-reference/data-types/float.md b/docs/en/sql-reference/data-types/float.md
index 767001c51d2..1e3486cdae7 100644
--- a/docs/en/sql-reference/data-types/float.md
+++ b/docs/en/sql-reference/data-types/float.md
@@ -9,11 +9,18 @@ toc_title: Float32, Float64
 
 Types are equivalent to types of C:
 
--   `Float32` - `float`
--   `Float64` - `double`
+-   `Float32` — `float`.
+-   `Float64` — `double`.
 
 We recommend that you store data in integer form whenever possible. For example, convert fixed precision numbers to integer values, such as monetary amounts or page load times in milliseconds.
 
+Aliases:
+
+-   `Float32` — `FLOAT`.
+-   `Float64` — `DOUBLE`.
+
+When creating tables, numeric parameters for floating point numbers can be set (e.g. `FLOAT(12)`, `FLOAT(15, 22)`, `DOUBLE(12)`, `DOUBLE(4, 18)`), but ClickHouse ignores them.
+
 ## Using Floating-point Numbers {#using-floating-point-numbers}
 
 -   Computations with floating-point numbers might produce a rounding error.
@@ -52,7 +59,7 @@ SELECT 0.5 / 0
 └────────────────┘
 ```
 
--   `-Inf` – Negative infinity.
+-   `-Inf` — Negative infinity.
 
 <!-- -->
 
@@ -66,7 +73,7 @@ SELECT -0.5 / 0
 └─────────────────┘
 ```
 
--   `NaN` – Not a number.
+-   `NaN` — Not a number.
 
 <!-- -->
 
@@ -80,6 +87,6 @@ SELECT 0 / 0
 └──────────────┘
 ```
 
-    See the rules for `NaN` sorting in the section [ORDER BY clause](../sql_reference/statements/select/order-by.md).
+See the rules for `NaN` sorting in the section [ORDER BY clause](../../sql-reference/statements/select/order-by.md).
 
 [Original article](https://clickhouse.tech/docs/en/data_types/float/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/int-uint.md b/docs/en/sql-reference/data-types/int-uint.md
index 2af855a340d..f0a706b0a37 100644
--- a/docs/en/sql-reference/data-types/int-uint.md
+++ b/docs/en/sql-reference/data-types/int-uint.md
@@ -7,23 +7,32 @@ toc_title: UInt8, UInt16, UInt32, UInt64, UInt256, Int8, Int16, Int32, Int64, In
 
 Fixed-length integers, with or without a sign.
 
+When creating tables, numeric parameters for integer numbers can be set (e.g. `TINYINT(8)`, `SMALLINT(16)`, `INT(32)`, `BIGINT(64)`), but ClickHouse ignores them. 
+
 ## Int Ranges {#int-ranges}
 
--   Int8 - \[-128 : 127\]
--   Int16 - \[-32768 : 32767\]
--   Int32 - \[-2147483648 : 2147483647\]
--   Int64 - \[-9223372036854775808 : 9223372036854775807\]
--   Int128 - \[-170141183460469231731687303715884105728 : 170141183460469231731687303715884105727\]
--   Int256 - \[-57896044618658097711785492504343953926634992332820282019728792003956564819968 : 57896044618658097711785492504343953926634992332820282019728792003956564819967\]
+-   `Int8` — \[-128 : 127\]
+-   `Int16` — \[-32768 : 32767\]
+-   `Int32` — \[-2147483648 : 2147483647\]
+-   `Int64` — \[-9223372036854775808 : 9223372036854775807\]
+-   `Int128` — \[-170141183460469231731687303715884105728 : 170141183460469231731687303715884105727\]
+-   `Int256` — \[-57896044618658097711785492504343953926634992332820282019728792003956564819968 : 57896044618658097711785492504343953926634992332820282019728792003956564819967\]
+
+Aliases:
+
+-   `Int8` — `TINYINT`, `BOOL`, `BOOLEAN`, `INT1`.
+-   `Int16` — `SMALLINT`, `INT2`.
+-   `Int32` — `INT`, `INT4`, `INTEGER`.
+-   `Int64` — `BIGINT`.
 
 ## Uint Ranges {#uint-ranges}
 
--   UInt8 - \[0 : 255\]
--   UInt16 - \[0 : 65535\]
--   UInt32 - \[0 : 4294967295\]
--   UInt64 - \[0 : 18446744073709551615\]
--   UInt256 - \[0 : 115792089237316195423570985008687907853269984665640564039457584007913129639935\]
+-   `UInt8` — \[0 : 255\]
+-   `UInt16` — \[0 : 65535\]
+-   `UInt32` — \[0 : 4294967295\]
+-   `UInt64` — \[0 : 18446744073709551615\]
+-   `UInt256` — \[0 : 115792089237316195423570985008687907853269984665640564039457584007913129639935\]
 
-UInt128 is not supported yet.
+`UInt128` is not supported yet.
 
 [Original article](https://clickhouse.tech/docs/en/data_types/int_uint/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/string.md b/docs/en/sql-reference/data-types/string.md
index a990bd0742b..42d8798c8a3 100644
--- a/docs/en/sql-reference/data-types/string.md
+++ b/docs/en/sql-reference/data-types/string.md
@@ -8,6 +8,8 @@ toc_title: String
 Strings of an arbitrary length. The length is not limited. The value can contain an arbitrary set of bytes, including null bytes.
 The String type replaces the types VARCHAR, BLOB, CLOB, and others from other DBMSs.
 
+When creating tables, numeric parameters for string fields can be set (e.g. `VARCHAR(255)`), but ClickHouse ignores them. 
+
 ## Encodings {#encodings}
 
 ClickHouse doesn’t have the concept of encodings. Strings can contain an arbitrary set of bytes, which are stored and output as-is.
diff --git a/docs/ru/sql-reference/data-types/float.md b/docs/ru/sql-reference/data-types/float.md
index f2e85f35041..0e861f170b7 100644
--- a/docs/ru/sql-reference/data-types/float.md
+++ b/docs/ru/sql-reference/data-types/float.md
@@ -9,8 +9,15 @@ toc_title: Float32, Float64
 
 Типы эквивалентны типам языка С:
 
--   `Float32` - `float`;
--   `Float64` - `double`.
+-   `Float32` — `float`.
+-   `Float64` — `double`.
+
+Синонимы:
+
+-   `Float32` — `FLOAT`.
+-   `Float64` — `DOUBLE`.
+
+При создании таблиц для чисел с плавающей запятой можно указывать числовые параметры (например, `FLOAT(12)`, `FLOAT(15, 22)`, `DOUBLE(12)`, `DOUBLE(4, 18)`), но ClickHouse их проигнорирует.
 
 Рекомендуется хранить данные в целочисленном виде всегда, когда это возможно. Например, переводите в целочисленные значения числа с фиксированной точностью, такие как денежные суммы или времена загрузки страниц в миллисекундах.
 
@@ -38,7 +45,7 @@ SELECT 1 - 0.9
 
 В отличие от стандартного SQL, ClickHouse поддерживает следующие категории чисел с плавающей запятой:
 
--   `Inf` - бесконечность.
+-   `Inf` — бесконечность.
 
 <!-- -->
 
@@ -52,7 +59,7 @@ SELECT 0.5 / 0
 └────────────────┘
 ```
 
--   `-Inf` - отрицательная бесконечность;
+-   `-Inf` — отрицательная бесконечность.
 
 <!-- -->
 
@@ -66,7 +73,7 @@ SELECT -0.5 / 0
 └─────────────────┘
 ```
 
--   `NaN` - не число.
+-   `NaN` — не число.
 
 <!-- -->
 
@@ -80,6 +87,6 @@ SELECT 0 / 0
 └──────────────┘
 ```
 
-    Смотрите правила сортировки `NaN` в разделе [Секция ORDER BY](../sql_reference/data_types/float.md).
+Смотрите правила сортировки `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/int-uint.md b/docs/ru/sql-reference/data-types/int-uint.md
index c45c639aace..d3c342e467a 100644
--- a/docs/ru/sql-reference/data-types/int-uint.md
+++ b/docs/ru/sql-reference/data-types/int-uint.md
@@ -7,23 +7,32 @@ toc_title: UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64
 
 Целые числа фиксированной длины, без знака или со знаком.
 
+При создании таблиц для целых чисел можно указывать числовые параметры (например `TINYINT(8)`, `SMALLINT(16)`, `INT(32)`, `BIGINT(64)`), но ClickHouse их проигнорирует.
+
 ## Диапазоны Int {#int-ranges}
 
--   Int8 - \[-128 : 127\]
--   Int16 - \[-32768 : 32767\]
--   Int32 - \[-2147483648 : 2147483647\]
--   Int64 - \[-9223372036854775808 : 9223372036854775807\]
--   Int128 - \[-170141183460469231731687303715884105728 : 170141183460469231731687303715884105727\]
--   Int256 - \[-57896044618658097711785492504343953926634992332820282019728792003956564819968 : 57896044618658097711785492504343953926634992332820282019728792003956564819967\]
+-   `Int8` — \[-128 : 127\]
+-   `Int16` — \[-32768 : 32767\]
+-   `Int32` — \[-2147483648 : 2147483647\]
+-   `Int64` — \[-9223372036854775808 : 9223372036854775807\]
+-   `Int128` — \[-170141183460469231731687303715884105728 : 170141183460469231731687303715884105727\]
+-   `Int256` — \[-57896044618658097711785492504343953926634992332820282019728792003956564819968 : 57896044618658097711785492504343953926634992332820282019728792003956564819967\]
+
+Синонимы:
+
+-   `Int8` — `TINYINT`, `BOOL`, `BOOLEAN`, `INT1`.
+-   `Int16` — `SMALLINT`, `INT2`.
+-   `Int32` — `INT`, `INT4`, `INTEGER`.
+-   `Int64` — `BIGINT`.
 
 ## Диапазоны Uint {#uint-ranges}
 
--   UInt8 - \[0 : 255\]
--   UInt16 - \[0 : 65535\]
--   UInt32 - \[0 : 4294967295\]
--   UInt64 - \[0 : 18446744073709551615\]
--   UInt256 - \[0 : 115792089237316195423570985008687907853269984665640564039457584007913129639935\]
+-   `UInt8` — \[0 : 255\]
+-   `UInt16` — \[0 : 65535\]
+-   `UInt32` — \[0 : 4294967295\]
+-   `UInt64` — \[0 : 18446744073709551615\]
+-   `UInt256` — \[0 : 115792089237316195423570985008687907853269984665640564039457584007913129639935\]
 
-UInt128 пока не реализован.
+`UInt128` пока не реализован.
 
 [Оригинальная статья](https://clickhouse.tech/docs/ru/data_types/int_uint/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/string.md b/docs/ru/sql-reference/data-types/string.md
index 798caec4d62..6a07f7e51de 100644
--- a/docs/ru/sql-reference/data-types/string.md
+++ b/docs/ru/sql-reference/data-types/string.md
@@ -8,6 +8,8 @@ toc_title: String
 Строки произвольной длины. Длина не ограничена. Значение может содержать произвольный набор байт, включая нулевые байты.
 Таким образом, тип String заменяет типы VARCHAR, BLOB, CLOB и т. п. из других СУБД.
 
+При создании таблиц для строк можно указывать числовые параметры (например `VARCHAR(255)`), но СlickHouse их проигнорирует.
+
 ## Кодировки {#kodirovki}
 
 В ClickHouse нет понятия кодировок. Строки могут содержать произвольный набор байт, который хранится и выводится, как есть.

From db4b18f923879262ffb9fa31f51e3fb103913533 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Mon, 18 Jan 2021 19:04:21 +0300
Subject: [PATCH 136/611] Remove tsan supression

---
 tests/tsan_suppressions.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/tsan_suppressions.txt b/tests/tsan_suppressions.txt
index ccc36d876f7..8e7dce01a65 100644
--- a/tests/tsan_suppressions.txt
+++ b/tests/tsan_suppressions.txt
@@ -1,4 +1,2 @@
-# looks like a bug in clang-11 thread sanitizer, detects normal data race with random FD in this method
-race:DB::LazyPipeFDs::close
 # races in openSSL https://github.com/openssl/openssl/issues/11974
 fun:evp_cipher_cache_constants

From 7135c62204bfa8a83ebe9d80fd0654562d6cb886 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Mon, 18 Jan 2021 19:12:16 +0300
Subject: [PATCH 137/611] Update tryLiftUpArrayJoin

---
 src/Interpreters/ActionsDAG.cpp        | 164 ++++---------------------
 src/Interpreters/ActionsDAG.h          |   5 +-
 src/Processors/QueryPlan/QueryPlan.cpp |  18 +--
 3 files changed, 38 insertions(+), 149 deletions(-)

diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index e145b7df13e..65241e1b5a3 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -1004,183 +1004,69 @@ std::pair<ActionsDAGPtr, ActionsDAGPtr> ActionsDAG::split(std::unordered_set<con
     return {std::move(first_actions), std::move(second_actions)};
 }
 
-ActionsDAGPtr ActionsDAG::splitActionsBeforeArrayJoin(const NameSet & array_joined_columns)
+std::pair<ActionsDAGPtr, ActionsDAGPtr>  ActionsDAG::splitActionsBeforeArrayJoin(const NameSet & array_joined_columns) const
 {
-    /// Split DAG into two parts.
-    /// (this_nodes, this_index) is a part which depends on ARRAY JOIN and stays here.
-    /// (split_nodes, split_index) is a part which will be moved before ARRAY JOIN.
-    std::list<Node> this_nodes;
-    std::list<Node> split_nodes;
-    Index this_index;
-    Index split_index;
-    Inputs new_inputs;
 
     struct Frame
     {
-        Node * node;
+        const Node * node;
         size_t next_child_to_visit = 0;
     };
 
-    struct Data
-    {
-        bool depend_on_array_join = false;
-        bool visited = false;
-        bool used_in_result = false;
-
-        /// Copies of node in one of the DAGs.
-        /// For COLUMN and INPUT both copies may exist.
-        Node * to_this = nullptr;
-        Node * to_split = nullptr;
-    };
+    std::unordered_set<const Node *> split_nodes;
+    std::unordered_set<const Node *> visited_nodes;
 
     std::stack<Frame> stack;
-    std::unordered_map<Node *, Data> data;
 
-    for (const auto & node : index)
-        data[node].used_in_result = true;
-
-    /// DFS. Decide if node depends on ARRAY JOIN and move it to one of the DAGs.
-    for (auto & node : nodes)
+    /// DFS. Decide if node depends on ARRAY JOIN.
+    for (const auto & node : nodes)
     {
-        if (!data[&node].visited)
-            stack.push({.node = &node});
+        if (visited_nodes.count(&node))
+            continue;
+
+        visited_nodes.insert(&node);
+        stack.push({.node = &node});
 
         while (!stack.empty())
         {
             auto & cur = stack.top();
-            auto & cur_data = data[cur.node];
 
             /// 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];
-                auto & child_data = data[child];
 
-                if (!child_data.visited)
+                if (visited_nodes.count(child) == 0)
                 {
+                    visited_nodes.insert(child);
                     stack.push({.node = child});
                     break;
                 }
 
                 ++cur.next_child_to_visit;
-                if (child_data.depend_on_array_join)
-                    cur_data.depend_on_array_join = true;
             }
 
-            /// Make a copy part.
             if (cur.next_child_to_visit == cur.node->children.size())
             {
+                bool depend_on_array_join = false;
                 if (cur.node->type == ActionType::INPUT && array_joined_columns.count(cur.node->result_name))
-                    cur_data.depend_on_array_join = true;
+                    depend_on_array_join = true;
+
+                for (const auto * child : cur.node->children)
+                {
+                    if (split_nodes.count(child) == 0)
+                        depend_on_array_join = true;
+                }
+
+                if (!depend_on_array_join)
+                    split_nodes.insert(cur.node);
 
-                cur_data.visited = true;
                 stack.pop();
-
-                if (cur_data.depend_on_array_join)
-                {
-                    auto & copy = this_nodes.emplace_back(*cur.node);
-                    cur_data.to_this = &copy;
-
-                    /// Replace children to newly created nodes.
-                    for (auto & child : copy.children)
-                    {
-                        auto & child_data = data[child];
-
-                        /// If children is not created, int may be from split part.
-                        if (!child_data.to_this)
-                        {
-                            if (child->type == ActionType::COLUMN) /// Just create new node for COLUMN action.
-                            {
-                                child_data.to_this = &this_nodes.emplace_back(*child);
-                            }
-                            else
-                            {
-                                /// Node from split part is added as new input.
-                                Node input_node;
-                                input_node.type = ActionType::INPUT;
-                                input_node.result_type = child->result_type;
-                                input_node.result_name = child->result_name; // getUniqueNameForIndex(index, child->result_name);
-                                child_data.to_this = &this_nodes.emplace_back(std::move(input_node));
-
-                                if (child->type != ActionType::INPUT)
-                                    new_inputs.push_back(child_data.to_this);
-
-                                /// This node is needed for current action, so put it to index also.
-                                split_index.replace(child_data.to_split);
-                            }
-                        }
-
-                        child = child_data.to_this;
-                    }
-                }
-                else
-                {
-                    auto & copy = split_nodes.emplace_back(*cur.node);
-                    cur_data.to_split = &copy;
-
-                    /// Replace children to newly created nodes.
-                    for (auto & child : copy.children)
-                    {
-                        child = data[child].to_split;
-                        assert(child != nullptr);
-                    }
-
-                    if (cur_data.used_in_result)
-                    {
-                        split_index.replace(&copy);
-
-                        /// If this node is needed in result, add it as input.
-                        Node input_node;
-                        input_node.type = ActionType::INPUT;
-                        input_node.result_type = node.result_type;
-                        input_node.result_name = node.result_name;
-                        cur_data.to_this = &this_nodes.emplace_back(std::move(input_node));
-
-                        if (copy.type != ActionType::INPUT)
-                            new_inputs.push_back(cur_data.to_this);
-                    }
-                }
             }
         }
     }
 
-    for (auto * node : index)
-        this_index.insert(data[node].to_this);
-
-    /// Consider actions are empty if all nodes are constants or inputs.
-    bool split_actions_are_empty = true;
-    for (const auto & node : split_nodes)
-        if (!node.children.empty())
-            split_actions_are_empty = false;
-
-    if (split_actions_are_empty)
-        return {};
-
-    Inputs this_inputs;
-    Inputs split_inputs;
-
-    for (auto * input : inputs)
-    {
-        const auto & cur = data[input];
-        if (cur.to_this)
-            this_inputs.push_back(cur.to_this);
-        if (cur.to_split)
-            split_inputs.push_back(cur.to_split);
-    }
-
-    this_inputs.insert(this_inputs.end(), new_inputs.begin(), new_inputs.end());
-
-    index.swap(this_index);
-    nodes.swap(this_nodes);
-    inputs.swap(this_inputs);
-
-    auto split_actions = cloneEmpty();
-    split_actions->nodes.swap(split_nodes);
-    split_actions->index.swap(split_index);
-    split_actions->inputs.swap(split_inputs);
-    split_actions->settings.project_input = false;
-
-    return split_actions;
+    return split(split_nodes);
 }
 
 }
diff --git a/src/Interpreters/ActionsDAG.h b/src/Interpreters/ActionsDAG.h
index 9ab00e14d2e..76ea3e30ee0 100644
--- a/src/Interpreters/ActionsDAG.h
+++ b/src/Interpreters/ActionsDAG.h
@@ -215,9 +215,8 @@ public:
     void projectInput() { settings.project_input = true; }
     void removeUnusedActions(const Names & required_names);
 
-    /// Splits actions into two parts. Returned half may be swapped with ARRAY JOIN.
-    /// Returns nullptr if no actions may be moved before ARRAY JOIN.
-    ActionsDAGPtr splitActionsBeforeArrayJoin(const NameSet & array_joined_columns);
+    /// Splits actions into two parts. Returned first half may be swapped with ARRAY JOIN.
+    std::pair<ActionsDAGPtr, ActionsDAGPtr> splitActionsBeforeArrayJoin(const NameSet & array_joined_columns) const;
 
     bool hasArrayJoin() const;
     bool hasStatefulFunctions() const;
diff --git a/src/Processors/QueryPlan/QueryPlan.cpp b/src/Processors/QueryPlan/QueryPlan.cpp
index 1b3ea16a213..6b5f5bc30b6 100644
--- a/src/Processors/QueryPlan/QueryPlan.cpp
+++ b/src/Processors/QueryPlan/QueryPlan.cpp
@@ -454,11 +454,11 @@ static void tryLiftUpArrayJoin(QueryPlan::Node * parent_node, QueryPlan::Node *
     auto split_actions = expression->splitActionsBeforeArrayJoin(array_join->columns);
 
     /// No actions can be moved before ARRAY JOIN.
-    if (!split_actions)
+    if (split_actions.first->empty())
         return;
 
     /// All actions was moved before ARRAY JOIN. Swap Expression and ArrayJoin.
-    if (expression->empty())
+    if (split_actions.second->empty())
     {
         auto expected_header = parent->getOutputStream().header;
 
@@ -468,10 +468,10 @@ static void tryLiftUpArrayJoin(QueryPlan::Node * parent_node, QueryPlan::Node *
 
         if (expression_step)
             child = std::make_unique<ExpressionStep>(child_node->children.at(0)->step->getOutputStream(),
-                                                     std::move(split_actions));
+                                                     std::move(split_actions.first));
         else
             child = std::make_unique<FilterStep>(child_node->children.at(0)->step->getOutputStream(),
-                                                 std::move(split_actions),
+                                                 std::move(split_actions.first),
                                                  filter_step->getFilterColumnName(),
                                                  filter_step->removesFilterColumn());
 
@@ -487,10 +487,14 @@ static void tryLiftUpArrayJoin(QueryPlan::Node * parent_node, QueryPlan::Node *
     /// Expression/Filter -> ArrayJoin -> node -> Something
 
     node.step = std::make_unique<ExpressionStep>(node.children.at(0)->step->getOutputStream(),
-                                                 std::move(split_actions));
+                                                 std::move(split_actions.first));
     array_join_step->updateInputStream(node.step->getOutputStream(), {});
-    expression_step ? expression_step->updateInputStream(array_join_step->getOutputStream(), true)
-                    : filter_step->updateInputStream(array_join_step->getOutputStream(), true);
+
+    if (expression_step)
+        parent = std::make_unique<ExpressionStep>(array_join_step->getOutputStream(), split_actions.second);
+    else
+        parent = std::make_unique<FilterStep>(array_join_step->getOutputStream(), split_actions.second,
+                                              filter_step->getFilterColumnName(), filter_step->removesFilterColumn());
 }
 
 static bool tryMergeExpressions(QueryPlan::Node * parent_node, QueryPlan::Node * child_node)

From b07d6c51325bb445bf4ee37761a700fd43e8f55c Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Mon, 18 Jan 2021 20:15:58 +0300
Subject: [PATCH 138/611] old flaky test

---
 .../0_stateless/01531_query_log_query_comment.sql    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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 81348c53589..2e1faf1b9e4 100644
--- a/tests/queries/0_stateless/01531_query_log_query_comment.sql
+++ b/tests/queries/0_stateless/01531_query_log_query_comment.sql
@@ -4,9 +4,17 @@ set log_queries_min_type='QUERY_FINISH';
 set enable_global_with_statement=1;
 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%';
+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%'
+    and current_database = currentDatabase()
+    ;
 
 set enable_global_with_statement=1;
 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%';
+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%'
+    and current_database = currentDatabase()
+    ;

From c7e93a9c74c8c53f42fcbea509ceb166c82a95ec Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Mon, 18 Jan 2021 20:58:31 +0300
Subject: [PATCH 139/611] Prepare changelog

---
 CHANGELOG.md                              | 418 ++++++++++------------
 utils/simple-backport/format-changelog.py |   2 +-
 2 files changed, 197 insertions(+), 223 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbaf92ce659..8da4919c975 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,313 +1,287 @@
-622 PRs added between v20.12.5.14-stable and v21.1.2.15-stable.
-curl: (22) The requested URL returned error: 404 Not Found
-Failed to download 'https://api.github.com/repos/ClickHouse/ClickHouse/pulls/18701' to 'pr18701.json'. Contents: ''.
-curl: (28) Failed to connect to api.github.com port 443: Connection timed out
-Failed to download 'https://api.github.com/repos/ClickHouse/ClickHouse/pulls/17832' to 'pr17832.json'. Contents: ''.
-/home/milovidov/.local/lib/python3.8/site-packages/fuzzywuzzy/fuzz.py:11: UserWarning: Using slow pure-python SequenceMatcher. Install python-Levenshtein to remove this warning
-  warnings.warn('Using slow pure-python SequenceMatcher. Install python-Levenshtein to remove this warning')
-### ClickHouse release v21.1.2.15-stable FIXME as compared to v20.12.5.14-stable
+## ClickHouse release 21.1
+
+### ClickHouse release v21.1.2.15-stable 2021-01-18
 
 #### Backward Incompatible Change
 
-* Remove `sumburConsistentHash` function. This closes [#18120](https://github.com/ClickHouse/ClickHouse/issues/18120). [#18656](https://github.com/ClickHouse/ClickHouse/pull/18656) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* The setting `input_format_null_as_default` is enabled by default. [#17525](https://github.com/ClickHouse/ClickHouse/pull/17525) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Check settings constraints for profile settings from config. Server will fail to start if users.xml contain settings that do not meet corresponding constraints. [#18486](https://github.com/ClickHouse/ClickHouse/pull/18486) ([tavplubix](https://github.com/tavplubix)).
 * Restrict `ALTER MODIFY SETTING` from changing storage settings that affects data parts (`write_final_mark` and `enable_mixed_granularity_parts`). [#18306](https://github.com/ClickHouse/ClickHouse/pull/18306) ([Amos Bird](https://github.com/amosbird)).
 * Set `insert_quorum_parallel` to 1 by default. It is significantly more convenient to use than "sequential" quorum inserts. But if you rely to sequential consistency, you should set the setting back to zero. [#17567](https://github.com/ClickHouse/ClickHouse/pull/17567) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* The setting `input_format_null_as_default` is enabled by default. [#17525](https://github.com/ClickHouse/ClickHouse/pull/17525) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Remove `sumburConsistentHash` function. This closes [#18120](https://github.com/ClickHouse/ClickHouse/issues/18120). [#18656](https://github.com/ClickHouse/ClickHouse/pull/18656) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Removed aggregate functions `timeSeriesGroupSum`, `timeSeriesGroupRateSum` because a friend of mine said they never worked. This fixes [#16869](https://github.com/ClickHouse/ClickHouse/issues/16869). If you have luck using these functions, write a email to clickhouse-feedback@yandex-team.com. [#17423](https://github.com/ClickHouse/ClickHouse/pull/17423) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Prohibit toUnixTimestamp(Date()) (before it just returns UInt16 representation of Date). [#17376](https://github.com/ClickHouse/ClickHouse/pull/17376) ([Azat Khuzhin](https://github.com/azat)).
 * Allow using extended integer types (`Int128`, `Int256`, `UInt256`) in `avg` and `avgWeighted` functions. Also allow using different types (integer, decimal, floating point) for value and for weight in `avgWeighted` function. This is a backward-incompatible change: now the `avg` and `avgWeighted` functions always return `Float64` (as documented). Before this change the return type for `Decimal` arguments was also `Decimal`. [#15419](https://github.com/ClickHouse/ClickHouse/pull/15419) ([Mike](https://github.com/myrrc)).
 
 #### New Feature
 
-* Function `position` now supports `position(needle in haystack)` synax for SQL compatibility. This closes [#18701](https://github.com/ClickHouse/ClickHouse/issues/18701). ... [#18779](https://github.com/ClickHouse/ClickHouse/pull/18779) ([Jianmei Zhang](https://github.com/zhangjmruc)).
-* Now we have a new storage setting `max_partitions_to_read` for tables in the MergeTree family. It limits the max number of partitions that can be accessed in one query. A user setting `force_max_partition_limit` is also added to enforce this constraint. [#18712](https://github.com/ClickHouse/ClickHouse/pull/18712) ([Amos Bird](https://github.com/amosbird)).
-* Add `query_id` column to `system.part_log` for inserted parts. closes [#10097](https://github.com/ClickHouse/ClickHouse/issues/10097). [#18644](https://github.com/ClickHouse/ClickHouse/pull/18644) ([flynn](https://github.com/ucasFL)).
+* Implement gRPC protocol in ClickHouse. [#15111](https://github.com/ClickHouse/ClickHouse/pull/15111) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Allow to use multiple zookeeper clusters. [#17070](https://github.com/ClickHouse/ClickHouse/pull/17070) ([fastio](https://github.com/fastio)).
 * Implemented `REPLACE TABLE` and `CREATE OR REPLACE TABLE` queries. [#18521](https://github.com/ClickHouse/ClickHouse/pull/18521) ([tavplubix](https://github.com/tavplubix)).
-* - IP Dictionary supports key fetching. Resolves [#18241](https://github.com/ClickHouse/ClickHouse/issues/18241). [#18480](https://github.com/ClickHouse/ClickHouse/pull/18480) ([vdimir](https://github.com/vdimir)).
-* Allow create table as select with columns specification. Example `CREATE TABLE t1 (x String) ENGINE = Memory AS SELECT 1;`. [#18060](https://github.com/ClickHouse/ClickHouse/pull/18060) ([Maksim Kita](https://github.com/kitaisreal)).
+* Implement `UNION DISTINCT` and treat the plain `UNION` clause as `UNION DISTINCT` by default. Add a setting `union_default_mode` that allows to treat it as `UNION ALL` or require explicit mode specification. [#16338](https://github.com/ClickHouse/ClickHouse/pull/16338) ([flynn](https://github.com/ucasFL)).
+* Added function `accurateCastOrNull`. This closes [#10290](https://github.com/ClickHouse/ClickHouse/issues/10290). Add type conversions in `x IN (subquery)` expressions. This closes [#10266](https://github.com/ClickHouse/ClickHouse/issues/10266). [#16724](https://github.com/ClickHouse/ClickHouse/pull/16724) ([Maksim Kita](https://github.com/kitaisreal)).
+* IP Dictionary supports `IPv4` / `IPv6` types directly. [#17571](https://github.com/ClickHouse/ClickHouse/pull/17571) ([vdimir](https://github.com/vdimir)).
+* IP Dictionary supports key fetching. Resolves [#18241](https://github.com/ClickHouse/ClickHouse/issues/18241). [#18480](https://github.com/ClickHouse/ClickHouse/pull/18480) ([vdimir](https://github.com/vdimir)).
+* Add `*.zst` compression/decompression support for data import and export. It enables using `*.zst` in `file()` function and `Content-encoding: zstd` in HTTP client. This closes [#16791 ](https://github.com/ClickHouse/ClickHouse/issues/16791). [#17144](https://github.com/ClickHouse/ClickHouse/pull/17144) ([Abi Palagashvili](https://github.com/fibersel)).
+* Added `mannWitneyUTest`, `studentTTest` and `welchTTest` aggregate functions. Refactored `rankCorr` a bit. [#16883](https://github.com/ClickHouse/ClickHouse/pull/16883) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Add functions `countMatches`/`countMatchesCaseInsensitive`. [#17459](https://github.com/ClickHouse/ClickHouse/pull/17459) ([Azat Khuzhin](https://github.com/azat)).
+* Implement `countSubstrings()`/`countSubstringsCaseInsensitive()`/`countSubstringsCaseInsensitiveUTF8()` (Count the number of substring occurrences). [#17347](https://github.com/ClickHouse/ClickHouse/pull/17347) ([Azat Khuzhin](https://github.com/azat)).
+* Add information about used databases, tables and columns in system.query_log. Add `query_kind` and `normalized_query_hash` fields. [#17726](https://github.com/ClickHouse/ClickHouse/pull/17726) ([Amos Bird](https://github.com/amosbird)).
+* Add a setting `optimize_on_insert`. When enabled, do the same transformation for INSERTed block of data as if merge was done on this block (e.g. Replacing, Collapsing, Aggregating...). This setting is enabled by default. This can influence Materialized View and MaterializeMySQL behaviour (see detailed description). This closes [#10683](https://github.com/ClickHouse/ClickHouse/issues/10683). [#16954](https://github.com/ClickHouse/ClickHouse/pull/16954) ([Kruglov Pavel](https://github.com/Avogar)).
+* Kerberos Authenticaiton for HDFS. [#16621](https://github.com/ClickHouse/ClickHouse/pull/16621) ([Ilya Golshtein](https://github.com/ilejn)).
 * Support `SHOW SETTINGS` statement to show parameters in system.settings. `SHOW CHANGED SETTINGS` and `LIKE/ILIKE` clause are also supported. [#18056](https://github.com/ClickHouse/ClickHouse/pull/18056) ([Jianmei Zhang](https://github.com/zhangjmruc)).
+* Function `position` now supports `POSITION(needle IN haystack)` synax for SQL compatibility. This closes [#18701](https://github.com/ClickHouse/ClickHouse/issues/18701). ... [#18779](https://github.com/ClickHouse/ClickHouse/pull/18779) ([Jianmei Zhang](https://github.com/zhangjmruc)).
+* Now we have a new storage setting `max_partitions_to_read` for tables in the MergeTree family. It limits the max number of partitions that can be accessed in one query. A user setting `force_max_partition_limit` is also added to enforce this constraint. [#18712](https://github.com/ClickHouse/ClickHouse/pull/18712) ([Amos Bird](https://github.com/amosbird)).
+* Add `query_id` column to `system.part_log` for inserted parts. Closes [#10097](https://github.com/ClickHouse/ClickHouse/issues/10097). [#18644](https://github.com/ClickHouse/ClickHouse/pull/18644) ([flynn](https://github.com/ucasFL)).
+* Allow create table as select with columns specification. Example `CREATE TABLE t1 (x String) ENGINE = Memory AS SELECT 1;`. [#18060](https://github.com/ClickHouse/ClickHouse/pull/18060) ([Maksim Kita](https://github.com/kitaisreal)).
 * Added `arrayMin`, `arrayMax`, `arrayAvg` aggregation functions. [#18032](https://github.com/ClickHouse/ClickHouse/pull/18032) ([Maksim Kita](https://github.com/kitaisreal)).
 * Implemented `ATTACH TABLE name FROM 'path/to/data/' (col1 Type1, ...` query. It creates new table with provided structure and attaches table data from provided directory in `user_files`. [#17903](https://github.com/ClickHouse/ClickHouse/pull/17903) ([tavplubix](https://github.com/tavplubix)).
+* Add mutation support for StorageMemory. This closes [#9117](https://github.com/ClickHouse/ClickHouse/issues/9117). [#15127](https://github.com/ClickHouse/ClickHouse/pull/15127) ([flynn](https://github.com/ucasFL)).
+* Support syntax `EXISTS DATABASE name`. [#18458](https://github.com/ClickHouse/ClickHouse/pull/18458) ([Du Chuan](https://github.com/spongedu)).
+* Support builtin function `isIPv4String` && `isIPv6String` like [MySQL](https://github.com/ClickHouse/ClickHouse/compare/master...spongedu:support_is_ipv4?expand=1). [#18349](https://github.com/ClickHouse/ClickHouse/pull/18349) ([Du Chuan](https://github.com/spongedu)).
+* Add a new setting `insert_distributed_one_random_shard = 1` to allow insertion into multi-sharded distributed table without any distributed key. [#18294](https://github.com/ClickHouse/ClickHouse/pull/18294) ([Amos Bird](https://github.com/amosbird)).
 * Add settings `min_compress_block_size` and `max_compress_block_size` to MergeTreeSettings, which have higher priority than the global settings and take effect when they are set. close [13890](https://github.com/ClickHouse/ClickHouse/issues/13890). [#17867](https://github.com/ClickHouse/ClickHouse/pull/17867) ([flynn](https://github.com/ucasFL)).
-* Add bitmap64 feature. [#17858](https://github.com/ClickHouse/ClickHouse/pull/17858) ([Andy Yang](https://github.com/andyyzh)).
+* Add support for 64bit roaring bitmaps. [#17858](https://github.com/ClickHouse/ClickHouse/pull/17858) ([Andy Yang](https://github.com/andyyzh)).
 * Extended `OPTIMIZE ... DEDUPLICATE` syntax to allow explicit (or implicit with asterisk/column transformers) list of columns to check for duplicates on. ... [#17846](https://github.com/ClickHouse/ClickHouse/pull/17846) ([Vasily Nemkov](https://github.com/Enmk)).
-* Added functions `toMJD`, `fromMJD`, `toMJDOrNull`, and `fromMJDOrNull`. These functions convert between Proleptic Gregorian calendar date and Modified Julian Day number. [#17750](https://github.com/ClickHouse/ClickHouse/pull/17750) ([PHO](https://github.com/depressed-pho)).
-* Add ability to use custom TLD list in functions `firstSignificantSubdomainCustom`, `cutToFirstSignificantSubdomainCustom`. [#17748](https://github.com/ClickHouse/ClickHouse/pull/17748) ([Azat Khuzhin](https://github.com/azat)).
-* Add support for PROXYv1 protocol to wrap native TCP interface. Allow quotas to be keyed by proxy-forwarded IP address (applied for PROXYv1 address and for X-Forwarded-For from HTTP interface). This is useful when you provide access to ClickHouse only via trusted proxy (e.g. CloudFlare) but want to account user resources by their original IP addresses. This fixes [#17268](https://github.com/ClickHouse/ClickHouse/issues/17268). [#17707](https://github.com/ClickHouse/ClickHouse/pull/17707) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Now clickhouse-client supports opening EDITOR to edit commands. `Alt-Shift-E`. [#17665](https://github.com/ClickHouse/ClickHouse/pull/17665) ([Amos Bird](https://github.com/amosbird)).
+* Added functions `toModifiedJulianDay`, `fromModifiedJulianDay`, `toModifiedJulianDayOrNull`, and `fromModifiedJulianDayOrNull`. These functions convert between Proleptic Gregorian calendar date and Modified Julian Day number. [#17750](https://github.com/ClickHouse/ClickHouse/pull/17750) ([PHO](https://github.com/depressed-pho)).
+* Add ability to use custom TLD list: added functions `firstSignificantSubdomainCustom`, `cutToFirstSignificantSubdomainCustom`. [#17748](https://github.com/ClickHouse/ClickHouse/pull/17748) ([Azat Khuzhin](https://github.com/azat)).
+* Add support for `PROXYv1` protocol to wrap native TCP interface. Allow quotas to be keyed by proxy-forwarded IP address (applied for `PROXYv1` address and for `X-Forwarded-For` from HTTP interface). This is useful when you provide access to ClickHouse only via trusted proxy (e.g. CloudFlare) but want to account user resources by their original IP addresses. This fixes [#17268](https://github.com/ClickHouse/ClickHouse/issues/17268). [#17707](https://github.com/ClickHouse/ClickHouse/pull/17707) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Now clickhouse-client supports opening `EDITOR` to edit commands. `Alt-Shift-E`. [#17665](https://github.com/ClickHouse/ClickHouse/pull/17665) ([Amos Bird](https://github.com/amosbird)).
 * Add function `encodeXMLComponent` to escape characters to place string into XML text node or attribute. [#17659](https://github.com/ClickHouse/ClickHouse/pull/17659) ([nauta](https://github.com/nautaa)).
-* Introduce `DETACH TABLE/VIEW ... PERMANENTLY` syntax, so that after restarting the table does not reappear back automatically (only by explicit request). The table can still be attached back using the short syntax ATTACH TABLE. Implements [#5555](https://github.com/ClickHouse/ClickHouse/issues/5555). Fixes [#13850](https://github.com/ClickHouse/ClickHouse/issues/13850). [#17642](https://github.com/ClickHouse/ClickHouse/pull/17642) ([filimonov](https://github.com/filimonov)).
+* Introduce `DETACH TABLE/VIEW ... PERMANENTLY` syntax, so that after restarting the table does not reappear back automatically on restart (only by explicit request). The table can still be attached back using the short syntax ATTACH TABLE. Implements [#5555](https://github.com/ClickHouse/ClickHouse/issues/5555). Fixes [#13850](https://github.com/ClickHouse/ClickHouse/issues/13850). [#17642](https://github.com/ClickHouse/ClickHouse/pull/17642) ([filimonov](https://github.com/filimonov)).
 * Add asynchronous metrics on total amount of rows, bytes and parts in MergeTree tables. This fix [#11714](https://github.com/ClickHouse/ClickHouse/issues/11714). [#17639](https://github.com/ClickHouse/ClickHouse/pull/17639) ([flynn](https://github.com/ucasFL)).
-* related: [#16176](https://github.com/ClickHouse/ClickHouse/issues/16176) Usage: ``` set limit = 10; set offset = 20; ``` this two settings will affect SELECT query as if it is added like ``` select * from ($your_original_select_query) tmp limit xxx offset xxx; ```. [#17633](https://github.com/ClickHouse/ClickHouse/pull/17633) ([hexiaoting](https://github.com/hexiaoting)).
-* * IP Dictionary supports `IPv4` / `IPv6` types directly. [#17571](https://github.com/ClickHouse/ClickHouse/pull/17571) ([vdimir](https://github.com/vdimir)).
-* add ```*.zst``` compression/decompression support.It enables using ```*.zst``` in ```file()``` function and ```Content-encoding: zstd``` in http client.This closes [#16791 ](https://github.com/ClickHouse/ClickHouse/issues/16791). [#17144](https://github.com/ClickHouse/ClickHouse/pull/17144) ([Abi Palagashvili](https://github.com/fibersel)).
-* Add a setting optimize_on_insert. When enabled, do the same transformation for INSERTed block of data as if merge was done on this block (e.g. Replacing, Collapsing, Aggregating...). This setting will be enabled as default. This can influence Materialized View and MaterializeMySQL behaviour (see detailed description). This closes [#10683](https://github.com/ClickHouse/ClickHouse/issues/10683). [#16954](https://github.com/ClickHouse/ClickHouse/pull/16954) ([Kruglov Pavel](https://github.com/Avogar)).
-* Added `mannWitneyUTest`, `studentTTest` and `welchTTest` aggregate functions. Refactored RankCorr a bit. [#16883](https://github.com/ClickHouse/ClickHouse/pull/16883) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Provide a new aggregator combinator : `-SimpleState` to build SimpleAggregateFunction types via query. It's useful for defining MaterializedView of AggregatingMergeTree engine, and will benefit projections too. [#16853](https://github.com/ClickHouse/ClickHouse/pull/16853) ([Amos Bird](https://github.com/amosbird)).
-* ... [#16819](https://github.com/ClickHouse/ClickHouse/pull/16819) ([Aleksandrov Vladimir](https://github.com/invis87)).
-* Use https://github.com/lemire/fast_float to parse floating point numbers. [#16787](https://github.com/ClickHouse/ClickHouse/pull/16787) ([Maksim Kita](https://github.com/kitaisreal)).
-* Added function `accurateCastOrNull`. This closes [#10290](https://github.com/ClickHouse/ClickHouse/issues/10290). Add type conversions in `x IN (subquery)` expressions. This closes [#10266](https://github.com/ClickHouse/ClickHouse/issues/10266). [#16724](https://github.com/ClickHouse/ClickHouse/pull/16724) ([Maksim Kita](https://github.com/kitaisreal)).
-* Kerberos Authenticaiton for HDFS. [#16621](https://github.com/ClickHouse/ClickHouse/pull/16621) ([Ilya Golshtein](https://github.com/ilejn)).
-* Implement `UNION DISTINCT` and treat the plain `UNION` clause as `UNION DISTINCT` by default. Add a setting `union_default_mode` that allows to treat it as `UNION ALL` or require explicit mode specification. [#16338](https://github.com/ClickHouse/ClickHouse/pull/16338) ([flynn](https://github.com/ucasFL)).
-* Added `queries-file` parameter for clickhouse-client and clickhouse-local. [#15930](https://github.com/ClickHouse/ClickHouse/pull/15930) ([Maksim Kita](https://github.com/kitaisreal)).
-* Add new datatype Map for supporting storage k:v . related to issue: [#1841](https://github.com/ClickHouse/ClickHouse/issues/1841) 1st version for Map only support String type of key and value. Later I will implement Int and other type for key and value. [#15806](https://github.com/ClickHouse/ClickHouse/pull/15806) ([hexiaoting](https://github.com/hexiaoting)).
-* Implement gRPC protocol in ClickHouse. [#15111](https://github.com/ClickHouse/ClickHouse/pull/15111) ([Vitaly Baranov](https://github.com/vitlibar)).
-* - parallel parsing was rewritten to processors - parallel formatting was implemented. [#11617](https://github.com/ClickHouse/ClickHouse/pull/11617) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Added functions `Simhash`, `Minhash`, `bitHammingDistance`, `tupleHammingDistance`. [#7649](https://github.com/ClickHouse/ClickHouse/pull/7649) ([flynn](https://github.com/ucasFL)).
+* Add settings `limit` and `offset` for out-of-SQL pagination: [#16176](https://github.com/ClickHouse/ClickHouse/issues/16176) They are useful for building APIs. These two settings will affect SELECT query as if it is added like `select * from (your_original_select_query) t limit xxx offset xxx;`. [#17633](https://github.com/ClickHouse/ClickHouse/pull/17633) ([hexiaoting](https://github.com/hexiaoting)).
+* Provide a new aggregator combinator : `-SimpleState` to build `SimpleAggregateFunction` types via query. It's useful for defining MaterializedView of AggregatingMergeTree engine, and will benefit projections too. [#16853](https://github.com/ClickHouse/ClickHouse/pull/16853) ([Amos Bird](https://github.com/amosbird)).
+* Added `queries-file` parameter for `clickhouse-client` and `clickhouse-local`. [#15930](https://github.com/ClickHouse/ClickHouse/pull/15930) ([Maksim Kita](https://github.com/kitaisreal)).
+* Added `query` parameter for `clickhouse-benchmark`. [#17832](https://github.com/ClickHouse/ClickHouse/pull/17832) ([Maksim Kita](https://github.com/kitaisreal)).
+* `EXPLAIN AST` now support queries other then `SELECT`. [#18136](https://github.com/ClickHouse/ClickHouse/pull/18136) ([taiyang-li](https://github.com/taiyang-li)).
+
+
+#### Experimental Feature
+
+* Added functions for calculation of minHash and simHash of text n-grams and shingles. They are intended for semi-duplicate search. Also functions `bitHammingDistance` and `tupleHammingDistance` are added. [#7649](https://github.com/ClickHouse/ClickHouse/pull/7649) ([flynn](https://github.com/ucasFL)).
+* Add new data type `Map`. See [#1841](https://github.com/ClickHouse/ClickHouse/issues/1841). First version for Map only supports `String` type of key and value. [#15806](https://github.com/ClickHouse/ClickHouse/pull/15806) ([hexiaoting](https://github.com/hexiaoting)).
+* Implement alternative SQL parser based on ANTLR4 runtime and generated from EBNF grammar. [#11298](https://github.com/ClickHouse/ClickHouse/pull/11298) ([Ivan](https://github.com/abyss7)).
+
+
+#### Performance Improvement
+
+* New IP Dictionary implementation with lower memory consumption, improved performance for some cases, and fixed bugs. [#16804](https://github.com/ClickHouse/ClickHouse/pull/16804) ([vdimir](https://github.com/vdimir)).
+* Parallel formatting for data export. [#11617](https://github.com/ClickHouse/ClickHouse/pull/11617) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* LDAP integration: Added `verification_cooldown` parameter in LDAP server connection configuration to allow caching of successful "bind" attempts for configurable period of time. [#15988](https://github.com/ClickHouse/ClickHouse/pull/15988) ([Denis Glazachev](https://github.com/traceon)).
+* Add `--no-system-table` option for `clickhouse-local` to run without system tables. This avoids initialization of `DateLUT` that may take noticeable amount of time (tens of milliseconds) at startup. [#18899](https://github.com/ClickHouse/ClickHouse/pull/18899) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Replace `PODArray` with `PODArrayWithStackMemory` in `AggregateFunctionWindowFunnelData` to improve `windowFunnel` function performance. [#18817](https://github.com/ClickHouse/ClickHouse/pull/18817) ([flynn](https://github.com/ucasFL)).
+* Don't send empty blocks to shards on synchronous INSERT into Distributed table. This closes [#14571](https://github.com/ClickHouse/ClickHouse/issues/14571). [#18775](https://github.com/ClickHouse/ClickHouse/pull/18775) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Optimized read for StorageMemory. [#18052](https://github.com/ClickHouse/ClickHouse/pull/18052) ([Maksim Kita](https://github.com/kitaisreal)).
+* Using Dragonbox algorithm for float to string conversion instead of ryu. This improves performance of float to string conversion significantly. [#17831](https://github.com/ClickHouse/ClickHouse/pull/17831) ([Maksim Kita](https://github.com/kitaisreal)).
+* Speedup `IPv6CIDRToRange` implementation. [#17569](https://github.com/ClickHouse/ClickHouse/pull/17569) ([vdimir](https://github.com/vdimir)).
+* Add `remerge_sort_lowered_memory_bytes_ratio` setting (If memory usage after remerge does not reduced by this ratio, remerge will be disabled). [#17539](https://github.com/ClickHouse/ClickHouse/pull/17539) ([Azat Khuzhin](https://github.com/azat)).
+* Improve performance of AggregatingMergeTree with SimpleAggregateFunction(String) in PK. [#17109](https://github.com/ClickHouse/ClickHouse/pull/17109) ([Azat Khuzhin](https://github.com/azat)).
+* Now the `-If` combinator is devirtualized, and `count` is properly vectorized. It is for [this PR](https://github.com/ClickHouse/ClickHouse/pull/17041). [#17043](https://github.com/ClickHouse/ClickHouse/pull/17043) ([Amos Bird](https://github.com/amosbird)).
+* Fix performance of reading from `Merge` tables over huge number of `MergeTree` tables. Fixes [#7748](https://github.com/ClickHouse/ClickHouse/issues/7748). [#16988](https://github.com/ClickHouse/ClickHouse/pull/16988) ([Anton Popov](https://github.com/CurtizJ)).
+* Improved performance of function `repeat`. [#16937](https://github.com/ClickHouse/ClickHouse/pull/16937) ([satanson](https://github.com/satanson)).
+* Slightly improved performance of float parsing. [#16809](https://github.com/ClickHouse/ClickHouse/pull/16809) ([Maksim Kita](https://github.com/kitaisreal)).
+* Add possibility to skip merged partitions for `OPTIMIZE TABLE ... FINAL`. [#15939](https://github.com/ClickHouse/ClickHouse/pull/15939) ([Kruglov Pavel](https://github.com/Avogar)).
+* Integrate with [fast_float from Daniel Lemire](https://github.com/lemire/fast_float) to parse floating point numbers. [#16787](https://github.com/ClickHouse/ClickHouse/pull/16787) ([Maksim Kita](https://github.com/kitaisreal)). It is not enabled, because performance its performance is still lower than rough float parser in ClickHouse.
+* Fix max_distributed_connections (affects `prefer_localhost_replica = 1` and `max_threads != max_distributed_connections`). [#17848](https://github.com/ClickHouse/ClickHouse/pull/17848) ([Azat Khuzhin](https://github.com/azat)).
+* Adaptive choice of single/multi part upload when sending data to S3. Single part upload is controlled by a new setting `max_single_part_upload_size`. [#17934](https://github.com/ClickHouse/ClickHouse/pull/17934) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Support for async tasks in `PipelineExecutor`. Initial support of async sockets for remote queries. [#17868](https://github.com/ClickHouse/ClickHouse/pull/17868) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Allow to use `optimize_move_to_prewhere` optimization with compact parts, when sizes of columns are unknown. [#17330](https://github.com/ClickHouse/ClickHouse/pull/17330) ([Anton Popov](https://github.com/CurtizJ)).
+
+
+#### Improvement
+
+* Avoid deadlock when executing INSERT SELECT into itself from a table with `TinyLog` or `Log` table engines. This closes [#6802](https://github.com/ClickHouse/ClickHouse/issues/6802). This closes [#18691](https://github.com/ClickHouse/ClickHouse/issues/18691). This closes [#16812](https://github.com/ClickHouse/ClickHouse/issues/16812). This closes [#14570](https://github.com/ClickHouse/ClickHouse/issues/14570). [#15260](https://github.com/ClickHouse/ClickHouse/pull/15260) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Support `SHOW CREATE VIEW name` syntax like [MySQL](https://dev.mysql.com/doc/refman/5.7/en/show-create-view.html). [#18095](https://github.com/ClickHouse/ClickHouse/pull/18095) ([Du Chuan](https://github.com/spongedu)).
+* All queries of type `Decimal * Float` or vice versa are allowed, including aggregate ones (e.g. `SELECT sum(decimal_field * 1.1)` or `SELECT dec_col * float_col`), the result type is Float32 or Float64. [#18145](https://github.com/ClickHouse/ClickHouse/pull/18145) ([Mike](https://github.com/myrrc)).
+* Improved minimal Web UI: add history; add sharing support; avoid race condition of different requests; add request in-flight and ready indicators; add favicon; detect Ctrl+Enter if textarea is not in focus. [#17293](https://github.com/ClickHouse/ClickHouse/pull/17293) [#17770](https://github.com/ClickHouse/ClickHouse/pull/17770) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* clickhouse-server didn't send `close` request to ZooKeeper server. [#16837](https://github.com/ClickHouse/ClickHouse/pull/16837) ([alesapin](https://github.com/alesapin)).
+* Avoid server abnormal termination in case of too low memory limits (`max_memory_usage = 1` / `max_untracked_memory = 1`). [#17453](https://github.com/ClickHouse/ClickHouse/pull/17453) ([Azat Khuzhin](https://github.com/azat)).
+* Fix non-deterministic result of `windowFunnel` function in case of same timestamp for different events. [#18884](https://github.com/ClickHouse/ClickHouse/pull/18884) ([Fuwang Hu](https://github.com/fuwhu)).
+* Docker: Explicitly set uid / gid of clickhouse user & group to the fixed values (101) in clickhouse-server Docker images. [#19096](https://github.com/ClickHouse/ClickHouse/pull/19096) ([filimonov](https://github.com/filimonov)).
+* Asynchronous INSERTs to `Distributed` tables: Two new settings (by analogy with MergeTree family) has been added: - `fsync_after_insert` - Do fsync for every inserted. Will decreases performance of inserts. - `fsync_directories` - Do fsync for temporary directory (that is used for async INSERT only) after all operations (writes, renames, etc.). [#18864](https://github.com/ClickHouse/ClickHouse/pull/18864) ([Azat Khuzhin](https://github.com/azat)).
+* `SYSTEM KILL` command started to work in Docker. This closes [#18847](https://github.com/ClickHouse/ClickHouse/issues/18847). [#18848](https://github.com/ClickHouse/ClickHouse/pull/18848) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Expand macros in the zk path when executing `FETCH PARTITION`. [#18839](https://github.com/ClickHouse/ClickHouse/pull/18839) ([fastio](https://github.com/fastio)).
+* Apply `ALTER TABLE <replicated_table> ON CLUSTER MODIFY SETTING ...` to all replicas. Because we don't replicate such alter commands. [#18789](https://github.com/ClickHouse/ClickHouse/pull/18789) ([Amos Bird](https://github.com/amosbird)).
+* Allow column transformer `EXCEPT` to accept a string as regular expression matcher. This resolves [#18685](https://github.com/ClickHouse/ClickHouse/issues/18685) . [#18699](https://github.com/ClickHouse/ClickHouse/pull/18699) ([Amos Bird](https://github.com/amosbird)).
+* Fix SimpleAggregateFunction in SummingMergeTree. Now it works like AggregateFunction. In previous versions values were summed together regardless to the aggregate function. This fixes [#18564](https://github.com/ClickHouse/ClickHouse/issues/18564) . [#8052](https://github.com/ClickHouse/ClickHouse/issues/8052). [#18637](https://github.com/ClickHouse/ClickHouse/pull/18637) ([Amos Bird](https://github.com/amosbird)). Another fix of using `SimpleAggregateFunction` in `SummingMergeTree`. This fixes [#18676](https://github.com/ClickHouse/ClickHouse/issues/18676) . [#18677](https://github.com/ClickHouse/ClickHouse/pull/18677) ([Amos Bird](https://github.com/amosbird)).
+* Fixed assertion error inside allocator in case when last argument of function bar is NaN. Now simple ClickHouse's exception is being thrown. This fixes [#17876](https://github.com/ClickHouse/ClickHouse/issues/17876). [#18520](https://github.com/ClickHouse/ClickHouse/pull/18520) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fix usability issue: no newline after exception message in some tools. [#18444](https://github.com/ClickHouse/ClickHouse/pull/18444) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add ability to modify primary and partition key column type from `LowCardinality(Type)` to `Type` and vice versa. Also add an ability to modify primary key column type from `EnumX ` to `IntX` type. Fixes [#5604](https://github.com/ClickHouse/ClickHouse/issues/5604). [#18362](https://github.com/ClickHouse/ClickHouse/pull/18362) ([alesapin](https://github.com/alesapin)).
+* Implement `untuple` field access. [#18133](https://github.com/ClickHouse/ClickHouse/issues/18133). [#18309](https://github.com/ClickHouse/ClickHouse/pull/18309) ([hexiaoting](https://github.com/hexiaoting)).
+* Allow to parse Array fields from CSV if it is represented as a string containing array that was serialized as nested CSV. Example: `"[""Hello"", ""world"", ""42"""" TV""]"` will parse as `['Hello', 'world', '42" TV']`. Allow to parse array in CSV in a string without enclosing braces. Example: `"'Hello', 'world', '42"" TV'"` will parse as `['Hello', 'world', '42" TV']`. [#18271](https://github.com/ClickHouse/ClickHouse/pull/18271) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Make better adaptive granularity calculation for merge tree wide parts. [#18223](https://github.com/ClickHouse/ClickHouse/pull/18223) ([alesapin](https://github.com/alesapin)).
+* Now `clickhouse install` could work on Mac. The problem was that there is no procfs on this platform. [#18201](https://github.com/ClickHouse/ClickHouse/pull/18201) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Better hints for `SHOW ...` query syntax. [#18183](https://github.com/ClickHouse/ClickHouse/pull/18183) ([Du Chuan](https://github.com/spongedu)).
+* Array aggregation `arrayMin`, `arrayMax`, `arraySum`, `arrayAvg` support for `Int128`, `Int256`, `UInt256`. [#18147](https://github.com/ClickHouse/ClickHouse/pull/18147) ([Maksim Kita](https://github.com/kitaisreal)).
+* Add `disk` to Set and Join storage settings. [#18112](https://github.com/ClickHouse/ClickHouse/pull/18112) ([Grigory Pervakov](https://github.com/GrigoryPervakov)).
+* Access control: Now table function `merge()` requires current user to have `SELECT` privilege on each table it receives data from. This PR fixes [#16964](https://github.com/ClickHouse/ClickHouse/issues/16964). [#18104](https://github.com/ClickHouse/ClickHouse/pull/18104) [#17983](https://github.com/ClickHouse/ClickHouse/pull/17983) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Temporary tables are visible in the system tables `system.tables` and `system.columns` now only in those session where they have been created. The internal database `_temporary_and_external_tables` is now hidden in those system tables; temporary tables are shown as tables with empty database with the `is_temporary` flag set instead. [#18014](https://github.com/ClickHouse/ClickHouse/pull/18014) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix clickhouse-client rendering issue when the size of terminal window changes. [#18009](https://github.com/ClickHouse/ClickHouse/pull/18009) ([Amos Bird](https://github.com/amosbird)).
+* Decrease log verbosity of the events when the client drops the connection from Warning to Information. [#18005](https://github.com/ClickHouse/ClickHouse/pull/18005) ([filimonov](https://github.com/filimonov)).
+* Forcibly removing empty or bad metadata files from filesystem for DiskS3. S3 is an experimental feature. [#17935](https://github.com/ClickHouse/ClickHouse/pull/17935) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Access control: `allow_introspection_functions=0` prohibits usage of introspection functions but doesn't prohibit giving grants for them anymore (the grantee will need to set `allow_introspection_functions=1` for himself to be able to use that grant). Similarly `allow_ddl=0` prohibits usage of DDL commands but doesn't prohibit giving grants for them anymore. [#17908](https://github.com/ClickHouse/ClickHouse/pull/17908) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Usability improvement: hints for column names. [#17112](https://github.com/ClickHouse/ClickHouse/issues/17112). [#17857](https://github.com/ClickHouse/ClickHouse/pull/17857) ([fastio](https://github.com/fastio)).
+* Add diagnostic information when two merge tables try to read each other's data. [#17854](https://github.com/ClickHouse/ClickHouse/pull/17854) ([徐炘](https://github.com/weeds085490)).
+* Let the possibility to override timeout value for running script using the ClickHouse docker image. [#17818](https://github.com/ClickHouse/ClickHouse/pull/17818) ([Guillaume Tassery](https://github.com/YiuRULE)).
+* Check system log tables' engine definition grammar to prevent some configuration errors. Notes that this grammar check is not semantical, that means such mistakes as non-existent columns / expression functions would be not found out util the table is created. [#17739](https://github.com/ClickHouse/ClickHouse/pull/17739) ([Du Chuan](https://github.com/spongedu)).
+* Removed exception throwing at `RabbitMQ` table initialization if there was no connection (it will be reconnecting in the background). [#17709](https://github.com/ClickHouse/ClickHouse/pull/17709) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Do not ignore server memory limits during Buffer flush. [#17646](https://github.com/ClickHouse/ClickHouse/pull/17646) ([Azat Khuzhin](https://github.com/azat)).
+* Switch to patched version of RocksDB (from ClickHouse-Extras) to fix use-after-free error. [#17643](https://github.com/ClickHouse/ClickHouse/pull/17643) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Added an offset to exception message for parallel parsing. This fixes [#17457](https://github.com/ClickHouse/ClickHouse/issues/17457). [#17641](https://github.com/ClickHouse/ClickHouse/pull/17641) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Don't throw "Too many parts" error in the middle of INSERT query. [#17566](https://github.com/ClickHouse/ClickHouse/pull/17566) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Allow query parameters in UPDATE statement of ALTER query. Fixes [#10976](https://github.com/ClickHouse/ClickHouse/issues/10976). [#17563](https://github.com/ClickHouse/ClickHouse/pull/17563) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Query obfuscator: avoid usage of some SQL keywords for identifier names. [#17526](https://github.com/ClickHouse/ClickHouse/pull/17526) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Export current max ddl entry executed by DDLWorker via server metric. It's useful to check if DDLWorker hangs somewhere. [#17464](https://github.com/ClickHouse/ClickHouse/pull/17464) ([Amos Bird](https://github.com/amosbird)).
+* Export asynchronous metrics of all servers current threads. It's useful to track down issues like [this](https://github.com/ClickHouse-Extras/poco/pull/28). [#17463](https://github.com/ClickHouse/ClickHouse/pull/17463) ([Amos Bird](https://github.com/amosbird)).
+* Include dynamic columns like MATERIALIZED / ALIAS for wildcard query when settings `asterisk_include_materialized_columns` and `asterisk_include_alias_columns` are turned on. [#17462](https://github.com/ClickHouse/ClickHouse/pull/17462) ([Ken Chen](https://github.com/chenziliang)).
+* Allow specifying [TTL](https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/mergetree/#mergetree-table-ttl) to remove old entries from [system log tables](https://clickhouse.tech/docs/en/operations/system-tables/), using the `<ttl>` attribute in `config.xml`. [#17438](https://github.com/ClickHouse/ClickHouse/pull/17438) ([Du Chuan](https://github.com/spongedu)).
+* Now queries coming to the server via MySQL and PostgreSQL protocols have distinctive interface types (which can be seen in the `interface` column of the table`system.query_log`): `4` for MySQL, and `5` for PostgreSQL, instead of formerly used `1` which is now used for the native protocol only. [#17437](https://github.com/ClickHouse/ClickHouse/pull/17437) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix parsing of SETTINGS clause of the `INSERT ... SELECT ... SETTINGS` query. [#17414](https://github.com/ClickHouse/ClickHouse/pull/17414) ([Azat Khuzhin](https://github.com/azat)).
+* Correctly account memory in RadixSort. [#17412](https://github.com/ClickHouse/ClickHouse/pull/17412) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Add eof check in `receiveHello` in server to prevent getting `Attempt to read after eof` exception. [#17365](https://github.com/ClickHouse/ClickHouse/pull/17365) ([Kruglov Pavel](https://github.com/Avogar)).
+* Avoid possible stack overflow in bigint conversion. Big integers are experimental. [#17269](https://github.com/ClickHouse/ClickHouse/pull/17269) ([flynn](https://github.com/ucasFL)).
+* Now `set` indices will work with `GLOBAL IN`. This fixes [#17232](https://github.com/ClickHouse/ClickHouse/issues/17232) , [#5576](https://github.com/ClickHouse/ClickHouse/issues/5576) . [#17253](https://github.com/ClickHouse/ClickHouse/pull/17253) ([Amos Bird](https://github.com/amosbird)).
+* Add limit for http redirects in request to S3 storage (`s3_max_redirects`). [#17220](https://github.com/ClickHouse/ClickHouse/pull/17220) ([ianton-ru](https://github.com/ianton-ru)).
+* When `-OrNull` combinator combined `-If`, `-Merge`, `-MergeState`, `-State` combinators, we should put `-OrNull` in front. [#16935](https://github.com/ClickHouse/ClickHouse/pull/16935) ([flynn](https://github.com/ucasFL)).
+* Support HTTP proxy and HTTPS S3 endpoint configuration. [#16861](https://github.com/ClickHouse/ClickHouse/pull/16861) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Added proper authentication using environment, `~/.aws` and `AssumeRole` for S3 client. [#16856](https://github.com/ClickHouse/ClickHouse/pull/16856) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Add more OpenTelemetry spans. Add an example of how to export the span data to Zipkin. [#16535](https://github.com/ClickHouse/ClickHouse/pull/16535) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Cache dictionaries: Completely eliminate callbacks and locks for acquiring them. Keys are not divided into "not found" and "expired", but stored in the same map during query. [#14958](https://github.com/ClickHouse/ClickHouse/pull/14958) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fix never worked `fsync_part_directory`/`fsync_after_insert`/`in_memory_parts_insert_sync` (experimental feature). [#18845](https://github.com/ClickHouse/ClickHouse/pull/18845) ([Azat Khuzhin](https://github.com/azat)).
+* Allow using `Atomic` engine for nested database of `MaterializeMySQL` engine. [#14849](https://github.com/ClickHouse/ClickHouse/pull/14849) ([tavplubix](https://github.com/tavplubix)).
+
 
 #### Bug Fix
 
-* - Split RemoteQueryExecutorReadContext into module part - Fix leaking of pipe fd for `async_socket_for_remote`. [#19153](https://github.com/ClickHouse/ClickHouse/pull/19153) ([Azat Khuzhin](https://github.com/azat)).
+* Fix the issue when server can stop accepting connections in very rare cases. [#17542](https://github.com/ClickHouse/ClickHouse/pull/17542) (Amos Bird, [alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix index analysis of binary functions with constant argument which leads to wrong query results. This fixes [#18364](https://github.com/ClickHouse/ClickHouse/issues/18364). [#18373](https://github.com/ClickHouse/ClickHouse/pull/18373) ([Amos Bird](https://github.com/amosbird)).
+* Fix possible wrong index analysis when the types of the index comparison are different. This fixes [#17122](https://github.com/ClickHouse/ClickHouse/issues/17122). [#17145](https://github.com/ClickHouse/ClickHouse/pull/17145) ([Amos Bird](https://github.com/amosbird)).
+* Disable write with AIO during merges because it can lead to extremely rare data corruption of primary key columns during merge. [#18481](https://github.com/ClickHouse/ClickHouse/pull/18481) ([alesapin](https://github.com/alesapin)).
+* Restrict merges from wide to compact parts. In case of vertical merge it led to broken result part. [#18381](https://github.com/ClickHouse/ClickHouse/pull/18381) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix possible incomplete query result while reading from `MergeTree*` in case of read backoff (message `<Debug> MergeTreeReadPool: Will lower number of threads` in logs). Was introduced in [#16423](https://github.com/ClickHouse/ClickHouse/issues/16423). Fixes [#18137](https://github.com/ClickHouse/ClickHouse/issues/18137). [#18216](https://github.com/ClickHouse/ClickHouse/pull/18216) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix use after free bug in `rocksdb` library. [#18862](https://github.com/ClickHouse/ClickHouse/pull/18862) ([sundyli](https://github.com/sundy-li)).
 * Fix infinite reading from file in `ORC` format (was introduced in [#10580](https://github.com/ClickHouse/ClickHouse/issues/10580)). Fixes [#19095](https://github.com/ClickHouse/ClickHouse/issues/19095). [#19134](https://github.com/ClickHouse/ClickHouse/pull/19134) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Fix bug in merge tree data writer which can lead to marks with bigger size than fixed granularity size. Fixes [#18913](https://github.com/ClickHouse/ClickHouse/issues/18913). [#19123](https://github.com/ClickHouse/ClickHouse/pull/19123) ([alesapin](https://github.com/alesapin)).
 * Fix startup bug when clickhouse was not able to read compression codec from `LowCardinality(Nullable(...))` and throws exception `Attempt to read after EOF`. Fixes [#18340](https://github.com/ClickHouse/ClickHouse/issues/18340). [#19101](https://github.com/ClickHouse/ClickHouse/pull/19101) ([alesapin](https://github.com/alesapin)).
-* Simplify the implementation of `tupleHammingDistance`. Support for tuples of any equal length. Fixes [#19029](https://github.com/ClickHouse/ClickHouse/issues/19029). [#19084](https://github.com/ClickHouse/ClickHouse/pull/19084) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Restrict `MODIFY TTL` queries for `MergeTree` tables created in old syntax. Previously the query succeeded, but actually it had no effect. [#19064](https://github.com/ClickHouse/ClickHouse/pull/19064) ([Anton Popov](https://github.com/CurtizJ)).
 * Make sure `groupUniqArray` returns correct type for argument of Enum type. This closes [#17875](https://github.com/ClickHouse/ClickHouse/issues/17875). [#19019](https://github.com/ClickHouse/ClickHouse/pull/19019) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Fix possible error `Expected single dictionary argument for function` if use function `ignore` with `LowCardinality` argument. Fixes [#14275](https://github.com/ClickHouse/ClickHouse/issues/14275). [#19016](https://github.com/ClickHouse/ClickHouse/pull/19016) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Fix inserting of `LowCardinality` column to table with `TinyLog` engine. Fixes [#18629](https://github.com/ClickHouse/ClickHouse/issues/18629). [#19010](https://github.com/ClickHouse/ClickHouse/pull/19010) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Join tries to materialize const columns, but our code waits for them in other places. [#18982](https://github.com/ClickHouse/ClickHouse/pull/18982) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Join tries to materialize const columns, but our code wants them in other places. [#18982](https://github.com/ClickHouse/ClickHouse/pull/18982) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
 * Disable `optimize_move_functions_out_of_any` because optimization is not always correct. This closes [#18051](https://github.com/ClickHouse/ClickHouse/issues/18051). This closes [#18973](https://github.com/ClickHouse/ClickHouse/issues/18973). [#18981](https://github.com/ClickHouse/ClickHouse/pull/18981) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Fix possible exception `QueryPipeline stream: different number of columns` caused by merging of query plan's `Expression` steps. Fixes [#18190](https://github.com/ClickHouse/ClickHouse/issues/18190). [#18980](https://github.com/ClickHouse/ClickHouse/pull/18980) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Fixed very rare deadlock at shutdown. [#18977](https://github.com/ClickHouse/ClickHouse/pull/18977) ([tavplubix](https://github.com/tavplubix)).
 * Fix incorrect behavior when `ALTER TABLE ... DROP PART 'part_name'` query removes all deduplication blocks for the whole partition. Fixes [#18874](https://github.com/ClickHouse/ClickHouse/issues/18874). [#18969](https://github.com/ClickHouse/ClickHouse/pull/18969) ([alesapin](https://github.com/alesapin)).
-* Fix error `Task was not found in task queue` (possible only for remote queries, with `async_socket_for_remote = 1`). [#18964](https://github.com/ClickHouse/ClickHouse/pull/18964) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix bug when mutation with some escaped text (like `ALTER ... UPDATE e = CAST('foo', 'Enum8(\'foo\' = 1')` serialized incorrectly. Fixes [#18878](https://github.com/ClickHouse/ClickHouse/issues/18878). [#18944](https://github.com/ClickHouse/ClickHouse/pull/18944) ([alesapin](https://github.com/alesapin)).
 * Attach partition should reset the mutation. [#18804](https://github.com/ClickHouse/ClickHouse/issues/18804). [#18935](https://github.com/ClickHouse/ClickHouse/pull/18935) ([fastio](https://github.com/fastio)).
 * Fix issue with `bitmapOrCardinality` that may lead to nullptr dereference. This closes [#18911](https://github.com/ClickHouse/ClickHouse/issues/18911). [#18912](https://github.com/ClickHouse/ClickHouse/pull/18912) ([sundyli](https://github.com/sundy-li)).
-* Fix possible hang at shutdown in clickhouse-local. This fixes [#18891](https://github.com/ClickHouse/ClickHouse/issues/18891). [#18893](https://github.com/ClickHouse/ClickHouse/pull/18893) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* change the sorting key of events_list from timestamp to (timestamp, event_index). [#18884](https://github.com/ClickHouse/ClickHouse/pull/18884) ([Fuwang Hu](https://github.com/fuwhu)).
+* Fix possible hang at shutdown in `clickhouse-local`. This fixes [#18891](https://github.com/ClickHouse/ClickHouse/issues/18891). [#18893](https://github.com/ClickHouse/ClickHouse/pull/18893) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Queries for external databases (MySQL, ODBC, JDBC) were incorrectly rewritten if there was an expression in form of `x IN table`. This fixes [#9756](https://github.com/ClickHouse/ClickHouse/issues/9756). [#18876](https://github.com/ClickHouse/ClickHouse/pull/18876) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix use after free bug in rocksdb. [#18862](https://github.com/ClickHouse/ClickHouse/pull/18862) ([sundyli](https://github.com/sundy-li)).
-* - Fix never worked `fsync_part_directory`/`fsync_after_insert`/`in_memory_parts_insert_sync`. [#18845](https://github.com/ClickHouse/ClickHouse/pull/18845) ([Azat Khuzhin](https://github.com/azat)).
 * Fix *If combinator with unary function and Nullable types. [#18806](https://github.com/ClickHouse/ClickHouse/pull/18806) ([Azat Khuzhin](https://github.com/azat)).
-* Asynchronous distributed INSERTs can be rejected by the server if the setting `network_compression_method` is globally set to non-default value. This fixes [#18741](https://github.com/ClickHouse/ClickHouse/issues/18741). [#18776](https://github.com/ClickHouse/ClickHouse/pull/18776) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix the issue that asynchronous distributed INSERTs can be rejected by the server if the setting `network_compression_method` is globally set to non-default value. This fixes [#18741](https://github.com/ClickHouse/ClickHouse/issues/18741). [#18776](https://github.com/ClickHouse/ClickHouse/pull/18776) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Fixed `Attempt to read after eof` error when trying to `CAST` `NULL` from `Nullable(String)` to `Nullable(Decimal(P, S))`. Now function `CAST` returns `NULL` when it cannot parse decimal from nullable string. Fixes [#7690](https://github.com/ClickHouse/ClickHouse/issues/7690). [#18718](https://github.com/ClickHouse/ClickHouse/pull/18718) ([Winter Zhang](https://github.com/zhang2014)).
-* Fix Logger with unmatched arg size. [#18717](https://github.com/ClickHouse/ClickHouse/pull/18717) ([sundyli](https://github.com/sundy-li)).
+* Fix minor issue with logging. [#18717](https://github.com/ClickHouse/ClickHouse/pull/18717) ([sundyli](https://github.com/sundy-li)).
 * Fix removing of empty parts in `ReplicatedMergeTree` tables, created with old syntax. Fixes [#18582](https://github.com/ClickHouse/ClickHouse/issues/18582). [#18614](https://github.com/ClickHouse/ClickHouse/pull/18614) ([Anton Popov](https://github.com/CurtizJ)).
 * Fix previous bug when date overflow with different values. Strict Date value limit to "2106-02-07", cast date > "2106-02-07" to value 0. [#18565](https://github.com/ClickHouse/ClickHouse/pull/18565) ([hexiaoting](https://github.com/hexiaoting)).
-* Add FixedString Data type support. I'll get this exception "Code: 50, e.displayText() = DB::Exception: Unsupported type FixedString(1)" when replicating data from MySQL to ClickHouse. This patch fixes bug [#18450](https://github.com/ClickHouse/ClickHouse/issues/18450) Also fixes [#6556](https://github.com/ClickHouse/ClickHouse/issues/6556). [#18553](https://github.com/ClickHouse/ClickHouse/pull/18553) ([awesomeleo](https://github.com/awesomeleo)).
+* Add FixedString data type support for replication from MySQL. Replication from MySQL is an experimental feature. This patch fixes [#18450](https://github.com/ClickHouse/ClickHouse/issues/18450) Also fixes [#6556](https://github.com/ClickHouse/ClickHouse/issues/6556). [#18553](https://github.com/ClickHouse/ClickHouse/pull/18553) ([awesomeleo](https://github.com/awesomeleo)).
 * Fix possible `Pipeline stuck` error while using `ORDER BY` after subquery with `RIGHT` or `FULL` join. [#18550](https://github.com/ClickHouse/ClickHouse/pull/18550) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Fix bug which may lead to `ALTER` queries hung after corresponding mutation kill. Found by thread fuzzer. [#18518](https://github.com/ClickHouse/ClickHouse/pull/18518) ([alesapin](https://github.com/alesapin)).
-* Disable write with AIO during merges because it can lead to extremely rare data corruption of primary key columns during merge. [#18481](https://github.com/ClickHouse/ClickHouse/pull/18481) ([alesapin](https://github.com/alesapin)).
 * Proper support for 12AM in `parseDateTimeBestEffort` function. This fixes [#18402](https://github.com/ClickHouse/ClickHouse/issues/18402). [#18449](https://github.com/ClickHouse/ClickHouse/pull/18449) ([vladimir-golovchenko](https://github.com/vladimir-golovchenko)).
 * Fixed `value is too short` error when executing `toType(...)` functions (`toDate`, `toUInt32`, etc) with argument of type `Nullable(String)`. Now such functions return `NULL` on parsing errors instead of throwing exception. Fixes [#7673](https://github.com/ClickHouse/ClickHouse/issues/7673). [#18445](https://github.com/ClickHouse/ClickHouse/pull/18445) ([tavplubix](https://github.com/tavplubix)).
 * Fix the unexpected behaviour of `SHOW TABLES`. [#18431](https://github.com/ClickHouse/ClickHouse/pull/18431) ([fastio](https://github.com/fastio)).
 * Fix -SimpleState combinator generates incompatible arugment type and return type. [#18404](https://github.com/ClickHouse/ClickHouse/pull/18404) ([Amos Bird](https://github.com/amosbird)).
 * Fix possible race condition in concurrent usage of `Set` or `Join` tables and selects from `system.tables`. [#18385](https://github.com/ClickHouse/ClickHouse/pull/18385) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Restrict merges from wide to compact parts. In case of vertical merge it led to broken result part. [#18381](https://github.com/ClickHouse/ClickHouse/pull/18381) ([Anton Popov](https://github.com/CurtizJ)).
 * Fix filling table `system.settings_profile_elements`. This PR fixes [#18231](https://github.com/ClickHouse/ClickHouse/issues/18231). [#18379](https://github.com/ClickHouse/ClickHouse/pull/18379) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix index analysis of binary functions with constant argument which leads to wrong query results. This fixes [#18364](https://github.com/ClickHouse/ClickHouse/issues/18364). [#18373](https://github.com/ClickHouse/ClickHouse/pull/18373) ([Amos Bird](https://github.com/amosbird)).
 * Fix possible crashes in aggregate functions with combinator `Distinct`, while using two-level aggregation. Fixes [#17682](https://github.com/ClickHouse/ClickHouse/issues/17682). [#18365](https://github.com/ClickHouse/ClickHouse/pull/18365) ([Anton Popov](https://github.com/CurtizJ)).
-* - Fixed issue when `clickhouse-odbc-bridge` process is unreachable by server on machines with dual IPv4/IPv6 stack; - Fixed issue when ODBC dictionary updates are performed using malformed queries and/or cause crashes; Possibly closes [#14489](https://github.com/ClickHouse/ClickHouse/issues/14489). [#18278](https://github.com/ClickHouse/ClickHouse/pull/18278) ([Denis Glazachev](https://github.com/traceon)).
-* `SELECT count() FROM table` now can be executed if only one any column can be selected from the `table`. This PR fixes [#10639](https://github.com/ClickHouse/ClickHouse/issues/10639). [#18233](https://github.com/ClickHouse/ClickHouse/pull/18233) ([Vitaly Baranov](https://github.com/vitlibar)).
-* `SELECT JOIN` now requires the `SELECT` privilege on each of the joined tables. This PR fixes [#17654](https://github.com/ClickHouse/ClickHouse/issues/17654). [#18232](https://github.com/ClickHouse/ClickHouse/pull/18232) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix possible incomplete query result while reading from `MergeTree*` in case of read backoff (message `<Debug> MergeTreeReadPool: Will lower number of threads` in logs). Was introduced in [#16423](https://github.com/ClickHouse/ClickHouse/issues/16423). Fixes [#18137](https://github.com/ClickHouse/ClickHouse/issues/18137). [#18216](https://github.com/ClickHouse/ClickHouse/pull/18216) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed issue when `clickhouse-odbc-bridge` process is unreachable by server on machines with dual IPv4/IPv6 stack; Fixed issue when ODBC dictionary updates are performed using malformed queries and/or cause crashes of the odbc-bridge process; Possibly closes [#14489](https://github.com/ClickHouse/ClickHouse/issues/14489). [#18278](https://github.com/ClickHouse/ClickHouse/pull/18278) ([Denis Glazachev](https://github.com/traceon)).
+* Access control: `SELECT count() FROM table` now can be executed if the user has access to at least single column from a table. This PR fixes [#10639](https://github.com/ClickHouse/ClickHouse/issues/10639). [#18233](https://github.com/ClickHouse/ClickHouse/pull/18233) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Access control: `SELECT JOIN` now requires the `SELECT` privilege on each of the joined tables. This PR fixes [#17654](https://github.com/ClickHouse/ClickHouse/issues/17654). [#18232](https://github.com/ClickHouse/ClickHouse/pull/18232) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Fix key comparison between Enum and Int types. This fixes [#17989](https://github.com/ClickHouse/ClickHouse/issues/17989). [#18214](https://github.com/ClickHouse/ClickHouse/pull/18214) ([Amos Bird](https://github.com/amosbird)).
-* fixes [#18186](https://github.com/ClickHouse/ClickHouse/issues/18186) fixes [#16372](https://github.com/ClickHouse/ClickHouse/issues/16372) fix unique key convert crash in MaterializeMySQL database engine. [#18211](https://github.com/ClickHouse/ClickHouse/pull/18211) ([Winter Zhang](https://github.com/zhang2014)).
-* Related to [#17466](https://github.com/ClickHouse/ClickHouse/issues/17466). [#18188](https://github.com/ClickHouse/ClickHouse/pull/18188) ([hexiaoting](https://github.com/hexiaoting)).
+* Replication from MySQL (experimental feature). Fixes [#18186](https://github.com/ClickHouse/ClickHouse/issues/18186) Fixes [#16372](https://github.com/ClickHouse/ClickHouse/issues/16372) Fix unique key convert issue in MaterializeMySQL database engine. [#18211](https://github.com/ClickHouse/ClickHouse/pull/18211) ([Winter Zhang](https://github.com/zhang2014)).
+* Fix inconsistency for queries with both `WITH FILL` and `WITH TIES` [#17466](https://github.com/ClickHouse/ClickHouse/issues/17466). [#18188](https://github.com/ClickHouse/ClickHouse/pull/18188) ([hexiaoting](https://github.com/hexiaoting)).
 * Fix inserting a row with default value in case of parsing error in the last column. Fixes [#17712](https://github.com/ClickHouse/ClickHouse/issues/17712). [#18182](https://github.com/ClickHouse/ClickHouse/pull/18182) ([Jianmei Zhang](https://github.com/zhangjmruc)).
 * Fix `Unknown setting profile` error on attempt to set settings profile. [#18167](https://github.com/ClickHouse/ClickHouse/pull/18167) ([tavplubix](https://github.com/tavplubix)).
 * Fix error when query `MODIFY COLUMN ... REMOVE TTL` doesn't actually remove column TTL. [#18130](https://github.com/ClickHouse/ClickHouse/pull/18130) ([alesapin](https://github.com/alesapin)).
 * Fixed `std::out_of_range: basic_string` in S3 URL parsing. [#18059](https://github.com/ClickHouse/ClickHouse/pull/18059) ([Vladimir Chebotarev](https://github.com/excitoon)).
-* Fix corruption in librdkafka snappy decompression (was a problem only for gcc10 builds, but official builds uses clang already, so at least recent official releases are not affected). [#18053](https://github.com/ClickHouse/ClickHouse/pull/18053) ([Azat Khuzhin](https://github.com/azat)).
 * Fix comparison of `DateTime64` and `Date`. Fixes [#13804](https://github.com/ClickHouse/ClickHouse/issues/13804) and [#11222](https://github.com/ClickHouse/ClickHouse/issues/11222). ... [#18050](https://github.com/ClickHouse/ClickHouse/pull/18050) ([Vasily Nemkov](https://github.com/Enmk)).
-* fixes [#15187](https://github.com/ClickHouse/ClickHouse/issues/15187) fixes [#17912](https://github.com/ClickHouse/ClickHouse/issues/17912) support convert MySQL prefix index for MaterializeMySQL CC: @tavplubix. [#17944](https://github.com/ClickHouse/ClickHouse/pull/17944) ([Winter Zhang](https://github.com/zhang2014)).
+* Replication from MySQL (experimental feature): Fixes [#15187](https://github.com/ClickHouse/ClickHouse/issues/15187) Fixes [#17912](https://github.com/ClickHouse/ClickHouse/issues/17912) support convert MySQL prefix index for MaterializeMySQL. [#17944](https://github.com/ClickHouse/ClickHouse/pull/17944) ([Winter Zhang](https://github.com/zhang2014)).
 * When server log rotation was configured using `logger.size` parameter with numeric value larger than 2^32, the logs were not rotated properly. This is fixed. [#17905](https://github.com/ClickHouse/ClickHouse/pull/17905) ([Alexander Kuzmenkov](https://github.com/akuzm)).
-* Fix comparison of `DateTime64` and `Date`. Fixes [#13804](https://github.com/ClickHouse/ClickHouse/issues/13804) and [#11222](https://github.com/ClickHouse/ClickHouse/issues/11222). ... [#17895](https://github.com/ClickHouse/ClickHouse/pull/17895) ([Vasily Nemkov](https://github.com/Enmk)).
 * Trivial query optimization was producing wrong result if query contains ARRAY JOIN (so query is actually non trivial). [#17887](https://github.com/ClickHouse/ClickHouse/pull/17887) ([sundyli](https://github.com/sundy-li)).
-* Fix max_distributed_connections (affects `prefer_localhost_replica=1` and `max_threads!=max_distributed_connections`). [#17848](https://github.com/ClickHouse/ClickHouse/pull/17848) ([Azat Khuzhin](https://github.com/azat)).
 * Fix possible segfault in `topK` aggregate function. This closes [#17404](https://github.com/ClickHouse/ClickHouse/issues/17404). [#17845](https://github.com/ClickHouse/ClickHouse/pull/17845) ([Maksim Kita](https://github.com/kitaisreal)).
-* fix incorrect initialize `max_compress_block_size` of MergeTreeWriterSettings with `min_compress_block_size`. [#17833](https://github.com/ClickHouse/ClickHouse/pull/17833) ([flynn](https://github.com/ucasFL)).
-* Do not restore parts from WAL if `in_memory_parts_enable_wal` is disabled. [#17802](https://github.com/ClickHouse/ClickHouse/pull/17802) ([detailyang](https://github.com/detailyang)).
+* WAL (experimental feature): Do not restore parts from WAL if `in_memory_parts_enable_wal` is disabled. [#17802](https://github.com/ClickHouse/ClickHouse/pull/17802) ([detailyang](https://github.com/detailyang)).
 * Exception message about max table size to drop was displayed incorrectly. [#17764](https://github.com/ClickHouse/ClickHouse/pull/17764) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed segfault when there is not enough space when inserting into `Distributed` table. [#17737](https://github.com/ClickHouse/ClickHouse/pull/17737) ([tavplubix](https://github.com/tavplubix)).
+* Fixed possible segfault when there is not enough space when inserting into `Distributed` table. [#17737](https://github.com/ClickHouse/ClickHouse/pull/17737) ([tavplubix](https://github.com/tavplubix)).
 * Fixed problem when ClickHouse fails to resume connection to MySQL servers. [#17681](https://github.com/ClickHouse/ClickHouse/pull/17681) ([Alexander Kazakov](https://github.com/Akazz)).
-* Fixed `Function not implemented` error when executing `RENAME` query in `Atomic` database with ClickHouse running on Windows Subsystem for Linux. Fixes [#17661](https://github.com/ClickHouse/ClickHouse/issues/17661). [#17664](https://github.com/ClickHouse/ClickHouse/pull/17664) ([tavplubix](https://github.com/tavplubix)).
+* Windows: Fixed `Function not implemented` error when executing `RENAME` query in `Atomic` database with ClickHouse running on Windows Subsystem for Linux. Fixes [#17661](https://github.com/ClickHouse/ClickHouse/issues/17661). [#17664](https://github.com/ClickHouse/ClickHouse/pull/17664) ([tavplubix](https://github.com/tavplubix)).
 * In might be determined incorrectly if cluster is circular- (cross-) replicated or not when executing `ON CLUSTER` query due to race condition when `pool_size` > 1. It's fixed. [#17640](https://github.com/ClickHouse/ClickHouse/pull/17640) ([tavplubix](https://github.com/tavplubix)).
 * Fix empty `system.stack_trace` table when server is running in daemon mode. [#17630](https://github.com/ClickHouse/ClickHouse/pull/17630) ([Amos Bird](https://github.com/amosbird)).
 * Exception `fmt::v7::format_error` can be logged in background for MergeTree tables. This fixes [#17613](https://github.com/ClickHouse/ClickHouse/issues/17613). [#17615](https://github.com/ClickHouse/ClickHouse/pull/17615) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * When clickhouse-client is used in interactive mode with multiline queries, single line comment was erronously extended till the end of query. This fixes [#13654](https://github.com/ClickHouse/ClickHouse/issues/13654). [#17565](https://github.com/ClickHouse/ClickHouse/pull/17565) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix the issue when server can stop accepting connections in very rare cases. [#17542](https://github.com/ClickHouse/ClickHouse/pull/17542) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Fix alter query hang when the corresponding mutation was killed on the different replica. Fixes [#16953](https://github.com/ClickHouse/ClickHouse/issues/16953). [#17499](https://github.com/ClickHouse/ClickHouse/pull/17499) ([alesapin](https://github.com/alesapin)).
-* Fix bug when mark cache size was underestimated by clickhouse. It may happen when there are a lot of tiny files with marks. [#17496](https://github.com/ClickHouse/ClickHouse/pull/17496) ([alesapin](https://github.com/alesapin)).
+* Fix issue with memory accounting when mark cache size was underestimated by clickhouse. It may happen when there are a lot of tiny files with marks. [#17496](https://github.com/ClickHouse/ClickHouse/pull/17496) ([alesapin](https://github.com/alesapin)).
 * Fix `ORDER BY` with enabled setting `optimize_redundant_functions_in_order_by`. [#17471](https://github.com/ClickHouse/ClickHouse/pull/17471) ([Anton Popov](https://github.com/CurtizJ)).
-* Avoid server abnormal termination in case of too low memory limits (`max_memory_usage=1`/`max_untracked_memory=1`). [#17453](https://github.com/ClickHouse/ClickHouse/pull/17453) ([Azat Khuzhin](https://github.com/azat)).
 * Fix duplicates after `DISTINCT` which were possible because of incorrect optimization. Fixes [#17294](https://github.com/ClickHouse/ClickHouse/issues/17294). [#17296](https://github.com/ClickHouse/ClickHouse/pull/17296) ([li chengxiang](https://github.com/chengxianglibra)). [#17439](https://github.com/ClickHouse/ClickHouse/pull/17439) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Fixed high CPU usage in background tasks of *MergeTree tables. [#17416](https://github.com/ClickHouse/ClickHouse/pull/17416) ([tavplubix](https://github.com/tavplubix)).
-* Fix crash while reading from `JOIN` table with `LowCardinality` types. Fixes [#17228](https://github.com/ClickHouse/ClickHouse/issues/17228). [#17397](https://github.com/ClickHouse/ClickHouse/pull/17397) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* fixes [#16835](https://github.com/ClickHouse/ClickHouse/issues/16835) try fix miss match header with MySQL SHOW statement. [#17366](https://github.com/ClickHouse/ClickHouse/pull/17366) ([Winter Zhang](https://github.com/zhang2014)).
-* Fix indeterministic functions with predicate optimizer. This fixes [#17244](https://github.com/ClickHouse/ClickHouse/issues/17244). [#17273](https://github.com/ClickHouse/ClickHouse/pull/17273) ([Winter Zhang](https://github.com/zhang2014)).
+* Fix possible crash while reading from `JOIN` table with `LowCardinality` types. Fixes [#17228](https://github.com/ClickHouse/ClickHouse/issues/17228). [#17397](https://github.com/ClickHouse/ClickHouse/pull/17397) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Replication from MySQL (experimental feature): Fixes [#16835](https://github.com/ClickHouse/ClickHouse/issues/16835) try fix miss match header with MySQL SHOW statement. [#17366](https://github.com/ClickHouse/ClickHouse/pull/17366) ([Winter Zhang](https://github.com/zhang2014)).
+* Fix nondeterministic functions with predicate optimizer. This fixes [#17244](https://github.com/ClickHouse/ClickHouse/issues/17244). [#17273](https://github.com/ClickHouse/ClickHouse/pull/17273) ([Winter Zhang](https://github.com/zhang2014)).
 * Fix possible `Unexpected packet Data received from client` error for Distributed queries with `LIMIT`. [#17254](https://github.com/ClickHouse/ClickHouse/pull/17254) ([Azat Khuzhin](https://github.com/azat)).
-* Fix set index invalidation when there are const columns in the subquery. This fixes [#17246](https://github.com/ClickHouse/ClickHouse/issues/17246) . [#17249](https://github.com/ClickHouse/ClickHouse/pull/17249) ([Amos Bird](https://github.com/amosbird)).
-* Fix [#15235](https://github.com/ClickHouse/ClickHouse/issues/15235). When clickhouse-copier handle non-partitioned table, throws segfault error. [#17248](https://github.com/ClickHouse/ClickHouse/pull/17248) ([Qi Chen](https://github.com/kaka11chen)).
-* Fixed possible not-working mutations for parts stored on S3 disk. [#17227](https://github.com/ClickHouse/ClickHouse/pull/17227) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Fix possible wrong index analysis when the types of the index comparison are different. This fixes [#17122](https://github.com/ClickHouse/ClickHouse/issues/17122). [#17145](https://github.com/ClickHouse/ClickHouse/pull/17145) ([Amos Bird](https://github.com/amosbird)).
-* Bug fix for funciton fuzzBits, related issue: [#16980](https://github.com/ClickHouse/ClickHouse/issues/16980). [#17051](https://github.com/ClickHouse/ClickHouse/pull/17051) ([hexiaoting](https://github.com/hexiaoting)).
-* - Fix optimize_distributed_group_by_sharding_key for query with OFFSET only. [#16996](https://github.com/ClickHouse/ClickHouse/pull/16996) ([Azat Khuzhin](https://github.com/azat)).
-* Fix Merge(Distributed()) with JOIN. [#16993](https://github.com/ClickHouse/ClickHouse/pull/16993) ([Azat Khuzhin](https://github.com/azat)).
-* Fix order by optimization with monotonous functions. Fixes [#16107](https://github.com/ClickHouse/ClickHouse/issues/16107). [#16956](https://github.com/ClickHouse/ClickHouse/pull/16956) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix set index invalidation when there are const columns in the subquery. This fixes [#17246](https://github.com/ClickHouse/ClickHouse/issues/17246). [#17249](https://github.com/ClickHouse/ClickHouse/pull/17249) ([Amos Bird](https://github.com/amosbird)).
+* clickhouse-copier: Fix for non-partitioned tables [#15235](https://github.com/ClickHouse/ClickHouse/issues/15235). [#17248](https://github.com/ClickHouse/ClickHouse/pull/17248) ([Qi Chen](https://github.com/kaka11chen)).
+* Fixed possible not-working mutations for parts stored on S3 disk (experimental feature). [#17227](https://github.com/ClickHouse/ClickHouse/pull/17227) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Bug fix for funciton `fuzzBits`, related issue: [#16980](https://github.com/ClickHouse/ClickHouse/issues/16980). [#17051](https://github.com/ClickHouse/ClickHouse/pull/17051) ([hexiaoting](https://github.com/hexiaoting)).
+* Fix `optimize_distributed_group_by_sharding_key` for query with OFFSET only. [#16996](https://github.com/ClickHouse/ClickHouse/pull/16996) ([Azat Khuzhin](https://github.com/azat)).
+* Fix queries from `Merge` tables over `Distributed` tables with JOINs. [#16993](https://github.com/ClickHouse/ClickHouse/pull/16993) ([Azat Khuzhin](https://github.com/azat)).
+* Fix order by optimization with monotonic functions. Fixes [#16107](https://github.com/ClickHouse/ClickHouse/issues/16107). [#16956](https://github.com/ClickHouse/ClickHouse/pull/16956) ([Anton Popov](https://github.com/CurtizJ)).
 * Fix incorrect comparison of types `DateTime64` with different scales. Fixes [#16655](https://github.com/ClickHouse/ClickHouse/issues/16655) ... [#16952](https://github.com/ClickHouse/ClickHouse/pull/16952) ([Vasily Nemkov](https://github.com/Enmk)).
 * Fix optimization of group by with enabled setting `optimize_aggregators_of_group_by_keys` and joins. Fixes [#12604](https://github.com/ClickHouse/ClickHouse/issues/12604). [#16951](https://github.com/ClickHouse/ClickHouse/pull/16951) ([Anton Popov](https://github.com/CurtizJ)).
-* TODO. [#16866](https://github.com/ClickHouse/ClickHouse/pull/16866) ([tavplubix](https://github.com/tavplubix)).
-* Fix bug when clickhouse-server doesn't send `close` request to ZooKeeper server. [#16837](https://github.com/ClickHouse/ClickHouse/pull/16837) ([alesapin](https://github.com/alesapin)).
-* Fix optimize_trivial_count_query with partition predicate. [#16767](https://github.com/ClickHouse/ClickHouse/pull/16767) ([Azat Khuzhin](https://github.com/azat)).
-* Return number of affected rows for INSERT queries via MySQL protocol. Previously ClickHouse used to always return 0, it's fixed. Fixes [#16605](https://github.com/ClickHouse/ClickHouse/issues/16605). [#16715](https://github.com/ClickHouse/ClickHouse/pull/16715) ([Winter Zhang](https://github.com/zhang2014)).
-* Fix inconsistent behavior caused by `select_sequential_consistency` for optimized trivial count query and system.tables. [#16309](https://github.com/ClickHouse/ClickHouse/pull/16309) ([Hao Chen](https://github.com/haoch)).
-* Throw error when use ColumnTransformer replace non exist column. [#16183](https://github.com/ClickHouse/ClickHouse/pull/16183) ([hexiaoting](https://github.com/hexiaoting)).
-* Fix crash in case of not equi-join ON expression in RIGH|FULL JOIN. [#15162](https://github.com/ClickHouse/ClickHouse/pull/15162) ([Artem Zuikov](https://github.com/4ertus2)).
+* Minor fix in SHOW ACCESS query. [#16866](https://github.com/ClickHouse/ClickHouse/pull/16866) ([tavplubix](https://github.com/tavplubix)).
+* Fix the behaviour with enabled `optimize_trivial_count_query` setting with partition predicate. [#16767](https://github.com/ClickHouse/ClickHouse/pull/16767) ([Azat Khuzhin](https://github.com/azat)).
+* Return number of affected rows for INSERT queries via MySQL wire protocol. Previously ClickHouse used to always return 0, it's fixed. Fixes [#16605](https://github.com/ClickHouse/ClickHouse/issues/16605). [#16715](https://github.com/ClickHouse/ClickHouse/pull/16715) ([Winter Zhang](https://github.com/zhang2014)).
+* Fix inconsistent behavior caused by `select_sequential_consistency` for optimized trivial count query and system tables. [#16309](https://github.com/ClickHouse/ClickHouse/pull/16309) ([Hao Chen](https://github.com/haoch)).
+* Throw error when `REPLACE` column transformer operates on non existing column. [#16183](https://github.com/ClickHouse/ClickHouse/pull/16183) ([hexiaoting](https://github.com/hexiaoting)).
+* Throw exception in case of not equi-join ON expression in RIGH|FULL JOIN. [#15162](https://github.com/ClickHouse/ClickHouse/pull/15162) ([Artem Zuikov](https://github.com/4ertus2)).
 
-#### Improvement
-
-* Explicitly set uid / gid of clickhouse user & group to the fixed values (101) in clickhouse-server images. [#19096](https://github.com/ClickHouse/ClickHouse/pull/19096) ([filimonov](https://github.com/filimonov)).
-* Two new settings (by analogy with MergeTree family) has been added: - `fsync_after_insert` - Do fsync for every inserted. Will decreases performance of inserts. - `fsync_directories` - Do fsync for temporary directory (that is used for async INSERT only) after all operations (writes, renames, etc.). [#18864](https://github.com/ClickHouse/ClickHouse/pull/18864) ([Azat Khuzhin](https://github.com/azat)).
-* `SYSTEM KILL` command started to work in Docker. This closes [#18847](https://github.com/ClickHouse/ClickHouse/issues/18847). [#18848](https://github.com/ClickHouse/ClickHouse/pull/18848) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Expand macros in the zk path when executing fetchPartition. [#18839](https://github.com/ClickHouse/ClickHouse/pull/18839) ([fastio](https://github.com/fastio)).
-* Apply `ALTER TABLE <replicated_table> ON CLUSTER MODIFY SETTING ...` to all replicas. Because we don't replicate such alter commands. [#18789](https://github.com/ClickHouse/ClickHouse/pull/18789) ([Amos Bird](https://github.com/amosbird)).
-* Allow column transformer `EXCEPT` to accept a string as regular expression matcher. This resolves [#18685](https://github.com/ClickHouse/ClickHouse/issues/18685) . [#18699](https://github.com/ClickHouse/ClickHouse/pull/18699) ([Amos Bird](https://github.com/amosbird)).
-* Another fix of using SimpleAggregateFunction in SummingMergeTree. This fixes [#18676](https://github.com/ClickHouse/ClickHouse/issues/18676) . [#18677](https://github.com/ClickHouse/ClickHouse/pull/18677) ([Amos Bird](https://github.com/amosbird)).
-* Fix SimpleAggregateFunction in SummingMergeTree. Now it works like AggregateFunction. In previous versions values were summed together regardless to the aggregate function. This fixes [#18564](https://github.com/ClickHouse/ClickHouse/issues/18564) . [#8052](https://github.com/ClickHouse/ClickHouse/issues/8052). [#18637](https://github.com/ClickHouse/ClickHouse/pull/18637) ([Amos Bird](https://github.com/amosbird)).
-* PODArray: Avoid call to memcpy with (nullptr, 0) arguments (Fix UBSan report). This fixes [#18525](https://github.com/ClickHouse/ClickHouse/issues/18525). [#18526](https://github.com/ClickHouse/ClickHouse/pull/18526) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fixed assertion error inside allocator in case when last argument of function bar is NaN. Now simple ClickHouse's exception is being thrown. This fixes [#17876](https://github.com/ClickHouse/ClickHouse/issues/17876). [#18520](https://github.com/ClickHouse/ClickHouse/pull/18520) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* support syntax `EXISTS DATABASE name`. [#18458](https://github.com/ClickHouse/ClickHouse/pull/18458) ([Du Chuan](https://github.com/spongedu)).
-* Fix bug: no newline after exception message in some tools. [#18444](https://github.com/ClickHouse/ClickHouse/pull/18444) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Add ability to modify primary and partition key column type from `LowCardinality(Type)` to `Type` and vice versa. Also add an ability to modify primary key column type from `EnumX ` to `IntX` type. Fixes [#5604](https://github.com/ClickHouse/ClickHouse/issues/5604). [#18362](https://github.com/ClickHouse/ClickHouse/pull/18362) ([alesapin](https://github.com/alesapin)).
-* Support builtin function `isIPv4String` && `isIPv6String` like [MySQL](https://github.com/ClickHouse/ClickHouse/compare/master...spongedu:support_is_ipv4?expand=1). [#18349](https://github.com/ClickHouse/ClickHouse/pull/18349) ([Du Chuan](https://github.com/spongedu)).
-* Fix potential server crash during Buffer rollback (that is impossible in current ClickHouse version). [#18329](https://github.com/ClickHouse/ClickHouse/pull/18329) ([Azat Khuzhin](https://github.com/azat)).
-* related to [#18133](https://github.com/ClickHouse/ClickHouse/issues/18133). [#18309](https://github.com/ClickHouse/ClickHouse/pull/18309) ([hexiaoting](https://github.com/hexiaoting)).
-* Add a new setting `insert_distributed_one_random_shard = 1` to allow insertion into multi-sharded distributed table without any distributed key. [#18294](https://github.com/ClickHouse/ClickHouse/pull/18294) ([Amos Bird](https://github.com/amosbird)).
-* Allow to parse Array fields from CSV if it is represented as a string containing array that was serialized as nested CSV. Example: `"[""Hello"", ""world"", ""42"""" TV""]"` will parse as `['Hello', 'world', '42" TV']`. Allow to parse array in CSV in a string without enclosing braces. Example: `"'Hello', 'world', '42"" TV'"` will parse as `['Hello', 'world', '42" TV']`. [#18271](https://github.com/ClickHouse/ClickHouse/pull/18271) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Make better adaptive granularity calculation for merge tree wide parts. [#18223](https://github.com/ClickHouse/ClickHouse/pull/18223) ([alesapin](https://github.com/alesapin)).
-* Now clickhouse-install could work on Mac. The problem was that there is no procfs on this platform. [#18201](https://github.com/ClickHouse/ClickHouse/pull/18201) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Better hints for `SHOW ...` query syntax. [#18183](https://github.com/ClickHouse/ClickHouse/pull/18183) ([Du Chuan](https://github.com/spongedu)).
-* Array aggregation `arrayMin`, `arrayMax`, `arraySum`, `arrayAvg` support for `Int128`, `Int256`, `UInt256`. [#18147](https://github.com/ClickHouse/ClickHouse/pull/18147) ([Maksim Kita](https://github.com/kitaisreal)).
-* All queries of type `Decimal * Float` or vice versa are allowed, including aggregate ones (e.g. `SELECT sum(decimal_field * 1.1)` or `SELECT dec_col * float_col`), the result type is Float32 or Float64. [#18145](https://github.com/ClickHouse/ClickHouse/pull/18145) ([Mike](https://github.com/myrrc)).
-* `EXPLAIN AST` now support queries other then `SELECT`. [#18136](https://github.com/ClickHouse/ClickHouse/pull/18136) ([taiyang-li](https://github.com/taiyang-li)).
-* Add `disk` to Set and Join storage settings. [#18112](https://github.com/ClickHouse/ClickHouse/pull/18112) ([Grigory Pervakov](https://github.com/GrigoryPervakov)).
-* Now the table function `merge()` requires the current user to have the `SELECT` privilege on each table it receives data from. This PR fixes [#16964](https://github.com/ClickHouse/ClickHouse/issues/16964). [#18104](https://github.com/ClickHouse/ClickHouse/pull/18104) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Support `SHOW CREATE VIEW name` syntax like [MySQL](https://dev.mysql.com/doc/refman/5.7/en/show-create-view.html). [#18095](https://github.com/ClickHouse/ClickHouse/pull/18095) ([Du Chuan](https://github.com/spongedu)).
-* Fix dead list watches removal for TestKeeperStorage. [#18065](https://github.com/ClickHouse/ClickHouse/pull/18065) ([alesapin](https://github.com/alesapin)).
-* Temporary tables are visible in the system tables `system.tables` and `system.columns` now only in those session where they have been created. The internal database `_temporary_and_external_tables` is now hidden in those system tables; temporary tables are shown as tables with empty database with the `is_temporary` flag set instead. [#18014](https://github.com/ClickHouse/ClickHouse/pull/18014) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix clickhouse-client rendering issue when the size of terminal window changes. [#18009](https://github.com/ClickHouse/ClickHouse/pull/18009) ([Amos Bird](https://github.com/amosbird)).
-* Decrease log verbosity of the events when the client drops the connection from WARNING to INFORMATION. [#18005](https://github.com/ClickHouse/ClickHouse/pull/18005) ([filimonov](https://github.com/filimonov)).
-* Now the table function `merge()` requires the current user to have the `SELECT` privilege on each table it receives data from. This PR fixes [#16964](https://github.com/ClickHouse/ClickHouse/issues/16964). [#17983](https://github.com/ClickHouse/ClickHouse/pull/17983) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Forcibly removing empty or bad metadata files from filesystem for DiskS3. S3 is an experimental feature. [#17935](https://github.com/ClickHouse/ClickHouse/pull/17935) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Adaptive choose of single/multi part upload in WriteBufferFromS3. Single part upload is controlled by a new setting 'max_single_part_upload_size'. [#17934](https://github.com/ClickHouse/ClickHouse/pull/17934) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Ability to set custom metadata when putting S3 object. [#17909](https://github.com/ClickHouse/ClickHouse/pull/17909) ([Pavel Kovalenko](https://github.com/Jokser)).
-* `allow_introspection_functions=0` prohibits usage of introspection functions but doesn't prohibit giving grants for them anymore (the grantee will need to set `allow_introspection_functions=1` for himself to be able to use that grant). Similarly `allow_ddl=0` prohibits usage of DDL commands but doesn't prohibit giving grants for them anymore. [#17908](https://github.com/ClickHouse/ClickHouse/pull/17908) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Support for async tasks in `PipelineExecutor`. Initial support of async sockets for remote queries. [#17868](https://github.com/ClickHouse/ClickHouse/pull/17868) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Hints for column names. [#17112](https://github.com/ClickHouse/ClickHouse/issues/17112). [#17857](https://github.com/ClickHouse/ClickHouse/pull/17857) ([fastio](https://github.com/fastio)).
-* Add diagnostic information when two merge tables try to read each other's data. [#17854](https://github.com/ClickHouse/ClickHouse/pull/17854) ([徐炘](https://github.com/weeds085490)).
-* Add metrics(Parts, PartsActive, PartsInactive) for part number in MergeTree in clickhouse. [#17838](https://github.com/ClickHouse/ClickHouse/pull/17838) ([徐炘](https://github.com/weeds085490)).
-* - Let the possibility to override timeout value for running script using the ClickHouse docker image. [#17818](https://github.com/ClickHouse/ClickHouse/pull/17818) ([Guillaume Tassery](https://github.com/YiuRULE)).
-* Improvement of Web UI: do not add empty query to browser history. [#17770](https://github.com/ClickHouse/ClickHouse/pull/17770) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Improves the path concatenation of zookeeper paths inside DDLWorker. [#17767](https://github.com/ClickHouse/ClickHouse/pull/17767) ([Bharat Nallan](https://github.com/bharatnc)).
-* Check system log tables' engine definition grammatically to prevent some configuration errors. Notes that this grammar check is not semantical, that means such mistakes as non-existent columns / expression functions would be not found out util the table is created. [#17739](https://github.com/ClickHouse/ClickHouse/pull/17739) ([Du Chuan](https://github.com/spongedu)).
-* system.query_log now has extensive information to achieve better query analysis. [#17726](https://github.com/ClickHouse/ClickHouse/pull/17726) ([Amos Bird](https://github.com/amosbird)).
-* Removed exception throwing at table initialization if there was no connection (it will be reconnecting in the background). [#17709](https://github.com/ClickHouse/ClickHouse/pull/17709) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Do not ignore server memory limits during Buffer flush. [#17646](https://github.com/ClickHouse/ClickHouse/pull/17646) ([Azat Khuzhin](https://github.com/azat)).
-* Switch to patched version of RocksDB (from ClickHouse-Extras). [#17643](https://github.com/ClickHouse/ClickHouse/pull/17643) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* This fixes [#17457](https://github.com/ClickHouse/ClickHouse/issues/17457). [#17641](https://github.com/ClickHouse/ClickHouse/pull/17641) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Allow to reload symbols from debug file. This PR also fixes a build-id issue. [#17637](https://github.com/ClickHouse/ClickHouse/pull/17637) ([Amos Bird](https://github.com/amosbird)).
-* Don't throw "Too many parts" error in the middle of INSERT query. [#17566](https://github.com/ClickHouse/ClickHouse/pull/17566) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Allow query parameters in UPDATE statement of ALTER query. Fixes [#10976](https://github.com/ClickHouse/ClickHouse/issues/10976). [#17563](https://github.com/ClickHouse/ClickHouse/pull/17563) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Query obfuscator: avoid usage of some SQL keywords for identifier names. [#17526](https://github.com/ClickHouse/ClickHouse/pull/17526) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Export current max ddl entry executed by DDLWorker. It's useful to check if DDLWorker hangs somewhere. [#17464](https://github.com/ClickHouse/ClickHouse/pull/17464) ([Amos Bird](https://github.com/amosbird)).
-* Export asynchronous metrics of all servers current threads. It's useful to track down issues like https://github.com/ClickHouse-Extras/poco/pull/28. [#17463](https://github.com/ClickHouse/ClickHouse/pull/17463) ([Amos Bird](https://github.com/amosbird)).
-* Return dynamic columns like MATERIALIZED / ALIAS for wildcard query when switches `asterisk_include_materialized_columns` and `asterisk_include_alias_columns` are turned on. [#17462](https://github.com/ClickHouse/ClickHouse/pull/17462) ([Ken Chen](https://github.com/chenziliang)).
-* Add functions countMatches/countMatchesCaseInsensitive. [#17459](https://github.com/ClickHouse/ClickHouse/pull/17459) ([Azat Khuzhin](https://github.com/azat)).
-* Allow specifying [TTL](https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/mergetree/#mergetree-table-ttl) to remove old entries from [system log tables](https://clickhouse.tech/docs/en/operations/system-tables/), using the `<ttl>` attribute in `config.xml`. [#17438](https://github.com/ClickHouse/ClickHouse/pull/17438) ([Du Chuan](https://github.com/spongedu)).
-* Now queries coming to the server via MySQL and PostgreSQL protocols have distinctive interface types (which can be seen in the `interface` column of the table`system.query_log`): `4` for MySQL, and `5` for PostgreSQL, instead of formerly used `1` which is now used for the native protocol only. [#17437](https://github.com/ClickHouse/ClickHouse/pull/17437) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Simplify Sys/V init script. It was not working on Ubuntu 12.04. [#17428](https://github.com/ClickHouse/ClickHouse/pull/17428) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Multiple improvements in `./clickhouse install` script. [#17421](https://github.com/ClickHouse/ClickHouse/pull/17421) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix parsing of SETTINGS clause of the INSERT ... SELECT ... SETTINGS query. [#17414](https://github.com/ClickHouse/ClickHouse/pull/17414) ([Azat Khuzhin](https://github.com/azat)).
-* Replaced `malloc` with `new`, so that the `MemoryTracker` takes this memory into account. [#17412](https://github.com/ClickHouse/ClickHouse/pull/17412) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Add eof check in receiveHello to prevent getting `Attempt to read after eof` exception. [#17365](https://github.com/ClickHouse/ClickHouse/pull/17365) ([Kruglov Pavel](https://github.com/Avogar)).
-* Implement `countSubstrings()`/`countSubstringsCaseInsensitive()`/`countSubstringsCaseInsensitiveUTF8()` (Count the number of substring occurrences). [#17347](https://github.com/ClickHouse/ClickHouse/pull/17347) ([Azat Khuzhin](https://github.com/azat)).
-* Allow to use `optimize_move_to_prewhere` optimization with compact parts, when sizes of columns are unknown. [#17330](https://github.com/ClickHouse/ClickHouse/pull/17330) ([Anton Popov](https://github.com/CurtizJ)).
-* Improved minimal Web UI: add history; add sharing support; avoid race condition of different requests; add request in-flight and ready indicators; add favicon; detect Ctrl+Enter if textarea is not in focus. [#17293](https://github.com/ClickHouse/ClickHouse/pull/17293) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Avoid possible stack overflow in bigint conversion. Big integers are experimental. [#17269](https://github.com/ClickHouse/ClickHouse/pull/17269) ([flynn](https://github.com/ucasFL)).
-* Now set indices will work with `GLOBAL IN`. This fixes [#17232](https://github.com/ClickHouse/ClickHouse/issues/17232) , [#5576](https://github.com/ClickHouse/ClickHouse/issues/5576) . [#17253](https://github.com/ClickHouse/ClickHouse/pull/17253) ([Amos Bird](https://github.com/amosbird)).
-* - Add limit for http redirects in request to S3 storage ('s3_max_redirects'). [#17220](https://github.com/ClickHouse/ClickHouse/pull/17220) ([ianton-ru](https://github.com/ianton-ru)).
-* - Add configuration for multi zookeeper clusters. [#17070](https://github.com/ClickHouse/ClickHouse/pull/17070) ([fastio](https://github.com/fastio)).
-* When `-OrNull` combinator combined `-If`, `-Merge`, `-MergeState`, `-State` combinators, we should put `-OrNull` in front. [#16935](https://github.com/ClickHouse/ClickHouse/pull/16935) ([flynn](https://github.com/ucasFL)).
-* Support HTTP proxy and HTTPS S3 endpoint configuration. [#16861](https://github.com/ClickHouse/ClickHouse/pull/16861) ([Pavel Kovalenko](https://github.com/Jokser)).
-* Added proper authentication using environment, `~/.aws` and `AssumeRole` for S3 client. [#16856](https://github.com/ClickHouse/ClickHouse/pull/16856) ([Vladimir Chebotarev](https://github.com/excitoon)).
-* - New IP Dictionary implementation with lower memory consumption, improved performance for some cases, and fixed bugs. [#16804](https://github.com/ClickHouse/ClickHouse/pull/16804) ([vdimir](https://github.com/vdimir)).
-* Add more OpenTelemetry spans. Add an example of how to export the span data to Zipkin. [#16535](https://github.com/ClickHouse/ClickHouse/pull/16535) ([Alexander Kuzmenkov](https://github.com/akuzm)).
-* - Added `verification_cooldown` parameter in LDAP server connection configuration to allow caching of successful "bind" attempts for configurable period of time. [#15988](https://github.com/ClickHouse/ClickHouse/pull/15988) ([Denis Glazachev](https://github.com/traceon)).
-* Avoid deadlock when executing INSERT SELECT into itself from a table with `TinyLog` or `Log` table engines. This closes [#6802](https://github.com/ClickHouse/ClickHouse/issues/6802). This closes [#18691](https://github.com/ClickHouse/ClickHouse/issues/18691). This closes [#16812](https://github.com/ClickHouse/ClickHouse/issues/16812). This closes [#14570](https://github.com/ClickHouse/ClickHouse/issues/14570). [#15260](https://github.com/ClickHouse/ClickHouse/pull/15260) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* fix [#9117](https://github.com/ClickHouse/ClickHouse/issues/9117). [#15127](https://github.com/ClickHouse/ClickHouse/pull/15127) ([flynn](https://github.com/ucasFL)).
-* * Completely eliminate callbacks and locks for acquiring them. * Keys are not divided into "not found" and "expired", but stored in the same map during query. [#14958](https://github.com/ClickHouse/ClickHouse/pull/14958) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Allow using `Atomic` engine for nested database of `MaterializeMySQL` engine. [#14849](https://github.com/ClickHouse/ClickHouse/pull/14849) ([tavplubix](https://github.com/tavplubix)).
-* Implement new parser based on ANTLR4 runtime and generated from EBNF grammar. [#11298](https://github.com/ClickHouse/ClickHouse/pull/11298) ([Ivan](https://github.com/abyss7)).
-
-#### Performance Improvement
-
-* Add `--no-system-table` option for `clickhouse-local` to run without system tables. This avoids initialization of `DateLUT` that may take noticeable amount of time (tens of milliseconds) at startup. [#18899](https://github.com/ClickHouse/ClickHouse/pull/18899) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Replace `PODArray` with `PODArrayWithStackMemory` in `AggregateFunctionWindowFunnelData` to improvement `windowFunnel` function performance. [#18817](https://github.com/ClickHouse/ClickHouse/pull/18817) ([flynn](https://github.com/ucasFL)).
-* Don't send empty blocks to shards on synchronous INSERT into Distributed table. This closes [#14571](https://github.com/ClickHouse/ClickHouse/issues/14571). [#18775](https://github.com/ClickHouse/ClickHouse/pull/18775) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Optimized read for StorageMemory. [#18052](https://github.com/ClickHouse/ClickHouse/pull/18052) ([Maksim Kita](https://github.com/kitaisreal)).
-* Using dragonbox algorithm for float to string conversion instead of ryu. [#17831](https://github.com/ClickHouse/ClickHouse/pull/17831) ([Maksim Kita](https://github.com/kitaisreal)).
-* Speedup `IPv6CIDRToRange` implementation. [#17569](https://github.com/ClickHouse/ClickHouse/pull/17569) ([vdimir](https://github.com/vdimir)).
-* Add `remerge_sort_lowered_memory_bytes_ratio` setting (If memory usage after remerge does not reduced by this ratio, remerge will be disabled). [#17539](https://github.com/ClickHouse/ClickHouse/pull/17539) ([Azat Khuzhin](https://github.com/azat)).
-* Improve performance of AggregatingMergeTree w/ SimpleAggregateFunction(String) in PK. [#17109](https://github.com/ClickHouse/ClickHouse/pull/17109) ([Azat Khuzhin](https://github.com/azat)).
-* Now the `-If` combinator is devirtualized, and `count` is properly vectorized. This is for https://github.com/ClickHouse/ClickHouse/pull/17041. [#17043](https://github.com/ClickHouse/ClickHouse/pull/17043) ([Amos Bird](https://github.com/amosbird)).
-* Fix performance of reading from `Merge` tables over huge number of `MergeTree` tables. Fixes [#7748](https://github.com/ClickHouse/ClickHouse/issues/7748). [#16988](https://github.com/ClickHouse/ClickHouse/pull/16988) ([Anton Popov](https://github.com/CurtizJ)).
-* Improved performance of function `repeat`. [#16937](https://github.com/ClickHouse/ClickHouse/pull/16937) ([satanson](https://github.com/satanson)).
-* Slightly improved performance of float parsing. [#16809](https://github.com/ClickHouse/ClickHouse/pull/16809) ([Maksim Kita](https://github.com/kitaisreal)).
-* Add possibility to skip merged partitions for OPTIMIZE TABLE ... FINAL. [#15939](https://github.com/ClickHouse/ClickHouse/pull/15939) ([Kruglov Pavel](https://github.com/Avogar)).
 
 #### Build/Testing/Packaging Improvement
 
-* Add `SYSTEM SUSPEND` command for fault injection. It can be used to faciliate failover tests. This closes [#15979](https://github.com/ClickHouse/ClickHouse/issues/15979). [#18850](https://github.com/ClickHouse/ClickHouse/pull/18850) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Removed the -finline-hint-functions flag not present in GCC. [#18846](https://github.com/ClickHouse/ClickHouse/pull/18846) ([Mike](https://github.com/myrrc)).
 * Add simple integrity check for ClickHouse binary. It allows to detect corruption due to faulty hardware (bit rot on storage media or bit flips in RAM). [#18811](https://github.com/ClickHouse/ClickHouse/pull/18811) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Change `OpenSSL` to `BoringSSL`. It allows to avoid issues with sanitizers. This fixes [#12490](https://github.com/ClickHouse/ClickHouse/issues/12490). This fixes [#17502](https://github.com/ClickHouse/ClickHouse/issues/17502). This fixes [#12952](https://github.com/ClickHouse/ClickHouse/issues/12952). [#18129](https://github.com/ClickHouse/ClickHouse/pull/18129) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Simplify `Sys/V` init script. It was not working on Ubuntu 12.04 or older. [#17428](https://github.com/ClickHouse/ClickHouse/pull/17428) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Multiple improvements in `./clickhouse install` script. [#17421](https://github.com/ClickHouse/ClickHouse/pull/17421) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Now ClickHouse can pretend to be a fake ZooKeeper. Currently, storage implementation is just stored in-memory hash-table, and server partially support ZooKeeper protocol. [#16877](https://github.com/ClickHouse/ClickHouse/pull/16877) ([alesapin](https://github.com/alesapin)).
+* Fix dead list watches removal for TestKeeperStorage (a mock for ZooKeeper). [#18065](https://github.com/ClickHouse/ClickHouse/pull/18065) ([alesapin](https://github.com/alesapin)).
+* Add `SYSTEM SUSPEND` command for fault injection. It can be used to faciliate failover tests. This closes [#15979](https://github.com/ClickHouse/ClickHouse/issues/15979). [#18850](https://github.com/ClickHouse/ClickHouse/pull/18850) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Generate build id when ClickHouse is linked with `lld`. It's appeared that `lld` does not generate it by default on my machine. Build id is used for crash reports and introspection. [#18808](https://github.com/ClickHouse/ClickHouse/pull/18808) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* TestFlows: fixes to LDAP tests that fail due to slow test execution. [#18790](https://github.com/ClickHouse/ClickHouse/pull/18790) ([vzakaznikov](https://github.com/vzakaznikov)).
 * Fix shellcheck errors in style check. [#18566](https://github.com/ClickHouse/ClickHouse/pull/18566) ([Ilya Yatsishin](https://github.com/qoega)).
 * Update timezones info to 2020e. [#18531](https://github.com/ClickHouse/ClickHouse/pull/18531) ([alesapin](https://github.com/alesapin)).
 * Fix codespell warnings. Split style checks into separate parts. Update style checks docker image. [#18463](https://github.com/ClickHouse/ClickHouse/pull/18463) ([Ilya Yatsishin](https://github.com/qoega)).
-* Check for leftovers of conflict markers in docs. [#18332](https://github.com/ClickHouse/ClickHouse/pull/18332) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Automated check for leftovers of conflict markers in docs. [#18332](https://github.com/ClickHouse/ClickHouse/pull/18332) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Enable Thread Fuzzer for stateless tests flaky check. [#18299](https://github.com/ClickHouse/ClickHouse/pull/18299) ([alesapin](https://github.com/alesapin)).
-* Merging requirements for AES encryption functions. Updating aes_encryption tests to use new requirements. Updating TestFlows version to 1.6.72. [#18221](https://github.com/ClickHouse/ClickHouse/pull/18221) ([vzakaznikov](https://github.com/vzakaznikov)).
-* - Updating TestFlows version to the latest 1.6.72 - Re-generating requirements.py. [#18208](https://github.com/ClickHouse/ClickHouse/pull/18208) ([vzakaznikov](https://github.com/vzakaznikov)).
 * Do not use non thread-safe function `strerror`. [#18204](https://github.com/ClickHouse/ClickHouse/pull/18204) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Update `anchore/scan-action@main` workflow action (was moved from master). [#18192](https://github.com/ClickHouse/ClickHouse/pull/18192) ([Stig Bakken](https://github.com/stigsb)).
-* Fix usage of uninitialized value in function toModifiedJulianDayOrNull, reported by MSan. Was discovered [here](https://github.com/ClickHouse/ClickHouse/pull/17726#issuecomment-744050500). [#18172](https://github.com/ClickHouse/ClickHouse/pull/18172) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Change OpenSSL to BoringSSL. It allows to avoid issues with sanitizers. This fixes [#12490](https://github.com/ClickHouse/ClickHouse/issues/12490). This fixes [#17502](https://github.com/ClickHouse/ClickHouse/issues/17502). This fixes [#12952](https://github.com/ClickHouse/ClickHouse/issues/12952). [#18129](https://github.com/ClickHouse/ClickHouse/pull/18129) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Now, `clickhouse-test` DROP/CREATE databases with a timeout. [#18098](https://github.com/ClickHouse/ClickHouse/pull/18098) ([alesapin](https://github.com/alesapin)).
-* Adjusting timeouts a bit, in the good hope that it will prevent flakiness of the test. [#18000](https://github.com/ClickHouse/ClickHouse/pull/18000) ([filimonov](https://github.com/filimonov)).
-* Enable Pytest framework for stateless tests. [#17902](https://github.com/ClickHouse/ClickHouse/pull/17902) ([Ivan](https://github.com/abyss7)).
-* Add our own CMakeList for dragonbox which was added in [#17831](https://github.com/ClickHouse/ClickHouse/issues/17831). [#17869](https://github.com/ClickHouse/ClickHouse/pull/17869) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Updating TestFlows README.md to include "How To Debug Why Test Failed" section. [#17808](https://github.com/ClickHouse/ClickHouse/pull/17808) ([vzakaznikov](https://github.com/vzakaznikov)).
-* - Testflows tests for RBAC [ACCESS MANAGEMENT](https://clickhouse.tech/docs/en/sql-reference/statements/grant/#grant-access-management) privileges. [#17804](https://github.com/ClickHouse/ClickHouse/pull/17804) ([MyroTk](https://github.com/MyroTk)).
+* Update `anchore/scan-action@main` workflow action (was moved from `master` to `main`). [#18192](https://github.com/ClickHouse/ClickHouse/pull/18192) ([Stig Bakken](https://github.com/stigsb)).
+* Now `clickhouse-test` does DROP/CREATE databases with a timeout. [#18098](https://github.com/ClickHouse/ClickHouse/pull/18098) ([alesapin](https://github.com/alesapin)).
+* Enable experimental support for Pytest framework for stateless tests. [#17902](https://github.com/ClickHouse/ClickHouse/pull/17902) ([Ivan](https://github.com/abyss7)).
 * Now we use the fresh docker daemon version in integration tests. [#17671](https://github.com/ClickHouse/ClickHouse/pull/17671) ([alesapin](https://github.com/alesapin)).
-* - RBAC testflows tests for SHOW, TRUNCATE, KILL, and OPTIMIZE. - Updates to old tests. - Resolved comments from #https://github.com/ClickHouse/ClickHouse/pull/16977. [#17657](https://github.com/ClickHouse/ClickHouse/pull/17657) ([MyroTk](https://github.com/MyroTk)).
-* Add an integration test: ClickHouse killed while insert for MaterializeMySQL ENGINE. [#17622](https://github.com/ClickHouse/ClickHouse/pull/17622) ([TCeason](https://github.com/TCeason)).
-* Add an integration test: MySQL server killed while insert for MaterializeMySQL Engine. [#17614](https://github.com/ClickHouse/ClickHouse/pull/17614) ([TCeason](https://github.com/TCeason)).
 * Send info about official build, memory, cpu and free disk space to Sentry if it is enabled. Sentry is opt-in feature to help ClickHouse developers. This closes [#17279](https://github.com/ClickHouse/ClickHouse/issues/17279). [#17543](https://github.com/ClickHouse/ClickHouse/pull/17543) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* There was an uninitialized variable in the code of Copier. [#17363](https://github.com/ClickHouse/ClickHouse/pull/17363) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* `PODArray` does not initialize "new" elements when resizing, unlike `std::vector`. This probably fixes [this failure](https://clickhouse-test-reports.s3.yandex.net/17309/065cd002578f2e8228f12a2744bd40c970065e0c/stress_test_(memory)/stderr.log) from [#17309](https://github.com/ClickHouse/ClickHouse/issues/17309). [#17344](https://github.com/ClickHouse/ClickHouse/pull/17344) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* * Added RBAC tests for `ATTACH`, `CREATE`, `DROP`, and `DETACH`. [#16977](https://github.com/ClickHouse/ClickHouse/pull/16977) ([MyroTk](https://github.com/MyroTk)).
-* Now ClickHouse can pretend to be a fake ZooKeeper. Currently, storage implementation is just stored in-memory hash-table, and server partially support ZooKeeper protocol. [#16877](https://github.com/ClickHouse/ClickHouse/pull/16877) ([alesapin](https://github.com/alesapin)).
-* Add some test for MaterializeMySQL. e.g. network partition, MySQL kill sync thread... [#16806](https://github.com/ClickHouse/ClickHouse/pull/16806) ([TCeason](https://github.com/TCeason)).
-* ... Detailed description / Documentation draft: ClickHouse-Extras repo contains fix for the issue with ipv6 in Arrow Flight library. See https://github.com/ClickHouse/ClickHouse/pull/16243#issuecomment-720830294 for details. [#16664](https://github.com/ClickHouse/ClickHouse/pull/16664) ([Zhanna](https://github.com/FawnD2)).
+* There was an uninitialized variable in the code of clickhouse-copier. [#17363](https://github.com/ClickHouse/ClickHouse/pull/17363) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fix [one MSan report](https://clickhouse-test-reports.s3.yandex.net/17309/065cd002578f2e8228f12a2744bd40c970065e0c/stress_test_(memory)/stderr.log) from [#17309](https://github.com/ClickHouse/ClickHouse/issues/17309). [#17344](https://github.com/ClickHouse/ClickHouse/pull/17344) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fix for the issue with IPv6 in Arrow Flight library. See [the comments](https://github.com/ClickHouse/ClickHouse/pull/16243#issuecomment-720830294) for details. [#16664](https://github.com/ClickHouse/ClickHouse/pull/16664) ([Zhanna](https://github.com/FawnD2)).
 * Add a library that replaces some `libc` functions to traps that will terminate the process. [#16366](https://github.com/ClickHouse/ClickHouse/pull/16366) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Provide diagnostics in server logs in case of stack overflow, send error message to clickhouse-client. This closes [#14840](https://github.com/ClickHouse/ClickHouse/issues/14840). [#16346](https://github.com/ClickHouse/ClickHouse/pull/16346) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Now we can run almost all stateless functional tests in parallel. [#15236](https://github.com/ClickHouse/ClickHouse/pull/15236) ([alesapin](https://github.com/alesapin)).
+* Fix corruption in `librdkafka` snappy decompression (was a problem only for gcc10 builds, but official builds uses clang already, so at least recent official releases are not affected). [#18053](https://github.com/ClickHouse/ClickHouse/pull/18053) ([Azat Khuzhin](https://github.com/azat)).
 * If server was terminated by OOM killer, print message in log. [#13516](https://github.com/ClickHouse/ClickHouse/pull/13516) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* PODArray: Avoid call to memcpy with (nullptr, 0) arguments (Fix UBSan report). This fixes [#18525](https://github.com/ClickHouse/ClickHouse/issues/18525). [#18526](https://github.com/ClickHouse/ClickHouse/pull/18526) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Minor improvement for path concatenation of zookeeper paths inside DDLWorker. [#17767](https://github.com/ClickHouse/ClickHouse/pull/17767) ([Bharat Nallan](https://github.com/bharatnc)).
+* Allow to reload symbols from debug file. This PR also fixes a build-id issue. [#17637](https://github.com/ClickHouse/ClickHouse/pull/17637) ([Amos Bird](https://github.com/amosbird)).
+* TestFlows: fixes to LDAP tests that fail due to slow test execution. [#18790](https://github.com/ClickHouse/ClickHouse/pull/18790) ([vzakaznikov](https://github.com/vzakaznikov)).
+* TestFlows: Merging requirements for AES encryption functions. Updating aes_encryption tests to use new requirements. Updating TestFlows version to 1.6.72. [#18221](https://github.com/ClickHouse/ClickHouse/pull/18221) ([vzakaznikov](https://github.com/vzakaznikov)).
+* TestFlows: Updating TestFlows version to the latest 1.6.72. Re-generating requirements.py. [#18208](https://github.com/ClickHouse/ClickHouse/pull/18208) ([vzakaznikov](https://github.com/vzakaznikov)).
+* TestFlows: Updating TestFlows README.md to include "How To Debug Why Test Failed" section. [#17808](https://github.com/ClickHouse/ClickHouse/pull/17808) ([vzakaznikov](https://github.com/vzakaznikov)).
+* TestFlows: tests for RBAC [ACCESS MANAGEMENT](https://clickhouse.tech/docs/en/sql-reference/statements/grant/#grant-access-management) privileges. [#17804](https://github.com/ClickHouse/ClickHouse/pull/17804) ([MyroTk](https://github.com/MyroTk)).
+* TestFlows: RBAC tests for SHOW, TRUNCATE, KILL, and OPTIMIZE. - Updates to old tests. - Resolved comments from #https://github.com/ClickHouse/ClickHouse/pull/16977. [#17657](https://github.com/ClickHouse/ClickHouse/pull/17657) ([MyroTk](https://github.com/MyroTk)).
+* TestFlows: Added RBAC tests for `ATTACH`, `CREATE`, `DROP`, and `DETACH`. [#16977](https://github.com/ClickHouse/ClickHouse/pull/16977) ([MyroTk](https://github.com/MyroTk)).
 
-#### NO CL ENTRY
 
-* NO CL ENTRY:  'Revert "Add metrics for part number in MergeTree in ClickHouse"'. [#18834](https://github.com/ClickHouse/ClickHouse/pull/18834) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* NO CL ENTRY:  'Fix typo in array functions' documentation'. [#18792](https://github.com/ClickHouse/ClickHouse/pull/18792) ([Bertrand Junqua](https://github.com/Bertrand31)).
-* NO CL ENTRY:  'Revert "Add some extra tests to copier"'. [#18636](https://github.com/ClickHouse/ClickHouse/pull/18636) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* NO CL ENTRY:  'Revert "Fix access rights required for the merge() table function."'. [#18103](https://github.com/ClickHouse/ClickHouse/pull/18103) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* NO CL ENTRY:  'Исправил опечатку в названии ОС RedHad->RedHat'. [#18028](https://github.com/ClickHouse/ClickHouse/pull/18028) ([Erixonich](https://github.com/Erixonich)).
-* NO CL ENTRY:  'Revert "Date vs DateTime64 comparison"'. [#17985](https://github.com/ClickHouse/ClickHouse/pull/17985) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* NO CL ENTRY:  'Revert "Fix index granularity calculation on block borders"'. [#17918](https://github.com/ClickHouse/ClickHouse/pull/17918) ([alesapin](https://github.com/alesapin)).
-* NO CL ENTRY:  'Update README.md'. [#17596](https://github.com/ClickHouse/ClickHouse/pull/17596) ([Robert Hodges](https://github.com/hodgesrm)).
-* NO CL ENTRY:  'Revert "Bump mkdocs-macros-plugin from 0.4.20 to 0.5.0 in /docs/tools"'. [#17405](https://github.com/ClickHouse/ClickHouse/pull/17405) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* NO CL ENTRY:  'Revert "Attempt to fix Stress test (MSan)"'. [#17372](https://github.com/ClickHouse/ClickHouse/pull/17372) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+## [Changelog for 2020](https://github.com/ClickHouse/ClickHouse/blob/master/docs/en/whats-new/changelog/2020.md)
diff --git a/utils/simple-backport/format-changelog.py b/utils/simple-backport/format-changelog.py
index 861faafdcfd..56fe973eb6f 100755
--- a/utils/simple-backport/format-changelog.py
+++ b/utils/simple-backport/format-changelog.py
@@ -78,7 +78,7 @@ def parse_one_pull_request(item):
 # This array gives the preferred category order, and is also used to
 # normalize category names.
 categories_preferred_order = ['Backward Incompatible Change',
-    'New Feature', 'Bug Fix', 'Improvement', 'Performance Improvement',
+    'New Feature', 'Performance Improvement', 'Improvement', 'Bug Fix',
     'Build/Testing/Packaging Improvement', 'Other']
 
 category_to_pr = collections.defaultdict(lambda: [])

From 9a4f34959c0ce746f00e8ca26e00e803c939ffc3 Mon Sep 17 00:00:00 2001
From: Mikhail Filimonov <mfilimonov@altinity.com>
Date: Mon, 18 Jan 2021 19:15:57 +0100
Subject: [PATCH 140/611] Try clickhouse/v1.6.0-RC2

---
 contrib/librdkafka | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/librdkafka b/contrib/librdkafka
index 7074c7dcd01..cf11d0aa36d 160000
--- a/contrib/librdkafka
+++ b/contrib/librdkafka
@@ -1 +1 @@
-Subproject commit 7074c7dcd01b22765314dce6a6d69d92926d2a2a
+Subproject commit cf11d0aa36d4738f2c9bf4377807661660f1be76

From eabc90075c8dcac1502b1a8f06c760c805f27385 Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Mon, 18 Jan 2021 21:57:45 +0300
Subject: [PATCH 141/611] Update run-fuzzer.sh

---
 docker/test/fuzzer/run-fuzzer.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index 5e9286ac61e..fe77aa56057 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -22,6 +22,7 @@ function clone
     git init
     git remote add origin https://github.com/ClickHouse/ClickHouse
     git fetch --depth=1 origin "$SHA_TO_TEST"
+    git fetch --depth=1 origin master # Used to obtain the list of modified or added tests
 
     # If not master, try to fetch pull/.../{head,merge}
     if [ "$PR_TO_TEST" != "0" ]

From 31a40880b4ffc9f37aa1f52f5ddec347f8baa604 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Mon, 18 Jan 2021 22:56:34 +0300
Subject: [PATCH 142/611] Update tryLiftUpArrayJoin

---
 src/Interpreters/ActionsDAG.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index 65241e1b5a3..88aaa5ba7b7 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -1066,7 +1066,10 @@ std::pair<ActionsDAGPtr, ActionsDAGPtr>  ActionsDAG::splitActionsBeforeArrayJoin
         }
     }
 
-    return split(split_nodes);
+    auto res = split(split_nodes);
+    /// Do not remove array joined columns if they are not used.
+    res.first->settings.project_input = false;
+    return res;
 }
 
 }

From 60584362e73c4b401d8265a1d4fa1cfea0324a74 Mon Sep 17 00:00:00 2001
From: George <gyuton@yandex-team.ru>
Date: Mon, 18 Jan 2021 22:57:13 +0300
Subject: [PATCH 143/611] Fixed typo

---
 docs/ru/operations/utilities/clickhouse-benchmark.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/operations/utilities/clickhouse-benchmark.md b/docs/ru/operations/utilities/clickhouse-benchmark.md
index 392ed859d58..4579418b63a 100644
--- a/docs/ru/operations/utilities/clickhouse-benchmark.md
+++ b/docs/ru/operations/utilities/clickhouse-benchmark.md
@@ -47,7 +47,7 @@ clickhouse-benchmark [keys] < queries_file;
 -   `-p N`, `--port=N` — порт сервера. Значение по умолчанию: 9000. Для [сравнительного режима](#clickhouse-benchmark-comparison-mode) можно использовать несколько `-p` ключей. 
 -   `-i N`, `--iterations=N` — общее число запросов. Значение по умолчанию: 0 (вечно будет повторяться).
 -   `-r`, `--randomize` — случайный порядок выполнения запросов при наличии более одного входного запроса.
--   `-s`, `--secure` — используется `TLS` соединения.
+-   `-s`, `--secure` — используется `TLS` соединение.
 -   `-t N`, `--timelimit=N` — лимит по времени в секундах. `clickhouse-benchmark` перестает отправлять запросы при достижении лимита по времени. Значение по умолчанию: 0 (лимит отключен).
 -   `--confidence=N` — уровень доверия для  T-критерия. Возможные значения: 0 (80%), 1 (90%), 2 (95%), 3 (98%), 4 (99%), 5 (99.5%). Значение по умолчанию: 5. В [сравнительном режиме](#clickhouse-benchmark-comparison-mode) `clickhouse-benchmark` проверяет [двухвыборочный  t-критерий Стьюдента для независимых выборок](https://en.wikipedia.org/wiki/Student%27s_t-test#Independent_two-sample_t-test) чтобы определить, различны ли две выборки при выбранном уровне доверия.
 -   `--cumulative` — выводит совокупность данных, а не данные за интервал.

From 154ac66ecedb3bb9b94505d334afce8033d9d6ce Mon Sep 17 00:00:00 2001
From: Denny Crane <deniszhuravlov@gmail.com>
Date: Mon, 18 Jan 2021 16:07:15 -0400
Subject: [PATCH 144/611] Update merge-tree-settings.md

---
 docs/en/operations/settings/merge-tree-settings.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/en/operations/settings/merge-tree-settings.md b/docs/en/operations/settings/merge-tree-settings.md
index c5ec8f7f0dd..aa2c575628b 100644
--- a/docs/en/operations/settings/merge-tree-settings.md
+++ b/docs/en/operations/settings/merge-tree-settings.md
@@ -35,7 +35,7 @@ If the number of active parts in a single partition exceeds the `parts_to_throw_
 
 Possible values:
 
--   Positive integer.
+-   Any positive integer.
 
 Default value: 300.
 
@@ -50,7 +50,7 @@ If the number of active parts in a single partition exceeds the `parts_to_delay_
 
 Possible values:
 
--   Positive integer.
+-   Any positive integer.
 
 Default value: 150.
 
@@ -62,7 +62,7 @@ The value in seconds, which is used to calculate the `INSERT` delay, if the numb
 
 Possible values:
 
--   Positive integer.
+-   Any positive integer.
 
 Default value: 1.
 
@@ -82,7 +82,7 @@ If the total number of active parts in all partitions of a table exceeds the `ma
 
 Possible values:
 
--   Positive integer.
+-   Any positive integer.
 
 Default value: 100000.
 
@@ -95,6 +95,7 @@ The number of most recently inserted blocks for which Zookeeper stores hashes to
 Possible values:
 
 -   Any positive integer.
+-   0 (disable deduplication)
 
 Default value: 100.
 
@@ -160,7 +161,7 @@ Possible values:
 Default value: 1048576 (1 MB)
 
 `max_bytes_to_merge_at_min_space_in_pool` defines the maximum total size of parts which can be merged despite the lack of available disk space (in pool). This is necessary to reduce the number of small parts and the chance of `Too many parts` errors.
-Merges book disk space by doubling the total merged parts sizes. Thus, with a small amount of free disk space, a situation may happen that there is free space, but this space is already booked by ongoing merges, so other merges unable to start, and the number of small parts grows with every insert.
+Merges book disk space by doubling the total merged parts sizes. Thus, with a small amount of free disk space, a situation may happen that there is free space, but this space is already booked by ongoing large merges, so other merges unable to start, and the number of small parts grows with every insert.
 
 ## merge_max_block_size {#merge-max-block-size}
 

From db7b477270f386bbf150616409ecb08b9c322a8b Mon Sep 17 00:00:00 2001
From: Denny Crane <deniszhuravlov@gmail.com>
Date: Mon, 18 Jan 2021 16:14:25 -0400
Subject: [PATCH 145/611] Update merge-tree-settings.md

---
 docs/en/operations/settings/merge-tree-settings.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/en/operations/settings/merge-tree-settings.md b/docs/en/operations/settings/merge-tree-settings.md
index aa2c575628b..e0f7c79dcab 100644
--- a/docs/en/operations/settings/merge-tree-settings.md
+++ b/docs/en/operations/settings/merge-tree-settings.md
@@ -90,7 +90,7 @@ A large number of parts in a table reduces performance of ClickHouse queries and
 
 ## replicated_deduplication_window {#replicated-deduplication-window}
 
-The number of most recently inserted blocks for which Zookeeper stores hashes to check for duplicates.
+The number of most recently inserted blocks for which Zookeeper stores hash sums to check for duplicates.
 
 Possible values:
 
@@ -99,7 +99,7 @@ Possible values:
 
 Default value: 100.
 
-The `Insert` command creates one or more blocks (parts). When inserting into Replicated tables, ClickHouse for [insert deduplication](../../engines/table-engines/mergetree-family/replication/) writes the hash-sums of the created parts into Zookeeper. Hash sums are stored only for the most recent `replicated_deduplication_window` blocks. The oldest hash sums are removed from Zookeeper.
+The `Insert` command creates one or more blocks (parts). When inserting into Replicated tables, ClickHouse for [insert deduplication](../../engines/table-engines/mergetree-family/replication/) writes the hash sums of the created parts into Zookeeper. Hash sums are stored only for the most recent `replicated_deduplication_window` blocks. The oldest hash sums are removed from Zookeeper.
 A large number of `replicated_deduplication_window` slows down `Inserts` because it needs to compare more entries.
 The hash sum is calculated from the composition of the field names and types and the data of the inserted part (stream of bytes).
 
@@ -113,7 +113,7 @@ Possible values:
 
 Default value: 604800 (1 week).
 
-Similar to [replicated_deduplication_window](#replicated-deduplication-window), `replicated_deduplication_window_seconds` specifies how long to store hash-sums of blocks for insert deduplication. Hashes older than `replicated_deduplication_window_seconds` are removed from Zookeeper, even if they are less than ` replicated_deduplication_window`.
+Similar to [replicated_deduplication_window](#replicated-deduplication-window), `replicated_deduplication_window_seconds` specifies how long to store hash sums of blocks for insert deduplication. Hash sums older than `replicated_deduplication_window_seconds` are removed from Zookeeper, even if they are less than ` replicated_deduplication_window`.
 
 ## old_parts_lifetime {#old-parts-lifetime}
 
@@ -173,7 +173,7 @@ Possible values:
 
 Default value: 8192
 
-Merge reads rows from parts in blocks of `merge_max_block_size` rows, then merges and writes the result into a new part. The read block is placed in RAM, so `merge_max_block_size` affects the size of the RAM required for the merge. Thus, merges can consume a large amount of RAM for tables with very wide rows (if the average row size is 100kb, then when merging 10 parts, (100kb * 10 * 8192) = ~ 8GB of RAM). By decreasing `merge_max_block_size`, you can reduce the amount of RAM required for a merge.
+Merge reads rows from parts in blocks of `merge_max_block_size` rows, then merges and writes the result into a new part. The read block is placed in RAM, so `merge_max_block_size` affects the size of the RAM required for the merge. Thus, merges can consume a large amount of RAM for tables with very wide rows (if the average row size is 100kb, then when merging 10 parts, (100kb * 10 * 8192) = ~ 8GB of RAM). By decreasing `merge_max_block_size`, you can reduce the amount of RAM required for a merge but slow down a merge.
 
 ## max_part_loading_threads {#max-part-loading-threads}
 

From c1b35da714c9f0373dad04cc2ec8446ce0907831 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Mon, 18 Jan 2021 20:15:58 +0300
Subject: [PATCH 146/611] old flaky test

---
 .../0_stateless/01531_query_log_query_comment.sql    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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 81348c53589..2e1faf1b9e4 100644
--- a/tests/queries/0_stateless/01531_query_log_query_comment.sql
+++ b/tests/queries/0_stateless/01531_query_log_query_comment.sql
@@ -4,9 +4,17 @@ set log_queries_min_type='QUERY_FINISH';
 set enable_global_with_statement=1;
 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%';
+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%'
+    and current_database = currentDatabase()
+    ;
 
 set enable_global_with_statement=1;
 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%';
+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%'
+    and current_database = currentDatabase()
+    ;

From ccd401289cc799741fb92c785e162e9e11de2f7b Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Mon, 18 Jan 2021 23:23:39 +0300
Subject: [PATCH 147/611] ya.make

---
 src/Interpreters/ya.make | 2 +-
 src/Parsers/ya.make      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Interpreters/ya.make b/src/Interpreters/ya.make
index d6671b0973c..77ca6bc0e14 100644
--- a/src/Interpreters/ya.make
+++ b/src/Interpreters/ya.make
@@ -158,8 +158,8 @@ SRCS(
     interpretSubquery.cpp
     join_common.cpp
     loadMetadata.cpp
-    replaceAliasColumnsInQuery.cpp
     processColumnTransformers.cpp
+    replaceAliasColumnsInQuery.cpp
     sortBlock.cpp
 
 )
diff --git a/src/Parsers/ya.make b/src/Parsers/ya.make
index 3305da3a4d0..4bd31cb79de 100644
--- a/src/Parsers/ya.make
+++ b/src/Parsers/ya.make
@@ -60,6 +60,7 @@ SRCS(
     ASTTTLElement.cpp
     ASTTablesInSelectQuery.cpp
     ASTUserNameWithHost.cpp
+    ASTWindowDefinition.cpp
     ASTWithAlias.cpp
     ASTWithElement.cpp
     CommonParsers.cpp

From 157e42a5b25023b8d60e008950050d16c27f89a4 Mon Sep 17 00:00:00 2001
From: Dmitriy <sevirov@yandex-team.ru>
Date: Mon, 18 Jan 2021 23:32:57 +0300
Subject: [PATCH 148/611] Fix the link
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Исправил ссылку.
---
 docs/ru/interfaces/formats.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/interfaces/formats.md b/docs/ru/interfaces/formats.md
index 97b72f79c86..d767ceb2b8d 100644
--- a/docs/ru/interfaces/formats.md
+++ b/docs/ru/interfaces/formats.md
@@ -495,7 +495,7 @@ ClickHouse поддерживает [NULL](../sql-reference/syntax.md), кото
 
 В этом формате один объект JSON интерпретируется как одно значение. Если входные данные имеют несколько объектов JSON, разделенных запятой, то они будут интерпретироваться как отдельные строки.
 
-В этом формате парситься может только таблица с единственным полем типа [String](../sql-reference/data-types/string.md). Остальные столбцы должны быть заданы как [DEFAULT](../sql-reference/statements/create/table.md#create-default-values) или [MATERIALIZED](../sql-reference/statements/create/table.md#create-default-values), либо отсутствовать. Как только вы соберете весь объект JSON в строку, для его обработки вы можете использовать [функции для работы с JSON](../sql-reference/functions/json-functions.md).
+В этом формате парситься может только таблица с единственным полем типа [String](../sql-reference/data-types/string.md). Остальные столбцы должны быть заданы как `DEFAULT` или `MATERIALIZED`(смотрите раздел [Значения по умолчанию](../sql-reference/statements/create/table.md#create-default-values)), либо отсутствовать. Как только вы соберете весь объект JSON в строку, для его обработки вы можете использовать [функции для работы с JSON](../sql-reference/functions/json-functions.md).
 
 **Пример**
 

From d914bf9552fd9aa265097a49009ce70e8785c881 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Mon, 18 Jan 2021 23:34:46 +0300
Subject: [PATCH 149/611] Update tryLiftUpArrayJoin

---
 src/Interpreters/ActionsDAG.cpp | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index 88aaa5ba7b7..d005e070f7f 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -923,22 +923,12 @@ std::pair<ActionsDAGPtr, ActionsDAGPtr> ActionsDAG::split(std::unordered_set<con
                                 input_node.result_name = child->result_name;
                                 child_data.to_second = &second_nodes.emplace_back(std::move(input_node));
 
-                                /// If it is already an input, it was created by other branch.
-                                assert(child->type != ActionType::INPUT);
                                 new_inputs.push_back(child);
                             }
                         }
 
                         child = child_data.to_second;
                     }
-
-                    /// Every input should be in both DAGs.
-                    if (copy.type == ActionType::INPUT)
-                    {
-                        auto & input_copy = first_nodes.emplace_back(*cur.node);
-                        assert(cur_data.to_first == nullptr);
-                        cur_data.to_first = &input_copy;
-                    }
                 }
                 else
                 {
@@ -952,7 +942,7 @@ std::pair<ActionsDAGPtr, ActionsDAGPtr> ActionsDAG::split(std::unordered_set<con
                         assert(child != nullptr);
                     }
 
-                    if (cur_data.used_in_result || copy.type == ActionType::INPUT)
+                    if (cur_data.used_in_result)
                     {
                         /// If this node is needed in result, add it as input.
                         Node input_node;
@@ -961,8 +951,7 @@ std::pair<ActionsDAGPtr, ActionsDAGPtr> ActionsDAG::split(std::unordered_set<con
                         input_node.result_name = node.result_name;
                         cur_data.to_second = &second_nodes.emplace_back(std::move(input_node));
 
-                        if (copy.type != ActionType::INPUT)
-                            new_inputs.push_back(cur.node);
+                        new_inputs.push_back(cur.node);
                     }
                 }
             }
@@ -978,9 +967,6 @@ std::pair<ActionsDAGPtr, ActionsDAGPtr> ActionsDAG::split(std::unordered_set<con
     for (auto * input : inputs)
     {
         const auto & cur = data[input];
-        second_inputs.push_back(cur.to_second);
-        first_index.insert(cur.to_first);
-
         first_inputs.push_back(cur.to_first);
     }
 

From c00471bd1cdd4251bf905d90246fd698291bd124 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Mon, 18 Jan 2021 23:52:33 +0300
Subject: [PATCH 150/611] Update tryLiftUpArrayJoin

---
 src/Interpreters/ActionsDAG.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index d005e070f7f..e601ef57c0c 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -929,6 +929,15 @@ std::pair<ActionsDAGPtr, ActionsDAGPtr> ActionsDAG::split(std::unordered_set<con
 
                         child = child_data.to_second;
                     }
+
+                    /// Input from second DAG should also be in the first.
+                    if (copy.type == ActionType::INPUT)
+                    {
+                        auto & input_copy = first_nodes.emplace_back(*cur.node);
+                        assert(cur_data.to_first == nullptr);
+                        cur_data.to_first = &input_copy;
+                        new_inputs.push_back(cur.node);
+                    }
                 }
                 else
                 {

From b9c0f2b4c97d19b209307b50cb3d0cd7320bf215 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 19 Jan 2021 00:54:01 +0300
Subject: [PATCH 151/611] Push actions result to begin of block.

---
 src/Interpreters/ActionsDAG.cpp        | 6 +++---
 src/Interpreters/ActionsDAG.h          | 3 +++
 src/Interpreters/ExpressionActions.cpp | 9 ++++++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index e601ef57c0c..993986309ea 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -692,7 +692,7 @@ ActionsDAGPtr ActionsDAG::merge(ActionsDAG && first, ActionsDAG && second)
 {
     /// first: x (1), x (2), y ==> x (2), z, x (3)
     /// second: x (1), x (2), x (3) ==> x (3), x (2), x (1)
-    /// merge: x (1), x (2), x (3), y =(first)=> x (3), y, x (2), z, x (4) =(second)=> y, z, x (4), x (2), x (3)
+    /// merge: x (1), x (2), x (3), y =(first)=> x (2), z, x (4), x (3) =(second)=> x (3), x (4), x (2), z
 
     /// Will store merged result in `first`.
 
@@ -775,8 +775,8 @@ ActionsDAGPtr ActionsDAG::merge(ActionsDAG && first, ActionsDAG && second)
             }
         }
 
-        for (auto * node : second.index)
-            first.index.insert(node);
+        for (auto it = second.index.rbegin(); it != second.index.rend(); ++it)
+            first.index.prepend(*it);
     }
 
 
diff --git a/src/Interpreters/ActionsDAG.h b/src/Interpreters/ActionsDAG.h
index 76ea3e30ee0..6b873eaaa26 100644
--- a/src/Interpreters/ActionsDAG.h
+++ b/src/Interpreters/ActionsDAG.h
@@ -106,6 +106,8 @@ public:
         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);
@@ -119,6 +121,7 @@ public:
         /// 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)
diff --git a/src/Interpreters/ExpressionActions.cpp b/src/Interpreters/ExpressionActions.cpp
index f0dcf830c82..3db0fbd833f 100644
--- a/src/Interpreters/ExpressionActions.cpp
+++ b/src/Interpreters/ExpressionActions.cpp
@@ -472,9 +472,16 @@ void ExpressionActions::execute(Block & block, size_t & num_rows, bool dry_run)
                 block.erase(input);
     }
 
+    Block res;
+
     for (auto pos : result_positions)
         if (execution_context.columns[pos].column)
-            block.insert(execution_context.columns[pos]);
+            res.insert(execution_context.columns[pos]);
+
+    for (const auto & item : block)
+        res.insert(std::move(item));
+
+    block.swap(res);
 
     num_rows = execution_context.num_rows;
 }

From 39cb72d1d49f59ce5cb9fb3ed99add88c58be93c Mon Sep 17 00:00:00 2001
From: Alexander Tokmakov <avtokmakov@yandex-team.ru>
Date: Tue, 19 Jan 2021 01:02:48 +0300
Subject: [PATCH 152/611] fix

---
 contrib/cassandra | 2 +-
 contrib/libuv     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/cassandra b/contrib/cassandra
index 2935f6f15fe..9cbc1a806df 160000
--- a/contrib/cassandra
+++ b/contrib/cassandra
@@ -1 +1 @@
-Subproject commit 2935f6f15fea889899750560aa6331e9119e9dd0
+Subproject commit 9cbc1a806df5d40fddbf84533b9873542c6513d8
diff --git a/contrib/libuv b/contrib/libuv
index 84438304f41..e2e9b7e9f97 160000
--- a/contrib/libuv
+++ b/contrib/libuv
@@ -1 +1 @@
-Subproject commit 84438304f41d8ea6670ee5409f4d6c63ca784f28
+Subproject commit e2e9b7e9f978ce8a1367b5fe781d97d1ce9f94ab

From f7e61c1ed18fb1a88da0ab5157c48976c2cd62c0 Mon Sep 17 00:00:00 2001
From: Vitaliy Zakaznikov <vzakaznikov@protonmail.com>
Date: Mon, 18 Jan 2021 17:03:31 -0500
Subject: [PATCH 153/611] Enabling all TestFlows modules. Increasing clickhouse
 container health check timeouts.

---
 .../docker-compose/clickhouse-service.yml     |    8 +-
 .../docker-compose/clickhouse-service.yml     |    2 +-
 .../docker-compose/clickhouse-service.yml     |    2 +-
 .../ldap/authentication/regression.py         |    6 +-
 .../authentication/tests/authentications.py   |    4 +-
 .../docker-compose/clickhouse-service.yml     |    2 +-
 .../external_user_directory/tests/common.py   |    5 +-
 tests/testflows/ldap/regression.py            |    3 +-
 tests/testflows/ldap/role_mapping/__init__.py |    0
 .../ldap/role_mapping/configs/CA/ca.crt       |   22 +
 .../ldap/role_mapping/configs/CA/ca.key       |   30 +
 .../ldap/role_mapping/configs/CA/ca.srl       |    1 +
 .../ldap/role_mapping/configs/CA/dhparam.pem  |    8 +
 .../role_mapping/configs/CA/passphrase.txt    |    1 +
 .../configs/clickhouse/common.xml             |    6 +
 .../configs/clickhouse/config.d/logs.xml      |   17 +
 .../configs/clickhouse/config.d/ports.xml     |    5 +
 .../configs/clickhouse/config.d/remote.xml    |  107 ++
 .../configs/clickhouse/config.d/ssl.xml       |   17 +
 .../configs/clickhouse/config.d/storage.xml   |   20 +
 .../configs/clickhouse/config.d/zookeeper.xml |   10 +
 .../configs/clickhouse/config.xml             |  442 +++++
 .../configs/clickhouse/ssl/dhparam.pem        |    8 +
 .../configs/clickhouse/ssl/server.crt         |   19 +
 .../configs/clickhouse/ssl/server.key         |   28 +
 .../role_mapping/configs/clickhouse/users.xml |  133 ++
 .../configs/clickhouse1/config.d/macros.xml   |    8 +
 .../configs/clickhouse2/config.d/macros.xml   |    8 +
 .../configs/clickhouse3/config.d/macros.xml   |    8 +
 .../configs/ldap1/config/export.ldif          |   64 +
 .../role_mapping/configs/ldap2/certs/ca.crt   |   22 +
 .../configs/ldap2/certs/dhparam.pem           |    5 +
 .../role_mapping/configs/ldap2/certs/ldap.crt |   20 +
 .../role_mapping/configs/ldap2/certs/ldap.csr |   17 +
 .../role_mapping/configs/ldap2/certs/ldap.key |   27 +
 .../configs/ldap2/config/export.ldif          |   64 +
 .../role_mapping/configs/ldap3/certs/ca.crt   |   22 +
 .../configs/ldap3/certs/dhparam.pem           |    5 +
 .../role_mapping/configs/ldap3/certs/ldap.crt |   20 +
 .../role_mapping/configs/ldap3/certs/ldap.csr |   17 +
 .../role_mapping/configs/ldap3/certs/ldap.key |   27 +
 .../configs/ldap3/config/export.ldif          |   64 +
 .../role_mapping/configs/ldap4/certs/ca.crt   |   22 +
 .../configs/ldap4/certs/dhparam.pem           |    5 +
 .../role_mapping/configs/ldap4/certs/ldap.crt |   20 +
 .../role_mapping/configs/ldap4/certs/ldap.csr |   17 +
 .../role_mapping/configs/ldap4/certs/ldap.key |   27 +
 .../configs/ldap4/config/export.ldif          |   64 +
 .../configs/ldap5/config/export.ldif          |   64 +
 .../configs/ldap5/ldap2/certs/ca.crt          |   22 +
 .../configs/ldap5/ldap2/certs/dhparam.pem     |    5 +
 .../configs/ldap5/ldap2/certs/ldap.crt        |   20 +
 .../configs/ldap5/ldap2/certs/ldap.csr        |   17 +
 .../configs/ldap5/ldap2/certs/ldap.key        |   27 +
 .../configs/ldap5/ldap2/config/export.ldif    |   64 +
 .../docker-compose/clickhouse-service.yml     |   28 +
 .../docker-compose/docker-compose.yml         |  162 ++
 .../docker-compose/openldap-service.yml       |   40 +
 .../docker-compose/zookeeper-service.yml      |   18 +
 .../testflows/ldap/role_mapping/regression.py |   47 +
 .../role_mapping/requirements/__init__.py     |    1 +
 .../role_mapping/requirements/requirements.py | 1475 +++++++++++++++++
 .../ldap/role_mapping/tests/common.py         |  252 +++
 .../ldap/role_mapping/tests/mapping.py        | 1372 +++++++++++++++
 .../ldap/role_mapping/tests/server_config.py  |   78 +
 .../docker-compose/clickhouse-service.yml     |    2 +-
 tests/testflows/regression.py                 |    9 +-
 67 files changed, 5140 insertions(+), 22 deletions(-)
 create mode 100644 tests/testflows/ldap/role_mapping/__init__.py
 create mode 100644 tests/testflows/ldap/role_mapping/configs/CA/ca.crt
 create mode 100644 tests/testflows/ldap/role_mapping/configs/CA/ca.key
 create mode 100644 tests/testflows/ldap/role_mapping/configs/CA/ca.srl
 create mode 100644 tests/testflows/ldap/role_mapping/configs/CA/dhparam.pem
 create mode 100644 tests/testflows/ldap/role_mapping/configs/CA/passphrase.txt
 create mode 100644 tests/testflows/ldap/role_mapping/configs/clickhouse/common.xml
 create mode 100644 tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/logs.xml
 create mode 100644 tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/ports.xml
 create mode 100644 tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/remote.xml
 create mode 100644 tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/ssl.xml
 create mode 100644 tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/storage.xml
 create mode 100644 tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/zookeeper.xml
 create mode 100644 tests/testflows/ldap/role_mapping/configs/clickhouse/config.xml
 create mode 100644 tests/testflows/ldap/role_mapping/configs/clickhouse/ssl/dhparam.pem
 create mode 100644 tests/testflows/ldap/role_mapping/configs/clickhouse/ssl/server.crt
 create mode 100644 tests/testflows/ldap/role_mapping/configs/clickhouse/ssl/server.key
 create mode 100644 tests/testflows/ldap/role_mapping/configs/clickhouse/users.xml
 create mode 100644 tests/testflows/ldap/role_mapping/configs/clickhouse1/config.d/macros.xml
 create mode 100644 tests/testflows/ldap/role_mapping/configs/clickhouse2/config.d/macros.xml
 create mode 100644 tests/testflows/ldap/role_mapping/configs/clickhouse3/config.d/macros.xml
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap1/config/export.ldif
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap2/certs/ca.crt
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap2/certs/dhparam.pem
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap2/certs/ldap.crt
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap2/certs/ldap.csr
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap2/certs/ldap.key
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap2/config/export.ldif
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap3/certs/ca.crt
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap3/certs/dhparam.pem
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap3/certs/ldap.crt
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap3/certs/ldap.csr
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap3/certs/ldap.key
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap3/config/export.ldif
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap4/certs/ca.crt
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap4/certs/dhparam.pem
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap4/certs/ldap.crt
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap4/certs/ldap.csr
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap4/certs/ldap.key
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap4/config/export.ldif
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap5/config/export.ldif
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/certs/ca.crt
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/certs/dhparam.pem
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/certs/ldap.crt
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/certs/ldap.csr
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/certs/ldap.key
 create mode 100644 tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/config/export.ldif
 create mode 100644 tests/testflows/ldap/role_mapping/docker-compose/clickhouse-service.yml
 create mode 100644 tests/testflows/ldap/role_mapping/docker-compose/docker-compose.yml
 create mode 100644 tests/testflows/ldap/role_mapping/docker-compose/openldap-service.yml
 create mode 100644 tests/testflows/ldap/role_mapping/docker-compose/zookeeper-service.yml
 create mode 100755 tests/testflows/ldap/role_mapping/regression.py
 create mode 100644 tests/testflows/ldap/role_mapping/requirements/__init__.py
 create mode 100644 tests/testflows/ldap/role_mapping/requirements/requirements.py
 create mode 100644 tests/testflows/ldap/role_mapping/tests/common.py
 create mode 100644 tests/testflows/ldap/role_mapping/tests/mapping.py
 create mode 100644 tests/testflows/ldap/role_mapping/tests/server_config.py

diff --git a/tests/testflows/aes_encryption/docker-compose/clickhouse-service.yml b/tests/testflows/aes_encryption/docker-compose/clickhouse-service.yml
index 9787b37abbb..0789decf022 100644
--- a/tests/testflows/aes_encryption/docker-compose/clickhouse-service.yml
+++ b/tests/testflows/aes_encryption/docker-compose/clickhouse-service.yml
@@ -18,10 +18,10 @@ services:
     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: 3s
-      timeout: 2s
-      retries: 40
-      start_period: 2s
+      interval: 10s
+      timeout: 10s
+      retries: 10
+      start_period: 300s
     cap_add:
       - SYS_PTRACE
     security_opt:
diff --git a/tests/testflows/example/docker-compose/clickhouse-service.yml b/tests/testflows/example/docker-compose/clickhouse-service.yml
index 2a56876c72e..0789decf022 100644
--- a/tests/testflows/example/docker-compose/clickhouse-service.yml
+++ b/tests/testflows/example/docker-compose/clickhouse-service.yml
@@ -20,7 +20,7 @@ services:
       test: clickhouse client --query='select 1'
       interval: 10s
       timeout: 10s
-      retries: 3
+      retries: 10
       start_period: 300s
     cap_add:
       - SYS_PTRACE
diff --git a/tests/testflows/ldap/authentication/docker-compose/clickhouse-service.yml b/tests/testflows/ldap/authentication/docker-compose/clickhouse-service.yml
index 2a56876c72e..0789decf022 100644
--- a/tests/testflows/ldap/authentication/docker-compose/clickhouse-service.yml
+++ b/tests/testflows/ldap/authentication/docker-compose/clickhouse-service.yml
@@ -20,7 +20,7 @@ services:
       test: clickhouse client --query='select 1'
       interval: 10s
       timeout: 10s
-      retries: 3
+      retries: 10
       start_period: 300s
     cap_add:
       - SYS_PTRACE
diff --git a/tests/testflows/ldap/authentication/regression.py b/tests/testflows/ldap/authentication/regression.py
index 50677d78cb8..ff004a998ca 100755
--- a/tests/testflows/ldap/authentication/regression.py
+++ b/tests/testflows/ldap/authentication/regression.py
@@ -23,11 +23,7 @@ xfails = {
     "connection protocols/starttls with custom port":
      [(Fail, "it seems that starttls is not enabled by default on custom plain-text ports in LDAP server")],
     "connection protocols/tls cipher suite":
-     [(Fail, "can't get it to work")],
-    "external user directory/user authentications/valid verification cooldown value ldap unavailable":
-     [(Fail, "flaky, ask Vitaly Zakaznikov, Telegram @vzakaznikov")],
-    "user authentications/rbac=True/verification cooldown/verification cooldown performance":
-     [(Fail, "flaky, ask Vitaly Zakaznikov, Telegram @vzakaznikov")]
+     [(Fail, "can't get it to work")]
 }
 
 @TestFeature
diff --git a/tests/testflows/ldap/authentication/tests/authentications.py b/tests/testflows/ldap/authentication/tests/authentications.py
index 46bcae000b8..b54cc880bbc 100644
--- a/tests/testflows/ldap/authentication/tests/authentications.py
+++ b/tests/testflows/ldap/authentication/tests/authentications.py
@@ -131,7 +131,7 @@ def login_after_user_is_deleted_from_ldap(self, server, rbac=False):
             user = add_user_to_ldap(**user)
 
         with ldap_authenticated_users({"username": user["cn"], "server": server}, config_file=f"ldap_users_{getuid()}.xml",
-            restart=True, rbac=rbac):
+                restart=True, rbac=rbac):
             login_and_execute_query(username=user["cn"], password=user["userpassword"])
 
             with When("I delete this user from LDAP"):
@@ -202,7 +202,7 @@ def login_after_user_cn_changed_in_ldap(self, server, rbac=False):
             user = add_user_to_ldap(**user)
 
         with ldap_authenticated_users({"username": user["cn"], "server": server},
-            config_file=f"ldap_users_{getuid()}.xml", restart=True, rbac=rbac):
+                config_file=f"ldap_users_{getuid()}.xml", restart=True, rbac=rbac):
             login_and_execute_query(username=user["cn"], password=user["userpassword"])
 
             with When("I change user password in LDAP"):
diff --git a/tests/testflows/ldap/external_user_directory/docker-compose/clickhouse-service.yml b/tests/testflows/ldap/external_user_directory/docker-compose/clickhouse-service.yml
index 2a56876c72e..0789decf022 100644
--- a/tests/testflows/ldap/external_user_directory/docker-compose/clickhouse-service.yml
+++ b/tests/testflows/ldap/external_user_directory/docker-compose/clickhouse-service.yml
@@ -20,7 +20,7 @@ services:
       test: clickhouse client --query='select 1'
       interval: 10s
       timeout: 10s
-      retries: 3
+      retries: 10
       start_period: 300s
     cap_add:
       - SYS_PTRACE
diff --git a/tests/testflows/ldap/external_user_directory/tests/common.py b/tests/testflows/ldap/external_user_directory/tests/common.py
index e1ee4f99545..e5980640721 100644
--- a/tests/testflows/ldap/external_user_directory/tests/common.py
+++ b/tests/testflows/ldap/external_user_directory/tests/common.py
@@ -96,7 +96,10 @@ def create_entries_ldap_external_user_directory_config_content(entries, config_d
         <user_directories>
             <ldap>
                 <server>my_ldap_server</server>
-                <user_template>my_user</user_template>
+                <roles>
+                    <my_local_role1 />
+                    <my_local_role2 />
+                </roles>
             </ldap>
         </user_directories>
     ```
diff --git a/tests/testflows/ldap/regression.py b/tests/testflows/ldap/regression.py
index 9cc9aa85f93..579223c4b35 100755
--- a/tests/testflows/ldap/regression.py
+++ b/tests/testflows/ldap/regression.py
@@ -16,6 +16,7 @@ def regression(self, local, clickhouse_binary_path, parallel=None, stress=None):
 
     Feature(test=load("ldap.authentication.regression", "regression"))(**args)
     Feature(test=load("ldap.external_user_directory.regression", "regression"))(**args)
+    Feature(test=load("ldap.role_mapping.regression", "regression"))(**args)
 
 if main():
-    regression()
\ No newline at end of file
+    regression()
diff --git a/tests/testflows/ldap/role_mapping/__init__.py b/tests/testflows/ldap/role_mapping/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/testflows/ldap/role_mapping/configs/CA/ca.crt b/tests/testflows/ldap/role_mapping/configs/CA/ca.crt
new file mode 100644
index 00000000000..8c71e3afc91
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/CA/ca.crt
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDlTCCAn2gAwIBAgIUJBqw2dHM2DDCZjYSkPOESlvDH6swDQYJKoZIhvcNAQEL
+BQAwWjELMAkGA1UEBhMCQ0ExCzAJBgNVBAgMAk9OMQ8wDQYDVQQHDAZPdHRhd2Ex
+ETAPBgNVBAoMCEFsdGluaXR5MQswCQYDVQQLDAJRQTENMAsGA1UEAwwEcm9vdDAe
+Fw0yMDA2MTExOTAzNDhaFw0zMDA2MDkxOTAzNDhaMFoxCzAJBgNVBAYTAkNBMQsw
+CQYDVQQIDAJPTjEPMA0GA1UEBwwGT3R0YXdhMREwDwYDVQQKDAhBbHRpbml0eTEL
+MAkGA1UECwwCUUExDTALBgNVBAMMBHJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC9Irr0zGV+HCI2fZ0ht4hR5It4Sbjz4RwZV8ENRP/+TEz8l9eK
+J6ygxhKX7SMYzIs/jS9Gsq4plX1r2ujW1qRf8yLpR4+dGLP+jBRi1drj0XjZXosT
+SERjWzgPauWxL9LN8+l26eBAqz6fw5e0W8WRSTgf5iGiCcKOTmaATIUjP0CdfWKK
+qpktI4vhe++CXZFJ3usR+8KZ/FwwbCLJM/3J2HnbcXfcaYPYvr1tfqLudKSTbG9H
+M3+AVwjctdesc/0sbd51Zsm0ClQptMbuKnDCYauGg61kNkgbgPgRmH9Pzo67DtxF
+/WW+PtOzq8xLOifciQ9Piboy9QBSQZGwf4wzAgMBAAGjUzBRMB0GA1UdDgQWBBSi
+njya0RDozx3OZTLYFpwqYnlpIDAfBgNVHSMEGDAWgBSinjya0RDozx3OZTLYFpwq
+YnlpIDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBAD7VyFg7F
+U1C25KFvtauchAOjCW6w7U/b3z1dVZvcQ88/kH1VsLUcfGixlSilUEfPTJsi7OA0
+R5BQdh2GGcjUJv4iqEFGU05KvMVmRRKn08P62+ZhJxKMxG26VzcliRZzCMkI6d0W
+lFwI6nM45yeqdHVh5k4xbuJzqpbD9BtXXLI+/Ra9Fx8S9ETA3GdidpZLU5P1VLxq
+UuedfqyAVWZXpr6TAURGxouRmRzul9yFzbSUex+MLEIPrstjtEwV3+tBQZJz9xAS
+TVPj+Nv3LO7GCq54bdwkq1ioWbSL2hEmABkj6kdW/JwmfhGHf/2rirDVMzrTYw07
+dFJfAZC+FEsv
+-----END CERTIFICATE-----
diff --git a/tests/testflows/ldap/role_mapping/configs/CA/ca.key b/tests/testflows/ldap/role_mapping/configs/CA/ca.key
new file mode 100644
index 00000000000..e7a7f664dcf
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/CA/ca.key
@@ -0,0 +1,30 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: AES-256-CBC,D06B9754A2069EBB4E77065DC9B605A1
+
+FJT794Z6AUuUB5Vp5W2iR6zzCvQUg2dtKoE+xhFdbgC7lmSfA2W/O9fx15Il67Yj
+Bbpm9Y6yteUSDQpJrvBdkhXeBkYEa5K1CA+0Jdx98nzwP3KBhHNxVVrTWRc5kniB
+LMV3iBQEbAafxgL7gN+EWr3eV7w7ZSqT7D5br/mlBALU62gv2UzwTXLu1CgyNWMC
+HIPjIX50Zga+BnhZhtQvM4Yj1gOsn+X6AaEZ3KjTfCDqthYQf2ldswW4gAlPAq83
++INq9Spx+QG97Z+1XO2DmmGTZL0z+OFLT+3y26/UcftM26ODY09Dcf3gt0n6RIUV
+0KsD1qQL0ppu4CHVnbIkOKMBe86qBl+kG8FVmyhgZ8D9ULlF1tpyTVKvHR82V2B5
+ztbc5EY1Fhb+r7OVVJlbCeo/bWmWybODZrpN49x5gGZpM3+8ApaHupGZ+cRFkQKG
+rDpqC5gflT3WwFNxtP5noWcV+Gzb3riXNM3c8G5aIpLZwmmaTLK9ahKqMcq4Ljf+
+hir8kuCMqIKt3m7Ceoj4wAHSP8xO0y/cc1WYNb3CI0Emk795aR6IPUw4vDEXHG27
+OLoCJTvl/JKRWJGkdQx8wKAs/uw/qwtbhYoQJccTjfvy4NXH3tpSgxCE8OTWuEch
+TAN8ra1PDGAUu+1MeT5gZ9uI1BEU6hXMME4mVRpJdcmw9MVy3V+B6rkUqX3kFAfR
+e2ueF5qgIp+A4/UlVe5cKdWAQxu4BnUESLooA7cbgcLypdao9bRx9bXH8S3aNgxW
+IdgICpc/v8wAX2yqMe191KgR9Vh1p0RCw/kEGVgWfY/IaQpsaYuq5quZbvr/fN5T
+d++ySAMaPysaCadLUdZJLw56uk4Y+PYzR+ygjTX9dCCHedrAU8RYM55FJ/fyD3bQ
+Hn9/n7PZyWy6u/TYt6dhlcYxaS3Opzw4eAQB8tGZJRYQ3AKpHpTEC57lXoMnUPKo
++nBmb0+YulylMZdns0WIBJlcv6qzIaNhDMrjyi18n1ezzPIGH7ivUjoXy2FL23q5
+f3aqJK4UUDEDkC8IeZkS+ykYxnohjFDhUyBe5gjryLqdMdy9EerehCWPf425AztX
+c/EWPzDl46qmxWhugOlz3Fiw95VlYu0MUDRayHuZiYPplgJypChuU4EHJ+q8V2z3
+BwjSo1bD4nfc8f68qEOtdZ1u/ClcolMwlZQYDJz/DiE4JOcd2Gx4QSF5vaInm0/4
+mMj/ZWna4DAYFbH8IGh7xUPDqeIWhBYlgrD69ajKyay5Vu3La/d2QW20BhX35Ro2
+ZJVR+lfioMmxn4y481H2pv+5gOlGwh02Oa8qLhZBb8W+DvFShNk6mk87eCForFFT
+CDgmvfsC/cS2wZkcFTecq6vbjFlt+OF13NCKlcO3wCm44D+bwVPeMrU6HycCVQw7
+SASrnP/th5sJbv11byb2lKgVdVHWk090bqnDwB9H2hGIb9JnPC9ZpaL/mocYyzTi
+H9fcBrMYkL09FJGr3Uff7qEY4XQTMlLadXue3iKd19PRgV8cRyKp37MYI9/3iLwv
+eYHLtMfrifZahf1ksOPeBphnlfzWo9qqfooUCaGxfSlNPUHhrHZ4aMiRyTE8Xeh2
+-----END RSA PRIVATE KEY-----
diff --git a/tests/testflows/ldap/role_mapping/configs/CA/ca.srl b/tests/testflows/ldap/role_mapping/configs/CA/ca.srl
new file mode 100644
index 00000000000..66feb9c8a35
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/CA/ca.srl
@@ -0,0 +1 @@
+227B125D27B6B1A4B5955361365DF8EC2D7098C1
diff --git a/tests/testflows/ldap/role_mapping/configs/CA/dhparam.pem b/tests/testflows/ldap/role_mapping/configs/CA/dhparam.pem
new file mode 100644
index 00000000000..554d75696ee
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/CA/dhparam.pem
@@ -0,0 +1,8 @@
+-----BEGIN DH PARAMETERS-----
+MIIBCAKCAQEA1iatTn4jdw1WIu09qeLj8OEeLhzG/w2lI4RUeJT9nU+WTwegpvLN
+/MvrIMIKHRmItyxgraYFau2moC7RKm7OKLmFt6e34QeMvM1vXpuwQav6mfp8GsYL
+mEIw5riFcB73E32NN3g7qmfmurkTF28BohmqhuQp2et7FNoGBKQ6ePZzGHWil3yG
+nEnCwyK0o3eP2IEytx2N50uUWVdfg3MN34L3wqpUivArrjBkoMpqm3/V3wdfoYG9
+ZQkH0gIxT/2FIixCLGlfBsJ1qA/Apz1BJZbGqVu5M5iiQmq+LWN5JLS3xYai4wJL
+rIY8DhjbciSNVWkwTJHzaLwIQa9a6p6mUwIBAg==
+-----END DH PARAMETERS-----
diff --git a/tests/testflows/ldap/role_mapping/configs/CA/passphrase.txt b/tests/testflows/ldap/role_mapping/configs/CA/passphrase.txt
new file mode 100644
index 00000000000..2cf58b2364c
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/CA/passphrase.txt
@@ -0,0 +1 @@
+altinity
diff --git a/tests/testflows/ldap/role_mapping/configs/clickhouse/common.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse/common.xml
new file mode 100644
index 00000000000..df952b28c82
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/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/ldap/role_mapping/configs/clickhouse/config.d/logs.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/logs.xml
new file mode 100644
index 00000000000..bdf1bbc11c1
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/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/ldap/role_mapping/configs/clickhouse/config.d/ports.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/ports.xml
new file mode 100644
index 00000000000..fbc6cea74c0
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/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/ldap/role_mapping/configs/clickhouse/config.d/remote.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/remote.xml
new file mode 100644
index 00000000000..51be2a6e8e3
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/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/ldap/role_mapping/configs/clickhouse/config.d/ssl.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/ssl.xml
new file mode 100644
index 00000000000..ca65ffd5e04
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/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/ldap/role_mapping/configs/clickhouse/config.d/storage.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/storage.xml
new file mode 100644
index 00000000000..618fd6b6d24
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/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/ldap/role_mapping/configs/clickhouse/config.d/zookeeper.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/zookeeper.xml
new file mode 100644
index 00000000000..96270e7b645
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/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/ldap/role_mapping/configs/clickhouse/config.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.xml
new file mode 100644
index 00000000000..e28a0c8e255
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.xml
@@ -0,0 +1,442 @@
+<?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/ldap/role_mapping/configs/clickhouse/ssl/dhparam.pem b/tests/testflows/ldap/role_mapping/configs/clickhouse/ssl/dhparam.pem
new file mode 100644
index 00000000000..2e6cee0798d
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/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/ldap/role_mapping/configs/clickhouse/ssl/server.crt b/tests/testflows/ldap/role_mapping/configs/clickhouse/ssl/server.crt
new file mode 100644
index 00000000000..7ade2d96273
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/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/ldap/role_mapping/configs/clickhouse/ssl/server.key b/tests/testflows/ldap/role_mapping/configs/clickhouse/ssl/server.key
new file mode 100644
index 00000000000..f0fb61ac443
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/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/ldap/role_mapping/configs/clickhouse/users.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse/users.xml
new file mode 100644
index 00000000000..86b2cd9e1e3
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/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/ldap/role_mapping/configs/clickhouse1/config.d/macros.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse1/config.d/macros.xml
new file mode 100644
index 00000000000..6cdcc1b440c
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/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/ldap/role_mapping/configs/clickhouse2/config.d/macros.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse2/config.d/macros.xml
new file mode 100644
index 00000000000..a114a9ce4ab
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/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/ldap/role_mapping/configs/clickhouse3/config.d/macros.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse3/config.d/macros.xml
new file mode 100644
index 00000000000..904a27b0172
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/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/ldap/role_mapping/configs/ldap1/config/export.ldif b/tests/testflows/ldap/role_mapping/configs/ldap1/config/export.ldif
new file mode 100644
index 00000000000..621dd32ca0c
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap1/config/export.ldif
@@ -0,0 +1,64 @@
+# LDIF Export for dc=company,dc=com
+# Server: openldap (openldap)
+# Search Scope: sub
+# Search Filter: (objectClass=*)
+# Total Entries: 7
+#
+# Generated by phpLDAPadmin (http://phpldapadmin.sourceforge.net) on May 22, 2020 5:51 pm
+# Version: 1.2.5
+
+# Entry 1: dc=company,dc=com
+#dn: dc=company,dc=com
+#dc: company
+#o: company
+#objectclass: top
+#objectclass: dcObject
+#objectclass: organization
+
+# Entry 2: cn=admin,dc=company,dc=com
+#dn: cn=admin,dc=company,dc=com
+#cn: admin
+#description: LDAP administrator
+#objectclass: simpleSecurityObject
+#objectclass: organizationalRole
+#userpassword: {SSHA}eUEupkQCTvq9SkrxfWGSe5rX+orrjVbF
+
+# Entry 3: ou=groups,dc=company,dc=com
+dn: ou=groups,dc=company,dc=com
+objectclass: organizationalUnit
+objectclass: top
+ou: groups
+
+# Entry 4: cn=admin,ou=groups,dc=company,dc=com
+dn: cn=admin,ou=groups,dc=company,dc=com
+cn: admin
+gidnumber: 500
+objectclass: posixGroup
+objectclass: top
+
+# Entry 5: cn=users,ou=groups,dc=company,dc=com
+dn: cn=users,ou=groups,dc=company,dc=com
+cn: users
+gidnumber: 501
+objectclass: posixGroup
+objectclass: top
+
+# Entry 6: ou=users,dc=company,dc=com
+dn: ou=users,dc=company,dc=com
+objectclass: organizationalUnit
+objectclass: top
+ou: users
+
+# Entry 7: cn=user1,ou=users,dc=company,dc=com
+dn: cn=user1,ou=users,dc=company,dc=com
+cn: user1
+gidnumber: 501
+givenname: John
+homedirectory: /home/users/user1
+objectclass: inetOrgPerson
+objectclass: posixAccount
+objectclass: top
+sn: User
+uid: user1
+uidnumber: 1101
+userpassword: user1
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap2/certs/ca.crt b/tests/testflows/ldap/role_mapping/configs/ldap2/certs/ca.crt
new file mode 100644
index 00000000000..8c71e3afc91
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap2/certs/ca.crt
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDlTCCAn2gAwIBAgIUJBqw2dHM2DDCZjYSkPOESlvDH6swDQYJKoZIhvcNAQEL
+BQAwWjELMAkGA1UEBhMCQ0ExCzAJBgNVBAgMAk9OMQ8wDQYDVQQHDAZPdHRhd2Ex
+ETAPBgNVBAoMCEFsdGluaXR5MQswCQYDVQQLDAJRQTENMAsGA1UEAwwEcm9vdDAe
+Fw0yMDA2MTExOTAzNDhaFw0zMDA2MDkxOTAzNDhaMFoxCzAJBgNVBAYTAkNBMQsw
+CQYDVQQIDAJPTjEPMA0GA1UEBwwGT3R0YXdhMREwDwYDVQQKDAhBbHRpbml0eTEL
+MAkGA1UECwwCUUExDTALBgNVBAMMBHJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC9Irr0zGV+HCI2fZ0ht4hR5It4Sbjz4RwZV8ENRP/+TEz8l9eK
+J6ygxhKX7SMYzIs/jS9Gsq4plX1r2ujW1qRf8yLpR4+dGLP+jBRi1drj0XjZXosT
+SERjWzgPauWxL9LN8+l26eBAqz6fw5e0W8WRSTgf5iGiCcKOTmaATIUjP0CdfWKK
+qpktI4vhe++CXZFJ3usR+8KZ/FwwbCLJM/3J2HnbcXfcaYPYvr1tfqLudKSTbG9H
+M3+AVwjctdesc/0sbd51Zsm0ClQptMbuKnDCYauGg61kNkgbgPgRmH9Pzo67DtxF
+/WW+PtOzq8xLOifciQ9Piboy9QBSQZGwf4wzAgMBAAGjUzBRMB0GA1UdDgQWBBSi
+njya0RDozx3OZTLYFpwqYnlpIDAfBgNVHSMEGDAWgBSinjya0RDozx3OZTLYFpwq
+YnlpIDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBAD7VyFg7F
+U1C25KFvtauchAOjCW6w7U/b3z1dVZvcQ88/kH1VsLUcfGixlSilUEfPTJsi7OA0
+R5BQdh2GGcjUJv4iqEFGU05KvMVmRRKn08P62+ZhJxKMxG26VzcliRZzCMkI6d0W
+lFwI6nM45yeqdHVh5k4xbuJzqpbD9BtXXLI+/Ra9Fx8S9ETA3GdidpZLU5P1VLxq
+UuedfqyAVWZXpr6TAURGxouRmRzul9yFzbSUex+MLEIPrstjtEwV3+tBQZJz9xAS
+TVPj+Nv3LO7GCq54bdwkq1ioWbSL2hEmABkj6kdW/JwmfhGHf/2rirDVMzrTYw07
+dFJfAZC+FEsv
+-----END CERTIFICATE-----
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap2/certs/dhparam.pem b/tests/testflows/ldap/role_mapping/configs/ldap2/certs/dhparam.pem
new file mode 100644
index 00000000000..0a96faffd62
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap2/certs/dhparam.pem
@@ -0,0 +1,5 @@
+-----BEGIN DH PARAMETERS-----
+MIGHAoGBAJitt2hhnpDViQ5ko2ipBMdjy+bZ6FR/WdZ987R7lQvBkKehPXmxtEyV
+AO6ofv5CZSDJokc5bUeBOAtg0EhMTCH82uPdwQvt58jRXcxXBg4JTjkx+oW9LBv2
+FdZsbaX8+SYivmiZ0Jp8T/HBm/4DA9VBS0O5GFRS4C7dHhmSTPfDAgEC
+-----END DH PARAMETERS-----
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap2/certs/ldap.crt b/tests/testflows/ldap/role_mapping/configs/ldap2/certs/ldap.crt
new file mode 100644
index 00000000000..9167cbf861d
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap2/certs/ldap.crt
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDQDCCAigCFCJ7El0ntrGktZVTYTZd+OwtcJjBMA0GCSqGSIb3DQEBCwUAMFox
+CzAJBgNVBAYTAkNBMQswCQYDVQQIDAJPTjEPMA0GA1UEBwwGT3R0YXdhMREwDwYD
+VQQKDAhBbHRpbml0eTELMAkGA1UECwwCUUExDTALBgNVBAMMBHJvb3QwHhcNMjAw
+NjExMTkxMTQzWhcNMzAwNjA5MTkxMTQzWjBfMQswCQYDVQQGEwJDQTELMAkGA1UE
+CAwCT04xDzANBgNVBAcMBk90dGF3YTERMA8GA1UECgwIQWx0aW5pdHkxCzAJBgNV
+BAsMAlFBMRIwEAYDVQQDDAlvcGVubGRhcDIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC0Mbn//U56URavMgXm82FWP6vBdKuRydFX/L0M5XLlnAtk/IXG
+/T+4t7nOBJxWmTp/xpsPtSMALE4eFJpEUEqlpVbG5DfBzVWcYOWoMeRAcHWCDkzr
+PkB6I0dfF0Mm5hoaDhn+ZXjBWvoh/IlJdAnPg5mlejflJBQ7xtFC9eN6WjldXuRO
+vyntGNuMfVLgITHwXuH2yZ98G0mFO6TU/9dRY/Z3D6RTSzKdb17Yk/VnG+ry92u2
+0sgXIBvhuJuC3ksWLArwwFoMl8DVa05D4O2H76goGdCcQ0KzqBV8RPXAh3UcgP2e
+Zu90p2EGIhIk+sZTCkPd4dorxjL9nkRR86HdAgMBAAEwDQYJKoZIhvcNAQELBQAD
+ggEBAJWiCxJaTksv/BTsh/etxlDY5eHwqStqIuiovEQ8bhGAcKJ3bfWd/YTb8DUS
+hrLvXrXdOVC+U8PqPFXBpdOqcm5Dc233z52VgUCb+0EKv3lAzgKXRIo32h52skdK
+NnRrCHDeDzgfEIXR4MEJ99cLEaxWyXQhremmTYWHYznry9/4NYz40gCDxHn9dJAi
+KxFyDNxhtuKs58zp4PrBoo+542JurAoLPtRGOhdXpU2RkQVU/ho38HsAXDStAB5D
+vAoSxPuMHKgo17ffrb0oqU3didwaA9fIsz7Mr6RxmI7X03s7hLzNBq9FCqu0U3RR
+CX4zWGFNJu/ieSGVWLYKQzbYxp8=
+-----END CERTIFICATE-----
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap2/certs/ldap.csr b/tests/testflows/ldap/role_mapping/configs/ldap2/certs/ldap.csr
new file mode 100644
index 00000000000..bf569f727d6
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap2/certs/ldap.csr
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICpDCCAYwCAQAwXzELMAkGA1UEBhMCQ0ExCzAJBgNVBAgMAk9OMQ8wDQYDVQQH
+DAZPdHRhd2ExETAPBgNVBAoMCEFsdGluaXR5MQswCQYDVQQLDAJRQTESMBAGA1UE
+AwwJb3BlbmxkYXAyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtDG5
+//1OelEWrzIF5vNhVj+rwXSrkcnRV/y9DOVy5ZwLZPyFxv0/uLe5zgScVpk6f8ab
+D7UjACxOHhSaRFBKpaVWxuQ3wc1VnGDlqDHkQHB1gg5M6z5AeiNHXxdDJuYaGg4Z
+/mV4wVr6IfyJSXQJz4OZpXo35SQUO8bRQvXjelo5XV7kTr8p7RjbjH1S4CEx8F7h
+9smffBtJhTuk1P/XUWP2dw+kU0synW9e2JP1Zxvq8vdrttLIFyAb4bibgt5LFiwK
+8MBaDJfA1WtOQ+Dth++oKBnQnENCs6gVfET1wId1HID9nmbvdKdhBiISJPrGUwpD
+3eHaK8Yy/Z5EUfOh3QIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBAEzIjZQOT5R7
+mEJg+RFpCSIoPn3xJ4/VMMyWqA3bTGZKpb4S6GxgsierY/87kPL7jZrMdGYB4Dc3
+2M3VWZGXlYo8vctH1zLE9VW6CzosUpl20lhdgydoCMz3RQqdJyK8aGeFTeLtk7G/
+TRCCUFUE6jaA+VtaCPCnOJSff3jUf76xguEu7dgTZgCKV7dtBqald8gIzF3D+AJJ
+7pEN2UrC3UR0xpe2cj2GhndQJ+WsIyft3zpNFzAO13j8ZPibuVP7oDWcW3ixNCWC
+213aeRVplJGof8Eo6llDxP+6Fwp1YmOoQmwB1Xm3t4ADn7FLJ14LONLB7q40KviG
+RyLyqu3IVOI=
+-----END CERTIFICATE REQUEST-----
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap2/certs/ldap.key b/tests/testflows/ldap/role_mapping/configs/ldap2/certs/ldap.key
new file mode 100644
index 00000000000..5ab3a3f8b59
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap2/certs/ldap.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAtDG5//1OelEWrzIF5vNhVj+rwXSrkcnRV/y9DOVy5ZwLZPyF
+xv0/uLe5zgScVpk6f8abD7UjACxOHhSaRFBKpaVWxuQ3wc1VnGDlqDHkQHB1gg5M
+6z5AeiNHXxdDJuYaGg4Z/mV4wVr6IfyJSXQJz4OZpXo35SQUO8bRQvXjelo5XV7k
+Tr8p7RjbjH1S4CEx8F7h9smffBtJhTuk1P/XUWP2dw+kU0synW9e2JP1Zxvq8vdr
+ttLIFyAb4bibgt5LFiwK8MBaDJfA1WtOQ+Dth++oKBnQnENCs6gVfET1wId1HID9
+nmbvdKdhBiISJPrGUwpD3eHaK8Yy/Z5EUfOh3QIDAQABAoIBADugMMIKWcuTxYPX
+c6iGZHEbxIPRTWyCcalB0nTQAAMGbabPAJ1l8432DZ+kWu806OybFXhPIfPOtVKy
+0pFEWE8TtPE/V0vj3C5Qye2sBLFmBRwyCzXUdZV00wseMXRPs9dnTyalAR5KMnbI
+j80kfpKSI2dkV9aU57UYBuq3Xrx/TCGItwL769D4ZZW9BvbpiTZApQQFZ0gwUFFn
+btPXGU9Ti8H4mfBuZWL+5CaZdqOo76+CXvMPaUK0F9MJp4yX3XxQLRNH3qz/Tyn7
+h7QOOo0XTqoUmzRw0N9QRVH5LRdSE5yq3aF9aFKjNW59exz+62pufOFadngzkpkn
+OKCzgWkCgYEA4mOWWMzdYwMn3GtfG7whqlqy7wOmMkNb81zTDQejHBV98dnj0AHr
+deurfKWzHrAh3DXo6tFeqUIgXabhBPS/0dEx/S5sgLFmuUZP05EUYahfWBgzzmM9
+C6Oe5xIMLzxsZCJczolsfkEsoFe4o0vkvuLYoQrQL7InzewcDy8cUxsCgYEAy8Na
+YCnanSNDY03Bulcni+5sF+opaHseeki1pv3nlw8TwsWuZF9ApS+yL7ck9jJjxBRR
+RC3KGmpoqIr0vTmUYS946ngQWXPE90zfuhJfM+NRv/q0oCjH0qAcxRbTkls5On9v
+oxJ8rO7gD6K85eHqasWdbCVzdZrobOXzay37tmcCgYBfyUUmw190cjReZauzH3Gb
+E48b5A5gu/Fe0cqWe8G+szU7rDZgnz9SAGnpbm6QMHPTKZgoKngD42+wUFhq8Wdr
+zjh5aDgOZ4EQKTjDSmI2Q7g7nNnmnESK9SrZl+BB6C3wXD2qQaj+7nKEUTlVFlpt
+jaucz+dwFtASp7Djl8pDOwKBgEtr2c3ycArt/ImLRIP2spqm+7e2YvFbcSKOOz6+
+iLRvTj8v8KcSYtlB2FC1F6dRa4AujQ4RbNduP6LzHDfWUkfOzJDtNBAIPAXVnJJB
+LqAEKkRHRghqT9x0i3GgS1vHDF3MwcO4mhFgserXr9ffUWeIEgbvrdcAKbv1Oa6Y
+bK1NAoGAGPm8ISmboDJynjBl9wMrkcy23Pwg9kmyocdWUHh0zMLDKriZNKYB6u/U
+C+/RTfkohPoHPzkeqWiHp7z3JhMItYUfTkNW6vMCxEGc0NEN6ZyMIjtiDPGN1n6O
+E7jmODFmj1AQICQGdV5SHp+yKvKyb0YHKyDwETbs4SZBXxVvjEw=
+-----END RSA PRIVATE KEY-----
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap2/config/export.ldif b/tests/testflows/ldap/role_mapping/configs/ldap2/config/export.ldif
new file mode 100644
index 00000000000..6766aaae6f1
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap2/config/export.ldif
@@ -0,0 +1,64 @@
+# LDIF Export for dc=company,dc=com
+# Server: openldap (openldap)
+# Search Scope: sub
+# Search Filter: (objectClass=*)
+# Total Entries: 7
+#
+# Generated by phpLDAPadmin (http://phpldapadmin.sourceforge.net) on May 22, 2020 5:51 pm
+# Version: 1.2.5
+
+# Entry 1: dc=company,dc=com
+#dn: dc=company,dc=com
+#dc: company
+#o: company
+#objectclass: top
+#objectclass: dcObject
+#objectclass: organization
+
+# Entry 2: cn=admin,dc=company,dc=com
+#dn: cn=admin,dc=company,dc=com
+#cn: admin
+#description: LDAP administrator
+#objectclass: simpleSecurityObject
+#objectclass: organizationalRole
+#userpassword: {SSHA}eUEupkQCTvq9SkrxfWGSe5rX+orrjVbF
+
+# Entry 3: ou=groups,dc=company,dc=com
+dn: ou=groups,dc=company,dc=com
+objectclass: organizationalUnit
+objectclass: top
+ou: groups
+
+# Entry 4: cn=admin,ou=groups,dc=company,dc=com
+dn: cn=admin,ou=groups,dc=company,dc=com
+cn: admin
+gidnumber: 500
+objectclass: posixGroup
+objectclass: top
+
+# Entry 5: cn=users,ou=groups,dc=company,dc=com
+dn: cn=users,ou=groups,dc=company,dc=com
+cn: users
+gidnumber: 501
+objectclass: posixGroup
+objectclass: top
+
+# Entry 6: ou=users,dc=company,dc=com
+dn: ou=users,dc=company,dc=com
+objectclass: organizationalUnit
+objectclass: top
+ou: users
+
+# Entry 7: cn=user2,ou=users,dc=company,dc=com
+dn: cn=user2,ou=users,dc=company,dc=com
+cn: user2
+gidnumber: 501
+givenname: John
+homedirectory: /home/users/user2
+objectclass: inetOrgPerson
+objectclass: posixAccount
+objectclass: top
+sn: User
+uid: user2
+uidnumber: 1002
+userpassword: user2
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap3/certs/ca.crt b/tests/testflows/ldap/role_mapping/configs/ldap3/certs/ca.crt
new file mode 100644
index 00000000000..8c71e3afc91
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap3/certs/ca.crt
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDlTCCAn2gAwIBAgIUJBqw2dHM2DDCZjYSkPOESlvDH6swDQYJKoZIhvcNAQEL
+BQAwWjELMAkGA1UEBhMCQ0ExCzAJBgNVBAgMAk9OMQ8wDQYDVQQHDAZPdHRhd2Ex
+ETAPBgNVBAoMCEFsdGluaXR5MQswCQYDVQQLDAJRQTENMAsGA1UEAwwEcm9vdDAe
+Fw0yMDA2MTExOTAzNDhaFw0zMDA2MDkxOTAzNDhaMFoxCzAJBgNVBAYTAkNBMQsw
+CQYDVQQIDAJPTjEPMA0GA1UEBwwGT3R0YXdhMREwDwYDVQQKDAhBbHRpbml0eTEL
+MAkGA1UECwwCUUExDTALBgNVBAMMBHJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC9Irr0zGV+HCI2fZ0ht4hR5It4Sbjz4RwZV8ENRP/+TEz8l9eK
+J6ygxhKX7SMYzIs/jS9Gsq4plX1r2ujW1qRf8yLpR4+dGLP+jBRi1drj0XjZXosT
+SERjWzgPauWxL9LN8+l26eBAqz6fw5e0W8WRSTgf5iGiCcKOTmaATIUjP0CdfWKK
+qpktI4vhe++CXZFJ3usR+8KZ/FwwbCLJM/3J2HnbcXfcaYPYvr1tfqLudKSTbG9H
+M3+AVwjctdesc/0sbd51Zsm0ClQptMbuKnDCYauGg61kNkgbgPgRmH9Pzo67DtxF
+/WW+PtOzq8xLOifciQ9Piboy9QBSQZGwf4wzAgMBAAGjUzBRMB0GA1UdDgQWBBSi
+njya0RDozx3OZTLYFpwqYnlpIDAfBgNVHSMEGDAWgBSinjya0RDozx3OZTLYFpwq
+YnlpIDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBAD7VyFg7F
+U1C25KFvtauchAOjCW6w7U/b3z1dVZvcQ88/kH1VsLUcfGixlSilUEfPTJsi7OA0
+R5BQdh2GGcjUJv4iqEFGU05KvMVmRRKn08P62+ZhJxKMxG26VzcliRZzCMkI6d0W
+lFwI6nM45yeqdHVh5k4xbuJzqpbD9BtXXLI+/Ra9Fx8S9ETA3GdidpZLU5P1VLxq
+UuedfqyAVWZXpr6TAURGxouRmRzul9yFzbSUex+MLEIPrstjtEwV3+tBQZJz9xAS
+TVPj+Nv3LO7GCq54bdwkq1ioWbSL2hEmABkj6kdW/JwmfhGHf/2rirDVMzrTYw07
+dFJfAZC+FEsv
+-----END CERTIFICATE-----
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap3/certs/dhparam.pem b/tests/testflows/ldap/role_mapping/configs/ldap3/certs/dhparam.pem
new file mode 100644
index 00000000000..0a96faffd62
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap3/certs/dhparam.pem
@@ -0,0 +1,5 @@
+-----BEGIN DH PARAMETERS-----
+MIGHAoGBAJitt2hhnpDViQ5ko2ipBMdjy+bZ6FR/WdZ987R7lQvBkKehPXmxtEyV
+AO6ofv5CZSDJokc5bUeBOAtg0EhMTCH82uPdwQvt58jRXcxXBg4JTjkx+oW9LBv2
+FdZsbaX8+SYivmiZ0Jp8T/HBm/4DA9VBS0O5GFRS4C7dHhmSTPfDAgEC
+-----END DH PARAMETERS-----
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap3/certs/ldap.crt b/tests/testflows/ldap/role_mapping/configs/ldap3/certs/ldap.crt
new file mode 100644
index 00000000000..9167cbf861d
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap3/certs/ldap.crt
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDQDCCAigCFCJ7El0ntrGktZVTYTZd+OwtcJjBMA0GCSqGSIb3DQEBCwUAMFox
+CzAJBgNVBAYTAkNBMQswCQYDVQQIDAJPTjEPMA0GA1UEBwwGT3R0YXdhMREwDwYD
+VQQKDAhBbHRpbml0eTELMAkGA1UECwwCUUExDTALBgNVBAMMBHJvb3QwHhcNMjAw
+NjExMTkxMTQzWhcNMzAwNjA5MTkxMTQzWjBfMQswCQYDVQQGEwJDQTELMAkGA1UE
+CAwCT04xDzANBgNVBAcMBk90dGF3YTERMA8GA1UECgwIQWx0aW5pdHkxCzAJBgNV
+BAsMAlFBMRIwEAYDVQQDDAlvcGVubGRhcDIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC0Mbn//U56URavMgXm82FWP6vBdKuRydFX/L0M5XLlnAtk/IXG
+/T+4t7nOBJxWmTp/xpsPtSMALE4eFJpEUEqlpVbG5DfBzVWcYOWoMeRAcHWCDkzr
+PkB6I0dfF0Mm5hoaDhn+ZXjBWvoh/IlJdAnPg5mlejflJBQ7xtFC9eN6WjldXuRO
+vyntGNuMfVLgITHwXuH2yZ98G0mFO6TU/9dRY/Z3D6RTSzKdb17Yk/VnG+ry92u2
+0sgXIBvhuJuC3ksWLArwwFoMl8DVa05D4O2H76goGdCcQ0KzqBV8RPXAh3UcgP2e
+Zu90p2EGIhIk+sZTCkPd4dorxjL9nkRR86HdAgMBAAEwDQYJKoZIhvcNAQELBQAD
+ggEBAJWiCxJaTksv/BTsh/etxlDY5eHwqStqIuiovEQ8bhGAcKJ3bfWd/YTb8DUS
+hrLvXrXdOVC+U8PqPFXBpdOqcm5Dc233z52VgUCb+0EKv3lAzgKXRIo32h52skdK
+NnRrCHDeDzgfEIXR4MEJ99cLEaxWyXQhremmTYWHYznry9/4NYz40gCDxHn9dJAi
+KxFyDNxhtuKs58zp4PrBoo+542JurAoLPtRGOhdXpU2RkQVU/ho38HsAXDStAB5D
+vAoSxPuMHKgo17ffrb0oqU3didwaA9fIsz7Mr6RxmI7X03s7hLzNBq9FCqu0U3RR
+CX4zWGFNJu/ieSGVWLYKQzbYxp8=
+-----END CERTIFICATE-----
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap3/certs/ldap.csr b/tests/testflows/ldap/role_mapping/configs/ldap3/certs/ldap.csr
new file mode 100644
index 00000000000..bf569f727d6
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap3/certs/ldap.csr
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICpDCCAYwCAQAwXzELMAkGA1UEBhMCQ0ExCzAJBgNVBAgMAk9OMQ8wDQYDVQQH
+DAZPdHRhd2ExETAPBgNVBAoMCEFsdGluaXR5MQswCQYDVQQLDAJRQTESMBAGA1UE
+AwwJb3BlbmxkYXAyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtDG5
+//1OelEWrzIF5vNhVj+rwXSrkcnRV/y9DOVy5ZwLZPyFxv0/uLe5zgScVpk6f8ab
+D7UjACxOHhSaRFBKpaVWxuQ3wc1VnGDlqDHkQHB1gg5M6z5AeiNHXxdDJuYaGg4Z
+/mV4wVr6IfyJSXQJz4OZpXo35SQUO8bRQvXjelo5XV7kTr8p7RjbjH1S4CEx8F7h
+9smffBtJhTuk1P/XUWP2dw+kU0synW9e2JP1Zxvq8vdrttLIFyAb4bibgt5LFiwK
+8MBaDJfA1WtOQ+Dth++oKBnQnENCs6gVfET1wId1HID9nmbvdKdhBiISJPrGUwpD
+3eHaK8Yy/Z5EUfOh3QIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBAEzIjZQOT5R7
+mEJg+RFpCSIoPn3xJ4/VMMyWqA3bTGZKpb4S6GxgsierY/87kPL7jZrMdGYB4Dc3
+2M3VWZGXlYo8vctH1zLE9VW6CzosUpl20lhdgydoCMz3RQqdJyK8aGeFTeLtk7G/
+TRCCUFUE6jaA+VtaCPCnOJSff3jUf76xguEu7dgTZgCKV7dtBqald8gIzF3D+AJJ
+7pEN2UrC3UR0xpe2cj2GhndQJ+WsIyft3zpNFzAO13j8ZPibuVP7oDWcW3ixNCWC
+213aeRVplJGof8Eo6llDxP+6Fwp1YmOoQmwB1Xm3t4ADn7FLJ14LONLB7q40KviG
+RyLyqu3IVOI=
+-----END CERTIFICATE REQUEST-----
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap3/certs/ldap.key b/tests/testflows/ldap/role_mapping/configs/ldap3/certs/ldap.key
new file mode 100644
index 00000000000..5ab3a3f8b59
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap3/certs/ldap.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAtDG5//1OelEWrzIF5vNhVj+rwXSrkcnRV/y9DOVy5ZwLZPyF
+xv0/uLe5zgScVpk6f8abD7UjACxOHhSaRFBKpaVWxuQ3wc1VnGDlqDHkQHB1gg5M
+6z5AeiNHXxdDJuYaGg4Z/mV4wVr6IfyJSXQJz4OZpXo35SQUO8bRQvXjelo5XV7k
+Tr8p7RjbjH1S4CEx8F7h9smffBtJhTuk1P/XUWP2dw+kU0synW9e2JP1Zxvq8vdr
+ttLIFyAb4bibgt5LFiwK8MBaDJfA1WtOQ+Dth++oKBnQnENCs6gVfET1wId1HID9
+nmbvdKdhBiISJPrGUwpD3eHaK8Yy/Z5EUfOh3QIDAQABAoIBADugMMIKWcuTxYPX
+c6iGZHEbxIPRTWyCcalB0nTQAAMGbabPAJ1l8432DZ+kWu806OybFXhPIfPOtVKy
+0pFEWE8TtPE/V0vj3C5Qye2sBLFmBRwyCzXUdZV00wseMXRPs9dnTyalAR5KMnbI
+j80kfpKSI2dkV9aU57UYBuq3Xrx/TCGItwL769D4ZZW9BvbpiTZApQQFZ0gwUFFn
+btPXGU9Ti8H4mfBuZWL+5CaZdqOo76+CXvMPaUK0F9MJp4yX3XxQLRNH3qz/Tyn7
+h7QOOo0XTqoUmzRw0N9QRVH5LRdSE5yq3aF9aFKjNW59exz+62pufOFadngzkpkn
+OKCzgWkCgYEA4mOWWMzdYwMn3GtfG7whqlqy7wOmMkNb81zTDQejHBV98dnj0AHr
+deurfKWzHrAh3DXo6tFeqUIgXabhBPS/0dEx/S5sgLFmuUZP05EUYahfWBgzzmM9
+C6Oe5xIMLzxsZCJczolsfkEsoFe4o0vkvuLYoQrQL7InzewcDy8cUxsCgYEAy8Na
+YCnanSNDY03Bulcni+5sF+opaHseeki1pv3nlw8TwsWuZF9ApS+yL7ck9jJjxBRR
+RC3KGmpoqIr0vTmUYS946ngQWXPE90zfuhJfM+NRv/q0oCjH0qAcxRbTkls5On9v
+oxJ8rO7gD6K85eHqasWdbCVzdZrobOXzay37tmcCgYBfyUUmw190cjReZauzH3Gb
+E48b5A5gu/Fe0cqWe8G+szU7rDZgnz9SAGnpbm6QMHPTKZgoKngD42+wUFhq8Wdr
+zjh5aDgOZ4EQKTjDSmI2Q7g7nNnmnESK9SrZl+BB6C3wXD2qQaj+7nKEUTlVFlpt
+jaucz+dwFtASp7Djl8pDOwKBgEtr2c3ycArt/ImLRIP2spqm+7e2YvFbcSKOOz6+
+iLRvTj8v8KcSYtlB2FC1F6dRa4AujQ4RbNduP6LzHDfWUkfOzJDtNBAIPAXVnJJB
+LqAEKkRHRghqT9x0i3GgS1vHDF3MwcO4mhFgserXr9ffUWeIEgbvrdcAKbv1Oa6Y
+bK1NAoGAGPm8ISmboDJynjBl9wMrkcy23Pwg9kmyocdWUHh0zMLDKriZNKYB6u/U
+C+/RTfkohPoHPzkeqWiHp7z3JhMItYUfTkNW6vMCxEGc0NEN6ZyMIjtiDPGN1n6O
+E7jmODFmj1AQICQGdV5SHp+yKvKyb0YHKyDwETbs4SZBXxVvjEw=
+-----END RSA PRIVATE KEY-----
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap3/config/export.ldif b/tests/testflows/ldap/role_mapping/configs/ldap3/config/export.ldif
new file mode 100644
index 00000000000..6ac9a995efd
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap3/config/export.ldif
@@ -0,0 +1,64 @@
+# LDIF Export for dc=company,dc=com
+# Server: openldap (openldap)
+# Search Scope: sub
+# Search Filter: (objectClass=*)
+# Total Entries: 7
+#
+# Generated by phpLDAPadmin (http://phpldapadmin.sourceforge.net) on May 22, 2020 5:51 pm
+# Version: 1.2.5
+
+# Entry 1: dc=company,dc=com
+#dn: dc=company,dc=com
+#dc: company
+#o: company
+#objectclass: top
+#objectclass: dcObject
+#objectclass: organization
+
+# Entry 2: cn=admin,dc=company,dc=com
+#dn: cn=admin,dc=company,dc=com
+#cn: admin
+#description: LDAP administrator
+#objectclass: simpleSecurityObject
+#objectclass: organizationalRole
+#userpassword: {SSHA}eUEupkQCTvq9SkrxfWGSe5rX+orrjVbF
+
+# Entry 3: ou=groups,dc=company,dc=com
+dn: ou=groups,dc=company,dc=com
+objectclass: organizationalUnit
+objectclass: top
+ou: groups
+
+# Entry 4: cn=admin,ou=groups,dc=company,dc=com
+dn: cn=admin,ou=groups,dc=company,dc=com
+cn: admin
+gidnumber: 500
+objectclass: posixGroup
+objectclass: top
+
+# Entry 5: cn=users,ou=groups,dc=company,dc=com
+dn: cn=users,ou=groups,dc=company,dc=com
+cn: users
+gidnumber: 501
+objectclass: posixGroup
+objectclass: top
+
+# Entry 6: ou=users,dc=company,dc=com
+dn: ou=users,dc=company,dc=com
+objectclass: organizationalUnit
+objectclass: top
+ou: users
+
+# Entry 7: cn=user3,ou=users,dc=company,dc=com
+dn: cn=user3,ou=users,dc=company,dc=com
+cn: user3
+gidnumber: 501
+givenname: John
+homedirectory: /home/users/user3
+objectclass: inetOrgPerson
+objectclass: posixAccount
+objectclass: top
+sn: User
+uid: user3
+uidnumber: 1003
+userpassword: user3
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap4/certs/ca.crt b/tests/testflows/ldap/role_mapping/configs/ldap4/certs/ca.crt
new file mode 100644
index 00000000000..8c71e3afc91
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap4/certs/ca.crt
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDlTCCAn2gAwIBAgIUJBqw2dHM2DDCZjYSkPOESlvDH6swDQYJKoZIhvcNAQEL
+BQAwWjELMAkGA1UEBhMCQ0ExCzAJBgNVBAgMAk9OMQ8wDQYDVQQHDAZPdHRhd2Ex
+ETAPBgNVBAoMCEFsdGluaXR5MQswCQYDVQQLDAJRQTENMAsGA1UEAwwEcm9vdDAe
+Fw0yMDA2MTExOTAzNDhaFw0zMDA2MDkxOTAzNDhaMFoxCzAJBgNVBAYTAkNBMQsw
+CQYDVQQIDAJPTjEPMA0GA1UEBwwGT3R0YXdhMREwDwYDVQQKDAhBbHRpbml0eTEL
+MAkGA1UECwwCUUExDTALBgNVBAMMBHJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC9Irr0zGV+HCI2fZ0ht4hR5It4Sbjz4RwZV8ENRP/+TEz8l9eK
+J6ygxhKX7SMYzIs/jS9Gsq4plX1r2ujW1qRf8yLpR4+dGLP+jBRi1drj0XjZXosT
+SERjWzgPauWxL9LN8+l26eBAqz6fw5e0W8WRSTgf5iGiCcKOTmaATIUjP0CdfWKK
+qpktI4vhe++CXZFJ3usR+8KZ/FwwbCLJM/3J2HnbcXfcaYPYvr1tfqLudKSTbG9H
+M3+AVwjctdesc/0sbd51Zsm0ClQptMbuKnDCYauGg61kNkgbgPgRmH9Pzo67DtxF
+/WW+PtOzq8xLOifciQ9Piboy9QBSQZGwf4wzAgMBAAGjUzBRMB0GA1UdDgQWBBSi
+njya0RDozx3OZTLYFpwqYnlpIDAfBgNVHSMEGDAWgBSinjya0RDozx3OZTLYFpwq
+YnlpIDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBAD7VyFg7F
+U1C25KFvtauchAOjCW6w7U/b3z1dVZvcQ88/kH1VsLUcfGixlSilUEfPTJsi7OA0
+R5BQdh2GGcjUJv4iqEFGU05KvMVmRRKn08P62+ZhJxKMxG26VzcliRZzCMkI6d0W
+lFwI6nM45yeqdHVh5k4xbuJzqpbD9BtXXLI+/Ra9Fx8S9ETA3GdidpZLU5P1VLxq
+UuedfqyAVWZXpr6TAURGxouRmRzul9yFzbSUex+MLEIPrstjtEwV3+tBQZJz9xAS
+TVPj+Nv3LO7GCq54bdwkq1ioWbSL2hEmABkj6kdW/JwmfhGHf/2rirDVMzrTYw07
+dFJfAZC+FEsv
+-----END CERTIFICATE-----
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap4/certs/dhparam.pem b/tests/testflows/ldap/role_mapping/configs/ldap4/certs/dhparam.pem
new file mode 100644
index 00000000000..0a96faffd62
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap4/certs/dhparam.pem
@@ -0,0 +1,5 @@
+-----BEGIN DH PARAMETERS-----
+MIGHAoGBAJitt2hhnpDViQ5ko2ipBMdjy+bZ6FR/WdZ987R7lQvBkKehPXmxtEyV
+AO6ofv5CZSDJokc5bUeBOAtg0EhMTCH82uPdwQvt58jRXcxXBg4JTjkx+oW9LBv2
+FdZsbaX8+SYivmiZ0Jp8T/HBm/4DA9VBS0O5GFRS4C7dHhmSTPfDAgEC
+-----END DH PARAMETERS-----
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap4/certs/ldap.crt b/tests/testflows/ldap/role_mapping/configs/ldap4/certs/ldap.crt
new file mode 100644
index 00000000000..9167cbf861d
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap4/certs/ldap.crt
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDQDCCAigCFCJ7El0ntrGktZVTYTZd+OwtcJjBMA0GCSqGSIb3DQEBCwUAMFox
+CzAJBgNVBAYTAkNBMQswCQYDVQQIDAJPTjEPMA0GA1UEBwwGT3R0YXdhMREwDwYD
+VQQKDAhBbHRpbml0eTELMAkGA1UECwwCUUExDTALBgNVBAMMBHJvb3QwHhcNMjAw
+NjExMTkxMTQzWhcNMzAwNjA5MTkxMTQzWjBfMQswCQYDVQQGEwJDQTELMAkGA1UE
+CAwCT04xDzANBgNVBAcMBk90dGF3YTERMA8GA1UECgwIQWx0aW5pdHkxCzAJBgNV
+BAsMAlFBMRIwEAYDVQQDDAlvcGVubGRhcDIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC0Mbn//U56URavMgXm82FWP6vBdKuRydFX/L0M5XLlnAtk/IXG
+/T+4t7nOBJxWmTp/xpsPtSMALE4eFJpEUEqlpVbG5DfBzVWcYOWoMeRAcHWCDkzr
+PkB6I0dfF0Mm5hoaDhn+ZXjBWvoh/IlJdAnPg5mlejflJBQ7xtFC9eN6WjldXuRO
+vyntGNuMfVLgITHwXuH2yZ98G0mFO6TU/9dRY/Z3D6RTSzKdb17Yk/VnG+ry92u2
+0sgXIBvhuJuC3ksWLArwwFoMl8DVa05D4O2H76goGdCcQ0KzqBV8RPXAh3UcgP2e
+Zu90p2EGIhIk+sZTCkPd4dorxjL9nkRR86HdAgMBAAEwDQYJKoZIhvcNAQELBQAD
+ggEBAJWiCxJaTksv/BTsh/etxlDY5eHwqStqIuiovEQ8bhGAcKJ3bfWd/YTb8DUS
+hrLvXrXdOVC+U8PqPFXBpdOqcm5Dc233z52VgUCb+0EKv3lAzgKXRIo32h52skdK
+NnRrCHDeDzgfEIXR4MEJ99cLEaxWyXQhremmTYWHYznry9/4NYz40gCDxHn9dJAi
+KxFyDNxhtuKs58zp4PrBoo+542JurAoLPtRGOhdXpU2RkQVU/ho38HsAXDStAB5D
+vAoSxPuMHKgo17ffrb0oqU3didwaA9fIsz7Mr6RxmI7X03s7hLzNBq9FCqu0U3RR
+CX4zWGFNJu/ieSGVWLYKQzbYxp8=
+-----END CERTIFICATE-----
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap4/certs/ldap.csr b/tests/testflows/ldap/role_mapping/configs/ldap4/certs/ldap.csr
new file mode 100644
index 00000000000..bf569f727d6
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap4/certs/ldap.csr
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICpDCCAYwCAQAwXzELMAkGA1UEBhMCQ0ExCzAJBgNVBAgMAk9OMQ8wDQYDVQQH
+DAZPdHRhd2ExETAPBgNVBAoMCEFsdGluaXR5MQswCQYDVQQLDAJRQTESMBAGA1UE
+AwwJb3BlbmxkYXAyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtDG5
+//1OelEWrzIF5vNhVj+rwXSrkcnRV/y9DOVy5ZwLZPyFxv0/uLe5zgScVpk6f8ab
+D7UjACxOHhSaRFBKpaVWxuQ3wc1VnGDlqDHkQHB1gg5M6z5AeiNHXxdDJuYaGg4Z
+/mV4wVr6IfyJSXQJz4OZpXo35SQUO8bRQvXjelo5XV7kTr8p7RjbjH1S4CEx8F7h
+9smffBtJhTuk1P/XUWP2dw+kU0synW9e2JP1Zxvq8vdrttLIFyAb4bibgt5LFiwK
+8MBaDJfA1WtOQ+Dth++oKBnQnENCs6gVfET1wId1HID9nmbvdKdhBiISJPrGUwpD
+3eHaK8Yy/Z5EUfOh3QIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBAEzIjZQOT5R7
+mEJg+RFpCSIoPn3xJ4/VMMyWqA3bTGZKpb4S6GxgsierY/87kPL7jZrMdGYB4Dc3
+2M3VWZGXlYo8vctH1zLE9VW6CzosUpl20lhdgydoCMz3RQqdJyK8aGeFTeLtk7G/
+TRCCUFUE6jaA+VtaCPCnOJSff3jUf76xguEu7dgTZgCKV7dtBqald8gIzF3D+AJJ
+7pEN2UrC3UR0xpe2cj2GhndQJ+WsIyft3zpNFzAO13j8ZPibuVP7oDWcW3ixNCWC
+213aeRVplJGof8Eo6llDxP+6Fwp1YmOoQmwB1Xm3t4ADn7FLJ14LONLB7q40KviG
+RyLyqu3IVOI=
+-----END CERTIFICATE REQUEST-----
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap4/certs/ldap.key b/tests/testflows/ldap/role_mapping/configs/ldap4/certs/ldap.key
new file mode 100644
index 00000000000..5ab3a3f8b59
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap4/certs/ldap.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAtDG5//1OelEWrzIF5vNhVj+rwXSrkcnRV/y9DOVy5ZwLZPyF
+xv0/uLe5zgScVpk6f8abD7UjACxOHhSaRFBKpaVWxuQ3wc1VnGDlqDHkQHB1gg5M
+6z5AeiNHXxdDJuYaGg4Z/mV4wVr6IfyJSXQJz4OZpXo35SQUO8bRQvXjelo5XV7k
+Tr8p7RjbjH1S4CEx8F7h9smffBtJhTuk1P/XUWP2dw+kU0synW9e2JP1Zxvq8vdr
+ttLIFyAb4bibgt5LFiwK8MBaDJfA1WtOQ+Dth++oKBnQnENCs6gVfET1wId1HID9
+nmbvdKdhBiISJPrGUwpD3eHaK8Yy/Z5EUfOh3QIDAQABAoIBADugMMIKWcuTxYPX
+c6iGZHEbxIPRTWyCcalB0nTQAAMGbabPAJ1l8432DZ+kWu806OybFXhPIfPOtVKy
+0pFEWE8TtPE/V0vj3C5Qye2sBLFmBRwyCzXUdZV00wseMXRPs9dnTyalAR5KMnbI
+j80kfpKSI2dkV9aU57UYBuq3Xrx/TCGItwL769D4ZZW9BvbpiTZApQQFZ0gwUFFn
+btPXGU9Ti8H4mfBuZWL+5CaZdqOo76+CXvMPaUK0F9MJp4yX3XxQLRNH3qz/Tyn7
+h7QOOo0XTqoUmzRw0N9QRVH5LRdSE5yq3aF9aFKjNW59exz+62pufOFadngzkpkn
+OKCzgWkCgYEA4mOWWMzdYwMn3GtfG7whqlqy7wOmMkNb81zTDQejHBV98dnj0AHr
+deurfKWzHrAh3DXo6tFeqUIgXabhBPS/0dEx/S5sgLFmuUZP05EUYahfWBgzzmM9
+C6Oe5xIMLzxsZCJczolsfkEsoFe4o0vkvuLYoQrQL7InzewcDy8cUxsCgYEAy8Na
+YCnanSNDY03Bulcni+5sF+opaHseeki1pv3nlw8TwsWuZF9ApS+yL7ck9jJjxBRR
+RC3KGmpoqIr0vTmUYS946ngQWXPE90zfuhJfM+NRv/q0oCjH0qAcxRbTkls5On9v
+oxJ8rO7gD6K85eHqasWdbCVzdZrobOXzay37tmcCgYBfyUUmw190cjReZauzH3Gb
+E48b5A5gu/Fe0cqWe8G+szU7rDZgnz9SAGnpbm6QMHPTKZgoKngD42+wUFhq8Wdr
+zjh5aDgOZ4EQKTjDSmI2Q7g7nNnmnESK9SrZl+BB6C3wXD2qQaj+7nKEUTlVFlpt
+jaucz+dwFtASp7Djl8pDOwKBgEtr2c3ycArt/ImLRIP2spqm+7e2YvFbcSKOOz6+
+iLRvTj8v8KcSYtlB2FC1F6dRa4AujQ4RbNduP6LzHDfWUkfOzJDtNBAIPAXVnJJB
+LqAEKkRHRghqT9x0i3GgS1vHDF3MwcO4mhFgserXr9ffUWeIEgbvrdcAKbv1Oa6Y
+bK1NAoGAGPm8ISmboDJynjBl9wMrkcy23Pwg9kmyocdWUHh0zMLDKriZNKYB6u/U
+C+/RTfkohPoHPzkeqWiHp7z3JhMItYUfTkNW6vMCxEGc0NEN6ZyMIjtiDPGN1n6O
+E7jmODFmj1AQICQGdV5SHp+yKvKyb0YHKyDwETbs4SZBXxVvjEw=
+-----END RSA PRIVATE KEY-----
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap4/config/export.ldif b/tests/testflows/ldap/role_mapping/configs/ldap4/config/export.ldif
new file mode 100644
index 00000000000..36afdb4e350
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap4/config/export.ldif
@@ -0,0 +1,64 @@
+# LDIF Export for dc=company,dc=com
+# Server: openldap (openldap)
+# Search Scope: sub
+# Search Filter: (objectClass=*)
+# Total Entries: 7
+#
+# Generated by phpLDAPadmin (http://phpldapadmin.sourceforge.net) on May 22, 2020 5:51 pm
+# Version: 1.2.5
+
+# Entry 1: dc=company,dc=com
+#dn: dc=company,dc=com
+#dc: company
+#o: company
+#objectclass: top
+#objectclass: dcObject
+#objectclass: organization
+
+# Entry 2: cn=admin,dc=company,dc=com
+#dn: cn=admin,dc=company,dc=com
+#cn: admin
+#description: LDAP administrator
+#objectclass: simpleSecurityObject
+#objectclass: organizationalRole
+#userpassword: {SSHA}eUEupkQCTvq9SkrxfWGSe5rX+orrjVbF
+
+# Entry 3: ou=groups,dc=company,dc=com
+dn: ou=groups,dc=company,dc=com
+objectclass: organizationalUnit
+objectclass: top
+ou: groups
+
+# Entry 4: cn=admin,ou=groups,dc=company,dc=com
+dn: cn=admin,ou=groups,dc=company,dc=com
+cn: admin
+gidnumber: 500
+objectclass: posixGroup
+objectclass: top
+
+# Entry 5: cn=users,ou=groups,dc=company,dc=com
+dn: cn=users,ou=groups,dc=company,dc=com
+cn: users
+gidnumber: 501
+objectclass: posixGroup
+objectclass: top
+
+# Entry 6: ou=users,dc=company,dc=com
+dn: ou=users,dc=company,dc=com
+objectclass: organizationalUnit
+objectclass: top
+ou: users
+
+# Entry 7: cn=user4,ou=users,dc=company,dc=com
+dn: cn=user4,ou=users,dc=company,dc=com
+cn: user4
+gidnumber: 501
+givenname: John
+homedirectory: /home/users/user4
+objectclass: inetOrgPerson
+objectclass: posixAccount
+objectclass: top
+sn: User
+uid: user4
+uidnumber: 1004
+userpassword: user4
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap5/config/export.ldif b/tests/testflows/ldap/role_mapping/configs/ldap5/config/export.ldif
new file mode 100644
index 00000000000..bc3d2ff75fc
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap5/config/export.ldif
@@ -0,0 +1,64 @@
+# LDIF Export for dc=company,dc=com
+# Server: openldap (openldap)
+# Search Scope: sub
+# Search Filter: (objectClass=*)
+# Total Entries: 7
+#
+# Generated by phpLDAPadmin (http://phpldapadmin.sourceforge.net) on May 22, 2020 5:51 pm
+# Version: 1.2.5
+
+# Entry 1: dc=company,dc=com
+#dn: dc=company,dc=com
+#dc: company
+#o: company
+#objectclass: top
+#objectclass: dcObject
+#objectclass: organization
+
+# Entry 2: cn=admin,dc=company,dc=com
+#dn: cn=admin,dc=company,dc=com
+#cn: admin
+#description: LDAP administrator
+#objectclass: simpleSecurityObject
+#objectclass: organizationalRole
+#userpassword: {SSHA}eUEupkQCTvq9SkrxfWGSe5rX+orrjVbF
+
+# Entry 3: ou=groups,dc=company,dc=com
+dn: ou=groups,dc=company,dc=com
+objectclass: organizationalUnit
+objectclass: top
+ou: groups
+
+# Entry 4: cn=admin,ou=groups,dc=company,dc=com
+dn: cn=admin,ou=groups,dc=company,dc=com
+cn: admin
+gidnumber: 500
+objectclass: posixGroup
+objectclass: top
+
+# Entry 5: cn=users,ou=groups,dc=company,dc=com
+dn: cn=users,ou=groups,dc=company,dc=com
+cn: users
+gidnumber: 501
+objectclass: posixGroup
+objectclass: top
+
+# Entry 6: ou=users,dc=company,dc=com
+dn: ou=users,dc=company,dc=com
+objectclass: organizationalUnit
+objectclass: top
+ou: users
+
+# Entry 7: cn=user5,ou=users,dc=company,dc=com
+dn: cn=user5,ou=users,dc=company,dc=com
+cn: user5
+gidnumber: 501
+givenname: John
+homedirectory: /home/users/user5
+objectclass: inetOrgPerson
+objectclass: posixAccount
+objectclass: top
+sn: User
+uid: user5
+uidnumber: 1005
+userpassword: user5
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/certs/ca.crt b/tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/certs/ca.crt
new file mode 100644
index 00000000000..8c71e3afc91
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/certs/ca.crt
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDlTCCAn2gAwIBAgIUJBqw2dHM2DDCZjYSkPOESlvDH6swDQYJKoZIhvcNAQEL
+BQAwWjELMAkGA1UEBhMCQ0ExCzAJBgNVBAgMAk9OMQ8wDQYDVQQHDAZPdHRhd2Ex
+ETAPBgNVBAoMCEFsdGluaXR5MQswCQYDVQQLDAJRQTENMAsGA1UEAwwEcm9vdDAe
+Fw0yMDA2MTExOTAzNDhaFw0zMDA2MDkxOTAzNDhaMFoxCzAJBgNVBAYTAkNBMQsw
+CQYDVQQIDAJPTjEPMA0GA1UEBwwGT3R0YXdhMREwDwYDVQQKDAhBbHRpbml0eTEL
+MAkGA1UECwwCUUExDTALBgNVBAMMBHJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC9Irr0zGV+HCI2fZ0ht4hR5It4Sbjz4RwZV8ENRP/+TEz8l9eK
+J6ygxhKX7SMYzIs/jS9Gsq4plX1r2ujW1qRf8yLpR4+dGLP+jBRi1drj0XjZXosT
+SERjWzgPauWxL9LN8+l26eBAqz6fw5e0W8WRSTgf5iGiCcKOTmaATIUjP0CdfWKK
+qpktI4vhe++CXZFJ3usR+8KZ/FwwbCLJM/3J2HnbcXfcaYPYvr1tfqLudKSTbG9H
+M3+AVwjctdesc/0sbd51Zsm0ClQptMbuKnDCYauGg61kNkgbgPgRmH9Pzo67DtxF
+/WW+PtOzq8xLOifciQ9Piboy9QBSQZGwf4wzAgMBAAGjUzBRMB0GA1UdDgQWBBSi
+njya0RDozx3OZTLYFpwqYnlpIDAfBgNVHSMEGDAWgBSinjya0RDozx3OZTLYFpwq
+YnlpIDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBAD7VyFg7F
+U1C25KFvtauchAOjCW6w7U/b3z1dVZvcQ88/kH1VsLUcfGixlSilUEfPTJsi7OA0
+R5BQdh2GGcjUJv4iqEFGU05KvMVmRRKn08P62+ZhJxKMxG26VzcliRZzCMkI6d0W
+lFwI6nM45yeqdHVh5k4xbuJzqpbD9BtXXLI+/Ra9Fx8S9ETA3GdidpZLU5P1VLxq
+UuedfqyAVWZXpr6TAURGxouRmRzul9yFzbSUex+MLEIPrstjtEwV3+tBQZJz9xAS
+TVPj+Nv3LO7GCq54bdwkq1ioWbSL2hEmABkj6kdW/JwmfhGHf/2rirDVMzrTYw07
+dFJfAZC+FEsv
+-----END CERTIFICATE-----
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/certs/dhparam.pem b/tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/certs/dhparam.pem
new file mode 100644
index 00000000000..0a96faffd62
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/certs/dhparam.pem
@@ -0,0 +1,5 @@
+-----BEGIN DH PARAMETERS-----
+MIGHAoGBAJitt2hhnpDViQ5ko2ipBMdjy+bZ6FR/WdZ987R7lQvBkKehPXmxtEyV
+AO6ofv5CZSDJokc5bUeBOAtg0EhMTCH82uPdwQvt58jRXcxXBg4JTjkx+oW9LBv2
+FdZsbaX8+SYivmiZ0Jp8T/HBm/4DA9VBS0O5GFRS4C7dHhmSTPfDAgEC
+-----END DH PARAMETERS-----
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/certs/ldap.crt b/tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/certs/ldap.crt
new file mode 100644
index 00000000000..9167cbf861d
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/certs/ldap.crt
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDQDCCAigCFCJ7El0ntrGktZVTYTZd+OwtcJjBMA0GCSqGSIb3DQEBCwUAMFox
+CzAJBgNVBAYTAkNBMQswCQYDVQQIDAJPTjEPMA0GA1UEBwwGT3R0YXdhMREwDwYD
+VQQKDAhBbHRpbml0eTELMAkGA1UECwwCUUExDTALBgNVBAMMBHJvb3QwHhcNMjAw
+NjExMTkxMTQzWhcNMzAwNjA5MTkxMTQzWjBfMQswCQYDVQQGEwJDQTELMAkGA1UE
+CAwCT04xDzANBgNVBAcMBk90dGF3YTERMA8GA1UECgwIQWx0aW5pdHkxCzAJBgNV
+BAsMAlFBMRIwEAYDVQQDDAlvcGVubGRhcDIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC0Mbn//U56URavMgXm82FWP6vBdKuRydFX/L0M5XLlnAtk/IXG
+/T+4t7nOBJxWmTp/xpsPtSMALE4eFJpEUEqlpVbG5DfBzVWcYOWoMeRAcHWCDkzr
+PkB6I0dfF0Mm5hoaDhn+ZXjBWvoh/IlJdAnPg5mlejflJBQ7xtFC9eN6WjldXuRO
+vyntGNuMfVLgITHwXuH2yZ98G0mFO6TU/9dRY/Z3D6RTSzKdb17Yk/VnG+ry92u2
+0sgXIBvhuJuC3ksWLArwwFoMl8DVa05D4O2H76goGdCcQ0KzqBV8RPXAh3UcgP2e
+Zu90p2EGIhIk+sZTCkPd4dorxjL9nkRR86HdAgMBAAEwDQYJKoZIhvcNAQELBQAD
+ggEBAJWiCxJaTksv/BTsh/etxlDY5eHwqStqIuiovEQ8bhGAcKJ3bfWd/YTb8DUS
+hrLvXrXdOVC+U8PqPFXBpdOqcm5Dc233z52VgUCb+0EKv3lAzgKXRIo32h52skdK
+NnRrCHDeDzgfEIXR4MEJ99cLEaxWyXQhremmTYWHYznry9/4NYz40gCDxHn9dJAi
+KxFyDNxhtuKs58zp4PrBoo+542JurAoLPtRGOhdXpU2RkQVU/ho38HsAXDStAB5D
+vAoSxPuMHKgo17ffrb0oqU3didwaA9fIsz7Mr6RxmI7X03s7hLzNBq9FCqu0U3RR
+CX4zWGFNJu/ieSGVWLYKQzbYxp8=
+-----END CERTIFICATE-----
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/certs/ldap.csr b/tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/certs/ldap.csr
new file mode 100644
index 00000000000..bf569f727d6
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/certs/ldap.csr
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICpDCCAYwCAQAwXzELMAkGA1UEBhMCQ0ExCzAJBgNVBAgMAk9OMQ8wDQYDVQQH
+DAZPdHRhd2ExETAPBgNVBAoMCEFsdGluaXR5MQswCQYDVQQLDAJRQTESMBAGA1UE
+AwwJb3BlbmxkYXAyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtDG5
+//1OelEWrzIF5vNhVj+rwXSrkcnRV/y9DOVy5ZwLZPyFxv0/uLe5zgScVpk6f8ab
+D7UjACxOHhSaRFBKpaVWxuQ3wc1VnGDlqDHkQHB1gg5M6z5AeiNHXxdDJuYaGg4Z
+/mV4wVr6IfyJSXQJz4OZpXo35SQUO8bRQvXjelo5XV7kTr8p7RjbjH1S4CEx8F7h
+9smffBtJhTuk1P/XUWP2dw+kU0synW9e2JP1Zxvq8vdrttLIFyAb4bibgt5LFiwK
+8MBaDJfA1WtOQ+Dth++oKBnQnENCs6gVfET1wId1HID9nmbvdKdhBiISJPrGUwpD
+3eHaK8Yy/Z5EUfOh3QIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBAEzIjZQOT5R7
+mEJg+RFpCSIoPn3xJ4/VMMyWqA3bTGZKpb4S6GxgsierY/87kPL7jZrMdGYB4Dc3
+2M3VWZGXlYo8vctH1zLE9VW6CzosUpl20lhdgydoCMz3RQqdJyK8aGeFTeLtk7G/
+TRCCUFUE6jaA+VtaCPCnOJSff3jUf76xguEu7dgTZgCKV7dtBqald8gIzF3D+AJJ
+7pEN2UrC3UR0xpe2cj2GhndQJ+WsIyft3zpNFzAO13j8ZPibuVP7oDWcW3ixNCWC
+213aeRVplJGof8Eo6llDxP+6Fwp1YmOoQmwB1Xm3t4ADn7FLJ14LONLB7q40KviG
+RyLyqu3IVOI=
+-----END CERTIFICATE REQUEST-----
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/certs/ldap.key b/tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/certs/ldap.key
new file mode 100644
index 00000000000..5ab3a3f8b59
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/certs/ldap.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAtDG5//1OelEWrzIF5vNhVj+rwXSrkcnRV/y9DOVy5ZwLZPyF
+xv0/uLe5zgScVpk6f8abD7UjACxOHhSaRFBKpaVWxuQ3wc1VnGDlqDHkQHB1gg5M
+6z5AeiNHXxdDJuYaGg4Z/mV4wVr6IfyJSXQJz4OZpXo35SQUO8bRQvXjelo5XV7k
+Tr8p7RjbjH1S4CEx8F7h9smffBtJhTuk1P/XUWP2dw+kU0synW9e2JP1Zxvq8vdr
+ttLIFyAb4bibgt5LFiwK8MBaDJfA1WtOQ+Dth++oKBnQnENCs6gVfET1wId1HID9
+nmbvdKdhBiISJPrGUwpD3eHaK8Yy/Z5EUfOh3QIDAQABAoIBADugMMIKWcuTxYPX
+c6iGZHEbxIPRTWyCcalB0nTQAAMGbabPAJ1l8432DZ+kWu806OybFXhPIfPOtVKy
+0pFEWE8TtPE/V0vj3C5Qye2sBLFmBRwyCzXUdZV00wseMXRPs9dnTyalAR5KMnbI
+j80kfpKSI2dkV9aU57UYBuq3Xrx/TCGItwL769D4ZZW9BvbpiTZApQQFZ0gwUFFn
+btPXGU9Ti8H4mfBuZWL+5CaZdqOo76+CXvMPaUK0F9MJp4yX3XxQLRNH3qz/Tyn7
+h7QOOo0XTqoUmzRw0N9QRVH5LRdSE5yq3aF9aFKjNW59exz+62pufOFadngzkpkn
+OKCzgWkCgYEA4mOWWMzdYwMn3GtfG7whqlqy7wOmMkNb81zTDQejHBV98dnj0AHr
+deurfKWzHrAh3DXo6tFeqUIgXabhBPS/0dEx/S5sgLFmuUZP05EUYahfWBgzzmM9
+C6Oe5xIMLzxsZCJczolsfkEsoFe4o0vkvuLYoQrQL7InzewcDy8cUxsCgYEAy8Na
+YCnanSNDY03Bulcni+5sF+opaHseeki1pv3nlw8TwsWuZF9ApS+yL7ck9jJjxBRR
+RC3KGmpoqIr0vTmUYS946ngQWXPE90zfuhJfM+NRv/q0oCjH0qAcxRbTkls5On9v
+oxJ8rO7gD6K85eHqasWdbCVzdZrobOXzay37tmcCgYBfyUUmw190cjReZauzH3Gb
+E48b5A5gu/Fe0cqWe8G+szU7rDZgnz9SAGnpbm6QMHPTKZgoKngD42+wUFhq8Wdr
+zjh5aDgOZ4EQKTjDSmI2Q7g7nNnmnESK9SrZl+BB6C3wXD2qQaj+7nKEUTlVFlpt
+jaucz+dwFtASp7Djl8pDOwKBgEtr2c3ycArt/ImLRIP2spqm+7e2YvFbcSKOOz6+
+iLRvTj8v8KcSYtlB2FC1F6dRa4AujQ4RbNduP6LzHDfWUkfOzJDtNBAIPAXVnJJB
+LqAEKkRHRghqT9x0i3GgS1vHDF3MwcO4mhFgserXr9ffUWeIEgbvrdcAKbv1Oa6Y
+bK1NAoGAGPm8ISmboDJynjBl9wMrkcy23Pwg9kmyocdWUHh0zMLDKriZNKYB6u/U
+C+/RTfkohPoHPzkeqWiHp7z3JhMItYUfTkNW6vMCxEGc0NEN6ZyMIjtiDPGN1n6O
+E7jmODFmj1AQICQGdV5SHp+yKvKyb0YHKyDwETbs4SZBXxVvjEw=
+-----END RSA PRIVATE KEY-----
diff --git a/tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/config/export.ldif b/tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/config/export.ldif
new file mode 100644
index 00000000000..c6470176a5e
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/configs/ldap5/ldap2/config/export.ldif
@@ -0,0 +1,64 @@
+# LDIF Export for dc=company,dc=com
+# Server: openldap (openldap)
+# Search Scope: sub
+# Search Filter: (objectClass=*)
+# Total Entries: 7
+#
+# Generated by phpLDAPadmin (http://phpldapadmin.sourceforge.net) on May 22, 2020 5:51 pm
+# Version: 1.2.5
+
+# Entry 1: dc=company,dc=com
+#dn: dc=company,dc=com
+#dc: company
+#o: company
+#objectclass: top
+#objectclass: dcObject
+#objectclass: organization
+
+# Entry 2: cn=admin,dc=company,dc=com
+#dn: cn=admin,dc=company,dc=com
+#cn: admin
+#description: LDAP administrator
+#objectclass: simpleSecurityObject
+#objectclass: organizationalRole
+#userpassword: {SSHA}eUEupkQCTvq9SkrxfWGSe5rX+orrjVbF
+
+# Entry 3: ou=groups,dc=company,dc=com
+dn: ou=groups,dc=company,dc=com
+objectclass: organizationalUnit
+objectclass: top
+ou: groups
+
+# Entry 4: cn=admin,ou=groups,dc=company,dc=com
+dn: cn=admin,ou=groups,dc=company,dc=com
+cn: admin
+gidnumber: 500
+objectclass: posixGroup
+objectclass: top
+
+# Entry 5: cn=users,ou=groups,dc=company,dc=com
+dn: cn=users,ou=groups,dc=company,dc=com
+cn: users
+gidnumber: 501
+objectclass: posixGroup
+objectclass: top
+
+# Entry 6: ou=users,dc=company,dc=com
+dn: ou=users,dc=company,dc=com
+objectclass: organizationalUnit
+objectclass: top
+ou: users
+
+# Entry 7: cn=user1,ou=users,dc=company,dc=com
+dn: cn=user1,ou=users,dc=company,dc=com
+cn: user1
+gidnumber: 501
+givenname: John1
+homedirectory: /home/users/user1
+objectclass: inetOrgPerson
+objectclass: posixAccount
+objectclass: top
+sn: User1
+uid: user1
+uidnumber: 1001
+userpassword: user1
diff --git a/tests/testflows/ldap/role_mapping/docker-compose/clickhouse-service.yml b/tests/testflows/ldap/role_mapping/docker-compose/clickhouse-service.yml
new file mode 100644
index 00000000000..0789decf022
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/docker-compose/clickhouse-service.yml
@@ -0,0 +1,28 @@
+version: '2.3'
+
+services:
+  clickhouse:
+    image: yandex/clickhouse-integration-test
+    expose:
+      - "9000"
+      - "9009"
+      - "8123"
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d:/etc/clickhouse-server/config.d"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.d/:/etc/clickhouse-server/users.d"
+      - "${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"
+    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: 10
+      start_period: 300s
+    cap_add:
+      - SYS_PTRACE
+    security_opt:
+      - label:disable
diff --git a/tests/testflows/ldap/role_mapping/docker-compose/docker-compose.yml b/tests/testflows/ldap/role_mapping/docker-compose/docker-compose.yml
new file mode 100644
index 00000000000..c8ff683df58
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/docker-compose/docker-compose.yml
@@ -0,0 +1,162 @@
+version: '2.3'
+
+services:
+  openldap1:
+    # plain text
+    extends:
+      file: openldap-service.yml
+      service: openldap
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/configs/ldap1/config:/container/service/slapd/assets/config/bootstrap/ldif/custom"
+
+  openldap2:
+    # TLS - never
+    extends:
+      file: openldap-service.yml
+      service: openldap
+    environment:
+      LDAP_TLS: "true"
+      LDAP_TLS_CRT_FILENAME: "ldap.crt"
+      LDAP_TLS_KEY_FILENAME: "ldap.key"
+      LDAP_TLS_DH_PARAM_FILENAME: "dhparam.pem"
+      LDAP_TLS_CA_CRT_FILENAME: "ca.crt"
+      LDAP_TLS_ENFORCE: "false"
+      LDAP_TLS_VERIFY_CLIENT: "never"
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/configs/ldap2/config:/container/service/slapd/assets/config/bootstrap/ldif/custom"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/ldap2/certs:/container/service/slapd/assets/certs/"
+
+  openldap3:
+    # plain text - custom port
+    extends:
+      file: openldap-service.yml
+      service: openldap
+    expose:
+      - "3089"
+    environment:
+      LDAP_PORT: "3089"
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/configs/ldap3/config:/container/service/slapd/assets/config/bootstrap/ldif/custom"
+
+  openldap4:
+    # TLS - never custom port
+    extends:
+      file: openldap-service.yml
+      service: openldap
+    expose:
+      - "3089"
+      - "6036"
+    environment:
+      LDAP_PORT: "3089"
+      LDAPS_PORT: "6036"
+      LDAP_TLS: "true"
+      LDAP_TLS_CRT_FILENAME: "ldap.crt"
+      LDAP_TLS_KEY_FILENAME: "ldap.key"
+      LDAP_TLS_DH_PARAM_FILENAME: "dhparam.pem"
+      LDAP_TLS_CA_CRT_FILENAME: "ca.crt"
+      LDAP_TLS_ENFORCE: "false"
+      LDAP_TLS_VERIFY_CLIENT: "never"
+      LDAP_TLS_CIPHER_SUITE: "SECURE256:+SECURE128:-VERS-TLS-ALL:+VERS-TLS1.2:-RSA:-DHE-DSS:-CAMELLIA-128-CBC:-CAMELLIA-256-CBC"
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/configs/ldap4/config:/container/service/slapd/assets/config/bootstrap/ldif/custom"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/ldap4/certs:/container/service/slapd/assets/certs/"
+
+  openldap5:
+    # TLS - try
+    extends:
+      file: openldap-service.yml
+      service: openldap
+    environment:
+      LDAP_TLS: "true"
+      LDAP_TLS_CRT_FILENAME: "ldap.crt"
+      LDAP_TLS_KEY_FILENAME: "ldap.key"
+      LDAP_TLS_DH_PARAM_FILENAME: "dhparam.pem"
+      LDAP_TLS_CA_CRT_FILENAME: "ca.crt"
+      LDAP_TLS_ENFORCE: "false"
+      LDAP_TLS_VERIFY_CLIENT: "try"
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/configs/ldap5/config:/container/service/slapd/assets/config/bootstrap/ldif/custom"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/ldap5/certs:/container/service/slapd/assets/certs/"
+
+  phpldapadmin:
+    extends:
+      file: openldap-service.yml
+      service: phpldapadmin
+    environment:
+      PHPLDAPADMIN_LDAP_HOSTS: "openldap1"
+    depends_on:
+      openldap1:
+        condition: service_healthy
+
+  zookeeper:
+    extends:
+      file: zookeeper-service.yml
+      service: zookeeper
+
+  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
+      openldap1:
+        condition: service_healthy
+      openldap2:
+        condition: service_healthy
+      openldap3:
+        condition: service_healthy
+      openldap4:
+        condition: service_healthy
+      openldap5:
+        condition: service_healthy
+      phpldapadmin:
+        condition: service_healthy
diff --git a/tests/testflows/ldap/role_mapping/docker-compose/openldap-service.yml b/tests/testflows/ldap/role_mapping/docker-compose/openldap-service.yml
new file mode 100644
index 00000000000..139907c513c
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/docker-compose/openldap-service.yml
@@ -0,0 +1,40 @@
+version: '2.3'
+
+services:
+  openldap:
+    image: osixia/openldap:1.4.0
+    command: "--copy-service --loglevel debug"
+    environment:
+      LDAP_ORGANIZATION: "company"
+      LDAP_DOMAIN: "company.com"
+      LDAP_ADMIN_PASSWORD: "admin"
+      LDAP_TLS: "false"
+    expose:
+      - "389"
+      - "636"
+    healthcheck:
+      test: ldapsearch -x -H ldap://localhost:$${LDAP_PORT:-389} -b "dc=company,dc=com" -D "cn=admin,dc=company,dc=com" -w admin
+      interval: 10s
+      timeout: 10s
+      retries: 3
+      start_period: 300s
+    security_opt:
+      - label:disable
+
+
+  phpldapadmin:
+    image: osixia/phpldapadmin:0.9.0
+    container_name: phpldapadmin
+    environment:
+      PHPLDAPADMIN_HTTPS=false:
+    ports:
+      - "8080:80"      
+    healthcheck:
+      test: echo 1
+      interval: 10s
+      timeout: 10s
+      retries: 3
+      start_period: 300s
+    security_opt:
+      - label:disable
+
diff --git a/tests/testflows/ldap/role_mapping/docker-compose/zookeeper-service.yml b/tests/testflows/ldap/role_mapping/docker-compose/zookeeper-service.yml
new file mode 100644
index 00000000000..6691a2df31c
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/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/ldap/role_mapping/regression.py b/tests/testflows/ldap/role_mapping/regression.py
new file mode 100755
index 00000000000..fff1e72a945
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/regression.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+import sys
+from testflows.core import *
+
+append_path(sys.path, "..", "..")
+
+from helpers.cluster import Cluster
+from helpers.argparser import argparser
+from ldap.role_mapping.requirements import *
+
+# Cross-outs of known fails
+xfails = {
+   "mapping/roles removed and added in parallel":
+       [(Fail, "known bug")]
+}
+
+@TestFeature
+@Name("role mapping")
+@ArgumentParser(argparser)
+@Specifications(
+    QA_SRS014_ClickHouse_LDAP_Role_Mapping
+)
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping("1.0")
+)
+@XFails(xfails)
+def regression(self, local, clickhouse_binary_path, stress=None, parallel=None):
+    """ClickHouse LDAP role mapping regression module.
+    """
+    nodes = {
+        "clickhouse": ("clickhouse1", "clickhouse2", "clickhouse3"),
+    }
+
+    with Cluster(local, clickhouse_binary_path, nodes=nodes) as cluster:
+        self.context.cluster = cluster
+        
+        if stress is not None or not hasattr(self.context, "stress"):
+            self.context.stress = stress
+        if parallel is not None or not hasattr(self.context, "parallel"):
+            self.context.parallel = parallel
+
+        Scenario(run=load("ldap.authentication.tests.sanity", "scenario"), name="ldap sanity")
+        Feature(run=load("ldap.role_mapping.tests.server_config", "feature"))
+        Feature(run=load("ldap.role_mapping.tests.mapping", "feature"))
+
+if main():
+    regression()
diff --git a/tests/testflows/ldap/role_mapping/requirements/__init__.py b/tests/testflows/ldap/role_mapping/requirements/__init__.py
new file mode 100644
index 00000000000..02f7d430154
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/requirements/__init__.py
@@ -0,0 +1 @@
+from .requirements import *
diff --git a/tests/testflows/ldap/role_mapping/requirements/requirements.py b/tests/testflows/ldap/role_mapping/requirements/requirements.py
new file mode 100644
index 00000000000..ca7192e9dad
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/requirements/requirements.py
@@ -0,0 +1,1475 @@
+# These requirements were auto generated
+# from software requirements specification (SRS)
+# document by TestFlows v1.6.210101.1235930.
+# 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_014_LDAP_RoleMapping = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support mapping of [LDAP] groups to [RBAC] roles\n'
+        'for users authenticated using [LDAP] external user directory.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.1.1')
+
+RQ_SRS_014_LDAP_RoleMapping_WithFixedRoles = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.WithFixedRoles',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support mapping of [LDAP] groups to [RBAC] roles\n'
+        'for users authenticated using [LDAP] external user directory when\n'
+        'one or more roles are specified in the `<roles>` section.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.1.2')
+
+RQ_SRS_014_LDAP_RoleMapping_Search = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Search',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL perform search on the [LDAP] server and map the results to [RBAC] role names \n'
+        'when authenticating users using the [LDAP] external user directory if the `<role_mapping>` section is configured\n'
+        'as part of the [LDAP] external user directory. The matched roles SHALL be assigned to the user.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.1.3')
+
+RQ_SRS_014_LDAP_RoleMapping_Map_Role_Name_WithUTF8Characters = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Map.Role.Name.WithUTF8Characters',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support mapping [LDAP] search results for users authenticated using [LDAP] external user directory\n'
+        'to an [RBAC] role that contains UTF-8 characters.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.2.1')
+
+RQ_SRS_014_LDAP_RoleMapping_Map_Role_Name_Long = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Map.Role.Name.Long',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support mapping [LDAP] search results for users authenticated using [LDAP] external user directory\n'
+        'to an [RBAC] role that has a name with more than 128 characters.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.2.2')
+
+RQ_SRS_014_LDAP_RoleMapping_Map_Role_Name_WithSpecialXMLCharacters = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Map.Role.Name.WithSpecialXMLCharacters',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support mapping [LDAP] search results for users authenticated using [LDAP] external user directory\n'
+        'to an [RBAC] role that has a name that contains special characters that need to be escaped in XML.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.2.3')
+
+RQ_SRS_014_LDAP_RoleMapping_Map_Role_Name_WithSpecialRegexCharacters = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Map.Role.Name.WithSpecialRegexCharacters',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support mapping [LDAP] search results for users authenticated using [LDAP] external user directory\n'
+        'to an [RBAC] role that has a name that contains special characters that need to be escaped in regex.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.2.4')
+
+RQ_SRS_014_LDAP_RoleMapping_Map_MultipleRoles = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Map.MultipleRoles',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support mapping one or more [LDAP] search results for users authenticated using \n'
+        '[LDAP] external user directory to one or more [RBAC] role.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.3.1')
+
+RQ_SRS_014_LDAP_RoleMapping_LDAP_Group_Removed = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.LDAP.Group.Removed',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL not assign [RBAC] role(s) for any users authenticated using [LDAP] external user directory\n'
+        'if the corresponding [LDAP] group(s) that map those role(s) are removed. Any users that have active sessions SHALL still\n'
+        'have privileges provided by the role(s) until the next time they are authenticated.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.4.1')
+
+RQ_SRS_014_LDAP_RoleMapping_LDAP_Group_RemovedAndAdded_Parallel = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.LDAP.Group.RemovedAndAdded.Parallel',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support authenticating users using [LDAP] external user directory \n'
+        'when [LDAP] groups are removed and added \n'
+        'at the same time as [LDAP] user authentications are performed in parallel.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.4.2')
+
+RQ_SRS_014_LDAP_RoleMapping_LDAP_Group_UserRemoved = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.LDAP.Group.UserRemoved',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL not assign [RBAC] role(s) for the user authenticated using [LDAP] external user directory\n'
+        'if the user has been removed from the corresponding [LDAP] group(s) that map those role(s). \n'
+        'Any active user sessions SHALL have privileges provided by the role(s) until the next time the user is authenticated.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.4.3')
+
+RQ_SRS_014_LDAP_RoleMapping_LDAP_Group_UserRemovedAndAdded_Parallel = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.LDAP.Group.UserRemovedAndAdded.Parallel',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support authenticating users using [LDAP] external user directory\n'
+        'when [LDAP] users are added and removed from [LDAP] groups used to map to [RBAC] roles\n'
+        'at the same time as [LDAP] user authentications are performed in parallel.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.4.4')
+
+RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_NotPresent = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.NotPresent',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL not reject authentication attempt using [LDAP] external user directory if any of the roles that are \n'
+        'are mapped from [LDAP] but are not present locally.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.5.1')
+
+RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_Added = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.Added',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL add the privileges provided by the [LDAP] mapped role when the\n'
+        'role is not present during user authentication using [LDAP] external user directory\n'
+        'as soon as the role is added.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.5.2')
+
+RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_Removed = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.Removed',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL remove the privileges provided by the role from all the\n'
+        'users authenticated using [LDAP] external user directory if the [RBAC] role that was mapped\n'
+        'as a result of [LDAP] search is removed.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.5.3')
+
+RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_Readded = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.Readded',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL reassign the [RBAC] role and add all the privileges provided by the role\n'
+        'when it is re-added after removal for all [LDAP] users authenticated using external user directory\n'
+        'for any role that was mapped as a result of [LDAP] search.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.5.4')
+
+RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_RemovedAndAdded_Parallel = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.RemovedAndAdded.Parallel',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support authenticating users using [LDAP] external user directory\n'
+        'when [RBAC] roles that are mapped by [LDAP] groups\n'
+        'are added and removed at the same time as [LDAP] user authentications are performed in parallel.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.5.5')
+
+RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_New = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.New',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL not allow any new roles to be assigned to any\n'
+        'users authenticated using [LDAP] external user directory unless the role is specified\n'
+        'in the configuration of the external user directory or was mapped as a result of [LDAP] search.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.5.6')
+
+RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_NewPrivilege = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.NewPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL add new privilege to all the users authenticated using [LDAP] external user directory\n'
+        'when new privilege is added to one of the roles that were mapped as a result of [LDAP] search.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.5.7')
+
+RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_RemovedPrivilege = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.RemovedPrivilege',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL remove privilege from all the users authenticated using [LDAP] external user directory\n'
+        'when the privilege that was provided by the mapped role is removed from all the roles \n'
+        'that were mapped as a result of [LDAP] search.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.5.8')
+
+RQ_SRS_014_LDAP_RoleMapping_Authentication_Parallel = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support parallel authentication of users using [LDAP] server\n'
+        'when using [LDAP] external user directory that has role mapping enabled.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.6.1')
+
+RQ_SRS_014_LDAP_RoleMapping_Authentication_Parallel_ValidAndInvalid = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel.ValidAndInvalid',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support authentication of valid users and\n'
+        'prohibit authentication of invalid users using [LDAP] server\n'
+        'in parallel without having invalid attempts affecting valid authentications\n'
+        'when using [LDAP] external user directory that has role mapping enabled.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.6.2')
+
+RQ_SRS_014_LDAP_RoleMapping_Authentication_Parallel_MultipleServers = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel.MultipleServers',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support parallel authentication of external [LDAP] users\n'
+        'authenticated using multiple [LDAP] external user directories that have\n'
+        'role mapping enabled.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.6.3')
+
+RQ_SRS_014_LDAP_RoleMapping_Authentication_Parallel_LocalOnly = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel.LocalOnly',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support parallel authentication of users defined only locally\n'
+        'when one or more [LDAP] external user directories with role mapping\n'
+        'are specified in the configuration file.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.6.4')
+
+RQ_SRS_014_LDAP_RoleMapping_Authentication_Parallel_LocalAndMultipleLDAP = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel.LocalAndMultipleLDAP',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support parallel authentication of local and external [LDAP] users\n'
+        'authenticated using multiple [LDAP] external user directories with role mapping enabled.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.6.5')
+
+RQ_SRS_014_LDAP_RoleMapping_Authentication_Parallel_SameUser = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel.SameUser',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support parallel authentication of the same external [LDAP] user\n'
+        'authenticated using the same [LDAP] external user directory with role mapping enabled.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.6.6')
+
+RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_BindDN = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.BindDN',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the `<bind_dn>` parameter in the `<ldap_servers><server_name>` section\n'
+        'of the `config.xml` that SHALL be used to construct the `DN` to bind to.\n'
+        'The resulting `DN` SHALL be constructed by replacing all `{user_name}` substrings of the template \n'
+        'with the actual user name during each authentication attempt.\n'
+        '\n'
+        'For example, \n'
+        '\n'
+        '```xml\n'
+        '<yandex>\n'
+        '    <ldap_servers>\n'
+        '        <my_ldap_server>\n'
+        '            <!-- ... -->\n'
+        '            <bind_dn>uid={user_name},ou=users,dc=example,dc=com</bind_dn>\n'
+        '            <!-- ... -->\n'
+        '        </my_ldap_server>\n'
+        '    </ldap_servers>\n'
+        '</yandex>\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.7.1.1')
+
+RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_BindDN_ConflictWith_AuthDN = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.BindDN.ConflictWith.AuthDN',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error if both `<bind_dn>` and `<auth_dn_prefix>` or `<auth_dn_suffix>` parameters\n'
+        'are specified as part of [LDAP] server description in the `<ldap_servers>` section of the `config.xml`.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.7.1.2')
+
+RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Syntax = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Syntax',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the `role_mapping` sub-section in the `<user_directories><ldap>` section\n'
+        'of the `config.xml`.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```xml\n'
+        '<yandex>\n'
+        '    <user_directories>\n'
+        '        <ldap>\n'
+        '            <!-- ... -->\n'
+        '            <role_mapping>\n'
+        '                <base_dn>ou=groups,dc=example,dc=com</base_dn>\n'
+        '                <attribute>cn</attribute>\n'
+        '                <scope>subtree</scope>\n'
+        '                <search_filter>(&amp;(objectClass=groupOfNames)(member={bind_dn}))</search_filter>\n'
+        '                <prefix>clickhouse_</prefix>\n'
+        '            </role_mapping>\n'
+        '        </ldap>\n'
+        '    </user_directories>\n'
+        '</yandex>\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.8.1.1')
+
+RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_SpecialCharactersEscaping = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.SpecialCharactersEscaping',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support properly escaped special XML characters that can be present\n'
+        'as part of the values for different configuration parameters inside the\n'
+        '`<user_directories><ldap><role_mapping>` section of the `config.xml` such as\n'
+        '\n'
+        '* `<search_filter>` parameter\n'
+        '* `<prefix>` parameter\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.8.2.1')
+
+RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_MultipleSections = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.MultipleSections',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support multiple `<role_mapping>` sections defined inside the same `<user_directories><ldap>` section \n'
+        'of the `config.xml` and all of the `<role_mapping>` sections SHALL be applied.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.8.3.1')
+
+RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_MultipleSections_IdenticalParameters = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.MultipleSections.IdenticalParameters',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL not duplicate mapped roles when multiple `<role_mapping>` sections \n'
+        'with identical parameters are defined inside the `<user_directories><ldap>` section \n'
+        'of the `config.xml`.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.8.3.2')
+
+RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_BaseDN = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.BaseDN',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the `<base_dn>` parameter in the `<user_directories><ldap><role_mapping>` section \n'
+        'of the `config.xml` that SHALL specify the template to be used to construct the base `DN` for the [LDAP] search.\n'
+        '\n'
+        'The resulting `DN` SHALL be constructed by replacing all the `{user_name}` and `{bind_dn}` substrings of \n'
+        'the template with the actual user name and bind `DN` during each [LDAP] search.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.8.4.1')
+
+RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Attribute = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Attribute',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the `<attribute>` parameter in the `<user_directories><ldap><role_mapping>` section of \n'
+        'the `config.xml` that SHALL specify the name of the attribute whose values SHALL be returned by the [LDAP] search.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.8.5.1')
+
+RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Scope = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the `<scope>` parameter in the `<user_directories><ldap><role_mapping>` section of \n'
+        'the `config.xml` that SHALL define the scope of the LDAP search as defined \n'
+        'by the https://ldapwiki.com/wiki/LDAP%20Search%20Scopes.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.8.6.1')
+
+RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Scope_Value_Base = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope.Value.Base',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the `base` value for the the `<scope>` parameter in the \n'
+        '`<user_directories><ldap><role_mapping>` section of the `config.xml` that SHALL\n'
+        'limit the scope as specified by the https://ldapwiki.com/wiki/BaseObject.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.8.6.2')
+
+RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Scope_Value_OneLevel = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope.Value.OneLevel',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the `one_level` value for the the `<scope>` parameter in the \n'
+        '`<user_directories><ldap><role_mapping>` section of the `config.xml` that SHALL\n'
+        'limit the scope as specified by the https://ldapwiki.com/wiki/SingleLevel.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.8.6.3')
+
+RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Scope_Value_Children = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope.Value.Children',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the `children` value for the the `<scope>` parameter in the \n'
+        '`<user_directories><ldap><role_mapping>` section of the `config.xml` that SHALL\n'
+        'limit the scope as specified by the https://ldapwiki.com/wiki/SubordinateSubtree.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.8.6.4')
+
+RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Scope_Value_Subtree = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope.Value.Subtree',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the `children` value for the the `<scope>` parameter in the \n'
+        '`<user_directories><ldap><role_mapping>` section of the `config.xml` that SHALL\n'
+        'limit the scope as specified by the https://ldapwiki.com/wiki/WholeSubtree.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.8.6.5')
+
+RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Scope_Value_Default = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope.Value.Default',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the `subtree` as the default value for the the `<scope>` parameter in the \n'
+        '`<user_directories><ldap><role_mapping>` section of the `config.xml` when the `<scope>` parameter is not specified.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.8.6.6')
+
+RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_SearchFilter = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.SearchFilter',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the `<search_filter>` parameter in the `<user_directories><ldap><role_mapping>`\n'
+        'section of the `config.xml` that SHALL specify the template used to construct \n'
+        'the [LDAP filter](https://ldap.com/ldap-filters/) for the search.\n'
+        '\n'
+        'The resulting filter SHALL be constructed by replacing all `{user_name}`, `{bind_dn}`, and `{base_dn}` substrings \n'
+        'of the template with the actual user name, bind `DN`, and base `DN` during each the [LDAP] search.\n'
+        ' \n'
+        ),
+    link=None,
+    level=4,
+    num='4.8.7.1')
+
+RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Prefix = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Prefix',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the `<prefix>` parameter in the `<user directories><ldap><role_mapping>`\n'
+        'section of the `config.xml` that SHALL be expected to be in front of each string in \n'
+        'the original list of strings returned by the [LDAP] search. \n'
+        'Prefix SHALL be removed from the original strings and resulting strings SHALL be treated as [RBAC] role names. \n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.8.8.1')
+
+RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Prefix_Default = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Prefix.Default',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support empty string as the default value of the `<prefix>` parameter in \n'
+        'the `<user directories><ldap><role_mapping>` section of the `config.xml`.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.8.8.2')
+
+RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Prefix_WithUTF8Characters = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Prefix.WithUTF8Characters',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support UTF8 characters as the value of the `<prefix>` parameter in\n'
+        'the `<user directories><ldap><role_mapping>` section of the `config.xml`.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.8.8.3')
+
+RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Prefix_WithSpecialXMLCharacters = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Prefix.WithSpecialXMLCharacters',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support XML special characters as the value of the `<prefix>` parameter in\n'
+        'the `<user directories><ldap><role_mapping>` section of the `config.xml`.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.8.8.4')
+
+RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Prefix_WithSpecialRegexCharacters = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Prefix.WithSpecialRegexCharacters',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support regex special characters as the value of the `<prefix>` parameter in\n'
+        'the `<user directories><ldap><role_mapping>` section of the `config.xml`.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.8.8.5')
+
+QA_SRS014_ClickHouse_LDAP_Role_Mapping = Specification(
+    name='QA-SRS014 ClickHouse LDAP Role Mapping', 
+    description=None,
+    author='vzakaznikov',
+    date='December 4, 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='LDAP', level=2, num='3.1'),
+        Heading(name='Requirements', level=1, num='4'),
+        Heading(name='General', level=2, num='4.1'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping', level=3, num='4.1.1'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.WithFixedRoles', level=3, num='4.1.2'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Search', level=3, num='4.1.3'),
+        Heading(name='Mapped Role Names', level=2, num='4.2'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Map.Role.Name.WithUTF8Characters', level=3, num='4.2.1'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Map.Role.Name.Long', level=3, num='4.2.2'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Map.Role.Name.WithSpecialXMLCharacters', level=3, num='4.2.3'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Map.Role.Name.WithSpecialRegexCharacters', level=3, num='4.2.4'),
+        Heading(name='Multiple Roles', level=2, num='4.3'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Map.MultipleRoles', level=3, num='4.3.1'),
+        Heading(name='LDAP Groups', level=2, num='4.4'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.LDAP.Group.Removed', level=3, num='4.4.1'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.LDAP.Group.RemovedAndAdded.Parallel', level=3, num='4.4.2'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.LDAP.Group.UserRemoved', level=3, num='4.4.3'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.LDAP.Group.UserRemovedAndAdded.Parallel', level=3, num='4.4.4'),
+        Heading(name='RBAC Roles', level=2, num='4.5'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.NotPresent', level=3, num='4.5.1'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.Added', level=3, num='4.5.2'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.Removed', level=3, num='4.5.3'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.Readded', level=3, num='4.5.4'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.RemovedAndAdded.Parallel', level=3, num='4.5.5'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.New', level=3, num='4.5.6'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.NewPrivilege', level=3, num='4.5.7'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.RemovedPrivilege', level=3, num='4.5.8'),
+        Heading(name='Authentication', level=2, num='4.6'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel', level=3, num='4.6.1'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel.ValidAndInvalid', level=3, num='4.6.2'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel.MultipleServers', level=3, num='4.6.3'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel.LocalOnly', level=3, num='4.6.4'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel.LocalAndMultipleLDAP', level=3, num='4.6.5'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel.SameUser', level=3, num='4.6.6'),
+        Heading(name='Server Configuration', level=2, num='4.7'),
+        Heading(name='BindDN Parameter', level=3, num='4.7.1'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.BindDN', level=4, num='4.7.1.1'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.BindDN.ConflictWith.AuthDN', level=4, num='4.7.1.2'),
+        Heading(name='External User Directory Configuration', level=2, num='4.8'),
+        Heading(name='Syntax', level=3, num='4.8.1'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Syntax', level=4, num='4.8.1.1'),
+        Heading(name='Special Characters Escaping', level=3, num='4.8.2'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.SpecialCharactersEscaping', level=4, num='4.8.2.1'),
+        Heading(name='Multiple Sections', level=3, num='4.8.3'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.MultipleSections', level=4, num='4.8.3.1'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.MultipleSections.IdenticalParameters', level=4, num='4.8.3.2'),
+        Heading(name='BaseDN Parameter', level=3, num='4.8.4'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.BaseDN', level=4, num='4.8.4.1'),
+        Heading(name='Attribute Parameter', level=3, num='4.8.5'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Attribute', level=4, num='4.8.5.1'),
+        Heading(name='Scope Parameter', level=3, num='4.8.6'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope', level=4, num='4.8.6.1'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope.Value.Base', level=4, num='4.8.6.2'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope.Value.OneLevel', level=4, num='4.8.6.3'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope.Value.Children', level=4, num='4.8.6.4'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope.Value.Subtree', level=4, num='4.8.6.5'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope.Value.Default', level=4, num='4.8.6.6'),
+        Heading(name='Search Filter Parameter', level=3, num='4.8.7'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.SearchFilter', level=4, num='4.8.7.1'),
+        Heading(name='Prefix Parameter', level=3, num='4.8.8'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Prefix', level=4, num='4.8.8.1'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Prefix.Default', level=4, num='4.8.8.2'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Prefix.WithUTF8Characters', level=4, num='4.8.8.3'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Prefix.WithSpecialXMLCharacters', level=4, num='4.8.8.4'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Prefix.WithSpecialRegexCharacters', level=4, num='4.8.8.5'),
+        Heading(name='References', level=1, num='5'),
+        ),
+    requirements=(
+        RQ_SRS_014_LDAP_RoleMapping,
+        RQ_SRS_014_LDAP_RoleMapping_WithFixedRoles,
+        RQ_SRS_014_LDAP_RoleMapping_Search,
+        RQ_SRS_014_LDAP_RoleMapping_Map_Role_Name_WithUTF8Characters,
+        RQ_SRS_014_LDAP_RoleMapping_Map_Role_Name_Long,
+        RQ_SRS_014_LDAP_RoleMapping_Map_Role_Name_WithSpecialXMLCharacters,
+        RQ_SRS_014_LDAP_RoleMapping_Map_Role_Name_WithSpecialRegexCharacters,
+        RQ_SRS_014_LDAP_RoleMapping_Map_MultipleRoles,
+        RQ_SRS_014_LDAP_RoleMapping_LDAP_Group_Removed,
+        RQ_SRS_014_LDAP_RoleMapping_LDAP_Group_RemovedAndAdded_Parallel,
+        RQ_SRS_014_LDAP_RoleMapping_LDAP_Group_UserRemoved,
+        RQ_SRS_014_LDAP_RoleMapping_LDAP_Group_UserRemovedAndAdded_Parallel,
+        RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_NotPresent,
+        RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_Added,
+        RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_Removed,
+        RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_Readded,
+        RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_RemovedAndAdded_Parallel,
+        RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_New,
+        RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_NewPrivilege,
+        RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_RemovedPrivilege,
+        RQ_SRS_014_LDAP_RoleMapping_Authentication_Parallel,
+        RQ_SRS_014_LDAP_RoleMapping_Authentication_Parallel_ValidAndInvalid,
+        RQ_SRS_014_LDAP_RoleMapping_Authentication_Parallel_MultipleServers,
+        RQ_SRS_014_LDAP_RoleMapping_Authentication_Parallel_LocalOnly,
+        RQ_SRS_014_LDAP_RoleMapping_Authentication_Parallel_LocalAndMultipleLDAP,
+        RQ_SRS_014_LDAP_RoleMapping_Authentication_Parallel_SameUser,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_BindDN,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_BindDN_ConflictWith_AuthDN,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Syntax,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_SpecialCharactersEscaping,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_MultipleSections,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_MultipleSections_IdenticalParameters,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_BaseDN,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Attribute,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Scope,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Scope_Value_Base,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Scope_Value_OneLevel,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Scope_Value_Children,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Scope_Value_Subtree,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Scope_Value_Default,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_SearchFilter,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Prefix,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Prefix_Default,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Prefix_WithUTF8Characters,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Prefix_WithSpecialXMLCharacters,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Prefix_WithSpecialRegexCharacters,
+        ),
+    content='''
+# QA-SRS014 ClickHouse LDAP Role Mapping
+# Software Requirements Specification
+
+(c) 2020 Altinity LTD. All Rights Reserved.
+
+**Document status:** Confidential
+
+**Author:** vzakaznikov
+
+**Date:** December 4, 2020
+
+## Approval
+
+**Status:** -
+
+**Version:** -
+
+**Approved by:** -
+
+**Date:** -
+
+## Table of Contents
+
+* 1 [Revision History](#revision-history)
+* 2 [Introduction](#introduction)
+* 3 [Terminology](#terminology)
+  * 3.1 [LDAP](#ldap)
+* 4 [Requirements](#requirements)
+  * 4.1 [General](#general)
+    * 4.1.1 [RQ.SRS-014.LDAP.RoleMapping](#rqsrs-014ldaprolemapping)
+    * 4.1.2 [RQ.SRS-014.LDAP.RoleMapping.WithFixedRoles](#rqsrs-014ldaprolemappingwithfixedroles)
+    * 4.1.3 [RQ.SRS-014.LDAP.RoleMapping.Search](#rqsrs-014ldaprolemappingsearch)
+  * 4.2 [Mapped Role Names](#mapped-role-names)
+    * 4.2.1 [RQ.SRS-014.LDAP.RoleMapping.Map.Role.Name.WithUTF8Characters](#rqsrs-014ldaprolemappingmaprolenamewithutf8characters)
+    * 4.2.2 [RQ.SRS-014.LDAP.RoleMapping.Map.Role.Name.Long](#rqsrs-014ldaprolemappingmaprolenamelong)
+    * 4.2.3 [RQ.SRS-014.LDAP.RoleMapping.Map.Role.Name.WithSpecialXMLCharacters](#rqsrs-014ldaprolemappingmaprolenamewithspecialxmlcharacters)
+    * 4.2.4 [RQ.SRS-014.LDAP.RoleMapping.Map.Role.Name.WithSpecialRegexCharacters](#rqsrs-014ldaprolemappingmaprolenamewithspecialregexcharacters)
+  * 4.3 [Multiple Roles](#multiple-roles)
+    * 4.3.1 [RQ.SRS-014.LDAP.RoleMapping.Map.MultipleRoles](#rqsrs-014ldaprolemappingmapmultipleroles)
+  * 4.4 [LDAP Groups](#ldap-groups)
+    * 4.4.1 [RQ.SRS-014.LDAP.RoleMapping.LDAP.Group.Removed](#rqsrs-014ldaprolemappingldapgroupremoved)
+    * 4.4.2 [RQ.SRS-014.LDAP.RoleMapping.LDAP.Group.RemovedAndAdded.Parallel](#rqsrs-014ldaprolemappingldapgroupremovedandaddedparallel)
+    * 4.4.3 [RQ.SRS-014.LDAP.RoleMapping.LDAP.Group.UserRemoved](#rqsrs-014ldaprolemappingldapgroupuserremoved)
+    * 4.4.4 [RQ.SRS-014.LDAP.RoleMapping.LDAP.Group.UserRemovedAndAdded.Parallel](#rqsrs-014ldaprolemappingldapgroupuserremovedandaddedparallel)
+  * 4.5 [RBAC Roles](#rbac-roles)
+    * 4.5.1 [RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.NotPresent](#rqsrs-014ldaprolemappingrbacrolenotpresent)
+    * 4.5.2 [RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.Added](#rqsrs-014ldaprolemappingrbacroleadded)
+    * 4.5.3 [RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.Removed](#rqsrs-014ldaprolemappingrbacroleremoved)
+    * 4.5.4 [RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.Readded](#rqsrs-014ldaprolemappingrbacrolereadded)
+    * 4.5.5 [RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.RemovedAndAdded.Parallel](#rqsrs-014ldaprolemappingrbacroleremovedandaddedparallel)
+    * 4.5.6 [RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.New](#rqsrs-014ldaprolemappingrbacrolenew)
+    * 4.5.7 [RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.NewPrivilege](#rqsrs-014ldaprolemappingrbacrolenewprivilege)
+    * 4.5.8 [RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.RemovedPrivilege](#rqsrs-014ldaprolemappingrbacroleremovedprivilege)
+  * 4.6 [Authentication](#authentication)
+    * 4.6.1 [RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel](#rqsrs-014ldaprolemappingauthenticationparallel)
+    * 4.6.2 [RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel.ValidAndInvalid](#rqsrs-014ldaprolemappingauthenticationparallelvalidandinvalid)
+    * 4.6.3 [RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel.MultipleServers](#rqsrs-014ldaprolemappingauthenticationparallelmultipleservers)
+    * 4.6.4 [RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel.LocalOnly](#rqsrs-014ldaprolemappingauthenticationparallellocalonly)
+    * 4.6.5 [RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel.LocalAndMultipleLDAP](#rqsrs-014ldaprolemappingauthenticationparallellocalandmultipleldap)
+    * 4.6.6 [RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel.SameUser](#rqsrs-014ldaprolemappingauthenticationparallelsameuser)
+  * 4.7 [Server Configuration](#server-configuration)
+    * 4.7.1 [BindDN Parameter](#binddn-parameter)
+      * 4.7.1.1 [RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.BindDN](#rqsrs-014ldaprolemappingconfigurationserverbinddn)
+      * 4.7.1.2 [RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.BindDN.ConflictWith.AuthDN](#rqsrs-014ldaprolemappingconfigurationserverbinddnconflictwithauthdn)
+  * 4.8 [External User Directory Configuration](#external-user-directory-configuration)
+    * 4.8.1 [Syntax](#syntax)
+      * 4.8.1.1 [RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Syntax](#rqsrs-014ldaprolemappingconfigurationuserdirectoryrolemappingsyntax)
+    * 4.8.2 [Special Characters Escaping](#special-characters-escaping)
+      * 4.8.2.1 [RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.SpecialCharactersEscaping](#rqsrs-014ldaprolemappingconfigurationuserdirectoryrolemappingspecialcharactersescaping)
+    * 4.8.3 [Multiple Sections](#multiple-sections)
+      * 4.8.3.1 [RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.MultipleSections](#rqsrs-014ldaprolemappingconfigurationuserdirectoryrolemappingmultiplesections)
+      * 4.8.3.2 [RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.MultipleSections.IdenticalParameters](#rqsrs-014ldaprolemappingconfigurationuserdirectoryrolemappingmultiplesectionsidenticalparameters)
+    * 4.8.4 [BaseDN Parameter](#basedn-parameter)
+      * 4.8.4.1 [RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.BaseDN](#rqsrs-014ldaprolemappingconfigurationuserdirectoryrolemappingbasedn)
+    * 4.8.5 [Attribute Parameter](#attribute-parameter)
+      * 4.8.5.1 [RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Attribute](#rqsrs-014ldaprolemappingconfigurationuserdirectoryrolemappingattribute)
+    * 4.8.6 [Scope Parameter](#scope-parameter)
+      * 4.8.6.1 [RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope](#rqsrs-014ldaprolemappingconfigurationuserdirectoryrolemappingscope)
+      * 4.8.6.2 [RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope.Value.Base](#rqsrs-014ldaprolemappingconfigurationuserdirectoryrolemappingscopevaluebase)
+      * 4.8.6.3 [RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope.Value.OneLevel](#rqsrs-014ldaprolemappingconfigurationuserdirectoryrolemappingscopevalueonelevel)
+      * 4.8.6.4 [RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope.Value.Children](#rqsrs-014ldaprolemappingconfigurationuserdirectoryrolemappingscopevaluechildren)
+      * 4.8.6.5 [RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope.Value.Subtree](#rqsrs-014ldaprolemappingconfigurationuserdirectoryrolemappingscopevaluesubtree)
+      * 4.8.6.6 [RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope.Value.Default](#rqsrs-014ldaprolemappingconfigurationuserdirectoryrolemappingscopevaluedefault)
+    * 4.8.7 [Search Filter Parameter](#search-filter-parameter)
+      * 4.8.7.1 [RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.SearchFilter](#rqsrs-014ldaprolemappingconfigurationuserdirectoryrolemappingsearchfilter)
+    * 4.8.8 [Prefix Parameter](#prefix-parameter)
+      * 4.8.8.1 [RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Prefix](#rqsrs-014ldaprolemappingconfigurationuserdirectoryrolemappingprefix)
+      * 4.8.8.2 [RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Prefix.Default](#rqsrs-014ldaprolemappingconfigurationuserdirectoryrolemappingprefixdefault)
+      * 4.8.8.3 [RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Prefix.WithUTF8Characters](#rqsrs-014ldaprolemappingconfigurationuserdirectoryrolemappingprefixwithutf8characters)
+      * 4.8.8.4 [RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Prefix.WithSpecialXMLCharacters](#rqsrs-014ldaprolemappingconfigurationuserdirectoryrolemappingprefixwithspecialxmlcharacters)
+      * 4.8.8.5 [RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Prefix.WithSpecialRegexCharacters](#rqsrs-014ldaprolemappingconfigurationuserdirectoryrolemappingprefixwithspecialregexcharacters)
+* 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 [Revision History].
+
+## Introduction
+
+The [QA-SRS007 ClickHouse Authentication of Users via LDAP] added support for authenticating
+users using an [LDAP] server and the [QA-SRS009 ClickHouse LDAP External User Directory] added
+support for authenticating users using an [LDAP] external user directory. 
+
+This requirements specification adds additional functionality for mapping [LDAP] groups to 
+the corresponding [ClickHouse] [RBAC] roles when [LDAP] external user directory is configured.
+This functionality will enable easier access management for [LDAP] authenticated users
+as the privileges granted by the roles can be granted or revoked by granting or revoking
+a corresponding [LDAP] group to one or more [LDAP] users.
+
+For the use case when only [LDAP] user authentication is used, the roles can be
+managed using [RBAC] in the same way as for non-[LDAP] authenticated users.
+
+## Terminology
+
+### LDAP
+
+* Lightweight Directory Access Protocol
+
+## Requirements
+
+### General
+
+#### RQ.SRS-014.LDAP.RoleMapping
+version: 1.0
+
+[ClickHouse] SHALL support mapping of [LDAP] groups to [RBAC] roles
+for users authenticated using [LDAP] external user directory.
+
+#### RQ.SRS-014.LDAP.RoleMapping.WithFixedRoles
+version: 1.0
+
+[ClickHouse] SHALL support mapping of [LDAP] groups to [RBAC] roles
+for users authenticated using [LDAP] external user directory when
+one or more roles are specified in the `<roles>` section.
+
+#### RQ.SRS-014.LDAP.RoleMapping.Search
+version: 1.0
+
+[ClickHouse] SHALL perform search on the [LDAP] server and map the results to [RBAC] role names 
+when authenticating users using the [LDAP] external user directory if the `<role_mapping>` section is configured
+as part of the [LDAP] external user directory. The matched roles SHALL be assigned to the user.
+
+### Mapped Role Names
+
+#### RQ.SRS-014.LDAP.RoleMapping.Map.Role.Name.WithUTF8Characters
+version: 1.0
+
+[ClickHouse] SHALL support mapping [LDAP] search results for users authenticated using [LDAP] external user directory
+to an [RBAC] role that contains UTF-8 characters.
+
+#### RQ.SRS-014.LDAP.RoleMapping.Map.Role.Name.Long
+version: 1.0
+
+[ClickHouse] SHALL support mapping [LDAP] search results for users authenticated using [LDAP] external user directory
+to an [RBAC] role that has a name with more than 128 characters.
+
+#### RQ.SRS-014.LDAP.RoleMapping.Map.Role.Name.WithSpecialXMLCharacters
+version: 1.0
+
+[ClickHouse] SHALL support mapping [LDAP] search results for users authenticated using [LDAP] external user directory
+to an [RBAC] role that has a name that contains special characters that need to be escaped in XML.
+
+#### RQ.SRS-014.LDAP.RoleMapping.Map.Role.Name.WithSpecialRegexCharacters
+version: 1.0
+
+[ClickHouse] SHALL support mapping [LDAP] search results for users authenticated using [LDAP] external user directory
+to an [RBAC] role that has a name that contains special characters that need to be escaped in regex.
+
+### Multiple Roles
+
+#### RQ.SRS-014.LDAP.RoleMapping.Map.MultipleRoles
+version: 1.0
+
+[ClickHouse] SHALL support mapping one or more [LDAP] search results for users authenticated using 
+[LDAP] external user directory to one or more [RBAC] role.
+
+### LDAP Groups
+
+#### RQ.SRS-014.LDAP.RoleMapping.LDAP.Group.Removed
+version: 1.0
+
+[ClickHouse] SHALL not assign [RBAC] role(s) for any users authenticated using [LDAP] external user directory
+if the corresponding [LDAP] group(s) that map those role(s) are removed. Any users that have active sessions SHALL still
+have privileges provided by the role(s) until the next time they are authenticated.
+
+#### RQ.SRS-014.LDAP.RoleMapping.LDAP.Group.RemovedAndAdded.Parallel
+version: 1.0
+
+[ClickHouse] SHALL support authenticating users using [LDAP] external user directory 
+when [LDAP] groups are removed and added 
+at the same time as [LDAP] user authentications are performed in parallel.
+
+#### RQ.SRS-014.LDAP.RoleMapping.LDAP.Group.UserRemoved
+version: 1.0
+
+[ClickHouse] SHALL not assign [RBAC] role(s) for the user authenticated using [LDAP] external user directory
+if the user has been removed from the corresponding [LDAP] group(s) that map those role(s). 
+Any active user sessions SHALL have privileges provided by the role(s) until the next time the user is authenticated.
+
+#### RQ.SRS-014.LDAP.RoleMapping.LDAP.Group.UserRemovedAndAdded.Parallel
+version: 1.0
+
+[ClickHouse] SHALL support authenticating users using [LDAP] external user directory
+when [LDAP] users are added and removed from [LDAP] groups used to map to [RBAC] roles
+at the same time as [LDAP] user authentications are performed in parallel.
+
+### RBAC Roles
+
+#### RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.NotPresent
+version: 1.0
+
+[ClickHouse] SHALL not reject authentication attempt using [LDAP] external user directory if any of the roles that are 
+are mapped from [LDAP] but are not present locally.
+
+#### RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.Added
+version: 1.0
+
+[ClickHouse] SHALL add the privileges provided by the [LDAP] mapped role when the
+role is not present during user authentication using [LDAP] external user directory
+as soon as the role is added.
+
+#### RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.Removed
+version: 1.0
+
+[ClickHouse] SHALL remove the privileges provided by the role from all the
+users authenticated using [LDAP] external user directory if the [RBAC] role that was mapped
+as a result of [LDAP] search is removed.
+
+#### RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.Readded
+version: 1.0
+
+[ClickHouse] SHALL reassign the [RBAC] role and add all the privileges provided by the role
+when it is re-added after removal for all [LDAP] users authenticated using external user directory
+for any role that was mapped as a result of [LDAP] search.
+
+#### RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.RemovedAndAdded.Parallel
+version: 1.0
+
+[ClickHouse] SHALL support authenticating users using [LDAP] external user directory
+when [RBAC] roles that are mapped by [LDAP] groups
+are added and removed at the same time as [LDAP] user authentications are performed in parallel.
+
+#### RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.New
+version: 1.0
+
+[ClickHouse] SHALL not allow any new roles to be assigned to any
+users authenticated using [LDAP] external user directory unless the role is specified
+in the configuration of the external user directory or was mapped as a result of [LDAP] search.
+
+#### RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.NewPrivilege
+version: 1.0
+
+[ClickHouse] SHALL add new privilege to all the users authenticated using [LDAP] external user directory
+when new privilege is added to one of the roles that were mapped as a result of [LDAP] search.
+
+#### RQ.SRS-014.LDAP.RoleMapping.RBAC.Role.RemovedPrivilege
+version: 1.0
+
+[ClickHouse] SHALL remove privilege from all the users authenticated using [LDAP] external user directory
+when the privilege that was provided by the mapped role is removed from all the roles 
+that were mapped as a result of [LDAP] search.
+
+### Authentication
+
+#### RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel
+version: 1.0
+
+[ClickHouse] SHALL support parallel authentication of users using [LDAP] server
+when using [LDAP] external user directory that has role mapping enabled.
+
+#### RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel.ValidAndInvalid
+version: 1.0
+
+[ClickHouse] SHALL support authentication of valid users and
+prohibit authentication of invalid users using [LDAP] server
+in parallel without having invalid attempts affecting valid authentications
+when using [LDAP] external user directory that has role mapping enabled.
+
+#### RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel.MultipleServers
+version: 1.0
+
+[ClickHouse] SHALL support parallel authentication of external [LDAP] users
+authenticated using multiple [LDAP] external user directories that have
+role mapping enabled.
+
+#### RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel.LocalOnly
+version: 1.0
+
+[ClickHouse] SHALL support parallel authentication of users defined only locally
+when one or more [LDAP] external user directories with role mapping
+are specified in the configuration file.
+
+#### RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel.LocalAndMultipleLDAP
+version: 1.0
+
+[ClickHouse] SHALL support parallel authentication of local and external [LDAP] users
+authenticated using multiple [LDAP] external user directories with role mapping enabled.
+
+#### RQ.SRS-014.LDAP.RoleMapping.Authentication.Parallel.SameUser
+version: 1.0
+
+[ClickHouse] SHALL support parallel authentication of the same external [LDAP] user
+authenticated using the same [LDAP] external user directory with role mapping enabled.
+
+### Server Configuration
+
+#### BindDN Parameter
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.BindDN
+version: 1.0
+
+[ClickHouse] SHALL support the `<bind_dn>` parameter in the `<ldap_servers><server_name>` section
+of the `config.xml` that SHALL be used to construct the `DN` to bind to.
+The resulting `DN` SHALL be constructed by replacing all `{user_name}` substrings of the template 
+with the actual user name during each authentication attempt.
+
+For example, 
+
+```xml
+<yandex>
+    <ldap_servers>
+        <my_ldap_server>
+            <!-- ... -->
+            <bind_dn>uid={user_name},ou=users,dc=example,dc=com</bind_dn>
+            <!-- ... -->
+        </my_ldap_server>
+    </ldap_servers>
+</yandex>
+```
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.BindDN.ConflictWith.AuthDN
+version: 1.0
+
+[ClickHouse] SHALL return an error if both `<bind_dn>` and `<auth_dn_prefix>` or `<auth_dn_suffix>` parameters
+are specified as part of [LDAP] server description in the `<ldap_servers>` section of the `config.xml`.
+
+### External User Directory Configuration
+
+#### Syntax
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Syntax
+version: 1.0
+
+[ClickHouse] SHALL support the `role_mapping` sub-section in the `<user_directories><ldap>` section
+of the `config.xml`.
+
+For example,
+
+```xml
+<yandex>
+    <user_directories>
+        <ldap>
+            <!-- ... -->
+            <role_mapping>
+                <base_dn>ou=groups,dc=example,dc=com</base_dn>
+                <attribute>cn</attribute>
+                <scope>subtree</scope>
+                <search_filter>(&amp;(objectClass=groupOfNames)(member={bind_dn}))</search_filter>
+                <prefix>clickhouse_</prefix>
+            </role_mapping>
+        </ldap>
+    </user_directories>
+</yandex>
+```
+
+#### Special Characters Escaping
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.SpecialCharactersEscaping
+version: 1.0
+
+[ClickHouse] SHALL support properly escaped special XML characters that can be present
+as part of the values for different configuration parameters inside the
+`<user_directories><ldap><role_mapping>` section of the `config.xml` such as
+
+* `<search_filter>` parameter
+* `<prefix>` parameter
+
+#### Multiple Sections
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.MultipleSections
+version: 1.0
+
+[ClickHouse] SHALL support multiple `<role_mapping>` sections defined inside the same `<user_directories><ldap>` section 
+of the `config.xml` and all of the `<role_mapping>` sections SHALL be applied.
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.MultipleSections.IdenticalParameters
+version: 1.0
+
+[ClickHouse] SHALL not duplicate mapped roles when multiple `<role_mapping>` sections 
+with identical parameters are defined inside the `<user_directories><ldap>` section 
+of the `config.xml`.
+
+#### BaseDN Parameter
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.BaseDN
+version: 1.0
+
+[ClickHouse] SHALL support the `<base_dn>` parameter in the `<user_directories><ldap><role_mapping>` section 
+of the `config.xml` that SHALL specify the template to be used to construct the base `DN` for the [LDAP] search.
+
+The resulting `DN` SHALL be constructed by replacing all the `{user_name}` and `{bind_dn}` substrings of 
+the template with the actual user name and bind `DN` during each [LDAP] search.
+
+#### Attribute Parameter
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Attribute
+version: 1.0
+
+[ClickHouse] SHALL support the `<attribute>` parameter in the `<user_directories><ldap><role_mapping>` section of 
+the `config.xml` that SHALL specify the name of the attribute whose values SHALL be returned by the [LDAP] search.
+
+#### Scope Parameter
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope
+version: 1.0
+
+[ClickHouse] SHALL support the `<scope>` parameter in the `<user_directories><ldap><role_mapping>` section of 
+the `config.xml` that SHALL define the scope of the LDAP search as defined 
+by the https://ldapwiki.com/wiki/LDAP%20Search%20Scopes.
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope.Value.Base
+version: 1.0
+
+[ClickHouse] SHALL support the `base` value for the the `<scope>` parameter in the 
+`<user_directories><ldap><role_mapping>` section of the `config.xml` that SHALL
+limit the scope as specified by the https://ldapwiki.com/wiki/BaseObject.
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope.Value.OneLevel
+version: 1.0
+
+[ClickHouse] SHALL support the `one_level` value for the the `<scope>` parameter in the 
+`<user_directories><ldap><role_mapping>` section of the `config.xml` that SHALL
+limit the scope as specified by the https://ldapwiki.com/wiki/SingleLevel.
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope.Value.Children
+version: 1.0
+
+[ClickHouse] SHALL support the `children` value for the the `<scope>` parameter in the 
+`<user_directories><ldap><role_mapping>` section of the `config.xml` that SHALL
+limit the scope as specified by the https://ldapwiki.com/wiki/SubordinateSubtree.
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope.Value.Subtree
+version: 1.0
+
+[ClickHouse] SHALL support the `children` value for the the `<scope>` parameter in the 
+`<user_directories><ldap><role_mapping>` section of the `config.xml` that SHALL
+limit the scope as specified by the https://ldapwiki.com/wiki/WholeSubtree.
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Scope.Value.Default
+version: 1.0
+
+[ClickHouse] SHALL support the `subtree` as the default value for the the `<scope>` parameter in the 
+`<user_directories><ldap><role_mapping>` section of the `config.xml` when the `<scope>` parameter is not specified.
+
+#### Search Filter Parameter
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.SearchFilter
+version: 1.0
+
+[ClickHouse] SHALL support the `<search_filter>` parameter in the `<user_directories><ldap><role_mapping>`
+section of the `config.xml` that SHALL specify the template used to construct 
+the [LDAP filter](https://ldap.com/ldap-filters/) for the search.
+
+The resulting filter SHALL 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 the [LDAP] search.
+ 
+#### Prefix Parameter
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Prefix
+version: 1.0
+
+[ClickHouse] SHALL support the `<prefix>` parameter in the `<user directories><ldap><role_mapping>`
+section of the `config.xml` that SHALL be expected to be in front of each string in 
+the original list of strings returned by the [LDAP] search. 
+Prefix SHALL be removed from the original strings and resulting strings SHALL be treated as [RBAC] role names. 
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Prefix.Default
+version: 1.0
+
+[ClickHouse] SHALL support empty string as the default value of the `<prefix>` parameter in 
+the `<user directories><ldap><role_mapping>` section of the `config.xml`.
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Prefix.WithUTF8Characters
+version: 1.0
+
+[ClickHouse] SHALL support UTF8 characters as the value of the `<prefix>` parameter in
+the `<user directories><ldap><role_mapping>` section of the `config.xml`.
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Prefix.WithSpecialXMLCharacters
+version: 1.0
+
+[ClickHouse] SHALL support XML special characters as the value of the `<prefix>` parameter in
+the `<user directories><ldap><role_mapping>` section of the `config.xml`.
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Prefix.WithSpecialRegexCharacters
+version: 1.0
+
+[ClickHouse] SHALL support regex special characters as the value of the `<prefix>` parameter in
+the `<user directories><ldap><role_mapping>` section of the `config.xml`.
+
+## References
+
+* **Access Control and Account Management**: https://clickhouse.tech/docs/en/operations/access-rights/
+* **LDAP**: https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol
+* **ClickHouse:** https://clickhouse.tech
+* **GitLab Repository**: https://gitlab.com/altinity-qa/documents/qa-srs014-clickhouse-ldap-role-mapping/-/blob/master/QA_SRS014_ClickHouse_LDAP_Role_Mapping.md
+* **Revision History**: https://gitlab.com/altinity-qa/documents/qa-srs014-clickhouse-ldap-role-mapping/-/commits/master/QA_SRS014_ClickHouse_LDAP_Role_Mapping.md
+* **Git:** https://git-scm.com/
+
+[RBAC]: https://clickhouse.tech/docs/en/operations/access-rights/
+[SRS]: #srs
+[Access Control and Account Management]: https://clickhouse.tech/docs/en/operations/access-rights/
+[QA-SRS009 ClickHouse LDAP External User Directory]: https://gitlab.com/altinity-qa/documents/qa-srs009-clickhouse-ldap-external-user-directory/-/blob/master/QA_SRS009_ClickHouse_LDAP_External_User_Directory.md
+[QA-SRS007 ClickHouse Authentication of Users via LDAP]: https://gitlab.com/altinity-qa/documents/qa-srs007-clickhouse-athentication-of-users-via-ldap/-/blob/master/QA_SRS007_ClickHouse_Authentication_of_Users_via_LDAP.md
+[LDAP]: https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol
+[ClickHouse]: https://clickhouse.tech
+[GitLab Repository]: https://gitlab.com/altinity-qa/documents/qa-srs014-clickhouse-ldap-role-mapping/-/blob/master/QA_SRS014_ClickHouse_LDAP_Role_Mapping.md
+[Revision History]: https://gitlab.com/altinity-qa/documents/qa-srs014-clickhouse-ldap-role-mapping/-/commits/master/QA_SRS014_ClickHouse_LDAP_Role_Mapping.md
+[Git]: https://git-scm.com/
+[GitLab]: https://gitlab.com
+''')
diff --git a/tests/testflows/ldap/role_mapping/tests/common.py b/tests/testflows/ldap/role_mapping/tests/common.py
new file mode 100644
index 00000000000..33ad4a46f52
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/tests/common.py
@@ -0,0 +1,252 @@
+import os
+
+from testflows.core import *
+from testflows.asserts import error
+
+from ldap.authentication.tests.common import getuid, create_ldap_servers_config_content, add_config, Config
+from ldap.external_user_directory.tests.common import rbac_roles, rbac_users, ldap_users
+from ldap.authentication.tests.common import xmltree, xml_indent, xml_append, xml_with_utf8
+
+@TestStep(Given)
+def create_table(self, name, create_statement, on_cluster=False):
+    """Create table.
+    """
+    node = current().context.node
+    try:
+        with Given(f"I have a {name} table"):
+            node.query(create_statement.format(name=name))
+        yield name
+    finally:
+        with Finally("I drop the table"):
+            if on_cluster:
+                node.query(f"DROP TABLE IF EXISTS {name} ON CLUSTER {on_cluster}")
+            else:
+                node.query(f"DROP TABLE IF EXISTS {name}")
+
+@TestStep(Given)
+def add_ldap_servers_configuration(self, servers, config_d_dir="/etc/clickhouse-server/config.d",
+        config_file="ldap_servers.xml", timeout=60, restart=False):
+    """Add LDAP servers configuration to config.xml.
+    """
+    config = create_ldap_servers_config_content(servers, config_d_dir, config_file)
+    return add_config(config, restart=restart)
+
+@TestStep(Given)
+def add_ldap_groups(self, groups, node=None):
+    """Add multiple new groups to the LDAP server.
+    """
+    try:
+        _groups = []
+        for group in groups:
+            with By(f"adding group {group['cn']}"):
+                _groups.append(add_group_to_ldap(**group, node=node))
+        yield _groups
+    finally:
+        with Finally(f"I delete groups from LDAP"):
+            for _group in _groups:
+                delete_group_from_ldap(_group, node=node)
+
+@TestStep(Given)
+def add_ldap_external_user_directory(self, server, roles=None, role_mappings=None,
+        config_d_dir="/etc/clickhouse-server/config.d",
+        config_file=None, timeout=60, restart=True, config=None):
+    """Add LDAP external user directory.
+    """
+    if config_file is None:
+        config_file = f"ldap_external_user_directory_with_role_mapping_{getuid()}.xml"
+
+    if config is None:
+        config = create_ldap_external_user_directory_config_content(server=server, roles=roles,
+            role_mappings=role_mappings, config_d_dir=config_d_dir, config_file=config_file)
+
+    return add_config(config, restart=restart)
+
+@TestStep(Given)
+def add_rbac_roles(self, roles):
+    """Add RBAC roles.
+    """
+    with rbac_roles(*roles) as _roles:
+        yield _roles
+
+@TestStep(Given)
+def add_rbac_users(self, users):
+    """Add RBAC users.
+    """
+    with rbac_users(*users) as _users:
+        yield _users
+
+@TestStep(Given)
+def add_ldap_users(self, users, node=None):
+    """Add LDAP users.
+    """
+    with ldap_users(*users, node=node) as _users:
+        yield _users
+
+def add_group_to_ldap(cn, gidnumber=None, node=None, _gidnumber=[600], exitcode=0):
+    """Add new group entry to LDAP.
+    """
+    _gidnumber[0] += 1
+
+    if node is None:
+        node = current().context.ldap_node
+
+    if gidnumber is None:
+        gidnumber = _gidnumber[0]
+
+    group = {
+        "dn": f"cn={cn},ou=groups,dc=company,dc=com",
+        "objectclass": ["top", "groupOfUniqueNames"],
+        "uniquemember": "cn=admin,dc=company,dc=com",
+        "_server": node.name
+    }
+
+    lines = []
+
+    for key, value in list(group.items()):
+        if key.startswith("_"):
+            continue
+        elif type(value) is list:
+            for v in value:
+                lines.append(f"{key}: {v}")
+        else:
+            lines.append(f"{key}: {value}")
+
+    ldif = "\n".join(lines)
+
+    r = node.command(
+        f"echo -e \"{ldif}\" | ldapadd -x -H ldap://localhost -D \"cn=admin,dc=company,dc=com\" -w admin")
+
+    if exitcode is not None:
+        assert r.exitcode == exitcode, error()
+
+    return group
+
+def delete_group_from_ldap(group, node=None, exitcode=0):
+    """Delete group entry from LDAP.
+    """
+    if node is None:
+        node = current().context.ldap_node
+
+    with By(f"deleting group {group['dn']}"):
+        r = node.command(
+            f"ldapdelete -x -H ldap://localhost -D \"cn=admin,dc=company,dc=com\" -w admin \"{group['dn']}\"")
+
+    if exitcode is not None:
+        assert r.exitcode == exitcode, error()
+
+def fix_ldap_permissions(node=None, exitcode=0):
+    """Fix LDAP access permissions.
+    """
+    if node is None:
+        node = current().context.ldap_node
+
+    ldif = (
+        "dn: olcDatabase={1}mdb,cn=config\n"
+        "changetype: modify\n"
+        "delete: olcAccess\n"
+        "-\n"
+        "add: olcAccess\n"
+        "olcAccess: to attrs=userPassword,shadowLastChange by self write by dn=\\\"cn=admin,dc=company,dc=com\\\" write by anonymous auth by * none\n"
+        "olcAccess: to * by self write by dn=\\\"cn=admin,dc=company,dc=com\\\" read by users read by * none"
+    )
+
+    r = node.command(
+        f"echo -e \"{ldif}\" | ldapmodify -Y EXTERNAL -Q -H ldapi:///")
+
+    if exitcode is not None:
+        assert r.exitcode == exitcode, error()
+
+def add_user_to_group_in_ldap(user, group, node=None, exitcode=0):
+    """Add user to a group in LDAP.
+    """
+    if node is None:
+        node = current().context.ldap_node
+
+    ldif = (f"dn: {group['dn']}\n"
+        "changetype: modify\n"
+        "add: uniquemember\n"
+        f"uniquemember: {user['dn']}")
+
+    with By(f"adding user {user['dn']} to group {group['dn']}"):
+        r = node.command(
+            f"echo -e \"{ldif}\" | ldapmodify -x -H ldap://localhost -D \"cn=admin,dc=company,dc=com\" -w admin")
+
+    if exitcode is not None:
+        assert r.exitcode == exitcode, error()
+
+def delete_user_from_group_in_ldap(user, group, node=None, exitcode=0):
+    """Delete user from a group in LDAP.
+    """
+    if node is None:
+        node = current().context.ldap_node
+
+    ldif = (f"dn: {group['dn']}\n"
+        "changetype: modify\n"
+        "delete: uniquemember\n"
+        f"uniquemember: {user['dn']}")
+
+    with By(f"deleting user {user['dn']} from group {group['dn']}"):
+        r = node.command(
+            f"echo -e \"{ldif}\" | ldapmodify -x -H ldap://localhost -D \"cn=admin,dc=company,dc=com\" -w admin")
+
+    if exitcode is not None:
+        assert r.exitcode == exitcode, error()
+
+def create_xml_config_content(entries, config_d_dir="/etc/clickhouse-server/config.d",
+        config_file="ldap_external_user_directories.xml"):
+    """Create XML configuration file from a dictionary.
+    """
+    uid = getuid()
+    path = os.path.join(config_d_dir, config_file)
+    name = config_file
+    root = xmltree.Element("yandex")
+    root.append(xmltree.Comment(text=f"config uid: {uid}"))
+
+    def create_xml_tree(entries, root):
+        for k,v in entries.items():
+            if type(v) is dict:
+                xml_element = xmltree.Element(k)
+                create_xml_tree(v, xml_element)
+                root.append(xml_element)
+            elif type(v) in (list, tuple):
+                xml_element = xmltree.Element(k)
+                for e in v:
+                    create_xml_tree(e, xml_element)
+                root.append(xml_element)
+            else:
+                xml_append(root, k, v)
+
+    create_xml_tree(entries, root)
+    xml_indent(root)
+    content = xml_with_utf8 + str(xmltree.tostring(root, short_empty_elements=False, encoding="utf-8"), "utf-8")
+
+    return Config(content, path, name, uid, "config.xml")
+
+def create_ldap_external_user_directory_config_content(server=None, roles=None, role_mappings=None, **kwargs):
+    """Create LDAP external user directory configuration file content.
+    """
+    entries = {
+        "user_directories": {
+            "ldap": {
+            }
+        }
+    }
+
+    entries["user_directories"]["ldap"] = []
+
+    if server:
+        entries["user_directories"]["ldap"].append({"server": server})
+
+    if roles:
+        entries["user_directories"]["ldap"].append({"roles": [{r: None} for r in roles]})
+
+    if role_mappings:
+        for role_mapping in role_mappings:
+            entries["user_directories"]["ldap"].append({"role_mapping": role_mapping})
+
+    return create_xml_config_content(entries, **kwargs)
+
+def create_entries_ldap_external_user_directory_config_content(entries, **kwargs):
+    """Create LDAP external user directory configuration file content.
+    """
+    return create_xml_config_content(entries, **kwargs)
\ No newline at end of file
diff --git a/tests/testflows/ldap/role_mapping/tests/mapping.py b/tests/testflows/ldap/role_mapping/tests/mapping.py
new file mode 100644
index 00000000000..97188199782
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/tests/mapping.py
@@ -0,0 +1,1372 @@
+# -*- coding: utf-8 -*-
+from testflows.core import *
+from testflows.asserts import error
+
+from multiprocessing.dummy import Pool
+
+from ldap.role_mapping.requirements import *
+from ldap.role_mapping.tests.common import *
+from ldap.external_user_directory.tests.common import join, randomword
+
+from ldap.external_user_directory.tests.authentications import login_with_valid_username_and_password
+from ldap.external_user_directory.tests.authentications import login_with_invalid_username_and_valid_password
+from ldap.external_user_directory.tests.authentications import login_with_valid_username_and_invalid_password
+
+def remove_ldap_groups_in_parallel(groups, i, iterations=10):
+    """Remove LDAP groups.
+    """
+    with When(f"LDAP groups are removed #{i}"):
+        for j in range(iterations):
+            for group in groups:
+                with When(f"I delete group #{j}", description=f"{group}"):
+                    delete_group_from_ldap(group, exitcode=None)
+
+def add_ldap_groups_in_parallel(ldap_user, names, i, iterations=10):
+    """Add LDAP groups.
+    """
+    with When(f"LDAP groups are added #{i}"):
+        for j in range(iterations):
+            for name in names:
+                with When(f"I add group {name} #{j}", description=f"{name}"):
+                    group = add_group_to_ldap(cn=name, exitcode=None)
+
+                    with When(f"I add user to the group"):
+                        add_user_to_group_in_ldap(user=ldap_user, group=group, exitcode=None)
+
+def add_user_to_ldap_groups_in_parallel(ldap_user, groups, i, iterations=10):
+    """Add user to LDAP groups.
+    """
+    with When(f"user is added to LDAP groups #{i}"):
+        for j in range(iterations):
+            for group in groups:
+                with When(f"I add user to the group {group['dn']} #{j}"):
+                    add_user_to_group_in_ldap(user=ldap_user, group=group, exitcode=None)
+
+def remove_user_from_ldap_groups_in_parallel(ldap_user, groups, i, iterations=10):
+    """Remove user from LDAP groups.
+    """
+    with When(f"user is removed from LDAP groups #{i}"):
+        for j in range(iterations):
+            for group in groups:
+                with When(f"I remove user from the group {group['dn']} #{j}"):
+                    delete_user_from_group_in_ldap(user=ldap_user, group=group, exitcode=None)
+
+def add_roles_in_parallel(role_names, i, iterations=10):
+    """Add roles.
+    """
+    with When(f"roles are added #{i}"):
+        for j in range(iterations):
+            for role_name in role_names:
+                with When(f"I add role {role_name} #{j}"):
+                    current().context.node.query(f"CREATE ROLE OR REPLACE {role_name}")
+
+def remove_roles_in_parallel(role_names, i, iterations=10):
+    """Remove roles.
+    """
+    with When(f"roles are removed #{i}"):
+        for j in range(iterations):
+            for role_name in role_names:
+                with When(f"I remove role {role_name} #{j}"):
+                    current().context.node.query(f"DROP ROLE IF EXISTS {role_name}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Map_MultipleRoles("1.0")
+)
+def multiple_roles(self, ldap_server, ldap_user):
+    """Check that users authenticated using LDAP external user directory
+    can be assigned multiple LDAP mapped roles.
+    """
+    uid = getuid()
+
+    role_mappings = [
+        {
+            "base_dn": "ou=groups,dc=company,dc=com",
+            "attribute": "cn",
+            "search_filter": "(&(objectClass=groupOfUniqueNames)(uniquemember={bind_dn}))",
+            "prefix":""
+        }
+    ]
+
+    with Given("I add LDAP groups"):
+        groups = add_ldap_groups(groups=({"cn": f"role0_{uid}"}, {"cn": f"role1_{uid}"}))
+
+    with And("I add LDAP user to each LDAP group"):
+        add_user_to_group_in_ldap(user=ldap_user, group=groups[0])
+        add_user_to_group_in_ldap(user=ldap_user, group=groups[1])
+
+    with And("I add RBAC roles"):
+        roles = add_rbac_roles(roles=(f"role0_{uid}", f"role1_{uid}"))
+
+    with And("I add LDAP external user directory configuration"):
+        add_ldap_external_user_directory(server=ldap_server,
+            role_mappings=role_mappings, restart=True)
+
+    with When(f"I login as an LDAP user"):
+        r = self.context.node.query(f"SHOW GRANTS", settings=[
+            ("user", ldap_user["username"]), ("password", ldap_user["password"])])
+
+    with Then("I expect the user to have mapped LDAP roles"):
+        with By(f"checking that first role is assigned", description=f"{roles[0]}"):
+            assert roles[0] in r.output, error()
+        with And(f"checking that second role is also assigned", description=f"{roles[1]}"):
+            assert roles[1] in r.output, error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_WithFixedRoles("1.0")
+)
+def with_fixed_roles(self, ldap_server, ldap_user):
+    """Check that LDAP users can be assigned roles dynamically
+    and statically using the `<roles>` section.
+    """
+    uid = getuid()
+    role_name = f"role_{uid}"
+    fixed_role_name = f"role_fixed_{uid}"
+
+    role_mappings = [
+        {
+            "base_dn": "ou=groups,dc=company,dc=com",
+            "attribute": "cn",
+            "search_filter": "(&(objectClass=groupOfUniqueNames)(uniquemember={bind_dn}))",
+            "prefix": ""
+        }
+    ]
+
+    with Given("I add LDAP group"):
+        groups = add_ldap_groups(groups=({"cn": role_name},))
+
+    with And("I add LDAP user to the group"):
+        add_user_to_group_in_ldap(user=ldap_user, group=groups[0])
+
+    with And("I add matching RBAC role"):
+        mapped_roles = add_rbac_roles(roles=(f"{role_name}",))
+
+    with And("I add an RBAC role that will be added statically"):
+        roles = add_rbac_roles(roles=(f"{fixed_role_name}",))
+
+    with And("I add LDAP external user directory configuration"):
+        add_ldap_external_user_directory(server=ldap_server,
+            role_mappings=role_mappings, roles=roles, restart=True)
+
+    with When(f"I login as an LDAP user"):
+        r = self.context.node.query(f"SHOW GRANTS", settings=[
+            ("user", ldap_user["username"]), ("password", ldap_user["password"])])
+
+    with Then("I expect the user to have mapped and fixed roles"):
+        with By("checking that mapped role is assigned"):
+            assert mapped_roles[0].strip("'") in r.output, error()
+        with And("checking that fixed role is assigned"):
+            assert roles[0] in r.output, error()
+
+@TestOutline
+def map_role(self, role_name, ldap_server, ldap_user, rbac_role_name=None, role_mappings=None):
+    """Check that we can map a role with a given name.
+    """
+    if role_mappings is None:
+        role_mappings = [
+            {
+                "base_dn": "ou=groups,dc=company,dc=com",
+                "attribute": "cn",
+                "search_filter": "(&(objectClass=groupOfUniqueNames)(uniquemember={bind_dn}))",
+                "prefix": ""
+            }
+        ]
+
+    if rbac_role_name is None:
+        rbac_role_name = role_name
+
+    with Given("I add LDAP group"):
+        groups = add_ldap_groups(groups=({"cn": role_name},))
+
+    with And("I add LDAP user to the group"):
+        add_user_to_group_in_ldap(user=ldap_user, group=groups[0])
+
+    with And("I add matching RBAC role"):
+        roles = add_rbac_roles(roles=(f"'{rbac_role_name}'",))
+
+    with And("I add LDAP external user directory configuration"):
+        add_ldap_external_user_directory(server=ldap_server,
+            role_mappings=role_mappings, restart=True)
+
+    with When(f"I login as an LDAP user"):
+        r = self.context.node.query(f"SHOW GRANTS", settings=[
+            ("user", ldap_user["username"]), ("password", ldap_user["password"])])
+
+    with Then("I expect the user to have mapped LDAP role"):
+        with By(f"checking that the role is assigned", description=f"{role_name}"):
+            assert roles[0].strip("'") in r.output, error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Map_Role_Name_WithUTF8Characters("1.0")
+)
+def role_name_with_utf8_characters(self, ldap_server, ldap_user):
+    """Check that we can map a role that contains UTF8 characters.
+    """
+    uid = getuid()
+    role_name = f"role_{uid}_Gãńdåłf_Thê_Gręât"
+
+    map_role(role_name=role_name, ldap_server=ldap_server, ldap_user=ldap_user)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Map_Role_Name_Long("1.0")
+)
+def role_name_with_more_than_128_characters(self, ldap_server, ldap_user):
+    """Check that we can map a role that contains more than 128 characters.
+    """
+    uid = getuid()
+    role_name = f"role_{uid}_{'r'*128}"
+
+    map_role(role_name=role_name, ldap_server=ldap_server, ldap_user=ldap_user)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Map_Role_Name_WithSpecialXMLCharacters("1.0")
+)
+def role_name_with_special_xml_characters(self, ldap_server, ldap_user):
+    """Check that we can map a role that contains special XML
+    characters that must be escaped.
+    """
+    uid = getuid()
+    role_name = f"role_{uid}_\\<\\>"
+    rbac_role_name = f"role_{uid}_<>"
+
+    map_role(role_name=role_name, ldap_server=ldap_server, ldap_user=ldap_user, rbac_role_name=rbac_role_name)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Map_Role_Name_WithSpecialRegexCharacters("1.0")
+)
+def role_name_with_special_regex_characters(self, ldap_server, ldap_user):
+    """Check that we can map a role that contains special regex
+    characters that must be escaped.
+    """
+    uid = getuid()
+    role_name = f"role_{uid}_\\+.?$"
+    rbac_role_name = f"role_{uid}_+.?$"
+
+    map_role(role_name=role_name, ldap_server=ldap_server, ldap_user=ldap_user, rbac_role_name=rbac_role_name)
+
+@TestOutline
+def map_groups_with_prefixes(self, prefixes, group_names, role_names,
+        expected, not_expected, ldap_server, ldap_user):
+    """Check that we can map multiple groups to roles whith one or more prefixes.
+    """
+    role_mappings = []
+
+    for prefix in prefixes:
+        role_mappings.append({
+            "base_dn": "ou=groups,dc=company,dc=com",
+            "attribute": "cn",
+            "search_filter": "(&(objectClass=groupOfUniqueNames)(uniquemember={bind_dn}))",
+            "prefix": prefix
+        })
+
+    with Given("I add LDAP group"):
+        groups = add_ldap_groups(groups=({"cn": name} for name in group_names))
+
+    with And("I add LDAP user to the group"):
+        for group in groups:
+            add_user_to_group_in_ldap(user=ldap_user, group=group)
+
+    with And("I add RBAC roles"):
+        roles = add_rbac_roles(roles=(f"'{name}'" for name in role_names))
+
+    with And("I add LDAP external user directory configuration"):
+        add_ldap_external_user_directory(server=ldap_server,
+            role_mappings=role_mappings, restart=True)
+
+    with When(f"I login as an LDAP user"):
+        r = self.context.node.query(f"SHOW GRANTS", settings=[
+            ("user", ldap_user["username"]), ("password", ldap_user["password"])])
+
+    with Then("I expect the user to have mapped roles"):
+        with By(f"checking that the roles are assigned", description=f"{', '.join(expected)}"):
+            for name in expected:
+                assert name in r.output, error()
+
+    with And("I expect the user not to have mapped roles"):
+        with By(f"checking that the roles are not assigned", description=f"{', '.join(not_expected)}"):
+            for name in not_expected:
+                assert name not in r.output, error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Syntax("1.0"),
+    RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Prefix("1.0")
+)
+def prefix_non_empty(self, ldap_server, ldap_user):
+    """Check that only group names with specified prefix are mapped to roles
+    when prefix is not empty.
+    """
+    uid = getuid()
+
+    with Given("I define group names"):
+        group_names=[
+            f"clickhouse_role_{uid}",
+            f"role0_{uid}"
+        ]
+
+    with And("I define role names"):
+        role_names=[
+            f"role_{uid}",
+            f"role0_{uid}"
+        ]
+
+    with And("I define group prefixes to be mapped"):
+        prefixes = ["clickhouse_"]
+
+    with And("I define the expected mapped and not mapped roles"):
+        expected=[f"role_{uid}"]
+        not_expected=[f"role0_{uid}"]
+
+    map_groups_with_prefixes(ldap_server=ldap_server, ldap_user=ldap_user,
+        prefixes=prefixes, group_names=group_names, role_names=role_names,
+        expected=expected, not_expected=not_expected)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Prefix_Default("1.0")
+)
+def prefix_default_value(self, ldap_server, ldap_user):
+    """Check that when prefix is not specified the default value of prefix
+    is empty and therefore ldap groups are mapped directly to roles.
+    """
+    uid = getuid()
+    role_name = f"role_{uid}"
+
+    role_mappings = [
+        {
+            "base_dn": "ou=groups,dc=company,dc=com",
+            "attribute": "cn",
+            "search_filter": "(&(objectClass=groupOfUniqueNames)(uniquemember={bind_dn}))",
+        }
+    ]
+
+    map_role(role_name=role_name, ldap_server=ldap_server, ldap_user=ldap_user, role_mappings=role_mappings)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Prefix_WithUTF8Characters("1.0")
+)
+def prefix_with_utf8_characters(self, ldap_server, ldap_user):
+    """Check that we can map a role when prefix contains UTF8 characters.
+    """
+    uid = getuid()
+
+    with Given("I define group names"):
+        group_names=[
+            f"Gãńdåłf_Thê_Gręât_role_{uid}",
+            f"role0_{uid}"
+        ]
+
+    with And("I define role names"):
+        role_names=[
+            f"role_{uid}",
+            f"role0_{uid}"
+        ]
+
+    with And("I define group prefixes to be mapped"):
+        prefixes = ["Gãńdåłf_Thê_Gręât_"]
+
+    with And("I define the expected mapped and not mapped roles"):
+        expected=[f"role_{uid}"]
+        not_expected=[f"role0_{uid}"]
+
+    map_groups_with_prefixes(ldap_server=ldap_server, ldap_user=ldap_user,
+        prefixes=prefixes, group_names=group_names, role_names=role_names,
+        expected=expected, not_expected=not_expected)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_SpecialCharactersEscaping("1.0"),
+    RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Prefix_WithSpecialXMLCharacters("1.0")
+)
+def prefix_with_special_xml_characters(self, ldap_server, ldap_user):
+    """Check that we can map a role when prefix contains special XML characters.
+    """
+    uid = getuid()
+
+    with Given("I define group names"):
+        group_names=[
+            f"clickhouse\\<\\>_role_{uid}",
+            f"role0_{uid}"
+        ]
+
+    with And("I define role names"):
+        role_names=[
+            f"role_{uid}",
+            f"role0_{uid}"
+        ]
+
+    with And("I define group prefixes to be mapped"):
+        prefixes = ["clickhouse<>_"]
+
+    with And("I define the expected mapped and not mapped roles"):
+        expected=[f"role_{uid}"]
+        not_expected=[f"role0_{uid}"]
+
+    map_groups_with_prefixes(ldap_server=ldap_server, ldap_user=ldap_user,
+        prefixes=prefixes, group_names=group_names, role_names=role_names,
+        expected=expected, not_expected=not_expected)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Prefix_WithSpecialRegexCharacters("1.0")
+)
+def prefix_with_special_regex_characters(self, ldap_server, ldap_user):
+    """Check that we can map a role when prefix contains special regex characters.
+    """
+    uid = getuid()
+
+    with Given("I define group names"):
+        group_names=[
+            f"clickhouse\\+.?\\$_role_{uid}",
+            f"role0_{uid}"
+        ]
+
+    with And("I define role names"):
+        role_names=[
+            f"role_{uid}",
+            f"role0_{uid}"
+        ]
+
+    with And("I define group prefixes to be mapped"):
+        prefixes = ["clickhouse+.?\\$_"]
+
+    with And("I define the expected mapped and not mapped roles"):
+        expected=[f"role_{uid}"]
+        not_expected=[f"role0_{uid}"]
+
+    map_groups_with_prefixes(ldap_server=ldap_server, ldap_user=ldap_user,
+        prefixes=prefixes, group_names=group_names, role_names=role_names,
+        expected=expected, not_expected=not_expected)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_MultipleSections("1.0")
+)
+def multiple_sections_with_different_prefixes(self, ldap_server, ldap_user):
+    """Check that we can map multiple roles with multiple role mapping sections
+    that use different prefixes.
+    """
+    uid = getuid()
+
+    with Given("I define group names"):
+        group_names=[
+            f"clickhouse0_role0_{uid}",
+            f"clickhouse1_role1_{uid}",
+            f"role2_{uid}"
+        ]
+
+    with And("I define role names"):
+        role_names=[
+            f"role0_{uid}",
+            f"role1_{uid}",
+            f"role2_{uid}"
+        ]
+
+    with And("I define group prefixes to be mapped"):
+        prefixes = ["clickhouse0_", "clickhouse1_"]
+
+    with And("I define the expected mapped and not mapped roles"):
+        expected=[f"role0_{uid}", f"role1_{uid}"]
+        not_expected=[f"role2_{uid}"]
+
+    map_groups_with_prefixes(ldap_server=ldap_server, ldap_user=ldap_user,
+        prefixes=prefixes, group_names=group_names, role_names=role_names,
+        expected=expected, not_expected=not_expected)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_LDAP_Group_Removed("1.0")
+)
+def group_removed(self, ldap_server, ldap_user):
+    """Check that roles are not mapped after the corresponding LDAP group
+    is removed.
+    """
+    uid = getuid()
+    role_name = f"role_{uid}"
+
+    role_mappings = [
+        {
+            "base_dn": "ou=groups,dc=company,dc=com",
+            "attribute": "cn",
+            "search_filter": "(&(objectClass=groupOfUniqueNames)(uniquemember={bind_dn}))",
+            "prefix": ""
+        }
+    ]
+
+    try:
+        with Given("I add LDAP group"):
+            group = add_group_to_ldap(**{"cn": role_name})
+
+        with And("I add LDAP user to the group"):
+            add_user_to_group_in_ldap(user=ldap_user, group=group)
+
+        with And("I add matching RBAC role"):
+            roles = add_rbac_roles(roles=(f"{role_name}",))
+
+        with And("I add LDAP external user directory configuration"):
+            add_ldap_external_user_directory(server=ldap_server,
+                role_mappings=role_mappings, restart=True)
+
+        with When(f"I login as an LDAP user"):
+            r = self.context.node.query(f"SHOW GRANTS", settings=[
+                ("user", ldap_user["username"]), ("password", ldap_user["password"])])
+
+        with Then("I expect the user to have mapped LDAP role"):
+            with By(f"checking that the role is assigned", description=f"{role_name}"):
+                assert role_name in r.output, error()
+    finally:
+        with Finally("I remove LDAP group"):
+            delete_group_from_ldap(group)
+
+    with When(f"I login as an LDAP user after LDAP group is removed"):
+        r = self.context.node.query(f"SHOW GRANTS", settings=[
+            ("user", ldap_user["username"]), ("password", ldap_user["password"])])
+
+    with Then("I expect the user not to have mapped LDAP role"):
+        with By(f"checking that the role is not assigned", description=f"{role_name}"):
+            assert role_name not in r.output, error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_LDAP_Group_UserRemoved("1.0")
+)
+def user_removed_from_group(self, ldap_server, ldap_user):
+    """Check that roles are not mapped after the user has been removed
+    from the corresponding LDAP group.
+    """
+    uid = getuid()
+    role_name = f"role_{uid}"
+
+    role_mappings = [
+        {
+            "base_dn": "ou=groups,dc=company,dc=com",
+            "attribute": "cn",
+            "search_filter": "(&(objectClass=groupOfUniqueNames)(uniquemember={bind_dn}))",
+            "prefix": ""
+        }
+    ]
+
+    with Given("I add LDAP group"):
+        groups = add_ldap_groups(groups=({"cn": role_name},))
+
+    with And("I add LDAP user to the group"):
+        add_user_to_group_in_ldap(user=ldap_user, group=groups[0])
+
+    with And("I add matching RBAC role"):
+        roles = add_rbac_roles(roles=(f"{role_name}",))
+
+    with And("I add LDAP external user directory configuration"):
+        add_ldap_external_user_directory(server=ldap_server,
+            role_mappings=role_mappings, restart=True)
+
+    with When(f"I login as an LDAP user"):
+        r = self.context.node.query(f"SHOW GRANTS", settings=[
+            ("user", ldap_user["username"]), ("password", ldap_user["password"])])
+
+    with Then("I expect the user to have mapped LDAP role"):
+        with By(f"checking that the role is assigned", description=f"{role_name}"):
+            assert role_name in r.output, error()
+
+    with When("I remove user from the LDAP group"):
+        delete_user_from_group_in_ldap(user=ldap_user, group=groups[0])
+
+    with And(f"I login as an LDAP user after user has been removed from the group"):
+        r = self.context.node.query(f"SHOW GRANTS", settings=[
+            ("user", ldap_user["username"]), ("password", ldap_user["password"])])
+
+    with Then("I expect the user not to have mapped LDAP role"):
+        with By(f"checking that the role is not assigned", description=f"{role_name}"):
+            assert role_name not in r.output, error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_NotPresent("1.0")
+)
+def role_not_present(self, ldap_server, ldap_user):
+    """Check that LDAP users can still be authenticated even if
+    the mapped role is not present.
+    """
+    uid = getuid()
+    role_name = f"role_{uid}"
+
+    role_mappings = [
+        {
+            "base_dn": "ou=groups,dc=company,dc=com",
+            "attribute": "cn",
+            "search_filter": "(&(objectClass=groupOfUniqueNames)(uniquemember={bind_dn}))",
+            "prefix": ""
+        }
+    ]
+
+    with Given("I add LDAP group"):
+        groups = add_ldap_groups(groups=({"cn": role_name},))
+
+    with And("I add LDAP user to the group for which no matching roles are present"):
+        add_user_to_group_in_ldap(user=ldap_user, group=groups[0])
+
+    with And("I add LDAP external user directory configuration"):
+        add_ldap_external_user_directory(server=ldap_server,
+            role_mappings=role_mappings, restart=True)
+
+    with When(f"I login as an LDAP user"):
+        r = self.context.node.query(f"SHOW GRANTS", settings=[
+            ("user", ldap_user["username"]), ("password", ldap_user["password"])], no_checks=True)
+
+    with Then("I expect the login to succeed"):
+        assert r.exitcode == 0, error()
+
+    with And("the user not to have any mapped LDAP role"):
+        assert r.output == "", error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_Removed("1.0"),
+    RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_Readded("1.0")
+)
+def role_removed_and_readded(self, ldap_server, ldap_user):
+    """Check that when a mapped role is removed the privileges provided by the role
+    are revoked from all the authenticated LDAP users and when the role
+    is added back the privileges to the authenticated LDAP users are re-granted.
+    """
+    uid = getuid()
+    role_name = f"role_{uid}"
+
+    role_mappings = [
+        {
+            "base_dn": "ou=groups,dc=company,dc=com",
+            "attribute": "cn",
+            "search_filter": "(&(objectClass=groupOfUniqueNames)(uniquemember={bind_dn}))",
+            "prefix": ""
+        }
+    ]
+    with Given("I add LDAP group"):
+        groups = add_ldap_groups(groups=({"cn": role_name},))
+
+    with And("I add LDAP user to the group"):
+        add_user_to_group_in_ldap(user=ldap_user, group=groups[0])
+
+    with And("I add matching RBAC role"):
+        roles = add_rbac_roles(roles=(f"{role_name}",))
+
+    with And("I create a table for which the role will provide privilege"):
+        table_name = create_table(name=f"table_{uid}",
+            create_statement="CREATE TABLE {name} (d DATE, s String, i UInt8) ENGINE = Memory()")
+
+    with And("I grant select privilege on the table to the role"):
+        self.context.node.query(f"GRANT SELECT ON {table_name} TO {role_name}")
+
+    with And("I add LDAP external user directory configuration"):
+        add_ldap_external_user_directory(server=ldap_server,
+            role_mappings=role_mappings, restart=True)
+
+    with When(f"I login as LDAP user using clickhouse-client"):
+        with self.context.cluster.shell(node=self.context.node.name) as shell:
+            with shell(
+                    f"TERM=dumb clickhouse client --user {ldap_user['username']} --password {ldap_user['password']}",
+                    asynchronous=True, name="client") as client:
+                client.app.expect("clickhouse1 :\) ")
+
+                with When("I execute SHOW GRANTS"):
+                    client.app.send(f"SHOW GRANTS")
+
+                    with Then("I expect the user to have the mapped role"):
+                        client.app.expect(f"{role_name}")
+                        client.app.expect("clickhouse1 :\) ")
+
+                with When("I execute select on the table"):
+                    client.app.send(f"SELECT * FROM {table_name} LIMIT 1")
+
+                    with Then("I expect to get no errors"):
+                        client.app.expect("Ok\.")
+                        client.app.expect("clickhouse1 :\) ")
+
+                with When("I remove the role that grants the privilege"):
+                    self.context.node.query(f"DROP ROLE {role_name}")
+
+                with And("I re-execute select on the table"):
+                    client.app.send(f"SELECT * FROM {table_name} LIMIT 1")
+
+                    with Then("I expect to get not enough privileges error"):
+                        client.app.expect(f"DB::Exception: {ldap_user['username']}: Not enough privileges.")
+                        client.app.expect("clickhouse1 :\) ")
+
+                with When("I add the role that grant the privilege back"):
+                    self.context.node.query(f"CREATE ROLE {role_name}")
+                    self.context.node.query(f"GRANT SELECT ON {table_name} TO {role_name}")
+
+                with And("I execute select on the table after role is added back"):
+                    client.app.send(f"SELECT * FROM {table_name} LIMIT 1")
+
+                    with Then("I expect to get no errors"):
+                        client.app.expect("Ok\.")
+                        client.app.expect("clickhouse1 :\) ")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_NewPrivilege("1.0"),
+    RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_RemovedPrivilege("1.0")
+)
+def privilege_new_and_removed(self, ldap_server, ldap_user):
+    """Check that when a new privilege is added to the mapped role
+    it is granted to all authenticated LDAP users and when
+    the privilege is removed from the role it is also revoked
+    from all authenticated LDAP users.
+    """
+    uid = getuid()
+    role_name = f"role_{uid}"
+
+    role_mappings = [
+        {
+            "base_dn": "ou=groups,dc=company,dc=com",
+            "attribute": "cn",
+            "search_filter": "(&(objectClass=groupOfUniqueNames)(uniquemember={bind_dn}))",
+            "prefix": ""
+        }
+    ]
+    with Given("I add LDAP group"):
+        groups = add_ldap_groups(groups=({"cn": role_name},))
+
+    with And("I add LDAP user to the group"):
+        add_user_to_group_in_ldap(user=ldap_user, group=groups[0])
+
+    with And("I add matching RBAC role"):
+        roles = add_rbac_roles(roles=(f"{role_name}",))
+
+    with And("I create a table for which the role will provide privilege"):
+        table_name = create_table(name=f"table_{uid}",
+            create_statement="CREATE TABLE {name} (d DATE, s String, i UInt8) ENGINE = Memory()")
+
+    with And("I add LDAP external user directory configuration"):
+        add_ldap_external_user_directory(server=ldap_server,
+            role_mappings=role_mappings, restart=True)
+
+    with When(f"I login as LDAP user using clickhouse-client"):
+        with self.context.cluster.shell(node=self.context.node.name) as shell:
+            with shell(
+                    f"TERM=dumb clickhouse client --user {ldap_user['username']} --password {ldap_user['password']}",
+                    asynchronous=True, name="client") as client:
+                client.app.expect("clickhouse1 :\) ")
+
+                with When("I execute SHOW GRANTS"):
+                    client.app.send(f"SHOW GRANTS")
+
+                    with Then("I expect the user to have the mapped role"):
+                        client.app.expect(f"{role_name}")
+                        client.app.expect("clickhouse1 :\) ")
+
+                with And("I execute select on the table when the mapped role does not provide this privilege"):
+                    client.app.send(f"SELECT * FROM {table_name} LIMIT 1")
+
+                    with Then("I expect to get not enough privileges error"):
+                        client.app.expect(f"DB::Exception: {ldap_user['username']}: Not enough privileges.")
+                        client.app.expect("clickhouse1 :\) ")
+
+                with When("I grant select privilege on the table to the mapped role"):
+                    self.context.node.query(f"GRANT SELECT ON {table_name} TO {role_name}")
+
+                with And("I execute select on the table"):
+                    client.app.send(f"SELECT * FROM {table_name} LIMIT 1")
+
+                    with Then("I expect to get no errors"):
+                        client.app.expect("Ok\.")
+                        client.app.expect("clickhouse1 :\) ")
+
+                with When("I remove the privilege from the mapped role"):
+                    self.context.node.query(f"REVOKE SELECT ON {table_name} FROM {role_name}")
+
+                with And("I re-execute select on the table"):
+                    client.app.send(f"SELECT * FROM {table_name} LIMIT 1")
+
+                    with Then("I expect to get not enough privileges error"):
+                        client.app.expect(f"DB::Exception: {ldap_user['username']}: Not enough privileges.")
+                        client.app.expect("clickhouse1 :\) ")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_Added("1.0")
+)
+def role_added(self, ldap_server, ldap_user):
+    """Check that when the mapped role is not present during LDAP user authentication but
+    is later added then the authenticated LDAP users is granted the privileges provided
+    by the mapped role.
+    """
+    uid = getuid()
+    role_name = f"role_{uid}"
+
+    role_mappings = [
+        {
+            "base_dn": "ou=groups,dc=company,dc=com",
+            "attribute": "cn",
+            "search_filter": "(&(objectClass=groupOfUniqueNames)(uniquemember={bind_dn}))",
+            "prefix": ""
+        }
+    ]
+    with Given("I add LDAP group"):
+        groups = add_ldap_groups(groups=({"cn": role_name},))
+
+    with And("I add LDAP user to the group"):
+        add_user_to_group_in_ldap(user=ldap_user, group=groups[0])
+
+    with And("I create a table for which the role will provide privilege"):
+        table_name = create_table(name=f"table_{uid}",
+            create_statement="CREATE TABLE {name} (d DATE, s String, i UInt8) ENGINE = Memory()")
+
+    with And("I add LDAP external user directory configuration"):
+        add_ldap_external_user_directory(server=ldap_server,
+            role_mappings=role_mappings, restart=True)
+
+    with When(f"I login as LDAP user using clickhouse-client"):
+        with self.context.cluster.shell(node=self.context.node.name) as shell:
+            with shell(
+                    f"TERM=dumb clickhouse client --user {ldap_user['username']} --password {ldap_user['password']}",
+                    asynchronous=True, name="client") as client:
+                client.app.expect("clickhouse1 :\) ")
+
+                with When("I execute SHOW GRANTS"):
+                    client.app.send(f"SHOW GRANTS")
+
+                    with Then("I expect the user not to have any mapped role"):
+                        client.app.expect(f"Ok\.")
+                        client.app.expect("clickhouse1 :\) ")
+
+                with And("I execute select on the table"):
+                    client.app.send(f"SELECT * FROM {table_name} LIMIT 1")
+
+                    with Then("I expect to get not enough privileges error"):
+                        client.app.expect(f"DB::Exception: {ldap_user['username']}: Not enough privileges.")
+                        client.app.expect("clickhouse1 :\) ")
+
+                with When("I add the role that grant the privilege"):
+                    self.context.node.query(f"CREATE ROLE {role_name}")
+                    self.context.node.query(f"GRANT SELECT ON {table_name} TO {role_name}")
+
+                with And("I execute select on the table after role is added"):
+                    client.app.send(f"SELECT * FROM {table_name} LIMIT 1")
+
+                    with Then("I expect to get no errors"):
+                        client.app.expect("Ok\.")
+                        client.app.expect("clickhouse1 :\) ")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_New("1.0")
+)
+def role_new(self, ldap_server, ldap_user):
+    """Check that no new roles can be granted to LDAP authenticated users.
+    """
+    uid = getuid()
+    role_name = f"role_{uid}"
+
+    role_mappings = [
+        {
+            "base_dn": "ou=groups,dc=company,dc=com",
+            "attribute": "cn",
+            "search_filter": "(&(objectClass=groupOfUniqueNames)(uniquemember={bind_dn}))",
+            "prefix": ""
+        }
+    ]
+
+    message = f"DB::Exception: Cannot update user `{ldap_user['username']}` in ldap because this storage is readonly"
+    exitcode = 239
+
+    with Given("I a have RBAC role that is not mapped"):
+        roles = add_rbac_roles(roles=(f"{role_name}",))
+
+    with And("I add LDAP external user directory configuration"):
+        add_ldap_external_user_directory(server=ldap_server,
+            role_mappings=role_mappings, restart=True)
+
+    with When(f"I login as LDAP user using clickhouse-client"):
+        with self.context.cluster.shell(node=self.context.node.name) as shell:
+            with shell(
+                    f"TERM=dumb clickhouse client --user {ldap_user['username']} --password {ldap_user['password']}",
+                    asynchronous=True, name="client") as client:
+                client.app.expect("clickhouse1 :\) ")
+
+                with When("I try to grant new role to user"):
+                    self.context.node.query(f"GRANT {role_name} TO {ldap_user['username']}",
+                        message=message, exitcode=exitcode)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_MultipleSections_IdenticalParameters("1.0")
+)
+def multiple_sections_with_identical_parameters(self, ldap_server, ldap_user):
+    """Check behaviour when multiple role mapping sections
+    have exactly the same parameters.
+    """
+    uid = getuid()
+    role_name = f"role_{uid}"
+
+    role_mappings = [
+        {
+            "base_dn": "ou=groups,dc=company,dc=com",
+            "attribute": "cn",
+            "search_filter": "(&(objectClass=groupOfUniqueNames)(uniquemember={bind_dn}))",
+            "prefix": ""
+        }
+    ] * 4
+
+    with Given("I add LDAP group"):
+        groups = add_ldap_groups(groups=({"cn": role_name},))
+
+    with And("I add LDAP user to the group"):
+        add_user_to_group_in_ldap(user=ldap_user, group=groups[0])
+
+    with And("I add matching RBAC role"):
+        roles = add_rbac_roles(roles=(f"{role_name}",))
+
+    with And("I add LDAP external user directory configuration"):
+        add_ldap_external_user_directory(server=ldap_server,
+            role_mappings=role_mappings, restart=True)
+
+    with When(f"I login as an LDAP user"):
+        r = self.context.node.query(f"SHOW GRANTS", settings=[
+            ("user", ldap_user["username"]), ("password", ldap_user["password"])])
+
+    with Then("I expect the user to have mapped LDAP role"):
+        with By(f"checking that the role is assigned", description=f"{role_name}"):
+            assert roles[0].strip("'") in r.output, error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_LDAP_Group_RemovedAndAdded_Parallel("1.0")
+)
+def group_removed_and_added_in_parallel(self, ldap_server, ldap_user, count=20, timeout=200):
+    """Check that user can be authenticated successfully when LDAP groups
+    are removed and added in parallel.
+    """
+    uid = getuid()
+    role_names = [f"role{i}_{uid}" for i in range(count)]
+    users = [{"cn": ldap_user["username"], "userpassword": ldap_user["password"]}]
+    groups = []
+
+    role_mappings = [
+        {
+            "base_dn": "ou=groups,dc=company,dc=com",
+            "attribute": "cn",
+            "search_filter": "(&(objectClass=groupOfUniqueNames)(uniquemember={bind_dn}))",
+            "prefix": ""
+        }
+    ]
+
+    try:
+        with Given("I initially add all LDAP groups"):
+            for role_name in role_names:
+                with When(f"I add LDAP groop {role_name}"):
+                    group = add_group_to_ldap(**{"cn": role_name})
+                with And(f"I add LDAP user to the group {role_name}"):
+                    add_user_to_group_in_ldap(user=ldap_user, group=group)
+                groups.append(group)
+
+        with And("I add RBAC roles"):
+            add_rbac_roles(roles=role_names)
+
+        with And("I add LDAP external user directory configuration"):
+            add_ldap_external_user_directory(server=ldap_server,
+                role_mappings=role_mappings, restart=True)
+
+        tasks = []
+        try:
+            with When("user try to login while LDAP groups are added and removed in parallel"):
+                p = Pool(15)
+                for i in range(15):
+                    tasks.append(p.apply_async(login_with_valid_username_and_password, (users, i, 50,)))
+                    tasks.append(p.apply_async(remove_ldap_groups_in_parallel, (groups, i, 10,)))
+                    tasks.append(p.apply_async(add_ldap_groups_in_parallel,(ldap_user, role_names, i, 10,)))
+
+        finally:
+            with Finally("it should work", flags=TE):
+                join(tasks, timeout)
+    finally:
+        with Finally("I clean up all LDAP groups"):
+            for group in groups:
+                delete_group_from_ldap(group, exitcode=None)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_LDAP_Group_UserRemovedAndAdded_Parallel("1.0")
+)
+def user_removed_and_added_in_ldap_groups_in_parallel(self, ldap_server, ldap_user, count=20, timeout=200):
+    """Check that user can be authenticated successfully when it is
+    removed and added from mapping LDAP groups in parallel.
+    """
+    uid = getuid()
+    role_names = [f"role{i}_{uid}" for i in range(count)]
+    users = [{"cn": ldap_user["username"], "userpassword": ldap_user["password"]}]
+    groups = [{"cn": role_name} for role_name in role_names]
+
+    role_mappings = [
+        {
+            "base_dn": "ou=groups,dc=company,dc=com",
+            "attribute": "cn",
+            "search_filter": "(&(objectClass=groupOfUniqueNames)(uniquemember={bind_dn}))",
+            "prefix": ""
+        }
+    ]
+
+    with Given("I add all LDAP groups"):
+        groups = add_ldap_groups(groups=groups)
+
+        for group in groups:
+            with And(f"I add LDAP user to the group {group['dn']}"):
+                add_user_to_group_in_ldap(user=ldap_user, group=group)
+
+    with And("I add RBAC roles"):
+        add_rbac_roles(roles=role_names)
+
+    with And("I add LDAP external user directory configuration"):
+        add_ldap_external_user_directory(server=ldap_server,
+            role_mappings=role_mappings, restart=True)
+
+    tasks = []
+    try:
+        with When("user try to login while user is added and removed from LDAP groups in parallel"):
+            p = Pool(15)
+            for i in range(15):
+                tasks.append(p.apply_async(login_with_valid_username_and_password, (users, i, 50,)))
+                tasks.append(p.apply_async(remove_user_from_ldap_groups_in_parallel, (ldap_user, groups, i, 1,)))
+                tasks.append(p.apply_async(add_user_to_ldap_groups_in_parallel, (ldap_user, groups, i, 1,)))
+
+    finally:
+        with Finally("it should work", flags=TE):
+            join(tasks, timeout)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_RBAC_Role_RemovedAndAdded_Parallel("1.0")
+)
+def roles_removed_and_added_in_parallel(self, ldap_server, ldap_user, count=20, timeout=200):
+    """Check that user can be authenticated successfully when roles that are mapped
+    by the LDAP groups are removed and added in parallel.
+    """
+    uid = getuid()
+    role_names = [f"role{i}_{uid}" for i in range(count)]
+    users = [{"cn": ldap_user["username"], "userpassword": ldap_user["password"]}]
+    groups = [{"cn": role_name} for role_name in role_names]
+
+    role_mappings = [
+        {
+            "base_dn": "ou=groups,dc=company,dc=com",
+            "attribute": "cn",
+            "search_filter": "(&(objectClass=groupOfUniqueNames)(uniquemember={bind_dn}))",
+            "prefix": ""
+        }
+    ]
+
+    fail("known bug that needs to be investigated")
+
+    with Given("I add all LDAP groups"):
+        groups = add_ldap_groups(groups=groups)
+        for group in groups:
+            with And(f"I add LDAP user to the group {group['dn']}"):
+                add_user_to_group_in_ldap(user=ldap_user, group=group)
+
+    with And("I add RBAC roles"):
+        add_rbac_roles(roles=role_names)
+
+    with And("I add LDAP external user directory configuration"):
+        add_ldap_external_user_directory(server=ldap_server,
+            role_mappings=role_mappings, restart=True)
+
+    tasks = []
+    try:
+        with When("user try to login while mapped roles are added and removed in parallel"):
+            p = Pool(15)
+            for i in range(15):
+                tasks.append(p.apply_async(login_with_valid_username_and_password, (users, i, 50,)))
+                tasks.append(p.apply_async(remove_roles_in_parallel, (role_names, i, 10,)))
+                tasks.append(p.apply_async(add_roles_in_parallel, (role_names, i, 10,)))
+
+    finally:
+        with Finally("it should work", flags=TE):
+            join(tasks, timeout)
+
+        with And("I clean up all the roles"):
+            for role_name in role_names:
+                with By(f"dropping role {role_name}", flags=TE):
+                    self.context.node.query(f"DROP ROLE IF EXISTS {role_name}")
+
+@TestOutline
+def parallel_login(self, ldap_server, ldap_user, user_count=10, timeout=200, role_count=10):
+    """Check that login of valid and invalid LDAP authenticated users
+    with mapped roles works in parallel.
+    """
+    uid = getuid()
+
+    role_names = [f"role{i}_{uid}" for i in range(role_count)]
+    users = [{"cn": f"parallel_user{i}", "userpassword": randomword(20)} for i in range(user_count)]
+    groups = [{"cn": f"clickhouse_{role_name}"} for role_name in role_names]
+
+    role_mappings = [
+        {
+            "base_dn": "ou=groups,dc=company,dc=com",
+            "attribute": "cn",
+            "search_filter": "(&(objectClass=groupOfUniqueNames)(uniquemember={bind_dn}))",
+            "prefix": "clickhouse_"
+        }
+    ]
+
+    with Given("I add LDAP users"):
+        users = add_ldap_users(users=users)
+
+    with And("I add all LDAP groups"):
+        groups = add_ldap_groups(groups=groups)
+
+    for group in groups:
+        for user in users:
+            with And(f"I add LDAP user {user['dn']} to the group {group['dn']}"):
+                add_user_to_group_in_ldap(user=user, group=group)
+
+    with And("I add RBAC roles"):
+        add_rbac_roles(roles=role_names)
+
+    with And("I add LDAP external user directory configuration"):
+        add_ldap_external_user_directory(server=ldap_server,
+            role_mappings=role_mappings, restart=True)
+
+    tasks = []
+    try:
+        with When("users try to login in parallel", description="""
+            * with valid username and password
+            * with invalid username and valid password
+            * with valid username and invalid password
+            """):
+            p = Pool(15)
+            for i in range(25):
+                tasks.append(p.apply_async(login_with_valid_username_and_password, (users, i, 50,)))
+                tasks.append(p.apply_async(login_with_valid_username_and_invalid_password, (users, i, 50,)))
+                tasks.append(p.apply_async(login_with_invalid_username_and_valid_password, (users, i, 50,)))
+
+    finally:
+        with Then("it should work"):
+            join(tasks, timeout)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Authentication_Parallel("1.0"),
+    RQ_SRS_014_LDAP_RoleMapping_Authentication_Parallel_ValidAndInvalid("1.0")
+)
+def parallel_login_of_multiple_users(self, ldap_server, ldap_user, timeout=200, role_count=10):
+    """Check that valid and invalid logins of multiple LDAP authenticated users
+    with mapped roles works in parallel.
+    """
+    parallel_login(user_count=10, ldap_user=ldap_user,ldap_server=ldap_server,
+        timeout=timeout, role_count=role_count)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Authentication_Parallel_SameUser("1.0"),
+    RQ_SRS_014_LDAP_RoleMapping_Authentication_Parallel_ValidAndInvalid("1.0")
+)
+def parallel_login_of_the_same_user(self, ldap_server, ldap_user, timeout=200, role_count=10):
+    """Check that valid and invalid logins of the same LDAP authenticated user
+    with mapped roles works in parallel.
+    """
+    parallel_login(user_count=10, ldap_user=ldap_user,ldap_server=ldap_server,
+        timeout=timeout, role_count=role_count)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Authentication_Parallel_MultipleServers("1.0"),
+    RQ_SRS_014_LDAP_RoleMapping_Authentication_Parallel_ValidAndInvalid("1.0")
+)
+def parallel_login_of_ldap_users_with_multiple_servers(self, ldap_server, ldap_user, timeout=200):
+    """Check that valid and invalid logins of multiple LDAP users that have mapped roles
+    works in parallel using multiple LDAP external user directories.
+    """
+    parallel_login_with_multiple_servers(ldap_server=ldap_server, ldap_user=ldap_user,
+        user_count=10, role_count=10,timeout=timeout, with_ldap_users=True, with_local_users=False)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Authentication_Parallel_LocalAndMultipleLDAP("1.0"),
+    RQ_SRS_014_LDAP_RoleMapping_Authentication_Parallel_ValidAndInvalid("1.0")
+)
+def parallel_login_of_local_and_ldap_users_with_multiple_servers(self, ldap_server, ldap_user, timeout=200):
+    """Check that valid and invalid logins of local users and LDAP users that have mapped roles
+    works in parallel using multiple LDAP external user directories.
+    """
+    parallel_login_with_multiple_servers(ldap_server=ldap_server, ldap_user=ldap_user,
+        user_count=10, role_count=10, timeout=timeout, with_local_users=True, with_ldap_users=True)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Authentication_Parallel_LocalOnly("1.0")
+)
+def parallel_login_of_local_users(self, ldap_server, ldap_user, timeout=200):
+    """Check that valid and invalid logins of local users
+    works in parallel when multiple LDAP external user directories
+    with role mapping are configured.
+    """
+    parallel_login_with_multiple_servers(ldap_server=ldap_server, ldap_user=ldap_user,
+        user_count=10, role_count=10, timeout=timeout, with_local_users=True, with_ldap_users=False)
+
+@TestOutline
+def parallel_login_with_multiple_servers(self, ldap_server, ldap_user, user_count=10,
+        role_count=10, timeout=200, with_ldap_users=True, with_local_users=False):
+    """Check that login of valid and invalid local users or LDAP users that have mapped roles
+    works in parallel using multiple LDAP external user directories.
+    """
+    uid = getuid()
+
+    cluster = self.context.cluster
+    user_groups = {}
+
+    with Given("I define role names"):
+        role_names = [f"role{i}_{uid}" for i in range(role_count)]
+
+    with And("I define corresponding group names"):
+        groups = [{"cn": f"clickhouse_{role_name}"} for role_name in role_names]
+
+    if with_ldap_users:
+        with And("I define a group of users to be created on each LDAP server"):
+            user_groups["openldap1_users"] = [
+                {"cn": f"openldap1_parallel_user{i}_{uid}", "userpassword": randomword(20)} for i in range(user_count)
+            ]
+            user_groups["openldap2_users"] = [
+                {"cn": f"openldap2_parallel_user{i}_{uid}", "userpassword": randomword(20)} for i in range(user_count)
+            ]
+
+    if with_local_users:
+        with And("I define a group of local users to be created"):
+            user_groups["local_users"] = [
+                {"cn": f"local_parallel_user{i}_{uid}", "userpassword": randomword(20)} for i in range(user_count)
+            ]
+
+    with And("I have a list of checks that I want to run for each user group"):
+        checks = [
+            login_with_valid_username_and_password,
+            login_with_valid_username_and_invalid_password,
+            login_with_invalid_username_and_valid_password
+        ]
+
+    with And("I create config file to define LDAP external user directory for each LDAP server"):
+        entries = {
+            "user_directories": [
+                {"ldap": [
+                    {"server": "openldap1"},
+                    {"role_mappings" : [
+                        {
+                            "base_dn": "ou=groups,dc=company,dc=com",
+                            "attribute": "cn",
+                            "search_filter": "(&(objectClass=groupOfUniqueNames)(uniquemember={bind_dn}))",
+                            "prefix": "clickhouse_"
+                        }
+                    ]}
+                ]},
+                {"ldap": [
+                    {"server": "openldap2"},
+                    {"role_mappings": [
+                        {
+                            "base_dn": "ou=groups,dc=company,dc=com",
+                            "attribute": "cn",
+                            "search_filter": "(&(objectClass=groupOfUniqueNames)(uniquemember={bind_dn}))",
+                            "prefix": "clickhouse_"
+                        }
+                    ]}
+                ]}
+            ]
+        }
+        config = create_entries_ldap_external_user_directory_config_content(entries)
+
+    with And("I add LDAP external user directory configuration"):
+        add_ldap_external_user_directory(server=None, restart=True, config=config)
+
+    if with_ldap_users:
+        with And("I add LDAP users to each LDAP server"):
+            openldap1_users = add_ldap_users(users=user_groups["openldap1_users"], node=cluster.node("openldap1"))
+            openldap2_users = add_ldap_users(users=user_groups["openldap2_users"], node=cluster.node("openldap2"))
+
+        with And("I add all LDAP groups to each LDAP server"):
+            openldap1_groups = add_ldap_groups(groups=groups, node=cluster.node("openldap1"))
+            openldap2_groups = add_ldap_groups(groups=groups, node=cluster.node("openldap2"))
+
+        with And("I add all users to LDAP groups on the first LDAP server"):
+            for group in openldap1_groups:
+                for user in openldap1_users:
+                    with By(f"adding LDAP user {user['dn']} to the group {group['dn']}"):
+                        add_user_to_group_in_ldap(user=user, group=group, node=cluster.node("openldap1"))
+
+        with And("I add all users to LDAP groups on the second LDAP server"):
+            for group in openldap2_groups:
+                for user in openldap2_users:
+                    with By(f"adding LDAP user {user['dn']} to the group {group['dn']}"):
+                        add_user_to_group_in_ldap(user=user, group=group, node=cluster.node("openldap2"))
+
+    with And("I add RBAC roles"):
+        add_rbac_roles(roles=role_names)
+
+    if with_local_users:
+        with And("I add local users"):
+            add_rbac_users(users=user_groups["local_users"])
+
+        with And("I grant the same RBAC roles to local users"):
+            for user in user_groups["local_users"]:
+                for role_name in role_names:
+                    self.context.node.query(f"GRANT {role_name} TO {user['cn']}")
+
+    tasks = []
+
+    try:
+        with When("users in each group try to login in parallel", description="""
+            * with valid username and password
+            * with invalid username and valid password
+            * with valid username and invalid password
+            """):
+            p = Pool(15)
+            for i in range(25):
+                for users in user_groups.values():
+                    for check in checks:
+                        tasks.append(p.apply_async(check, (users, i, 50,)))
+
+    finally:
+        with Then("it should work"):
+            join(tasks, timeout)
+
+@TestFeature
+@Name("mapping")
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Search("1.0")
+)
+def feature(self):
+    """Check role LDAP role mapping.
+    """
+    self.context.node = self.context.cluster.node("clickhouse1")
+    self.context.ldap_node = self.context.cluster.node("openldap1")
+
+    servers = {
+        "openldap1": {
+            "host": "openldap1",
+            "port": "389",
+            "enable_tls": "no",
+            "bind_dn": "cn={user_name},ou=users,dc=company,dc=com"
+        },
+        "openldap2": {
+            "host": "openldap2",
+            "port": "636",
+            "enable_tls": "yes",
+            "bind_dn": "cn={user_name},ou=users,dc=company,dc=com",
+            "tls_require_cert": "never",
+        }
+    }
+
+    users = [
+        {"server": "openldap1", "username": "user1", "password": "user1", "login": True,
+         "dn": "cn=user1,ou=users,dc=company,dc=com"},
+    ]
+
+    with Given("I fix LDAP access permissions"):
+        fix_ldap_permissions()
+
+    with And("I add LDAP servers configuration", description=f"{servers}"):
+        add_ldap_servers_configuration(servers=servers)
+
+    for scenario in loads(current_module(), Scenario):
+        scenario(ldap_server="openldap1", ldap_user=users[0])
diff --git a/tests/testflows/ldap/role_mapping/tests/server_config.py b/tests/testflows/ldap/role_mapping/tests/server_config.py
new file mode 100644
index 00000000000..85fe33f4388
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/tests/server_config.py
@@ -0,0 +1,78 @@
+from testflows.core import *
+from testflows.asserts import error
+
+from ldap.role_mapping.requirements import *
+
+from ldap.authentication.tests.common import invalid_server_config
+from ldap.external_user_directory.tests.common import login
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_BindDN("1.0")
+)
+def valid_bind_dn(self):
+    """Check that LDAP users can login when `bind_dn` is valid.
+    """
+    servers = {
+        "openldap1": {
+            "host": "openldap1", "port": "389", "enable_tls": "no",
+            "bind_dn": "cn={user_name},ou=users,dc=company,dc=com"
+        }
+    }
+
+    user = {
+        "server": "openldap1", "username": "user1", "password": "user1", "login": True,
+    }
+
+    login(servers, "openldap1", user)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_BindDN("1.0")
+)
+def invalid_bind_dn(self):
+    """Check that LDAP users can't login when `bind_dn` is invalid.
+    """
+    servers = {
+        "openldap1": {
+            "host": "openldap1", "port": "389", "enable_tls": "no",
+            "bind_dn": "cn={user_name},ou=users,dc=company2,dc=com"
+        }}
+
+    user = {
+        "server": "openldap1", "username": "user1", "password": "user1", "login": True,
+        "exitcode": 4,
+        "message": "DB::Exception: user1: Authentication failed: password is incorrect or there is no user with such name."
+    }
+
+    login(servers, "openldap1", user)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_BindDN_ConflictWith_AuthDN("1.0")
+)
+def bind_dn_conflict_with_auth_dn(self, timeout=60):
+    """Check that an error is returned with both `bind_dn` and
+    `auth_dn_prefix` and `auth_dn_suffix` are specified at the same time.
+    """
+    message = "DB::Exception: Deprecated 'auth_dn_prefix' and 'auth_dn_suffix' entries cannot be used with 'bind_dn' entry"
+    servers = {
+        "openldap1": {
+            "host": "openldap1", "port": "389", "enable_tls": "no",
+            "bind_dn": "cn={user_name},ou=users,dc=company,dc=com",
+            "auth_dn_prefix": "cn=",
+            "auth_dn_suffix": ",ou=users,dc=company,dc=com"
+        }
+    }
+
+    invalid_server_config(servers, message=message, tail=18, timeout=timeout)
+
+
+@TestFeature
+@Name("server config")
+def feature(self, node="clickhouse1"):
+    """Check LDAP server configuration.
+    """
+    self.context.node = self.context.cluster.node(node)
+    for scenario in loads(current_module(), Scenario):
+        scenario()
\ No newline at end of file
diff --git a/tests/testflows/rbac/docker-compose/clickhouse-service.yml b/tests/testflows/rbac/docker-compose/clickhouse-service.yml
index 2d79443dcbb..d5f981ca8b7 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: 3
+      retries: 10
       start_period: 300s
     cap_add:
       - SYS_PTRACE
diff --git a/tests/testflows/regression.py b/tests/testflows/regression.py
index 6e19e4e49e1..0e9a821cae0 100755
--- a/tests/testflows/regression.py
+++ b/tests/testflows/regression.py
@@ -14,11 +14,10 @@ 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)
-#    for i in range(10):
-#        Feature(test=load("rbac.regression", "regression"))(**args)
-#    Feature(test=load("aes_encryption.regression", "regression"))(**args)
+    Feature(test=load("example.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)
 
 if main():
     regression()

From 1bd0c25bf00149b3772906104e02d449bab01a0d Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Tue, 19 Jan 2021 01:40:30 +0300
Subject: [PATCH 154/611] Consolidate the test hint handling

Before it was handled in like five places with two of them disabled by a
flag and the others not disabled. Hard to navigate.
---
 programs/client/Client.cpp | 291 +++++++++++++++++++++++++------------
 programs/client/TestHint.h |  38 -----
 2 files changed, 202 insertions(+), 127 deletions(-)

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index a13c36c1fcf..46556e7099a 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -193,15 +193,15 @@ private:
     /// Parsed query. Is used to determine some settings (e.g. format, output file).
     ASTPtr parsed_query;
 
-    /// The last exception that was received from the server. Is used for the return code in batch mode.
-    std::unique_ptr<Exception> last_exception_received_from_server;
+    /// The last exception that was received from the server. Is used for the
+    /// return code in batch mode.
+    std::unique_ptr<Exception> server_exception;
+    /// Likewise, the last exception that occurred on the client.
+    std::unique_ptr<Exception> client_exception;
 
-    /// If the last query resulted in exception.
-    bool received_exception_from_server = false;
-    int expected_server_error = 0;
-    int expected_client_error = 0;
-    int actual_server_error = 0;
-    int actual_client_error = 0;
+    /// If the last query resulted in exception. `server_exception` or
+    /// `client_exception` must be set.
+    bool have_error = false;
 
     UInt64 server_revision = 0;
     String server_version;
@@ -667,18 +667,14 @@ private:
                 }
                 catch (const Exception & e)
                 {
-                    actual_client_error = e.code();
-                    if (!actual_client_error || actual_client_error != expected_client_error)
-                    {
-                        std::cerr << std::endl
-                            << "Exception on client:" << std::endl
-                            << "Code: " << e.code() << ". " << e.displayText() << std::endl;
+                    std::cerr << std::endl
+                        << "Exception on client:" << std::endl
+                        << "Code: " << e.code() << ". " << e.displayText() << std::endl;
 
-                        if (config().getBool("stacktrace", false))
-                            std::cerr << "Stack trace:" << std::endl << e.getStackTraceString() << std::endl;
+                    if (config().getBool("stacktrace", false))
+                        std::cerr << "Stack trace:" << std::endl << e.getStackTraceString() << std::endl;
 
-                        std::cerr << std::endl;
-                    }
+                    std::cerr << std::endl;
 
                     /// Client-side exception during query execution can result in the loss of
                     /// sync in the connection protocol.
@@ -704,9 +700,20 @@ private:
 
             nonInteractive();
 
-            /// If exception code isn't zero, we should return non-zero return code anyway.
-            if (last_exception_received_from_server)
-                return last_exception_received_from_server->code() != 0 ? last_exception_received_from_server->code() : -1;
+            // If exception code isn't zero, we should return non-zero return
+            // code anyway.
+            const auto * exception = server_exception
+                ? server_exception.get() : client_exception.get();
+            if (exception)
+            {
+                return exception->code() != 0 ? exception->code() : -1;
+            }
+            if (have_error)
+            {
+                // Shouldn't be set without an exception, but check it just in
+                // case so that at least we don't lose an error.
+                return -1;
+            }
 
             return 0;
         }
@@ -892,6 +899,40 @@ private:
         }
     }
 
+    void reportQueryError() const
+    {
+        // If we probably have progress bar, we should add additional
+        // newline, otherwise exception may display concatenated with
+        // the progress bar.
+        if (need_render_progress)
+            std::cerr << '\n';
+
+        if (server_exception)
+        {
+            std::string text = server_exception->displayText();
+            auto embedded_stack_trace_pos = text.find("Stack trace");
+            if (std::string::npos != embedded_stack_trace_pos
+                && !config().getBool("stacktrace", false))
+            {
+                text.resize(embedded_stack_trace_pos);
+            }
+            std::cerr << "Received exception from server (version "
+                << server_version << "):" << std::endl << "Code: "
+                << server_exception->code() << ". " << text << std::endl;
+        }
+
+        if (client_exception)
+        {
+            fmt::print(stderr,
+                "Error on processing query '{}':\n{}",
+                full_query, client_exception->message());
+        }
+
+        // A debug check -- at least some exception must be set, if the error
+        // flag is set, and vice versa.
+        assert(have_error == (client_exception || server_exception));
+    }
+
     bool processMultiQuery(const String & all_queries_text)
     {
         // It makes sense not to base any control flow on this, so that it is
@@ -1055,51 +1096,135 @@ private:
                 continue;
             }
 
-            // Look for the hint in the text of query + insert data, if any.
-            // e.g. insert into t format CSV 'a' -- { serverError 123 }.
-            TestHint test_hint(test_mode, full_query);
-            expected_client_error = test_hint.clientError();
-            expected_server_error = test_hint.serverError();
-
             try
             {
                 processParsedSingleQuery();
-
-                if (insert_ast && insert_ast->data)
-                {
-                    // For VALUES format: use the end of inline data as reported
-                    // by the format parser (it is saved in sendData()). This
-                    // allows us to handle queries like:
-                    //   insert into t values (1); select 1
-                    //, where the inline data is delimited by semicolon and not
-                    // by a newline.
-                    this_query_end = parsed_query->as<ASTInsertQuery>()->end;
-
-                    adjustQueryEnd(this_query_end, all_queries_end,
-                        context.getSettingsRef().max_parser_depth);
-                }
             }
             catch (...)
             {
-                last_exception_received_from_server = std::make_unique<Exception>(getCurrentExceptionMessage(true), getCurrentExceptionCode());
-                actual_client_error = last_exception_received_from_server->code();
-                if (!ignore_error && (!actual_client_error || actual_client_error != expected_client_error))
-                    std::cerr << "Error on processing query: " << full_query << std::endl << last_exception_received_from_server->message();
-                received_exception_from_server = true;
+                // Surprisingly, this is a client error. A server error would
+                // have been reported w/o throwing (see onReceiveSeverException()).
+                client_exception = std::make_unique<Exception>(
+                    getCurrentExceptionMessage(true), getCurrentExceptionCode());
+                have_error = true;
             }
 
-            if (!test_hint.checkActual(
-                actual_server_error, actual_client_error, received_exception_from_server, last_exception_received_from_server))
+            // For INSERTs with inline data: use the end of inline data as
+            // reported by the format parser (it is saved in sendData()).
+            // This allows us to handle queries like:
+            //   insert into t values (1); select 1
+            // , where the inline data is delimited by semicolon and not by a
+            // newline.
+            if (insert_ast && insert_ast->data)
             {
+                this_query_end = insert_ast->end;
+                adjustQueryEnd(this_query_end, all_queries_end,
+                    context.getSettingsRef().max_parser_depth);
+            }
+
+            // Now we know for sure where the query ends.
+            // Look for the hint in the text of query + insert data + trailing
+            // comments,
+            // e.g. insert into t format CSV 'a' -- { serverError 123 }.
+            // Use the updated query boundaries we just calculated.
+            TestHint test_hint(test_mode, std::string(this_query_begin,
+                this_query_end - this_query_begin));
+
+            // Check whether the error (or its absence) matches the test hints
+            // (or their absence).
+            bool error_matches_hint = true;
+            if (have_error)
+            {
+                if (test_hint.serverError())
+                {
+                    if (!server_exception)
+                    {
+                        error_matches_hint = false;
+                        fmt::print(stderr,
+                            "Expected server error code '{}' but got no server error.\n",
+                            test_hint.serverError());
+                    }
+                    else if (server_exception->code() != test_hint.serverError())
+                    {
+                        error_matches_hint = false;
+                        std::cerr << "Expected server error code: " <<
+                            test_hint.serverError() << " but got: " <<
+                            server_exception->code() << "." << std::endl;
+                    }
+                }
+
+                if (test_hint.clientError())
+                {
+                    if (!client_exception)
+                    {
+                        error_matches_hint = false;
+                        fmt::print(stderr,
+                            "Expected client error code '{}' but got no client error.\n",
+                            test_hint.clientError());
+                    }
+                    else if (client_exception->code() != test_hint.clientError())
+                    {
+                        error_matches_hint = false;
+                        fmt::print(stderr,
+                            "Expected client error code '{}' but got '{}'.\n",
+                            test_hint.clientError(),
+                            client_exception->code());
+                    }
+                }
+
+                if (!test_hint.clientError() && !test_hint.serverError())
+                {
+                    // No error was expected but it still occurred. This is the
+                    // default case w/o test hint, doesn't need additional
+                    // diagnostics.
+                    error_matches_hint = false;
+                }
+            }
+            else
+            {
+                if (test_hint.clientError())
+                {
+                    fmt::print(stderr,
+                        "The query succeeded but the client error '{}' was expected.\n",
+                        test_hint.clientError());
+                    error_matches_hint = false;
+                }
+
+                if (test_hint.serverError())
+                {
+                    fmt::print(stderr,
+                        "The query succeeded but the server error '{}' was expected.\n",
+                        test_hint.serverError());
+                    error_matches_hint = false;
+                }
+            }
+
+            // If the error is expected, force reconnect and ignore it.
+            if (have_error && error_matches_hint)
+            {
+                client_exception.reset();
+                server_exception.reset();
+                have_error = false;
                 connection->forceConnected(connection_parameters.timeouts);
             }
 
-            if (received_exception_from_server && !ignore_error)
+            // Report error.
+            if (have_error)
+            {
+                reportQueryError();
+            }
+
+            // Stop processing queries if needed.
+            if (have_error && !ignore_error)
             {
                 if (is_interactive)
+                {
                     break;
+                }
                 else
+                {
                     return false;
+                }
             }
 
             this_query_begin = this_query_end;
@@ -1207,15 +1332,20 @@ private:
                 // Some functions (e.g. protocol parsers) don't throw, but
                 // set last_exception instead, so we'll also do it here for
                 // uniformity.
-                last_exception_received_from_server = std::make_unique<Exception>(getCurrentExceptionMessage(true), getCurrentExceptionCode());
-                received_exception_from_server = true;
+                // Surprisingly, this is a client exception, because we get the
+                // server exception w/o throwing (see onReceiveException()).
+                client_exception = std::make_unique<Exception>(
+                    getCurrentExceptionMessage(true), getCurrentExceptionCode());
+                have_error = true;
             }
 
-            if (received_exception_from_server)
+            if (have_error)
             {
+                const auto * exception = server_exception
+                    ? server_exception.get() : client_exception.get();
                 fmt::print(stderr, "Error on processing query '{}': {}\n",
                     ast_to_process->formatForErrorMessage(),
-                    last_exception_received_from_server->message());
+                    exception->message());
             }
 
             if (!connection->isConnected())
@@ -1228,13 +1358,14 @@ private:
 
             // The server is still alive so we're going to continue fuzzing.
             // Determine what we're going to use as the starting AST.
-            if (received_exception_from_server)
+            if (have_error)
             {
                 // Query completed with error, keep the previous starting AST.
                 // Also discard the exception that we now know to be non-fatal,
                 // so that it doesn't influence the exit code.
-                last_exception_received_from_server.reset(nullptr);
-                received_exception_from_server = false;
+                server_exception.reset();
+                client_exception.reset();
+                have_error = false;
             }
             else if (ast_to_process->formatForErrorMessage().size() > 500)
             {
@@ -1278,6 +1409,11 @@ private:
         }
 
         processParsedSingleQuery();
+
+        if (have_error)
+        {
+            reportQueryError();
+        }
     }
 
     // Parameters are in global variables:
@@ -1288,8 +1424,9 @@ private:
     void processParsedSingleQuery()
     {
         resetOutput();
-        last_exception_received_from_server.reset();
-        received_exception_from_server = false;
+        client_exception.reset();
+        server_exception.reset();
+        have_error = false;
 
         if (echo_queries)
         {
@@ -1354,7 +1491,7 @@ private:
         }
 
         /// Do not change context (current DB, settings) in case of an exception.
-        if (!received_exception_from_server)
+        if (!have_error)
         {
             if (const auto * set_query = parsed_query->as<ASTSetQuery>())
             {
@@ -1765,8 +1902,7 @@ private:
                 return true;
 
             case Protocol::Server::Exception:
-                onReceiveExceptionFromServer(*packet.exception);
-                last_exception_received_from_server = std::move(packet.exception);
+                onReceiveExceptionFromServer(std::move(packet.exception));
                 return false;
 
             case Protocol::Server::Log:
@@ -1798,8 +1934,7 @@ private:
                     return true;
 
                 case Protocol::Server::Exception:
-                    onReceiveExceptionFromServer(*packet.exception);
-                    last_exception_received_from_server = std::move(packet.exception);
+                    onReceiveExceptionFromServer(std::move(packet.exception));
                     return false;
 
                 case Protocol::Server::Log:
@@ -1832,8 +1967,7 @@ private:
                     return true;
 
                 case Protocol::Server::Exception:
-                    onReceiveExceptionFromServer(*packet.exception);
-                    last_exception_received_from_server = std::move(packet.exception);
+                    onReceiveExceptionFromServer(std::move(packet.exception));
                     return false;
 
                 case Protocol::Server::Log:
@@ -2142,32 +2276,11 @@ private:
     }
 
 
-    void onReceiveExceptionFromServer(const Exception & e)
+    void onReceiveExceptionFromServer(std::unique_ptr<Exception> && e)
     {
+        have_error = true;
+        server_exception = std::move(e);
         resetOutput();
-        received_exception_from_server = true;
-
-        actual_server_error = e.code();
-        if (expected_server_error)
-        {
-            if (actual_server_error == expected_server_error)
-                return;
-            std::cerr << "Expected error code: " << expected_server_error << " but got: " << actual_server_error << "." << std::endl;
-        }
-
-        std::string text = e.displayText();
-
-        auto embedded_stack_trace_pos = text.find("Stack trace");
-        if (std::string::npos != embedded_stack_trace_pos && !config().getBool("stacktrace", false))
-            text.resize(embedded_stack_trace_pos);
-
-        /// If we probably have progress bar, we should add additional newline,
-        /// otherwise exception may display concatenated with the progress bar.
-        if (need_render_progress)
-            std::cerr << '\n';
-
-        std::cerr << "Received exception from server (version " << server_version << "):" << std::endl
-            << "Code: " << e.code() << ". " << text << std::endl;
     }
 
 
diff --git a/programs/client/TestHint.h b/programs/client/TestHint.h
index dac7038b836..32dc1f0bc17 100644
--- a/programs/client/TestHint.h
+++ b/programs/client/TestHint.h
@@ -11,12 +11,6 @@
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int UNEXPECTED_ERROR_CODE;
-}
-
-
 /// Checks expected server and client error codes in testmode.
 /// To enable it add special comment after the query: "-- { serverError 60 }" or "-- { clientError 20 }".
 /// Also you can enable echoing all queries by writing "-- { echo }".
@@ -24,7 +18,6 @@ class TestHint
 {
 public:
     TestHint(bool enabled_, const String & query_) :
-        enabled(enabled_),
         query(query_)
     {
         if (!enabled_)
@@ -64,42 +57,11 @@ public:
         }
     }
 
-    /// @returns true if it's possible to continue without reconnect
-    bool checkActual(int & actual_server_error, int & actual_client_error,
-                     bool & got_exception, std::unique_ptr<Exception> & last_exception) const
-    {
-        if (!enabled)
-        {
-            return true;
-        }
-
-        if (allErrorsExpected(actual_server_error, actual_client_error))
-        {
-            got_exception = false;
-            last_exception.reset();
-            actual_server_error = 0;
-            actual_client_error = 0;
-            return false;
-        }
-
-        if (lostExpectedError(actual_server_error, actual_client_error))
-        {
-            std::cerr << "Success when error expected in query: " << query << "It expects server error "
-                << server_error << ", client error " << client_error << "." << std::endl;
-            got_exception = true;
-            last_exception = std::make_unique<Exception>("Success when error expected", ErrorCodes::UNEXPECTED_ERROR_CODE); /// return error to OS
-            return false;
-        }
-
-        return true;
-    }
-
     int serverError() const { return server_error; }
     int clientError() const { return client_error; }
     bool echoQueries() const { return echo; }
 
 private:
-    bool enabled = false;
     const String & query;
     int server_error = 0;
     int client_error = 0;

From d782a0e7ba7353f109f9e3fb8f60fab1dd272060 Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Tue, 19 Jan 2021 02:35:11 +0300
Subject: [PATCH 155/611] Update 40_bug-report.md

---
 .github/ISSUE_TEMPLATE/40_bug-report.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/40_bug-report.md b/.github/ISSUE_TEMPLATE/40_bug-report.md
index 1445af4b051..4dfd19266d0 100644
--- a/.github/ISSUE_TEMPLATE/40_bug-report.md
+++ b/.github/ISSUE_TEMPLATE/40_bug-report.md
@@ -12,6 +12,9 @@ assignees: ''
 **Describe the bug**
 A clear and concise description of what works not as it is supposed to.
 
+**Does it reproduce on recent release?**
+[The list of releases](https://github.com/ClickHouse/ClickHouse/blob/master/utils/list-versions/version_date.tsv)
+
 **How to reproduce**
 * Which ClickHouse server version to use
 * Which interface to use, if matters

From 2a76a8c8d08b329c8c01fb9e4c5e87ce0bf27073 Mon Sep 17 00:00:00 2001
From: RegulusZ <704709463@qq.com>
Date: Tue, 19 Jan 2021 11:52:18 +0800
Subject: [PATCH 156/611] Update ansi.md

Improve translation
---
 docs/zh/sql-reference/ansi.md | 130 +++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 65 deletions(-)

diff --git a/docs/zh/sql-reference/ansi.md b/docs/zh/sql-reference/ansi.md
index cc69988f507..0e7fa1d06c3 100644
--- a/docs/zh/sql-reference/ansi.md
+++ b/docs/zh/sql-reference/ansi.md
@@ -12,18 +12,18 @@ toc_title: "ANSI\u517C\u5BB9\u6027"
 
 ## 行为差异 {#differences-in-behaviour}
 
-下表列出了查询功能在ClickHouse中工作但行为不符合ANSI SQL中指定的情况。
+下表列出了查询功能在ClickHouse中有效但不符合ANSI SQL标准的情况。
 
 | Feature ID | 功能名称           | 差异                                                                |
 |------------|--------------------|---------------------------------------------------------------------|
-| E011       | 数字数据类型       | 带句点的数值文字被解释为近似值 (`Float64`）而不是确切的 (`Decimal`) |
-| E051-05    | 选择项目可以重命名 | 项目重命名具有比仅选择结果更广泛的可见性范围                        |
-| E141-01    | 非空约束           | `NOT NULL` 默认情况下，表列隐含                                     |
-| E011-04    | 算术运算符         | ClickHouse溢出而不是检查算法，并根据自定义规则更改结果数据类型      |
+| E011       | 数值（Numeric）数据类型       | 带小数点的数值文字被解释为近似值 (`Float64`）而不是精确值 (`Decimal`) |
+| E051-05    | SELECT字段可以重命名 | 字段不仅仅在SELECT结果中可被重命名                        |
+| E141-01    | 非空约束           | 表中每一列默认为`NOT NULL`                                      |
+| E011-04    | 算术运算符         | ClickHouse不会检查算法，并根据自定义规则更改结果数据类型，而是会溢出      |
 
-## 功能状态 {#feature-status}
+## 功能匹配 {#feature-status}
 
-| Feature ID | 功能名称                                                       | 状态                     | 评论                                                                                                                                                                     |
+| Feature ID | 功能名称                                                       | 匹配                     | 评论                                                                                                                                                                     |
 |------------|----------------------------------------------------------------|--------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **E011**   | **数字数据类型**                                               | **部分**{.text-warning}  |                                                                                                                                                                          |
 | E011-01    | 整型和小型数据类型                                             | 是 {.text-success}        |                                                                                                                                                                          |
@@ -31,10 +31,10 @@ toc_title: "ANSI\u517C\u5BB9\u6027"
 | E011-03    | 十进制和数值数据类型                                           | 部分 {.text-warning}      | 只有 `DECIMAL(p,s)` 支持，而不是 `NUMERIC`                                                                                                                               |
 | E011-04    | 算术运算符                                                     | 是 {.text-success}        |                                                                                                                                                                          |
 | E011-05    | 数字比较                                                       | 是 {.text-success}        |                                                                                                                                                                          |
-| E011-06    | 数字数据类型之间的隐式转换                                     | 非也。 {.text-danger}     | ANSI SQL允许在数值类型之间进行任意隐式转换，而ClickHouse依赖于具有多个重载的函数而不是隐式转换                                                                           |
+| E011-06    | 数字数据类型之间的隐式转换                                     | 否。 {.text-danger}     | ANSI SQL允许在数值类型之间进行任意隐式转换，而ClickHouse依赖于具有多个重载的函数而不是隐式转换                                                                           |
 | **E021**   | **字符串类型**                                                 | **部分**{.text-warning}  |                                                                                                                                                                          |
-| E021-01    | 字符数据类型                                                   | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| E021-02    | 字符变化数据类型                                               | 非也。 {.text-danger}     | `String` 行为类似，但括号中没有长度限制                                                                                                                                  |
+| E021-01    | 字符数据类型                                                   | 否。 {.text-danger}     |                                                                                                                                                                          |
+| E021-02    | 字符变化数据类型                                               | 否。 {.text-danger}     | `String` 行为类似，但括号中没有长度限制                                                                                                                                  |
 | E021-03    | 字符文字                                                       | 部分 {.text-warning}      | 不自动连接连续文字和字符集支持                                                                                                                                           |
 | E021-04    | 字符长度函数                                                   | 部分 {.text-warning}      | 非也。 `USING` 条款                                                                                                                                                      |
 | E021-05    | OCTET_LENGTH函数                                              | 非也。 {.text-danger}     | `LENGTH` 表现类似                                                                                                                                                        |
@@ -42,7 +42,7 @@ toc_title: "ANSI\u517C\u5BB9\u6027"
 | E021-07    | 字符串联                                                       | 部分 {.text-warning}      | 非也。 `COLLATE` 条款                                                                                                                                                    |
 | E021-08    | 上下功能                                                       | 是 {.text-success}        |                                                                                                                                                                          |
 | E021-09    | 修剪功能                                                       | 是 {.text-success}        |                                                                                                                                                                          |
-| E021-10    | 固定长度和可变长度字符串类型之间的隐式转换                     | 非也。 {.text-danger}     | ANSI SQL允许在字符串类型之间进行任意隐式转换，而ClickHouse依赖于具有多个重载的函数而不是隐式转换                                                                         |
+| E021-10    | 固定长度和可变长度字符串类型之间的隐式转换                     | 否。 {.text-danger}     | ANSI SQL允许在字符串类型之间进行任意隐式转换，而ClickHouse依赖于具有多个重载的函数而不是隐式转换                                                                         |
 | E021-11    | 职位功能                                                       | 部分 {.text-warning}      | 不支持 `IN` 和 `USING` 条款，否 `POSITION_REGEX` 备选案文                                                                                                                |
 | E021-12    | 字符比较                                                       | 是 {.text-success}        |                                                                                                                                                                          |
 | **E031**   | **标识符**                                                     | **部分**{.text-warning}  |                                                                                                                                                                          |
@@ -57,23 +57,23 @@ toc_title: "ANSI\u517C\u5BB9\u6027"
 | E051-06    | 有条款                                                         | 是 {.text-success}        |                                                                                                                                                                          |
 | E051-07    | 合格\*在选择列表中                                             | 是 {.text-success}        |                                                                                                                                                                          |
 | E051-08    | FROM子句中的关联名称                                           | 是 {.text-success}        |                                                                                                                                                                          |
-| E051-09    | 重命名FROM子句中的列                                           | 非也。 {.text-danger}     |                                                                                                                                                                          |
+| E051-09    | 重命名FROM子句中的列                                           | 否。 {.text-danger}     |                                                                                                                                                                          |
 | **E061**   | **基本谓词和搜索条件**                                         | **部分**{.text-warning}  |                                                                                                                                                                          |
 | E061-01    | 比较谓词                                                       | 是 {.text-success}        |                                                                                                                                                                          |
 | E061-02    | 谓词之间                                                       | 部分 {.text-warning}      | 非也。 `SYMMETRIC` 和 `ASYMMETRIC` 条款                                                                                                                                  |
 | E061-03    | 在具有值列表的谓词中                                           | 是 {.text-success}        |                                                                                                                                                                          |
 | E061-04    | 像谓词                                                         | 是 {.text-success}        |                                                                                                                                                                          |
-| E061-05    | LIKE谓词：逃避条款                                             | 非也。 {.text-danger}     |                                                                                                                                                                          |
+| E061-05    | LIKE谓词：逃避条款                                             | 否。 {.text-danger}     |                                                                                                                                                                          |
 | E061-06    | 空谓词                                                         | 是 {.text-success}        |                                                                                                                                                                          |
 | E061-07    | 量化比较谓词                                                   | 非也。 {.text-danger}     |                                                                                                                                                                          |
 | E061-08    | 存在谓词                                                       | 非也。 {.text-danger}     |                                                                                                                                                                          |
 | E061-09    | 比较谓词中的子查询                                             | 是 {.text-success}        |                                                                                                                                                                          |
 | E061-11    | 谓词中的子查询                                                 | 是 {.text-success}        |                                                                                                                                                                          |
-| E061-12    | 量化比较谓词中的子查询                                         | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| E061-13    | 相关子查询                                                     | 非也。 {.text-danger}     |                                                                                                                                                                          |
+| E061-12    | 量化比较谓词中的子查询                                         | 否。 {.text-danger}     |                                                                                                                                                                          |
+| E061-13    | 相关子查询                                                     | 否。 {.text-danger}     |                                                                                                                                                                          |
 | E061-14    | 搜索条件                                                       | 是 {.text-success}        |                                                                                                                                                                          |
 | **E071**   | **基本查询表达式**                                             | **部分**{.text-warning}  |                                                                                                                                                                          |
-| E071-01    | UNION DISTINCT table运算符                                     | 非也。 {.text-danger}     |                                                                                                                                                                          |
+| E071-01    | UNION DISTINCT table运算符                                     | 否。 {.text-danger}     |                                                                                                                                                                          |
 | E071-02    | 联合所有表运算符                                               | 是 {.text-success}        |                                                                                                                                                                          |
 | E071-03    | 除了不同的表运算符                                             | 非也。 {.text-danger}     |                                                                                                                                                                          |
 | E071-05    | 通过表运算符组合的列不必具有完全相同的数据类型                 | 是 {.text-success}        |                                                                                                                                                                          |
@@ -85,51 +85,51 @@ toc_title: "ANSI\u517C\u5BB9\u6027"
 | E091-03    | MAX                                                            | 是 {.text-success}        |                                                                                                                                                                          |
 | E091-04    | MIN                                                            | 是 {.text-success}        |                                                                                                                                                                          |
 | E091-05    | SUM                                                            | 是 {.text-success}        |                                                                                                                                                                          |
-| E091-06    | 全部量词                                                       | 非也。 {.text-danger}     |                                                                                                                                                                          |
+| E091-06    | 全部量词                                                       | 否。 {.text-danger}     |                                                                                                                                                                          |
 | E091-07    | 不同的量词                                                     | 部分 {.text-warning}      | 并非所有聚合函数都受支持                                                                                                                                                 |
 | **E101**   | **基本数据操作**                                               | **部分**{.text-warning}  |                                                                                                                                                                          |
 | E101-01    | 插入语句                                                       | 是 {.text-success}        | 注：ClickHouse中的主键并不意味着 `UNIQUE` 约束                                                                                                                           |
-| E101-03    | 搜索更新语句                                                   | 非也。 {.text-danger}     | 有一个 `ALTER UPDATE` 批量数据修改语句                                                                                                                                   |
-| E101-04    | 搜索的删除语句                                                 | 非也。 {.text-danger}     | 有一个 `ALTER DELETE` 批量数据删除声明                                                                                                                                   |
-| **E111**   | **单行SELECT语句**                                             | **非也。**{.text-danger} |                                                                                                                                                                          |
-| **E121**   | **基本光标支持**                                               | **非也。**{.text-danger} |                                                                                                                                                                          |
-| E121-01    | DECLARE CURSOR                                                 | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| E121-02    | 按列排序不需要在选择列表中                                     | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| E121-03    | 按顺序排列的值表达式                                           | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| E121-04    | 公开声明                                                       | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| E121-06    | 定位更新语句                                                   | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| E121-07    | 定位删除语句                                                   | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| E121-08    | 关闭声明                                                       | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| E121-10    | FETCH语句：隐式NEXT                                            | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| E121-17    | 使用保持游标                                                   | 非也。 {.text-danger}     |                                                                                                                                                                          |
+| E101-03    | 搜索更新语句                                                   | 否。 {.text-danger}     | 有一个 `ALTER UPDATE` 批量数据修改语句                                                                                                                                   |
+| E101-04    | 搜索的删除语句                                                 | 否。 {.text-danger}     | 有一个 `ALTER DELETE` 批量数据删除声明                                                                                                                                   |
+| **E111**   | **单行SELECT语句**                                             | **否。**{.text-danger} |                                                                                                                                                                          |
+| **E121**   | **基本光标支持**                                               | **否。**{.text-danger} |                                                                                                                                                                          |
+| E121-01    | DECLARE CURSOR                                                 | 否。 {.text-danger}     |                                                                                                                                                                          |
+| E121-02    | 按列排序不需要在选择列表中                                     | 否。 {.text-danger}     |                                                                                                                                                                          |
+| E121-03    | 按顺序排列的值表达式                                           | 否。 {.text-danger}     |                                                                                                                                                                          |
+| E121-04    | 公开声明                                                       | 否。 {.text-danger}     |                                                                                                                                                                          |
+| E121-06    | 定位更新语句                                                   | 否。 {.text-danger}     |                                                                                                                                                                          |
+| E121-07    | 定位删除语句                                                   | 否。 {.text-danger}     |                                                                                                                                                                          |
+| E121-08    | 关闭声明                                                       | 否。 {.text-danger}     |                                                                                                                                                                          |
+| E121-10    | FETCH语句：隐式NEXT                                            | 否。 {.text-danger}     |                                                                                                                                                                          |
+| E121-17    | 使用保持游标                                                   | 否。 {.text-danger}     |                                                                                                                                                                          |
 | **E131**   | **空值支持（空值代替值)**                                      | **部分**{.text-warning}  | 一些限制适用                                                                                                                                                             |
 | **E141**   | **基本完整性约束**                                             | **部分**{.text-warning}  |                                                                                                                                                                          |
 | E141-01    | 非空约束                                                       | 是 {.text-success}        | 注: `NOT NULL` 默认情况下，表列隐含                                                                                                                                      |
-| E141-02    | 非空列的唯一约束                                               | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| E141-03    | 主键约束                                                       | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| E141-04    | 对于引用删除操作和引用更新操作，具有默认无操作的基本外键约束   | 非也。 {.text-danger}     |                                                                                                                                                                          |
+| E141-02    | 非空列的唯一约束                                               | 否。 {.text-danger}     |                                                                                                                                                                          |
+| E141-03    | 主键约束                                                       | 否。 {.text-danger}     |                                                                                                                                                                          |
+| E141-04    | 对于引用删除操作和引用更新操作，具有默认无操作的基本外键约束   | 否。 {.text-danger}     |                                                                                                                                                                          |
 | E141-06    | 检查约束                                                       | 是 {.text-success}        |                                                                                                                                                                          |
 | E141-07    | 列默认值                                                       | 是 {.text-success}        |                                                                                                                                                                          |
 | E141-08    | 在主键上推断为非NULL                                           | 是 {.text-success}        |                                                                                                                                                                          |
-| E141-10    | 可以按任何顺序指定外键中的名称                                 | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| **E151**   | **交易支持**                                                   | **非也。**{.text-danger} |                                                                                                                                                                          |
-| E151-01    | 提交语句                                                       | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| E151-02    | 回滚语句                                                       | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| **E152**   | **基本设置事务语句**                                           | **非也。**{.text-danger} |                                                                                                                                                                          |
-| E152-01    | SET TRANSACTION语句：隔离级别SERIALIZABLE子句                  | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| E152-02    | SET TRANSACTION语句：只读和读写子句                            | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| **E153**   | **具有子查询的可更新查询**                                     | **非也。**{.text-danger} |                                                                                                                                                                          |
+| E141-10    | 可以按任何顺序指定外键中的名称                                 | 否。 {.text-danger}     |                                                                                                                                                                          |
+| **E151**   | **交易支持**                                                   | **否。**{.text-danger} |                                                                                                                                                                          |
+| E151-01    | 提交语句                                                       | 否。 {.text-danger}     |                                                                                                                                                                          |
+| E151-02    | 回滚语句                                                       | 否。 {.text-danger}     |                                                                                                                                                                          |
+| **E152**   | **基本设置事务语句**                                           | **否。**{.text-danger} |                                                                                                                                                                          |
+| E152-01    | SET TRANSACTION语句：隔离级别SERIALIZABLE子句                  | 否。 {.text-danger}     |                                                                                                                                                                          |
+| E152-02    | SET TRANSACTION语句：只读和读写子句                            | 否。 {.text-danger}     |                                                                                                                                                                          |
+| **E153**   | **具有子查询的可更新查询**                                     | **否。**{.text-danger} |                                                                                                                                                                          |
 | **E161**   | **SQL注释使用前导双减**                                        | **是**{.text-success}    |                                                                                                                                                                          |
-| **E171**   | **SQLSTATE支持**                                               | **非也。**{.text-danger} |                                                                                                                                                                          |
-| **E182**   | **主机语言绑定**                                               | **非也。**{.text-danger} |                                                                                                                                                                          |
+| **E171**   | **SQLSTATE支持**                                               | **否。**{.text-danger} |                                                                                                                                                                          |
+| **E182**   | **主机语言绑定**                                               | **否。**{.text-danger} |                                                                                                                                                                          |
 | **F031**   | **基本架构操作**                                               | **部分**{.text-warning}  |                                                                                                                                                                          |
-| F031-01    | CREATE TABLE语句创建持久基表                                   | 部分 {.text-warning}      | 非也。 `SYSTEM VERSIONING`, `ON COMMIT`, `GLOBAL`, `LOCAL`, `PRESERVE`, `DELETE`, `REF IS`, `WITH OPTIONS`, `UNDER`, `LIKE`, `PERIOD FOR` 子句，不支持用户解析的数据类型 |
-| F031-02    | 创建视图语句                                                   | 部分 {.text-warning}      | 非也。 `RECURSIVE`, `CHECK`, `UNDER`, `WITH OPTIONS` 子句，不支持用户解析的数据类型                                                                                      |
+| F031-01    | CREATE TABLE语句创建持久基表                                   | 部分 {.text-warning}      | 否。 `SYSTEM VERSIONING`, `ON COMMIT`, `GLOBAL`, `LOCAL`, `PRESERVE`, `DELETE`, `REF IS`, `WITH OPTIONS`, `UNDER`, `LIKE`, `PERIOD FOR` 子句，不支持用户解析的数据类型 |
+| F031-02    | 创建视图语句                                                   | 部分 {.text-warning}      | 否。 `RECURSIVE`, `CHECK`, `UNDER`, `WITH OPTIONS` 子句，不支持用户解析的数据类型                                                                                      |
 | F031-03    | 赠款声明                                                       | 是 {.text-success}        |                                                                                                                                                                          |
 | F031-04    | ALTER TABLE语句：ADD COLUMN子句                                | 部分 {.text-warning}      | 不支持 `GENERATED` 条款和系统时间段                                                                                                                                      |
-| F031-13    | DROP TABLE语句：RESTRICT子句                                   | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| F031-16    | DROP VIEW语句：RESTRICT子句                                    | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| F031-19    | REVOKE语句：RESTRICT子句                                       | 非也。 {.text-danger}     |                                                                                                                                                                          |
+| F031-13    | DROP TABLE语句：RESTRICT子句                                   | 否。 {.text-danger}     |                                                                                                                                                                          |
+| F031-16    | DROP VIEW语句：RESTRICT子句                                    | 否。 {.text-danger}     |                                                                                                                                                                          |
+| F031-19    | REVOKE语句：RESTRICT子句                                       | 否。 {.text-danger}     |                                                                                                                                                                          |
 | **F041**   | **基本连接表**                                                 | **部分**{.text-warning}  |                                                                                                                                                                          |
 | F041-01    | Inner join（但不一定是INNER关键字)                             | 是 {.text-success}        |                                                                                                                                                                          |
 | F041-02    | 内部关键字                                                     | 是 {.text-success}        |                                                                                                                                                                          |
@@ -137,16 +137,16 @@ toc_title: "ANSI\u517C\u5BB9\u6027"
 | F041-04    | RIGHT OUTER JOIN                                               | 是 {.text-success}        |                                                                                                                                                                          |
 | F041-05    | 可以嵌套外部连接                                               | 是 {.text-success}        |                                                                                                                                                                          |
 | F041-07    | 左侧或右侧外部联接中的内部表也可用于内部联接                   | 是 {.text-success}        |                                                                                                                                                                          |
-| F041-08    | 支持所有比较运算符（而不仅仅是=)                               | 非也。 {.text-danger}     |                                                                                                                                                                          |
+| F041-08    | 支持所有比较运算符（而不仅仅是=)                               | 否。 {.text-danger}     |                                                                                                                                                                          |
 | **F051**   | **基本日期和时间**                                             | **部分**{.text-warning}  |                                                                                                                                                                          |
 | F051-01    | 日期数据类型（包括对日期文字的支持)                            | 部分 {.text-warning}      | 没有文字                                                                                                                                                                 |
-| F051-02    | 时间数据类型（包括对时间文字的支持），秒小数精度至少为0        | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| F051-03    | 时间戳数据类型（包括对时间戳文字的支持），小数秒精度至少为0和6 | 非也。 {.text-danger}     | `DateTime64` 时间提供了类似的功能                                                                                                                                        |
+| F051-02    | 时间数据类型（包括对时间文字的支持），秒小数精度至少为0        | 否。 {.text-danger}     |                                                                                                                                                                          |
+| F051-03    | 时间戳数据类型（包括对时间戳文字的支持），小数秒精度至少为0和6 | 否。 {.text-danger}     | `DateTime64` 时间提供了类似的功能                                                                                                                                        |
 | F051-04    | 日期、时间和时间戳数据类型的比较谓词                           | 部分 {.text-warning}      | 只有一种数据类型可用                                                                                                                                                     |
 | F051-05    | Datetime类型和字符串类型之间的显式转换                         | 是 {.text-success}        |                                                                                                                                                                          |
-| F051-06    | CURRENT_DATE                                                  | 非也。 {.text-danger}     | `today()` 是相似的                                                                                                                                                       |
-| F051-07    | LOCALTIME                                                      | 非也。 {.text-danger}     | `now()` 是相似的                                                                                                                                                         |
-| F051-08    | LOCALTIMESTAMP                                                 | 非也。 {.text-danger}     |                                                                                                                                                                          |
+| F051-06    | CURRENT_DATE                                                  | 否。 {.text-danger}     | `today()` 是相似的                                                                                                                                                       |
+| F051-07    | LOCALTIME                                                      | 否。 {.text-danger}     | `now()` 是相似的                                                                                                                                                         |
+| F051-08    | LOCALTIMESTAMP                                                 | 否。 {.text-danger}     |                                                                                                                                                                          |
 | **F081**   | **联盟和视图除外**                                             | **部分**{.text-warning}  |                                                                                                                                                                          |
 | **F131**   | **分组操作**                                                   | **部分**{.text-warning}  |                                                                                                                                                                          |
 | F131-01    | WHERE、GROUP BY和HAVING子句在具有分组视图的查询中受支持        | 是 {.text-success}        |                                                                                                                                                                          |
@@ -154,27 +154,27 @@ toc_title: "ANSI\u517C\u5BB9\u6027"
 | F131-03    | 设置具有分组视图的查询中支持的函数                             | 是 {.text-success}        |                                                                                                                                                                          |
 | F131-04    | 具有分组依据和具有子句和分组视图的子查询                       | 是 {.text-success}        |                                                                                                                                                                          |
 | F131-05    | 单行选择具有GROUP BY和具有子句和分组视图                       | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| **F181**   | **多模块支持**                                                 | **非也。**{.text-danger} |                                                                                                                                                                          |
+| **F181**   | **多模块支持**                                                 | **否。**{.text-danger} |                                                                                                                                                                          |
 | **F201**   | **投函数**                                                     | **是**{.text-success}    |                                                                                                                                                                          |
-| **F221**   | **显式默认值**                                                 | **非也。**{.text-danger} |                                                                                                                                                                          |
+| **F221**   | **显式默认值**                                                 | **否。**{.text-danger} |                                                                                                                                                                          |
 | **F261**   | **案例表达式**                                                 | **是**{.text-success}    |                                                                                                                                                                          |
 | F261-01    | 简单案例                                                       | 是 {.text-success}        |                                                                                                                                                                          |
 | F261-02    | 检索案例                                                       | 是 {.text-success}        |                                                                                                                                                                          |
 | F261-03    | NULLIF                                                         | 是 {.text-success}        |                                                                                                                                                                          |
 | F261-04    | COALESCE                                                       | 是 {.text-success}        |                                                                                                                                                                          |
 | **F311**   | **架构定义语句**                                               | **部分**{.text-warning}  |                                                                                                                                                                          |
-| F311-01    | CREATE SCHEMA                                                  | 非也。 {.text-danger}     |                                                                                                                                                                          |
+| F311-01    | CREATE SCHEMA                                                  | 否。 {.text-danger}     |                                                                                                                                                                          |
 | F311-02    | 为持久基表创建表                                               | 是 {.text-success}        |                                                                                                                                                                          |
 | F311-03    | CREATE VIEW                                                    | 是 {.text-success}        |                                                                                                                                                                          |
-| F311-04    | CREATE VIEW: WITH CHECK OPTION                                 | 非也。 {.text-danger}     |                                                                                                                                                                          |
+| F311-04    | CREATE VIEW: WITH CHECK OPTION                                 | 否。 {.text-danger}     |                                                                                                                                                                          |
 | F311-05    | 赠款声明                                                       | 是 {.text-success}        |                                                                                                                                                                          |
 | **F471**   | **标量子查询值**                                               | **是**{.text-success}    |                                                                                                                                                                          |
 | **F481**   | **扩展空谓词**                                                 | **是**{.text-success}    |                                                                                                                                                                          |
-| **F812**   | **基本标记**                                                   | **非也。**{.text-danger} |                                                                                                                                                                          |
-| **T321**   | **基本的SQL调用例程**                                          | **非也。**{.text-danger} |                                                                                                                                                                          |
-| T321-01    | 无重载的用户定义函数                                           | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| T321-02    | 无重载的用户定义存储过程                                       | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| T321-03    | 函数调用                                                       | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| T321-04    | 电话声明                                                       | 非也。 {.text-danger}     |                                                                                                                                                                          |
-| T321-05    | 退货声明                                                       | 非也。 {.text-danger}     |                                                                                                                                                                          |
+| **F812**   | **基本标记**                                                   | **否。**{.text-danger} |                                                                                                                                                                          |
+| **T321**   | **基本的SQL调用例程**                                          | **否。**{.text-danger} |                                                                                                                                                                          |
+| T321-01    | 无重载的用户定义函数                                           | 否。 {.text-danger}     |                                                                                                                                                                          |
+| T321-02    | 无重载的用户定义存储过程                                       | 否。 {.text-danger}     |                                                                                                                                                                          |
+| T321-03    | 函数调用                                                       | 否。 {.text-danger}     |                                                                                                                                                                          |
+| T321-04    | 电话声明                                                       | 否。 {.text-danger}     |                                                                                                                                                                          |
+| T321-05    | 退货声明                                                       | 否。 {.text-danger}     |                                                                                                                                                                          |
 | **T631**   | **在一个列表元素的谓词中**                                     | **是**{.text-success}    |                                                                                                                                                                          |

From 6e1a1186424b32363b6b4a452198ca96090f3c49 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 19 Jan 2021 11:14:37 +0300
Subject: [PATCH 157/611] Merge Filter and Expression steps.

---
 src/Processors/QueryPlan/QueryPlan.cpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/Processors/QueryPlan/QueryPlan.cpp b/src/Processors/QueryPlan/QueryPlan.cpp
index 6b5f5bc30b6..9be9f6d0c0b 100644
--- a/src/Processors/QueryPlan/QueryPlan.cpp
+++ b/src/Processors/QueryPlan/QueryPlan.cpp
@@ -504,6 +504,7 @@ static bool tryMergeExpressions(QueryPlan::Node * parent_node, QueryPlan::Node *
 
     /// TODO: FilterStep
     auto * parent_expr = typeid_cast<ExpressionStep *>(parent.get());
+    auto * parent_filter = typeid_cast<FilterStep *>(parent.get());
     auto * child_expr = typeid_cast<ExpressionStep *>(child.get());
 
     if (parent_expr && child_expr)
@@ -526,6 +527,24 @@ static bool tryMergeExpressions(QueryPlan::Node * parent_node, QueryPlan::Node *
         parent_node->children.swap(child_node->children);
         return true;
     }
+    else if (parent_filter && child_expr)
+    {
+        const auto & child_actions = child_expr->getExpression();
+        const auto & parent_actions = parent_filter->getExpression();
+
+        if (child_actions->hasArrayJoin() && parent_actions->hasStatefulFunctions())
+            return false;
+
+        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());
+        filter->setStepDescription(parent_filter->getStepDescription() + " + " + child_expr->getStepDescription());
+
+        parent_node->step = std::move(filter);
+        parent_node->children.swap(child_node->children);
+        return true;
+    }
 
     return false;
 }

From 6db51965cd8826bfb6cf4771af727c0bedc1a57f Mon Sep 17 00:00:00 2001
From: Pavel Kovalenko <jokserfn@yandex-team.ru>
Date: Tue, 19 Jan 2021 12:03:48 +0300
Subject: [PATCH 158/611] Add S3 disk documentation [EN]

---
 .../mergetree-family/mergetree.md             | 90 +++++++++++++++++++
 1 file changed, 90 insertions(+)

diff --git a/docs/en/engines/table-engines/mergetree-family/mergetree.md b/docs/en/engines/table-engines/mergetree-family/mergetree.md
index 80769fe9954..084d05ec0a0 100644
--- a/docs/en/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/mergetree.md
@@ -657,6 +657,96 @@ 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.
 
+## 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`.
+
+Configuration markup:
+``` 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>
+            <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>
+            <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>
+```
+
+Required parameters:
+-   `endpoint` — S3 endpoint url in `path` or `virtual hosted` [styles](https://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html). Endpoint url should contain bucket and root path to store data.
+-   `access_key_id` — S3 access key id. 
+-   `secret_access_key` — S3 secret access key.
+
+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`.
+-   `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>/`. 
+-   `cache_enabled` — Allows to cache mark and index files on local FS. Default value is `true`. 
+-   `cache_path` — Path on local FS where to store cached mark and index files. Default value is `/var/lib/clickhouse/disks/<disk_name>/cache/`. 
+-   `skip_access_check` — If true disk access checks will not be performed on disk start-up. Default value is `false`.
+
+
+S3 disk can be configured as `main` or `cold` storage:
+``` 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>
+```
+
+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:

From 3ae8d37e83f4c35e6809e52554d1cff3cde0356f Mon Sep 17 00:00:00 2001
From: Yatsishin Ilya <2159081+qoega@users.noreply.github.com>
Date: Tue, 19 Jan 2021 12:48:05 +0300
Subject: [PATCH 159/611] better

---
 docker/test/sqlancer/run.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker/test/sqlancer/run.sh b/docker/test/sqlancer/run.sh
index 147ed1c2a9d..000a8300050 100755
--- a/docker/test/sqlancer/run.sh
+++ b/docker/test/sqlancer/run.sh
@@ -21,6 +21,7 @@ export NUM_QUERIES=1000
 ( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPDistinct | tee /test_output/TLPDistinct.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPDistinct.err
 ( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPAggregate | tee /test_output/TLPAggregate.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPAggregate.err
 
-cp /var/log/clickhouse-server/clickhouse-server.log /test_output/
-cp /var/log/clickhouse-server/stderr.log /test_output/
-cp /var/log/clickhouse-server/stdout.log /test_output/
\ No newline at end of file
+tar czf /test_output/logs.tar.gz -C /var/log/clickhouse-server
+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

From b00f01d6b1812af5c21b205f6a02b27e25defd37 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 19 Jan 2021 13:03:25 +0300
Subject: [PATCH 160/611] Split filter optimization.

---
 src/Interpreters/ActionsDAG.cpp        | 42 +++++++++++++++++++++++++
 src/Interpreters/ActionsDAG.h          | 19 +++++++++---
 src/Processors/QueryPlan/QueryPlan.cpp | 43 ++++++++++++++++++++++----
 3 files changed, 94 insertions(+), 10 deletions(-)

diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index 993986309ea..bdc233912ba 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -454,6 +454,36 @@ bool ActionsDAG::tryRestoreColumn(const std::string & column_name)
     return false;
 }
 
+void ActionsDAG::removeUnusedInput(const std::string & column_name)
+{
+    auto it = inputs.begin();
+    for (; it != inputs.end(); ++it)
+        if ((*it)->result_name == column_name)
+            break;
+
+    if (it == inputs.end())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Not found input {} in ActionsDAG\n{}", column_name, dumpDAG());
+
+    auto * input = *it;
+    for (const auto & node : nodes)
+        for (const auto * child : node.children)
+            if (input == child)
+                throw Exception(ErrorCodes::LOGICAL_ERROR,
+                                "Cannot remove input {} because it has dependent nodes in ActionsDAG\n{}",
+                                column_name, dumpDAG());
+
+    for (auto jt = index.begin(); jt != index.end(); ++jt)
+    {
+        if (*jt == input)
+        {
+            index.remove(jt);
+            break;
+        }
+    }
+
+    inputs.erase(it);
+}
+
 ActionsDAGPtr ActionsDAG::clone() const
 {
     auto actions = cloneEmpty();
@@ -1067,4 +1097,16 @@ std::pair<ActionsDAGPtr, ActionsDAGPtr>  ActionsDAG::splitActionsBeforeArrayJoin
     return res;
 }
 
+std::pair<ActionsDAGPtr, ActionsDAGPtr> ActionsDAG::splitActionsForFilter(const std::string & column_name) const
+{
+    auto it = index.find(column_name);
+    if (it == index.end())
+        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};
+    return split(split_nodes);
+}
+
 }
diff --git a/src/Interpreters/ActionsDAG.h b/src/Interpreters/ActionsDAG.h
index 6b873eaaa26..c82496b2a8a 100644
--- a/src/Interpreters/ActionsDAG.h
+++ b/src/Interpreters/ActionsDAG.h
@@ -214,13 +214,13 @@ public:
 
     /// If column is not in index, try to find it in nodes and insert back into index.
     bool tryRestoreColumn(const std::string & column_name);
+    /// Find column in input. Remove it from input and index.
+    /// Checks that column in inputs and has not dependent nodes.
+    void removeUnusedInput(const std::string & column_name);
 
     void projectInput() { settings.project_input = true; }
     void removeUnusedActions(const Names & required_names);
 
-    /// Splits actions into two parts. Returned first half may be swapped with ARRAY JOIN.
-    std::pair<ActionsDAGPtr, ActionsDAGPtr> splitActionsBeforeArrayJoin(const NameSet & array_joined_columns) const;
-
     bool hasArrayJoin() const;
     bool hasStatefulFunctions() const;
     bool empty() const; /// If actions only contain inputs.
@@ -249,14 +249,25 @@ public:
         MatchColumnsMode mode,
         bool ignore_constant_values = false); /// Do not check that constants are same. Use value from result_header.
 
-    /// Create ActionsDAG which represents expression equivalent to applying lhs and rhs actions consequently.
+    /// Create ActionsDAG which represents expression equivalent to applying first and second actions consequently.
     /// Is used to replace `(first -> second)` expression chain to single `merge(first, second)` expression.
     /// If first.settings.project_input is set, then outputs of `first` must include inputs of `second`.
     /// Otherwise, any two actions may be combined.
     static ActionsDAGPtr merge(ActionsDAG && first, ActionsDAG && second);
 
+    /// Split ActionsDAG into two DAGs, where first part contains all nodes from split_nodes and their children.
+    /// Execution of first then second parts on block is equivalent to execution of initial DAG.
+    /// First DAG and initial DAG have equal inputs, second DAG and initial DAG has equal index (outputs).
+    /// Second DAG inputs may contain less inputs then first DAG (but also include other columns).
     std::pair<ActionsDAGPtr, ActionsDAGPtr> split(std::unordered_set<const Node *> split_nodes) const;
 
+    /// Splits actions into two parts. Returned first half may be swapped with ARRAY JOIN.
+    std::pair<ActionsDAGPtr, ActionsDAGPtr> splitActionsBeforeArrayJoin(const NameSet & array_joined_columns) const;
+
+    /// Splits actions into two parts. First part has minimal size sufficient for calculation of column_name.
+    /// Index of initial actions must contain column_name.
+    std::pair<ActionsDAGPtr, ActionsDAGPtr> splitActionsForFilter(const std::string & column_name) const;
+
 private:
     Node & addNode(Node node, bool can_replace = false);
     Node & getNode(const std::string & name);
diff --git a/src/Processors/QueryPlan/QueryPlan.cpp b/src/Processors/QueryPlan/QueryPlan.cpp
index 9be9f6d0c0b..db38c3916fc 100644
--- a/src/Processors/QueryPlan/QueryPlan.cpp
+++ b/src/Processors/QueryPlan/QueryPlan.cpp
@@ -497,12 +497,13 @@ static void tryLiftUpArrayJoin(QueryPlan::Node * parent_node, QueryPlan::Node *
                                               filter_step->getFilterColumnName(), filter_step->removesFilterColumn());
 }
 
+/// Replace chain `ExpressionStep -> ExpressionStep` to single ExpressionStep
+/// Replace chain `FilterStep -> ExpressionStep` to single FilterStep
 static bool tryMergeExpressions(QueryPlan::Node * parent_node, QueryPlan::Node * child_node)
 {
     auto & parent = parent_node->step;
     auto & child = child_node->step;
 
-    /// TODO: FilterStep
     auto * parent_expr = typeid_cast<ExpressionStep *>(parent.get());
     auto * parent_filter = typeid_cast<FilterStep *>(parent.get());
     auto * child_expr = typeid_cast<ExpressionStep *>(child.get());
@@ -549,6 +550,36 @@ static bool tryMergeExpressions(QueryPlan::Node * parent_node, QueryPlan::Node *
     return false;
 }
 
+/// Split FilterStep into chain `ExpressionStep -> FilterStep`, where FilterStep contains minimal number of nodes.
+static bool trySplitFilter(QueryPlan::Node * node, QueryPlan::Nodes & nodes)
+{
+    auto * filter_step = typeid_cast<FilterStep *>(node->step.get());
+    if (!filter_step)
+        return false;
+
+    const auto & expr = filter_step->getExpression();
+    auto split = expr->splitActionsForFilter(filter_step->getFilterColumnName());
+
+    if (split.second->empty())
+        return false;
+
+    if (filter_step->removesFilterColumn())
+        split.second->removeUnusedInput(filter_step->getFilterColumnName());
+
+    auto & filter_node = nodes.emplace_back();
+    node->children.swap(filter_node.children);
+    node->children.push_back(&filter_node);
+
+    filter_node.step = std::make_unique<FilterStep>(
+            filter_node.children.at(0)->step->getOutputStream(),
+            std::move(split.first),
+            filter_step->getFilterColumnName(),
+            filter_step->removesFilterColumn());
+
+    node->step = std::make_unique<ExpressionStep>(filter_node.step->getOutputStream(), std::move(split.second));
+    return true;
+}
+
 void QueryPlan::optimize()
 {
     struct Frame
@@ -566,12 +597,16 @@ void QueryPlan::optimize()
 
         if (frame.next_child == 0)
         {
-            /// First entrance, try push down.
             if (frame.node->children.size() == 1)
             {
                 tryPushDownLimit(frame.node->step, frame.node->children.front());
 
                 while (tryMergeExpressions(frame.node, frame.node->children.front()));
+
+                if (frame.node->children.size() == 1)
+                    tryLiftUpArrayJoin(frame.node, frame.node->children.front(), nodes);
+
+                trySplitFilter(frame.node, nodes);
             }
         }
 
@@ -582,10 +617,6 @@ void QueryPlan::optimize()
         }
         else
         {
-            /// Last entrance, try lift up.
-            if (frame.node->children.size() == 1)
-                tryLiftUpArrayJoin(frame.node, frame.node->children.front(), nodes);
-
             stack.pop();
         }
     }

From e313209a103f47f362b41653b252337e5c361774 Mon Sep 17 00:00:00 2001
From: Dmitriy <sevirov@yandex-team.ru>
Date: Tue, 19 Jan 2021 13:26:56 +0300
Subject: [PATCH 161/611] Support CHARACTER data type
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Добавил поддержку типа данных CHARACTER.
---
 docs/en/sql-reference/ansi.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/ansi.md b/docs/en/sql-reference/ansi.md
index 5ca216d11fa..84e47902f3b 100644
--- a/docs/en/sql-reference/ansi.md
+++ b/docs/en/sql-reference/ansi.md
@@ -31,7 +31,7 @@ The following table lists cases when query feature works in ClickHouse, but beha
 | E011-05    | Numeric comparison                                                                                                       | Yes {.text-success}         |                                                                                                                                                                                           |
 | E011-06    | Implicit casting among the numeric data types                                                                            | No {.text-danger}           | ANSI SQL allows arbitrary implicit cast between numeric types, while ClickHouse relies on functions having multiple overloads instead of implicit cast                                    |
 | **E021**   | **Character string types**                                                                                               | **Partial**{.text-warning} |                                                                                                                                                                                           |
-| E021-01    | CHARACTER data type                                                                                                      | No {.text-danger}           |                                                                                                                                                                                           |
+| E021-01    | CHARACTER data type                                                                                                      | Yes {.text-danger}          |                                                                                                                                                                                           |
 | E021-02    | CHARACTER VARYING data type                                                                                              | Yes {.text-danger}          |                                                                                                                                                                                           |
 | E021-03    | Character literals                                                                                                       | Partial {.text-warning}     | No automatic concatenation of consecutive literals and character set support                                                                                                              |
 | E021-04    | CHARACTER_LENGTH function                                                                                               | Partial {.text-warning}     | No `USING` clause                                                                                                                                                                         |

From 2a924c1186daa6658afeff235ce9f25adbea03fe Mon Sep 17 00:00:00 2001
From: Yatsishin Ilya <2159081+qoega@users.noreply.github.com>
Date: Tue, 19 Jan 2021 13:31:23 +0300
Subject: [PATCH 162/611] ls

---
 docker/test/sqlancer/run.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/test/sqlancer/run.sh b/docker/test/sqlancer/run.sh
index 000a8300050..7dd6a1fdcb8 100755
--- a/docker/test/sqlancer/run.sh
+++ b/docker/test/sqlancer/run.sh
@@ -21,7 +21,8 @@ export NUM_QUERIES=1000
 ( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPDistinct | tee /test_output/TLPDistinct.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPDistinct.err
 ( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPAggregate | tee /test_output/TLPAggregate.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPAggregate.err
 
-tar czf /test_output/logs.tar.gz -C /var/log/clickhouse-server
+ls /var/log/clickhouse-server/
+tar czf /test_output/logs.tar.gz -C /var/log/clickhouse-server/
 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

From bc796ec391695a471a6872af5c3c65272345ed65 Mon Sep 17 00:00:00 2001
From: Anton Popov <pad11rus@gmail.com>
Date: Tue, 19 Jan 2021 14:05:21 +0300
Subject: [PATCH 163/611] support 'keys' and 'values' subcolumns in type Map

---
 src/DataTypes/DataTypeMap.cpp                 | 10 ++++++++
 src/DataTypes/DataTypeMap.h                   |  4 +++-
 .../01475_read_subcolumns.reference           |  9 +++++++
 .../0_stateless/01475_read_subcolumns.sql     | 19 +++++++++++++++
 .../01475_read_subcolumns_storages.reference  | 24 +++++++++----------
 .../01475_read_subcolumns_storages.sh         |  8 +++----
 6 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/src/DataTypes/DataTypeMap.cpp b/src/DataTypes/DataTypeMap.cpp
index 3f59e1d3654..af2ed8805e8 100644
--- a/src/DataTypes/DataTypeMap.cpp
+++ b/src/DataTypes/DataTypeMap.cpp
@@ -65,6 +65,16 @@ static IColumn & extractNestedColumn(IColumn & column)
     return assert_cast<ColumnMap &>(column).getNestedColumn();
 }
 
+DataTypePtr DataTypeMap::tryGetSubcolumnType(const String & subcolumn_name) const
+{
+    return nested->tryGetSubcolumnType(subcolumn_name);
+}
+
+ColumnPtr DataTypeMap::getSubcolumn(const String & subcolumn_name, const IColumn & column) const
+{
+    return nested->getSubcolumn(subcolumn_name, extractNestedColumn(column));
+}
+
 void DataTypeMap::serializeBinary(const Field & field, WriteBuffer & ostr) const
 {
     const auto & map = get<const Map &>(field);
diff --git a/src/DataTypes/DataTypeMap.h b/src/DataTypes/DataTypeMap.h
index 7c51ac2f579..ea495f05548 100644
--- a/src/DataTypes/DataTypeMap.h
+++ b/src/DataTypes/DataTypeMap.h
@@ -32,6 +32,9 @@ public:
 
     bool canBeInsideNullable() const override { return false; }
 
+    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;
@@ -45,7 +48,6 @@ public:
     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(
diff --git a/tests/queries/0_stateless/01475_read_subcolumns.reference b/tests/queries/0_stateless/01475_read_subcolumns.reference
index 336c11fe775..84b8ecc901d 100644
--- a/tests/queries/0_stateless/01475_read_subcolumns.reference
+++ b/tests/queries/0_stateless/01475_read_subcolumns.reference
@@ -19,3 +19,12 @@ baz
 0
 1
 2
+====map====
+['a','b']
+['a','c']
+['b','c']
+[1,2]
+[3,4]
+[5,6]
+4
+4
diff --git a/tests/queries/0_stateless/01475_read_subcolumns.sql b/tests/queries/0_stateless/01475_read_subcolumns.sql
index 06b2d3795de..ce85dd72abf 100644
--- a/tests/queries/0_stateless/01475_read_subcolumns.sql
+++ b/tests/queries/0_stateless/01475_read_subcolumns.sql
@@ -42,3 +42,22 @@ 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();
+
+SELECT '====map====';
+SET allow_experimental_map_type = 1;
+DROP TABLE IF EXISTS t_map;
+CREATE TABLE t_map (m Map(String, UInt32)) ENGINE = MergeTree ORDER BY tuple() SETTINGS min_bytes_for_wide_part = 0;
+INSERT INTO t_map VALUES (map('a', 1, 'b', 2)) (map('a', 3, 'c', 4)), (map('b', 5, 'c', 6));
+
+--- will read 4 files: keys.bin, keys.mrk2, size0.bin, size0.mrk2
+SYSTEM DROP MARK CACHE;
+SELECT m.keys FROM t_map;
+
+SYSTEM DROP MARK CACHE;
+SELECT m.values FROM t_map;
+
+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();
diff --git a/tests/queries/0_stateless/01475_read_subcolumns_storages.reference b/tests/queries/0_stateless/01475_read_subcolumns_storages.reference
index f848977a55d..4e37b751d5a 100644
--- a/tests/queries/0_stateless/01475_read_subcolumns_storages.reference
+++ b/tests/queries/0_stateless/01475_read_subcolumns_storages.reference
@@ -1,18 +1,18 @@
 Log
-100	[1,2,3]	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	[1,NULL,2]	('foo',200)
-100	0	[1,2,3]	3	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	3	[3,2,1]	[[2,0,1],[2,2],[0]]	[1,NULL,2]	3	[0,1,0]	('foo',200)	foo	200
+100	[1,2,3]	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	[1,NULL,2]	('foo',200)	{'foo':1,'bar':42}
+100	0	[1,2,3]	3	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	3	[3,2,1]	[[2,0,1],[2,2],[0]]	[1,NULL,2]	3	[0,1,0]	('foo',200)	foo	200	{'foo':1,'bar':42}	['foo','bar']	[1,42]
 TinyLog
-100	[1,2,3]	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	[1,NULL,2]	('foo',200)
-100	0	[1,2,3]	3	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	3	[3,2,1]	[[2,0,1],[2,2],[0]]	[1,NULL,2]	3	[0,1,0]	('foo',200)	foo	200
+100	[1,2,3]	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	[1,NULL,2]	('foo',200)	{'foo':1,'bar':42}
+100	0	[1,2,3]	3	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	3	[3,2,1]	[[2,0,1],[2,2],[0]]	[1,NULL,2]	3	[0,1,0]	('foo',200)	foo	200	{'foo':1,'bar':42}	['foo','bar']	[1,42]
 Memory
-100	[1,2,3]	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	[1,NULL,2]	('foo',200)
-100	0	[1,2,3]	3	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	3	[3,2,1]	[[2,0,1],[2,2],[0]]	[1,NULL,2]	3	[0,1,0]	('foo',200)	foo	200
+100	[1,2,3]	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	[1,NULL,2]	('foo',200)	{'foo':1,'bar':42}
+100	0	[1,2,3]	3	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	3	[3,2,1]	[[2,0,1],[2,2],[0]]	[1,NULL,2]	3	[0,1,0]	('foo',200)	foo	200	{'foo':1,'bar':42}	['foo','bar']	[1,42]
 MergeTree ORDER BY tuple() SETTINGS min_bytes_for_compact_part='10M'
-100	[1,2,3]	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	[1,NULL,2]	('foo',200)
-100	0	[1,2,3]	3	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	3	[3,2,1]	[[2,0,1],[2,2],[0]]	[1,NULL,2]	3	[0,1,0]	('foo',200)	foo	200
+100	[1,2,3]	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	[1,NULL,2]	('foo',200)	{'foo':1,'bar':42}
+100	0	[1,2,3]	3	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	3	[3,2,1]	[[2,0,1],[2,2],[0]]	[1,NULL,2]	3	[0,1,0]	('foo',200)	foo	200	{'foo':1,'bar':42}	['foo','bar']	[1,42]
 MergeTree ORDER BY tuple() SETTINGS min_bytes_for_wide_part='10M'
-100	[1,2,3]	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	[1,NULL,2]	('foo',200)
-100	0	[1,2,3]	3	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	3	[3,2,1]	[[2,0,1],[2,2],[0]]	[1,NULL,2]	3	[0,1,0]	('foo',200)	foo	200
+100	[1,2,3]	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	[1,NULL,2]	('foo',200)	{'foo':1,'bar':42}
+100	0	[1,2,3]	3	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	3	[3,2,1]	[[2,0,1],[2,2],[0]]	[1,NULL,2]	3	[0,1,0]	('foo',200)	foo	200	{'foo':1,'bar':42}	['foo','bar']	[1,42]
 MergeTree ORDER BY tuple() SETTINGS min_bytes_for_wide_part=0
-100	[1,2,3]	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	[1,NULL,2]	('foo',200)
-100	0	[1,2,3]	3	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	3	[3,2,1]	[[2,0,1],[2,2],[0]]	[1,NULL,2]	3	[0,1,0]	('foo',200)	foo	200
+100	[1,2,3]	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	[1,NULL,2]	('foo',200)	{'foo':1,'bar':42}
+100	0	[1,2,3]	3	[[[1,2],[],[4]],[[5,6],[7,8]],[[]]]	3	[3,2,1]	[[2,0,1],[2,2],[0]]	[1,NULL,2]	3	[0,1,0]	('foo',200)	foo	200	{'foo':1,'bar':42}	['foo','bar']	[1,42]
diff --git a/tests/queries/0_stateless/01475_read_subcolumns_storages.sh b/tests/queries/0_stateless/01475_read_subcolumns_storages.sh
index 54cd0c073b2..684d65ceb25 100755
--- a/tests/queries/0_stateless/01475_read_subcolumns_storages.sh
+++ b/tests/queries/0_stateless/01475_read_subcolumns_storages.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 set -e
 
 create_query="CREATE TABLE subcolumns(n Nullable(UInt32), a1 Array(UInt32),\
-    a2 Array(Array(Array(UInt32))), a3 Array(Nullable(UInt32)), t Tuple(s String, v UInt32))"
+    a2 Array(Array(Array(UInt32))), a3 Array(Nullable(UInt32)), t Tuple(s String, v UInt32), m Map(String, UInt32))"
 
 # "StripeLog"
 declare -a ENGINES=("Log" "TinyLog" "Memory" \
@@ -18,8 +18,8 @@ declare -a ENGINES=("Log" "TinyLog" "Memory" \
 for engine in "${ENGINES[@]}"; do
     echo $engine
     $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS subcolumns"
-    $CLICKHOUSE_CLIENT --query "$create_query ENGINE = $engine"
-    $CLICKHOUSE_CLIENT --query "INSERT INTO subcolumns VALUES (100, [1, 2, 3], [[[1, 2], [], [4]], [[5, 6], [7, 8]], [[]]], [1, NULL, 2], ('foo', 200))"
+    $CLICKHOUSE_CLIENT --query "$create_query ENGINE = $engine" --allow_experimental_map_type 1
+    $CLICKHOUSE_CLIENT --query "INSERT INTO subcolumns VALUES (100, [1, 2, 3], [[[1, 2], [], [4]], [[5, 6], [7, 8]], [[]]], [1, NULL, 2], ('foo', 200), map('foo', 1, 'bar', 42))"
     $CLICKHOUSE_CLIENT --query "SELECT * FROM subcolumns"
-    $CLICKHOUSE_CLIENT --query "SELECT n, n.null, a1, a1.size0, a2, a2.size0, a2.size1, a2.size2, a3, a3.size0, a3.null, t, t.s, t.v FROM subcolumns"
+    $CLICKHOUSE_CLIENT --query "SELECT n, n.null, a1, a1.size0, a2, a2.size0, a2.size1, a2.size2, a3, a3.size0, a3.null, t, t.s, t.v, m, m.keys, m.values FROM subcolumns"
 done

From 2e9c27eaf6f829c87081e9dbc1a8dddf2d0fabc7 Mon Sep 17 00:00:00 2001
From: Yatsishin Ilya <2159081+qoega@users.noreply.github.com>
Date: Tue, 19 Jan 2021 14:42:56 +0300
Subject: [PATCH 164/611] fix tar

---
 docker/test/sqlancer/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/test/sqlancer/run.sh b/docker/test/sqlancer/run.sh
index 7dd6a1fdcb8..4ff99cfdbd2 100755
--- a/docker/test/sqlancer/run.sh
+++ b/docker/test/sqlancer/run.sh
@@ -22,7 +22,7 @@ export NUM_QUERIES=1000
 ( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPAggregate | tee /test_output/TLPAggregate.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPAggregate.err
 
 ls /var/log/clickhouse-server/
-tar czf /test_output/logs.tar.gz -C /var/log/clickhouse-server/
+tar czf /test_output/logs.tar.gz -C /var/log/clickhouse-server/ .
 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

From b0b3cfbd028b9beb3e6e2c3855702c4dba7b2e93 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 19 Jan 2021 14:48:09 +0300
Subject: [PATCH 165/611] Split filter optimization.

---
 src/Interpreters/ActionsDAG.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index bdc233912ba..60443e7656b 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -481,6 +481,15 @@ void ActionsDAG::removeUnusedInput(const std::string & column_name)
         }
     }
 
+    for (auto jt = nodes.begin(); jt != nodes.end(); ++jt)
+    {
+        if (&(*jt) == input)
+        {
+            nodes.erase(jt);
+            break;
+        }
+    }
+
     inputs.erase(it);
 }
 

From 91403b2f75fa0b589d82c4ad29523f37efa4025c Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 19 Jan 2021 15:04:45 +0300
Subject: [PATCH 166/611] Split filter optimization.

---
 src/Processors/QueryPlan/QueryPlan.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Processors/QueryPlan/QueryPlan.cpp b/src/Processors/QueryPlan/QueryPlan.cpp
index db38c3916fc..dc33c96700e 100644
--- a/src/Processors/QueryPlan/QueryPlan.cpp
+++ b/src/Processors/QueryPlan/QueryPlan.cpp
@@ -617,6 +617,10 @@ void QueryPlan::optimize()
         }
         else
         {
+            trySplitFilter(frame.node, nodes);
+
+            while (tryMergeExpressions(frame.node, frame.node->children.front()));
+
             stack.pop();
         }
     }

From 0711957fbb96dedf1b8da968cad0903dff7215a4 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 19 Jan 2021 15:08:21 +0300
Subject: [PATCH 167/611] Split filter optimization.

---
 src/Processors/QueryPlan/QueryPlan.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Processors/QueryPlan/QueryPlan.cpp b/src/Processors/QueryPlan/QueryPlan.cpp
index dc33c96700e..97934c8f500 100644
--- a/src/Processors/QueryPlan/QueryPlan.cpp
+++ b/src/Processors/QueryPlan/QueryPlan.cpp
@@ -617,9 +617,12 @@ void QueryPlan::optimize()
         }
         else
         {
-            trySplitFilter(frame.node, nodes);
+            if (frame.node->children.size() == 1)
+            {
+                while (tryMergeExpressions(frame.node, frame.node->children.front()));
 
-            while (tryMergeExpressions(frame.node, frame.node->children.front()));
+                trySplitFilter(frame.node, nodes);
+            }
 
             stack.pop();
         }

From 0246e3eacef7bfb9a6b25adb774a4f2d7dd22b99 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 19 Jan 2021 15:51:53 +0300
Subject: [PATCH 168/611] Added perftest.

---
 tests/performance/split_filter.xml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 tests/performance/split_filter.xml

diff --git a/tests/performance/split_filter.xml b/tests/performance/split_filter.xml
new file mode 100644
index 00000000000..7bd4af51abd
--- /dev/null
+++ b/tests/performance/split_filter.xml
@@ -0,0 +1,4 @@
+<test>
+    <query>select sum(x), sum(y) from (select sipHash64(number) as x, bitAnd(number, 1024) as y from numbers_mt(1000000000)) where y = 0 settings enable_optimize_predicate_expression=0</query>
+    <query>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</query>
+</test>

From 9db2974aaae5b3cca4129f6ed4b8cfeacf846c34 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 19 Jan 2021 15:54:55 +0300
Subject: [PATCH 169/611] Update explain for filter

---
 src/Processors/QueryPlan/FilterStep.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Processors/QueryPlan/FilterStep.cpp b/src/Processors/QueryPlan/FilterStep.cpp
index 8fb405e685b..921c1351511 100644
--- a/src/Processors/QueryPlan/FilterStep.cpp
+++ b/src/Processors/QueryPlan/FilterStep.cpp
@@ -83,7 +83,11 @@ void FilterStep::transformPipeline(QueryPipeline & pipeline)
 void FilterStep::describeActions(FormatSettings & settings) const
 {
     String prefix(settings.offset, ' ');
-    settings.out << prefix << "Filter column: " << filter_column_name << '\n';
+    settings.out << prefix << "Filter column: " << filter_column_name;
+
+    if (remove_filter_column)
+        settings.out << " (removed)";
+    settings.out << '\n';
 
     bool first = true;
     auto expression = std::make_shared<ExpressionActions>(actions_dag);
@@ -94,6 +98,11 @@ void FilterStep::describeActions(FormatSettings & settings) const
         first = false;
         settings.out << action.toString() << '\n';
     }
+
+    settings.out << prefix << "Positions:";
+    for (const auto & pos : expression->getResultPositions())
+        settings.out << ' ' << pos;
+    settings.out << '\n';
 }
 
 }

From b1c7944f843626543a37d39ad4772a31c4020959 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 19 Jan 2021 16:08:14 +0300
Subject: [PATCH 170/611] Fix description after step optimizations

---
 src/Processors/QueryPlan/QueryPlan.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/Processors/QueryPlan/QueryPlan.cpp b/src/Processors/QueryPlan/QueryPlan.cpp
index 97934c8f500..da659b78ce1 100644
--- a/src/Processors/QueryPlan/QueryPlan.cpp
+++ b/src/Processors/QueryPlan/QueryPlan.cpp
@@ -457,6 +457,8 @@ static void tryLiftUpArrayJoin(QueryPlan::Node * parent_node, QueryPlan::Node *
     if (split_actions.first->empty())
         return;
 
+    auto description = parent->getStepDescription();
+
     /// All actions was moved before ARRAY JOIN. Swap Expression and ArrayJoin.
     if (split_actions.second->empty())
     {
@@ -475,6 +477,8 @@ static void tryLiftUpArrayJoin(QueryPlan::Node * parent_node, QueryPlan::Node *
                                                  filter_step->getFilterColumnName(),
                                                  filter_step->removesFilterColumn());
 
+        child->setStepDescription(std::move(description));
+
         array_join_step->updateInputStream(child->getOutputStream(), expected_header);
         return;
     }
@@ -488,6 +492,7 @@ static void tryLiftUpArrayJoin(QueryPlan::Node * parent_node, QueryPlan::Node *
 
     node.step = std::make_unique<ExpressionStep>(node.children.at(0)->step->getOutputStream(),
                                                  std::move(split_actions.first));
+    node.step->setStepDescription(description);
     array_join_step->updateInputStream(node.step->getOutputStream(), {});
 
     if (expression_step)
@@ -495,6 +500,8 @@ static void tryLiftUpArrayJoin(QueryPlan::Node * parent_node, QueryPlan::Node *
     else
         parent = std::make_unique<FilterStep>(array_join_step->getOutputStream(), split_actions.second,
                                               filter_step->getFilterColumnName(), filter_step->removesFilterColumn());
+
+    parent->setStepDescription(description + " [split]");
 }
 
 /// Replace chain `ExpressionStep -> ExpressionStep` to single ExpressionStep
@@ -577,6 +584,10 @@ static bool trySplitFilter(QueryPlan::Node * node, QueryPlan::Nodes & nodes)
             filter_step->removesFilterColumn());
 
     node->step = std::make_unique<ExpressionStep>(filter_node.step->getOutputStream(), std::move(split.second));
+
+    filter_node.step->setStepDescription(filter_step->getStepDescription() + " [split]");
+    node->step->setStepDescription(filter_step->getStepDescription() + " [split]");
+
     return true;
 }
 

From 72d2511e8ea9aab0a59fd3731030e498ca446cad Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Tue, 19 Jan 2021 16:15:06 +0300
Subject: [PATCH 171/611] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8da4919c975..5f57e99a04b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@
 * Removed aggregate functions `timeSeriesGroupSum`, `timeSeriesGroupRateSum` because a friend of mine said they never worked. This fixes [#16869](https://github.com/ClickHouse/ClickHouse/issues/16869). If you have luck using these functions, write a email to clickhouse-feedback@yandex-team.com. [#17423](https://github.com/ClickHouse/ClickHouse/pull/17423) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Prohibit toUnixTimestamp(Date()) (before it just returns UInt16 representation of Date). [#17376](https://github.com/ClickHouse/ClickHouse/pull/17376) ([Azat Khuzhin](https://github.com/azat)).
 * Allow using extended integer types (`Int128`, `Int256`, `UInt256`) in `avg` and `avgWeighted` functions. Also allow using different types (integer, decimal, floating point) for value and for weight in `avgWeighted` function. This is a backward-incompatible change: now the `avg` and `avgWeighted` functions always return `Float64` (as documented). Before this change the return type for `Decimal` arguments was also `Decimal`. [#15419](https://github.com/ClickHouse/ClickHouse/pull/15419) ([Mike](https://github.com/myrrc)).
+* Expression `toUUID(N)` no longer works. Replace with `toUUID('00000000-0000-0000-0000-000000000000')`. This change is motivated by non-obvious results of `toUUID(N)` where N is non zero.
+* SSL Certificated with incorrect "key usage" are rejected. In previous versions they are used to work.
 
 #### New Feature
 

From c0ce2d9b167dbaec58e2419bf2a4b2330b23fe58 Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Tue, 19 Jan 2021 16:15:13 +0300
Subject: [PATCH 172/611] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f57e99a04b..11484b556a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@
 * Prohibit toUnixTimestamp(Date()) (before it just returns UInt16 representation of Date). [#17376](https://github.com/ClickHouse/ClickHouse/pull/17376) ([Azat Khuzhin](https://github.com/azat)).
 * Allow using extended integer types (`Int128`, `Int256`, `UInt256`) in `avg` and `avgWeighted` functions. Also allow using different types (integer, decimal, floating point) for value and for weight in `avgWeighted` function. This is a backward-incompatible change: now the `avg` and `avgWeighted` functions always return `Float64` (as documented). Before this change the return type for `Decimal` arguments was also `Decimal`. [#15419](https://github.com/ClickHouse/ClickHouse/pull/15419) ([Mike](https://github.com/myrrc)).
 * Expression `toUUID(N)` no longer works. Replace with `toUUID('00000000-0000-0000-0000-000000000000')`. This change is motivated by non-obvious results of `toUUID(N)` where N is non zero.
-* SSL Certificated with incorrect "key usage" are rejected. In previous versions they are used to work.
+* SSL Certificates with incorrect "key usage" are rejected. In previous versions they are used to work.
 
 #### New Feature
 

From 964af8e02c88f4adcffc224fe4fdca0d0f2ca1b3 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 19 Jan 2021 16:17:52 +0300
Subject: [PATCH 173/611] Fix description after step optimizations

---
 src/Processors/QueryPlan/QueryPlan.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Processors/QueryPlan/QueryPlan.cpp b/src/Processors/QueryPlan/QueryPlan.cpp
index da659b78ce1..ba64e644c5f 100644
--- a/src/Processors/QueryPlan/QueryPlan.cpp
+++ b/src/Processors/QueryPlan/QueryPlan.cpp
@@ -529,7 +529,7 @@ static bool tryMergeExpressions(QueryPlan::Node * parent_node, QueryPlan::Node *
         auto merged = ActionsDAG::merge(std::move(*child_actions), std::move(*parent_actions));
 
         auto expr = std::make_unique<ExpressionStep>(child_expr->getInputStreams().front(), merged);
-        expr->setStepDescription(parent_expr->getStepDescription() + " + " + child_expr->getStepDescription());
+        expr->setStepDescription("(" + parent_expr->getStepDescription() + " + " + child_expr->getStepDescription() + ")");
 
         parent_node->step = std::move(expr);
         parent_node->children.swap(child_node->children);
@@ -547,7 +547,7 @@ static bool tryMergeExpressions(QueryPlan::Node * parent_node, QueryPlan::Node *
 
         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());
+        filter->setStepDescription("(" + parent_filter->getStepDescription() + " + " + child_expr->getStepDescription() + ")");
 
         parent_node->step = std::move(filter);
         parent_node->children.swap(child_node->children);
@@ -585,8 +585,8 @@ static bool trySplitFilter(QueryPlan::Node * node, QueryPlan::Nodes & nodes)
 
     node->step = std::make_unique<ExpressionStep>(filter_node.step->getOutputStream(), std::move(split.second));
 
-    filter_node.step->setStepDescription(filter_step->getStepDescription() + " [split]");
-    node->step->setStepDescription(filter_step->getStepDescription() + " [split]");
+    filter_node.step->setStepDescription("(" + filter_step->getStepDescription() + ")[split]");
+    node->step->setStepDescription(filter_step->getStepDescription());
 
     return true;
 }

From 35f48e60ad2f79045586b3caa70d36ab07bf49de Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 19 Jan 2021 16:21:28 +0300
Subject: [PATCH 174/611] Fix description after step optimizations

---
 src/Processors/QueryPlan/QueryPlan.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Processors/QueryPlan/QueryPlan.cpp b/src/Processors/QueryPlan/QueryPlan.cpp
index ba64e644c5f..d393dbb604f 100644
--- a/src/Processors/QueryPlan/QueryPlan.cpp
+++ b/src/Processors/QueryPlan/QueryPlan.cpp
@@ -573,6 +573,8 @@ static bool trySplitFilter(QueryPlan::Node * node, QueryPlan::Nodes & nodes)
     if (filter_step->removesFilterColumn())
         split.second->removeUnusedInput(filter_step->getFilterColumnName());
 
+    auto description = filter_step->getStepDescription();
+
     auto & filter_node = nodes.emplace_back();
     node->children.swap(filter_node.children);
     node->children.push_back(&filter_node);
@@ -585,7 +587,7 @@ static bool trySplitFilter(QueryPlan::Node * node, QueryPlan::Nodes & nodes)
 
     node->step = std::make_unique<ExpressionStep>(filter_node.step->getOutputStream(), std::move(split.second));
 
-    filter_node.step->setStepDescription("(" + filter_step->getStepDescription() + ")[split]");
+    filter_node.step->setStepDescription("(" + description + ")[split]");
     node->step->setStepDescription(filter_step->getStepDescription());
 
     return true;

From 17edf238e3ff3eea2eb03f5b4016c287a5ec093a Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 19 Jan 2021 16:35:26 +0300
Subject: [PATCH 175/611] Added test.

---
 .../0_stateless/01655_plan_optimizations.reference    | 11 +++++++++++
 tests/queries/0_stateless/01655_plan_optimizations.sh | 10 ++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 tests/queries/0_stateless/01655_plan_optimizations.reference
 create mode 100755 tests/queries/0_stateless/01655_plan_optimizations.sh

diff --git a/tests/queries/0_stateless/01655_plan_optimizations.reference b/tests/queries/0_stateless/01655_plan_optimizations.reference
new file mode 100644
index 00000000000..fda40305f9d
--- /dev/null
+++ b/tests/queries/0_stateless/01655_plan_optimizations.reference
@@ -0,0 +1,11 @@
+sipHash should be calculated after filtration
+FUNCTION sipHash64
+Filter column: equals
+sorting steps should know about limit
+Limit 10
+MergingSorted
+Limit 10
+MergeSorting
+Limit 10
+PartialSorting
+Limit 10
diff --git a/tests/queries/0_stateless/01655_plan_optimizations.sh b/tests/queries/0_stateless/01655_plan_optimizations.sh
new file mode 100755
index 00000000000..4f3541f9dde
--- /dev/null
+++ b/tests/queries/0_stateless/01655_plan_optimizations.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+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 "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"
+$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"

From ac64a1339290be826e10bfa454897f825c87457c Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Tue, 19 Jan 2021 17:22:28 +0300
Subject: [PATCH 176/611] Split storage and requests processing

---
 src/Common/ZooKeeper/TestKeeperStorage.cpp    | 325 +++++++-----------
 src/Common/ZooKeeper/TestKeeperStorage.h      |  70 ++--
 .../ZooKeeper/TestKeeperStorageDispatcher.cpp | 131 +++++++
 .../ZooKeeper/TestKeeperStorageDispatcher.h   |  58 ++++
 src/Interpreters/Context.cpp                  |   8 +-
 src/Interpreters/Context.h                    |   4 +-
 src/Server/TestKeeperTCPHandler.cpp           | 166 ++++-----
 src/Server/TestKeeperTCPHandler.h             |  14 +-
 8 files changed, 410 insertions(+), 366 deletions(-)
 create mode 100644 src/Common/ZooKeeper/TestKeeperStorageDispatcher.cpp
 create mode 100644 src/Common/ZooKeeper/TestKeeperStorageDispatcher.h

diff --git a/src/Common/ZooKeeper/TestKeeperStorage.cpp b/src/Common/ZooKeeper/TestKeeperStorage.cpp
index daadba6519e..4f1300cde8c 100644
--- a/src/Common/ZooKeeper/TestKeeperStorage.cpp
+++ b/src/Common/ZooKeeper/TestKeeperStorage.cpp
@@ -39,8 +39,9 @@ static String baseName(const String & path)
     return path.substr(rslash_pos + 1);
 }
 
-static void processWatchesImpl(const String & path, TestKeeperStorage::Watches & watches, TestKeeperStorage::Watches & list_watches, Coordination::Event event_type)
+static TestKeeperStorage::ResponsesForSessions processWatchesImpl(const String & path, TestKeeperStorage::Watches & watches, TestKeeperStorage::Watches & list_watches, Coordination::Event event_type)
 {
+    TestKeeperStorage::ResponsesForSessions result;
     auto it = watches.find(path);
     if (it != watches.end())
     {
@@ -50,9 +51,8 @@ static void processWatchesImpl(const String & path, TestKeeperStorage::Watches &
         watch_response->zxid = -1;
         watch_response->type = event_type;
         watch_response->state = Coordination::State::CONNECTED;
-        for (auto & watcher : it->second)
-            if (watcher.watch_callback)
-                watcher.watch_callback(watch_response);
+        for (auto watcher_session : it->second)
+            result.push_back(TestKeeperStorage::ResponseForSession{watcher_session, watch_response});
 
         watches.erase(it);
     }
@@ -67,19 +67,17 @@ static void processWatchesImpl(const String & path, TestKeeperStorage::Watches &
         watch_list_response->zxid = -1;
         watch_list_response->type = Coordination::Event::CHILD;
         watch_list_response->state = Coordination::State::CONNECTED;
-        for (auto & watcher : it->second)
-            if (watcher.watch_callback)
-                watcher.watch_callback(watch_list_response);
+        for (auto watcher_session : it->second)
+            result.push_back(TestKeeperStorage::ResponseForSession{watcher_session, watch_list_response});
 
         list_watches.erase(it);
     }
+    return result;
 }
 
 TestKeeperStorage::TestKeeperStorage()
 {
     container.emplace("/", Node());
-
-    processing_thread = ThreadFromGlobalPool([this] { processingThread(); });
 }
 
 using Undo = std::function<void()>;
@@ -92,7 +90,7 @@ struct TestKeeperStorageRequest
         : zk_request(zk_request_)
     {}
     virtual std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(TestKeeperStorage::Container & container, TestKeeperStorage::Ephemerals & ephemerals, int64_t zxid, int64_t session_id) const = 0;
-    virtual void processWatches(TestKeeperStorage::Watches & /*watches*/, TestKeeperStorage::Watches & /*list_watches*/) const {}
+    virtual TestKeeperStorage::ResponsesForSessions processWatches(TestKeeperStorage::Watches & /*watches*/, TestKeeperStorage::Watches & /*list_watches*/) const { return {}; }
 
     virtual ~TestKeeperStorageRequest() = default;
 };
@@ -111,9 +109,9 @@ struct TestKeeperStorageCreateRequest final : public TestKeeperStorageRequest
 {
     using TestKeeperStorageRequest::TestKeeperStorageRequest;
 
-    void processWatches(TestKeeperStorage::Watches & watches, TestKeeperStorage::Watches & list_watches) const override
+    TestKeeperStorage::ResponsesForSessions processWatches(TestKeeperStorage::Watches & watches, TestKeeperStorage::Watches & list_watches) const override
     {
-        processWatchesImpl(zk_request->getPath(), watches, list_watches, Coordination::Event::CREATED);
+        return processWatchesImpl(zk_request->getPath(), watches, list_watches, Coordination::Event::CREATED);
     }
 
     std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(TestKeeperStorage::Container & container, TestKeeperStorage::Ephemerals & ephemerals, int64_t zxid, int64_t session_id) const override
@@ -271,9 +269,9 @@ struct TestKeeperStorageRemoveRequest final : public TestKeeperStorageRequest
         return { response_ptr, undo };
     }
 
-    void processWatches(TestKeeperStorage::Watches & watches, TestKeeperStorage::Watches & list_watches) const override
+    TestKeeperStorage::ResponsesForSessions processWatches(TestKeeperStorage::Watches & watches, TestKeeperStorage::Watches & list_watches) const override
     {
-        processWatchesImpl(zk_request->getPath(), watches, list_watches, Coordination::Event::DELETED);
+        return processWatchesImpl(zk_request->getPath(), watches, list_watches, Coordination::Event::DELETED);
     }
 };
 
@@ -344,9 +342,9 @@ struct TestKeeperStorageSetRequest final : public TestKeeperStorageRequest
         return { response_ptr, undo };
     }
 
-    void processWatches(TestKeeperStorage::Watches & watches, TestKeeperStorage::Watches & list_watches) const override
+    TestKeeperStorage::ResponsesForSessions processWatches(TestKeeperStorage::Watches & watches, TestKeeperStorage::Watches & list_watches) const override
     {
-        processWatchesImpl(zk_request->getPath(), watches, list_watches, Coordination::Event::CHANGED);
+        return processWatchesImpl(zk_request->getPath(), watches, list_watches, Coordination::Event::CHANGED);
     }
 
 };
@@ -502,10 +500,15 @@ struct TestKeeperStorageMultiRequest final : public TestKeeperStorageRequest
         }
     }
 
-    void processWatches(TestKeeperStorage::Watches & watches, TestKeeperStorage::Watches & list_watches) const override
+    TestKeeperStorage::ResponsesForSessions processWatches(TestKeeperStorage::Watches & watches, TestKeeperStorage::Watches & list_watches) const override
     {
+        TestKeeperStorage::ResponsesForSessions result;
         for (const auto & generic_request : concrete_requests)
-            generic_request->processWatches(watches, list_watches);
+        {
+            auto responses = generic_request->processWatches(watches, list_watches);
+            result.insert(result.end(), responses.begin(), responses.end());
+        }
+        return result;
     }
 };
 
@@ -518,160 +521,49 @@ struct TestKeeperStorageCloseRequest final : public TestKeeperStorageRequest
     }
 };
 
-void TestKeeperStorage::processingThread()
+TestKeeperStorage::ResponsesForSessions TestKeeperStorage::finalize(const RequestsForSessions & expired_requests)
 {
-    setThreadName("TestKeeperSProc");
+    if (finalized)
+        throw DB::Exception("Testkeeper storage already finalized", ErrorCodes::LOGICAL_ERROR);
 
-    try
+    finalized = true;
+
+    ResponsesForSessions finalize_results;
+    auto finish_watch = [] (const auto & watch_pair) -> ResponsesForSessions
     {
-        while (!shutdown)
-        {
-            RequestInfo info;
+        ResponsesForSessions results;
+        std::shared_ptr<Coordination::ZooKeeperWatchResponse> response = std::make_shared<Coordination::ZooKeeperWatchResponse>();
+        response->type = Coordination::SESSION;
+        response->state = Coordination::EXPIRED_SESSION;
+        response->error = Coordination::Error::ZSESSIONEXPIRED;
 
-            UInt64 max_wait = UInt64(operation_timeout.totalMilliseconds());
+        for (auto & watcher_session : watch_pair.second)
+            results.push_back(ResponseForSession{watcher_session, response});
+        return results;
+    };
 
-            if (requests_queue.tryPop(info, max_wait))
-            {
-                if (shutdown)
-                    break;
-
-                auto zk_request = info.request->zk_request;
-                if (zk_request->getOpNum() == Coordination::OpNum::Close)
-                {
-                    auto it = ephemerals.find(info.session_id);
-                    if (it != ephemerals.end())
-                    {
-                        for (const auto & ephemeral_path : it->second)
-                        {
-                            container.erase(ephemeral_path);
-                            processWatchesImpl(ephemeral_path, watches, list_watches, Coordination::Event::DELETED);
-                        }
-                        ephemerals.erase(it);
-                    }
-                    clearDeadWatches(info.session_id);
-
-                    /// Finish connection
-                    auto response = std::make_shared<Coordination::ZooKeeperCloseResponse>();
-                    response->xid = zk_request->xid;
-                    response->zxid = getZXID();
-                    info.response_callback(response);
-                }
-                else
-                {
-                    auto [response, _] = info.request->process(container, ephemerals, zxid, info.session_id);
-
-                    if (info.watch_callback)
-                    {
-                        if (response->error == Coordination::Error::ZOK)
-                        {
-                            auto & watches_type = zk_request->getOpNum() == Coordination::OpNum::List || zk_request->getOpNum() == Coordination::OpNum::SimpleList
-                                ? list_watches
-                                : watches;
-
-                            watches_type[zk_request->getPath()].emplace_back(Watcher{info.session_id, info.watch_callback});
-                            sessions_and_watchers[info.session_id].emplace(zk_request->getPath());
-                        }
-                        else if (response->error == Coordination::Error::ZNONODE && zk_request->getOpNum() == Coordination::OpNum::Exists)
-                        {
-                            watches[zk_request->getPath()].emplace_back(Watcher{info.session_id, info.watch_callback});
-                            sessions_and_watchers[info.session_id].emplace(zk_request->getPath());
-                        }
-                        else
-                        {
-                            std::shared_ptr<Coordination::ZooKeeperWatchResponse> watch_response = std::make_shared<Coordination::ZooKeeperWatchResponse>();
-                            watch_response->path = zk_request->getPath();
-                            watch_response->xid = -1;
-                            watch_response->error = response->error;
-                            watch_response->type = Coordination::Event::NOTWATCHING;
-                            info.watch_callback(watch_response);
-                        }
-                    }
-
-                    if (response->error == Coordination::Error::ZOK)
-                        info.request->processWatches(watches, list_watches);
-
-                    response->xid = zk_request->xid;
-                    response->zxid = getZXID();
-
-                    info.response_callback(response);
-                }
-            }
-        }
-    }
-    catch (...)
+    for (auto & path_watch : watches)
     {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
-        finalize();
-    }
-}
-
-
-void TestKeeperStorage::finalize()
-{
-    {
-        std::lock_guard lock(push_request_mutex);
-
-        if (shutdown)
-            return;
-
-        shutdown = true;
-
-        if (processing_thread.joinable())
-            processing_thread.join();
+        auto watch_responses = finish_watch(path_watch);
+        finalize_results.insert(finalize_results.end(), watch_responses.begin(), watch_responses.end());
     }
 
-    try
+    watches.clear();
+    for (auto & path_watch : list_watches)
     {
-        {
-            auto finish_watch = [] (const auto & watch_pair)
-            {
-                Coordination::ZooKeeperWatchResponse response;
-                response.type = Coordination::SESSION;
-                response.state = Coordination::EXPIRED_SESSION;
-                response.error = Coordination::Error::ZSESSIONEXPIRED;
+        auto list_watch_responses = finish_watch(path_watch);
+        finalize_results.insert(finalize_results.end(), list_watch_responses.begin(), list_watch_responses.end());
+    }
+    list_watches.clear();
+    sessions_and_watchers.clear();
 
-                for (auto & watcher : watch_pair.second)
-                {
-                    if (watcher.watch_callback)
-                    {
-                        try
-                        {
-                            watcher.watch_callback(std::make_shared<Coordination::ZooKeeperWatchResponse>(response));
-                        }
-                        catch (...)
-                        {
-                            tryLogCurrentException(__PRETTY_FUNCTION__);
-                        }
-                    }
-                }
-            };
-            for (auto & path_watch : watches)
-                finish_watch(path_watch);
-            watches.clear();
-            for (auto & path_watch : list_watches)
-                finish_watch(path_watch);
-            list_watches.clear();
-            sessions_and_watchers.clear();
-        }
-        RequestInfo info;
-        while (requests_queue.tryPop(info))
-        {
-            auto response = info.request->zk_request->makeResponse();
-            response->error = Coordination::Error::ZSESSIONEXPIRED;
-            try
-            {
-                info.response_callback(response);
-            }
-            catch (...)
-            {
-                tryLogCurrentException(__PRETTY_FUNCTION__);
-            }
-        }
-    }
-    catch (...)
+    for (const auto & [session_id, zk_request] : expired_requests)
     {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
+        auto response = zk_request->makeResponse();
+        response->error = Coordination::Error::ZSESSIONEXPIRED;
+        finalize_results.push_back(ResponseForSession{session_id, response});
     }
+    return finalize_results;
 }
 
 
@@ -731,55 +623,80 @@ TestKeeperWrapperFactory::TestKeeperWrapperFactory()
     registerTestKeeperRequestWrapper<Coordination::OpNum::Multi, TestKeeperStorageMultiRequest>(*this);
 }
 
-void TestKeeperStorage::putRequest(const Coordination::ZooKeeperRequestPtr & request, int64_t session_id, ResponseCallback callback)
+
+TestKeeperStorage::ResponsesForSessions TestKeeperStorage::processRequest(const Coordination::ZooKeeperRequestPtr & zk_request, int64_t session_id)
 {
-    TestKeeperStorageRequestPtr storage_request = TestKeeperWrapperFactory::instance().get(request);
-    RequestInfo request_info;
-    request_info.time = clock::now();
-    request_info.request = storage_request;
-    request_info.session_id = session_id;
-    request_info.response_callback = callback;
-
-    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), operation_timeout.totalMilliseconds()))
-        throw Exception("Cannot push request to queue within operation timeout", ErrorCodes::TIMEOUT_EXCEEDED);
-
-}
-
-void TestKeeperStorage::putRequest(const Coordination::ZooKeeperRequestPtr & request, int64_t session_id, ResponseCallback callback, ResponseCallback watch_callback)
-{
-    TestKeeperStorageRequestPtr storage_request = TestKeeperWrapperFactory::instance().get(request);
-    RequestInfo request_info;
-    request_info.time = clock::now();
-    request_info.request = storage_request;
-    request_info.session_id = session_id;
-    request_info.response_callback = callback;
-    if (request->has_watch)
-        request_info.watch_callback = watch_callback;
-
-    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), operation_timeout.totalMilliseconds()))
-        throw Exception("Cannot push request to queue within operation timeout", ErrorCodes::TIMEOUT_EXCEEDED);
-}
-
-TestKeeperStorage::~TestKeeperStorage()
-{
-    try
+    TestKeeperStorage::ResponsesForSessions results;
+    if (zk_request->getOpNum() == Coordination::OpNum::Close)
     {
-        finalize();
+        auto it = ephemerals.find(session_id);
+        if (it != ephemerals.end())
+        {
+            for (const auto & ephemeral_path : it->second)
+            {
+                container.erase(ephemeral_path);
+                auto responses = processWatchesImpl(ephemeral_path, watches, list_watches, Coordination::Event::DELETED);
+                results.insert(results.end(), responses.begin(), responses.end());
+            }
+            ephemerals.erase(it);
+        }
+        clearDeadWatches(session_id);
+
+        /// Finish connection
+        auto response = std::make_shared<Coordination::ZooKeeperCloseResponse>();
+        response->xid = zk_request->xid;
+        response->zxid = getZXID();
+        results.push_front(ResponseForSession{session_id, response});
     }
-    catch (...)
+    else
     {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
+
+        TestKeeperStorageRequestPtr storage_request = TestKeeperWrapperFactory::instance().get(zk_request);
+        auto [response, _] = storage_request->process(container, ephemerals, zxid, session_id);
+
+        if (zk_request->has_watch)
+        {
+            if (response->error == Coordination::Error::ZOK)
+            {
+                auto & watches_type = zk_request->getOpNum() == Coordination::OpNum::List || zk_request->getOpNum() == Coordination::OpNum::SimpleList
+                    ? list_watches
+                    : watches;
+
+                watches_type[zk_request->getPath()].emplace_back(session_id);
+                sessions_and_watchers[session_id].emplace(zk_request->getPath());
+            }
+            else if (response->error == Coordination::Error::ZNONODE && zk_request->getOpNum() == Coordination::OpNum::Exists)
+            {
+                watches[zk_request->getPath()].emplace_back(session_id);
+                sessions_and_watchers[session_id].emplace(zk_request->getPath());
+            }
+            else
+            {
+                std::shared_ptr<Coordination::ZooKeeperWatchResponse> watch_response = std::make_shared<Coordination::ZooKeeperWatchResponse>();
+                watch_response->path = zk_request->getPath();
+                watch_response->xid = -1;
+                watch_response->error = response->error;
+                watch_response->type = Coordination::Event::NOTWATCHING;
+                results.push_back(ResponseForSession{session_id, watch_response});
+            }
+        }
+
+        if (response->error == Coordination::Error::ZOK)
+        {
+            auto watch_responses = storage_request->processWatches(watches, list_watches);
+            results.insert(results.end(), watch_responses.begin(), watch_responses.end());
+        }
+
+        response->xid = zk_request->xid;
+        response->zxid = getZXID();
+
+        results.push_front(ResponseForSession{session_id, response});
     }
+
+    return results;
 }
 
+
 void TestKeeperStorage::clearDeadWatches(int64_t session_id)
 {
     auto watches_it = sessions_and_watchers.find(session_id);
@@ -793,7 +710,7 @@ void TestKeeperStorage::clearDeadWatches(int64_t session_id)
                 auto & watches_for_path = watch->second;
                 for (auto w_it = watches_for_path.begin(); w_it != watches_for_path.end();)
                 {
-                    if (w_it->session_id == session_id)
+                    if (*w_it == session_id)
                         w_it = watches_for_path.erase(w_it);
                     else
                         ++w_it;
@@ -808,7 +725,7 @@ void TestKeeperStorage::clearDeadWatches(int64_t session_id)
                 auto & list_watches_for_path = list_watch->second;
                 for (auto w_it = list_watches_for_path.begin(); w_it != list_watches_for_path.end();)
                 {
-                    if (w_it->session_id == session_id)
+                    if (*w_it == session_id)
                         w_it = list_watches_for_path.erase(w_it);
                     else
                         ++w_it;
diff --git a/src/Common/ZooKeeper/TestKeeperStorage.h b/src/Common/ZooKeeper/TestKeeperStorage.h
index afb0a7add82..5afa5032bcf 100644
--- a/src/Common/ZooKeeper/TestKeeperStorage.h
+++ b/src/Common/ZooKeeper/TestKeeperStorage.h
@@ -4,9 +4,9 @@
 #include <Common/ZooKeeper/IKeeper.h>
 #include <Common/ConcurrentBoundedQueue.h>
 #include <Common/ZooKeeper/ZooKeeperCommon.h>
-#include <future>
 #include <unordered_map>
 #include <unordered_set>
+#include <deque>
 
 namespace zkutil
 {
@@ -18,10 +18,7 @@ using ResponseCallback = std::function<void(const Coordination::ZooKeeperRespons
 
 class TestKeeperStorage
 {
-
 public:
-
-    Poco::Timespan operation_timeout{0, Coordination::DEFAULT_OPERATION_TIMEOUT_MS * 1000};
     std::atomic<int64_t> session_id_counter{0};
 
     struct Node
@@ -34,71 +31,58 @@ public:
         int32_t seq_num = 0;
     };
 
-    struct Watcher
+    struct ResponseForSession
     {
         int64_t session_id;
-        ResponseCallback watch_callback;
+        Coordination::ZooKeeperResponsePtr response;
     };
 
+    using ResponsesForSessions = std::deque<ResponseForSession>;
+
+    struct RequestForSession
+    {
+        int64_t session_id;
+        Coordination::ZooKeeperRequestPtr request;
+    };
+
+    using RequestsForSessions = std::deque<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 SessionIDs = std::vector<int64_t>;
 
-    using WatchCallbacks = std::vector<Watcher>;
-    using Watches = std::map<String /* path, relative of root_path */, WatchCallbacks>;
+    using Watches = std::map<String /* path, relative of root_path */, SessionIDs>;
 
     Container container;
     Ephemerals ephemerals;
     SessionAndWatcher sessions_and_watchers;
 
     std::atomic<int64_t> zxid{0};
-    std::atomic<bool> shutdown{false};
+    std::atomic<bool> finalized{false};
 
     Watches watches;
     Watches list_watches;   /// Watches for 'list' request (watches on children).
 
-    using clock = std::chrono::steady_clock;
-
-    struct RequestInfo
-    {
-        TestKeeperStorageRequestPtr request;
-        ResponseCallback response_callback;
-        ResponseCallback watch_callback;
-        clock::time_point time;
-        int64_t session_id;
-    };
-
-    std::mutex push_request_mutex;
-    using RequestsQueue = ConcurrentBoundedQueue<RequestInfo>;
-    RequestsQueue requests_queue{1};
-
-    void finalize();
-
-    ThreadFromGlobalPool processing_thread;
-
-    void processingThread();
     void clearDeadWatches(int64_t session_id);
 
-public:
-    using AsyncResponse = std::future<Coordination::ZooKeeperResponsePtr>;
-    TestKeeperStorage();
-    ~TestKeeperStorage();
-    struct ResponsePair
+    int64_t getZXID()
     {
-        AsyncResponse response;
-        std::optional<AsyncResponse> watch_response;
-    };
-    void putRequest(const Coordination::ZooKeeperRequestPtr & request, int64_t session_id, ResponseCallback callback);
-    void putRequest(const Coordination::ZooKeeperRequestPtr & request, int64_t session_id, ResponseCallback callback, ResponseCallback watch_callback);
+        return zxid.fetch_add(1);
+    }
+
+public:
+    TestKeeperStorage();
+
+    ResponsesForSessions processRequest(const Coordination::ZooKeeperRequestPtr & request, int64_t session_id);
+    ResponsesForSessions finalize(const RequestsForSessions & expired_requests);
 
     int64_t getSessionID()
     {
         return session_id_counter.fetch_add(1);
     }
-    int64_t getZXID()
-    {
-        return zxid.fetch_add(1);
-    }
+
+
 };
 
 }
diff --git a/src/Common/ZooKeeper/TestKeeperStorageDispatcher.cpp b/src/Common/ZooKeeper/TestKeeperStorageDispatcher.cpp
new file mode 100644
index 00000000000..b1233fc47e3
--- /dev/null
+++ b/src/Common/ZooKeeper/TestKeeperStorageDispatcher.cpp
@@ -0,0 +1,131 @@
+#include <Common/ZooKeeper/TestKeeperStorageDispatcher.h>
+#include <Common/setThreadName.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+
+    extern const int LOGICAL_ERROR;
+    extern const int TIMEOUT_EXCEEDED;
+}
+
+}
+namespace zkutil
+{
+
+void TestKeeperStorageDispatcher::processingThread()
+{
+    setThreadName("TestKeeperSProc");
+    try
+    {
+        while (!shutdown)
+        {
+            RequestInfo info;
+
+            UInt64 max_wait = UInt64(operation_timeout.totalMilliseconds());
+
+            if (requests_queue.tryPop(info, max_wait))
+            {
+                if (shutdown)
+                    break;
+
+                auto responses = storage.processRequest(info.request, info.session_id);
+                for (const auto & response_for_session : responses)
+                    setResponse(response_for_session.session_id, response_for_session.response);
+            }
+        }
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+        finalize();
+    }
+}
+
+void TestKeeperStorageDispatcher::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())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown session id {}", session_id);
+
+    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);
+}
+
+void TestKeeperStorageDispatcher::finalize()
+{
+    {
+        std::lock_guard lock(push_request_mutex);
+
+        if (shutdown)
+            return;
+
+        shutdown = true;
+
+        if (processing_thread.joinable())
+            processing_thread.join();
+    }
+
+    RequestInfo info;
+    TestKeeperStorage::RequestsForSessions expired_requests;
+    while (requests_queue.tryPop(info))
+        expired_requests.push_back(TestKeeperStorage::RequestForSession{info.session_id, info.request});
+
+    auto expired_responses = storage.finalize(expired_requests);
+
+    for (const auto & response_for_session : expired_responses)
+        setResponse(response_for_session.session_id, response_for_session.response);
+}
+
+void TestKeeperStorageDispatcher::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)
+            throw Exception(DB::ErrorCodes::LOGICAL_ERROR, "Unknown session id {}", session_id);
+    }
+
+    RequestInfo request_info;
+    request_info.time = clock::now();
+    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), operation_timeout.totalMilliseconds()))
+        throw Exception("Cannot push request to queue within operation timeout", ErrorCodes::TIMEOUT_EXCEEDED);
+}
+
+TestKeeperStorageDispatcher::TestKeeperStorageDispatcher()
+{
+    processing_thread = ThreadFromGlobalPool([this] { processingThread(); });
+}
+
+TestKeeperStorageDispatcher::~TestKeeperStorageDispatcher()
+{
+    try
+    {
+        finalize();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+
+void TestKeeperStorageDispatcher::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);
+}
+
+}
diff --git a/src/Common/ZooKeeper/TestKeeperStorageDispatcher.h b/src/Common/ZooKeeper/TestKeeperStorageDispatcher.h
new file mode 100644
index 00000000000..27abf17ac73
--- /dev/null
+++ b/src/Common/ZooKeeper/TestKeeperStorageDispatcher.h
@@ -0,0 +1,58 @@
+#pragma once
+
+#include <Common/ThreadPool.h>
+#include <Common/ConcurrentBoundedQueue.h>
+#include <Common/ZooKeeper/TestKeeperStorage.h>
+#include <functional>
+
+namespace zkutil
+{
+
+using ZooKeeperResponseCallback = std::function<void(const Coordination::ZooKeeperResponsePtr & response)>;
+
+class TestKeeperStorageDispatcher
+{
+private:
+    Poco::Timespan operation_timeout{0, Coordination::DEFAULT_OPERATION_TIMEOUT_MS * 1000};
+
+    using clock = std::chrono::steady_clock;
+
+    struct RequestInfo
+    {
+        Coordination::ZooKeeperRequestPtr request;
+        clock::time_point time;
+        int64_t session_id;
+    };
+
+    std::mutex push_request_mutex;
+
+    using RequestsQueue = ConcurrentBoundedQueue<RequestInfo>;
+    RequestsQueue requests_queue{1};
+    std::atomic<bool> shutdown{false};
+    using SessionToResponseCallback = std::unordered_map<int64_t, ZooKeeperResponseCallback>;
+
+    std::mutex session_to_response_callback_mutex;
+    SessionToResponseCallback session_to_response_callback;
+
+    ThreadFromGlobalPool processing_thread;
+
+    TestKeeperStorage storage;
+
+private:
+    void processingThread();
+    void finalize();
+    void setResponse(int64_t session_id, const Coordination::ZooKeeperResponsePtr & response);
+
+public:
+    TestKeeperStorageDispatcher();
+    ~TestKeeperStorageDispatcher();
+
+    void putRequest(const Coordination::ZooKeeperRequestPtr & request, int64_t session_id);
+    int64_t getSessionID()
+    {
+        return storage.getSessionID();
+    }
+    void registerSession(int64_t session_id, ZooKeeperResponseCallback callback);
+};
+
+}
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index 2a8fdce869b..ea10024b3cb 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 <Common/ZooKeeper/TestKeeperStorage.h>
+#include <Common/ZooKeeper/TestKeeperStorageDispatcher.h>
 #include <Compression/ICompressionCodec.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <Formats/FormatFactory.h>
@@ -306,7 +306,7 @@ struct ContextShared
     ConfigurationPtr zookeeper_config;                      /// Stores zookeeper configs
 
     mutable std::mutex test_keeper_storage_mutex;
-    mutable std::shared_ptr<zkutil::TestKeeperStorage> test_keeper_storage;
+    mutable std::shared_ptr<zkutil::TestKeeperStorageDispatcher> test_keeper_storage;
     mutable std::mutex auxiliary_zookeepers_mutex;
     mutable std::map<String, zkutil::ZooKeeperPtr> auxiliary_zookeepers;    /// Map for auxiliary ZooKeeper clients.
     ConfigurationPtr auxiliary_zookeepers_config;           /// Stores auxiliary zookeepers configs
@@ -1531,11 +1531,11 @@ zkutil::ZooKeeperPtr Context::getZooKeeper() const
     return shared->zookeeper;
 }
 
-std::shared_ptr<zkutil::TestKeeperStorage> & Context::getTestKeeperStorage() const
+std::shared_ptr<zkutil::TestKeeperStorageDispatcher> & Context::getTestKeeperStorage() const
 {
     std::lock_guard lock(shared->test_keeper_storage_mutex);
     if (!shared->test_keeper_storage)
-        shared->test_keeper_storage = std::make_shared<zkutil::TestKeeperStorage>();
+        shared->test_keeper_storage = std::make_shared<zkutil::TestKeeperStorageDispatcher>();
 
     return shared->test_keeper_storage;
 }
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index 79140f0d209..dc8efb058e7 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -40,7 +40,7 @@ namespace Poco
 namespace zkutil
 {
     class ZooKeeper;
-    class TestKeeperStorage;
+    class TestKeeperStorageDispatcher;
 }
 
 
@@ -513,7 +513,7 @@ public:
     std::shared_ptr<zkutil::ZooKeeper> getAuxiliaryZooKeeper(const String & name) const;
 
 
-    std::shared_ptr<zkutil::TestKeeperStorage> & getTestKeeperStorage() const;
+    std::shared_ptr<zkutil::TestKeeperStorageDispatcher> & getTestKeeperStorage() const;
 
     /// Set auxiliary zookeepers configuration at server starting or configuration reloading.
     void reloadAuxiliaryZooKeepersConfigIfChanged(const ConfigurationPtr & config);
diff --git a/src/Server/TestKeeperTCPHandler.cpp b/src/Server/TestKeeperTCPHandler.cpp
index aeb7da038b7..e81a2e9ef99 100644
--- a/src/Server/TestKeeperTCPHandler.cpp
+++ b/src/Server/TestKeeperTCPHandler.cpp
@@ -32,7 +32,7 @@ namespace ErrorCodes
 
 struct PollResult
 {
-    std::vector<size_t> ready_responses;
+    bool has_responses;
     bool has_requests;
     bool error;
 };
@@ -162,10 +162,10 @@ struct SocketInterruptablePollWrapper
                     {
                         do
                         {
-                            size_t response_position;
-                            readIntBinary(response_position, response_in);
-                            result.ready_responses.push_back(response_position);
-                        } while (response_in.available());
+                            UInt8 response_byte;
+                            readIntBinary(response_byte, response_in);
+                            result.has_responses = true;
+                        } while (response_in.available()); /// Just to drain all of them
                     }
                 }
             }
@@ -186,11 +186,12 @@ TestKeeperTCPHandler::TestKeeperTCPHandler(IServer & server_, const Poco::Net::S
     , server(server_)
     , log(&Poco::Logger::get("TestKeeperTCPHandler"))
     , global_context(server.context())
-    , test_keeper_storage(global_context.getTestKeeperStorage())
+    , test_keeper_storage_dispatcher(global_context.getTestKeeperStorage())
     , 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)
-    , session_id(test_keeper_storage->getSessionID())
+    , session_id(test_keeper_storage_dispatcher->getSessionID())
     , poll_wrapper(std::make_unique<SocketInterruptablePollWrapper>(socket_))
+    , responses(1000)
 {
 }
 
@@ -278,6 +279,16 @@ void TestKeeperTCPHandler::runImpl()
     }
 
     sendHandshake();
+
+    auto response_fd = poll_wrapper->getResponseFD();
+    auto response_callback = [this, response_fd] (const Coordination::ZooKeeperResponsePtr & response)
+    {
+        responses.push(response);
+        UInt8 single_byte = 1;
+        [[maybe_unused]] int result = write(response_fd, &single_byte, sizeof(single_byte));
+    };
+    test_keeper_storage_dispatcher->registerSession(session_id, response_callback);
+
     session_stopwatch.start();
     bool close_received = false;
     try
@@ -291,27 +302,12 @@ void TestKeeperTCPHandler::runImpl()
             {
                 do
                 {
-                    Coordination::OpNum received_op = receiveRequest();
+                    auto [received_op, received_xid] = receiveRequest();
 
                     if (received_op == Coordination::OpNum::Close)
                     {
-                        auto last_response = responses.find(response_id_counter - 1);
-                        if (last_response == responses.end())
-                            throw Exception(ErrorCodes::LOGICAL_ERROR, "Just inserted response #{} not found in responses", response_id_counter - 1);
-                        LOG_DEBUG(log, "Received close request for session #{}", session_id);
-                        if (last_response->second.wait_for(std::chrono::microseconds(operation_timeout.totalMicroseconds())) != std::future_status::ready)
-                        {
-                            LOG_DEBUG(log, "Cannot sent close for session #{}", session_id);
-                        }
-                        else
-                        {
-                            LOG_DEBUG(log, "Sent close for session #{}", session_id);
-                            last_response->second.get()->write(*out);
-                        }
-
-                        close_received = true;
-
-                        break;
+                        LOG_DEBUG(log, "Received close event with xid {} for session id #{}", received_xid, session_id);
+                        close_xid = received_xid;
                     }
                     else if (received_op == Coordination::OpNum::Heartbeat)
                     {
@@ -322,44 +318,36 @@ void TestKeeperTCPHandler::runImpl()
                 while (in->available());
             }
 
+            if (result.has_responses)
+            {
+                Coordination::ZooKeeperResponsePtr response;
+                while (responses.tryPop(response))
+                {
+                    if (response->xid == close_xid)
+                    {
+                        close_received = true;
+                        break;
+                    }
+
+                    if (response->error == Coordination::Error::ZOK)
+                        response->write(*out);
+                    else if (response->xid != Coordination::WATCH_XID)
+                        response->write(*out);
+                    /// skipping bad response for watch
+                }
+            }
+
             if (close_received)
                 break;
 
-            for (size_t response_id : result.ready_responses)
-            {
-                auto response_future = responses.find(response_id);
-                if (response_future == responses.end())
-                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Trying to get unknown response #{}", response_id);
-
-                if (response_future->second.wait_for(0s) != std::future_status::ready)
-                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Response #{} was market as ready but corresponding future not ready yet", response_id);
-
-                auto response = response_future->second.get();
-                if (response->error == Coordination::Error::ZOK)
-                {
-                    response->write(*out);
-                }
-                else
-                {
-                    /// TODO Get rid of this
-                    if (!dynamic_cast<Coordination::ZooKeeperWatchResponse *>(response.get()))
-                        response->write(*out);
-                }
-                responses.erase(response_future);
-            }
-
             if (result.error)
                 throw Exception("Exception happened while reading from socket", ErrorCodes::SYSTEM_ERROR);
 
             if (session_stopwatch.elapsedMicroseconds() > static_cast<UInt64>(session_timeout.totalMicroseconds()))
             {
                 LOG_DEBUG(log, "Session #{} expired", session_id);
-                auto response = putCloseRequest();
-                if (response.wait_for(std::chrono::microseconds(operation_timeout.totalMicroseconds())) != std::future_status::ready)
+                if (!finish())
                     LOG_DEBUG(log, "Cannot sent close for expired session #{}", session_id);
-                else
-                    response.get()->write(*out);
-
                 break;
             }
         }
@@ -367,29 +355,33 @@ void TestKeeperTCPHandler::runImpl()
     catch (const Exception & ex)
     {
         LOG_INFO(log, "Got exception processing session #{}: {}", session_id, getExceptionMessage(ex, true));
-        auto response = putCloseRequest();
-        if (response.wait_for(std::chrono::microseconds(operation_timeout.totalMicroseconds())) != std::future_status::ready)
+        if (!finish())
             LOG_DEBUG(log, "Cannot sent close for session #{}", session_id);
-        else
-            response.get()->write(*out);
     }
 
 }
 
-zkutil::TestKeeperStorage::AsyncResponse TestKeeperTCPHandler::putCloseRequest()
+bool TestKeeperTCPHandler::finish()
 {
     Coordination::ZooKeeperRequestPtr request = Coordination::ZooKeeperRequestFactory::instance().get(Coordination::OpNum::Close);
-    request->xid = Coordination::CLOSE_XID;
-    auto promise = std::make_shared<std::promise<Coordination::ZooKeeperResponsePtr>>();
-    zkutil::ResponseCallback callback = [promise] (const Coordination::ZooKeeperResponsePtr & response)
+    request->xid = close_xid;
+    test_keeper_storage_dispatcher->putRequest(request, session_id);
+
+    Coordination::ZooKeeperResponsePtr response;
+    bool finished = false;
+    while (responses.tryPop(response, operation_timeout.totalMilliseconds()))
     {
-        promise->set_value(response);
-    };
-    test_keeper_storage->putRequest(request, session_id, callback);
-    return promise->get_future();
+        if (response->xid == close_xid)
+        {
+            finished = true;
+            response->write(*out);
+            break;
+        }
+    }
+    return finished;
 }
 
-Coordination::OpNum TestKeeperTCPHandler::receiveRequest()
+std::pair<Coordination::OpNum, Coordination::XID> TestKeeperTCPHandler::receiveRequest()
 {
     int32_t length;
     Coordination::read(length, *in);
@@ -402,47 +394,9 @@ Coordination::OpNum TestKeeperTCPHandler::receiveRequest()
     Coordination::ZooKeeperRequestPtr request = Coordination::ZooKeeperRequestFactory::instance().get(opnum);
     request->xid = xid;
     request->readImpl(*in);
-    auto promise = std::make_shared<std::promise<Coordination::ZooKeeperResponsePtr>>();
-    if (opnum != Coordination::OpNum::Close)
-    {
-        int response_fd = poll_wrapper->getResponseFD();
-        size_t response_num = response_id_counter++;
-        zkutil::ResponseCallback callback = [response_fd, promise, response_num] (const Coordination::ZooKeeperResponsePtr & response)
-        {
-            promise->set_value(response);
-            [[maybe_unused]] int result = write(response_fd, &response_num, sizeof(response_num));
-        };
 
-        if (request->has_watch)
-        {
-            auto watch_promise = std::make_shared<std::promise<Coordination::ZooKeeperResponsePtr>>();
-            size_t watch_response_num = response_id_counter++;
-            zkutil::ResponseCallback watch_callback = [response_fd, watch_promise, watch_response_num] (const Coordination::ZooKeeperResponsePtr & response)
-            {
-                watch_promise->set_value(response);
-                [[maybe_unused]] int result = write(response_fd, &watch_response_num, sizeof(watch_response_num));
-            };
-            test_keeper_storage->putRequest(request, session_id, callback, watch_callback);
-            responses.try_emplace(response_num, promise->get_future());
-            responses.try_emplace(watch_response_num, watch_promise->get_future());
-        }
-        else
-        {
-            test_keeper_storage->putRequest(request, session_id, callback);
-            responses.try_emplace(response_num, promise->get_future());
-        }
-    }
-    else
-    {
-        zkutil::ResponseCallback callback = [promise] (const Coordination::ZooKeeperResponsePtr & response)
-        {
-            promise->set_value(response);
-        };
-        test_keeper_storage->putRequest(request, session_id, callback);
-        responses.try_emplace(response_id_counter++, promise->get_future());
-    }
-
-    return opnum;
+    test_keeper_storage_dispatcher->putRequest(request, session_id);
+    return std::make_pair(opnum, xid);
 }
 
 }
diff --git a/src/Server/TestKeeperTCPHandler.h b/src/Server/TestKeeperTCPHandler.h
index 14e38ae6bd5..e2de33a5156 100644
--- a/src/Server/TestKeeperTCPHandler.h
+++ b/src/Server/TestKeeperTCPHandler.h
@@ -3,10 +3,11 @@
 #include <Poco/Net/TCPServerConnection.h>
 #include "IServer.h"
 #include <Common/Stopwatch.h>
+#include <Common/ConcurrentBoundedQueue.h>
 #include <Interpreters/Context.h>
 #include <Common/ZooKeeper/ZooKeeperCommon.h>
 #include <Common/ZooKeeper/ZooKeeperConstants.h>
-#include <Common/ZooKeeper/TestKeeperStorage.h>
+#include <Common/ZooKeeper/TestKeeperStorageDispatcher.h>
 #include <IO/WriteBufferFromPocoSocket.h>
 #include <IO/ReadBufferFromPocoSocket.h>
 #include <unordered_map>
@@ -27,15 +28,14 @@ private:
     IServer & server;
     Poco::Logger * log;
     Context global_context;
-    std::shared_ptr<zkutil::TestKeeperStorage> test_keeper_storage;
+    std::shared_ptr<zkutil::TestKeeperStorageDispatcher> test_keeper_storage_dispatcher;
     Poco::Timespan operation_timeout;
     Poco::Timespan session_timeout;
     int64_t session_id;
     Stopwatch session_stopwatch;
     SocketInterruptablePollWrapperPtr poll_wrapper;
-
-    size_t response_id_counter = 0;
-    std::unordered_map<size_t, zkutil::TestKeeperStorage::AsyncResponse> responses;
+    ConcurrentBoundedQueue<Coordination::ZooKeeperResponsePtr> responses;
+    Coordination::XID close_xid = Coordination::CLOSE_XID;
 
     /// Streams for reading/writing from/to client connection socket.
     std::shared_ptr<ReadBufferFromPocoSocket> in;
@@ -46,8 +46,8 @@ private:
     void sendHandshake();
     void receiveHandshake();
 
-    Coordination::OpNum receiveRequest();
-    zkutil::TestKeeperStorage::AsyncResponse putCloseRequest();
+    std::pair<Coordination::OpNum, Coordination::XID> receiveRequest();
+    bool finish();
 };
 
 }

From a56563812993a07b04a2b3f5e9e168b587639544 Mon Sep 17 00:00:00 2001
From: Yatsishin Ilya <2159081+qoega@users.noreply.github.com>
Date: Tue, 19 Jan 2021 17:37:27 +0300
Subject: [PATCH 177/611] stop server

---
 docker/test/sqlancer/run.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker/test/sqlancer/run.sh b/docker/test/sqlancer/run.sh
index 4ff99cfdbd2..950b95249f9 100755
--- a/docker/test/sqlancer/run.sh
+++ b/docker/test/sqlancer/run.sh
@@ -21,8 +21,12 @@ export NUM_QUERIES=1000
 ( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPDistinct | tee /test_output/TLPDistinct.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPDistinct.err
 ( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPAggregate | tee /test_output/TLPAggregate.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPAggregate.err
 
+service clickhouse-server stop && sleep 10
+
 ls /var/log/clickhouse-server/
 tar czf /test_output/logs.tar.gz -C /var/log/clickhouse-server/ .
 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
+
+ls /test_output

From 3668885f6fd2b3e5d01771edf7656df03227d992 Mon Sep 17 00:00:00 2001
From: Dmitriy <sevirov@yandex-team.ru>
Date: Tue, 19 Jan 2021 17:42:34 +0300
Subject: [PATCH 178/611] Fix translation of multiword types
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Заменил выражение "типы с названием из нескольких слов" на "составные типы".
---
 .../data-types/multiword-types.md             | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 docs/ru/sql-reference/data-types/multiword-types.md

diff --git a/docs/ru/sql-reference/data-types/multiword-types.md b/docs/ru/sql-reference/data-types/multiword-types.md
new file mode 100644
index 00000000000..4c08ea8ee92
--- /dev/null
+++ b/docs/ru/sql-reference/data-types/multiword-types.md
@@ -0,0 +1,29 @@
+---
+toc_priority: 61
+toc_title: Составные типы
+---
+
+# Составные типы {#multiword-types}
+
+При создании таблиц вы также можете использовать типы данных с названием, состоящим из нескольких слов. Это необходимо для лучшей совместимости с SQL.
+
+## Поддержка составных типов {#multiword-types-support}
+
+| Составные типы                      | Обычные типы                                              |
+|-------------------------------------|-----------------------------------------------------------|
+| DOUBLE PRECISION                    | [Float64](../../sql-reference/data-types/float.md)        |
+| CHAR LARGE OBJECT                   | [String](../../sql-reference/data-types/string.md)        |
+| CHAR VARYING                        | [String](../../sql-reference/data-types/string.md)        |
+| CHARACTER LARGE OBJECT              | [String](../../sql-reference/data-types/string.md)        |
+| CHARACTER VARYING                   | [String](../../sql-reference/data-types/string.md)        |
+| NCHAR LARGE OBJECT                  | [String](../../sql-reference/data-types/string.md)        |
+| NCHAR VARYING                       | [String](../../sql-reference/data-types/string.md)        |
+| NATIONAL CHARACTER LARGE OBJECT     | [String](../../sql-reference/data-types/string.md)        |
+| NATIONAL CHARACTER VARYING          | [String](../../sql-reference/data-types/string.md)        |
+| NATIONAL CHAR VARYING               | [String](../../sql-reference/data-types/string.md)        |
+| NATIONAL CHARACTER                  | [String](../../sql-reference/data-types/string.md)        |
+| NATIONAL CHAR                       | [String](../../sql-reference/data-types/string.md)        |
+| 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-->

From ace6d906b0b7a2a8b0f45b95021a618f44b9d21e Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Tue, 19 Jan 2021 17:45:45 +0300
Subject: [PATCH 179/611] Fix normal close scenario

---
 src/Common/ZooKeeper/TestKeeperStorage.cpp |  4 ++--
 src/Common/ZooKeeper/TestKeeperStorage.h   |  4 ++--
 src/Server/TestKeeperTCPHandler.cpp        | 11 +++++------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/Common/ZooKeeper/TestKeeperStorage.cpp b/src/Common/ZooKeeper/TestKeeperStorage.cpp
index 4f1300cde8c..e7300939821 100644
--- a/src/Common/ZooKeeper/TestKeeperStorage.cpp
+++ b/src/Common/ZooKeeper/TestKeeperStorage.cpp
@@ -646,7 +646,7 @@ TestKeeperStorage::ResponsesForSessions TestKeeperStorage::processRequest(const
         auto response = std::make_shared<Coordination::ZooKeeperCloseResponse>();
         response->xid = zk_request->xid;
         response->zxid = getZXID();
-        results.push_front(ResponseForSession{session_id, response});
+        results.push_back(ResponseForSession{session_id, response});
     }
     else
     {
@@ -690,7 +690,7 @@ TestKeeperStorage::ResponsesForSessions TestKeeperStorage::processRequest(const
         response->xid = zk_request->xid;
         response->zxid = getZXID();
 
-        results.push_front(ResponseForSession{session_id, response});
+        results.push_back(ResponseForSession{session_id, response});
     }
 
     return results;
diff --git a/src/Common/ZooKeeper/TestKeeperStorage.h b/src/Common/ZooKeeper/TestKeeperStorage.h
index 5afa5032bcf..2196273b3ba 100644
--- a/src/Common/ZooKeeper/TestKeeperStorage.h
+++ b/src/Common/ZooKeeper/TestKeeperStorage.h
@@ -37,7 +37,7 @@ public:
         Coordination::ZooKeeperResponsePtr response;
     };
 
-    using ResponsesForSessions = std::deque<ResponseForSession>;
+    using ResponsesForSessions = std::vector<ResponseForSession>;
 
     struct RequestForSession
     {
@@ -45,7 +45,7 @@ public:
         Coordination::ZooKeeperRequestPtr request;
     };
 
-    using RequestsForSessions = std::deque<RequestForSession>;
+    using RequestsForSessions = std::vector<RequestForSession>;
 
     using Container = std::map<std::string, Node>;
     using Ephemerals = std::unordered_map<int64_t, std::unordered_set<String>>;
diff --git a/src/Server/TestKeeperTCPHandler.cpp b/src/Server/TestKeeperTCPHandler.cpp
index e81a2e9ef99..90aec9ce66f 100644
--- a/src/Server/TestKeeperTCPHandler.cpp
+++ b/src/Server/TestKeeperTCPHandler.cpp
@@ -298,7 +298,7 @@ void TestKeeperTCPHandler::runImpl()
             using namespace std::chrono_literals;
 
             PollResult result = poll_wrapper->poll(session_timeout);
-            if (result.has_requests)
+            if (result.has_requests && !close_received)
             {
                 do
                 {
@@ -308,6 +308,8 @@ void TestKeeperTCPHandler::runImpl()
                     {
                         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)
                     {
@@ -325,8 +327,8 @@ void TestKeeperTCPHandler::runImpl()
                 {
                     if (response->xid == close_xid)
                     {
-                        close_received = true;
-                        break;
+                        LOG_DEBUG(log, "Session #{} successfuly closed", session_id);
+                        return;
                     }
 
                     if (response->error == Coordination::Error::ZOK)
@@ -337,9 +339,6 @@ void TestKeeperTCPHandler::runImpl()
                 }
             }
 
-            if (close_received)
-                break;
-
             if (result.error)
                 throw Exception("Exception happened while reading from socket", ErrorCodes::SYSTEM_ERROR);
 

From f4a718aab946742657a0813e055e581ffb2bbdaf Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 19 Jan 2021 17:53:51 +0300
Subject: [PATCH 180/611] Fix tests.

---
 src/Interpreters/ActionsDAG.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index 60443e7656b..4eae60488b9 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -1108,7 +1108,11 @@ std::pair<ActionsDAGPtr, ActionsDAGPtr>  ActionsDAG::splitActionsBeforeArrayJoin
 
 std::pair<ActionsDAGPtr, ActionsDAGPtr> ActionsDAG::splitActionsForFilter(const std::string & column_name) const
 {
-    auto it = index.find(column_name);
+    auto it = index.begin();
+    for (; it != index.end(); ++it)
+        if ((*it)->result_name == column_name)
+            break;
+
     if (it == index.end())
         throw Exception(ErrorCodes::LOGICAL_ERROR,
                         "Index for ActionsDAG does not contain filter column name {}. DAG:\n{}",

From 0ee5629527dc35ffb707bc2ddececfcc082f04bb Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Tue, 19 Jan 2021 18:10:49 +0300
Subject: [PATCH 181/611] Fix style

---
 src/Common/ZooKeeper/TestKeeperStorage.cpp | 1 -
 src/Common/ya.make                         | 1 +
 src/Server/TestKeeperTCPHandler.cpp        | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Common/ZooKeeper/TestKeeperStorage.cpp b/src/Common/ZooKeeper/TestKeeperStorage.cpp
index e7300939821..e364b0efca9 100644
--- a/src/Common/ZooKeeper/TestKeeperStorage.cpp
+++ b/src/Common/ZooKeeper/TestKeeperStorage.cpp
@@ -14,7 +14,6 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
-    extern const int TIMEOUT_EXCEEDED;
     extern const int BAD_ARGUMENTS;
 }
 
diff --git a/src/Common/ya.make b/src/Common/ya.make
index 5b5da618bbe..4f2f1892a88 100644
--- a/src/Common/ya.make
+++ b/src/Common/ya.make
@@ -85,6 +85,7 @@ SRCS(
     ZooKeeper/IKeeper.cpp
     ZooKeeper/TestKeeper.cpp
     ZooKeeper/TestKeeperStorage.cpp
+    ZooKeeper/TestKeeperStorageDispatcher.cpp
     ZooKeeper/ZooKeeper.cpp
     ZooKeeper/ZooKeeperCommon.cpp
     ZooKeeper/ZooKeeperConstants.cpp
diff --git a/src/Server/TestKeeperTCPHandler.cpp b/src/Server/TestKeeperTCPHandler.cpp
index 90aec9ce66f..f928c10c856 100644
--- a/src/Server/TestKeeperTCPHandler.cpp
+++ b/src/Server/TestKeeperTCPHandler.cpp
@@ -27,7 +27,6 @@ namespace ErrorCodes
 {
     extern const int SYSTEM_ERROR;
     extern const int UNEXPECTED_PACKET_FROM_CLIENT;
-    extern const int LOGICAL_ERROR;
 }
 
 struct PollResult

From 6c6bf60937e76fcf27433a796b3d4be0c51ecd32 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Tue, 19 Jan 2021 18:23:32 +0300
Subject: [PATCH 182/611] Rename function

---
 src/Interpreters/Context.cpp        | 16 ++++++++--------
 src/Interpreters/Context.h          |  2 +-
 src/Server/TestKeeperTCPHandler.cpp |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index ea10024b3cb..6cf977dac34 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -305,8 +305,8 @@ struct ContextShared
     mutable zkutil::ZooKeeperPtr zookeeper;                 /// Client for ZooKeeper.
     ConfigurationPtr zookeeper_config;                      /// Stores zookeeper configs
 
-    mutable std::mutex test_keeper_storage_mutex;
-    mutable std::shared_ptr<zkutil::TestKeeperStorageDispatcher> test_keeper_storage;
+    mutable std::mutex test_keeper_storage_dispatcher_mutex;
+    mutable std::shared_ptr<zkutil::TestKeeperStorageDispatcher> test_keeper_storage_dispatcher;
     mutable std::mutex auxiliary_zookeepers_mutex;
     mutable std::map<String, zkutil::ZooKeeperPtr> auxiliary_zookeepers;    /// Map for auxiliary ZooKeeper clients.
     ConfigurationPtr auxiliary_zookeepers_config;           /// Stores auxiliary zookeepers configs
@@ -447,7 +447,7 @@ struct ContextShared
         /// Stop zookeeper connection
         zookeeper.reset();
         /// Stop test_keeper storage
-        test_keeper_storage.reset();
+        test_keeper_storage_dispatcher.reset();
     }
 
     bool hasTraceCollector() const
@@ -1531,13 +1531,13 @@ zkutil::ZooKeeperPtr Context::getZooKeeper() const
     return shared->zookeeper;
 }
 
-std::shared_ptr<zkutil::TestKeeperStorageDispatcher> & Context::getTestKeeperStorage() const
+std::shared_ptr<zkutil::TestKeeperStorageDispatcher> & Context::getTestKeeperStorageDispatcher() const
 {
-    std::lock_guard lock(shared->test_keeper_storage_mutex);
-    if (!shared->test_keeper_storage)
-        shared->test_keeper_storage = std::make_shared<zkutil::TestKeeperStorageDispatcher>();
+    std::lock_guard lock(shared->test_keeper_storage_dispatcher_mutex);
+    if (!shared->test_keeper_storage_dispatcher)
+        shared->test_keeper_storage_dispatcher = std::make_shared<zkutil::TestKeeperStorageDispatcher>();
 
-    return shared->test_keeper_storage;
+    return shared->test_keeper_storage_dispatcher;
 }
 
 zkutil::ZooKeeperPtr Context::getAuxiliaryZooKeeper(const String & name) const
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index dc8efb058e7..9c8d5252373 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -513,7 +513,7 @@ public:
     std::shared_ptr<zkutil::ZooKeeper> getAuxiliaryZooKeeper(const String & name) const;
 
 
-    std::shared_ptr<zkutil::TestKeeperStorageDispatcher> & getTestKeeperStorage() const;
+    std::shared_ptr<zkutil::TestKeeperStorageDispatcher> & getTestKeeperStorageDispatcher() const;
 
     /// Set auxiliary zookeepers configuration at server starting or configuration reloading.
     void reloadAuxiliaryZooKeepersConfigIfChanged(const ConfigurationPtr & config);
diff --git a/src/Server/TestKeeperTCPHandler.cpp b/src/Server/TestKeeperTCPHandler.cpp
index f928c10c856..b4192b6c9fb 100644
--- a/src/Server/TestKeeperTCPHandler.cpp
+++ b/src/Server/TestKeeperTCPHandler.cpp
@@ -185,7 +185,7 @@ TestKeeperTCPHandler::TestKeeperTCPHandler(IServer & server_, const Poco::Net::S
     , server(server_)
     , log(&Poco::Logger::get("TestKeeperTCPHandler"))
     , global_context(server.context())
-    , test_keeper_storage_dispatcher(global_context.getTestKeeperStorage())
+    , test_keeper_storage_dispatcher(global_context.getTestKeeperStorageDispatcher())
     , 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)
     , session_id(test_keeper_storage_dispatcher->getSessionID())

From b4addbf2c9b86abc5b99381133207c160cd6c732 Mon Sep 17 00:00:00 2001
From: Dmitriy <sevirov@yandex-team.ru>
Date: Tue, 19 Jan 2021 18:24:37 +0300
Subject: [PATCH 183/611] Fix translation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Поправил перевод.
---
 docs/en/operations/settings/settings.md             | 6 +++---
 docs/ru/operations/settings/settings.md             | 4 ++--
 docs/ru/sql-reference/functions/string-functions.md | 6 +++---
 docs/ru/sql-reference/statements/create/table.md    | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index c6e13451cef..d3a4d50d21c 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -2530,12 +2530,12 @@ See examples in [UNION](../../sql-reference/statements/select/union.md).
 
 ## data_type_default_nullable {#data_type_default_nullable}
 
-Allows data type without explicit modifiers [NULL or NOT NULL](../../sql-reference/statements/create/table.md#null-modifiers) in column definition will be [Nullable](../../sql-reference/data-types/nullable.md#data_type-nullable).
+Allows data types without explicit modifiers [NULL or NOT NULL](../../sql-reference/statements/create/table.md#null-modifiers) in column definition will be [Nullable](../../sql-reference/data-types/nullable.md#data_type-nullable).
 
 Possible values:
 
-- 1 — The data type in column definition is set to `Nullable` by default.
-- 0 — The data type in column definition is set to not `Nullable` by default.
+- 1 — The data types in column definitions are set to `Nullable` by default.
+- 0 — The data types in column definitions are set to not `Nullable` by default.
 
 Default value: `0`.
 
diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index 9118af01b04..fe967944272 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -2402,8 +2402,8 @@ WHERE 0
 
 Возможные значения:
 
-- 1 — тип данных в определении столбца задан по умолчанию как `Nullable`.
-- 0 — тип данных в определении столбца не задан по умолчанию как `Nullable`.
+- 1 — типы данных в определении столбца заданы по умолчанию как `Nullable`.
+- 0 — типы данных в определении столбца не заданы по умолчанию как `Nullable`.
 
 Значение по умолчанию: `0`.
 
diff --git a/docs/ru/sql-reference/functions/string-functions.md b/docs/ru/sql-reference/functions/string-functions.md
index cba5c1bc27f..aeb0652cc18 100644
--- a/docs/ru/sql-reference/functions/string-functions.md
+++ b/docs/ru/sql-reference/functions/string-functions.md
@@ -557,9 +557,9 @@ SELECT normalizedQueryHash('SELECT 1 AS `xyz`') != normalizedQueryHash('SELECT 1
 
 ## encodeXMLComponent {#encode-xml-component}
 
-Экранирует символы для размещения строки в текстовом узле XML или атрибуте.
+Экранирует символы для размещения строки в текстовом узле или атрибуте XML.
 
-Следующие пять встроенных XML-элементов будут заменены: `<`, `&`, `>`, `"`, `'`.
+Экранируются символы, которые в формате XML являются зарезервированными (служебными): `<`, `&`, `>`, `"`, `'`.
 
 **Синтаксис** 
 
@@ -573,7 +573,7 @@ encodeXMLComponent(x)
 
 **Возвращаемое значение**
 
--   Последовательность символов, включая и экранируемые.
+-   Строка, в которой зарезервированные символы экранированы.
 
 Тип: [String](../../sql-reference/data-types/string.md).
 
diff --git a/docs/ru/sql-reference/statements/create/table.md b/docs/ru/sql-reference/statements/create/table.md
index eb93875d4ee..133d54f2ebd 100644
--- a/docs/ru/sql-reference/statements/create/table.md
+++ b/docs/ru/sql-reference/statements/create/table.md
@@ -44,9 +44,9 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name ENGINE = engine AS SELECT ...
 
 После секции `ENGINE` в запросе могут использоваться и другие секции в зависимости от движка. Подробную документацию по созданию таблиц смотрите в описаниях [движков таблиц](../../../engines/table-engines/index.md#table_engines).
 
-## Модификаторы NULL или NOT NULL {#null-modifiers}
+## Модификатор NULL или NOT NULL {#null-modifiers}
 
-Модификаторы `NULL` and `NOT NULL` после установления типа данных в определении столбца позволяют или не позволяют ему быть типом [Nullable](../../../sql-reference/data-types/nullable.md#data_type-nullable). 
+Модификатор `NULL` или `NOT NULL`, указанный после типа данных в определении столбца, позволяет или не позволяет типу данных быть [Nullable](../../../sql-reference/data-types/nullable.md#data_type-nullable). 
 
 Если тип не `Nullable` и указан модификатор `NULL`, то столбец будет иметь тип `Nullable`; если `NOT NULL`, то не `Nullable`. Например, `INT NULL` то же, что и `Nullable(INT)`. Если тип `Nullable` и указаны модификаторы `NULL` или `NOT NULL`, то будет вызвано исключение.
 

From 7e71a5b1b0c68f8ededa72c51351440472ca8ad8 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Tue, 19 Jan 2021 18:25:08 +0300
Subject: [PATCH 184/611] Fix new lines

---
 src/Common/ZooKeeper/TestKeeperStorage.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Common/ZooKeeper/TestKeeperStorage.h b/src/Common/ZooKeeper/TestKeeperStorage.h
index 2196273b3ba..2df505d3e34 100644
--- a/src/Common/ZooKeeper/TestKeeperStorage.h
+++ b/src/Common/ZooKeeper/TestKeeperStorage.h
@@ -81,8 +81,6 @@ public:
     {
         return session_id_counter.fetch_add(1);
     }
-
-
 };
 
 }

From df56590e2189459faf16e5e529ab438e72e10830 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 19 Jan 2021 18:35:32 +0300
Subject: [PATCH 185/611] Update test.

---
 ..._explain_select_with_union_query.reference | 144 +++++++++---------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/tests/queries/0_stateless/01556_explain_select_with_union_query.reference b/tests/queries/0_stateless/01556_explain_select_with_union_query.reference
index e4aac5bda16..40c99db429d 100644
--- a/tests/queries/0_stateless/01556_explain_select_with_union_query.reference
+++ b/tests/queries/0_stateless/01556_explain_select_with_union_query.reference
@@ -1,252 +1,252 @@
 Union
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
 Union
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
 Distinct
   Union
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
 Distinct
   Union
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
 Distinct
   Union
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
 Distinct
   Union
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
 Union
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
   Distinct
     Union
-      Expression (Projection + Before ORDER BY)
+      Expression ((Projection + Before ORDER BY))
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
           ReadFromStorage (SystemOne)
-      Expression (Projection + Before ORDER BY)
+      Expression ((Projection + Before ORDER BY))
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
           ReadFromStorage (SystemOne)
-      Expression (Projection + Before ORDER BY)
+      Expression ((Projection + Before ORDER BY))
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
           ReadFromStorage (SystemOne)
   Distinct
     Union
-      Expression (Projection + Before ORDER BY)
+      Expression ((Projection + Before ORDER BY))
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
           ReadFromStorage (SystemOne)
-      Expression (Projection + Before ORDER BY)
+      Expression ((Projection + Before ORDER BY))
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
           ReadFromStorage (SystemOne)
-      Expression (Projection + Before ORDER BY)
+      Expression ((Projection + Before ORDER BY))
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
           ReadFromStorage (SystemOne)
-      Expression (Projection + Before ORDER BY)
+      Expression ((Projection + Before ORDER BY))
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
           ReadFromStorage (SystemOne)
-      Expression (Projection + Before ORDER BY)
+      Expression ((Projection + Before ORDER BY))
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
           ReadFromStorage (SystemOne)
-      Expression (Projection + Before ORDER BY)
+      Expression ((Projection + Before ORDER BY))
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
           ReadFromStorage (SystemOne)
 Distinct
   Union
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
 Distinct
   Union
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
 Distinct
   Union
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
 Union
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
 Union
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
 Union
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
 Distinct
   Union
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
 Distinct
   Union
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
 Distinct
   Union
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
-    Expression (Projection + Before ORDER BY)
+    Expression ((Projection + Before ORDER BY))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (SystemOne)
 Union
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
   Distinct
     Union
-      Expression (Projection + Before ORDER BY)
+      Expression ((Projection + Before ORDER BY))
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
           ReadFromStorage (SystemOne)
-      Expression (Projection + Before ORDER BY)
+      Expression ((Projection + Before ORDER BY))
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
           ReadFromStorage (SystemOne)
-      Expression (Projection + Before ORDER BY)
+      Expression ((Projection + Before ORDER BY))
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
           ReadFromStorage (SystemOne)
-      Expression (Projection + Before ORDER BY)
+      Expression ((Projection + Before ORDER BY))
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
           ReadFromStorage (SystemOne)
 Union
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
 Union
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
 Union
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)
-  Expression (Projection + Before ORDER BY)
+  Expression ((Projection + Before ORDER BY))
     SettingQuotaAndLimits (Set limits and quota after reading from storage)
       ReadFromStorage (SystemOne)

From 8cdfbd996bbb0c06e72f1c2aec9a20c179b2dd48 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Tue, 19 Jan 2021 18:51:52 +0300
Subject: [PATCH 186/611] Fix header

---
 src/Common/ZooKeeper/TestKeeperStorage.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Common/ZooKeeper/TestKeeperStorage.h b/src/Common/ZooKeeper/TestKeeperStorage.h
index 2df505d3e34..21b1ce16c32 100644
--- a/src/Common/ZooKeeper/TestKeeperStorage.h
+++ b/src/Common/ZooKeeper/TestKeeperStorage.h
@@ -6,7 +6,7 @@
 #include <Common/ZooKeeper/ZooKeeperCommon.h>
 #include <unordered_map>
 #include <unordered_set>
-#include <deque>
+#include <vector>
 
 namespace zkutil
 {

From 56f19e4790b235337611456cc44e4486df47e970 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Tue, 19 Jan 2021 18:52:28 +0300
Subject: [PATCH 187/611] Remove unused headers

---
 src/Server/TestKeeperTCPHandler.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Server/TestKeeperTCPHandler.h b/src/Server/TestKeeperTCPHandler.h
index e2de33a5156..2115f1cf11f 100644
--- a/src/Server/TestKeeperTCPHandler.h
+++ b/src/Server/TestKeeperTCPHandler.h
@@ -11,7 +11,6 @@
 #include <IO/WriteBufferFromPocoSocket.h>
 #include <IO/ReadBufferFromPocoSocket.h>
 #include <unordered_map>
-#include <future>
 
 namespace DB
 {

From 4b1a494a9171f97edc8a23f5129537131b7c6f00 Mon Sep 17 00:00:00 2001
From: feng lv <fenglv15@mails.ucas.ac.cn>
Date: Tue, 19 Jan 2021 15:59:49 +0000
Subject: [PATCH 188/611] move ctr from private to delete

---
 src/Interpreters/ExpressionActions.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Interpreters/ExpressionActions.h b/src/Interpreters/ExpressionActions.h
index cbd92eb57e3..af3ad6b683a 100644
--- a/src/Interpreters/ExpressionActions.h
+++ b/src/Interpreters/ExpressionActions.h
@@ -79,6 +79,7 @@ private:
     Block sample_block;
 
 public:
+    ExpressionActions() = delete;
     ~ExpressionActions();
     explicit ExpressionActions(ActionsDAGPtr actions_dag_);
     ExpressionActions(const ExpressionActions &) = default;
@@ -114,8 +115,6 @@ public:
     ExpressionActionsPtr clone() const;
 
 private:
-    ExpressionActions() = default;
-
     void checkLimits(const ColumnsWithTypeAndName & columns) const;
 
     void linearizeActions();

From 374cee47e040e977e67b255d1685186cd285ef19 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Tue, 19 Jan 2021 19:22:40 +0300
Subject: [PATCH 189/611] Fix typo

---
 src/Server/TestKeeperTCPHandler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Server/TestKeeperTCPHandler.cpp b/src/Server/TestKeeperTCPHandler.cpp
index b4192b6c9fb..8b9047c531c 100644
--- a/src/Server/TestKeeperTCPHandler.cpp
+++ b/src/Server/TestKeeperTCPHandler.cpp
@@ -326,7 +326,7 @@ void TestKeeperTCPHandler::runImpl()
                 {
                     if (response->xid == close_xid)
                     {
-                        LOG_DEBUG(log, "Session #{} successfuly closed", session_id);
+                        LOG_DEBUG(log, "Session #{} successfully closed", session_id);
                         return;
                     }
 

From 6ab17d5fd38de8e5967db4cb955a083e470be24d Mon Sep 17 00:00:00 2001
From: Zoran Pandovski <zoran.pandovski@gmail.com>
Date: Tue, 19 Jan 2021 17:40:21 +0100
Subject: [PATCH 190/611] Update gui.md

Add MindsDB to the GUI tools
---
 docs/en/interfaces/third-party/gui.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/en/interfaces/third-party/gui.md b/docs/en/interfaces/third-party/gui.md
index 3d1d2c337a3..e0afbbbd567 100644
--- a/docs/en/interfaces/third-party/gui.md
+++ b/docs/en/interfaces/third-party/gui.md
@@ -163,4 +163,8 @@ Features:
 
 [How to configure ClickHouse in Looker.](https://docs.looker.com/setup-and-management/database-config/clickhouse)
 
+### MindsDB Studio {#mindsdb}
+
+[MindsDB](https://mindsdb.com/) is an open-source AI layer for databases including ClickHouse that allows you to effortlessly develop, train and deploy state-of-the-art machine learning models. MindsDB Studio(GUI) allows you to train new models from database, interpret predictions made by the model, identify potential data biases, and evaluate and visualize model accuracy using the Explainable AI function to adapt and tune your Machine Learning models faster.
+
 [Original article](https://clickhouse.tech/docs/en/interfaces/third-party/gui/) <!--hide-->

From c455cd41a2b16e8d1f4de0c66acbdcb9c1f21d3d Mon Sep 17 00:00:00 2001
From: Zoran Pandovski <zoran.pandovski@gmail.com>
Date: Tue, 19 Jan 2021 17:42:11 +0100
Subject: [PATCH 191/611] Update gui.md

Move mindsdb to open source GUI
---
 docs/en/interfaces/third-party/gui.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/en/interfaces/third-party/gui.md b/docs/en/interfaces/third-party/gui.md
index e0afbbbd567..fa123d8b23d 100644
--- a/docs/en/interfaces/third-party/gui.md
+++ b/docs/en/interfaces/third-party/gui.md
@@ -107,6 +107,10 @@ Features:
 
 [xeus-clickhouse](https://github.com/wangfenjin/xeus-clickhouse) is a Jupyter kernal for ClickHouse, which supports query CH data using SQL in Jupyter.
 
+### MindsDB Studio {#mindsdb}
+
+[MindsDB](https://mindsdb.com/) is an open-source AI layer for databases including ClickHouse that allows you to effortlessly develop, train and deploy state-of-the-art machine learning models. MindsDB Studio(GUI) allows you to train new models from database, interpret predictions made by the model, identify potential data biases, and evaluate and visualize model accuracy using the Explainable AI function to adapt and tune your Machine Learning models faster.
+
 ## Commercial {#commercial}
 
 ### DataGrip {#datagrip}
@@ -163,8 +167,4 @@ Features:
 
 [How to configure ClickHouse in Looker.](https://docs.looker.com/setup-and-management/database-config/clickhouse)
 
-### MindsDB Studio {#mindsdb}
-
-[MindsDB](https://mindsdb.com/) is an open-source AI layer for databases including ClickHouse that allows you to effortlessly develop, train and deploy state-of-the-art machine learning models. MindsDB Studio(GUI) allows you to train new models from database, interpret predictions made by the model, identify potential data biases, and evaluate and visualize model accuracy using the Explainable AI function to adapt and tune your Machine Learning models faster.
-
 [Original article](https://clickhouse.tech/docs/en/interfaces/third-party/gui/) <!--hide-->

From 9d95b87615d28e064eef73696770c334f862dbf4 Mon Sep 17 00:00:00 2001
From: Zoran Pandovski <zoran.pandovski@gmail.com>
Date: Tue, 19 Jan 2021 17:43:25 +0100
Subject: [PATCH 192/611] Update integrations.md

Add MindsDB to new AutoML section in 3rd party integrations
---
 docs/en/interfaces/third-party/integrations.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/en/interfaces/third-party/integrations.md b/docs/en/interfaces/third-party/integrations.md
index 7588bef0230..f28a870e206 100644
--- a/docs/en/interfaces/third-party/integrations.md
+++ b/docs/en/interfaces/third-party/integrations.md
@@ -69,6 +69,9 @@ toc_title: Integrations
 -   Geo
     -   [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) - Predictive AI layer for ClickHouse database.
 
 ## Programming Language Ecosystems {#programming-language-ecosystems}
 

From a69d38649206cd328f894b81e572d48ee7257bec Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 19 Jan 2021 20:09:40 +0300
Subject: [PATCH 193/611] Fix tests.

---
 src/Processors/QueryPlan/QueryPlan.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Processors/QueryPlan/QueryPlan.cpp b/src/Processors/QueryPlan/QueryPlan.cpp
index d393dbb604f..9de4fc95aa6 100644
--- a/src/Processors/QueryPlan/QueryPlan.cpp
+++ b/src/Processors/QueryPlan/QueryPlan.cpp
@@ -588,7 +588,7 @@ static bool trySplitFilter(QueryPlan::Node * node, QueryPlan::Nodes & nodes)
     node->step = std::make_unique<ExpressionStep>(filter_node.step->getOutputStream(), std::move(split.second));
 
     filter_node.step->setStepDescription("(" + description + ")[split]");
-    node->step->setStepDescription(filter_step->getStepDescription());
+    node->step->setStepDescription(description);
 
     return true;
 }

From 5b7af74f84f14f3a45c1b09851a703767acd48e8 Mon Sep 17 00:00:00 2001
From: Dmitriy <sevirov@yandex-team.ru>
Date: Tue, 19 Jan 2021 20:10:23 +0300
Subject: [PATCH 194/611] Fix multiword types.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Внес небольшие поправки.
---
 docs/en/sql-reference/data-types/multiword-types.md | 2 +-
 docs/ru/sql-reference/data-types/multiword-types.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/sql-reference/data-types/multiword-types.md b/docs/en/sql-reference/data-types/multiword-types.md
index f55efcd7a51..5012fbb404e 100644
--- a/docs/en/sql-reference/data-types/multiword-types.md
+++ b/docs/en/sql-reference/data-types/multiword-types.md
@@ -5,7 +5,7 @@ toc_title: Multiword Type Names
 
 # Multiword Types {#multiword-types}
 
-When creating tables, you can also use data types with a name consisting of several words. This is necessary for better SQL compatibility.
+When creating tables, you can use data types with a name consisting of several words. This is implemented for better SQL compatibility.
 
 ## Multiword Types Support {#multiword-types-support}
 
diff --git a/docs/ru/sql-reference/data-types/multiword-types.md b/docs/ru/sql-reference/data-types/multiword-types.md
index 4c08ea8ee92..559755ef989 100644
--- a/docs/ru/sql-reference/data-types/multiword-types.md
+++ b/docs/ru/sql-reference/data-types/multiword-types.md
@@ -5,7 +5,7 @@ toc_title: Составные типы
 
 # Составные типы {#multiword-types}
 
-При создании таблиц вы также можете использовать типы данных с названием, состоящим из нескольких слов. Это необходимо для лучшей совместимости с SQL.
+При создании таблиц вы можете использовать типы данных с названием, состоящим из нескольких слов. Такие названия поддерживаются для лучшей совместимости с SQL.
 
 ## Поддержка составных типов {#multiword-types-support}
 

From 6fefc29f39b99e8035bec4982297c246ee744261 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Tue, 19 Jan 2021 20:25:28 +0300
Subject: [PATCH 195/611] comment

---
 programs/client/Client.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index cb8cdb81e43..27ecaa40061 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -669,6 +669,8 @@ private:
                 }
                 catch (const Exception & e)
                 {
+                    // We don't need to handle the test hints in the interactive
+                    // mode.
                     std::cerr << std::endl
                         << "Exception on client:" << std::endl
                         << "Code: " << e.code() << ". " << e.displayText() << std::endl;

From 9393e96e1b92fb051c9c616d12dbe559a569abd8 Mon Sep 17 00:00:00 2001
From: Dmitriy <sevirov@yandex-team.ru>
Date: Tue, 19 Jan 2021 20:41:47 +0300
Subject: [PATCH 196/611] Update materialize-mysql.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Внес правки в перевод.
---
 .../database-engines/materialize-mysql.md     | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/ru/engines/database-engines/materialize-mysql.md b/docs/ru/engines/database-engines/materialize-mysql.md
index e899f453b5f..77e6400ee69 100644
--- a/docs/ru/engines/database-engines/materialize-mysql.md
+++ b/docs/ru/engines/database-engines/materialize-mysql.md
@@ -25,8 +25,8 @@ ENGINE = MaterializeMySQL('host:port', ['database' | database], 'user', 'passwor
 
 ## Виртуальные столбцы {#virtual-columns}
 
-При работе с движком баз данных `MaterializeMySQL` таблицы семейства [ReplacingMergeTree](../../engines/table-engines/mergetree-family/replacingmergetree.md) используются с виртуальными столбцами `_sign` и `_version`.
- 
+При работе с движком баз данных `MaterializeMySQL` используются таблицы семейства [ReplacingMergeTree](../../engines/table-engines/mergetree-family/replacingmergetree.md) с виртуальными столбцами `_sign` и `_version`.
+
 - `_version` — счетчик транзакций. Тип [UInt64](../../sql-reference/data-types/int-uint.md).
 - `_sign` — метка удаления. Тип [Int8](../../sql-reference/data-types/int-uint.md). Возможные значения:
     - `1` — строка не удалена, 
@@ -51,7 +51,7 @@ ENGINE = MaterializeMySQL('host:port', ['database' | database], 'user', 'passwor
 | VARCHAR, VAR_STRING     | [String](../../sql-reference/data-types/string.md)           |
 | BLOB                    | [String](../../sql-reference/data-types/string.md)           |
 
-Другие типы не поддерживаются. Если таблица MySQL содержит столбец такого типа, ClickHouse выдаст исключение "необработанный тип данных" и остановит репликацию.
+Другие типы не поддерживаются. Если таблица MySQL содержит столбец другого типа, ClickHouse выдаст исключение "Неподдерживаемый тип данных" ("Unhandled data type") и остановит репликацию.
 
 Тип [Nullable](../../sql-reference/data-types/nullable.md) поддерживается.
 
@@ -59,38 +59,38 @@ ENGINE = MaterializeMySQL('host:port', ['database' | database], 'user', 'passwor
 
 ### DDL-запросы {#ddl-queries}
 
-DDL-запросы в MySQL конвертируются в соответствующие DDL-запросы в ClickHouse ([ALTER](../../sql-reference/statements/alter/index.md), [CREATE](../../sql-reference/statements/create/index.md), [DROP](../../sql-reference/statements/drop.md), [RENAME](../../sql-reference/statements/rename.md)). Если ClickHouse не может спарсить какой-либо DDL-запрос, то он игнорируется.
+DDL-запросы в MySQL конвертируются в соответствующие DDL-запросы в ClickHouse ([ALTER](../../sql-reference/statements/alter/index.md), [CREATE](../../sql-reference/statements/create/index.md), [DROP](../../sql-reference/statements/drop.md), [RENAME](../../sql-reference/statements/rename.md)). Если ClickHouse не может конвертировать какой-либо DDL-запрос, он его игнорирует.
 
 ### Репликация данных {#data-replication}
 
 Движок MaterializeMySQL не поддерживает прямые запросы `INSERT`, `DELETE` и `UPDATE`. Однако они поддерживаются с точки зрения репликации данных:
 
-- Запрос `INSERT` в MySQL конвертируется в `INSERT` с `_sign=1`.
+- Запрос `INSERT` из MySQL конвертируется в ClickHouse в `INSERT` с `_sign=1`.
 
-- Запрос `DELETE` в MySQL конвертируется в `INSERT` с `_sign=-1`.
+- Запрос `DELETE` из MySQL конвертируется в ClickHouse в `INSERT` с `_sign=-1`.
 
-- Запрос `UPDATE` в MySQL конвертируется в `INSERT` с `_sign=-1` и `INSERT` с `_sign=1`.
+- Запрос `UPDATE` из MySQL конвертируется в ClickHouse в `INSERT` с `_sign=-1` и `INSERT` с `_sign=1`.
 
 ### Выборка из таблиц движка MaterializeMySQL {#select}
 
 Запрос `SELECT` из таблиц движка MaterializeMySQL имеет некоторую специфику:
 
-- Если `_version` не указан в запросе `SELECT`, то используется модификатор [FINAL](../../sql-reference/statements/select/from.md#select-from-final). Таким образом, выбираются только строки с `MAX(_version)`.
+- Если в запросе `SELECT` напрямую не указан столбец `_version`, то используется модификатор [FINAL](../../sql-reference/statements/select/from.md#select-from-final). Таким образом, выбираются только строки с `MAX(_version)`.
 
-- Если `_sign` не указан в запросе `SELECT`, то по умолчанию используется `WHERE _sign=1`. Таким образом, удаленные строки не включаются в результирующий набор. 
+- Если в запросе `SELECT` напрямую не указан столбец `_sign`, то по умолчанию используется `WHERE _sign=1`. Таким образом, удаленные строки не включаются в результирующий набор. 
 
-### Индекс конверсии {#index-conversion}
+### Конвертация индексов {#index-conversion}
 
 Секции `PRIMARY KEY` и `INDEX` в MySQL конвертируются в кортежи `ORDER BY` в таблицах ClickHouse.
 
-ClickHouse имеет только один физический порядок, который определяется секцией `ORDER BY`. Чтобы создать новый физический порядок, используйте [материализованные представления](../../sql-reference/statements/create/view.md#materialized).
+В таблицах ClickHouse данные физически хранятся в том порядке, который определяется секцией `ORDER BY`. Чтобы физически перегруппировать данные, используйте [материализованные представления](../../sql-reference/statements/create/view.md#materialized).
 
 **Примечание**
 
 - Строки с `_sign=-1` физически не удаляются из таблиц.
 - Каскадные запросы `UPDATE/DELETE` не поддерживаются движком `MaterializeMySQL`.
 - Репликация может быть легко нарушена.
-- Операции вручную с базами данных и таблицами запрещены.
+- Прямые операции изменения данных в таблицах и базах данных `MaterializeMySQL` запрещены.
 
 ## Примеры использования {#examples-of-use}
 

From 29dab7cba16af14ebdc89e6eb6a1f7f442d2efdb Mon Sep 17 00:00:00 2001
From: Anna <42538400+adevyatova@users.noreply.github.com>
Date: Tue, 19 Jan 2021 20:45:56 +0300
Subject: [PATCH 197/611] Update show.md

Fix syntax
---
 docs/en/sql-reference/statements/show.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/statements/show.md b/docs/en/sql-reference/statements/show.md
index 0e390c3822c..83c4caa3f08 100644
--- a/docs/en/sql-reference/statements/show.md
+++ b/docs/en/sql-reference/statements/show.md
@@ -358,7 +358,8 @@ Returns a list of clusters. All available clusters are listed in the [system.clu
 ### Syntax {#show-cluster-syntax}
 
 ``` sql
-SHOW (CLUSTER '<name>') | (CLUSTERS [LIKE|NOT LIKE '<pattern>'] [LIMIT <N>]);
+SHOW CLUSTER '<name>'
+SWOW CLUSTERS [LIKE|NOT LIKE '<pattern>'] [LIMIT <N>]
 ```
 ### Examples 
 

From 20dd97b4b446392fc00578393b5bb42b8adf8b8e Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <36882414+akuzm@users.noreply.github.com>
Date: Tue, 19 Jan 2021 21:02:31 +0300
Subject: [PATCH 198/611] Update run-fuzzer.sh

---
 docker/test/fuzzer/run-fuzzer.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index fe77aa56057..6d59bc282d9 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -175,7 +175,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.*" server.log > description.txt
+        if ! grep -ao "Received signal.*\|Logical error.*\|Assertion.*failed\|Failed assertion.*\|.*runtime error: .*" server.log > description.txt
         then
             echo "Lost connection to server. See the logs" > description.txt
         fi

From a803ca2bc5dd55013f4bf2ebfce8fa3535ae74b9 Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Tue, 19 Jan 2021 21:59:01 +0300
Subject: [PATCH 199/611] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11484b556a7..b328dcf5c88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@
 * Prohibit toUnixTimestamp(Date()) (before it just returns UInt16 representation of Date). [#17376](https://github.com/ClickHouse/ClickHouse/pull/17376) ([Azat Khuzhin](https://github.com/azat)).
 * Allow using extended integer types (`Int128`, `Int256`, `UInt256`) in `avg` and `avgWeighted` functions. Also allow using different types (integer, decimal, floating point) for value and for weight in `avgWeighted` function. This is a backward-incompatible change: now the `avg` and `avgWeighted` functions always return `Float64` (as documented). Before this change the return type for `Decimal` arguments was also `Decimal`. [#15419](https://github.com/ClickHouse/ClickHouse/pull/15419) ([Mike](https://github.com/myrrc)).
 * Expression `toUUID(N)` no longer works. Replace with `toUUID('00000000-0000-0000-0000-000000000000')`. This change is motivated by non-obvious results of `toUUID(N)` where N is non zero.
-* SSL Certificates with incorrect "key usage" are rejected. In previous versions they are used to work.
+* SSL Certificates with incorrect "key usage" are rejected. In previous versions they are used to work. See [#19262](https://github.com/ClickHouse/ClickHouse/issues/19262).
 
 #### New Feature
 

From e4350e078ce1754597b5ace38d05ed5cf4e74b70 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Wed, 20 Jan 2021 00:42:31 +0300
Subject: [PATCH 200/611] Add ability to distinguish remote exceptions from
 local

---
 src/Client/Connection.cpp | 5 ++++-
 src/Common/Exception.cpp  | 3 ++-
 src/Common/Exception.h    | 7 ++++++-
 src/IO/ReadHelpers.cpp    | 4 ++--
 src/IO/ReadHelpers.h      | 2 +-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/Client/Connection.cpp b/src/Client/Connection.cpp
index ef114490c51..084f169bb9f 100644
--- a/src/Client/Connection.cpp
+++ b/src/Client/Connection.cpp
@@ -803,6 +803,9 @@ Packet Connection::receivePacket(std::function<void(Poco::Net::Socket &)> async_
     }
     catch (Exception & e)
     {
+        /// This is to consider ATTEMPT_TO_READ_AFTER_EOF as a remote exception.
+        e.setRemoteException();
+
         /// Add server address to exception message, if need.
         if (e.code() != ErrorCodes::UNKNOWN_PACKET_FROM_SERVER)
             e.addMessage("while receiving packet from " + getDescription());
@@ -892,7 +895,7 @@ void Connection::setDescription()
 
 std::unique_ptr<Exception> Connection::receiveException()
 {
-    return std::make_unique<Exception>(readException(*in, "Received from " + getDescription()));
+    return std::make_unique<Exception>(readException(*in, "Received from " + getDescription(), true /* remote */));
 }
 
 
diff --git a/src/Common/Exception.cpp b/src/Common/Exception.cpp
index b782471a4e8..231b45a49c6 100644
--- a/src/Common/Exception.cpp
+++ b/src/Common/Exception.cpp
@@ -50,8 +50,9 @@ void handle_error_code([[maybe_unused]] const std::string & msg, int code)
     ErrorCodes::increment(code);
 }
 
-Exception::Exception(const std::string & msg, int code)
+Exception::Exception(const std::string & msg, int code, bool remote_)
     : Poco::Exception(msg, code)
+    , remote(remote_)
 {
     handle_error_code(msg, code);
 }
diff --git a/src/Common/Exception.h b/src/Common/Exception.h
index a6190c7ca24..661d31469fe 100644
--- a/src/Common/Exception.h
+++ b/src/Common/Exception.h
@@ -25,7 +25,7 @@ class Exception : public Poco::Exception
 {
 public:
     Exception() = default;
-    Exception(const std::string & msg, int code);
+    Exception(const std::string & msg, int code, bool remote_ = false);
     Exception(const std::string & msg, const Exception & nested, int code);
 
     Exception(int code, const std::string & message)
@@ -61,12 +61,17 @@ public:
         extendedMessage(message);
     }
 
+    /// Used to distinguish local exceptions from the one that was received from remote node.
+    void setRemoteException(bool remote_ = true) { remote = remote_; }
+    bool isRemoteException() const { return remote; }
+
     std::string getStackTraceString() const;
 
 private:
 #ifndef STD_EXCEPTION_HAS_STACK_TRACE
     StackTrace trace;
 #endif
+    bool remote = false;
 
     const char * className() const throw() override { return "DB::Exception"; }
 };
diff --git a/src/IO/ReadHelpers.cpp b/src/IO/ReadHelpers.cpp
index 9cd8747da64..76a722a8ad1 100644
--- a/src/IO/ReadHelpers.cpp
+++ b/src/IO/ReadHelpers.cpp
@@ -1014,7 +1014,7 @@ void skipJSONField(ReadBuffer & buf, const StringRef & name_of_field)
 }
 
 
-Exception readException(ReadBuffer & buf, const String & additional_message)
+Exception readException(ReadBuffer & buf, const String & additional_message, bool remote_exception)
 {
     int code = 0;
     String name;
@@ -1041,7 +1041,7 @@ Exception readException(ReadBuffer & buf, const String & additional_message)
     if (!stack_trace.empty())
         out << " Stack trace:\n\n" << stack_trace;
 
-    return Exception(out.str(), code);
+    return Exception(out.str(), code, remote_exception);
 }
 
 void readAndThrowException(ReadBuffer & buf, const String & additional_message)
diff --git a/src/IO/ReadHelpers.h b/src/IO/ReadHelpers.h
index 56c795324e3..de4e87440a2 100644
--- a/src/IO/ReadHelpers.h
+++ b/src/IO/ReadHelpers.h
@@ -1073,7 +1073,7 @@ void skipJSONField(ReadBuffer & buf, const StringRef & name_of_field);
   * (type is cut to base class, 'message' replaced by 'displayText', and stack trace is appended to 'message')
   * Some additional message could be appended to exception (example: you could add information about from where it was received).
   */
-Exception readException(ReadBuffer & buf, const String & additional_message = "");
+Exception readException(ReadBuffer & buf, const String & additional_message = "", bool remote_exception = false);
 void readAndThrowException(ReadBuffer & buf, const String & additional_message = "");
 
 

From 8a0081639612b2d2221991976615b8cbf882f551 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Tue, 19 Jan 2021 22:22:58 +0300
Subject: [PATCH 201/611] Do not mark file for distributed send as broken on
 EOF

- the sender will got ATTEMPT_TO_READ_AFTER_EOF (added in
  946c275dfbe901cfec87deecc845f72215350b9d) when the client just go
  away, i.e. server had been restarted, and this is incorrect to mark the
  file as broken in this case.

- since #18853 the file will be checked on the sender locally, and
  in case the file was truncated CANNOT_READ_ALL_DATA will be thrown.
  But before #18853 the sender will not receive
  ATTEMPT_TO_READ_AFTER_EOF from the client in case of file was truncated
  on the sender, since the client will just wait for more data, IOW just hang.

- and I don't see how ATTEMPT_TO_READ_AFTER_EOF can be received while
  reading local file.
---
 src/Storages/Distributed/DirectoryMonitor.cpp | 35 ++++++++++++-------
 src/Storages/Distributed/DirectoryMonitor.h   |  1 -
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/Storages/Distributed/DirectoryMonitor.cpp b/src/Storages/Distributed/DirectoryMonitor.cpp
index 2a29f2559b6..1b0b78ba0d9 100644
--- a/src/Storages/Distributed/DirectoryMonitor.cpp
+++ b/src/Storages/Distributed/DirectoryMonitor.cpp
@@ -155,6 +155,27 @@ namespace
 
         return header;
     }
+
+    /// remote_error argument is used to decide whether some errors should be
+    /// ignored or not, in particular:
+    ///
+    /// - ATTEMPT_TO_READ_AFTER_EOF should not be ignored
+    ///   if we receive it from remote (receiver), since:
+    ///   - the sender will got ATTEMPT_TO_READ_AFTER_EOF when the client just go away,
+    ///     i.e. server had been restarted
+    ///   - since #18853 the file will be checked on the sender locally, and
+    ///     if there is something wrong with the file itself, we will receive
+    ///     ATTEMPT_TO_READ_AFTER_EOF not from the remote at first
+    ///     and mark batch as broken.
+    bool isFileBrokenErrorCode(int code, bool remote_error)
+    {
+        return code == ErrorCodes::CHECKSUM_DOESNT_MATCH
+            || code == ErrorCodes::TOO_LARGE_SIZE_COMPRESSED
+            || code == ErrorCodes::CANNOT_READ_ALL_DATA
+            || code == ErrorCodes::UNKNOWN_CODEC
+            || code == ErrorCodes::CANNOT_DECOMPRESS
+            || (!remote_error && code == ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF);
+    }
 }
 
 
@@ -571,7 +592,7 @@ struct StorageDistributedDirectoryMonitor::Batch
         }
         catch (const Exception & e)
         {
-            if (isFileBrokenErrorCode(e.code()))
+            if (isFileBrokenErrorCode(e.code(), e.isRemoteException()))
             {
                 tryLogCurrentException(parent.log, "Failed to send batch due to");
                 batch_broken = true;
@@ -801,16 +822,6 @@ void StorageDistributedDirectoryMonitor::processFilesWithBatching(const std::map
     }
 }
 
-bool StorageDistributedDirectoryMonitor::isFileBrokenErrorCode(int code)
-{
-    return code == ErrorCodes::CHECKSUM_DOESNT_MATCH
-        || code == ErrorCodes::TOO_LARGE_SIZE_COMPRESSED
-        || code == ErrorCodes::CANNOT_READ_ALL_DATA
-        || code == ErrorCodes::UNKNOWN_CODEC
-        || code == ErrorCodes::CANNOT_DECOMPRESS
-        || code == ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF;
-}
-
 void StorageDistributedDirectoryMonitor::markAsBroken(const std::string & file_path) const
 {
     const auto last_path_separator_pos = file_path.rfind('/');
@@ -837,7 +848,7 @@ void StorageDistributedDirectoryMonitor::markAsBroken(const std::string & file_p
 bool StorageDistributedDirectoryMonitor::maybeMarkAsBroken(const std::string & file_path, const Exception & e) const
 {
     /// mark file as broken if necessary
-    if (isFileBrokenErrorCode(e.code()))
+    if (isFileBrokenErrorCode(e.code(), e.isRemoteException()))
     {
         markAsBroken(file_path);
         return true;
diff --git a/src/Storages/Distributed/DirectoryMonitor.h b/src/Storages/Distributed/DirectoryMonitor.h
index bc897136786..c73b79761ca 100644
--- a/src/Storages/Distributed/DirectoryMonitor.h
+++ b/src/Storages/Distributed/DirectoryMonitor.h
@@ -70,7 +70,6 @@ private:
     void processFile(const std::string & file_path);
     void processFilesWithBatching(const std::map<UInt64, std::string> & files);
 
-    static bool isFileBrokenErrorCode(int code);
     void markAsBroken(const std::string & file_path) const;
     bool maybeMarkAsBroken(const std::string & file_path, const Exception & e) const;
 

From de0e106fd7d379aa7aae2d9c7674041aceec4c62 Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Wed, 20 Jan 2021 01:22:00 +0300
Subject: [PATCH 202/611] Update 2020.md

---
 docs/en/whats-new/changelog/2020.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/en/whats-new/changelog/2020.md b/docs/en/whats-new/changelog/2020.md
index 2ec48bcd584..5975edd3c6c 100644
--- a/docs/en/whats-new/changelog/2020.md
+++ b/docs/en/whats-new/changelog/2020.md
@@ -1,3 +1,8 @@
+---
+toc_priority: 76
+toc_title: '2020'
+---
+
 ### ClickHouse release 20.12
 
 ### ClickHouse release v20.12.4.5-stable, 2020-12-24

From 701b078866be7ae3f08e4c5b5ea2157017466d3a Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Wed, 20 Jan 2021 01:39:12 +0300
Subject: [PATCH 203/611] First draft

---
 docs/en/sql-reference/table-functions/file.md | 32 ++++++--
 .../sql-reference/table-functions/remote.md   | 74 ++++++++++++-------
 docs/en/sql-reference/table-functions/url.md  | 42 ++++++++---
 3 files changed, 106 insertions(+), 42 deletions(-)

diff --git a/docs/en/sql-reference/table-functions/file.md b/docs/en/sql-reference/table-functions/file.md
index beab691ad0e..2ba55c1aa90 100644
--- a/docs/en/sql-reference/table-functions/file.md
+++ b/docs/en/sql-reference/table-functions/file.md
@@ -5,7 +5,11 @@ 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.
+
+**Syntax**
 
 ``` sql
 file(path, format, structure)
@@ -21,7 +25,7 @@ file(path, format, structure)
 
 A table with the specified structure for reading or writing data in the specified file.
 
-**Example**
+**Examples**
 
 Setting `user_files_path` and the contents of the file `test.csv`:
 
@@ -39,8 +43,8 @@ Table from`test.csv` and selection of the first two rows from it:
 
 ``` sql
 SELECT *
-FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32')
-LIMIT 2
+FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32');
+LIMIT 2;
 ```
 
 ``` text
@@ -52,9 +56,25 @@ LIMIT 2
 
 ``` 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;
 ```
 
+Inserting data from a file into a table:
+
+``` sql
+CREATE TABLE file_engine_table (column1 UInt32, column2 UInt32, column3 UInt32) ENGINE=File(CSV);
+INSERT INTO file_engine_table FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32');
+SELECT * FROM file_engine_table;
+```
+
+``` text
+┌─column1─┬─column2─┬─column3─┐
+│       1 │       2 │       3 │
+│       3 │       2 │       1 │
+└─────────┴─────────┴─────────┘
+```
+
+
 **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).
@@ -116,4 +136,4 @@ FROM file('big_dir/file{0..9}{0..9}{0..9}', 'CSV', 'name String, value UInt32')
 
 -   [Virtual columns](https://clickhouse.tech/docs/en/operations/table_engines/#table_engines-virtual_columns)
 
-[Original article](https://clickhouse.tech/docs/en/query_language/table_functions/file/) <!--hide-->
+[Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/file/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/remote.md b/docs/en/sql-reference/table-functions/remote.md
index 71b1006fc5d..ef74cf8ca7a 100644
--- a/docs/en/sql-reference/table-functions/remote.md
+++ b/docs/en/sql-reference/table-functions/remote.md
@@ -5,9 +5,11 @@ toc_title: remote
 
 # remote, remoteSecure {#remote-remotesecure}
 
-Allows you to access remote servers without creating a `Distributed` table.
+Allows to access remote servers without creating a [Distributed](../../engines/table-engines/special/distributed.md) table. `remoteSecure` - same as `remote` but with secured connection. 
 
-Signatures:
+Both functions can be used in `SELECT` and `INSERT` queries.
+
+**Syntax**
 
 ``` sql
 remote('addresses_expr', db, table[, 'user'[, 'password'], sharding_key])
@@ -16,13 +18,39 @@ remoteSecure('addresses_expr', db, table[, 'user'[, 'password'], sharding_key])
 remoteSecure('addresses_expr', db.table[, 'user'[, 'password'], sharding_key])
 ```
 
-`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` from the server’s config file (by default, 9000).
-`sharding_key` - We can specify 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())`.
+**Input parameters**
 
-!!! important "Important"
-    The port is required for an IPv6 address.
+- `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). 
 
-Examples:
+   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).
+
+**Returned value**
+
+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.
+
+The `remote` table function can be useful in the following cases:
+
+-   Accessing a specific server for data comparison, debugging, and testing.
+-   Queries between various ClickHouse clusters for research purposes.
+-   Infrequent distributed requests that are made manually.
+-   Distributed requests where the set of servers is re-defined each time.
+
+**Adresses**
 
 ``` text
 example01-01-1
@@ -33,9 +61,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 to shards with different data). Example:
 
 ``` text
 example01-01-1,example01-02-1
@@ -55,30 +81,28 @@ 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.
-
-Example:
+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:
 
 ``` text
 example01-{01..02}-{1|2}
 ```
 
-This example specifies two shards that each have two replicas.
-
 The number of addresses generated is limited by a constant. Right now this is 1000 addresses.
 
-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.
+**Examples**
 
-The `remote` table function can be useful in the following cases:
+Selecting data from a remote server:
 
--   Accessing a specific server for data comparison, debugging, and testing.
--   Queries between various ClickHouse clusters for research purposes.
--   Infrequent distributed requests that are made manually.
--   Distributed requests where the set of servers is re-defined each time.
+``` sql
+SELECT * FROM remote('127.0.0.1', db.remote_engine_table) LIMIT 3;
+```
 
-If the user is not specified, `default` is used.
-If the password is not specified, an empty password is used.
+Inserting data from a remote server into a table:
 
-`remoteSecure` - same as `remote` but with secured connection. Default port — [tcp_port_secure](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port_secure) from config or 9440.
+``` sql
+CREATE TABLE remote_engine_table (name String, value UInt32) ENGINE=Distributed(cluster, default, hits);
+INSERT INTO remote_engine_table FROM remote('127.0.0.1', db.remote_engine_table);
+SELECT * FROM remote_engine_table;
+```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/table_functions/remote/) <!--hide-->
+[Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/remote/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/url.md b/docs/en/sql-reference/table-functions/url.md
index ea649e01994..0b091224cf4 100644
--- a/docs/en/sql-reference/table-functions/url.md
+++ b/docs/en/sql-reference/table-functions/url.md
@@ -5,20 +5,40 @@ toc_title: url
 
 # url {#url}
 
-`url(URL, format, structure)` - returns a table created from the `URL` with given
-`format` and `structure`.
+`url` function creates a table from the `URL` with given `format` and `structure`.
 
-URL - HTTP or HTTPS server address, which can accept `GET` and/or `POST` requests.
+`url` function can be used in `SELECT` and `INSERT` queries on data in [URL](../../engines/table-engines/special/url.md) tables.
 
-format - [format](../../interfaces/formats.md#formats) of the data.
-
-structure - table structure in `'UserID UInt64, Name String'` format. Determines column names and types.
-
-**Example**
+**Syntax**
 
 ``` 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
+url(URL, format, structure)
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/table_functions/url/) <!--hide-->
+**Input parameters**
+
+- `URL` - HTTP or HTTPS server address, which can accept `GET` and/or `POST` 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).
+
+**Returned value**
+
+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.
+
+``` 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:
+
+``` sql
+CREATE TABLE url_engine_table (column1 String, column2 UInt32) ENGINE=URL('http://127.0.0.1:12345/', CSV);
+INSERT INTO url_engine_table FROM url('http://127.0.0.1:12345/', 'CSV', 'column1 String, column2 UInt32');
+SELECT * FROM url_engine_table;
+```
+
+[Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/url/) <!--hide-->

From 2a511b169bb64f340e7e6770a656d96051d9ede5 Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Wed, 20 Jan 2021 02:02:46 +0300
Subject: [PATCH 204/611] Fixes

---
 docs/en/sql-reference/table-functions/file.md | 41 ++++++++-----------
 .../sql-reference/table-functions/remote.md   |  9 ++--
 docs/en/sql-reference/table-functions/url.md  |  2 +-
 3 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/docs/en/sql-reference/table-functions/file.md b/docs/en/sql-reference/table-functions/file.md
index 2ba55c1aa90..2dd12a8b44b 100644
--- a/docs/en/sql-reference/table-functions/file.md
+++ b/docs/en/sql-reference/table-functions/file.md
@@ -17,9 +17,9 @@ file(path, format, structure)
 
 **Input 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 readonly 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, ...'`.
+-   `structure` — Structure of the table. Format: `'column1_name column1_type, column2_name column2_type, ...'`.
 
 **Returned value**
 
@@ -39,7 +39,7 @@ $ cat /var/lib/clickhouse/user_files/test.csv
     78,43,45
 ```
 
-Table from`test.csv` and selection of the first two rows from it:
+Table from `test.csv` and selection of the first two rows from it:
 
 ``` sql
 SELECT *
@@ -53,9 +53,9 @@ LIMIT 2;
 │       3 │       2 │       1 │
 └─────────┴─────────┴─────────┘
 ```
+Getting the first 10 lines of a table that contains 3 columns of UInt32 type from a CSV file:
 
 ``` 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;
 ```
 
@@ -75,7 +75,7 @@ SELECT * FROM file_engine_table;
 ```
 
 
-**Globs in path**
+## 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).
 
@@ -88,31 +88,25 @@ Constructions with `{}` are similar to the [remote table function](../../sql-ref
 
 **Example**
 
-1.  Suppose we have several files with the following relative paths:
+Suppose we have several files with the following relative paths:
 
--   ‘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.  Query the amount of rows in these files:
-
-<!-- -->
+Query the amount of rows in these files:
 
 ``` 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.  Query the amount of rows in all files of these two directories:
-
-<!-- -->
+Query the amount of rows in all files of these two directories:
 
 ``` 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"
@@ -123,8 +117,7 @@ FROM file('{some,another}_dir/*', 'TSV', 'name String, value UInt32')
 Query the data from files named `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');
 ```
 
 ## Virtual Columns {#virtual-columns}
diff --git a/docs/en/sql-reference/table-functions/remote.md b/docs/en/sql-reference/table-functions/remote.md
index ef74cf8ca7a..5dc915a8522 100644
--- a/docs/en/sql-reference/table-functions/remote.md
+++ b/docs/en/sql-reference/table-functions/remote.md
@@ -22,13 +22,14 @@ remoteSecure('addresses_expr', db.table[, 'user'[, 'password'], sharding_key])
 
 - `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 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.
+    The port is required for an IPv6 address.
+
+    Type: [String](../../sql-reference/data-types/string.md).
 
-   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).
diff --git a/docs/en/sql-reference/table-functions/url.md b/docs/en/sql-reference/table-functions/url.md
index 0b091224cf4..1ef878f1074 100644
--- a/docs/en/sql-reference/table-functions/url.md
+++ b/docs/en/sql-reference/table-functions/url.md
@@ -7,7 +7,7 @@ toc_title: url
 
 `url` function creates a table from the `URL` with given `format` and `structure`.
 
-`url` function can be used in `SELECT` and `INSERT` queries on data in [URL](../../engines/table-engines/special/url.md) tables.
+`url` function may be used in `SELECT` and `INSERT` queries on data in [URL](../../engines/table-engines/special/url.md) tables.
 
 **Syntax**
 

From ea0052aba56bf7c279fbe0bf755bff79e4624dad Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Wed, 20 Jan 2021 03:02:58 +0300
Subject: [PATCH 205/611] Fix error in fuzzer

---
 docker/test/fuzzer/run-fuzzer.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index 6d59bc282d9..4c16db74ad2 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -75,7 +75,7 @@ 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 master | grep -P 'tests/queries/0_stateless/.*\.sql' | sed -r -e 's!^!ch/!' | sort -R)
+    NEW_TESTS=$(git diff --name-only master "$SHA_TO_TEST" | grep -P 'tests/queries/0_stateless/.*\.sql' | sed -r -e 's!^!ch/!' | sort -R)
     cd ..
     if [[ -n "$NEW_TESTS" ]]
     then

From f8049fca180328a2c414dc9c93e15b5a3261f773 Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Wed, 20 Jan 2021 03:17:20 +0300
Subject: [PATCH 206/611] Update ansi.md

---
 docs/en/sql-reference/ansi.md | 53 ++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/docs/en/sql-reference/ansi.md b/docs/en/sql-reference/ansi.md
index fc759f9f79a..0b193270918 100644
--- a/docs/en/sql-reference/ansi.md
+++ b/docs/en/sql-reference/ansi.md
@@ -25,22 +25,22 @@ The following table lists cases when query feature works in ClickHouse, but beha
 |------------|--------------------------------------------------------------------------------------------------------------------------|----------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **E011**   | **Numeric data types**                                                                                                   | **Partial**{.text-warning} |                                                                                                                                                                                           |
 | E011-01    | INTEGER and SMALLINT data types                                                                                          | Yes {.text-success}         |                                                                                                                                                                                           |
-| E011-02    | REAL, DOUBLE PRECISION and FLOAT data types data types                                                                   | Partial {.text-warning}     | `FLOAT(<binary_precision>)`, `REAL` and `DOUBLE PRECISION` are not supported                                                                                                              |
-| E011-03    | DECIMAL and NUMERIC data types                                                                                           | Partial {.text-warning}     | Only `DECIMAL(p,s)` is supported, not `NUMERIC`                                                                                                                                           |
+| E011-02    | REAL, DOUBLE PRECISION and FLOAT data types data types                                                                   | Yes {.text-success}     |                                                                                                               |
+| E011-03    | DECIMAL and NUMERIC data types                                                                                           | Yes {.text-success}     |                                                                                                                                          |
 | E011-04    | Arithmetic operators                                                                                                     | Yes {.text-success}         |                                                                                                                                                                                           |
 | E011-05    | Numeric comparison                                                                                                       | Yes {.text-success}         |                                                                                                                                                                                           |
 | E011-06    | Implicit casting among the numeric data types                                                                            | No {.text-danger}           | ANSI SQL allows arbitrary implicit cast between numeric types, while ClickHouse relies on functions having multiple overloads instead of implicit cast                                    |
 | **E021**   | **Character string types**                                                                                               | **Partial**{.text-warning} |                                                                                                                                                                                           |
-| E021-01    | CHARACTER data type                                                                                                      | No {.text-danger}           |                                                                                                                                                                                           |
-| E021-02    | CHARACTER VARYING data type                                                                                              | No {.text-danger}           | `String` behaves similarly, but without length limit in parentheses                                                                                                                       |
-| E021-03    | Character literals                                                                                                       | Partial {.text-warning}     | No automatic concatenation of consecutive literals and character set support                                                                                                              |
+| E021-01    | CHARACTER data type                                                                                                      | Yes {.text-success}           |                                                                                                                                                                                           |
+| E021-02    | CHARACTER VARYING data type                                                                                              | Yes {.text-success}           |                                                                                                                       |
+| E021-03    | Character literals                                                                                                       | Yes {.text-success}     |                                                                                                               |
 | E021-04    | CHARACTER_LENGTH function                                                                                               | Partial {.text-warning}     | No `USING` clause                                                                                                                                                                         |
 | E021-05    | OCTET_LENGTH function                                                                                                   | No {.text-danger}           | `LENGTH` behaves similarly                                                                                                                                                                |
 | E021-06    | SUBSTRING                                                                                                                | Partial {.text-warning}     | No support for `SIMILAR` and `ESCAPE` clauses, no `SUBSTRING_REGEX` variant                                                                                                               |
 | E021-07    | Character concatenation                                                                                                  | Partial {.text-warning}     | No `COLLATE` clause                                                                                                                                                                       |
 | E021-08    | UPPER and LOWER functions                                                                                                | Yes {.text-success}         |                                                                                                                                                                                           |
 | E021-09    | TRIM function                                                                                                            | Yes {.text-success}         |                                                                                                                                                                                           |
-| E021-10    | Implicit casting among the fixed-length and variable-length character string types                                       | No {.text-danger}           | ANSI SQL allows arbitrary implicit cast between string types, while ClickHouse relies on functions having multiple overloads instead of implicit cast                                     |
+| E021-10    | Implicit casting among the fixed-length and variable-length character string types                                       | Partial           | ANSI SQL allows arbitrary implicit cast between string types, while ClickHouse relies on functions having multiple overloads instead of implicit cast                                     |
 | E021-11    | POSITION function                                                                                                        | Partial {.text-warning}     | No support for `IN` and `USING` clauses, no `POSITION_REGEX` variant                                                                                                                      |
 | E021-12    | Character comparison                                                                                                     | Yes {.text-success}         |                                                                                                                                                                                           |
 | **E031**   | **Identifiers**                                                                                                          | **Partial**{.text-warning} |                                                                                                                                                                                           |
@@ -71,20 +71,20 @@ The following table lists cases when query feature works in ClickHouse, but beha
 | E061-13    | Correlated subqueries                                                                                                    | No {.text-danger}           |                                                                                                                                                                                           |
 | E061-14    | Search condition                                                                                                         | Yes {.text-success}         |                                                                                                                                                                                           |
 | **E071**   | **Basic query expressions**                                                                                              | **Partial**{.text-warning} |                                                                                                                                                                                           |
-| E071-01    | UNION DISTINCT table operator                                                                                            | No {.text-danger}           |                                                                                                                                                                                           |
+| E071-01    | UNION DISTINCT table operator                                                                                            | Yes {.text-success}           |                                                                                                                                                                                           |
 | E071-02    | UNION ALL table operator                                                                                                 | Yes {.text-success}         |                                                                                                                                                                                           |
 | E071-03    | EXCEPT DISTINCT table operator                                                                                           | No {.text-danger}           |                                                                                                                                                                                           |
 | E071-05    | Columns combined via table operators need not have exactly the same data type                                            | Yes {.text-success}         |                                                                                                                                                                                           |
 | E071-06    | Table operators in subqueries                                                                                            | Yes {.text-success}         |                                                                                                                                                                                           |
-| **E081**   | **Basic privileges**                                                                                                     | **Partial**{.text-warning} | Work in progress                                                                                                                                                                          |
-| E081-01    | SELECT privilege at the table level | | |
+| **E081**   | **Basic privileges**                                                                                                     | **Yes**{.text-success} |                        |
+| E081-01    | SELECT privilege at the table level | Yes {.text-success} | |
 | E081-02    | DELETE privilege | | |
-| E081-03    | INSERT privilege at the table level | | |
-| E081-04    | UPDATE privilege at the table level | | |
+| E081-03    | INSERT privilege at the table level | Yes {.text-success} | |
+| E081-04    | UPDATE privilege at the table level | Yes {.text-success} | |
 | E081-05    | UPDATE privilege at the column level | | |
 | E081-06    | REFERENCES privilege at the table level | | |
 | E081-07    | REFERENCES privilege at the column level | | |
-| E081-08    | WITH GRANT OPTION | | |
+| E081-08    | WITH GRANT OPTION | Yes {.text-success} | |
 | E081-09    | USAGE privilege | | |
 | E081-10    | EXECUTE privilege | | |
 | **E091**   | **Set functions**                                                                                                        | **Yes**{.text-success}     |                                                                                                                                                                                           |
@@ -93,28 +93,28 @@ The following table lists cases when query feature works in ClickHouse, but beha
 | E091-03    | MAX                                                                                                                      | Yes {.text-success}         |                                                                                                                                                                                           |
 | E091-04    | MIN                                                                                                                      | Yes {.text-success}         |                                                                                                                                                                                           |
 | E091-05    | SUM                                                                                                                      | Yes {.text-success}         |                                                                                                                                                                                           |
-| E091-06    | ALL quantifier                                                                                                           | No {.text-danger}           |                                                                                                                                                                                           |
-| E091-07    | DISTINCT quantifier                                                                                                      | Partial {.text-warning}     | Not all aggregate functions supported                                                                                                                                                     |
+| E091-06    | ALL quantifier                                                                                                           | Yes {.text-success}           |                                                                                                                                                                                           |
+| E091-07    | DISTINCT quantifier                                                                                                      | Yes {.text-success}     | Not all aggregate functions supported                                                                                                                                                     |
 | **E101**   | **Basic data manipulation**                                                                                              | **Partial**{.text-warning} |                                                                                                                                                                                           |
 | E101-01    | INSERT statement                                                                                                         | Yes {.text-success}         | Note: primary key in ClickHouse does not imply the `UNIQUE` constraint                                                                                                                    |
-| E101-03    | Searched UPDATE statement                                                                                                | No {.text-danger}           | There’s an `ALTER UPDATE` statement for batch data modification                                                                                                                           |
-| E101-04    | Searched DELETE statement                                                                                                | No {.text-danger}           | There’s an `ALTER DELETE` statement for batch data removal                                                                                                                                |
+| E101-03    | Searched UPDATE statement                                                                                                | Partial           | There’s an `ALTER UPDATE` statement for batch data modification                                                                                                                           |
+| E101-04    | Searched DELETE statement                                                                                                | Partial           | There’s an `ALTER DELETE` statement for batch data removal                                                                                                                                |
 | **E111**   | **Single row SELECT statement**                                                                                          | **No**{.text-danger}       |                                                                                                                                                                                           |
 | **E121**   | **Basic cursor support**                                                                                                 | **No**{.text-danger}       |                                                                                                                                                                                           |
 | E121-01    | DECLARE CURSOR                                                                                                           | No {.text-danger}           |                                                                                                                                                                                           |
-| E121-02    | ORDER BY columns need not be in select list                                                                              | No {.text-danger}           |                                                                                                                                                                                           |
-| E121-03    | Value expressions in ORDER BY clause                                                                                     | No {.text-danger}           |                                                                                                                                                                                           |
+| E121-02    | ORDER BY columns need not be in select list                                                                              | Yes {.text-success}           |                                                                                                                                                                                           |
+| E121-03    | Value expressions in ORDER BY clause                                                                                     | Yes {.text-success}           |                                                                                                                                                                                           |
 | E121-04    | OPEN statement                                                                                                           | No {.text-danger}           |                                                                                                                                                                                           |
 | E121-06    | Positioned UPDATE statement                                                                                              | No {.text-danger}           |                                                                                                                                                                                           |
 | E121-07    | Positioned DELETE statement                                                                                              | No {.text-danger}           |                                                                                                                                                                                           |
 | E121-08    | CLOSE statement                                                                                                          | No {.text-danger}           |                                                                                                                                                                                           |
 | E121-10    | FETCH statement: implicit NEXT                                                                                           | No {.text-danger}           |                                                                                                                                                                                           |
 | E121-17    | WITH HOLD cursors                                                                                                        | No {.text-danger}           |                                                                                                                                                                                           |
-| **E131**   | **Null value support (nulls in lieu of values)**                                                                         | **Partial**{.text-warning} | Some restrictions apply                                                                                                                                                                   |
+| **E131**   | **Null value support (nulls in lieu of values)**                                                                         | **Yes**{.text-success} | Some restrictions apply                                                                                                                                                                   |
 | **E141**   | **Basic integrity constraints**                                                                                          | **Partial**{.text-warning} |                                                                                                                                                                                           |
 | E141-01    | NOT NULL constraints                                                                                                     | Yes {.text-success}         | Note: `NOT NULL` is implied for table columns by default                                                                                                                                  |
 | E141-02    | UNIQUE constraint of NOT NULL columns                                                                                    | No {.text-danger}           |                                                                                                                                                                                           |
-| E141-03    | PRIMARY KEY constraints                                                                                                  | No {.text-danger}           |                                                                                                                                                                                           |
+| E141-03    | PRIMARY KEY constraints                                                                                                  | Partial           |                                                                                                                                                                                           |
 | E141-04    | Basic FOREIGN KEY constraint with the NO ACTION default for both referential delete action and referential update action | No {.text-danger}           |                                                                                                                                                                                           |
 | E141-06    | CHECK constraint                                                                                                         | Yes {.text-success}         |                                                                                                                                                                                           |
 | E141-07    | Column defaults                                                                                                          | Yes {.text-success}         |                                                                                                                                                                                           |
@@ -126,7 +126,7 @@ The following table lists cases when query feature works in ClickHouse, but beha
 | **E152**   | **Basic SET TRANSACTION statement**                                                                                      | **No**{.text-danger}       |                                                                                                                                                                                           |
 | E152-01    | SET TRANSACTION statement: ISOLATION LEVEL SERIALIZABLE clause                                                           | No {.text-danger}           |                                                                                                                                                                                           |
 | E152-02    | SET TRANSACTION statement: READ ONLY and READ WRITE clauses                                                              | No {.text-danger}           |                                                                                                                                                                                           |
-| **E153**   | **Updatable queries with subqueries**                                                                                    | **No**{.text-danger}       |                                                                                                                                                                                           |
+| **E153**   | **Updatable queries with subqueries**                                                                                    | **Yes**{.text-success}       |                                                                                                                                                                                           |
 | **E161**   | **SQL comments using leading double minus**                                                                              | **Yes**{.text-success}     |                                                                                                                                                                                           |
 | **E171**   | **SQLSTATE support**                                                                                                     | **No**{.text-danger}       |                                                                                                                                                                                           |
 | **E182**   | **Host language binding**                                                                                                | **No**{.text-danger}       |                                                                                                                                                                                           |
@@ -134,7 +134,7 @@ The following table lists cases when query feature works in ClickHouse, but beha
 | F031-01    | CREATE TABLE statement to create persistent base tables                                                                  | Partial {.text-warning}     | No `SYSTEM VERSIONING`, `ON COMMIT`, `GLOBAL`, `LOCAL`, `PRESERVE`, `DELETE`, `REF IS`, `WITH OPTIONS`, `UNDER`, `LIKE`, `PERIOD FOR` clauses and no support for user resolved data types |
 | F031-02    | CREATE VIEW statement                                                                                                    | Partial {.text-warning}     | No `RECURSIVE`, `CHECK`, `UNDER`, `WITH OPTIONS` clauses and no support for user resolved data types                                                                                      |
 | F031-03    | GRANT statement                                                                                                          | Yes {.text-success}         |                                                                                                                                                                                           |
-| F031-04    | ALTER TABLE statement: ADD COLUMN clause                                                                                 | Partial {.text-warning}     | No support for `GENERATED` clause and system time period                                                                                                                                  |
+| F031-04    | ALTER TABLE statement: ADD COLUMN clause                                                                                 | Yes {.text-success}     | No support for `GENERATED` clause and system time period                                                                                                                                  |
 | F031-13    | DROP TABLE statement: RESTRICT clause                                                                                    | No {.text-danger}           |                                                                                                                                                                                           |
 | F031-16    | DROP VIEW statement: RESTRICT clause                                                                                     | No {.text-danger}           |                                                                                                                                                                                           |
 | F031-19    | REVOKE statement: RESTRICT clause                                                                                        | No {.text-danger}           |                                                                                                                                                                                           |
@@ -147,10 +147,11 @@ The following table lists cases when query feature works in ClickHouse, but beha
 | F041-07    | The inner table in a left or right outer join can also be used in an inner join                                          | Yes {.text-success}         |                                                                                                                                                                                           |
 | F041-08    | All comparison operators are supported (rather than just =)                                                              | No {.text-danger}           |                                                                                                                                                                                           |
 | **F051**   | **Basic date and time**                                                                                                  | **Partial**{.text-warning} |                                                                                                                                                                                           |
-| F051-01    | DATE data type (including support of DATE literal)                                                                       | Partial {.text-warning}     | No literal                                                                                                                                                                                |
+| F051-01    | DATE data type (including support of DATE literal)                                                                       | Yes {.text-success}     |                       |
 | F051-02    | TIME data type (including support of TIME literal) with fractional seconds precision of at least 0                       | No {.text-danger}           |                                                                                                                                                                                           |
-| F051-03    | TIMESTAMP data type (including support of TIMESTAMP literal) with fractional seconds precision of at least 0 and 6       | No {.text-danger}           | `DateTime64` time provides similar functionality                                                                                                                                          |
-| F051-04    | Comparison predicate on DATE, TIME, and TIMESTAMP data types                                                             | Partial {.text-warning}     | Only one data type available                                                                                                                                                              |
+| F051-03    | TIMESTAMP data type (including support of TIMESTAMP literal) with fractional seconds precision of at least 0 and 6       | Yes {.text-success}           |                                                                                                                                         |
+| F051-04    | Comparison predicate on DATE, TIME, and TIMESTAMP data types                                                             | Yes {.text-success}     | 
+|
 | F051-05    | Explicit CAST between datetime types and character string types                                                          | Yes {.text-success}         |                                                                                                                                                                                           |
 | F051-06    | CURRENT_DATE                                                                                                            | No {.text-danger}           | `today()` is similar                                                                                                                                                                      |
 | F051-07    | LOCALTIME                                                                                                                | No {.text-danger}           | `now()` is similar                                                                                                                                                                        |
@@ -171,7 +172,7 @@ The following table lists cases when query feature works in ClickHouse, but beha
 | F261-03    | NULLIF                                                                                                                   | Yes {.text-success}         |                                                                                                                                                                                           |
 | F261-04    | COALESCE                                                                                                                 | Yes {.text-success}         |                                                                                                                                                                                           |
 | **F311**   | **Schema definition statement**                                                                                          | **Partial**{.text-warning} |                                                                                                                                                                                           |
-| F311-01    | CREATE SCHEMA                                                                                                            | No {.text-danger}           |                                                                                                                                                                                           |
+| F311-01    | CREATE SCHEMA                                                                                                            | Partial {.text-danger}           | See CREATE DATABASE |
 | F311-02    | CREATE TABLE for persistent base tables                                                                                  | Yes {.text-success}         |                                                                                                                                                                                           |
 | F311-03    | CREATE VIEW                                                                                                              | Yes {.text-success}         |                                                                                                                                                                                           |
 | F311-04    | CREATE VIEW: WITH CHECK OPTION                                                                                           | No {.text-danger}           |                                                                                                                                                                                           |

From b77e3a485b0ad93d5fc6a45e2a8de0f48e659e89 Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Wed, 20 Jan 2021 03:18:40 +0300
Subject: [PATCH 207/611] Update ansi.md

---
 docs/en/sql-reference/ansi.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/en/sql-reference/ansi.md b/docs/en/sql-reference/ansi.md
index 0b193270918..7a87ac2dcdb 100644
--- a/docs/en/sql-reference/ansi.md
+++ b/docs/en/sql-reference/ansi.md
@@ -149,10 +149,9 @@ The following table lists cases when query feature works in ClickHouse, but beha
 | **F051**   | **Basic date and time**                                                                                                  | **Partial**{.text-warning} |                                                                                                                                                                                           |
 | F051-01    | DATE data type (including support of DATE literal)                                                                       | Yes {.text-success}     |                       |
 | F051-02    | TIME data type (including support of TIME literal) with fractional seconds precision of at least 0                       | No {.text-danger}           |                                                                                                                                                                                           |
-| F051-03    | TIMESTAMP data type (including support of TIMESTAMP literal) with fractional seconds precision of at least 0 and 6       | Yes {.text-success}           |                                                                                                                                         |
-| F051-04    | Comparison predicate on DATE, TIME, and TIMESTAMP data types                                                             | Yes {.text-success}     | 
-|
-| F051-05    | Explicit CAST between datetime types and character string types                                                          | Yes {.text-success}         |                                                                                                                                                                                           |
+| F051-03    | TIMESTAMP data type (including support of TIMESTAMP literal) with fractional seconds precision of at least 0 and 6 | Yes {.text-success} | |
+| F051-04    | Comparison predicate on DATE, TIME, and TIMESTAMP data types | Yes {.text-success} | |
+| F051-05    | Explicit CAST between datetime types and character string types | Yes {.text-success} | |
 | F051-06    | CURRENT_DATE                                                                                                            | No {.text-danger}           | `today()` is similar                                                                                                                                                                      |
 | F051-07    | LOCALTIME                                                                                                                | No {.text-danger}           | `now()` is similar                                                                                                                                                                        |
 | F051-08    | LOCALTIMESTAMP                                                                                                           | No {.text-danger}           |                                                                                                                                                                                           |

From 659303d8713ddd4b7b280e0734396b315e9ac08f Mon Sep 17 00:00:00 2001
From: sundyli <543950155@qq.com>
Date: Wed, 20 Jan 2021 09:25:57 +0800
Subject: [PATCH 208/611] Remove useless codes

---
 src/Interpreters/ColumnAliasesVisitor.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Interpreters/ColumnAliasesVisitor.cpp b/src/Interpreters/ColumnAliasesVisitor.cpp
index dcc4c3d75d4..f41dbd19047 100644
--- a/src/Interpreters/ColumnAliasesVisitor.cpp
+++ b/src/Interpreters/ColumnAliasesVisitor.cpp
@@ -10,7 +10,6 @@
 #include <Parsers/ASTInsertQuery.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTFunction.h>
-#include <Parsers/queryToString.h>
 
 namespace DB
 {
@@ -89,7 +88,6 @@ void ColumnAliasesMatcher::visit(ASTIdentifier & node, ASTPtr & ast, Data & data
         if (col.default_desc.kind == ColumnDefaultKind::Alias)
         {
             ast = addTypeConversionToAST(col.default_desc.expression->clone(), col.type->getName(), data.columns.getAll(), data.context);
-            auto str = queryToString(ast);
             // revisit ast to track recursive alias columns
             Visitor(data).visit(ast);
         }

From 99d6676857155935b67ed3adad7f1549ab6e3deb Mon Sep 17 00:00:00 2001
From: jianmei zhang <zhangjmruc@sina.com>
Date: Wed, 20 Jan 2021 11:32:39 +0800
Subject: [PATCH 209/611] update clickhouse-local docs to latest

---
 .../operations/utilities/clickhouse-local.md  | 17 +++++++++++-----
 .../operations/utilities/clickhouse-local.md  | 20 ++++++++++++++-----
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/docs/en/operations/utilities/clickhouse-local.md b/docs/en/operations/utilities/clickhouse-local.md
index f93ba139cae..04f9f3660b5 100644
--- a/docs/en/operations/utilities/clickhouse-local.md
+++ b/docs/en/operations/utilities/clickhouse-local.md
@@ -16,7 +16,7 @@ By default `clickhouse-local` does not have access to data on the same host, but
 !!! warning "Warning"
     It is not recommended to load production server configuration into `clickhouse-local` because data can be damaged in case of human error.
 
-For temporary data, a unique temporary data directory is created by default. If you want to override this behavior, the data directory can be explicitly specified with the `-- --path` option.
+For temporary data, a unique temporary data directory is created by default.
 
 ## Usage {#usage}
 
@@ -32,15 +32,22 @@ Arguments:
 -   `-S`, `--structure` — table structure for input data.
 -   `-if`, `--input-format` — input format, `TSV` by default.
 -   `-f`, `--file` — path to data, `stdin` by default.
--   `-q` `--query` — queries to execute with `;` as delimeter. You must specify either `query` or `queries-file` option.
--   `-qf` `--queries-file` - file path with queries to execute. You must specify either `query` or `queries-file` option.
+-   `-q`, `--query` — queries to execute with `;` as delimeter. You must specify either `query` or `queries-file` option.
+-   `-qf`, `--queries-file` - file path with queries to execute. You must specify either `query` or `queries-file` option.
 -   `-N`, `--table` — table name where to put output data, `table` by default.
 -   `-of`, `--format`, `--output-format` — output format, `TSV` by default.
+-   `-d`, `--database` — default database, `_local` by default.
 -   `--stacktrace` — whether to dump debug output in case of exception.
+-   `--echo` — print query before execution. 
 -   `--verbose` — more details on query execution.
--   `-s` — disables `stderr` logging.
--   `--config-file` — path to configuration file in same format as for ClickHouse server, by default the configuration empty.
+-   `--logger.console` — Log to console.
+-   `--logger.log` — Log file name.
+-   `--logger.level` — Log level.
+-   `--ignore-error` — do not stop processing if a query failed.
+-   `-c`, `--config-file` — path to configuration file in same format as for ClickHouse server, by default the configuration empty.
+-   `--no-system-tables` — do not attach system tables.
 -   `--help` — arguments references for `clickhouse-local`.
+-   `-V`, `--version` — print version information and exit.
 
 Also there are arguments for each ClickHouse configuration variable which are more commonly used instead of `--config-file`.
 
diff --git a/docs/zh/operations/utilities/clickhouse-local.md b/docs/zh/operations/utilities/clickhouse-local.md
index 3ff38c01651..9b0ae841cd6 100644
--- a/docs/zh/operations/utilities/clickhouse-local.md
+++ b/docs/zh/operations/utilities/clickhouse-local.md
@@ -3,11 +3,11 @@ toc_priority: 60
 toc_title: clickhouse-local
 ---
 
-# ClickHouse Local {#clickhouse-local}
+# clickhouse-local {#clickhouse-local}
 
 `clickhouse-local`模式可以使您能够对本地文件执行快速处理，而无需部署和配置ClickHouse服务器。
 
-[ClickHouse SQL语法](../../operations/utilities/clickhouse-local.md)支持对表格数据的查询.
+接受表示表格tables的数据，并使用[ClickHouse SQL方言](../../operations/utilities/clickhouse-local.md)查询它们。
 
 `clickhouse-local`使用与ClickHouse Server相同的核心，因此它支持大多数功能以及相同的格式和表引擎。
 
@@ -16,6 +16,8 @@ toc_title: clickhouse-local
 !!! warning "警告"
     不建议将生产服务器配置加载到`clickhouse-local`因为数据可以在人为错误的情况下被损坏。
 
+对于临时数据，默认情况下会创建一个唯一的临时数据目录。
+
 ## 用途 {#usage}
 
 基本用法:
@@ -29,14 +31,22 @@ clickhouse-local --structure "table_structure" --input-format "format_of_incomin
 -   `-S`, `--structure` — 输入数据的表结构。
 -   `-if`, `--input-format` — 输入格式化类型, 默认是`TSV`。
 -   `-f`, `--file` — 数据路径, 默认是`stdin`。
--   `-q` `--query` — 要查询的SQL语句使用`;`做分隔符。
+-   `-q`, `--query` — 要查询的SQL语句使用`;`做分隔符。您必须指定`query`或`queries-file`选项。
+-   `-qf`, `--queries-file` - 包含执行查询的文件路径。您必须指定`query`或`queries-file`选项。
 -   `-N`, `--table` — 数据输出的表名，默认是`table`。
 -   `-of`, `--format`, `--output-format` — 输出格式化类型, 默认是`TSV`。
+-   `-d`, `--database` — 默认数据库名，默认是`_local`。
 -   `--stacktrace` — 是否在出现异常时输出栈信息。
+-   `--echo` — 执行前打印查询。
 -   `--verbose` — debug显示查询的详细信息。
--   `-s` — 禁用`stderr`输出信息。
--   `--config-file` — 与ClickHouse服务器格式相同配置文件的路径，默认情况下配置为空。
+-   `--logger.console` — 日志显示到控制台。
+-   `--logger.log` — 日志文件名。
+-   `--logger.level` — 日志级别。
+-   `--ignore-error` — 当查询失败时，不停止处理。
+-   `-c`, `--config-file` — 与ClickHouse服务器格式相同配置文件的路径，默认情况下配置为空。
+-   `--no-system-tables` — 不附加系统表。
 -   `--help` — `clickhouse-local`使用帮助信息。
+-   `-V`, `--version` — 打印版本信息并退出。
 
 对于每个ClickHouse配置的参数，也可以单独使用，可以不使用`--config-file`指定。
 

From 951b552727c267978972ae8154a42bc5715a755e Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Wed, 20 Jan 2021 08:29:27 +0300
Subject: [PATCH 210/611] rename

---
 src/Interpreters/ExpressionAnalyzer.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Interpreters/ExpressionAnalyzer.cpp b/src/Interpreters/ExpressionAnalyzer.cpp
index 76fc0cf419f..13f23643c3a 100644
--- a/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/src/Interpreters/ExpressionAnalyzer.cpp
@@ -472,7 +472,7 @@ bool ExpressionAnalyzer::makeAggregateDescriptions(ActionsDAGPtr & actions)
     return !aggregates().empty();
 }
 
-void makeWindowDescription(WindowDescription & desc, const IAST * ast)
+void makeWindowDescriptionFromAST(WindowDescription & desc, const IAST * ast)
 {
     const auto & definition = ast->as<const ASTWindowDefinition &>();
 
@@ -537,7 +537,7 @@ void ExpressionAnalyzer::makeWindowDescriptions(ActionsDAGPtr actions)
             const auto & elem = ptr->as<const ASTWindowListElement &>();
             WindowDescription desc;
             desc.window_name = elem.name;
-            makeWindowDescription(desc, elem.definition.get());
+            makeWindowDescriptionFromAST(desc, elem.definition.get());
 
             auto [it, inserted] = window_descriptions.insert(
                 {desc.window_name, desc});
@@ -623,7 +623,7 @@ void ExpressionAnalyzer::makeWindowDescriptions(ActionsDAGPtr actions)
                 const ASTWindowDefinition &>();
             WindowDescription desc;
             desc.window_name = definition.getDefaultWindowName();
-            makeWindowDescription(desc, &definition);
+            makeWindowDescriptionFromAST(desc, &definition);
 
             auto [it, inserted] = window_descriptions.insert(
                 {desc.window_name, desc});

From 107d83b6548ec04d9ad22e0b2fae4edcfd857836 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Wed, 20 Jan 2021 08:27:42 +0300
Subject: [PATCH 211/611] Avoid mixing output from parallel test runs.

Also mark some tests as sequential-only.
---
 tests/clickhouse-test                         | 88 +++++++++++--------
 ...ionary_invalidate_query_switchover_long.sh | 34 +++----
 ...em_reload_dictionary_reloads_completely.sh | 34 +++----
 ...dictionary_attribute_properties_values.sql | 22 ++---
 .../01045_dictionaries_restrictions.sql       | 12 +--
 .../0_stateless/01451_detach_drop_part.sql    | 44 +++++-----
 tests/queries/skip_list.json                  |  5 +-
 7 files changed, 128 insertions(+), 111 deletions(-)

diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index 78affcf8da0..14a979db349 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -274,7 +274,9 @@ def run_tests_array(all_tests_with_params):
 
     def print_test_time(test_time):
         if args.print_time:
-            print(" {0:.2f} sec.".format(test_time), end='')
+            return " {0:.2f} sec.".format(test_time)
+        else:
+            return ''
 
     if len(all_tests):
         print("\nRunning {} {} tests.".format(len(all_tests), suite) + "\n")
@@ -291,36 +293,43 @@ def run_tests_array(all_tests_with_params):
         (name, ext) = os.path.splitext(case)
 
         try:
-            sys.stdout.flush()
-            sys.stdout.write("{0:72}".format(name + ": "))
-            # This flush is needed so you can see the test name of the long running test before it will finish.
-            sys.stdout.flush()
+            status = ''
+            is_concurrent = multiprocessing.current_process().name != "MainProcess";
+            if not is_concurrent:
+                sys.stdout.flush()
+                sys.stdout.write("{0:72}".format(name + ": "))
+                # This flush is needed so you can see the test name of the long
+                # running test before it will finish. But don't do it in parallel
+                # mode, so that the lines don't mix.
+                sys.stdout.flush()
+            else:
+                status = "{0:72}".format(name + ": ");
 
             if args.skip and any(s in name for s in args.skip):
-                print(MSG_SKIPPED + " - skip")
+                status += MSG_SKIPPED + " - skip\n"
                 skipped_total += 1
             elif not args.zookeeper and ('zookeeper' in name
                     or 'replica' in name):
-                print(MSG_SKIPPED + " - no zookeeper")
+                status += MSG_SKIPPED + " - no zookeeper\n"
                 skipped_total += 1
             elif not args.shard and ('shard' in name
                     or 'distributed' in name
                     or 'global' in name):
-                print(MSG_SKIPPED + " - no shard")
+                status += MSG_SKIPPED + " - no shard\n"
                 skipped_total += 1
             elif not args.no_long and ('long' in name
                     # Tests for races and deadlocks usually are runned in loop
                     #  for significant amount of time
                     or 'deadlock' in name
                     or 'race' in name):
-                print(MSG_SKIPPED + " - no long")
+                status += MSG_SKIPPED + " - no long\n"
                 skipped_total += 1
             else:
                 disabled_file = os.path.join(suite_dir, name) + '.disabled'
 
                 if os.path.exists(disabled_file) and not args.disabled:
                     message = open(disabled_file, 'r').read()
-                    print(MSG_SKIPPED + " - " + message)
+                    status += MSG_SKIPPED + " - " + message + "\n"
                 else:
 
                     if args.testname:
@@ -347,11 +356,11 @@ def run_tests_array(all_tests_with_params):
                                 raise
 
                         failures += 1
-                        print(MSG_FAIL, end='')
-                        print_test_time(total_time)
-                        print(" - Timeout!")
+                        status += MSG_FAIL
+                        status += print_test_time(total_time)
+                        status += " - Timeout!\n"
                         if stderr:
-                            print(stderr)
+                            status += stderr
                     else:
                         counter = 1
                         while proc.returncode != 0 and need_retry(stderr):
@@ -364,12 +373,12 @@ def run_tests_array(all_tests_with_params):
                         if proc.returncode != 0:
                             failures += 1
                             failures_chain += 1
-                            print(MSG_FAIL, end='')
-                            print_test_time(total_time)
-                            print(" - return code {}".format(proc.returncode))
+                            status += MSG_FAIL
+                            status += print_test_time(total_time)
+                            status += f' - return code {proc.returncode}\n'
 
                             if stderr:
-                                print(stderr)
+                                status += stderr
 
                             # Stop on fatal errors like segmentation fault. They are sent to client via logs.
                             if ' <Fatal> ' in stderr:
@@ -379,46 +388,51 @@ def run_tests_array(all_tests_with_params):
                                 SERVER_DIED = True
 
                             if os.path.isfile(stdout_file):
-                                print(", result:\n")
-                                print('\n'.join(open(stdout_file).read().split('\n')[:100]))
+                                status += ", result:\n\n"
+                                status += '\n'.join(
+                                    open(stdout_file).read().split('\n')[:100])
+                                status += '\n';
 
                         elif stderr:
                             failures += 1
                             failures_chain += 1
-                            print(MSG_FAIL, end='')
-                            print_test_time(total_time)
-                            print(" - having stderror:\n{}".format(
-                                '\n'.join(stderr.split('\n')[:100])))
+                            status += MSG_FAIL
+                            status += print_test_time(total_time)
+                            status += " - having stderror:\n{}\n".format(
+                                '\n'.join(stderr.split('\n')[:100]))
                         elif 'Exception' in stdout:
                             failures += 1
                             failures_chain += 1
-                            print(MSG_FAIL, end='')
-                            print_test_time(total_time)
-                            print(" - having exception:\n{}".format(
-                                '\n'.join(stdout.split('\n')[:100])))
+                            status += MSG_FAIL
+                            status += print_test_time(total_time)
+                            status += " - having exception:\n{}\n".format(
+                                '\n'.join(stdout.split('\n')[:100]))
                         elif not os.path.isfile(reference_file):
-                            print(MSG_UNKNOWN, end='')
-                            print_test_time(total_time)
-                            print(" - no reference file")
+                            status += MSG_UNKNOWN
+                            status += print_test_time(total_time)
+                            status += " - no reference file\n"
                         else:
                             result_is_different = subprocess.call(['diff', '-q', reference_file, stdout_file], stdout=PIPE)
 
                             if result_is_different:
                                 diff = Popen(['diff', '-U', str(args.unified), reference_file, stdout_file], stdout=PIPE, universal_newlines=True).communicate()[0]
                                 failures += 1
-                                print(MSG_FAIL, end='')
-                                print_test_time(total_time)
-                                print(" - result differs with reference:\n{}".format(diff))
+                                status += MSG_FAIL
+                                status += print_test_time(total_time)
+                                status += " - result differs with reference:\n{}\n".format(diff)
                             else:
                                 passed_total += 1
                                 failures_chain = 0
-                                print(MSG_OK, end='')
-                                print_test_time(total_time)
-                                print()
+                                status += MSG_OK
+                                status += print_test_time(total_time)
+                                status += "\n"
                                 if os.path.exists(stdout_file):
                                     os.remove(stdout_file)
                                 if os.path.exists(stderr_file):
                                     os.remove(stderr_file)
+
+            sys.stdout.write(status)
+            sys.stdout.flush()
         except KeyboardInterrupt as e:
             print(colored("Break tests execution", args, "red"))
             raise e
diff --git a/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh b/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh
index 93a807a923e..66571f456d9 100755
--- a/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh
+++ b/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh
@@ -5,12 +5,12 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 
-$CLICKHOUSE_CLIENT --query "DROP DATABASE IF EXISTS dictdb"
+$CLICKHOUSE_CLIENT --query "DROP DATABASE IF EXISTS dictdb_01041_01040"
 
-$CLICKHOUSE_CLIENT --query "CREATE DATABASE dictdb"
+$CLICKHOUSE_CLIENT --query "CREATE DATABASE dictdb_01041_01040"
 
 $CLICKHOUSE_CLIENT --query "
-CREATE TABLE dictdb.dict_invalidate
+CREATE TABLE dictdb_01041_01040.dict_invalidate
 ENGINE = Memory AS
 SELECT
     122 as dummy,
@@ -19,31 +19,31 @@ FROM system.one"
 
 
 $CLICKHOUSE_CLIENT --query "
-CREATE DICTIONARY dictdb.invalidate
+CREATE DICTIONARY dictdb_01041_01040.invalidate
 (
   dummy UInt64,
   two UInt8 EXPRESSION dummy
 )
 PRIMARY KEY dummy
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'dict_invalidate' DB 'dictdb' INVALIDATE_QUERY 'select max(last_time) from dictdb.dict_invalidate'))
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'dict_invalidate' DB 'dictdb_01041_01040' INVALIDATE_QUERY 'select max(last_time) from dictdb_01041_01040.dict_invalidate'))
 LIFETIME(MIN 0 MAX 1)
 LAYOUT(FLAT())"
 
-$CLICKHOUSE_CLIENT --query "SELECT dictGetUInt8('dictdb.invalidate', 'two', toUInt64(122))"
+$CLICKHOUSE_CLIENT --query "SELECT dictGetUInt8('dictdb_01041_01040.invalidate', 'two', toUInt64(122))"
 
 # No exception happened
-$CLICKHOUSE_CLIENT --query "SELECT last_exception FROM system.dictionaries WHERE database = 'dictdb' AND name = 'invalidate'"
+$CLICKHOUSE_CLIENT --query "SELECT last_exception FROM system.dictionaries WHERE database = 'dictdb_01041_01040' AND name = 'invalidate'"
 
-$CLICKHOUSE_CLIENT --query "DROP TABLE dictdb.dict_invalidate"
+$CLICKHOUSE_CLIENT --query "DROP TABLE dictdb_01041_01040.dict_invalidate"
 
 function check_exception_detected()
 {
 
-    query_result=$($CLICKHOUSE_CLIENT --query "SELECT last_exception FROM system.dictionaries WHERE database = 'dictdb' AND name = 'invalidate'" 2>&1)
+    query_result=$($CLICKHOUSE_CLIENT --query "SELECT last_exception FROM system.dictionaries WHERE database = 'dictdb_01041_01040' AND name = 'invalidate'" 2>&1)
 
     while [ -z "$query_result" ]
     do
-        query_result=$($CLICKHOUSE_CLIENT --query "SELECT last_exception FROM system.dictionaries WHERE database = 'dictdb' AND name = 'invalidate'" 2>&1)
+        query_result=$($CLICKHOUSE_CLIENT --query "SELECT last_exception FROM system.dictionaries WHERE database = 'dictdb_01041_01040' AND name = 'invalidate'" 2>&1)
         sleep 0.1
     done
 }
@@ -52,10 +52,10 @@ function check_exception_detected()
 export -f check_exception_detected;
 timeout 30 bash -c check_exception_detected 2> /dev/null
 
-$CLICKHOUSE_CLIENT --query "SELECT last_exception FROM system.dictionaries WHERE database = 'dictdb' AND name = 'invalidate'" 2>&1 | grep -Eo "Table dictdb.dict_invalidate .* exist"
+$CLICKHOUSE_CLIENT --query "SELECT last_exception FROM system.dictionaries WHERE database = 'dictdb_01041_01040' AND name = 'invalidate'" 2>&1 | grep -Eo "Table dictdb_01041_01040.dict_invalidate .* exist"
 
 $CLICKHOUSE_CLIENT --query "
-CREATE TABLE dictdb.dict_invalidate
+CREATE TABLE dictdb_01041_01040.dict_invalidate
 ENGINE = Memory AS
 SELECT
     133 as dummy,
@@ -64,11 +64,11 @@ FROM system.one"
 
 function check_exception_fixed()
 {
-    query_result=$($CLICKHOUSE_CLIENT --query "SELECT last_exception FROM system.dictionaries WHERE database = 'dictdb' AND name = 'invalidate'" 2>&1)
+    query_result=$($CLICKHOUSE_CLIENT --query "SELECT last_exception FROM system.dictionaries WHERE database = 'dictdb_01041_01040' AND name = 'invalidate'" 2>&1)
 
     while [ "$query_result" ]
     do
-        query_result=$($CLICKHOUSE_CLIENT --query "SELECT last_exception FROM system.dictionaries WHERE database = 'dictdb' AND name = 'invalidate'" 2>&1)
+        query_result=$($CLICKHOUSE_CLIENT --query "SELECT last_exception FROM system.dictionaries WHERE database = 'dictdb_01041_01040' AND name = 'invalidate'" 2>&1)
         sleep 0.1
     done
 }
@@ -77,7 +77,7 @@ export -f check_exception_fixed;
 # it may take a while until dictionary reloads
 timeout 60 bash -c check_exception_fixed 2> /dev/null
 
-$CLICKHOUSE_CLIENT --query "SELECT last_exception FROM system.dictionaries WHERE database = 'dictdb' AND name = 'invalidate'" 2>&1
-$CLICKHOUSE_CLIENT --query "SELECT dictGetUInt8('dictdb.invalidate', 'two', toUInt64(133))"
+$CLICKHOUSE_CLIENT --query "SELECT last_exception FROM system.dictionaries WHERE database = 'dictdb_01041_01040' AND name = 'invalidate'" 2>&1
+$CLICKHOUSE_CLIENT --query "SELECT dictGetUInt8('dictdb_01041_01040.invalidate', 'two', toUInt64(133))"
 
-$CLICKHOUSE_CLIENT --query "DROP DATABASE IF EXISTS dictdb"
+$CLICKHOUSE_CLIENT --query "DROP DATABASE IF EXISTS dictdb_01041_01040"
diff --git a/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh b/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh
index b466b863f3b..512d12866c4 100755
--- a/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh
+++ b/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh
@@ -8,40 +8,40 @@ set -e -o pipefail
 
 # Run the client.
 $CLICKHOUSE_CLIENT --multiquery <<'EOF'
-DROP DATABASE IF EXISTS dictdb;
-CREATE DATABASE dictdb;
-CREATE TABLE dictdb.table(x Int64, y Int64, insert_time DateTime) ENGINE = MergeTree ORDER BY tuple();
-INSERT INTO dictdb.table VALUES (12, 102, now());
+DROP DATABASE IF EXISTS dictdb_01042;
+CREATE DATABASE dictdb_01042;
+CREATE TABLE dictdb_01042.table(x Int64, y Int64, insert_time DateTime) ENGINE = MergeTree ORDER BY tuple();
+INSERT INTO dictdb_01042.table VALUES (12, 102, now());
 
-CREATE DICTIONARY dictdb.dict
+CREATE DICTIONARY dictdb_01042.dict
 (
   x Int64 DEFAULT -1,
   y Int64 DEFAULT -1,
   insert_time DateTime
 )
 PRIMARY KEY x
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table' DB 'dictdb' UPDATE_FIELD 'insert_time'))
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table' DB 'dictdb_01042' UPDATE_FIELD 'insert_time'))
 LAYOUT(FLAT())
 LIFETIME(1);
 EOF
 
-$CLICKHOUSE_CLIENT --query "SELECT '12 -> ', dictGetInt64('dictdb.dict', 'y', toUInt64(12))"
+$CLICKHOUSE_CLIENT --query "SELECT '12 -> ', dictGetInt64('dictdb_01042.dict', 'y', toUInt64(12))"
 
-$CLICKHOUSE_CLIENT --query "INSERT INTO dictdb.table VALUES (13, 103, now())"
-$CLICKHOUSE_CLIENT --query "INSERT INTO dictdb.table VALUES (14, 104, now() - INTERVAL 1 DAY)"
+$CLICKHOUSE_CLIENT --query "INSERT INTO dictdb_01042.table VALUES (13, 103, now())"
+$CLICKHOUSE_CLIENT --query "INSERT INTO dictdb_01042.table VALUES (14, 104, now() - INTERVAL 1 DAY)"
 
-while [ "$(${CLICKHOUSE_CLIENT} --query "SELECT dictGetInt64('dictdb.dict', 'y', toUInt64(13))")" = -1 ]
+while [ "$(${CLICKHOUSE_CLIENT} --query "SELECT dictGetInt64('dictdb_01042.dict', 'y', toUInt64(13))")" = -1 ]
     do
         sleep 0.5
     done
 
-$CLICKHOUSE_CLIENT --query "SELECT '13 -> ', dictGetInt64('dictdb.dict', 'y', toUInt64(13))"
-$CLICKHOUSE_CLIENT --query "SELECT '14 -> ', dictGetInt64('dictdb.dict', 'y', toUInt64(14))"
+$CLICKHOUSE_CLIENT --query "SELECT '13 -> ', dictGetInt64('dictdb_01042.dict', 'y', toUInt64(13))"
+$CLICKHOUSE_CLIENT --query "SELECT '14 -> ', dictGetInt64('dictdb_01042.dict', 'y', toUInt64(14))"
 
-$CLICKHOUSE_CLIENT --query "SYSTEM RELOAD DICTIONARY 'dictdb.dict'"
+$CLICKHOUSE_CLIENT --query "SYSTEM RELOAD DICTIONARY 'dictdb_01042.dict'"
 
-$CLICKHOUSE_CLIENT --query "SELECT '12(r) -> ', dictGetInt64('dictdb.dict', 'y', toUInt64(12))"
-$CLICKHOUSE_CLIENT --query "SELECT '13(r) -> ', dictGetInt64('dictdb.dict', 'y', toUInt64(13))"
-$CLICKHOUSE_CLIENT --query "SELECT '14(r) -> ', dictGetInt64('dictdb.dict', 'y', toUInt64(14))"
+$CLICKHOUSE_CLIENT --query "SELECT '12(r) -> ', dictGetInt64('dictdb_01042.dict', 'y', toUInt64(12))"
+$CLICKHOUSE_CLIENT --query "SELECT '13(r) -> ', dictGetInt64('dictdb_01042.dict', 'y', toUInt64(13))"
+$CLICKHOUSE_CLIENT --query "SELECT '14(r) -> ', dictGetInt64('dictdb_01042.dict', 'y', toUInt64(14))"
 
-$CLICKHOUSE_CLIENT --query "DROP DATABASE IF EXISTS dictdb"
+$CLICKHOUSE_CLIENT --query "DROP DATABASE IF EXISTS dictdb_01042"
diff --git a/tests/queries/0_stateless/01043_dictionary_attribute_properties_values.sql b/tests/queries/0_stateless/01043_dictionary_attribute_properties_values.sql
index 5e448862603..5e150cfed9c 100644
--- a/tests/queries/0_stateless/01043_dictionary_attribute_properties_values.sql
+++ b/tests/queries/0_stateless/01043_dictionary_attribute_properties_values.sql
@@ -1,11 +1,11 @@
-DROP DATABASE IF EXISTS dictdb;
-CREATE DATABASE dictdb;
+DROP DATABASE IF EXISTS dictdb_01043;
+CREATE DATABASE dictdb_01043;
 
-CREATE TABLE dictdb.dicttbl(key Int64, value_default String, value_expression String) ENGINE = MergeTree ORDER BY tuple();
-INSERT INTO dictdb.dicttbl VALUES (12, 'hello', '55:66:77');
+CREATE TABLE dictdb_01043.dicttbl(key Int64, value_default String, value_expression String) ENGINE = MergeTree ORDER BY tuple();
+INSERT INTO dictdb_01043.dicttbl VALUES (12, 'hello', '55:66:77');
 
 
-CREATE DICTIONARY dictdb.dict
+CREATE DICTIONARY dictdb_01043.dict
 (
   key Int64 DEFAULT -1,
   value_default String DEFAULT 'world',
@@ -13,15 +13,15 @@ CREATE DICTIONARY dictdb.dict
 
 )
 PRIMARY KEY key
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'dicttbl' DB 'dictdb'))
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'dicttbl' DB 'dictdb_01043'))
 LAYOUT(FLAT())
 LIFETIME(1);
 
 
-SELECT dictGetString('dictdb.dict', 'value_default', toUInt64(12));
-SELECT dictGetString('dictdb.dict', 'value_default', toUInt64(14));
+SELECT dictGetString('dictdb_01043.dict', 'value_default', toUInt64(12));
+SELECT dictGetString('dictdb_01043.dict', 'value_default', toUInt64(14));
 
-SELECT dictGetString('dictdb.dict', 'value_expression', toUInt64(12));
-SELECT dictGetString('dictdb.dict', 'value_expression', toUInt64(14));
+SELECT dictGetString('dictdb_01043.dict', 'value_expression', toUInt64(12));
+SELECT dictGetString('dictdb_01043.dict', 'value_expression', toUInt64(14));
 
-DROP DATABASE IF EXISTS dictdb;
+DROP DATABASE IF EXISTS dictdb_01043;
diff --git a/tests/queries/0_stateless/01045_dictionaries_restrictions.sql b/tests/queries/0_stateless/01045_dictionaries_restrictions.sql
index 909e2fe8ad4..0bc2f6f9f13 100644
--- a/tests/queries/0_stateless/01045_dictionaries_restrictions.sql
+++ b/tests/queries/0_stateless/01045_dictionaries_restrictions.sql
@@ -1,8 +1,8 @@
-DROP DATABASE IF EXISTS dictdb;
+DROP DATABASE IF EXISTS dictdb_01045;
 
-CREATE DATABASE dictdb;
+CREATE DATABASE dictdb_01045;
 
-CREATE DICTIONARY dictdb.restricted_dict (
+CREATE DICTIONARY dictdb_01045.restricted_dict (
   key UInt64,
   value String
 )
@@ -12,10 +12,10 @@ LIFETIME(MIN 0 MAX 1)
 LAYOUT(CACHE(SIZE_IN_CELLS 10));
 
 -- because of lazy load we can check only in dictGet query
-select dictGetString('dictdb.restricted_dict', 'value', toUInt64(1));  -- {serverError 482}
+select dictGetString('dictdb_01045.restricted_dict', 'value', toUInt64(1));  -- {serverError 482}
 
 select 'Ok.';
 
-DROP DICTIONARY IF EXISTS dictdb.restricted_dict;
+DROP DICTIONARY IF EXISTS dictdb_01045.restricted_dict;
 
-DROP DATABASE IF EXISTS dictdb;
+DROP DATABASE IF EXISTS dictdb_01045;
diff --git a/tests/queries/0_stateless/01451_detach_drop_part.sql b/tests/queries/0_stateless/01451_detach_drop_part.sql
index 84973da5f25..d70f4e37de4 100644
--- a/tests/queries/0_stateless/01451_detach_drop_part.sql
+++ b/tests/queries/0_stateless/01451_detach_drop_part.sql
@@ -1,42 +1,42 @@
-DROP TABLE IF EXISTS mt;
+DROP TABLE IF EXISTS mt_01451;
 
-CREATE TABLE mt (v UInt8) ENGINE = MergeTree() order by tuple();
-SYSTEM STOP MERGES mt;
+CREATE TABLE mt_01451 (v UInt8) ENGINE = MergeTree() order by tuple();
+SYSTEM STOP MERGES mt_01451;
 
-INSERT INTO mt VALUES (0);
-INSERT INTO mt VALUES (1);
-INSERT INTO mt VALUES (2);
+INSERT INTO mt_01451 VALUES (0);
+INSERT INTO mt_01451 VALUES (1);
+INSERT INTO mt_01451 VALUES (2);
 
-SELECT v FROM mt ORDER BY v;
+SELECT v FROM mt_01451 ORDER BY v;
 
-ALTER TABLE mt DETACH PART 'all_100_100_0'; -- { serverError 232 }
+ALTER TABLE mt_01451 DETACH PART 'all_100_100_0'; -- { serverError 232 }
 
-ALTER TABLE mt DETACH PART 'all_2_2_0';
+ALTER TABLE mt_01451 DETACH PART 'all_2_2_0';
 
-SELECT v FROM mt ORDER BY v;
+SELECT v FROM mt_01451 ORDER BY v;
 
-SELECT name FROM system.detached_parts WHERE table = 'mt';
+SELECT name FROM system.detached_parts WHERE table = 'mt_01451';
 
-ALTER TABLE mt ATTACH PART 'all_2_2_0';
+ALTER TABLE mt_01451 ATTACH PART 'all_2_2_0';
 
-SELECT v FROM mt ORDER BY v;
+SELECT v FROM mt_01451 ORDER BY v;
 
-SELECT name FROM system.detached_parts WHERE table = 'mt';
+SELECT name FROM system.detached_parts WHERE table = 'mt_01451';
 
 SELECT '-- drop part --';
 
-ALTER TABLE mt DROP PART 'all_4_4_0';
+ALTER TABLE mt_01451 DROP PART 'all_4_4_0';
 
-ALTER TABLE mt ATTACH PART 'all_4_4_0'; -- { serverError 233 }
+ALTER TABLE mt_01451 ATTACH PART 'all_4_4_0'; -- { serverError 233 }
 
-SELECT v FROM mt ORDER BY v;
+SELECT v FROM mt_01451 ORDER BY v;
 
 SELECT '-- resume merges --';
-SYSTEM START MERGES mt;
-OPTIMIZE TABLE mt FINAL;
+SYSTEM START MERGES mt_01451;
+OPTIMIZE TABLE mt_01451 FINAL;
 
-SELECT v FROM mt ORDER BY v;
+SELECT v FROM mt_01451 ORDER BY v;
 
-SELECT name FROM system.parts WHERE table = 'mt' AND active;
+SELECT name FROM system.parts WHERE table = 'mt_01451' AND active;
 
-DROP TABLE mt;
+DROP TABLE mt_01451;
diff --git a/tests/queries/skip_list.json b/tests/queries/skip_list.json
index beaf311c9e6..c01cfee5993 100644
--- a/tests/queries/skip_list.json
+++ b/tests/queries/skip_list.json
@@ -473,12 +473,15 @@
         "01494_storage_join_persistency",
         "01516_drop_table_stress",
         "01541_max_memory_usage_for_user",
+        "01646_system_restart_replicas_smoke", // system restart replicas is a global query
+        "01600_count_of_parts_metrics", // tests global system metrics
         "attach",
         "ddl_dictionaries",
         "dictionary",
         "limit_memory",
         "live_view",
         "memory_leak",
-        "memory_limit"
+        "memory_limit",
+        "polygon_dicts" // they use an explicitly specified database
     ]
 }

From 33b941b216c0ae2de5b72cab290a0b4cc1c8a5d2 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Wed, 20 Jan 2021 10:01:26 +0300
Subject: [PATCH 212/611] not sure why it doesn't like my f-strings

---
 tests/clickhouse-test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index 14a979db349..64497349c78 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -375,7 +375,7 @@ def run_tests_array(all_tests_with_params):
                             failures_chain += 1
                             status += MSG_FAIL
                             status += print_test_time(total_time)
-                            status += f' - return code {proc.returncode}\n'
+                            status += ' - return code {}\n'.format(proc.returncode)
 
                             if stderr:
                                 status += stderr

From 67d880dc3a74c9fb4b135d1a8cff2a85872175a1 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Wed, 20 Jan 2021 12:38:56 +0300
Subject: [PATCH 213/611] Update test.

---
 .../01576_alias_column_rewrite.reference           | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/queries/0_stateless/01576_alias_column_rewrite.reference b/tests/queries/0_stateless/01576_alias_column_rewrite.reference
index ebc8be4f79b..679695dd6db 100644
--- a/tests/queries/0_stateless/01576_alias_column_rewrite.reference
+++ b/tests/queries/0_stateless/01576_alias_column_rewrite.reference
@@ -26,13 +26,13 @@ Expression (Projection)
     MergingSorted (Merge sorted streams for ORDER BY)
       MergeSorting (Merge sorted blocks for ORDER BY)
         PartialSorting (Sort each block for ORDER BY)
-          Expression (Before ORDER BY + Add table aliases)
+          Expression ((Before ORDER BY + Add table aliases))
             SettingQuotaAndLimits (Set limits and quota after reading from storage)
               ReadFromStorage (MergeTree)
 Expression (Projection)
   Limit (preliminary LIMIT)
     FinishSorting
-      Expression (Before ORDER BY + Add table aliases)
+      Expression ((Before ORDER BY + Add table aliases))
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
           Union
             ReadFromStorage (MergeTree  with order)
@@ -48,20 +48,20 @@ Expression (Projection)
             ReadFromStorage (MergeTree  with order)
             ReadFromStorage (MergeTree  with order)
 optimize_aggregation_in_order
-Expression (Projection + Before ORDER BY)
+Expression ((Projection + Before ORDER BY))
   Aggregating
-    Expression (Before GROUP BY + Add table aliases)
+    Expression ((Before GROUP BY + Add table aliases))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         ReadFromStorage (MergeTree)
-Expression (Projection + Before ORDER BY)
+Expression ((Projection + Before ORDER BY))
   Aggregating
-    Expression (Before GROUP BY + Add table aliases)
+    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)
-Expression (Projection + Before ORDER BY)
+Expression ((Projection + Before ORDER BY))
   Aggregating
     Expression (Before GROUP BY)
       SettingQuotaAndLimits (Set limits and quota after reading from storage)

From fa3964d36d69062eb091dd7ac3ce877c7c1b91e8 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Wed, 20 Jan 2021 12:42:55 +0300
Subject: [PATCH 214/611] Fix test.

---
 src/Processors/QueryPlan/QueryPlan.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Processors/QueryPlan/QueryPlan.cpp b/src/Processors/QueryPlan/QueryPlan.cpp
index 9de4fc95aa6..0e16d97d436 100644
--- a/src/Processors/QueryPlan/QueryPlan.cpp
+++ b/src/Processors/QueryPlan/QueryPlan.cpp
@@ -565,6 +565,11 @@ static bool trySplitFilter(QueryPlan::Node * node, QueryPlan::Nodes & nodes)
         return false;
 
     const auto & expr = filter_step->getExpression();
+
+    /// Do not split if there are function like runningDifference.
+    if (expr->hasStatefulFunctions())
+        return false;
+
     auto split = expr->splitActionsForFilter(filter_step->getFilterColumnName());
 
     if (split.second->empty())

From ab325f5d0ce6ddcadc853d0a6844dcf3e442d5b6 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Wed, 20 Jan 2021 13:31:47 +0300
Subject: [PATCH 215/611] Fix test

---
 .../01040_dictionary_invalidate_query_switchover_long.reference | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.reference b/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.reference
index e362d692f42..c89fe48d9f9 100644
--- a/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.reference
+++ b/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.reference
@@ -1,5 +1,5 @@
 122
 
-Table dictdb.dict_invalidate doesn\'t exist
+Table dictdb_01041_01040.dict_invalidate doesn\'t exist
 
 133

From 6847fdf7722cb4d50b57a73708190e991521140e Mon Sep 17 00:00:00 2001
From: Alexander Tokmakov <avtokmakov@yandex-team.ru>
Date: Wed, 20 Jan 2021 14:12:33 +0300
Subject: [PATCH 216/611] fix

---
 base/harmful/harmful.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/base/harmful/harmful.c b/base/harmful/harmful.c
index 4032fbf3b90..bfb68abbcfb 100644
--- a/base/harmful/harmful.c
+++ b/base/harmful/harmful.c
@@ -118,7 +118,9 @@ TRAP(logout)
 TRAP(logwtmp)
 TRAP(lrand48)
 TRAP(mallinfo)
-//TRAP(mallopt) // Used by tsan
+#if !defined(SANITIZER)
+TRAP(mallopt) // Used by tsan
+#endif
 TRAP(mblen)
 TRAP(mbrlen)
 TRAP(mbrtowc)
@@ -193,7 +195,9 @@ TRAP(dbm_nextkey)
 TRAP(dbm_open)
 TRAP(dbm_store)
 TRAP(dirname)
-//TRAP(dlerror) // Used by tsan
+#if !defined(SANITIZER)
+TRAP(dlerror) // Used by tsan
+#endif
 TRAP(ftw)
 TRAP(getc_unlocked)
 //TRAP(getenv) // Ok at program startup

From 70679e4ee1964693d419a35d23bc2bdbdf8fcbb6 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Wed, 20 Jan 2021 15:11:26 +0300
Subject: [PATCH 217/611] Fix test keeper handler

---
 src/Server/TestKeeperTCPHandler.cpp | 70 +++++++++++++++++------------
 src/Server/TestKeeperTCPHandler.h   |  9 ++--
 2 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/src/Server/TestKeeperTCPHandler.cpp b/src/Server/TestKeeperTCPHandler.cpp
index 8b9047c531c..7b02996019e 100644
--- a/src/Server/TestKeeperTCPHandler.cpp
+++ b/src/Server/TestKeeperTCPHandler.cpp
@@ -13,6 +13,8 @@
 #include <Common/PipeFDs.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <IO/ReadBufferFromFileDescriptor.h>
+#include <queue>
+#include <mutex>
 
 #ifdef POCO_HAVE_FD_EPOLL
     #include <sys/epoll.h>
@@ -36,6 +38,36 @@ struct PollResult
     bool error;
 };
 
+/// Queue with mutex. As simple as possible.
+class ThreadSafeResponseQueue
+{
+private:
+    mutable std::mutex queue_mutex;
+    std::queue<Coordination::ZooKeeperResponsePtr> queue;
+public:
+    void push(const Coordination::ZooKeeperResponsePtr & response)
+    {
+        std::lock_guard lock(queue_mutex);
+        queue.push(response);
+    }
+    bool tryPop(Coordination::ZooKeeperResponsePtr & response)
+    {
+        std::lock_guard lock(queue_mutex);
+        if (!queue.empty())
+        {
+            response = queue.front();
+            queue.pop();
+            return true;
+        }
+        return false;
+    }
+    size_t size() const
+    {
+        std::lock_guard lock(queue_mutex);
+        return queue.size();
+    }
+};
+
 struct SocketInterruptablePollWrapper
 {
     int sockfd;
@@ -159,12 +191,10 @@ struct SocketInterruptablePollWrapper
                         result.has_requests = true;
                     else
                     {
-                        do
-                        {
-                            UInt8 response_byte;
-                            readIntBinary(response_byte, response_in);
-                            result.has_responses = true;
-                        } while (response_in.available()); /// Just to drain all of them
+                        /// Skip all of them, we are not interested in exact
+                        /// amount because responses ordered in responses queue.
+                        response_in.ignore();
+                        result.has_responses = true;
                     }
                 }
             }
@@ -190,7 +220,7 @@ TestKeeperTCPHandler::TestKeeperTCPHandler(IServer & server_, const Poco::Net::S
     , session_timeout(0, global_context.getConfigRef().getUInt("test_keeper_server.session_timeout_ms", Coordination::DEFAULT_SESSION_TIMEOUT_MS) * 1000)
     , session_id(test_keeper_storage_dispatcher->getSessionID())
     , poll_wrapper(std::make_unique<SocketInterruptablePollWrapper>(socket_))
-    , responses(1000)
+    , responses(std::make_unique<ThreadSafeResponseQueue>())
 {
 }
 
@@ -282,7 +312,7 @@ void TestKeeperTCPHandler::runImpl()
     auto response_fd = poll_wrapper->getResponseFD();
     auto response_callback = [this, response_fd] (const Coordination::ZooKeeperResponsePtr & response)
     {
-        responses.push(response);
+        responses->push(response);
         UInt8 single_byte = 1;
         [[maybe_unused]] int result = write(response_fd, &single_byte, sizeof(single_byte));
     };
@@ -322,7 +352,7 @@ void TestKeeperTCPHandler::runImpl()
             if (result.has_responses)
             {
                 Coordination::ZooKeeperResponsePtr response;
-                while (responses.tryPop(response))
+                while (responses->tryPop(response))
                 {
                     if (response->xid == close_xid)
                     {
@@ -344,8 +374,7 @@ void TestKeeperTCPHandler::runImpl()
             if (session_stopwatch.elapsedMicroseconds() > static_cast<UInt64>(session_timeout.totalMicroseconds()))
             {
                 LOG_DEBUG(log, "Session #{} expired", session_id);
-                if (!finish())
-                    LOG_DEBUG(log, "Cannot sent close for expired session #{}", session_id);
+                finish();
                 break;
             }
         }
@@ -353,30 +382,15 @@ void TestKeeperTCPHandler::runImpl()
     catch (const Exception & ex)
     {
         LOG_INFO(log, "Got exception processing session #{}: {}", session_id, getExceptionMessage(ex, true));
-        if (!finish())
-            LOG_DEBUG(log, "Cannot sent close for session #{}", session_id);
+        finish();
     }
-
 }
 
-bool TestKeeperTCPHandler::finish()
+void TestKeeperTCPHandler::finish()
 {
     Coordination::ZooKeeperRequestPtr request = Coordination::ZooKeeperRequestFactory::instance().get(Coordination::OpNum::Close);
     request->xid = close_xid;
     test_keeper_storage_dispatcher->putRequest(request, session_id);
-
-    Coordination::ZooKeeperResponsePtr response;
-    bool finished = false;
-    while (responses.tryPop(response, operation_timeout.totalMilliseconds()))
-    {
-        if (response->xid == close_xid)
-        {
-            finished = true;
-            response->write(*out);
-            break;
-        }
-    }
-    return finished;
 }
 
 std::pair<Coordination::OpNum, Coordination::XID> TestKeeperTCPHandler::receiveRequest()
diff --git a/src/Server/TestKeeperTCPHandler.h b/src/Server/TestKeeperTCPHandler.h
index 2115f1cf11f..46b4454b319 100644
--- a/src/Server/TestKeeperTCPHandler.h
+++ b/src/Server/TestKeeperTCPHandler.h
@@ -3,7 +3,6 @@
 #include <Poco/Net/TCPServerConnection.h>
 #include "IServer.h"
 #include <Common/Stopwatch.h>
-#include <Common/ConcurrentBoundedQueue.h>
 #include <Interpreters/Context.h>
 #include <Common/ZooKeeper/ZooKeeperCommon.h>
 #include <Common/ZooKeeper/ZooKeeperConstants.h>
@@ -17,6 +16,8 @@ namespace DB
 
 struct SocketInterruptablePollWrapper;
 using SocketInterruptablePollWrapperPtr = std::unique_ptr<SocketInterruptablePollWrapper>;
+class ThreadSafeResponseQueue;
+using ThreadSafeResponseQueuePtr = std::unique_ptr<ThreadSafeResponseQueue>;
 
 class TestKeeperTCPHandler : public Poco::Net::TCPServerConnection
 {
@@ -33,7 +34,9 @@ private:
     int64_t session_id;
     Stopwatch session_stopwatch;
     SocketInterruptablePollWrapperPtr poll_wrapper;
-    ConcurrentBoundedQueue<Coordination::ZooKeeperResponsePtr> responses;
+
+    ThreadSafeResponseQueuePtr responses;
+
     Coordination::XID close_xid = Coordination::CLOSE_XID;
 
     /// Streams for reading/writing from/to client connection socket.
@@ -46,7 +49,7 @@ private:
     void receiveHandshake();
 
     std::pair<Coordination::OpNum, Coordination::XID> receiveRequest();
-    bool finish();
+    void finish();
 };
 
 }

From cf888740887917bb5de3e84d0f01dcbbe9890ee8 Mon Sep 17 00:00:00 2001
From: Nikita Mikhailov <jakalletti@jakalletti-build.sas.yp-c.yandex.net>
Date: Wed, 20 Jan 2021 15:30:41 +0300
Subject: [PATCH 218/611] done

---
 src/Interpreters/Context.cpp |  2 +-
 src/Interpreters/Context.h   | 33 ++++++++++++++++++++++++++++++---
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index 2a8fdce869b..abd39cc3d4b 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -946,7 +946,7 @@ bool Context::hasScalar(const String & name) const
 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);
-    auto lock = getLock();
+    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);
     for (const auto & column_name : column_names)
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index 79140f0d209..1bd901d40c6 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -194,9 +194,36 @@ private:
     /// Record entities accessed by current query, and store this information in system.query_log.
     struct QueryAccessInfo
     {
-        std::set<std::string> databases;
-        std::set<std::string> tables;
-        std::set<std::string> columns;
+        QueryAccessInfo() = default;
+
+        QueryAccessInfo(const QueryAccessInfo & rhs)
+        {
+            std::lock_guard<std::mutex> lock(rhs.mutex);
+            databases = rhs.databases;
+            tables = rhs.tables;
+            columns = rhs.columns;
+        }
+
+        QueryAccessInfo(QueryAccessInfo && rhs) = delete;
+
+        QueryAccessInfo & operator=(QueryAccessInfo rhs)
+        {
+            swap(rhs);
+            return *this;
+        }
+
+        void swap(QueryAccessInfo & rhs) 
+        {
+            std::swap(databases, rhs.databases);
+            std::swap(tables, rhs.tables);
+            std::swap(columns, rhs.columns);
+        }
+
+        /// To prevent a race between copy-constructor and other uses of this structure.
+        mutable std::mutex mutex{};
+        std::set<std::string> databases{};
+        std::set<std::string> tables{};
+        std::set<std::string> columns{};
     };
 
     QueryAccessInfo query_access_info;

From 1d1e53f5d3c68f82a5491e15a972983c6f7f8add Mon Sep 17 00:00:00 2001
From: Nikita Mikhailov <jakalletti@jakalletti-build.sas.yp-c.yandex.net>
Date: Wed, 20 Jan 2021 15:37:53 +0300
Subject: [PATCH 219/611] style

---
 src/Interpreters/Context.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index 1bd901d40c6..a74875376ec 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -212,7 +212,7 @@ private:
             return *this;
         }
 
-        void swap(QueryAccessInfo & rhs) 
+        void swap(QueryAccessInfo & rhs)
         {
             std::swap(databases, rhs.databases);
             std::swap(tables, rhs.tables);

From d0fc7098a7f72ab291bf95d8fd14920054ce56a6 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Wed, 20 Jan 2021 15:58:23 +0300
Subject: [PATCH 220/611] Fix tests.

---
 tests/queries/0_stateless/01508_explain_header.reference | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/queries/0_stateless/01508_explain_header.reference b/tests/queries/0_stateless/01508_explain_header.reference
index 5f9e8cfed84..4bfbe1c818b 100644
--- a/tests/queries/0_stateless/01508_explain_header.reference
+++ b/tests/queries/0_stateless/01508_explain_header.reference
@@ -1,4 +1,4 @@
-Expression (Projection + Before ORDER BY)
+Expression ((Projection + Before ORDER BY))
 Header: x UInt8
   SettingQuotaAndLimits (Set limits and quota after reading from storage)
   Header: dummy UInt8

From 6cf4ed5c42270385248f6dfd44604319082a1eb4 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Wed, 20 Jan 2021 16:18:41 +0300
Subject: [PATCH 221/611] Refactor now64

---
 src/Functions/now64.cpp | 81 +++++++++++++++++++++++++++++++++--------
 1 file changed, 65 insertions(+), 16 deletions(-)

diff --git a/src/Functions/now64.cpp b/src/Functions/now64.cpp
index fb6f7a0366d..ac418312698 100644
--- a/src/Functions/now64.cpp
+++ b/src/Functions/now64.cpp
@@ -15,6 +15,7 @@ namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int CANNOT_CLOCK_GETTIME;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 }
 
 namespace
@@ -44,29 +45,77 @@ Field nowSubsecond(UInt32 scale)
                         scale);
 }
 
-class FunctionNow64 : public IFunction
+/// Get the current time. (It is a constant, it is evaluated once for the entire query.)
+class ExecutableFunctionNow64 : public IExecutableFunctionImpl
+{
+public:
+    explicit ExecutableFunctionNow64(Field time_) : time_value(time_) {}
+
+    String getName() const override { return "now64"; }
+
+    ColumnPtr execute(const ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
+    {
+        return result_type->createColumnConst(input_rows_count, time_value);
+    }
+
+private:
+    Field time_value;
+};
+
+class FunctionBaseNow64 : public IFunctionBaseImpl
+{
+public:
+    explicit FunctionBaseNow64(Field time_, DataTypePtr return_type_) : time_value(time_), return_type(return_type_) {}
+
+    String getName() const override { return "now64"; }
+
+    const DataTypes & getArgumentTypes() const override
+    {
+        static const DataTypes argument_types;
+        return argument_types;
+    }
+
+    const DataTypePtr & getResultType() const override
+    {
+        return return_type;
+    }
+
+    ExecutableFunctionImplPtr prepare(const ColumnsWithTypeAndName &) const override
+    {
+        return std::make_unique<ExecutableFunctionNow64>(time_value);
+    }
+
+    bool isDeterministic() const override { return false; }
+    bool isDeterministicInScopeOfQuery() const override { return true; }
+
+private:
+    Field time_value;
+    DataTypePtr return_type;
+};
+
+class Now64OverloadResolver : public IFunctionOverloadResolverImpl
 {
 public:
     static constexpr auto name = "now64";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionNow64>(); }
 
-    String getName() const override
-    {
-        return name;
-    }
+    String getName() const override { return name; }
 
-    bool isVariadic() const override { return true; }
-    size_t getNumberOfArguments() const override { return 0; }
-    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return ColumnNumbers{0}; }
     bool isDeterministic() const override { return false; }
 
-    // Return type depends on argument value.
-    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    bool isVariadic() const override { return true; }
+
+    size_t getNumberOfArguments() const override { return 0; }
+    static FunctionOverloadResolverImplPtr create(const Context &) { return std::make_unique<Now64OverloadResolver>(); }
+
+    DataTypePtr getReturnType(const ColumnsWithTypeAndName & arguments) const override
     {
         UInt32 scale = DataTypeDateTime64::default_scale;
 
-        // Type check is similar to the validateArgumentType, trying to keep error codes and messages as close to the said function as possible.
-        if (!arguments.empty())
+        if (arguments.size() > 1)
+        {
+            throw Exception("Arguments size of function " + getName() + " should be 0 or 1", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+        }
+        if (arguments.size() == 1)
         {
             const auto & argument = arguments[0];
             if (!isInteger(argument.type) || !argument.column || !isColumnConst(*argument.column))
@@ -82,10 +131,10 @@ public:
         return std::make_shared<DataTypeDateTime64>(scale);
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
+    FunctionBaseImplPtr build(const ColumnsWithTypeAndName &, const DataTypePtr & result_type) const override
     {
         const UInt32 scale = assert_cast<const DataTypeDateTime64 *>(result_type.get())->getScale();
-        return result_type->createColumnConst(input_rows_count, nowSubsecond(scale));
+        return std::make_unique<FunctionBaseNow64>(nowSubsecond(scale), result_type);
     }
 };
 
@@ -93,7 +142,7 @@ public:
 
 void registerFunctionNow64(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionNow64>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<Now64OverloadResolver>(FunctionFactory::CaseInsensitive);
 }
 
 }

From ac438f8ee7cedb85fef4a9888fe506e3d25e87c2 Mon Sep 17 00:00:00 2001
From: Yatsishin Ilya <2159081+qoega@users.noreply.github.com>
Date: Wed, 20 Jan 2021 17:31:56 +0300
Subject: [PATCH 222/611] add Sanitizer report issue template

---
 .github/ISSUE_TEMPLATE/95_sanitizer-report.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/95_sanitizer-report.md

diff --git a/.github/ISSUE_TEMPLATE/95_sanitizer-report.md b/.github/ISSUE_TEMPLATE/95_sanitizer-report.md
new file mode 100644
index 00000000000..4dfcf17c60f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/95_sanitizer-report.md
@@ -0,0 +1,19 @@
+---
+name: Sanitizer alert
+about: Potential issue has been found by special code instrumentation
+title: ''
+labels: testing
+assignees: ''
+
+---
+
+(you don't have to strictly follow this form)
+
+**Describe the bug**
+A link to the report
+
+**How to reproduce**
+Try to reproduce the report and copy the tables and queries involved.
+
+**Error message and/or stacktrace**
+You can find additional information in server logs.

From 166fcd80b5bb178032d690b8585b574c190bc7d4 Mon Sep 17 00:00:00 2001
From: Evgenia Sudarikova <56156889+otrazhenia@users.noreply.github.com>
Date: Wed, 20 Jan 2021 18:27:59 +0300
Subject: [PATCH 223/611] DOCSUP-5600: Edit and translate to Russian (#19152)

---
 docs/en/interfaces/cli.md                        |  6 +++---
 docs/ru/interfaces/cli.md                        | 14 +++++++-------
 docs/ru/sql-reference/functions/url-functions.md |  4 ++++
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/docs/en/interfaces/cli.md b/docs/en/interfaces/cli.md
index 3474c22f48e..7e072e366dc 100644
--- a/docs/en/interfaces/cli.md
+++ b/docs/en/interfaces/cli.md
@@ -110,17 +110,17 @@ You can pass parameters to `clickhouse-client` (all parameters have a default va
 
 ### Command Line Options {#command-line-options}
 
--   `--host, -h` -– The server name, ‘localhost’ by default. You can use either the name or the IPv4 or IPv6 address.
+-   `--host, -h` – The server name, ‘localhost’ by default. You can use either the name or the IPv4 or IPv6 address.
 -   `--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. You must specify either `query` or `queries-file` option.
--   `--queries-file, -qf` - file path with queries to execute. You must specify either `query` or `queries-file` option.
+-   `--queries-file, -qf` – file path with queries to execute. You must specify either `query` or `queries-file` option.
 -   `--database, -d` – Select the current default database. Default value: the current database from the server settings (‘default’ by default).
 -   `--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’. In this format, each value is printed on a separate line, which is helpful when displaying wide tables.
+-   `--vertical, -E` – If specified, use the [Vertical format](../interfaces/formats.md#vertical) by default to output the result. This is the same as `–format=Vertical`. In this format, each value is printed on a separate line, which is helpful when displaying wide tables.
 -   `--time, -t` – If specified, print the query execution time to ‘stderr’ in non-interactive mode.
 -   `--stacktrace` – If specified, also print the stack trace if an exception occurs.
 -   `--config-file` – The name of the configuration file.
diff --git a/docs/ru/interfaces/cli.md b/docs/ru/interfaces/cli.md
index 03d669c5def..b1d8c4f0732 100644
--- a/docs/ru/interfaces/cli.md
+++ b/docs/ru/interfaces/cli.md
@@ -116,18 +116,18 @@ $ clickhouse-client --param_tbl="numbers" --param_db="system" --param_col="numbe
 
 ### Параметры командной строки {#parametry-komandnoi-stroki}
 
--   `--host, -h` — имя сервера, по умолчанию — localhost. Вы можете использовать как имя, так и IPv4 или IPv6 адрес.
--   `--port` — порт, к которому соединяться, по умолчанию — 9000. Замечу, что для HTTP и родного интерфейса используются разные порты.
--   `--user, -u` — имя пользователя, по умолчанию — default.
+-   `--host, -h` — имя сервера, по умолчанию — ‘localhost’. Вы можете использовать как имя, так и IPv4 или IPv6 адрес.
+-   `--port` — порт для подключения, по умолчанию — 9000. Обратите внимание: для HTTP-интерфейса и нативного интерфейса используются разные порты.
+-   `--user, -u` — имя пользователя, по умолчанию — ‘default’.
 -   `--password` — пароль, по умолчанию — пустая строка.
 -   `--query, -q` — запрос для выполнения, при использовании в неинтерактивном режиме.
--   `--database, -d` — выбрать текущую БД, по умолчанию — текущая БД из настроек сервера (по умолчанию — БД default).
+-   `--database, -d` — выбрать текущую БД. Без указания значение берется из настроек сервера (по умолчанию — БД ‘default’).
 -   `--multiline, -m` — если указано — разрешить многострочные запросы, не отправлять запрос по нажатию Enter.
 -   `--multiquery, -n` — если указано — разрешить выполнять несколько запросов, разделённых точкой с запятой.
 -   `--format, -f` — использовать указанный формат по умолчанию для вывода результата.
--   `--vertical, -E` — если указано, использовать формат Vertical по умолчанию для вывода результата. То же самое, что –format=Vertical. В этом формате каждое значение выводится на отдельной строке, что удобно для отображения широких таблиц.
--   `--time, -t` — если указано, в неинтерактивном режиме вывести время выполнения запроса в stderr.
--   `--stacktrace` — если указано, в случае исключения, выводить также его стек трейс.
+-   `--vertical, -E` — если указано, использовать по умолчанию формат [Vertical](../interfaces/formats.md#vertical) для вывода результата. То же самое, что `–format=Vertical`. В этом формате каждое значение выводится на отдельной строке, что удобно для отображения широких таблиц.
+-   `--time, -t` — если указано, в неинтерактивном режиме вывести время выполнения запроса в поток ‘stderr’.
+-   `--stacktrace` — если указано, в случае исключения, выводить также его стек-трейс.
 -   `--config-file` — имя конфигурационного файла.
 -   `--secure` — если указано, будет использован безопасный канал.
 -   `--param_<name>` — значение параметра для [запроса с параметрами](#cli-queries-with-parameters).
diff --git a/docs/ru/sql-reference/functions/url-functions.md b/docs/ru/sql-reference/functions/url-functions.md
index 8f10a1ebd2b..1008e2a359c 100644
--- a/docs/ru/sql-reference/functions/url-functions.md
+++ b/docs/ru/sql-reference/functions/url-functions.md
@@ -115,6 +115,10 @@ SELECT topLevelDomain('svn+ssh://www.some.svn-hosting.com:80/repo/trunk')
 
 Например, `cutToFirstSignificantSubdomain('https://news.yandex.com.tr/') = 'yandex.com.tr'`.
 
+### port(URL[, default_port = 0]) {#port}
+
+Возвращает порт или значение `default_port`, если в URL-адресе нет порта (или передан невалидный URL) 
+
 ### path {#path}
 
 Возвращает путь. Пример: `/top/news.html` Путь не включает в себя query string.

From 25d8c047c5d7238aa9f4176911d3ffa00fa4080d Mon Sep 17 00:00:00 2001
From: Daniel Qin <danielqinling@gmail.com>
Date: Wed, 20 Jan 2021 23:34:17 +0800
Subject: [PATCH 224/611] Add a check to avoid exception when long alias equals
 to column (#18968)

* Add a check to avoid exception when long alias equas to column

* try fix with add an underlying table name, add function test

* format code

Co-authored-by: Ling Qin <lqin@freewheel.com>
---
 .../JoinToSubqueryTransformVisitor.cpp        | 16 +++++-
 src/Parsers/ASTIdentifier.cpp                 |  4 ++
 ..._multiple_left_join_with_aliases.reference |  0
 .../01600_multiple_left_join_with_aliases.sql | 52 +++++++++++++++++++
 4 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 tests/queries/0_stateless/01600_multiple_left_join_with_aliases.reference
 create mode 100644 tests/queries/0_stateless/01600_multiple_left_join_with_aliases.sql

diff --git a/src/Interpreters/JoinToSubqueryTransformVisitor.cpp b/src/Interpreters/JoinToSubqueryTransformVisitor.cpp
index 372bbfbe648..772077ba92a 100644
--- a/src/Interpreters/JoinToSubqueryTransformVisitor.cpp
+++ b/src/Interpreters/JoinToSubqueryTransformVisitor.cpp
@@ -467,6 +467,7 @@ std::vector<TableNeededColumns> normalizeColumnNamesExtractNeeded(
 
     for (ASTIdentifier * ident : identifiers)
     {
+
         bool got_alias = aliases.count(ident->name());
         bool allow_ambiguous = got_alias; /// allow ambiguous column overridden by an alias
 
@@ -475,8 +476,19 @@ std::vector<TableNeededColumns> normalizeColumnNamesExtractNeeded(
             if (!ident->isShort())
             {
                 if (got_alias)
-                    throw Exception("Alias clashes with qualified column '" + ident->name() + "'", ErrorCodes::AMBIGUOUS_COLUMN_NAME);
-
+                {
+                    auto alias = aliases.find(ident->name())->second;
+                    auto alias_table = IdentifierSemantic::getTableName(alias->ptr());
+                    bool alias_equals_column_name = false;
+                    if ((!ident->isShort() && alias->ptr()->getColumnNameWithoutAlias() == ident->getColumnNameWithoutAlias())
+                        || (alias_table == IdentifierSemantic::getTableName(ident->ptr())
+                            && ident->shortName() == alias->as<ASTIdentifier>()->shortName()))
+                    {
+                        alias_equals_column_name = true;
+                    }
+                    if (!alias_equals_column_name)
+                        throw Exception("Alias clashes with qualified column '" + ident->name() + "'", ErrorCodes::AMBIGUOUS_COLUMN_NAME);
+                }
                 String short_name = ident->shortName();
                 String original_long_name;
                 if (public_identifiers.count(ident))
diff --git a/src/Parsers/ASTIdentifier.cpp b/src/Parsers/ASTIdentifier.cpp
index 2717edd3b91..54ccc155dbf 100644
--- a/src/Parsers/ASTIdentifier.cpp
+++ b/src/Parsers/ASTIdentifier.cpp
@@ -80,8 +80,12 @@ void ASTIdentifier::setShortName(const String & new_name)
     name_parts = {new_name};
 
     bool special = semantic->special;
+    //how about keep the semantic info here, such as table
+    auto table = semantic->table;
+
     *semantic = IdentifierSemanticImpl();
     semantic->special = special;
+    semantic->table = table;
 }
 
 const String & ASTIdentifier::name() const
diff --git a/tests/queries/0_stateless/01600_multiple_left_join_with_aliases.reference b/tests/queries/0_stateless/01600_multiple_left_join_with_aliases.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01600_multiple_left_join_with_aliases.sql b/tests/queries/0_stateless/01600_multiple_left_join_with_aliases.sql
new file mode 100644
index 00000000000..9eb4221d063
--- /dev/null
+++ b/tests/queries/0_stateless/01600_multiple_left_join_with_aliases.sql
@@ -0,0 +1,52 @@
+drop database if exists test_01600;
+create database test_01600;
+
+CREATE TABLE test_01600.base
+(
+`id` UInt64,
+`id2` UInt64,
+`d` UInt64,
+`value` UInt64
+)
+ENGINE=MergeTree()
+PARTITION BY d
+ORDER BY (id,id2,d);
+
+CREATE TABLE test_01600.derived1
+(
+    `id1` UInt64,
+    `d1` UInt64,
+    `value1` UInt64
+)
+ENGINE = MergeTree()
+PARTITION BY d1
+ORDER BY (id1, d1)
+;
+
+CREATE TABLE test_01600.derived2
+(
+    `id2` UInt64,
+    `d2` UInt64,
+    `value2` UInt64
+)
+ENGINE = MergeTree()
+PARTITION BY d2
+ORDER BY (id2, d2)
+;
+
+select 
+base.id as `base.id`,
+derived2.value2 as `derived2.value2`,
+derived1.value1 as `derived1.value1`
+from test_01600.base as base 
+left join test_01600.derived2 as derived2 on base.id2 = derived2.id2
+left join test_01600.derived1 as derived1 on base.id = derived1.id1;
+
+
+SELECT
+    base.id AS `base.id`,
+    derived1.value1 AS `derived1.value1`
+FROM test_01600.base AS base
+LEFT JOIN test_01600.derived1 AS derived1 ON base.id = derived1.id1;
+
+drop database test_01600;

From 6458d210408e3e3e13fd15556f9c5830f755bb1c Mon Sep 17 00:00:00 2001
From: George <gyuton@yandex-team.ru>
Date: Wed, 20 Jan 2021 18:38:35 +0300
Subject: [PATCH 225/611] various fixes

---
 .../utilities/clickhouse-benchmark.md         |  4 +--
 .../utilities/clickhouse-benchmark.md         | 28 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/docs/en/operations/utilities/clickhouse-benchmark.md b/docs/en/operations/utilities/clickhouse-benchmark.md
index 49c18b02e2d..92a96f8cd6e 100644
--- a/docs/en/operations/utilities/clickhouse-benchmark.md
+++ b/docs/en/operations/utilities/clickhouse-benchmark.md
@@ -40,10 +40,10 @@ clickhouse-benchmark [keys] < queries_file;
 
 ## Keys {#clickhouse-benchmark-keys}
 
--   `--query=WORD` — Query to execute. If this parameter is not passed, `clickhouse-benchmark` will read queries from standard input. 
+-   `--query=QUERY` — Query to execute. If this parameter is not passed, `clickhouse-benchmark` will read queries from standard input. 
 -   `-c N`, `--concurrency=N` — Number of queries that `clickhouse-benchmark` sends simultaneously. Default value: 1.
 -   `-d N`, `--delay=N` — Interval in seconds between intermediate reports (to disable reports set 0). Default value: 1.
--   `-h WORD`, `--host=WORD` — Server host. Default value: `localhost`. For the [comparison mode](#clickhouse-benchmark-comparison-mode) you can use multiple `-h` keys.
+-   `-h HOST`, `--host=HOST` — Server host. Default value: `localhost`. For the [comparison mode](#clickhouse-benchmark-comparison-mode) you can use multiple `-h` keys.
 -   `-p N`, `--port=N` — Server port. Default value: 9000. For the [comparison mode](#clickhouse-benchmark-comparison-mode) you can use multiple `-p` keys.
 -   `-i N`, `--iterations=N` — Total number of queries. Default value: 0 (repeat forever).
 -   `-r`, `--randomize` — Random order of queries execution if there is more than one input query.
diff --git a/docs/ru/operations/utilities/clickhouse-benchmark.md b/docs/ru/operations/utilities/clickhouse-benchmark.md
index 4579418b63a..2a883cf3bb5 100644
--- a/docs/ru/operations/utilities/clickhouse-benchmark.md
+++ b/docs/ru/operations/utilities/clickhouse-benchmark.md
@@ -5,7 +5,7 @@ toc_title: clickhouse-benchmark
 
 # clickhouse-benchmark {#clickhouse-benchmark}
 
-Устанавливает соединение с сервером ClickHouse и неоднократно посылает указанные запросы.
+Устанавливает соединение с сервером ClickHouse и запускает циклическое выполнение указанных запросов.
 
 **Синтаксис**
 
@@ -25,7 +25,7 @@ $ echo "single query" | clickhouse-benchmark [keys]
 $ clickhouse-benchmark [keys] <<< "single query"
 ```
 
-Если нужно послать набор запросов, создайте текстовый файл и расположите каждый запрос на отдельной строке в файле. Например:
+Если нужно выполнить набор запросов, создайте текстовый файл и расположите каждый запрос на отдельной строке в файле. Например:
 
 ``` sql
 SELECT * FROM system.numbers LIMIT 10000000;
@@ -40,22 +40,22 @@ clickhouse-benchmark [keys] < queries_file;
 
 ## Ключи {#clickhouse-benchmark-keys}
 
--   `--query=WORD` — запрос для исполнения. Если параметр не передан, `clickhouse-benchmark` будет считывать запросы из стандартного ввода. 
+-   `--query=QUERY` — исполняемый запрос. Если параметр не передан, `clickhouse-benchmark` будет считывать запросы из стандартного ввода. 
 -   `-c N`, `--concurrency=N` — количество запросов, которые `clickhouse-benchmark` отправляет одновременно. Значение по умолчанию: 1.
--   `-d N`, `--delay=N` — интервал в секундах между промежуточными сообщениями (чтобы отключить сообщения, установите 0). Значение по умолчанию: 1.
--   `-h WORD`, `--host=WORD` — хост сервера. Значение по умолчанию: `localhost`. Для [сравнительного режима](#clickhouse-benchmark-comparison-mode) можно использовать несколько `-h` ключей. 
--   `-p N`, `--port=N` — порт сервера. Значение по умолчанию: 9000. Для [сравнительного режима](#clickhouse-benchmark-comparison-mode) можно использовать несколько `-p` ключей. 
+-   `-d N`, `--delay=N` — интервал в секундах между промежуточными отчетами (чтобы отключить отчеты, установите 0). Значение по умолчанию: 1.
+-   `-h HOST`, `--host=HOST` — хост сервера. Значение по умолчанию: `localhost`. Для [режима сравнения](#clickhouse-benchmark-comparison-mode) можно использовать несколько `-h` ключей. 
+-   `-p N`, `--port=N` — порт сервера. Значение по умолчанию: 9000. Для [режима сравнения](#clickhouse-benchmark-comparison-mode) можно использовать несколько `-p` ключей. 
 -   `-i N`, `--iterations=N` — общее число запросов. Значение по умолчанию: 0 (вечно будет повторяться).
--   `-r`, `--randomize` — случайный порядок выполнения запросов при наличии более одного входного запроса.
+-   `-r`, `--randomize` — использовать случайный порядок выполнения запросов при наличии более одного входного запроса.
 -   `-s`, `--secure` — используется `TLS` соединение.
 -   `-t N`, `--timelimit=N` — лимит по времени в секундах. `clickhouse-benchmark` перестает отправлять запросы при достижении лимита по времени. Значение по умолчанию: 0 (лимит отключен).
--   `--confidence=N` — уровень доверия для  T-критерия. Возможные значения: 0 (80%), 1 (90%), 2 (95%), 3 (98%), 4 (99%), 5 (99.5%). Значение по умолчанию: 5. В [сравнительном режиме](#clickhouse-benchmark-comparison-mode) `clickhouse-benchmark` проверяет [двухвыборочный  t-критерий Стьюдента для независимых выборок](https://en.wikipedia.org/wiki/Student%27s_t-test#Independent_two-sample_t-test) чтобы определить, различны ли две выборки при выбранном уровне доверия.
--   `--cumulative` — выводит совокупность данных, а не данные за интервал.
+-   `--confidence=N` — уровень доверия для  T-критерия. Возможные значения: 0 (80%), 1 (90%), 2 (95%), 3 (98%), 4 (99%), 5 (99.5%). Значение по умолчанию: 5. В [режиме сравнения](#clickhouse-benchmark-comparison-mode) `clickhouse-benchmark` проверяет [двухвыборочный  t-критерий Стьюдента для независимых выборок](https://en.wikipedia.org/wiki/Student%27s_t-test#Independent_two-sample_t-test) чтобы определить, различны ли две выборки при выбранном уровне доверия.
+-   `--cumulative` — выводить статистику за все время работы, а не за последний временной интервал.
 -   `--database=DATABASE_NAME` — имя базы данных ClickHouse. Значение по умолчанию: `default`. 
--   `--json=FILEPATH` — формат вывода `JSON`. Когда этот ключ указан, `clickhouse-benchmark` выводит сообщение в указанный JSON-файл.
+-   `--json=FILEPATH` — дополнительный вывод в формате `JSON`. Когда этот ключ указан, `clickhouse-benchmark` выводит отчет в указанный JSON-файл.
 -   `--user=USERNAME` — имя пользователя ClickHouse. Значение по умолчанию: `default`.
 -   `--password=PSWD` — пароль пользователя ClickHouse. Значение по умолчанию: пустая строка.
--   `--stacktrace` — вывод трассировки стека исключений.
+-   `--stacktrace` — вывод трассировки стека исключений. Когда этот ключ указан, `clickhouse-bencmark` выводит трассировку стека исключений.
 -   `--stage=WORD` — стадия обработки запроса на сервере. ClickHouse останавливает обработку запроса и возвращает ответ `clickhouse-benchmark` на заданной стадии. Возможные значения: `complete`, `fetch_columns`, `with_mergeable_state`. Значение по умолчанию: `complete`. 
 -   `--help` — показывает справку.
 
@@ -94,17 +94,17 @@ localhost:9000, queries 10, QPS: 6.772, RPS: 67904487.440, MiB/s: 518.070, resul
 
 -   Строка статуса, содержащая (в таком же порядке):
 
-    -   Конечная точка сервера ClickHouse.
+    -   Endpoint сервера ClickHouse.
     -   Число обработанных запросов.
     -   QPS: количество запросов, выполняемых сервером за секунду в течение `--delay` интервала.
     -   RPS: количество строк, читаемых сервером за секунду в течение `--delay` интервала.
     -   MiB/s: количество Мебибайтов, считываемых сервером за секунду в течение `--delay` интервала.
-    -   result RPS: количество столбцов, размещаемое сервером в результат запроса за секунду в течение `--delay` интервала.
+    -   result RPS: количество строк, добавленное сервером в результат запроса за секунду в течение `--delay` интервала.
     -   result MiB/s. количество Мебибайтов, размещаемое сервером в результат запроса за секунду в течение `--delay` интервала.
 
 -   Процентили времени выполнения запросов.
 
-## Сравнительный режим {#clickhouse-benchmark-comparison-mode}
+## Режим сравнения {#clickhouse-benchmark-comparison-mode}
 
 `clickhouse-benchmark` может сравнивать производительность двух работающих серверов ClickHouse.
 

From 6560ec3ed553409fa8d63db9f95287039c218471 Mon Sep 17 00:00:00 2001
From: Alexander Tokmakov <avtokmakov@yandex-team.ru>
Date: Wed, 20 Jan 2021 19:36:18 +0300
Subject: [PATCH 226/611] fix segfault on aggregation when MV has unexpected
 structure

---
 src/AggregateFunctions/AggregateFunctionSum.h |  8 ++--
 src/Storages/StorageMaterializedView.cpp      | 24 ++++++++---
 ...ialized_view_different_structure.reference |  6 +++
 ..._materialized_view_different_structure.sql | 42 +++++++++++++++++++
 4 files changed, 71 insertions(+), 9 deletions(-)
 create mode 100644 tests/queries/0_stateless/01182_materialized_view_different_structure.reference
 create mode 100644 tests/queries/0_stateless/01182_materialized_view_different_structure.sql

diff --git a/src/AggregateFunctions/AggregateFunctionSum.h b/src/AggregateFunctions/AggregateFunctionSum.h
index 1038c8107a5..134b7e490d1 100644
--- a/src/AggregateFunctions/AggregateFunctionSum.h
+++ b/src/AggregateFunctions/AggregateFunctionSum.h
@@ -287,7 +287,7 @@ public:
 
     void add(AggregateDataPtr place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
-        const auto & column = static_cast<const ColVecType &>(*columns[0]);
+        const auto & column = assert_cast<const ColVecType &>(*columns[0]);
         if constexpr (is_big_int_v<T>)
             this->data(place).add(static_cast<TResult>(column.getData()[row_num]));
         else
@@ -309,7 +309,7 @@ public:
         }
         else
         {
-            const auto & column = static_cast<const ColVecType &>(*columns[0]);
+            const auto & column = assert_cast<const ColVecType &>(*columns[0]);
             this->data(place).addMany(column.getData().data(), batch_size);
         }
     }
@@ -327,7 +327,7 @@ public:
         }
         else
         {
-            const auto & column = static_cast<const ColVecType &>(*columns[0]);
+            const auto & column = assert_cast<const ColVecType &>(*columns[0]);
             this->data(place).addManyNotNull(column.getData().data(), null_map, batch_size);
         }
     }
@@ -349,7 +349,7 @@ public:
 
     void insertResultInto(AggregateDataPtr place, IColumn & to, Arena *) const override
     {
-        auto & column = static_cast<ColVecResult &>(to);
+        auto & column = assert_cast<ColVecResult &>(to);
         column.getData().push_back(this->data(place).get());
     }
 
diff --git a/src/Storages/StorageMaterializedView.cpp b/src/Storages/StorageMaterializedView.cpp
index 61fdbc0198b..9b5a4bad697 100644
--- a/src/Storages/StorageMaterializedView.cpp
+++ b/src/Storages/StorageMaterializedView.cpp
@@ -11,6 +11,7 @@
 #include <Interpreters/InterpreterRenameQuery.h>
 #include <Interpreters/getTableExpressions.h>
 #include <Interpreters/AddDefaultDatabaseVisitor.h>
+#include <Interpreters/getHeaderForProcessingStage.h>
 #include <Access/AccessFlags.h>
 #include <DataStreams/IBlockInputStream.h>
 #include <DataStreams/IBlockOutputStream.h>
@@ -24,6 +25,7 @@
 #include <Common/checkStackSize.h>
 #include <Processors/Sources/SourceFromInputStream.h>
 #include <Processors/QueryPlan/SettingQuotaAndLimitsStep.h>
+#include <Processors/QueryPlan/ExpressionStep.h>
 
 
 namespace DB
@@ -130,7 +132,7 @@ Pipe StorageMaterializedView::read(
 void StorageMaterializedView::read(
     QueryPlan & query_plan,
     const Names & column_names,
-    const StorageMetadataPtr & /*metadata_snapshot*/,
+    const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
     const Context & context,
     QueryProcessingStage::Enum processed_stage,
@@ -139,15 +141,27 @@ void StorageMaterializedView::read(
 {
     auto storage = getTargetTable();
     auto lock = storage->lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
-    auto metadata_snapshot = storage->getInMemoryMetadataPtr();
+    auto target_metadata_snapshot = storage->getInMemoryMetadataPtr();
 
     if (query_info.order_optimizer)
-        query_info.input_order_info = query_info.order_optimizer->getInputOrder(metadata_snapshot, context);
+        query_info.input_order_info = query_info.order_optimizer->getInputOrder(target_metadata_snapshot, context);
 
-    storage->read(query_plan, column_names, metadata_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
+    storage->read(query_plan, column_names, target_metadata_snapshot, query_info, 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 target_header = getHeaderForProcessingStage(*storage, column_names, target_metadata_snapshot, query_info, context, processed_stage);
+        if (!blocksHaveEqualStructure(mv_header, target_header))
+        {
+            auto converting_actions = ActionsDAG::makeConvertingActions(target_header.getColumnsWithTypeAndName(),
+                                                                        mv_header.getColumnsWithTypeAndName(),
+                                                                        ActionsDAG::MatchColumnsMode::Name);
+            auto converting_step = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), converting_actions);
+            converting_step->setStepDescription("Convert target table structure to MaterializedView structure");
+            query_plan.addStep(std::move(converting_step));
+        }
+
         StreamLocalLimits limits;
         SizeLimits leaf_limits;
 
@@ -161,7 +175,7 @@ void StorageMaterializedView::read(
                 nullptr,
                 nullptr);
 
-        adding_limits_and_quota->setStepDescription("Lock destination table for Buffer");
+        adding_limits_and_quota->setStepDescription("Lock destination table for MaterializedView");
         query_plan.addStep(std::move(adding_limits_and_quota));
     }
 }
diff --git a/tests/queries/0_stateless/01182_materialized_view_different_structure.reference b/tests/queries/0_stateless/01182_materialized_view_different_structure.reference
new file mode 100644
index 00000000000..a1f113394b2
--- /dev/null
+++ b/tests/queries/0_stateless/01182_materialized_view_different_structure.reference
@@ -0,0 +1,6 @@
+4999950000.000000
+4999950000
+1000	499500	499500	999	0
+1000	124716	499500	255	0
+1000	124716	99	0
+2000	249432	255	0
diff --git a/tests/queries/0_stateless/01182_materialized_view_different_structure.sql b/tests/queries/0_stateless/01182_materialized_view_different_structure.sql
new file mode 100644
index 00000000000..751bcc9e48e
--- /dev/null
+++ b/tests/queries/0_stateless/01182_materialized_view_different_structure.sql
@@ -0,0 +1,42 @@
+DROP TABLE IF EXISTS test_table;
+DROP TABLE IF EXISTS numbers;
+DROP TABLE IF EXISTS test_mv;
+DROP TABLE IF EXISTS src;
+DROP TABLE IF EXISTS dst;
+DROP TABLE IF EXISTS mv;
+DROP TABLE IF EXISTS dist;
+
+CREATE TABLE test_table (key UInt32, value Decimal(16, 6)) ENGINE = SummingMergeTree() ORDER BY key;
+CREATE TABLE numbers (number UInt64) ENGINE=Memory;
+
+CREATE MATERIALIZED VIEW test_mv TO test_table (number UInt64, value Decimal(38, 6))
+AS SELECT number, sum(number) AS value FROM (SELECT *, toDecimal64(number, 6) AS val FROM numbers) GROUP BY number;
+
+INSERT INTO numbers SELECT * FROM numbers(100000);
+
+SELECT sum(value) FROM test_mv;
+SELECT sum(value) FROM (SELECT number, sum(number) AS value FROM (SELECT *, toDecimal64(number, 6) AS val FROM numbers) GROUP BY number);
+
+CREATE TABLE src (n UInt64, s FixedString(16)) ENGINE=Memory;
+CREATE TABLE dst (n UInt8, s String) ENGINE = Memory;
+CREATE MATERIALIZED VIEW mv TO dst (n String) AS SELECT * FROM src;
+SET allow_experimental_bigint_types=1;
+CREATE TABLE dist (n Int128) ENGINE=Distributed(test_cluster_two_shards, currentDatabase(), mv);
+
+INSERT INTO src SELECT number, toString(number) FROM numbers(1000);
+INSERT INTO mv SELECT toString(number + 1000) FROM numbers(1000); -- { serverError 53 }
+INSERT INTO mv SELECT arrayJoin(['42', 'test']); -- { serverError 53 }
+
+SELECT count(), sum(n), sum(toInt64(s)), max(n), min(n) FROM src;
+SELECT count(), sum(n), sum(toInt64(s)), max(n), min(n) FROM dst;
+SELECT count(), sum(toInt64(n)), max(n), min(n) FROM mv;
+SELECT count(), sum(toInt64(n)), max(n), min(n) FROM dist; -- { serverError 70 }
+SELECT count(), sum(toInt64(n)), max(toUInt32(n)), min(toInt128(n)) FROM dist;
+
+DROP TABLE test_table;
+DROP TABLE numbers;
+DROP TABLE test_mv;
+DROP TABLE src;
+DROP TABLE dst;
+DROP TABLE mv;
+DROP TABLE dist;

From 8da4aa5bf08a2898b8e40634e1f45f69422d805d Mon Sep 17 00:00:00 2001
From: romanzhukov <romanzhukov@yandex-team.ru>
Date: Wed, 20 Jan 2021 20:10:35 +0300
Subject: [PATCH 227/611] DOCSUP-5272: fix PR and ticket comments

---
 .../sql-reference/statements/create/table.md  | 21 ++++++++++++++-----
 .../sql-reference/statements/create/table.md  | 21 ++++++++++++++-----
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/docs/en/sql-reference/statements/create/table.md b/docs/en/sql-reference/statements/create/table.md
index 95ac0252eaa..3b7506ae89a 100644
--- a/docs/en/sql-reference/statements/create/table.md
+++ b/docs/en/sql-reference/statements/create/table.md
@@ -111,19 +111,30 @@ It is not possible to set default values for elements in nested data structures.
 
 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
+- Inside the column list
 
 ``` sql
-CREATE TABLE db.table_name (name1 type1, name2 type2, ..., PRIMARY KEY (expr1[, expr2,...])]) ENGINE = engine;
+CREATE TABLE db.table_name 
+( 
+    name1 type1, name2 type2, ..., 
+    PRIMARY KEY(expr1[, expr2,...])]
+) 
+ENGINE = engine;
 ```
 
-- outside the column list
+- Outside the column list
 
 ``` sql
-CREATE TABLE db.table_name (name1 type1, name2 type2, ...) ENGINE = engine PRIMARY KEY(expr1[, expr2,...]);
+CREATE TABLE db.table_name
+( 
+    name1 type1, name2 type2, ...
+) 
+ENGINE = engine
+PRIMARY KEY(expr1[, expr2,...]);
 ```
 
-You can't combine both ways in one query.
+!!! warning "Warning"
+    You can't combine both ways in one query.
 
 ## Constraints {#constraints}
 
diff --git a/docs/ru/sql-reference/statements/create/table.md b/docs/ru/sql-reference/statements/create/table.md
index e91a7f15903..5244774c58c 100644
--- a/docs/ru/sql-reference/statements/create/table.md
+++ b/docs/ru/sql-reference/statements/create/table.md
@@ -85,19 +85,30 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name ENGINE = engine AS SELECT ...
 
 Вы можете определить [первичный ключ](../../../engines/table-engines/mergetree-family/mergetree.md#primary-keys-and-indexes-in-queries) при создании таблицы. Первичный ключ может быть указан двумя способами:
 
-- В списке столбцов:
+- в списке столбцов:
 
 ``` sql
-CREATE TABLE db.table_name (name1 type1, name2 type2, ..., PRIMARY KEY (expr1[, expr2,...])]) ENGINE = engine;
+CREATE TABLE db.table_name 
+( 
+    name1 type1, name2 type2, ..., 
+    PRIMARY KEY(expr1[, expr2,...])]
+) 
+ENGINE = engine;
 ```
 
-- Вне списка столбцов:
+- вне списка столбцов:
 
 ``` sql
-CREATE TABLE db.table_name (name1 type1, name2 type2, ...) ENGINE = engine PRIMARY KEY(expr1[, expr2,...]);
+CREATE TABLE db.table_name
+( 
+    name1 type1, name2 type2, ...
+) 
+ENGINE = engine
+PRIMARY KEY(expr1[, expr2,...]);
 ```
 
-Вы не можете сочетать оба способа в одном запросе.
+!!! warning "Предупреждение"
+    Вы не можете сочетать оба способа в одном запросе.
 
 ### Ограничения (constraints) {#constraints}
 

From 7b4d1fba6aeeed0a395dd135ef662883f84a0855 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <36882414+akuzm@users.noreply.github.com>
Date: Wed, 20 Jan 2021 20:18:02 +0300
Subject: [PATCH 228/611] Update run-fuzzer.sh

---
 docker/test/fuzzer/run-fuzzer.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index 4c16db74ad2..2c44f44bd65 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -175,7 +175,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: .*" server.log > description.txt
+        if ! grep -ao "Received signal.*\|Logical error.*\|Assertion.*failed\|Failed assertion.*\|.*runtime error: .*\|.*is located.*" server.log > description.txt
         then
             echo "Lost connection to server. See the logs" > description.txt
         fi

From 801c540f5e755a928337202e5de8cc73cf5fba29 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Wed, 20 Jan 2021 20:33:12 +0300
Subject: [PATCH 229/611] Try fix tests.

---
 src/Processors/QueryPlan/QueryPlan.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Processors/QueryPlan/QueryPlan.cpp b/src/Processors/QueryPlan/QueryPlan.cpp
index 0e16d97d436..92ee5d4a1d2 100644
--- a/src/Processors/QueryPlan/QueryPlan.cpp
+++ b/src/Processors/QueryPlan/QueryPlan.cpp
@@ -640,6 +640,8 @@ void QueryPlan::optimize()
                 while (tryMergeExpressions(frame.node, frame.node->children.front()));
 
                 trySplitFilter(frame.node, nodes);
+
+                tryLiftUpArrayJoin(frame.node, frame.node->children.front(), nodes);
             }
 
             stack.pop();

From 7d61f27abb2cd8ecd8a0d09657035c70441f58e8 Mon Sep 17 00:00:00 2001
From: Dmitriy <sevirov@yandex-team.ru>
Date: Wed, 20 Jan 2021 20:51:14 +0300
Subject: [PATCH 230/611] Fix ansi.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Разрешаю конфликт с мастером.
---
 docs/en/sql-reference/ansi.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/en/sql-reference/ansi.md b/docs/en/sql-reference/ansi.md
index 84e47902f3b..18243a5f9f5 100644
--- a/docs/en/sql-reference/ansi.md
+++ b/docs/en/sql-reference/ansi.md
@@ -25,15 +25,15 @@ The following table lists cases when query feature works in ClickHouse, but beha
 |------------|--------------------------------------------------------------------------------------------------------------------------|----------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **E011**   | **Numeric data types**                                                                                                   | **Partial**{.text-warning} |                                                                                                                                                                                           |
 | E011-01    | INTEGER and SMALLINT data types                                                                                          | Yes {.text-success}         |                                                                                                                                                                                           |
-| E011-02    | REAL, DOUBLE PRECISION and FLOAT data types data types                                                                   | Yes {.text-warning}         |                                                                                                                                                                                           |
-| E011-03    | DECIMAL and NUMERIC data types                                                                                           | Partial {.text-warning}     | Only `DECIMAL(p,s)` is supported, not `NUMERIC`                                                                                                                                           |
+| E011-02    | REAL, DOUBLE PRECISION and FLOAT data types data types                                                                   | Yes {.text-success}         |                                                                                                                                                                                           |
+| E011-03    | DECIMAL and NUMERIC data types                                                                                           | Yes {.text-success}         |                                                                                                                                                                                           |
 | E011-04    | Arithmetic operators                                                                                                     | Yes {.text-success}         |                                                                                                                                                                                           |
 | E011-05    | Numeric comparison                                                                                                       | Yes {.text-success}         |                                                                                                                                                                                           |
 | E011-06    | Implicit casting among the numeric data types                                                                            | No {.text-danger}           | ANSI SQL allows arbitrary implicit cast between numeric types, while ClickHouse relies on functions having multiple overloads instead of implicit cast                                    |
 | **E021**   | **Character string types**                                                                                               | **Partial**{.text-warning} |                                                                                                                                                                                           |
-| E021-01    | CHARACTER data type                                                                                                      | Yes {.text-danger}          |                                                                                                                                                                                           |
-| E021-02    | CHARACTER VARYING data type                                                                                              | Yes {.text-danger}          |                                                                                                                                                                                           |
-| E021-03    | Character literals                                                                                                       | Partial {.text-warning}     | No automatic concatenation of consecutive literals and character set support                                                                                                              |
+| E021-01    | CHARACTER data type                                                                                                      | Yes {.text-success}         |                                                                                                                                                                                           |
+| E021-02    | CHARACTER VARYING data type                                                                                              | Yes {.text-success}         |                                                                                                                                                                                           |
+| E021-03    | Character literals                                                                                                       | Yes {.text-success}         |                                                                                                                                                                                           |
 | E021-04    | CHARACTER_LENGTH function                                                                                               | Partial {.text-warning}     | No `USING` clause                                                                                                                                                                         |
 | E021-05    | OCTET_LENGTH function                                                                                                   | No {.text-danger}           | `LENGTH` behaves similarly                                                                                                                                                                |
 | E021-06    | SUBSTRING                                                                                                                | Partial {.text-warning}     | No support for `SIMILAR` and `ESCAPE` clauses, no `SUBSTRING_REGEX` variant                                                                                                               |

From 2d87e52b3a2a9db9db6a045b8c24a4dc88a29e5f Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 21 Jan 2021 03:24:44 +0300
Subject: [PATCH 231/611] Fix bad formatting of IPv4 addresses

---
 src/DataTypes/DataTypeNumberBase.h                        | 8 +++++++-
 src/DataTypes/IDataType.h                                 | 2 +-
 .../0_stateless/01656_ipv4_bad_formatting.reference       | 4 ++++
 tests/queries/0_stateless/01656_ipv4_bad_formatting.sql   | 1 +
 4 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 tests/queries/0_stateless/01656_ipv4_bad_formatting.reference
 create mode 100644 tests/queries/0_stateless/01656_ipv4_bad_formatting.sql

diff --git a/src/DataTypes/DataTypeNumberBase.h b/src/DataTypes/DataTypeNumberBase.h
index 0390da2cb6f..cbbc203bf4f 100644
--- a/src/DataTypes/DataTypeNumberBase.h
+++ b/src/DataTypes/DataTypeNumberBase.h
@@ -51,7 +51,13 @@ public:
 
     bool isParametric() const override { return false; }
     bool haveSubtypes() const override { return false; }
-    bool shouldAlignRightInPrettyFormats() const override { return true; }
+
+    bool shouldAlignRightInPrettyFormats() const override
+    {
+        /// Just a number, without customizations. Counterexample: IPv4.
+        return !custom_text_serialization;
+    }
+
     bool textCanContainOnlyValidUTF8() const override { return true; }
     bool isComparable() const override { return true; }
     bool isValueRepresentedByNumber() const override { return true; }
diff --git a/src/DataTypes/IDataType.h b/src/DataTypes/IDataType.h
index b67c5ee1846..cb9fc7f122c 100644
--- a/src/DataTypes/IDataType.h
+++ b/src/DataTypes/IDataType.h
@@ -497,7 +497,7 @@ public:
     /// For all other substreams (like ArraySizes, NullMasks, etc.) we use only
     /// generic compression codecs like LZ4.
     static bool isSpecialCompressionAllowed(const SubstreamPath & path);
-private:
+protected:
     friend class DataTypeFactory;
     friend class AggregateFunctionSimpleState;
     /// Customize this DataType
diff --git a/tests/queries/0_stateless/01656_ipv4_bad_formatting.reference b/tests/queries/0_stateless/01656_ipv4_bad_formatting.reference
new file mode 100644
index 00000000000..a7b5c448f13
--- /dev/null
+++ b/tests/queries/0_stateless/01656_ipv4_bad_formatting.reference
@@ -0,0 +1,4 @@
+┌─x───────────────┬─y───────────────┬──────────z─┐
+│ 1.1.1.1         │ 1.1.1.1         │   16843009 │
+│ 255.255.255.255 │ 255.255.255.255 │ 4294967295 │
+└─────────────────┴─────────────────┴────────────┘
diff --git a/tests/queries/0_stateless/01656_ipv4_bad_formatting.sql b/tests/queries/0_stateless/01656_ipv4_bad_formatting.sql
new file mode 100644
index 00000000000..a0b253ea31a
--- /dev/null
+++ b/tests/queries/0_stateless/01656_ipv4_bad_formatting.sql
@@ -0,0 +1 @@
+SELECT arrayJoin(['1.1.1.1', '255.255.255.255']) AS x, toIPv4(x) AS y, toUInt32(y) AS z FORMAT PrettyCompactNoEscapes;

From 2094eae23df8ae19002ff65af842b5ed6913798b Mon Sep 17 00:00:00 2001
From: feng lv <fenglv15@mails.ucas.ac.cn>
Date: Thu, 21 Jan 2021 04:49:35 +0000
Subject: [PATCH 232/611] fix sleep with infinite input

---
 src/Functions/sleep.h                                         | 4 ++--
 .../queries/0_stateless/01655_sleep_infinite_float.reference  | 0
 tests/queries/0_stateless/01655_sleep_infinite_float.sql      | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 tests/queries/0_stateless/01655_sleep_infinite_float.reference
 create mode 100644 tests/queries/0_stateless/01655_sleep_infinite_float.sql

diff --git a/src/Functions/sleep.h b/src/Functions/sleep.h
index 6dca6b5f84c..65566e36d1f 100644
--- a/src/Functions/sleep.h
+++ b/src/Functions/sleep.h
@@ -78,8 +78,8 @@ public:
 
         Float64 seconds = applyVisitor(FieldVisitorConvertToNumber<Float64>(), assert_cast<const ColumnConst &>(*col).getField());
 
-        if (seconds < 0)
-            throw Exception("Cannot sleep negative amount of time (not implemented)", ErrorCodes::BAD_ARGUMENTS);
+        if (seconds < 0 || !std::isfinite(seconds))
+            throw Exception("Cannot sleep infinite or negative amount of time (not implemented)", ErrorCodes::BAD_ARGUMENTS);
 
         size_t size = col->size();
 
diff --git a/tests/queries/0_stateless/01655_sleep_infinite_float.reference b/tests/queries/0_stateless/01655_sleep_infinite_float.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01655_sleep_infinite_float.sql b/tests/queries/0_stateless/01655_sleep_infinite_float.sql
new file mode 100644
index 00000000000..a469ba9674a
--- /dev/null
+++ b/tests/queries/0_stateless/01655_sleep_infinite_float.sql
@@ -0,0 +1,2 @@
+SELECT sleep(nan); -- { serverError 36 }
+SELECT sleep(inf); -- { serverError 36 }

From 7f68afa362ab8ce926168af86576352fdd0e46a9 Mon Sep 17 00:00:00 2001
From: Winter Zhang <coswde@gmail.com>
Date: Thu, 21 Jan 2021 13:11:07 +0800
Subject: [PATCH 233/611] ISSUES-18684 fix MaterializeMySQL integration failure

---
 .../test_materialize_mysql_database/materialize_with_ddl.py      | 1 +
 1 file changed, 1 insertion(+)

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 c04194c8ebb..a4320ee54c5 100644
--- a/tests/integration/test_materialize_mysql_database/materialize_with_ddl.py
+++ b/tests/integration/test_materialize_mysql_database/materialize_with_ddl.py
@@ -460,6 +460,7 @@ def query_event_with_empty_transaction(clickhouse_node, mysql_node, service_name
     mysql_node.query("INSERT INTO test_database.t1(a) VALUES(2)")
     mysql_node.query("/* start */ commit /* end */")
 
+    check_query(clickhouse_node, "SHOW TABLES FROM test_database FORMAT TSV", "t1\n")
     check_query(clickhouse_node, "SELECT * FROM test_database.t1 ORDER BY a FORMAT TSV", "1\tBEGIN\n2\tBEGIN\n")
     clickhouse_node.query("DROP DATABASE test_database")
     mysql_node.query("DROP DATABASE test_database")

From 2edf69fe6459657a0b1783b3236d1ce7445db308 Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Thu, 21 Jan 2021 09:17:12 +0300
Subject: [PATCH 234/611] Fix

---
 docs/en/operations/caches.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/operations/caches.md b/docs/en/operations/caches.md
index 0107c340019..0323fc84ef4 100644
--- a/docs/en/operations/caches.md
+++ b/docs/en/operations/caches.md
@@ -19,6 +19,6 @@ Additional cache types:
 - [dictionaries data cache](../sql-reference/dictionaries/index.md)
 
 Not directly used:
-- page cache OS
+- OS page cache
 
 [Original article](https://clickhouse.tech/docs/en/operations/caches/) <!--hide-->

From 5f3059555a039181cdb9b558fb073fc7998ad496 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Thu, 21 Jan 2021 10:26:08 +0300
Subject: [PATCH 235/611] Fix system.parts _state column

There was LOGICAL_ERROR when querying this column, due to incorrect order:

    SELECT
        *,
        _state
    FROM system.parts

    2021.01.21 10:22:57.731556 [ 22851 ] {02a07c6d-467d-4681-9203-4dc11cc6fbee} <Fatal> : Logical error: 'Invalid Field get from type String to type UInt64'.
---
 src/Storages/System/StorageSystemParts.cpp    |  7 ++--
 .../01660_system_parts_smoke.reference        | 14 +++++++
 .../0_stateless/01660_system_parts_smoke.sql  | 41 +++++++++++++++++++
 3 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 tests/queries/0_stateless/01660_system_parts_smoke.reference
 create mode 100644 tests/queries/0_stateless/01660_system_parts_smoke.sql

diff --git a/src/Storages/System/StorageSystemParts.cpp b/src/Storages/System/StorageSystemParts.cpp
index 7ae20ed024e..5b9461b5c25 100644
--- a/src/Storages/System/StorageSystemParts.cpp
+++ b/src/Storages/System/StorageSystemParts.cpp
@@ -139,9 +139,6 @@ void StorageSystemParts::processNextStorage(MutableColumns & columns_, const Sto
             columns_[i++]->insertDefault();
         }
 
-        if (has_state_column)
-            columns_[i++]->insert(part->stateString());
-
         MinimalisticDataPartChecksums helper;
         helper.computeTotalChecksums(part->checksums);
 
@@ -184,6 +181,10 @@ void StorageSystemParts::processNextStorage(MutableColumns & columns_, const Sto
         columns_[i++]->insert(queryToString(part->default_codec->getCodecDesc()));
 
         add_ttl_info_map(part->ttl_infos.recompression_ttl);
+
+        /// _state column should be the latest.
+        if (has_state_column)
+            columns_[i++]->insert(part->stateString());
     }
 }
 
diff --git a/tests/queries/0_stateless/01660_system_parts_smoke.reference b/tests/queries/0_stateless/01660_system_parts_smoke.reference
new file mode 100644
index 00000000000..f21fab8e539
--- /dev/null
+++ b/tests/queries/0_stateless/01660_system_parts_smoke.reference
@@ -0,0 +1,14 @@
+# two parts
+Committed
+Committed
+all_1_1_0	Committed
+all_2_2_0	Committed
+all_1_1_0	1
+all_2_2_0	1
+# optimize
+2	Outdated
+1	Committed
+# truncate
+Outdated
+Outdated
+# drop
diff --git a/tests/queries/0_stateless/01660_system_parts_smoke.sql b/tests/queries/0_stateless/01660_system_parts_smoke.sql
new file mode 100644
index 00000000000..8a1b0a12f81
--- /dev/null
+++ b/tests/queries/0_stateless/01660_system_parts_smoke.sql
@@ -0,0 +1,41 @@
+-- There is different code path when:
+-- - _state is not requested
+-- - _state is requested
+-- - only _state is requested
+SELECT * FROM system.parts FORMAT Null;
+SELECT *, _state FROM system.parts FORMAT Null;
+SELECT _state FROM system.parts FORMAT Null;
+
+-- Create one table and see some columns in system.parts
+DROP TABLE IF EXISTS data_01660;
+CREATE TABLE data_01660 (key Int) Engine=MergeTree() ORDER BY key;
+SYSTEM STOP MERGES data_01660;
+
+-- Empty
+SELECT _state FROM system.parts WHERE database = currentDatabase() AND table = 'data_01660';
+SELECT name, _state FROM system.parts WHERE database = currentDatabase() AND table = 'data_01660';
+SELECT name, active FROM system.parts WHERE database = currentDatabase() AND table = 'data_01660';
+
+-- Add part and check again
+SELECT '# two parts';
+INSERT INTO data_01660 VALUES (0);
+INSERT INTO data_01660 VALUES (1);
+SELECT _state FROM system.parts WHERE database = currentDatabase() AND table = 'data_01660';
+SELECT name, _state FROM system.parts WHERE database = currentDatabase() AND table = 'data_01660';
+SELECT name, active FROM system.parts WHERE database = currentDatabase() AND table = 'data_01660';
+
+-- OPTIMIZE to create Outdated parts
+SELECT '# optimize';
+SYSTEM START MERGES data_01660;
+OPTIMIZE TABLE data_01660 FINAL;
+SELECT count(), _state FROM system.parts WHERE database = currentDatabase() AND table = 'data_01660' GROUP BY _state;
+
+-- TRUNCATE does not remove parts instantly
+SELECT '# truncate';
+TRUNCATE data_01660;
+SELECT _state FROM system.parts WHERE database = currentDatabase() AND table = 'data_01660';
+
+-- But DROP does
+SELECT '# drop';
+DROP TABLE data_01660;
+SELECT * FROM system.parts WHERE database = currentDatabase() AND table = 'data_01660';

From 58c57bbb9dc719f5980bec6a6ad702b79b42135e Mon Sep 17 00:00:00 2001
From: Mikhail Filimonov <mfilimonov@altinity.com>
Date: Wed, 20 Jan 2021 20:08:16 +0100
Subject: [PATCH 236/611] Allow building librdkafka without ssl

---
 cmake/find/rdkafka.cmake                |  6 ++--
 contrib/librdkafka-cmake/CMakeLists.txt | 40 +++++++++++++++++++------
 contrib/librdkafka-cmake/config.h.in    |  6 ++--
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/cmake/find/rdkafka.cmake b/cmake/find/rdkafka.cmake
index 26005acc4d4..bf7028feb02 100644
--- a/cmake/find/rdkafka.cmake
+++ b/cmake/find/rdkafka.cmake
@@ -1,9 +1,7 @@
-if (NOT ARCH_ARM AND OPENSSL_FOUND)
+if (NOT ARCH_ARM)
     option (ENABLE_RDKAFKA "Enable kafka" ${ENABLE_LIBRARIES})
-elseif(ENABLE_RDKAFKA AND NOT OPENSSL_FOUND)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use librdkafka without SSL")
 elseif(ENABLE_RDKAFKA)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "librdafka is not supported on ARM and on FreeBSD")
+    message (${RECONFIGURE_MESSAGE_LEVEL} "librdafka is not supported on ARM")
 endif ()
 
 if (NOT ENABLE_RDKAFKA)
diff --git a/contrib/librdkafka-cmake/CMakeLists.txt b/contrib/librdkafka-cmake/CMakeLists.txt
index 1d9e839e8cf..2b55b22cd2b 100644
--- a/contrib/librdkafka-cmake/CMakeLists.txt
+++ b/contrib/librdkafka-cmake/CMakeLists.txt
@@ -50,12 +50,12 @@ set(SRCS
   ${RDKAFKA_SOURCE_DIR}/rdkafka_request.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_roundrobin_assignor.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl.c
-#  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_cyrus.c # optionally included below
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_oauthbearer.c
+#  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_cyrus.c        # optionally included below
+#  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_oauthbearer.c  # optionally included below
   ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_plain.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_scram.c
+#  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_scram.c        # optionally included below
 #  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_win32.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_ssl.c
+#  ${RDKAFKA_SOURCE_DIR}/rdkafka_ssl.c               # optionally included below
   ${RDKAFKA_SOURCE_DIR}/rdkafka_sticky_assignor.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_subscription.c
   ${RDKAFKA_SOURCE_DIR}/rdkafka_timer.c
@@ -82,10 +82,33 @@ set(SRCS
 
 if(${ENABLE_CYRUS_SASL})
     message (STATUS "librdkafka with SASL support")
-    set(SRCS
-        ${SRCS}
-        ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_cyrus.c # needed to support Kerberos, requires cyrus-sasl
-    )
+    set(WITH_SASL_CYRUS 1)
+endif()
+
+if(OPENSSL_FOUND)
+    message (STATUS "librdkafka with SSL support")
+    set(WITH_SSL 1)
+
+    if(${ENABLE_CYRUS_SASL})
+       set(WITH_SASL_SCRAM 1)
+       set(WITH_SASL_OAUTHBEARER 1)
+    endif()
+endif()
+
+if(WITH_SSL)
+  list(APPEND SRCS ${RDKAFKA_SOURCE_DIR}/rdkafka_ssl.c)
+endif()
+
+if(WITH_SASL_CYRUS)
+  list(APPEND SRCS ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_cyrus.c) # needed to support Kerberos, requires cyrus-sasl
+endif()
+
+if(WITH_SASL_SCRAM)
+  list(APPEND SRCS ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_scram.c)
+endif()
+
+if(WITH_SASL_OAUTHBEARER)
+  list(APPEND SRCS ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_oauthbearer.c)
 endif()
 
 add_library(rdkafka ${SRCS})
@@ -101,7 +124,6 @@ if(OPENSSL_SSL_LIBRARY AND OPENSSL_CRYPTO_LIBRARY)
 endif()
 if(${ENABLE_CYRUS_SASL})
     target_link_libraries(rdkafka PRIVATE ${CYRUS_SASL_LIBRARY})
-    set(WITH_SASL_CYRUS 1)
 endif()
 
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/auxdir)
diff --git a/contrib/librdkafka-cmake/config.h.in b/contrib/librdkafka-cmake/config.h.in
index 1c9057bd794..29e833959f7 100644
--- a/contrib/librdkafka-cmake/config.h.in
+++ b/contrib/librdkafka-cmake/config.h.in
@@ -60,11 +60,11 @@
 // WITH_SOCKEM
 #define WITH_SOCKEM 1
 // libssl
-#define WITH_SSL 1
+#cmakedefine WITH_SSL 1
 // WITH_SASL_SCRAM
-#define WITH_SASL_SCRAM 1
+#cmakedefine WITH_SASL_SCRAM 1
 // WITH_SASL_OAUTHBEARER
-#define WITH_SASL_OAUTHBEARER 1
+#cmakedefine WITH_SASL_OAUTHBEARER 1
 #cmakedefine WITH_SASL_CYRUS 1
 // crc32chw
 #if !defined(__PPC__)

From 1bb8cc5c9ab8659b97082abc2a678cbe857c92ce Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 21 Jan 2021 11:10:31 +0300
Subject: [PATCH 237/611] Avoid UBSan report in arrayElement

---
 src/Functions/array/arrayElement.cpp          | 27 ++++++++++++++-----
 .../01657_array_element_ubsan.reference       | 26 ++++++++++++++++++
 .../0_stateless/01657_array_element_ubsan.sql | 19 +++++++++++++
 3 files changed, 65 insertions(+), 7 deletions(-)
 create mode 100644 tests/queries/0_stateless/01657_array_element_ubsan.reference
 create mode 100644 tests/queries/0_stateless/01657_array_element_ubsan.sql

diff --git a/src/Functions/array/arrayElement.cpp b/src/Functions/array/arrayElement.cpp
index 88166f04e0e..7d053988cae 100644
--- a/src/Functions/array/arrayElement.cpp
+++ b/src/Functions/array/arrayElement.cpp
@@ -231,7 +231,7 @@ struct ArrayElementNumImpl
                 if (builder)
                     builder.update(j);
             }
-            else if (index < 0 && static_cast<size_t>(-index) <= array_size)
+            else if (index < 0 && -static_cast<size_t>(index) <= array_size)
             {
                 size_t j = offsets[i] + index;
                 result[i] = data[j];
@@ -329,7 +329,7 @@ struct ArrayElementStringImpl
             TIndex index = indices[i];
             if (index > 0 && static_cast<size_t>(index) <= array_size)
                 adjusted_index = index - 1;
-            else if (index < 0 && static_cast<size_t>(-index) <= array_size)
+            else if (index < 0 && -static_cast<size_t>(index) <= array_size)
                 adjusted_index = array_size + index;
             else
                 adjusted_index = array_size;    /// means no element should be taken
@@ -427,7 +427,7 @@ struct ArrayElementGenericImpl
                 if (builder)
                     builder.update(j);
             }
-            else if (index < 0 && static_cast<size_t>(-index) <= array_size)
+            else if (index < 0 && -static_cast<size_t>(index) <= array_size)
             {
                 size_t j = offsets[i] + index;
                 result.insertFrom(data, j);
@@ -472,11 +472,24 @@ ColumnPtr FunctionArrayElement::executeNumberConst(
     auto col_res = ColumnVector<DataType>::create();
 
     if (index.getType() == Field::Types::UInt64)
+    {
         ArrayElementNumImpl<DataType>::template vectorConst<false>(
             col_nested->getData(), col_array->getOffsets(), safeGet<UInt64>(index) - 1, col_res->getData(), builder);
+    }
     else if (index.getType() == Field::Types::Int64)
+    {
+        /// Cast to UInt64 before negation allows to avoid undefined behaviour for negation of the most negative number.
+        /// NOTE: this would be undefined behaviour in C++ sense, but nevertheless, compiler cannot see it on user provided data,
+        /// and generates the code that we want on supported CPU architectures (overflow in sense of two's complement arithmetic).
+        /// This is only needed to avoid UBSan report.
+
+        /// Negative array indices work this way:
+        /// arr[-1] is the element at offset 0 from the last
+        /// arr[-2] is the element at offset 1 from the last and so on.
+
         ArrayElementNumImpl<DataType>::template vectorConst<true>(
-            col_nested->getData(), col_array->getOffsets(), -safeGet<Int64>(index) - 1, col_res->getData(), builder);
+            col_nested->getData(), col_array->getOffsets(), -(UInt64(safeGet<Int64>(index)) + 1), col_res->getData(), builder);
+    }
     else
         throw Exception("Illegal type of array index", ErrorCodes::LOGICAL_ERROR);
 
@@ -534,7 +547,7 @@ FunctionArrayElement::executeStringConst(const ColumnsWithTypeAndName & argument
             col_nested->getChars(),
             col_array->getOffsets(),
             col_nested->getOffsets(),
-            -safeGet<Int64>(index) - 1,
+            -(UInt64(safeGet<Int64>(index)) + 1),
             col_res->getChars(),
             col_res->getOffsets(),
             builder);
@@ -588,7 +601,7 @@ ColumnPtr FunctionArrayElement::executeGenericConst(
             col_nested, col_array->getOffsets(), safeGet<UInt64>(index) - 1, *col_res, builder);
     else if (index.getType() == Field::Types::Int64)
         ArrayElementGenericImpl::vectorConst<true>(
-            col_nested, col_array->getOffsets(), -safeGet<Int64>(index) - 1, *col_res, builder);
+            col_nested, col_array->getOffsets(), -(UInt64(safeGet<Int64>(index) + 1)), *col_res, builder);
     else
         throw Exception("Illegal type of array index", ErrorCodes::LOGICAL_ERROR);
 
@@ -639,7 +652,7 @@ ColumnPtr FunctionArrayElement::executeConst(const ColumnsWithTypeAndName & argu
             if (builder)
                 builder.update(j);
         }
-        else if (index < 0 && static_cast<size_t>(-index) <= array_size)
+        else if (index < 0 && -static_cast<size_t>(index) <= array_size)
         {
             size_t j = array_size + index;
             res->insertFrom(array_elements, j);
diff --git a/tests/queries/0_stateless/01657_array_element_ubsan.reference b/tests/queries/0_stateless/01657_array_element_ubsan.reference
new file mode 100644
index 00000000000..14e3161f529
--- /dev/null
+++ b/tests/queries/0_stateless/01657_array_element_ubsan.reference
@@ -0,0 +1,26 @@
+0
+0
+0
+0
+---
+0
+0
+0
+---
+0
+0
+0
+0
+0
+0
+0
+1
+---
+0
+0
+0
+0
+0
+0
+0
+1
diff --git a/tests/queries/0_stateless/01657_array_element_ubsan.sql b/tests/queries/0_stateless/01657_array_element_ubsan.sql
new file mode 100644
index 00000000000..82ddf643389
--- /dev/null
+++ b/tests/queries/0_stateless/01657_array_element_ubsan.sql
@@ -0,0 +1,19 @@
+SELECT [number][10000000000] FROM numbers(1);
+SELECT [number][-10000000000] FROM numbers(1);
+
+SELECT [number][-0x8000000000000000] FROM numbers(1);
+SELECT [number][0xFFFFFFFFFFFFFFFF] FROM numbers(1);
+
+SELECT '---';
+
+SELECT [materialize(1)][0xFFFFFFFFFFFFFFFF];
+SELECT [materialize(1)][materialize(18446744073709551615)];
+SELECT [materialize(1)][-0x8000000000000000];
+
+SELECT '---';
+
+SELECT [number][arrayJoin([-0x8000000000000000, -10000000000, 0, -1])] FROM numbers(2);
+
+SELECT '---';
+
+SELECT [number][arrayJoin([0xFFFFFFFFFFFFFFFF, 10000000000, 0, 1])] FROM numbers(2);

From 110089086bbf0148743a92ef14fe5f51e287b5a5 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 21 Jan 2021 11:41:19 +0300
Subject: [PATCH 238/611] Fix UBSan report in GatherUtils #19287

---
 src/Functions/GatherUtils/Algorithms.h                 |  6 +++---
 .../0_stateless/01658_substring_ubsan.reference        |  0
 tests/queries/0_stateless/01658_substring_ubsan.sql    | 10 ++++++++++
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 tests/queries/0_stateless/01658_substring_ubsan.reference
 create mode 100644 tests/queries/0_stateless/01658_substring_ubsan.sql

diff --git a/src/Functions/GatherUtils/Algorithms.h b/src/Functions/GatherUtils/Algorithms.h
index 620d6439af2..101e1354bc6 100644
--- a/src/Functions/GatherUtils/Algorithms.h
+++ b/src/Functions/GatherUtils/Algorithms.h
@@ -342,7 +342,7 @@ void NO_INLINE sliceDynamicOffsetUnbounded(Source && src, Sink && sink, const IC
             if (offset > 0)
                 slice = src.getSliceFromLeft(offset - 1);
             else
-                slice = src.getSliceFromRight(-offset);
+                slice = src.getSliceFromRight(-UInt64(offset));
 
             writeSlice(slice, sink);
         }
@@ -374,7 +374,7 @@ void NO_INLINE sliceDynamicOffsetBounded(Source && src, Sink && sink, const ICol
         Int64 size = has_length ? length_nested_column->getInt(row_num) : static_cast<Int64>(src.getElementSize());
 
         if (size < 0)
-            size += offset > 0 ? static_cast<Int64>(src.getElementSize()) - (offset - 1) : -offset;
+            size += offset > 0 ? static_cast<Int64>(src.getElementSize()) - (offset - 1) : -UInt64(offset);
 
         if (offset != 0 && size > 0)
         {
@@ -383,7 +383,7 @@ void NO_INLINE sliceDynamicOffsetBounded(Source && src, Sink && sink, const ICol
             if (offset > 0)
                 slice = src.getSliceFromLeft(offset - 1, size);
             else
-                slice = src.getSliceFromRight(-offset, size);
+                slice = src.getSliceFromRight(-UInt64(offset), size);
 
             writeSlice(slice, sink);
         }
diff --git a/tests/queries/0_stateless/01658_substring_ubsan.reference b/tests/queries/0_stateless/01658_substring_ubsan.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01658_substring_ubsan.sql b/tests/queries/0_stateless/01658_substring_ubsan.sql
new file mode 100644
index 00000000000..3d7968b8d6b
--- /dev/null
+++ b/tests/queries/0_stateless/01658_substring_ubsan.sql
@@ -0,0 +1,10 @@
+/** NOTE: The behaviour of substring and substringUTF8 is inconsistent when negative offset is greater than string size:
+  * substring:
+  *      hello
+  * ^-----^ - offset -10, length 7, result: "he"
+  * substringUTF8:
+  *      hello
+  *      ^-----^ - offset -10, length 7, result: "hello"
+  * This may be subject for change.
+  */
+SELECT substringUTF8('hello, п�иве�', -9223372036854775808, number) FROM numbers(16) FORMAT Null;

From 0d20b4575da223d899650b0eea751c7f4b5e800c Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Thu, 21 Jan 2021 11:41:32 +0300
Subject: [PATCH 239/611] Fix test.

---
 src/Functions/now64.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Functions/now64.cpp b/src/Functions/now64.cpp
index ac418312698..3d02885c726 100644
--- a/src/Functions/now64.cpp
+++ b/src/Functions/now64.cpp
@@ -133,7 +133,10 @@ public:
 
     FunctionBaseImplPtr build(const ColumnsWithTypeAndName &, const DataTypePtr & result_type) const override
     {
-        const UInt32 scale = assert_cast<const DataTypeDateTime64 *>(result_type.get())->getScale();
+        UInt32 scale = DataTypeDateTime64::default_scale;
+        if (const auto * type = typeid_cast<const DataTypeDateTime64 *>(result_type.get()))
+            scale = type->getScale();
+
         return std::make_unique<FunctionBaseNow64>(nowSubsecond(scale), result_type);
     }
 };

From 9ae3628b662f5f9b34695a3f4f7b07307323fc8b Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Thu, 21 Jan 2021 11:49:40 +0300
Subject: [PATCH 240/611] Fix test.

---
 src/Functions/now64.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Functions/now64.cpp b/src/Functions/now64.cpp
index 3d02885c726..feb821fde82 100644
--- a/src/Functions/now64.cpp
+++ b/src/Functions/now64.cpp
@@ -3,6 +3,7 @@
 #include <Core/DecimalFunctions.h>
 #include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
+#include <DataTypes/DataTypeNullable.h>
 
 #include <Common/assert_cast.h>
 
@@ -134,7 +135,8 @@ public:
     FunctionBaseImplPtr build(const ColumnsWithTypeAndName &, const DataTypePtr & result_type) const override
     {
         UInt32 scale = DataTypeDateTime64::default_scale;
-        if (const auto * type = typeid_cast<const DataTypeDateTime64 *>(result_type.get()))
+        auto res_type = removeNullable(result_type);
+        if (const auto * type = typeid_cast<const DataTypeDateTime64 *>(res_type.get()))
             scale = type->getScale();
 
         return std::make_unique<FunctionBaseNow64>(nowSubsecond(scale), result_type);

From af7dca7bb78a579f0047a2197d823306c4b4887c Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Thu, 21 Jan 2021 11:54:56 +0300
Subject: [PATCH 241/611] Update perftest.

---
 tests/performance/split_filter.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/performance/split_filter.xml b/tests/performance/split_filter.xml
index 7bd4af51abd..4b503a6645b 100644
--- a/tests/performance/split_filter.xml
+++ b/tests/performance/split_filter.xml
@@ -1,4 +1,4 @@
 <test>
-    <query>select sum(x), sum(y) from (select sipHash64(number) as x, bitAnd(number, 1024) as y from numbers_mt(1000000000)) where y = 0 settings enable_optimize_predicate_expression=0</query>
-    <query>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</query>
+    <query>select sum(x), sum(y) from (select sipHash64(number) as x, bitAnd(number, 1024) as y from numbers_mt(200000000)) where y = 0 settings enable_optimize_predicate_expression=0</query>
+    <query>select sum(x), sum(y) from (select sipHash64(number) as x, bitAnd(number, 1024) as y from numbers_mt(200000000) limit 200000000) where y = 0</query>
 </test>

From e75b116466328df4ffb9144435a05e0ad9f714d9 Mon Sep 17 00:00:00 2001
From: flynn <fenglv15@mails.ucas.ac.cn>
Date: Thu, 21 Jan 2021 17:01:35 +0800
Subject: [PATCH 242/611] Rewrite `sum(if())` and `sumIf` to `countIf` in
 special cases (#17041)

Co-authored-by: vdimir <vdimir@yandex-team.ru>
---
 src/Core/Settings.h                           |  1 +
 src/Interpreters/InDepthNodeVisitor.h         |  4 +-
 .../RewriteSumIfFunctionVisitor.cpp           | 91 +++++++++++++++++++
 .../RewriteSumIfFunctionVisitor.h             | 30 ++++++
 src/Interpreters/TreeOptimizer.cpp            | 11 +++
 src/Interpreters/ya.make                      |  1 +
 tests/performance/rewrite_sumIf.xml           |  4 +
 .../01646_rewrite_sum_if.reference            | 24 +++++
 .../0_stateless/01646_rewrite_sum_if.sql      | 35 +++++++
 9 files changed, 199 insertions(+), 2 deletions(-)
 create mode 100644 src/Interpreters/RewriteSumIfFunctionVisitor.cpp
 create mode 100644 src/Interpreters/RewriteSumIfFunctionVisitor.h
 create mode 100644 tests/performance/rewrite_sumIf.xml
 create mode 100644 tests/queries/0_stateless/01646_rewrite_sum_if.reference
 create mode 100644 tests/queries/0_stateless/01646_rewrite_sum_if.sql

diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index 6ebdaaa4c84..cc32417af09 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -416,6 +416,7 @@ class IColumn;
     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, optimize_rewrite_sum_if_to_count_if, true, "Rewrite sumIf() and sum(if()) function countIf() function when logically equivalent", 0) \
     /** Obsolete settings that do nothing but left for compatibility reasons. Remove each one after half a year of obsolescence. */ \
     \
     M(UInt64, max_memory_usage_for_all_queries, 0, "Obsolete. Will be removed after 2020-10-20", 0) \
diff --git a/src/Interpreters/InDepthNodeVisitor.h b/src/Interpreters/InDepthNodeVisitor.h
index 7a793566cdd..3ba25a327c4 100644
--- a/src/Interpreters/InDepthNodeVisitor.h
+++ b/src/Interpreters/InDepthNodeVisitor.h
@@ -68,11 +68,11 @@ struct NeedChild
 };
 
 /// Simple matcher for one node type. Use need_child function for complex traversal logic.
-template <typename Data_, NeedChild::Condition need_child = NeedChild::all, typename T = ASTPtr>
+template <typename DataImpl, NeedChild::Condition need_child = NeedChild::all, typename T = ASTPtr>
 class OneTypeMatcher
 {
 public:
-    using Data = Data_;
+    using Data = DataImpl;
     using TypeToVisit = typename Data::TypeToVisit;
 
     static bool needChildVisit(const ASTPtr & node, const ASTPtr & child) { return need_child(node, child); }
diff --git a/src/Interpreters/RewriteSumIfFunctionVisitor.cpp b/src/Interpreters/RewriteSumIfFunctionVisitor.cpp
new file mode 100644
index 00000000000..b856f9164e0
--- /dev/null
+++ b/src/Interpreters/RewriteSumIfFunctionVisitor.cpp
@@ -0,0 +1,91 @@
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <Interpreters/RewriteSumIfFunctionVisitor.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Common/typeid_cast.h>
+
+namespace DB
+{
+
+void RewriteSumIfFunctionMatcher::visit(ASTPtr & ast, Data & data)
+{
+    if (auto * func = ast->as<ASTFunction>())
+        visit(*func, ast, data);
+}
+
+static ASTPtr createNewFunctionWithOneArgument(const String & func_name, const ASTPtr & argument)
+{
+    auto new_func = std::make_shared<ASTFunction>();
+    new_func->name = func_name;
+
+    auto new_arguments = std::make_shared<ASTExpressionList>();
+    new_arguments->children.push_back(argument);
+    new_func->arguments = new_arguments;
+    new_func->children.push_back(new_arguments);
+    return new_func;
+}
+
+void RewriteSumIfFunctionMatcher::visit(const ASTFunction & func, ASTPtr & ast, Data &)
+{
+    if (!func.arguments || func.arguments->children.empty())
+        return;
+
+    auto lower_name = Poco::toLower(func.name);
+
+    if (lower_name != "sum" && lower_name != "sumif")
+        return;
+
+    auto & func_arguments = func.arguments->children;
+
+    if (lower_name == "sumif")
+    {
+        /// sumIf(1, cond) -> countIf(cond)
+        const auto * literal = func_arguments[0]->as<ASTLiteral>();
+        if (func_arguments.size() == 2 && literal && literal->value.get<UInt64>() == 1)
+        {
+            auto new_func = createNewFunctionWithOneArgument("countIf", func_arguments[1]);
+            new_func->setAlias(func.alias);
+            ast = std::move(new_func);
+            return;
+        }
+    }
+
+    else
+    {
+        const auto * nested_func = func_arguments[0]->as<ASTFunction>();
+
+        if (!nested_func || Poco::toLower(nested_func->name) != "if" || nested_func->arguments->children.size() != 3)
+            return;
+
+        auto & if_arguments = nested_func->arguments->children;
+
+        const auto * first_literal = if_arguments[1]->as<ASTLiteral>();
+        const auto * second_literal = if_arguments[2]->as<ASTLiteral>();
+
+        if (first_literal && second_literal)
+        {
+            auto first_value = first_literal->value.get<UInt64>();
+            auto second_value = second_literal->value.get<UInt64>();
+            /// sum(if(cond, 1, 0)) -> countIf(cond)
+            if (first_value == 1 && second_value == 0)
+            {
+                auto new_func = createNewFunctionWithOneArgument("countIf", if_arguments[0]);
+                new_func->setAlias(func.alias);
+                ast = std::move(new_func);
+                return;
+            }
+            /// sum(if(cond, 0, 1)) -> countIf(not(cond))
+            if (first_value == 0 && second_value == 1)
+            {
+                auto not_func = createNewFunctionWithOneArgument("not", if_arguments[0]);
+                auto new_func = createNewFunctionWithOneArgument("countIf", not_func);
+                new_func->setAlias(func.alias);
+                ast = std::move(new_func);
+                return;
+            }
+        }
+    }
+
+}
+
+}
diff --git a/src/Interpreters/RewriteSumIfFunctionVisitor.h b/src/Interpreters/RewriteSumIfFunctionVisitor.h
new file mode 100644
index 00000000000..86aeef65377
--- /dev/null
+++ b/src/Interpreters/RewriteSumIfFunctionVisitor.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include <unordered_set>
+
+#include <Parsers/IAST.h>
+#include <Interpreters/InDepthNodeVisitor.h>
+
+namespace DB
+{
+
+class ASTFunction;
+
+/// Rewrite 'sum(if())' and 'sumIf' functions to counIf.
+/// sumIf(1, cond) -> countIf(1, cond)
+/// sum(if(cond, 1, 0)) -> countIf(cond)
+/// sum(if(cond, 0, 1)) -> countIf(not(cond))
+class RewriteSumIfFunctionMatcher
+{
+public:
+    struct Data
+    {
+    };
+
+    static void visit(ASTPtr & ast, Data &);
+    static void visit(const ASTFunction &, ASTPtr & ast, Data &);
+    static bool needChildVisit(const ASTPtr &, const ASTPtr &) { return true; }
+};
+
+using RewriteSumIfFunctionVisitor = InDepthNodeVisitor<RewriteSumIfFunctionMatcher, false>;
+}
diff --git a/src/Interpreters/TreeOptimizer.cpp b/src/Interpreters/TreeOptimizer.cpp
index cee19c632fa..2347ab0d4a5 100644
--- a/src/Interpreters/TreeOptimizer.cpp
+++ b/src/Interpreters/TreeOptimizer.cpp
@@ -28,6 +28,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Storages/StorageInMemoryMetadata.h>
 
+#include <Interpreters/RewriteSumIfFunctionVisitor.h>
 
 namespace DB
 {
@@ -548,6 +549,13 @@ void optimizeAnyFunctions(ASTPtr & query)
     RewriteAnyFunctionVisitor(data).visit(query);
 }
 
+void optimizeSumIfFunctions(ASTPtr & query)
+{
+    RewriteSumIfFunctionVisitor::Data data = {};
+    RewriteSumIfFunctionVisitor(data).visit(query);
+}
+
+
 void optimizeInjectiveFunctionsInsideUniq(ASTPtr & query, const Context & context)
 {
     RemoveInjectiveFunctionsVisitor::Data data = {context};
@@ -608,6 +616,9 @@ void TreeOptimizer::apply(ASTPtr & query, Aliases & aliases, const NameSet & sou
     if (settings.optimize_move_functions_out_of_any)
         optimizeAnyFunctions(query);
 
+    if (settings.optimize_rewrite_sum_if_to_count_if)
+        optimizeSumIfFunctions(query);
+
     /// Remove injective functions inside uniq
     if (settings.optimize_injective_functions_inside_uniq)
         optimizeInjectiveFunctionsInsideUniq(query, context);
diff --git a/src/Interpreters/ya.make b/src/Interpreters/ya.make
index 77ca6bc0e14..1cadc447e59 100644
--- a/src/Interpreters/ya.make
+++ b/src/Interpreters/ya.make
@@ -129,6 +129,7 @@ SRCS(
     RequiredSourceColumnsData.cpp
     RequiredSourceColumnsVisitor.cpp
     RewriteAnyFunctionVisitor.cpp
+    RewriteSumIfFunctionVisitor.cpp
     RowRefs.cpp
     Set.cpp
     SetVariants.cpp
diff --git a/tests/performance/rewrite_sumIf.xml b/tests/performance/rewrite_sumIf.xml
new file mode 100644
index 00000000000..4ba4916bdbf
--- /dev/null
+++ b/tests/performance/rewrite_sumIf.xml
@@ -0,0 +1,4 @@
+<test>
+    <query>SELECT sumIf(1, 0) FROM numbers(100000000)</query>
+    <query>SELECT sumIf(1, 1) FROM numbers(100000000)</query>
+</test>
diff --git a/tests/queries/0_stateless/01646_rewrite_sum_if.reference b/tests/queries/0_stateless/01646_rewrite_sum_if.reference
new file mode 100644
index 00000000000..0f315b0812a
--- /dev/null
+++ b/tests/queries/0_stateless/01646_rewrite_sum_if.reference
@@ -0,0 +1,24 @@
+0
+0	0	1
+0
+50
+50	50	1
+50
+50
+50	50	50	1	0
+50
+50
+50	50	50	1	0
+50
+0
+0	0	1
+0
+50
+50	50	1
+50
+50
+50	50	50	1	0
+50
+50
+50	50	50	1	0
+50
diff --git a/tests/queries/0_stateless/01646_rewrite_sum_if.sql b/tests/queries/0_stateless/01646_rewrite_sum_if.sql
new file mode 100644
index 00000000000..07fb90c0eb7
--- /dev/null
+++ b/tests/queries/0_stateless/01646_rewrite_sum_if.sql
@@ -0,0 +1,35 @@
+SET optimize_rewrite_sum_if_to_count_if = 0;
+
+SELECT sumIf(1, number % 2 > 2) FROM numbers(100);
+SELECT sumIf(1 as one_expr, number % 2 > 2 as cond_expr), sum(cond_expr), one_expr FROM numbers(100);
+SELECT countIf(number % 2 > 2) FROM numbers(100);
+
+SELECT sumIf(1, number % 2 == 0) FROM numbers(100);
+SELECT sumIf(1 as one_expr, number % 2 == 0 as cond_expr), sum(cond_expr), one_expr FROM numbers(100);
+SELECT countIf(number % 2 == 0) FROM numbers(100);
+
+SELECT sum(if(number % 2 == 0, 1, 0)) FROM numbers(100);
+SELECT sum(if(number % 2 == 0 as cond_expr, 1 as one_expr, 0 as zero_expr) as if_expr), sum(cond_expr), sum(if_expr), one_expr, zero_expr FROM numbers(100);
+SELECT countIf(number % 2 == 0) FROM numbers(100);
+
+SELECT sum(if(number % 2 == 0, 0, 1)) FROM numbers(100);
+SELECT sum(if(number % 2 == 0 as cond_expr, 0 as zero_expr, 1 as one_expr) as if_expr), sum(cond_expr), sum(if_expr), one_expr, zero_expr FROM numbers(100);
+SELECT countIf(number % 2 != 0) FROM numbers(100);
+
+SET optimize_rewrite_sum_if_to_count_if = 1;
+
+SELECT sumIf(1, number % 2 > 2) FROM numbers(100);
+SELECT sumIf(1 as one_expr, number % 2 > 2 as cond_expr), sum(cond_expr), one_expr FROM numbers(100);
+SELECT countIf(number % 2 > 2) FROM numbers(100);
+
+SELECT sumIf(1, number % 2 == 0) FROM numbers(100);
+SELECT sumIf(1 as one_expr, number % 2 == 0 as cond_expr), sum(cond_expr), one_expr FROM numbers(100);
+SELECT countIf(number % 2 == 0) FROM numbers(100);
+
+SELECT sum(if(number % 2 == 0, 1, 0)) FROM numbers(100);
+SELECT sum(if(number % 2 == 0 as cond_expr, 1 as one_expr, 0 as zero_expr) as if_expr), sum(cond_expr), sum(if_expr), one_expr, zero_expr FROM numbers(100);
+SELECT countIf(number % 2 == 0) FROM numbers(100);
+
+SELECT sum(if(number % 2 == 0, 0, 1)) FROM numbers(100);
+SELECT sum(if(number % 2 == 0 as cond_expr, 0 as zero_expr, 1 as one_expr) as if_expr), sum(cond_expr), sum(if_expr), one_expr, zero_expr FROM numbers(100);
+SELECT countIf(number % 2 != 0) FROM numbers(100);

From fe6b964b32c94b85b001cb40372d8cdc780367f5 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Thu, 21 Jan 2021 12:39:46 +0300
Subject: [PATCH 243/611] Revert "Revert "Auto version update to [21.2.1.1]
 [54446]""

This reverts commit 42f63e14b5b5adaaf72f32a19ec04b9599880605.
---
 cmake/autogenerated_versions.txt                       | 10 +++++-----
 debian/changelog                                       |  4 ++--
 docker/client/Dockerfile                               |  2 +-
 docker/server/Dockerfile                               |  2 +-
 docker/test/Dockerfile                                 |  2 +-
 .../System/StorageSystemContributors.generated.cpp     |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cmake/autogenerated_versions.txt b/cmake/autogenerated_versions.txt
index bc06286a1ad..1c2e4c1f55e 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 54445)
+SET(VERSION_REVISION 54446)
 SET(VERSION_MAJOR 21)
-SET(VERSION_MINOR 1)
+SET(VERSION_MINOR 2)
 SET(VERSION_PATCH 1)
-SET(VERSION_GITHASH 667dd0cf0ccecdaa6f334177b7ece2f53bd196a1)
-SET(VERSION_DESCRIBE v21.1.1.5646-prestable)
-SET(VERSION_STRING 21.1.1.5646)
+SET(VERSION_GITHASH 53d0c9fa7255aa1dc48991d19f4246ff71cc2fd7)
+SET(VERSION_DESCRIBE v21.2.1.1-prestable)
+SET(VERSION_STRING 21.2.1.1)
 # end of autochange
diff --git a/debian/changelog b/debian/changelog
index 3a267a83c69..1cec020f026 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-clickhouse (21.1.0) unstable; urgency=low
+clickhouse (21.2.1.1) unstable; urgency=low
 
   * Modified source code
 
- -- Alexey Milovidov <milovidov@yandex-team.ru>  Mon, 11 Jan 2021 03:51:08 +0300
+ -- clickhouse-release <clickhouse-release@yandex-team.ru>  Mon, 11 Jan 2021 11:12:08 +0300
diff --git a/docker/client/Dockerfile b/docker/client/Dockerfile
index ddfe3cd177b..5022687c47b 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.1.0
+ARG version=21.2.1.*
 
 RUN apt-get update \
     && apt-get install --yes --no-install-recommends \
diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile
index fa9c0ae5f3a..3cec94b3c66 100644
--- a/docker/server/Dockerfile
+++ b/docker/server/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:20.04
 
 ARG repository="deb https://repo.clickhouse.tech/deb/stable/ main/"
-ARG version=21.1.0
+ARG version=21.2.1.*
 ARG gosu_ver=1.10
 
 # user/group precreated explicitly with fixed uid/gid on purpose.
diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile
index 2e17151b31f..df918928f99 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.1.0
+ARG version=21.2.1.*
 
 RUN apt-get update && \
     apt-get install -y apt-transport-https dirmngr && \
diff --git a/src/Storages/System/StorageSystemContributors.generated.cpp b/src/Storages/System/StorageSystemContributors.generated.cpp
index ee39390a0f5..0c50e452e95 100644
--- a/src/Storages/System/StorageSystemContributors.generated.cpp
+++ b/src/Storages/System/StorageSystemContributors.generated.cpp
@@ -1,4 +1,4 @@
-// autogenerated by src/Storages/System/StorageSystemContributors.sh
+// autogenerated by ./StorageSystemContributors.sh
 const char * auto_contributors[] {
     "0xflotus",
     "20018712",

From 7f32926a218282891cbc6c5082267b7b5db3b867 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Thu, 21 Jan 2021 14:37:20 +0300
Subject: [PATCH 244/611] Fix race condition in TestKeeperHandler on session
 finish

---
 src/Common/ZooKeeper/TestKeeperStorageDispatcher.cpp | 10 +++++++++-
 src/Common/ZooKeeper/TestKeeperStorageDispatcher.h   |  2 ++
 src/Server/TestKeeperTCPHandler.cpp                  |  4 ++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/Common/ZooKeeper/TestKeeperStorageDispatcher.cpp b/src/Common/ZooKeeper/TestKeeperStorageDispatcher.cpp
index b1233fc47e3..35378e4ff09 100644
--- a/src/Common/ZooKeeper/TestKeeperStorageDispatcher.cpp
+++ b/src/Common/ZooKeeper/TestKeeperStorageDispatcher.cpp
@@ -49,7 +49,7 @@ void TestKeeperStorageDispatcher::setResponse(int64_t session_id, const Coordina
     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())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown session id {}", session_id);
+        return;
 
     session_writer->second(response);
     /// Session closed, no more writes
@@ -128,4 +128,12 @@ void TestKeeperStorageDispatcher::registerSession(int64_t session_id, ZooKeeperR
         throw Exception(DB::ErrorCodes::LOGICAL_ERROR, "Session with id {} already registered in dispatcher", session_id);
 }
 
+void TestKeeperStorageDispatcher::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/Common/ZooKeeper/TestKeeperStorageDispatcher.h b/src/Common/ZooKeeper/TestKeeperStorageDispatcher.h
index 27abf17ac73..a86895b5be1 100644
--- a/src/Common/ZooKeeper/TestKeeperStorageDispatcher.h
+++ b/src/Common/ZooKeeper/TestKeeperStorageDispatcher.h
@@ -53,6 +53,8 @@ public:
         return storage.getSessionID();
     }
     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);
 };
 
 }
diff --git a/src/Server/TestKeeperTCPHandler.cpp b/src/Server/TestKeeperTCPHandler.cpp
index 7b02996019e..bf407ba96b7 100644
--- a/src/Server/TestKeeperTCPHandler.cpp
+++ b/src/Server/TestKeeperTCPHandler.cpp
@@ -390,7 +390,11 @@ void TestKeeperTCPHandler::finish()
 {
     Coordination::ZooKeeperRequestPtr request = Coordination::ZooKeeperRequestFactory::instance().get(Coordination::OpNum::Close);
     request->xid = close_xid;
+    /// Put close request (so storage will remove all info about session)
     test_keeper_storage_dispatcher->putRequest(request, session_id);
+    /// We don't need any callbacks because session can be already dead and
+    /// nobody wait for response
+    test_keeper_storage_dispatcher->finishSession(session_id);
 }
 
 std::pair<Coordination::OpNum, Coordination::XID> TestKeeperTCPHandler::receiveRequest()

From 2cd04e8923051323b906c33786ccac58cff87eae Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 21 Jan 2021 14:42:34 +0300
Subject: [PATCH 245/611] Fix UBSan report in arraySum

---
 src/Functions/array/arrayAggregation.cpp                       | 3 ++-
 .../0_stateless/01659_array_aggregation_ubsan.reference        | 1 +
 tests/queries/0_stateless/01659_array_aggregation_ubsan.sql    | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 tests/queries/0_stateless/01659_array_aggregation_ubsan.reference
 create mode 100644 tests/queries/0_stateless/01659_array_aggregation_ubsan.sql

diff --git a/src/Functions/array/arrayAggregation.cpp b/src/Functions/array/arrayAggregation.cpp
index 992a331d05b..40afd657abb 100644
--- a/src/Functions/array/arrayAggregation.cpp
+++ b/src/Functions/array/arrayAggregation.cpp
@@ -5,6 +5,7 @@
 #include <Columns/ColumnDecimal.h>
 #include "FunctionArrayMapped.h"
 #include <Functions/FunctionFactory.h>
+#include <common/defines.h>
 
 
 namespace DB
@@ -121,7 +122,7 @@ struct ArrayAggregateImpl
     }
 
     template <typename Element>
-    static bool executeType(const ColumnPtr & mapped, const ColumnArray::Offsets & offsets, ColumnPtr & res_ptr)
+    static NO_SANITIZE_UNDEFINED bool executeType(const ColumnPtr & mapped, const ColumnArray::Offsets & offsets, ColumnPtr & res_ptr)
     {
         using Result = ArrayAggregateResult<Element, aggregate_operation>;
         using ColVecType = std::conditional_t<IsDecimalNumber<Element>, ColumnDecimal<Element>, ColumnVector<Element>>;
diff --git a/tests/queries/0_stateless/01659_array_aggregation_ubsan.reference b/tests/queries/0_stateless/01659_array_aggregation_ubsan.reference
new file mode 100644
index 00000000000..62c80bed251
--- /dev/null
+++ b/tests/queries/0_stateless/01659_array_aggregation_ubsan.reference
@@ -0,0 +1 @@
+446744073709551616
diff --git a/tests/queries/0_stateless/01659_array_aggregation_ubsan.sql b/tests/queries/0_stateless/01659_array_aggregation_ubsan.sql
new file mode 100644
index 00000000000..1b8b506b26e
--- /dev/null
+++ b/tests/queries/0_stateless/01659_array_aggregation_ubsan.sql
@@ -0,0 +1 @@
+SELECT arraySum([-9000000000000000000, -9000000000000000000]);

From 47a0f4e16280b996d0315ec55b9546564e2806cf Mon Sep 17 00:00:00 2001
From: Ildus Kurbangaliev <i.kurbangaliev@gmail.com>
Date: Tue, 24 Nov 2020 16:25:45 +0500
Subject: [PATCH 246/611] Add tuple argument support for argMin and argMax

---
 .../aggregate-functions/reference/argmax.md   |  24 ++-
 .../aggregate-functions/reference/argmin.md   |  12 +-
 .../data-types/simpleaggregatefunction.md     |   2 +
 .../AggregateFunctionArgMinMax.h              |  64 ++++--
 src/AggregateFunctions/Helpers.h              |   6 +
 src/AggregateFunctions/HelpersMinMaxAny.h     |  80 ++++----
 src/AggregateFunctions/IAggregateFunction.h   | 194 ++++++++++++++----
 .../DataTypeCustomSimpleAggregateFunction.cpp |   3 +-
 .../0_stateless/00027_argMinMax.reference     |   5 +
 tests/queries/0_stateless/00027_argMinMax.sql |   8 +
 .../00027_simple_argMinArray.reference        |   1 -
 .../0_stateless/00027_simple_argMinArray.sql  |   1 -
 .../00915_simple_aggregate_function.reference |   6 +-
 .../00915_simple_aggregate_function.sql       |  18 +-
 14 files changed, 310 insertions(+), 114 deletions(-)
 create mode 100644 tests/queries/0_stateless/00027_argMinMax.reference
 create mode 100644 tests/queries/0_stateless/00027_argMinMax.sql
 delete mode 100644 tests/queries/0_stateless/00027_simple_argMinArray.reference
 delete mode 100644 tests/queries/0_stateless/00027_simple_argMinArray.sql

diff --git a/docs/en/sql-reference/aggregate-functions/reference/argmax.md b/docs/en/sql-reference/aggregate-functions/reference/argmax.md
index 3093a4f67ef..35e87d49e60 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/argmax.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/argmax.md
@@ -4,6 +4,28 @@ toc_priority: 106
 
 # argMax {#agg-function-argmax}
 
-Syntax: `argMax(arg, val)`
+Syntax: `argMax(arg, val)` or `argMax(tuple(arg, val))`
 
 Calculates the `arg` value for a maximum `val` value. If there are several different values of `arg` for maximum values of `val`, the first of these values encountered is output.
+
+Tuple version of this function will return the tuple with the maximum `val` value. It is convinient for use with `SimpleAggregateFunction`.
+
+**Example:**
+
+``` text
+┌─user─────┬─salary─┐
+│ director │   5000 │
+│ manager  │   3000 │
+│ worker   │   1000 │
+└──────────┴────────┘
+```
+
+``` sql
+SELECT argMax(user, salary), argMax(tuple(user, salary)) FROM salary
+```
+
+``` text
+┌─argMax(user, salary)─┬─argMax(tuple(user, salary))─┐
+│ director             │ ('director',5000)           │
+└──────────────────────┴─────────────────────────────┘
+```
diff --git a/docs/en/sql-reference/aggregate-functions/reference/argmin.md b/docs/en/sql-reference/aggregate-functions/reference/argmin.md
index 315c7b6c29a..72c9bce6817 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/argmin.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/argmin.md
@@ -4,10 +4,12 @@ toc_priority: 105
 
 # argMin {#agg-function-argmin}
 
-Syntax: `argMin(arg, val)`
+Syntax: `argMin(arg, val)` or `argMin(tuple(arg, val))`
 
 Calculates the `arg` value for a minimal `val` value. If there are several different values of `arg` for minimal values of `val`, the first of these values encountered is output.
 
+Tuple version of this function will return the tuple with the minimal `val` value. It is convinient for use with `SimpleAggregateFunction`.
+
 **Example:**
 
 ``` text
@@ -19,11 +21,11 @@ Calculates the `arg` value for a minimal `val` value. If there are several diffe
 ```
 
 ``` sql
-SELECT argMin(user, salary) FROM salary
+SELECT argMin(user, salary), argMin(tuple(user, salary)) FROM salary
 ```
 
 ``` text
-┌─argMin(user, salary)─┐
-│ worker               │
-└──────────────────────┘
+┌─argMin(user, salary)─┬─argMin(tuple(user, salary))─┐
+│ worker               │ ('worker',1000)             │
+└──────────────────────┴─────────────────────────────┘
 ```
diff --git a/docs/en/sql-reference/data-types/simpleaggregatefunction.md b/docs/en/sql-reference/data-types/simpleaggregatefunction.md
index b23ab5a6717..2d2746f85d3 100644
--- a/docs/en/sql-reference/data-types/simpleaggregatefunction.md
+++ b/docs/en/sql-reference/data-types/simpleaggregatefunction.md
@@ -18,6 +18,8 @@ The following aggregate functions are supported:
 -   [`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.
 
diff --git a/src/AggregateFunctions/AggregateFunctionArgMinMax.h b/src/AggregateFunctions/AggregateFunctionArgMinMax.h
index 9470b1b8692..67f21db0240 100644
--- a/src/AggregateFunctions/AggregateFunctionArgMinMax.h
+++ b/src/AggregateFunctions/AggregateFunctionArgMinMax.h
@@ -1,14 +1,16 @@
 #pragma once
 
-#include <common/StringRef.h>
-#include <DataTypes/IDataType.h>
-#include <AggregateFunctions/IAggregateFunction.h>
 #include <AggregateFunctions/AggregateFunctionMinMaxAny.h> // SingleValueDataString used in embedded compiler
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <Columns/ColumnTuple.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/IDataType.h>
+#include <common/StringRef.h>
+#include "Columns/IColumn.h"
 
 
 namespace DB
 {
-
 namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
@@ -22,37 +24,49 @@ struct AggregateFunctionArgMinMaxData
     using ResultData_t = ResultData;
     using ValueData_t = ValueData;
 
-    ResultData result;  // the argument at which the minimum/maximum value is reached.
-    ValueData value;    // value for which the minimum/maximum is calculated.
+    ResultData result; // the argument at which the minimum/maximum value is reached.
+    ValueData value; // value for which the minimum/maximum is calculated.
 
-    static bool allocatesMemoryInArena()
-    {
-        return ResultData::allocatesMemoryInArena() || ValueData::allocatesMemoryInArena();
-    }
+    static bool allocatesMemoryInArena() { return ResultData::allocatesMemoryInArena() || ValueData::allocatesMemoryInArena(); }
+
+    static String name() { return StringRef(ValueData_t::name()) == StringRef("min") ? "argMin" : "argMax"; }
 };
 
 /// Returns the first arg value found for the minimum/maximum value. Example: argMax(arg, value).
 template <typename Data>
-class AggregateFunctionArgMinMax final : public IAggregateFunctionDataHelper<Data, AggregateFunctionArgMinMax<Data>>
+class AggregateFunctionArgMinMax final : public IAggregateFunctionTupleArgHelper<Data, AggregateFunctionArgMinMax<Data>, 2>
 {
 private:
     const DataTypePtr & type_res;
     const DataTypePtr & type_val;
+    bool tuple_argument;
+
+    using Base = IAggregateFunctionTupleArgHelper<Data, AggregateFunctionArgMinMax<Data>, 2>;
 
 public:
-    AggregateFunctionArgMinMax(const DataTypePtr & type_res_, const DataTypePtr & type_val_)
-        : IAggregateFunctionDataHelper<Data, AggregateFunctionArgMinMax<Data>>({type_res_, type_val_}, {}),
-        type_res(this->argument_types[0]), type_val(this->argument_types[1])
+    AggregateFunctionArgMinMax(const DataTypePtr & type_res_, const DataTypePtr & type_val_, const bool tuple_argument_)
+        : Base({type_res_, type_val_}, {}, tuple_argument_)
+        , type_res(this->argument_types[0])
+        , type_val(this->argument_types[1])
     {
         if (!type_val->isComparable())
-            throw Exception("Illegal type " + type_val->getName() + " of second argument of aggregate function " + getName()
-                + " because the values of that data type are not comparable", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            throw Exception(
+                "Illegal type " + type_val->getName() + " of second argument of aggregate function " + getName()
+                    + " because the values of that data type are not comparable",
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+
+        this->tuple_argument = tuple_argument_;
     }
 
-    String getName() const override { return StringRef(Data::ValueData_t::name()) == StringRef("min") ? "argMin" : "argMax"; }
+    String getName() const override { return Data::name(); }
 
     DataTypePtr getReturnType() const override
     {
+        if (tuple_argument)
+        {
+            return std::make_shared<DataTypeTuple>(DataTypes{this->type_res, this->type_val});
+        }
+
         return type_res;
     }
 
@@ -80,15 +94,21 @@ public:
         this->data(place).value.read(buf, *type_val, arena);
     }
 
-    bool allocatesMemoryInArena() const override
-    {
-        return Data::allocatesMemoryInArena();
-    }
+    bool allocatesMemoryInArena() const override { return Data::allocatesMemoryInArena(); }
 
     void insertResultInto(AggregateDataPtr place, IColumn & to, Arena *) const override
     {
-        this->data(place).result.insertResultInto(to);
+        if (tuple_argument)
+        {
+            auto & tup = assert_cast<ColumnTuple &>(to);
+
+            this->data(place).result.insertResultInto(tup.getColumn(0));
+            this->data(place).value.insertResultInto(tup.getColumn(1));
+        }
+        else
+            this->data(place).result.insertResultInto(to);
     }
 };
 
+
 }
diff --git a/src/AggregateFunctions/Helpers.h b/src/AggregateFunctions/Helpers.h
index fb727bf98b0..2b21b745a0e 100644
--- a/src/AggregateFunctions/Helpers.h
+++ b/src/AggregateFunctions/Helpers.h
@@ -31,6 +31,12 @@
     M(Float32) \
     M(Float64)
 
+#define FOR_DECIMAL_TYPES(M) \
+    M(Decimal32) \
+    M(Decimal64) \
+    M(Decimal128)
+
+
 namespace DB
 {
 
diff --git a/src/AggregateFunctions/HelpersMinMaxAny.h b/src/AggregateFunctions/HelpersMinMaxAny.h
index dc165f50d8e..e995f52f498 100644
--- a/src/AggregateFunctions/HelpersMinMaxAny.h
+++ b/src/AggregateFunctions/HelpersMinMaxAny.h
@@ -8,10 +8,14 @@
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeString.h>
-
+#include <DataTypes/DataTypeTuple.h>
 
 namespace DB
 {
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+}
 
 /// min, max, any, anyLast, anyHeavy, etc...
 template <template <typename> class AggregateFunctionTemplate, template <typename> class Data>
@@ -26,6 +30,7 @@ static IAggregateFunction * createAggregateFunctionSingleValue(const String & na
 #define DISPATCH(TYPE) \
     if (which.idx == TypeIndex::TYPE) return new AggregateFunctionTemplate<Data<SingleValueDataFixed<TYPE>>>(argument_type);
     FOR_NUMERIC_TYPES(DISPATCH)
+    FOR_DECIMAL_TYPES(DISPATCH)
 #undef DISPATCH
 
     if (which.idx == TypeIndex::Date)
@@ -34,12 +39,6 @@ static IAggregateFunction * createAggregateFunctionSingleValue(const String & na
         return new AggregateFunctionTemplate<Data<SingleValueDataFixed<DataTypeDateTime::FieldType>>>(argument_type);
     if (which.idx == TypeIndex::DateTime64)
         return new AggregateFunctionTemplate<Data<SingleValueDataFixed<DateTime64>>>(argument_type);
-    if (which.idx == TypeIndex::Decimal32)
-        return new AggregateFunctionTemplate<Data<SingleValueDataFixed<Decimal32>>>(argument_type);
-    if (which.idx == TypeIndex::Decimal64)
-        return new AggregateFunctionTemplate<Data<SingleValueDataFixed<Decimal64>>>(argument_type);
-    if (which.idx == TypeIndex::Decimal128)
-        return new AggregateFunctionTemplate<Data<SingleValueDataFixed<Decimal128>>>(argument_type);
     if (which.idx == TypeIndex::String)
         return new AggregateFunctionTemplate<Data<SingleValueDataString>>(argument_type);
 
@@ -49,66 +48,77 @@ static IAggregateFunction * createAggregateFunctionSingleValue(const String & na
 
 /// argMin, argMax
 template <template <typename> class MinMaxData, typename ResData>
-static IAggregateFunction * createAggregateFunctionArgMinMaxSecond(const DataTypePtr & res_type, const DataTypePtr & val_type)
+static IAggregateFunction * createAggregateFunctionArgMinMaxSecond(const DataTypePtr & res_type, const DataTypePtr & val_type, bool is_tuple)
 {
     WhichDataType which(val_type);
 
 #define DISPATCH(TYPE) \
     if (which.idx == TypeIndex::TYPE) \
-        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<TYPE>>>>(res_type, val_type);
+        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<TYPE>>>>(res_type, val_type, is_tuple);
     FOR_NUMERIC_TYPES(DISPATCH)
+    FOR_DECIMAL_TYPES(DISPATCH)
 #undef DISPATCH
 
     if (which.idx == TypeIndex::Date)
-        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<DataTypeDate::FieldType>>>>(res_type, val_type);
+        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<DataTypeDate::FieldType>>>>(res_type, val_type, is_tuple);
     if (which.idx == TypeIndex::DateTime)
-        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<DataTypeDateTime::FieldType>>>>(res_type, val_type);
+        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<DataTypeDateTime::FieldType>>>>(res_type, val_type, is_tuple);
     if (which.idx == TypeIndex::DateTime64)
-        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<DateTime64>>>>(res_type, val_type);
-    if (which.idx == TypeIndex::Decimal32)
-        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<Decimal32>>>>(res_type, val_type);
-    if (which.idx == TypeIndex::Decimal64)
-        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<Decimal64>>>>(res_type, val_type);
-    if (which.idx == TypeIndex::Decimal128)
-        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<Decimal128>>>>(res_type, val_type);
+        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<DateTime64>>>>(res_type, val_type, is_tuple);
     if (which.idx == TypeIndex::String)
-        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataString>>>(res_type, val_type);
+        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataString>>>(res_type, val_type, is_tuple);
+
+    return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataGeneric>>>(res_type, val_type, is_tuple);
 
-    return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataGeneric>>>(res_type, val_type);
 }
 
 template <template <typename> class MinMaxData>
 static IAggregateFunction * createAggregateFunctionArgMinMax(const String & name, const DataTypes & argument_types, const Array & parameters)
 {
     assertNoParameters(name, parameters);
-    assertBinary(name, argument_types);
 
-    const DataTypePtr & res_type = argument_types[0];
-    const DataTypePtr & val_type = argument_types[1];
+    DataTypePtr res_type, val_type;
+    bool is_tuple = false;
+
+    // argMin and argMax could get tuple of two as arguments
+    if (argument_types.size() == 1 && argument_types[0]->getTypeId() == TypeIndex::Tuple)
+    {
+        const auto * tuple_type = assert_cast<const DataTypeTuple *>(argument_types[0].get());
+
+        if (tuple_type->getElements().size() != 2)
+        {
+            throw Exception("Aggregate function " + name + " expects two elements in tuple argument", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+        }
+
+        res_type = tuple_type->getElements()[0];
+        val_type = tuple_type->getElements()[1];
+        is_tuple = true;
+     }
+     else
+     {
+        assertBinary(name, argument_types);
+        res_type = argument_types[0];
+        val_type = argument_types[1];
+     }
 
     WhichDataType which(res_type);
 #define DISPATCH(TYPE) \
     if (which.idx == TypeIndex::TYPE) \
-        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<TYPE>>(res_type, val_type);
+        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<TYPE>>(res_type, val_type, is_tuple);
     FOR_NUMERIC_TYPES(DISPATCH)
+    FOR_DECIMAL_TYPES(DISPATCH)
 #undef DISPATCH
 
     if (which.idx == TypeIndex::Date)
-        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<DataTypeDate::FieldType>>(res_type, val_type);
+        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<DataTypeDate::FieldType>>(res_type, val_type, is_tuple);
     if (which.idx == TypeIndex::DateTime)
-        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<DataTypeDateTime::FieldType>>(res_type, val_type);
+        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<DataTypeDateTime::FieldType>>(res_type, val_type, is_tuple);
     if (which.idx == TypeIndex::DateTime64)
-        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<DateTime64>>(res_type, val_type);
-    if (which.idx == TypeIndex::Decimal32)
-        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<Decimal32>>(res_type, val_type);
-    if (which.idx == TypeIndex::Decimal64)
-        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<Decimal64>>(res_type, val_type);
-    if (which.idx == TypeIndex::Decimal128)
-        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<Decimal128>>(res_type, val_type);
+        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<DateTime64>>(res_type, val_type, is_tuple);
     if (which.idx == TypeIndex::String)
-        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataString>(res_type, val_type);
+        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataString>(res_type, val_type, is_tuple);
 
-    return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataGeneric>(res_type, val_type);
+    return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataGeneric>(res_type, val_type, is_tuple);
 }
 
 }
diff --git a/src/AggregateFunctions/IAggregateFunction.h b/src/AggregateFunctions/IAggregateFunction.h
index a9fe26688d7..2f3c882e777 100644
--- a/src/AggregateFunctions/IAggregateFunction.h
+++ b/src/AggregateFunctions/IAggregateFunction.h
@@ -2,14 +2,15 @@
 
 #include <cstddef>
 #include <memory>
-#include <vector>
 #include <type_traits>
+#include <vector>
 
 #include <common/types.h>
-#include <Core/ColumnNumbers.h>
-#include <Core/Block.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>
 
 
@@ -48,7 +49,9 @@ class IAggregateFunction
 {
 public:
     IAggregateFunction(const DataTypes & argument_types_, const Array & parameters_)
-        : argument_types(argument_types_), parameters(parameters_) {}
+        : argument_types(argument_types_), parameters(parameters_)
+    {
+    }
 
     /// Get main function name.
     virtual String getName() const = 0;
@@ -100,10 +103,7 @@ public:
     virtual void deserialize(AggregateDataPtr 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 { return false; }
 
     /// 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
@@ -177,12 +177,8 @@ public:
       *  "places" contains a large number of same values consecutively.
       */
     virtual void addBatchArray(
-        size_t batch_size,
-        AggregateDataPtr * places,
-        size_t place_offset,
-        const IColumn ** columns,
-        const UInt64 * offsets,
-        Arena * arena) const = 0;
+        size_t batch_size, AggregateDataPtr * places, size_t place_offset, const IColumn ** columns, const UInt64 * offsets, Arena * arena)
+        const = 0;
 
     /** The case when the aggregation key is UInt8
       * and pointers to aggregation states are stored in AggregateDataPtr[256] lookup table.
@@ -203,8 +199,10 @@ public:
      *  arguments and params are for nested_function.
      */
     virtual AggregateFunctionPtr getOwnNullAdapter(
-        const AggregateFunctionPtr & /*nested_function*/, const DataTypes & /*arguments*/,
-        const Array & /*params*/, const AggregateFunctionProperties & /*properties*/) const
+        const AggregateFunctionPtr & /*nested_function*/,
+        const DataTypes & /*arguments*/,
+        const Array & /*params*/,
+        const AggregateFunctionProperties & /*properties*/) const
     {
         return nullptr;
     }
@@ -235,7 +233,9 @@ private:
 
 public:
     IAggregateFunctionHelper(const DataTypes & argument_types_, const Array & parameters_)
-        : IAggregateFunction(argument_types_, parameters_) {}
+        : IAggregateFunction(argument_types_, parameters_)
+    {
+    }
 
     AddFunc getAddressOfAddFunction() const override { return &addFree; }
 
@@ -387,40 +387,27 @@ class IAggregateFunctionDataHelper : public IAggregateFunctionHelper<Derived>
 protected:
     using Data = T;
 
-    static Data & data(AggregateDataPtr place) { return *reinterpret_cast<Data*>(place); }
-    static const Data & data(ConstAggregateDataPtr place) { return *reinterpret_cast<const Data*>(place); }
+    static Data & data(AggregateDataPtr place) { return *reinterpret_cast<Data *>(place); }
+    static const Data & data(ConstAggregateDataPtr place) { return *reinterpret_cast<const Data *>(place); }
 
 public:
     // Derived class can `override` this to flag that DateTime64 is not supported.
     static constexpr bool DateTime64Supported = true;
 
     IAggregateFunctionDataHelper(const DataTypes & argument_types_, const Array & parameters_)
-        : IAggregateFunctionHelper<Derived>(argument_types_, parameters_) {}
-
-    void create(AggregateDataPtr place) const override
+        : IAggregateFunctionHelper<Derived>(argument_types_, parameters_)
     {
-        new (place) Data;
     }
 
-    void destroy(AggregateDataPtr place) const noexcept override
-    {
-        data(place).~Data();
-    }
+    void create(AggregateDataPtr place) const override { new (place) Data; }
 
-    bool hasTrivialDestructor() const override
-    {
-        return std::is_trivially_destructible_v<Data>;
-    }
+    void destroy(AggregateDataPtr place) const noexcept override { data(place).~Data(); }
 
-    size_t sizeOfData() const override
-    {
-        return sizeof(Data);
-    }
+    bool hasTrivialDestructor() const override { return std::is_trivially_destructible_v<Data>; }
 
-    size_t alignOfData() const override
-    {
-        return alignof(Data);
-    }
+    size_t sizeOfData() const override { return sizeof(Data); }
+
+    size_t alignOfData() const override { return alignof(Data); }
 
     void addBatchLookupTable8(
         size_t batch_size,
@@ -499,6 +486,135 @@ public:
     }
 };
 
+/// Implements tuple argument unwrapper when the tuple just masks arguments
+template <typename T, typename Derived, size_t args_count>
+class IAggregateFunctionTupleArgHelper : public IAggregateFunctionDataHelper<T, Derived>
+{
+private:
+    using Base = IAggregateFunctionDataHelper<T, Derived>;
+
+    static void addFree(const IAggregateFunction * that, AggregateDataPtr place, const IColumn ** columns_, size_t row_num, Arena * arena)
+    {
+        if (const auto * col = checkAndGetColumn<ColumnTuple>(*columns_[0]))
+        {
+            const IColumn * columns[args_count];
+            const auto & tup_columns = col->getColumns();
+
+            assert(tup_columns.size == args_count);
+            for (size_t i = 0; i < tup_columns.size(); ++i)
+            {
+                columns[i] = tup_columns[i].get();
+            }
+
+            static_cast<const Derived &>(*that).add(place, columns, row_num, arena);
+        }
+        else
+            static_cast<const Derived &>(*that).add(place, columns_, row_num, arena);
+    }
+
+protected:
+    void extractColumns(const IColumn ** columns, const IColumn ** aggr_columns) const
+    {
+        if (tuple_argument)
+        {
+            auto tup_columns = assert_cast<const ColumnTuple *>(aggr_columns[0])->getColumns();
+            for (size_t i = 0; i < args_count; ++i)
+                columns[i] = tup_columns[i].get();
+        }
+        else
+        {
+            for (size_t i = 0; i < args_count; ++i)
+                columns[i] = aggr_columns[i];
+        }
+    }
+
+    bool tuple_argument;
+
+public:
+    IAggregateFunctionTupleArgHelper(const DataTypes & argument_types_, const Array & parameters_, bool tuple_argument_)
+        : Base(argument_types_, parameters_)
+    {
+        tuple_argument = tuple_argument_;
+    }
+
+    IAggregateFunction::AddFunc getAddressOfAddFunction() const override { return &addFree; }
+
+    /*
+     * We're overriding addBatch* functions just to avoid extracting columns
+     * in 'add' functions
+     */
+    void addBatch(
+        size_t batch_size,
+        AggregateDataPtr * places,
+        size_t place_offset,
+        const IColumn ** columns,
+        Arena * arena,
+        ssize_t if_argument_pos = -1) const override
+    {
+        const IColumn * ex_columns[args_count];
+        extractColumns(ex_columns, columns);
+
+        Base::addBatch(batch_size, places, place_offset, ex_columns, arena, if_argument_pos);
+    }
+
+    void addBatchSinglePlace(
+        size_t batch_size, AggregateDataPtr place, const IColumn ** columns, Arena * arena, ssize_t if_argument_pos = -1) const override
+    {
+        const IColumn * ex_columns[args_count];
+        extractColumns(ex_columns, columns);
+
+        Base::addBatchSinglePlace(batch_size, place, ex_columns, arena, if_argument_pos);
+    }
+
+    void addBatchSinglePlaceNotNull(
+        size_t batch_size,
+        AggregateDataPtr place,
+        const IColumn ** columns,
+        const UInt8 * null_map,
+        Arena * arena,
+        ssize_t if_argument_pos = -1) const override
+    {
+        const IColumn * ex_columns[args_count];
+        extractColumns(ex_columns, columns);
+
+        Base::addBatchSinglePlaceNotNull(batch_size, place, ex_columns, null_map, arena, if_argument_pos);
+    }
+
+    void addBatchSinglePlaceFromInterval(
+        size_t batch_begin, size_t batch_end, AggregateDataPtr place, const IColumn ** columns, Arena * arena, ssize_t if_argument_pos = -1)
+        const override
+    {
+        const IColumn * ex_columns[args_count];
+        extractColumns(ex_columns, columns);
+
+        Base::addBatchSinglePlaceFromInterval(batch_begin, batch_end, place, ex_columns, arena, if_argument_pos);
+    }
+
+    void addBatchArray(
+        size_t batch_size, AggregateDataPtr * places, size_t place_offset, const IColumn ** columns, const UInt64 * offsets, Arena * arena)
+        const override
+    {
+        const IColumn * ex_columns[args_count];
+        extractColumns(ex_columns, columns);
+
+        Base::addBatchArray(batch_size, places, place_offset, ex_columns, offsets, arena);
+    }
+
+    void addBatchLookupTable8(
+        size_t batch_size,
+        AggregateDataPtr * map,
+        size_t place_offset,
+        std::function<void(AggregateDataPtr &)> init,
+        const UInt8 * key,
+        const IColumn ** columns,
+        Arena * arena) const override
+    {
+        const IColumn * ex_columns[args_count];
+        extractColumns(ex_columns, columns);
+
+        Base::addBatchLookupTable8(batch_size, map, place_offset, init, key, ex_columns, arena);
+    }
+};
 
 /// Properties of aggregate function that are independent of argument types and parameters.
 struct AggregateFunctionProperties
diff --git a/src/DataTypes/DataTypeCustomSimpleAggregateFunction.cpp b/src/DataTypes/DataTypeCustomSimpleAggregateFunction.cpp
index 6b2f94aa7b5..3262dd1610a 100644
--- a/src/DataTypes/DataTypeCustomSimpleAggregateFunction.cpp
+++ b/src/DataTypes/DataTypeCustomSimpleAggregateFunction.cpp
@@ -29,7 +29,8 @@ void DataTypeCustomSimpleAggregateFunction::checkSupportedFunctions(const Aggreg
 {
     static const std::vector<String> supported_functions{"any", "anyLast", "min",
         "max", "sum", "sumWithOverflow", "groupBitAnd", "groupBitOr", "groupBitXor",
-        "sumMap", "minMap", "maxMap", "groupArrayArray", "groupUniqArrayArray"};
+        "sumMap", "minMap", "maxMap", "groupArrayArray", "groupUniqArrayArray",
+        "argMin", "argMax"};
 
     // check function
     if (std::find(std::begin(supported_functions), std::end(supported_functions), function->getName()) == std::end(supported_functions))
diff --git a/tests/queries/0_stateless/00027_argMinMax.reference b/tests/queries/0_stateless/00027_argMinMax.reference
new file mode 100644
index 00000000000..5ba447dd04b
--- /dev/null
+++ b/tests/queries/0_stateless/00027_argMinMax.reference
@@ -0,0 +1,5 @@
+0	(0,1)	9	(9,10)
+0	('0',1)	9	('9',10)
+1970-01-01	('1970-01-01','1970-01-01 00:00:01')	1970-01-10	('1970-01-10','1970-01-01 00:00:10')
+0.00	(0.00,1.00)	9.00	(9.00,10.00)
+4	1
diff --git a/tests/queries/0_stateless/00027_argMinMax.sql b/tests/queries/0_stateless/00027_argMinMax.sql
new file mode 100644
index 00000000000..2bb3b507df5
--- /dev/null
+++ b/tests/queries/0_stateless/00027_argMinMax.sql
@@ -0,0 +1,8 @@
+-- types
+select argMin(x.1, x.2), argMin(x), argMax(x.1, x.2), argMax(x) from (select (number, number + 1) as x from numbers(10));
+select argMin(x.1, x.2), argMin(x), argMax(x.1, x.2), argMax(x) from (select (toString(number), toInt32(number) + 1) as x from numbers(10));
+select argMin(x.1, x.2), argMin(x), argMax(x.1, x.2), argMax(x) from (select (toDate(number, 'UTC'), toDateTime(number, 'UTC') + 1) as x from numbers(10));
+select argMin(x.1, x.2), argMin(x), argMax(x.1, x.2), argMax(x) from (select (toDecimal32(number, 2), toDecimal64(number, 2) + 1) as x from numbers(10));
+
+-- array
+SELECT argMinArray(id, num), argMaxArray(id, num)  FROM (SELECT arrayJoin([[10, 4, 3], [7, 5, 6], [8, 8, 2]]) AS num, arrayJoin([[1, 2, 4], [2, 3, 3]]) AS id);
diff --git a/tests/queries/0_stateless/00027_simple_argMinArray.reference b/tests/queries/0_stateless/00027_simple_argMinArray.reference
deleted file mode 100644
index 4482956b706..00000000000
--- a/tests/queries/0_stateless/00027_simple_argMinArray.reference
+++ /dev/null
@@ -1 +0,0 @@
-4	1
diff --git a/tests/queries/0_stateless/00027_simple_argMinArray.sql b/tests/queries/0_stateless/00027_simple_argMinArray.sql
deleted file mode 100644
index b681a2c53cf..00000000000
--- a/tests/queries/0_stateless/00027_simple_argMinArray.sql
+++ /dev/null
@@ -1 +0,0 @@
-SELECT argMinArray(id, num), argMaxArray(id, num)  FROM (SELECT arrayJoin([[10, 4, 3], [7, 5, 6], [8, 8, 2]]) AS num, arrayJoin([[1, 2, 4], [2, 3, 3]]) AS id)
diff --git a/tests/queries/0_stateless/00915_simple_aggregate_function.reference b/tests/queries/0_stateless/00915_simple_aggregate_function.reference
index 6bbe9b1e8b3..8d5d8340f17 100644
--- a/tests/queries/0_stateless/00915_simple_aggregate_function.reference
+++ b/tests/queries/0_stateless/00915_simple_aggregate_function.reference
@@ -39,7 +39,7 @@ SimpleAggregateFunction(sum, Float64)
 7	14
 8	16
 9	18
-1	1	2	2.2.2.2	3	([1,2,3],[2,1,1])	([1,2,3],[1,1,2])	([1,2,3],[2,1,2])	[1,2,2,3,4]	[4,2,1,3]
-10	2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222	20	20.20.20.20	5	([2,3,4],[2,1,1])	([2,3,4],[3,3,4])	([2,3,4],[4,3,4])	[]	[]
-SimpleAggregateFunction(anyLast, Nullable(String))	SimpleAggregateFunction(anyLast, LowCardinality(Nullable(String)))	SimpleAggregateFunction(anyLast, IPv4)	SimpleAggregateFunction(groupBitOr, UInt32)	SimpleAggregateFunction(sumMap, Tuple(Array(Int32), Array(Int64)))	SimpleAggregateFunction(minMap, Tuple(Array(Int32), Array(Int64)))	SimpleAggregateFunction(maxMap, Tuple(Array(Int32), Array(Int64)))	SimpleAggregateFunction(groupArrayArray, Array(Int32))	SimpleAggregateFunction(groupUniqArrayArray, Array(Int32))
+1	1	2	2.2.2.2	3	([1,2,3],[2,1,1])	([1,2,3],[1,1,2])	([1,2,3],[2,1,2])	[1,2,2,3,4]	[4,2,1,3]	(1,1)	(2,2)
+10	2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222	20	20.20.20.20	5	([2,3,4],[2,1,1])	([2,3,4],[3,3,4])	([2,3,4],[4,3,4])	[]	[]	(3,3)	(4,4)
+SimpleAggregateFunction(anyLast, Nullable(String))	SimpleAggregateFunction(anyLast, LowCardinality(Nullable(String)))	SimpleAggregateFunction(anyLast, IPv4)	SimpleAggregateFunction(groupBitOr, UInt32)	SimpleAggregateFunction(sumMap, Tuple(Array(Int32), Array(Int64)))	SimpleAggregateFunction(minMap, Tuple(Array(Int32), Array(Int64)))	SimpleAggregateFunction(maxMap, Tuple(Array(Int32), Array(Int64)))	SimpleAggregateFunction(groupArrayArray, Array(Int32))	SimpleAggregateFunction(groupUniqArrayArray, Array(Int32))	SimpleAggregateFunction(argMin, Tuple(Int32, Int64))	SimpleAggregateFunction(argMax, Tuple(Int32, Int64))
 with_overflow	1	0
diff --git a/tests/queries/0_stateless/00915_simple_aggregate_function.sql b/tests/queries/0_stateless/00915_simple_aggregate_function.sql
index 82a7aa2152f..c669f810312 100644
--- a/tests/queries/0_stateless/00915_simple_aggregate_function.sql
+++ b/tests/queries/0_stateless/00915_simple_aggregate_function.sql
@@ -31,16 +31,22 @@ create table simple (
     tup_min SimpleAggregateFunction(minMap, Tuple(Array(Int32), Array(Int64))),
     tup_max SimpleAggregateFunction(maxMap, Tuple(Array(Int32), Array(Int64))),
     arr SimpleAggregateFunction(groupArrayArray, Array(Int32)),
-    uniq_arr SimpleAggregateFunction(groupUniqArrayArray, Array(Int32))
+    uniq_arr SimpleAggregateFunction(groupUniqArrayArray, Array(Int32)),
+    arg_min SimpleAggregateFunction(argMin, Tuple(Int32, Int64)),
+    arg_max SimpleAggregateFunction(argMax, Tuple(Int32, Int64))
 ) engine=AggregatingMergeTree order by id;
-insert into simple values(1,'1','1','1.1.1.1', 1, ([1,2], [1,1]), ([1,2], [1,1]), ([1,2], [1,1]), [1,2], [1,2]);
-insert into simple values(1,null,'2','2.2.2.2', 2, ([1,3], [1,1]), ([1,3], [2,2]), ([1,3], [2,2]), [2,3,4], [2,3,4]);
+
+insert into simple values(1,'1','1','1.1.1.1', 1, ([1,2], [1,1]), ([1,2], [1,1]), ([1,2], [1,1]), [1,2], [1,2], (1,1), (1,1));
+insert into simple values(1,null,'2','2.2.2.2', 2, ([1,3], [1,1]), ([1,3], [2,2]), ([1,3], [2,2]), [2,3,4], [2,3,4], (2,2), (2,2));
 -- String longer then MAX_SMALL_STRING_SIZE (actual string length is 100)
-insert into simple values(10,'10','10','10.10.10.10', 4, ([2,3], [1,1]), ([2,3], [3,3]), ([2,3], [3,3]), [], []);
-insert into simple values(10,'2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222','20','20.20.20.20', 1, ([2, 4], [1,1]), ([2, 4], [4,4]), ([2, 4], [4,4]), [], []);
+insert into simple values(10,'10','10','10.10.10.10', 4, ([2,3], [1,1]), ([2,3], [3,3]), ([2,3], [3,3]), [], [], (3,3), (3,3));
+insert into simple values(10,'2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222','20','20.20.20.20', 1, ([2, 4], [1,1]), ([2, 4], [4,4]), ([2, 4], [4,4]), [], [], (4,4), (4,4));
 
 select * from simple final order by id;
-select toTypeName(nullable_str),toTypeName(low_str),toTypeName(ip),toTypeName(status), toTypeName(tup), toTypeName(tup_min), toTypeName(tup_max), toTypeName(arr), toTypeName(uniq_arr) from simple limit 1;
+select toTypeName(nullable_str), toTypeName(low_str), toTypeName(ip), toTypeName(status),
+    toTypeName(tup), toTypeName(tup_min), toTypeName(tup_max), toTypeName(arr),
+    toTypeName(uniq_arr), toTypeName(arg_min), toTypeName(arg_max)
+from simple limit 1;
 
 optimize table simple final;
 

From 4968f1733e2a284215889f947d03246e4a4fd56d Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 21 Jan 2021 15:01:24 +0300
Subject: [PATCH 247/611] Annotations for DateLUT

---
 base/common/DateLUTImpl.h                         | 8 ++++----
 src/Functions/FunctionDateOrDateTimeAddInterval.h | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/base/common/DateLUTImpl.h b/base/common/DateLUTImpl.h
index 3698276d0e1..ef74182b333 100644
--- a/base/common/DateLUTImpl.h
+++ b/base/common/DateLUTImpl.h
@@ -780,7 +780,7 @@ public:
         return lut[index].date + time_offset;
     }
 
-    inline time_t addWeeks(time_t t, Int64 delta) const
+    inline NO_SANITIZE_UNDEFINED time_t addWeeks(time_t t, Int64 delta) const
     {
         return addDays(t, delta * 7);
     }
@@ -812,7 +812,7 @@ public:
         return lut[result_day].date + time_offset;
     }
 
-    inline DayNum addMonths(DayNum d, Int64 delta) const
+    inline NO_SANITIZE_UNDEFINED DayNum addMonths(DayNum d, Int64 delta) const
     {
         const Values & values = lut[d];
 
@@ -836,12 +836,12 @@ public:
         }
     }
 
-    inline time_t addQuarters(time_t t, Int64 delta) const
+    inline NO_SANITIZE_UNDEFINED time_t addQuarters(time_t t, Int64 delta) const
     {
         return addMonths(t, delta * 3);
     }
 
-    inline DayNum addQuarters(DayNum d, Int64 delta) const
+    inline NO_SANITIZE_UNDEFINED DayNum addQuarters(DayNum d, Int64 delta) const
     {
         return addMonths(d, delta * 3);
     }
diff --git a/src/Functions/FunctionDateOrDateTimeAddInterval.h b/src/Functions/FunctionDateOrDateTimeAddInterval.h
index 70e2616eeac..aa753916987 100644
--- a/src/Functions/FunctionDateOrDateTimeAddInterval.h
+++ b/src/Functions/FunctionDateOrDateTimeAddInterval.h
@@ -224,8 +224,9 @@ struct SubtractIntervalImpl : public Transform
     using Transform::Transform;
 
     template <typename T>
-    inline auto execute(T t, Int64 delta, const DateLUTImpl & time_zone) const
+    inline NO_SANITIZE_UNDEFINED auto execute(T t, Int64 delta, const DateLUTImpl & time_zone) const
     {
+        /// Signed integer overflow is Ok.
         return Transform::execute(t, -delta, time_zone);
     }
 };

From 56012402e2b9d7e8b657f6a140e478378dc747c8 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 21 Jan 2021 15:19:00 +0300
Subject: [PATCH 248/611] Fix potential nullptr dereference in table function
 VALUES

---
 src/TableFunctions/TableFunctionValues.cpp             | 10 +++++++---
 tests/queries/0_stateless/01658_values_ubsan.reference |  1 +
 tests/queries/0_stateless/01658_values_ubsan.sql       |  1 +
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 tests/queries/0_stateless/01658_values_ubsan.reference
 create mode 100644 tests/queries/0_stateless/01658_values_ubsan.sql

diff --git a/src/TableFunctions/TableFunctionValues.cpp b/src/TableFunctions/TableFunctionValues.cpp
index 2d01d581fda..4127a30892f 100644
--- a/src/TableFunctions/TableFunctionValues.cpp
+++ b/src/TableFunctions/TableFunctionValues.cpp
@@ -47,12 +47,18 @@ static void parseAndInsertValues(MutableColumns & res_columns, const ASTs & args
         for (size_t i = 1; i < args.size(); ++i)
         {
             const auto & [value_field, value_type_ptr] = evaluateConstantExpression(args[i], context);
-            const DataTypes & value_types_tuple = typeid_cast<const DataTypeTuple *>(value_type_ptr.get())->getElements();
+
+            const DataTypeTuple * type_tuple = typeid_cast<const DataTypeTuple *>(value_type_ptr.get());
+            if (!type_tuple)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "Table function VALUES requires all but first argument (rows specification) to be either tuples or single values");
+
             const Tuple & value_tuple = value_field.safeGet<Tuple>();
 
             if (value_tuple.size() != sample_block.columns())
                 throw Exception("Values size should match with number of columns", ErrorCodes::BAD_ARGUMENTS);
 
+            const DataTypes & value_types_tuple = type_tuple->getElements();
             for (size_t j = 0; j < value_tuple.size(); ++j)
             {
                 Field value = convertFieldToTypeOrThrow(value_tuple[j], *sample_block.getByPosition(j).type, value_types_tuple[j].get());
@@ -64,8 +70,6 @@ static void parseAndInsertValues(MutableColumns & res_columns, const ASTs & args
 
 void TableFunctionValues::parseArguments(const ASTPtr & ast_function, const Context & /*context*/)
 {
-
-
     ASTs & args_func = ast_function->children;
 
     if (args_func.size() != 1)
diff --git a/tests/queries/0_stateless/01658_values_ubsan.reference b/tests/queries/0_stateless/01658_values_ubsan.reference
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/tests/queries/0_stateless/01658_values_ubsan.reference
@@ -0,0 +1 @@
+
diff --git a/tests/queries/0_stateless/01658_values_ubsan.sql b/tests/queries/0_stateless/01658_values_ubsan.sql
new file mode 100644
index 00000000000..10d17c2f00a
--- /dev/null
+++ b/tests/queries/0_stateless/01658_values_ubsan.sql
@@ -0,0 +1 @@
+SELECT * FROM VALUES('x UInt8, y UInt16', 1 + 2, 'Hello'); -- { serverError 36 }

From ac3de63a7134a3ac083f4a785299b1a33a130976 Mon Sep 17 00:00:00 2001
From: Anton Popov <pad11rus@gmail.com>
Date: Thu, 21 Jan 2021 15:34:11 +0300
Subject: [PATCH 249/611] fix several cases, while reading subcolumns

---
 src/DataTypes/DataTypeNullable.cpp            |  2 +-
 src/Storages/ColumnsDescription.cpp           | 13 ++++++-
 src/Storages/ColumnsDescription.h             |  2 +
 src/Storages/MergeTree/IMergeTreeDataPart.cpp | 12 +++---
 .../01475_read_subcolumns_3.reference         | 16 ++++++++
 .../0_stateless/01475_read_subcolumns_3.sql   | 39 +++++++++++++++++++
 6 files changed, 75 insertions(+), 9 deletions(-)
 create mode 100644 tests/queries/0_stateless/01475_read_subcolumns_3.reference
 create mode 100644 tests/queries/0_stateless/01475_read_subcolumns_3.sql

diff --git a/src/DataTypes/DataTypeNullable.cpp b/src/DataTypes/DataTypeNullable.cpp
index 64b060e521b..c3b734686f8 100644
--- a/src/DataTypes/DataTypeNullable.cpp
+++ b/src/DataTypes/DataTypeNullable.cpp
@@ -546,7 +546,7 @@ ColumnPtr DataTypeNullable::getSubcolumn(const String & subcolumn_name, const IC
 {
     const auto & column_nullable = assert_cast<const ColumnNullable &>(column);
     if (subcolumn_name == "null")
-        return column_nullable.getNullMapColumnPtr()->assumeMutable();
+        return column_nullable.getNullMapColumnPtr();
 
     return nested_data_type->getSubcolumn(subcolumn_name, column_nullable.getNestedColumn());
 }
diff --git a/src/Storages/ColumnsDescription.cpp b/src/Storages/ColumnsDescription.cpp
index b4ddde7c0f3..bba577928bf 100644
--- a/src/Storages/ColumnsDescription.cpp
+++ b/src/Storages/ColumnsDescription.cpp
@@ -331,8 +331,7 @@ NamesAndTypesList ColumnsDescription::getAll() const
 
 bool ColumnsDescription::has(const String & column_name) const
 {
-    return columns.get<1>().find(column_name) != columns.get<1>().end()
-        || subcolumns.find(column_name) != subcolumns.end();
+    return columns.get<1>().find(column_name) != columns.get<1>().end();
 }
 
 bool ColumnsDescription::hasNested(const String & column_name) const
@@ -341,6 +340,16 @@ bool ColumnsDescription::hasNested(const String & column_name) const
     return range.first != range.second && range.first->name.length() > column_name.length();
 }
 
+bool ColumnsDescription::hasSubcolumn(const String & column_name) const
+{
+    return subcolumns.find(column_name) != subcolumns.end();
+}
+
+bool ColumnsDescription::hasInStorageOrSubcolumn(const String & column_name) const
+{
+    return has(column_name) || hasSubcolumn(column_name);
+}
+
 const ColumnDescription & ColumnsDescription::get(const String & column_name) const
 {
     auto it = columns.get<1>().find(column_name);
diff --git a/src/Storages/ColumnsDescription.h b/src/Storages/ColumnsDescription.h
index 1990c565b65..26e30004544 100644
--- a/src/Storages/ColumnsDescription.h
+++ b/src/Storages/ColumnsDescription.h
@@ -85,6 +85,8 @@ public:
 
     bool has(const String & column_name) const;
     bool hasNested(const String & column_name) const;
+    bool hasSubcolumn(const String & column_name) const;
+    bool hasInStorageOrSubcolumn(const String & column_name) const;
     const ColumnDescription & get(const String & column_name) const;
 
     template <typename F>
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.cpp b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
index 5a2c17a7b98..2e91d32db1c 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
@@ -879,6 +879,8 @@ void IMergeTreeDataPart::loadColumns(bool require)
 {
     String path = getFullRelativePath() + "columns.txt";
     auto metadata_snapshot = storage.getInMemoryMetadataPtr();
+    NamesAndTypesList loaded_columns;
+
     if (!volume->getDisk()->exists(path))
     {
         /// We can get list of columns only from columns.txt in compact parts.
@@ -888,25 +890,23 @@ void IMergeTreeDataPart::loadColumns(bool require)
         /// If there is no file with a list of columns, write it down.
         for (const NameAndTypePair & column : metadata_snapshot->getColumns().getAllPhysical())
             if (volume->getDisk()->exists(getFullRelativePath() + getFileNameForColumn(column) + ".bin"))
-                columns.push_back(column);
+                loaded_columns.push_back(column);
 
         if (columns.empty())
             throw Exception("No columns in part " + name, ErrorCodes::NO_FILE_IN_DATA_PART);
 
         {
             auto buf = volume->getDisk()->writeFile(path + ".tmp", 4096);
-            columns.writeText(*buf);
+            loaded_columns.writeText(*buf);
         }
         volume->getDisk()->moveFile(path + ".tmp", path);
     }
     else
     {
-        columns.readText(*volume->getDisk()->readFile(path));
+        loaded_columns.readText(*volume->getDisk()->readFile(path));
     }
 
-    size_t pos = 0;
-    for (const auto & column : columns)
-        column_name_to_position.emplace(column.name, pos++);
+    setColumns(loaded_columns);
 }
 
 bool IMergeTreeDataPart::shallParticipateInMerges(const StoragePolicyPtr & storage_policy) const
diff --git a/tests/queries/0_stateless/01475_read_subcolumns_3.reference b/tests/queries/0_stateless/01475_read_subcolumns_3.reference
new file mode 100644
index 00000000000..0fc48bd797a
--- /dev/null
+++ b/tests/queries/0_stateless/01475_read_subcolumns_3.reference
@@ -0,0 +1,16 @@
+Nullable
+2
+2
+2
+2
+Map
+2
+2
+2
+2
+2
+2
+1	2
+2	2
+3	3
+1
diff --git a/tests/queries/0_stateless/01475_read_subcolumns_3.sql b/tests/queries/0_stateless/01475_read_subcolumns_3.sql
new file mode 100644
index 00000000000..66bcd7dbc91
--- /dev/null
+++ b/tests/queries/0_stateless/01475_read_subcolumns_3.sql
@@ -0,0 +1,39 @@
+DROP TABLE IF EXISTS null_subcolumns;
+
+SELECT 'Nullable';
+CREATE TABLE null_subcolumns (id UInt32, n Nullable(String)) ENGINE = MergeTree ORDER BY id;
+
+INSERT INTO null_subcolumns VALUES (1, 'foo') (2, NULL) (3, NULL) (4, 'abc');
+
+SELECT count() FROM null_subcolumns WHERE n.null;
+SELECT count() FROM null_subcolumns PREWHERE n.null;
+
+-- Check, that subcolumns will be available after restart.
+DETACH TABLE null_subcolumns;
+ATTACH TABLE null_subcolumns;
+
+SELECT count() FROM null_subcolumns WHERE n.null;
+SELECT count() FROM null_subcolumns PREWHERE n.null;
+
+DROP TABLE null_subcolumns;
+DROP TABLE IF EXISTS map_subcolumns;
+
+SELECT 'Map';
+SET allow_experimental_map_type = 1;
+CREATE TABLE map_subcolumns (id UInt32, m Map(String, UInt32)) ENGINE = MergeTree ORDER BY id;
+INSERT INTO map_subcolumns VALUES (1, map('a', 1, 'b', 2)) (2, map('a', 3, 'c', 4)), (3, map('b', 5, 'c', 6, 'd', 7));
+
+SELECT count() FROM map_subcolumns WHERE has(m.keys, 'a');
+SELECT count() FROM map_subcolumns PREWHERE has(m.keys, 'b');
+
+SELECT count() FROM map_subcolumns WHERE arrayMax(m.values) > 3;
+SELECT count() FROM map_subcolumns PREWHERE arrayMax(m.values) > 3;
+
+DETACH TABLE map_subcolumns;
+ATTACH TABLE map_subcolumns;
+
+SELECT count() FROM map_subcolumns WHERE has(m.keys, 'a');
+SELECT count() FROM map_subcolumns PREWHERE has(m.keys, 'b');
+
+SELECT id, m.size0 FROM map_subcolumns;
+SELECT count() FROM map_subcolumns WHERE m.size0 > 2;

From ac50b1b231d1c193d7a165e3e1effa57588e6812 Mon Sep 17 00:00:00 2001
From: tavplubix <avtokmakov@yandex-team.ru>
Date: Thu, 21 Jan 2021 15:57:18 +0300
Subject: [PATCH 250/611] Update StorageMaterializedView.cpp

---
 src/Storages/StorageMaterializedView.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Storages/StorageMaterializedView.cpp b/src/Storages/StorageMaterializedView.cpp
index 9b5a4bad697..af00b37b1d5 100644
--- a/src/Storages/StorageMaterializedView.cpp
+++ b/src/Storages/StorageMaterializedView.cpp
@@ -151,7 +151,7 @@ void StorageMaterializedView::read(
     if (query_plan.isInitialized())
     {
         auto mv_header = getHeaderForProcessingStage(*this, column_names, metadata_snapshot, query_info, context, processed_stage);
-        auto target_header = getHeaderForProcessingStage(*storage, column_names, target_metadata_snapshot, query_info, context, processed_stage);
+        auto target_header = query_plan.getCurrentDataStream().header;
         if (!blocksHaveEqualStructure(mv_header, target_header))
         {
             auto converting_actions = ActionsDAG::makeConvertingActions(target_header.getColumnsWithTypeAndName(),

From 375db8ce7e2a042229fb0d0d26ff7c7a74c8d73c Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 21 Jan 2021 16:42:47 +0300
Subject: [PATCH 251/611] Update reference

---
 tests/queries/0_stateless/01658_values_ubsan.reference | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/queries/0_stateless/01658_values_ubsan.reference b/tests/queries/0_stateless/01658_values_ubsan.reference
index 8b137891791..e69de29bb2d 100644
--- a/tests/queries/0_stateless/01658_values_ubsan.reference
+++ b/tests/queries/0_stateless/01658_values_ubsan.reference
@@ -1 +0,0 @@
-

From 3b2a87b57e11596a96db28ff45e0e4ae88f46e80 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 21 Jan 2021 16:48:07 +0300
Subject: [PATCH 252/611] Update SECURITY.md (outdated long time ago)

---
 SECURITY.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 6d64dd2d24b..906b2966348 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -15,9 +15,13 @@ currently being supported with security updates:
 | 20.4   | :x: |
 | 20.5   | :x: |
 | 20.6   | :x: |
-| 20.7   | :white_check_mark: |
+| 20.7   | :x: |
 | 20.8   | :white_check_mark: |
-| 20.9   | :white_check_mark: |
+| 20.9   | :x: |
+| 20.10  | :x: |
+| 20.11  | :white_check_mark: |
+| 20.12  | :white_check_mark: |
+| 21.1   | :white_check_mark: |
 
 ## Reporting a Vulnerability
 

From 2f11fdf4dfbcfd30231a0c36526f5c4b020ee892 Mon Sep 17 00:00:00 2001
From: vdimir <vdimir@yandex-team.ru>
Date: Thu, 21 Jan 2021 16:46:46 +0300
Subject: [PATCH 253/611] Fix default value in join types with non-zero default
 (close #18197)

---
 src/Interpreters/HashJoin.cpp                 |  2 +-
 src/Interpreters/MergeJoin.cpp                | 14 ++++---
 src/Interpreters/join_common.cpp              | 33 ++++++++++++++-
 src/Interpreters/join_common.h                |  2 +
 .../01656_join_defaul_enum.reference          | 36 +++++++++++++++++
 .../0_stateless/01656_join_defaul_enum.sql    | 40 +++++++++++++++++++
 6 files changed, 118 insertions(+), 9 deletions(-)
 create mode 100644 tests/queries/0_stateless/01656_join_defaul_enum.reference
 create mode 100644 tests/queries/0_stateless/01656_join_defaul_enum.sql

diff --git a/src/Interpreters/HashJoin.cpp b/src/Interpreters/HashJoin.cpp
index 7c472a27d88..7cdaf11dcd4 100644
--- a/src/Interpreters/HashJoin.cpp
+++ b/src/Interpreters/HashJoin.cpp
@@ -702,7 +702,7 @@ public:
         if (lazy_defaults_count)
         {
             for (size_t j = 0; j < right_indexes.size(); ++j)
-                columns[j]->insertManyDefaults(lazy_defaults_count);
+                JoinCommon::addDefaultValues(columns[j], type_name[j].first, lazy_defaults_count);
             lazy_defaults_count = 0;
         }
     }
diff --git a/src/Interpreters/MergeJoin.cpp b/src/Interpreters/MergeJoin.cpp
index 4839980eac7..e4f84093763 100644
--- a/src/Interpreters/MergeJoin.cpp
+++ b/src/Interpreters/MergeJoin.cpp
@@ -398,7 +398,8 @@ bool joinEquals(const Block & left_block, const Block & right_block, const Block
 }
 
 template <bool copy_left>
-void joinInequalsLeft(const Block & left_block, MutableColumns & left_columns, MutableColumns & right_columns,
+void joinInequalsLeft(const Block & left_block, MutableColumns & left_columns,
+                      const Block & right_block, MutableColumns & right_columns,
                       size_t start, size_t end)
 {
     if (end <= start)
@@ -408,9 +409,10 @@ void joinInequalsLeft(const Block & left_block, MutableColumns & left_columns, M
     if constexpr (copy_left)
         copyLeftRange(left_block, left_columns, start, rows_to_add);
 
-    /// append nulls
-    for (auto & column : right_columns)
-        column->insertManyDefaults(rows_to_add);
+    for (size_t i = 0; i < right_columns.size(); ++i)
+    {
+        JoinCommon::addDefaultValues(right_columns[i], right_block.getByPosition(i).type, rows_to_add);
+    }
 }
 
 }
@@ -696,7 +698,7 @@ void MergeJoin::joinSortedBlock(Block & block, ExtraBlockPtr & not_processed)
         }
 
         left_cursor.nextN(left_key_tail);
-        joinInequalsLeft<is_all>(block, left_columns, right_columns, left_cursor.position(), left_cursor.end());
+        joinInequalsLeft<is_all>(block, left_columns, right_columns_to_add, right_columns, left_cursor.position(), left_cursor.end());
         //left_cursor.nextN(left_cursor.end() - left_cursor.position());
 
         changeLeftColumns(block, std::move(left_columns));
@@ -773,7 +775,7 @@ bool MergeJoin::leftJoin(MergeJoinCursor & left_cursor, const Block & left_block
 
         Range range = left_cursor.getNextEqualRange(right_cursor);
 
-        joinInequalsLeft<is_all>(left_block, left_columns, right_columns, left_unequal_position, range.left_start);
+        joinInequalsLeft<is_all>(left_block, left_columns, right_columns_to_add, right_columns, left_unequal_position, range.left_start);
 
         if (range.empty())
             break;
diff --git a/src/Interpreters/join_common.cpp b/src/Interpreters/join_common.cpp
index 17c289b151d..b2ad7ba74e8 100644
--- a/src/Interpreters/join_common.cpp
+++ b/src/Interpreters/join_common.cpp
@@ -276,6 +276,20 @@ void joinTotals(const Block & totals, const Block & columns_to_add, const Names
     }
 }
 
+void addDefaultValues(MutableColumnPtr & column, const DataTypePtr & typ, size_t count)
+{
+    if (typ->getTypeId() == column->getDataType())
+    {
+        column->insertManyDefaults(count);
+    }
+    else
+    {
+        auto default_val = typ->getDefault();
+        for (size_t i = 0; i < count; ++i)
+            column->insert(default_val);
+    }
+}
+
 }
 
 
@@ -387,9 +401,24 @@ void NotJoined::correctLowcardAndNullability(MutableColumns & columns_right)
 
 void NotJoined::addLeftColumns(Block & block, size_t rows_added) const
 {
-    /// @note it's possible to make ColumnConst here and materialize it later
     for (size_t pos : column_indices_left)
-        block.getByPosition(pos).column = block.getByPosition(pos).column->cloneResized(rows_added);
+    {
+        auto & col = block.getByPosition(pos);
+        if (col.column->getDataType() == col.type->getTypeId())
+        {
+            col.column = col.column->cloneResized(rows_added);
+        }
+        else
+        {
+            auto mut_col = col.column->cloneEmpty();
+            mut_col->reserve(rows_added);
+
+            const auto default_value = col.type->getDefault();
+            for (size_t i = 0; i < rows_added; ++i)
+                mut_col->insert(default_value);
+            col.column = std::move(mut_col);
+        }
+    }
 }
 
 void NotJoined::addRightColumns(Block & block, MutableColumns & columns_right) const
diff --git a/src/Interpreters/join_common.h b/src/Interpreters/join_common.h
index cfd727704a0..acce0ee3651 100644
--- a/src/Interpreters/join_common.h
+++ b/src/Interpreters/join_common.h
@@ -34,6 +34,8 @@ void checkTypesOfKeys(const Block & block_left, const Names & key_names_left, co
 void createMissedColumns(Block & block);
 void joinTotals(const Block & totals, const Block & columns_to_add, const Names & key_names_right, Block & block);
 
+void addDefaultValues(MutableColumnPtr & column, const DataTypePtr & typ, size_t count);
+
 }
 
 /// Creates result from right table data in RIGHT and FULL JOIN when keys are not present in left table.
diff --git a/tests/queries/0_stateless/01656_join_defaul_enum.reference b/tests/queries/0_stateless/01656_join_defaul_enum.reference
new file mode 100644
index 00000000000..f0fb4b8bf2b
--- /dev/null
+++ b/tests/queries/0_stateless/01656_join_defaul_enum.reference
@@ -0,0 +1,36 @@
+1	First
+2	Second
+3	First
+1	First
+2	Second
+3	First
+4	Second
+2	Second
+4	Second
+2	Second
+4	Second
+1	First
+2	Second
+3	First
+1	First
+2	Second
+3	First
+4	Second
+1	First
+2	Second
+3	First
+1	First
+2	Second
+3	First
+4	Second
+2	Second
+4	Second
+2	Second
+4	Second
+1	First
+2	Second
+3	First
+1	First
+2	Second
+3	First
+4	Second
diff --git a/tests/queries/0_stateless/01656_join_defaul_enum.sql b/tests/queries/0_stateless/01656_join_defaul_enum.sql
new file mode 100644
index 00000000000..8a0fc089b16
--- /dev/null
+++ b/tests/queries/0_stateless/01656_join_defaul_enum.sql
@@ -0,0 +1,40 @@
+DROP DATABASE IF EXISTS test_01656;
+
+CREATE DATABASE test_01656;
+USE test_01656;
+
+DROP TABLE IF EXISTS table_key;
+DROP TABLE IF EXISTS table_with_enum;
+
+CREATE TABLE table_key (keycol UInt16) ENGINE = MergeTree() ORDER BY (keycol) PARTITION BY tuple();
+
+CREATE TABLE table_with_enum (keycol UInt16, enum_col Enum8('First' = 1,'Second' = 2))
+    ENGINE = MergeTree() ORDER BY (keycol) PARTITION BY tuple();
+
+INSERT INTO table_key VALUES (1), (2), (3);
+INSERT INTO table_with_enum VALUES (2, 'Second'), (4, 'Second');
+
+SET join_algorithm = 'hash';
+
+SELECT keycol, enum_col FROM table_key LEFT JOIN table_with_enum USING (keycol) ORDER BY keycol;
+SELECT keycol, enum_col FROM table_key FULL JOIN table_with_enum USING (keycol) ORDER BY keycol;
+SELECT keycol, enum_col FROM table_key RIGHT JOIN table_with_enum USING (keycol) ORDER BY keycol;
+
+SELECT keycol, enum_col FROM table_with_enum LEFT JOIN table_key USING (keycol) ORDER BY keycol;
+SELECT keycol, enum_col FROM table_with_enum RIGHT JOIN table_key USING (keycol) ORDER BY keycol;
+SELECT keycol, enum_col FROM table_with_enum FULL JOIN table_key USING (keycol) ORDER BY keycol;
+
+SET join_algorithm = 'partial_merge';
+
+SELECT keycol, enum_col FROM table_key LEFT JOIN table_with_enum USING (keycol) ORDER BY keycol;
+SELECT keycol, enum_col FROM table_key FULL JOIN table_with_enum USING (keycol) ORDER BY keycol;
+SELECT keycol, enum_col FROM table_key RIGHT JOIN table_with_enum USING (keycol) ORDER BY keycol;
+
+SELECT keycol, enum_col FROM table_with_enum LEFT JOIN table_key USING (keycol) ORDER BY keycol;
+SELECT keycol, enum_col FROM table_with_enum RIGHT JOIN table_key USING (keycol) ORDER BY keycol;
+SELECT keycol, enum_col FROM table_with_enum FULL JOIN table_key USING (keycol) ORDER BY keycol;
+
+DROP TABLE IF EXISTS table_key;
+DROP TABLE IF EXISTS table_with_enum;
+
+DROP DATABASE IF EXISTS test_01656;

From 06d0252e76414a487f707f7cdd1df1390694e810 Mon Sep 17 00:00:00 2001
From: vdimir <vdimir@yandex-team.ru>
Date: Thu, 21 Jan 2021 17:18:57 +0300
Subject: [PATCH 254/611] Use IDataType::insertDefaultInto for inserting
 default values in join

---
 src/Interpreters/HashJoin.cpp    |  2 +-
 src/Interpreters/MergeJoin.cpp   |  2 +-
 src/Interpreters/join_common.cpp | 31 +++++++------------------------
 src/Interpreters/join_common.h   |  2 +-
 4 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/src/Interpreters/HashJoin.cpp b/src/Interpreters/HashJoin.cpp
index 7cdaf11dcd4..ac2429334e4 100644
--- a/src/Interpreters/HashJoin.cpp
+++ b/src/Interpreters/HashJoin.cpp
@@ -702,7 +702,7 @@ public:
         if (lazy_defaults_count)
         {
             for (size_t j = 0; j < right_indexes.size(); ++j)
-                JoinCommon::addDefaultValues(columns[j], type_name[j].first, lazy_defaults_count);
+                JoinCommon::addDefaultValues(*columns[j], type_name[j].first, lazy_defaults_count);
             lazy_defaults_count = 0;
         }
     }
diff --git a/src/Interpreters/MergeJoin.cpp b/src/Interpreters/MergeJoin.cpp
index e4f84093763..2cf1024648a 100644
--- a/src/Interpreters/MergeJoin.cpp
+++ b/src/Interpreters/MergeJoin.cpp
@@ -411,7 +411,7 @@ void joinInequalsLeft(const Block & left_block, MutableColumns & left_columns,
 
     for (size_t i = 0; i < right_columns.size(); ++i)
     {
-        JoinCommon::addDefaultValues(right_columns[i], right_block.getByPosition(i).type, rows_to_add);
+        JoinCommon::addDefaultValues(*right_columns[i], right_block.getByPosition(i).type, rows_to_add);
     }
 }
 
diff --git a/src/Interpreters/join_common.cpp b/src/Interpreters/join_common.cpp
index b2ad7ba74e8..a4c39a45efa 100644
--- a/src/Interpreters/join_common.cpp
+++ b/src/Interpreters/join_common.cpp
@@ -276,18 +276,11 @@ void joinTotals(const Block & totals, const Block & columns_to_add, const Names
     }
 }
 
-void addDefaultValues(MutableColumnPtr & column, const DataTypePtr & typ, size_t count)
+void addDefaultValues(IColumn & column, const DataTypePtr & type, size_t count)
 {
-    if (typ->getTypeId() == column->getDataType())
-    {
-        column->insertManyDefaults(count);
-    }
-    else
-    {
-        auto default_val = typ->getDefault();
-        for (size_t i = 0; i < count; ++i)
-            column->insert(default_val);
-    }
+    column.reserve(column.size() + count);
+    for (size_t i = 0; i < count; ++i)
+        type->insertDefaultInto(column);
 }
 
 }
@@ -404,20 +397,10 @@ void NotJoined::addLeftColumns(Block & block, size_t rows_added) const
     for (size_t pos : column_indices_left)
     {
         auto & col = block.getByPosition(pos);
-        if (col.column->getDataType() == col.type->getTypeId())
-        {
-            col.column = col.column->cloneResized(rows_added);
-        }
-        else
-        {
-            auto mut_col = col.column->cloneEmpty();
-            mut_col->reserve(rows_added);
 
-            const auto default_value = col.type->getDefault();
-            for (size_t i = 0; i < rows_added; ++i)
-                mut_col->insert(default_value);
-            col.column = std::move(mut_col);
-        }
+        auto mut_col = col.column->cloneEmpty();
+        JoinCommon::addDefaultValues(*mut_col, col.type, rows_added);
+        col.column = std::move(mut_col);
     }
 }
 
diff --git a/src/Interpreters/join_common.h b/src/Interpreters/join_common.h
index acce0ee3651..6f9f7dd1210 100644
--- a/src/Interpreters/join_common.h
+++ b/src/Interpreters/join_common.h
@@ -34,7 +34,7 @@ void checkTypesOfKeys(const Block & block_left, const Names & key_names_left, co
 void createMissedColumns(Block & block);
 void joinTotals(const Block & totals, const Block & columns_to_add, const Names & key_names_right, Block & block);
 
-void addDefaultValues(MutableColumnPtr & column, const DataTypePtr & typ, size_t count);
+void addDefaultValues(IColumn & column, const DataTypePtr & type, size_t count);
 
 }
 

From ec8ff215261c03608a94133dfe27a487c7270b77 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Thu, 21 Jan 2021 17:28:46 +0300
Subject: [PATCH 255/611] Reconnect after client errors

---
 programs/client/Client.cpp                    |  8 +++-
 tests/clickhouse-test                         |  2 +-
 .../0_stateless/01564_test_hint_woes.sql      |  5 +++
 .../01565_reconnect_after_client_error.expect | 39 +++++++++++++++++++
 ...565_reconnect_after_client_error.reference |  0
 5 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100755 tests/queries/0_stateless/01565_reconnect_after_client_error.expect
 create mode 100644 tests/queries/0_stateless/01565_reconnect_after_client_error.reference

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 27ecaa40061..bf54aeba1cf 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -680,6 +680,12 @@ private:
 
                     std::cerr << std::endl;
 
+                    client_exception.reset(new Exception(e));
+                }
+
+                if (client_exception)
+                {
+                    /// client_exception may have been set above or elsewhere.
                     /// Client-side exception during query execution can result in the loss of
                     /// sync in the connection protocol.
                     /// So we reconnect and allow to enter the next query.
@@ -937,7 +943,7 @@ private:
         if (client_exception)
         {
             fmt::print(stderr,
-                "Error on processing query '{}':\n{}",
+                "Error on processing query '{}':\n{}\n",
                 full_query, client_exception->message());
         }
 
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index 64497349c78..bc07d624cd9 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -649,7 +649,7 @@ def main(args):
     def is_test_from_dir(suite_dir, case):
         case_file = os.path.join(suite_dir, case)
         (name, ext) = os.path.splitext(case)
-        return os.path.isfile(case_file) and (ext == '.sql' or ext == '.sh' or ext == '.py')
+        return os.path.isfile(case_file) and (ext == '.sql' or ext == '.sh' or ext == '.py' or ext == '.expect' or os.access(case_file, os. X_OK))
 
     def sute_key_func(item):
        if args.order == 'random':
diff --git a/tests/queries/0_stateless/01564_test_hint_woes.sql b/tests/queries/0_stateless/01564_test_hint_woes.sql
index be41a8dffaf..ec2c319e8d1 100644
--- a/tests/queries/0_stateless/01564_test_hint_woes.sql
+++ b/tests/queries/0_stateless/01564_test_hint_woes.sql
@@ -42,5 +42,10 @@ OPTIMIZE TABLE values_01564 DEDUPLICATE BY; -- { clientError 62 }
 OPTIMIZE TABLE values_01564 DEDUPLICATE BY a EXCEPT a; -- { clientError 62 }
 select 'a' || distinct one || 'c' from system.one; -- { clientError 62 }
 
+-- a failing insert and then a normal insert (#https://github.com/ClickHouse/ClickHouse/issues/19353)
+CREATE TABLE t0 (c0 String, c1 Int32) ENGINE = Memory() ;
+INSERT INTO t0(c0, c1) VALUES ("1",1) ; -- { clientError 47 }
+INSERT INTO t0(c0, c1) VALUES ('1', 1) ;
+
 -- the return code must be zero after the final query has failed with expected error
 insert into values_01564 values (11); -- { serverError 469 }
diff --git a/tests/queries/0_stateless/01565_reconnect_after_client_error.expect b/tests/queries/0_stateless/01565_reconnect_after_client_error.expect
new file mode 100755
index 00000000000..89ba90988dd
--- /dev/null
+++ b/tests/queries/0_stateless/01565_reconnect_after_client_error.expect
@@ -0,0 +1,39 @@
+#!/usr/bin/expect -f
+
+# This is a separate test, because we want to test the interactive mode.
+# https://github.com/ClickHouse/ClickHouse/issues/19353
+
+log_user 0
+set timeout 5
+match_max 100000
+
+# A default timeout action is to fail
+expect_after {
+    timeout {
+        exit 1
+    }
+}
+
+set basedir [file dirname $argv0]
+spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT_BINARY \$CLICKHOUSE_CLIENT_OPT -mn"
+expect "\n:) "
+
+send -- "DROP TABLE IF EXISTS t01565;\n"
+expect "\nOk."
+expect "\n:)"
+
+send -- "CREATE TABLE t01565 (c0 String, c1 Int32) ENGINE = Memory() ;\n"
+expect "\nOk."
+expect "\n:) "
+
+send -- "INSERT INTO t01565(c0, c1) VALUES (\"1\",1) ;\n"
+expect "\nConnected"
+expect "\n:) "
+
+send -- "INSERT INTO t01565(c0, c1) VALUES ('1', 1) ;\n"
+expect "\nOk."
+expect "\n:) "
+
+# Ctrl+D
+send -- "\4"
+expect eof
diff --git a/tests/queries/0_stateless/01565_reconnect_after_client_error.reference b/tests/queries/0_stateless/01565_reconnect_after_client_error.reference
new file mode 100644
index 00000000000..e69de29bb2d

From 4ac080b2cab41ec3e2133eabd017bc505ef59fac Mon Sep 17 00:00:00 2001
From: Yatsishin Ilya <2159081+qoega@users.noreply.github.com>
Date: Thu, 21 Jan 2021 17:53:28 +0300
Subject: [PATCH 256/611] SQLancer binary changed its name

---
 docker/test/sqlancer/run.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker/test/sqlancer/run.sh b/docker/test/sqlancer/run.sh
index 950b95249f9..ffe0afd98a8 100755
--- a/docker/test/sqlancer/run.sh
+++ b/docker/test/sqlancer/run.sh
@@ -14,12 +14,12 @@ cd /sqlancer/sqlancer-master
 export TIMEOUT=60
 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
-( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPGroupBy | tee /test_output/TLPGroupBy.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPGroupBy.err
-( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPHaving | tee /test_output/TLPHaving.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPHaving.err
-( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPWhere --oracle TLPGroupBy | tee /test_output/TLPWhereGroupBy.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPWhereGroupBy.err
-( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPDistinct | tee /test_output/TLPDistinct.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPDistinct.err
-( java -jar target/SQLancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPAggregate | tee /test_output/TLPAggregate.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPAggregate.err
+( 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
+( java -jar target/sqlancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPGroupBy | tee /test_output/TLPGroupBy.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPGroupBy.err
+( java -jar target/sqlancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPHaving | tee /test_output/TLPHaving.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPHaving.err
+( java -jar target/sqlancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPWhere --oracle TLPGroupBy | tee /test_output/TLPWhereGroupBy.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPWhereGroupBy.err
+( java -jar target/sqlancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPDistinct | tee /test_output/TLPDistinct.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPDistinct.err
+( java -jar target/sqlancer-*.jar --num-threads 10 --timeout-seconds $TIMEOUT --num-queries $NUM_QUERIES  --username default --password "" clickhouse --oracle TLPAggregate | tee /test_output/TLPAggregate.out )  3>&1 1>&2 2>&3 | tee /test_output/TLPAggregate.err
 
 service clickhouse-server stop && sleep 10
 

From 600862f4a2212eee416e874479e43dc0e95efa36 Mon Sep 17 00:00:00 2001
From: tavplubix <avtokmakov@yandex-team.ru>
Date: Thu, 21 Jan 2021 18:00:58 +0300
Subject: [PATCH 257/611] Better logging in MySQLHandler

---
 src/Server/MySQLHandler.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Server/MySQLHandler.cpp b/src/Server/MySQLHandler.cpp
index 89cd055a848..63a48fde1a7 100644
--- a/src/Server/MySQLHandler.cpp
+++ b/src/Server/MySQLHandler.cpp
@@ -185,6 +185,7 @@ void MySQLHandler::run()
             }
             catch (...)
             {
+                tryLogCurrentException(log, "MySQLHandler: Cannot read packet: ");
                 packet_endpoint->sendPacket(ERRPacket(getCurrentExceptionCode(), "00000", getCurrentExceptionMessage(false)), true);
             }
         }

From 066fbfff0ef349f38d7f7c1dc8f7eaf71b2ce92b Mon Sep 17 00:00:00 2001
From: Mikhail Filimonov <mfilimonov@altinity.com>
Date: Thu, 21 Jan 2021 16:04:55 +0100
Subject: [PATCH 258/611] librdkafka support for arm64

---
 base/glibc-compatibility/CMakeLists.txt |  9 ++++++---
 cmake/find/rdkafka.cmake                | 16 +++-------------
 contrib/librdkafka-cmake/config.h.in    |  4 ++--
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/base/glibc-compatibility/CMakeLists.txt b/base/glibc-compatibility/CMakeLists.txt
index eb9d8db454d..684c6162941 100644
--- a/base/glibc-compatibility/CMakeLists.txt
+++ b/base/glibc-compatibility/CMakeLists.txt
@@ -27,9 +27,12 @@ if (GLIBC_COMPATIBILITY)
         list(APPEND glibc_compatibility_sources musl/getentropy.c)
     endif()
 
-    add_library (clickhouse_memcpy OBJECT
-        ${ClickHouse_SOURCE_DIR}/contrib/FastMemcpy/memcpy_wrapper.c
-    )
+    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")
diff --git a/cmake/find/rdkafka.cmake b/cmake/find/rdkafka.cmake
index bf7028feb02..f6460c1d9a3 100644
--- a/cmake/find/rdkafka.cmake
+++ b/cmake/find/rdkafka.cmake
@@ -1,8 +1,4 @@
-if (NOT ARCH_ARM)
-    option (ENABLE_RDKAFKA "Enable kafka" ${ENABLE_LIBRARIES})
-elseif(ENABLE_RDKAFKA)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "librdafka is not supported on ARM")
-endif ()
+option (ENABLE_RDKAFKA "Enable kafka" ${ENABLE_LIBRARIES})
 
 if (NOT ENABLE_RDKAFKA)
     if (USE_INTERNAL_RDKAFKA_LIBRARY)
@@ -11,11 +7,7 @@ if (NOT ENABLE_RDKAFKA)
     return()
 endif()
 
-if (NOT ARCH_ARM)
-    option (USE_INTERNAL_RDKAFKA_LIBRARY "Set to FALSE to use system librdkafka instead of the bundled" ${NOT_UNBUNDLED})
-elseif(USE_INTERNAL_RDKAFKA_LIBRARY)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal librdkafka with ARCH_ARM=${ARCH_ARM}")
-endif ()
+option (USE_INTERNAL_RDKAFKA_LIBRARY "Set to FALSE to use system librdkafka instead of the bundled" ${NOT_UNBUNDLED})
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/cppkafka/CMakeLists.txt")
     if(USE_INTERNAL_RDKAFKA_LIBRARY)
@@ -65,14 +57,12 @@ if (RDKAFKA_LIB AND RDKAFKA_INCLUDE_DIR)
     if (LZ4_LIBRARY)
        list (APPEND RDKAFKA_LIBRARY ${LZ4_LIBRARY})
     endif ()
-elseif (NOT MISSING_INTERNAL_RDKAFKA_LIBRARY AND NOT MISSING_INTERNAL_CPPKAFKA_LIBRARY AND NOT ARCH_ARM)
+elseif (NOT MISSING_INTERNAL_RDKAFKA_LIBRARY AND NOT MISSING_INTERNAL_CPPKAFKA_LIBRARY)
     set (USE_INTERNAL_RDKAFKA_LIBRARY 1)
     set (RDKAFKA_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/librdkafka/src")
     set (RDKAFKA_LIBRARY rdkafka)
     set (CPPKAFKA_LIBRARY cppkafka)
     set (USE_RDKAFKA 1)
-elseif(ARCH_ARM)
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Using internal rdkafka on ARM is not supported")
 endif ()
 
 message (STATUS "Using librdkafka=${USE_RDKAFKA}: ${RDKAFKA_INCLUDE_DIR} : ${RDKAFKA_LIBRARY} ${CPPKAFKA_LIBRARY}")
diff --git a/contrib/librdkafka-cmake/config.h.in b/contrib/librdkafka-cmake/config.h.in
index 29e833959f7..9057af2bff9 100644
--- a/contrib/librdkafka-cmake/config.h.in
+++ b/contrib/librdkafka-cmake/config.h.in
@@ -1,7 +1,6 @@
 // Originally generated by ./configure
 #ifndef _CONFIG_H_
 #define _CONFIG_H_
-#define ARCH "x86_64"
 #define BUILT_WITH "GCC GXX PKGCONFIG OSXLD LIBDL PLUGINS ZLIB SSL SASL_CYRUS ZSTD HDRHISTOGRAM LZ4_EXT SNAPPY SOCKEM SASL_SCRAM CRC32C_HW"
 
 #define CPU "generic"
@@ -67,7 +66,8 @@
 #cmakedefine WITH_SASL_OAUTHBEARER 1
 #cmakedefine WITH_SASL_CYRUS 1
 // crc32chw
-#if !defined(__PPC__)
+// actually some arch cpus may have hw crc, feature detection can be added.
+#if !defined(__aarch64__) && !defined(__PPC__)
 #define WITH_CRC32C_HW 1
 #endif
 // regex

From 36a42a1f96f57b1254e9830957ce2beb5ada2c3a Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Thu, 21 Jan 2021 18:30:51 +0300
Subject: [PATCH 259/611] update tests

---
 tests/queries/0_stateless/00534_functions_bad_arguments.lib | 0
 tests/queries/0_stateless/01564_test_hint_woes.reference    | 4 ++++
 2 files changed, 4 insertions(+)
 mode change 100755 => 100644 tests/queries/0_stateless/00534_functions_bad_arguments.lib

diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments.lib b/tests/queries/0_stateless/00534_functions_bad_arguments.lib
old mode 100755
new mode 100644
diff --git a/tests/queries/0_stateless/01564_test_hint_woes.reference b/tests/queries/0_stateless/01564_test_hint_woes.reference
index 2f63ed55e85..892ca733d7c 100644
--- a/tests/queries/0_stateless/01564_test_hint_woes.reference
+++ b/tests/queries/0_stateless/01564_test_hint_woes.reference
@@ -23,5 +23,9 @@ select nonexistent column; -- { serverError 47 }
 insert into values_01564 values (1); select 1;
 select 1;
 1
+-- a failing insert and then a normal insert (#https://github.com/ClickHouse/ClickHouse/issues/19353)
+CREATE TABLE t0 (c0 String, c1 Int32) ENGINE = Memory() ;
+INSERT INTO t0(c0, c1) VALUES ("1",1) ; -- { clientError 47 }
+INSERT INTO t0(c0, c1) VALUES ('1', 1) ;
 -- the return code must be zero after the final query has failed with expected error
 insert into values_01564 values (11); -- { serverError 469 }

From c1702f34ee4835c0e5448a1ee9effdf878918b5a Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Wed, 20 Jan 2021 10:54:11 +0000
Subject: [PATCH 260/611] Add factories info into system.query_log

---
 .../AggregateFunctionFactory.cpp              |  5 ++
 src/Common/ThreadStatus.h                     |  5 ++
 src/DataTypes/DataTypeFactory.cpp             |  9 +++
 src/Databases/DatabaseFactory.cpp             |  4 ++
 src/Dictionaries/DictionaryFactory.cpp        |  6 +-
 src/Formats/FormatFactory.cpp                 |  9 +++
 src/Functions/FunctionFactory.cpp             |  4 ++
 src/Interpreters/Context.cpp                  | 24 +++++++
 src/Interpreters/Context.h                    | 17 +++++
 src/Interpreters/QueryLog.cpp                 | 63 +++++++++++++------
 src/Interpreters/QueryLog.h                   |  9 +++
 src/Interpreters/executeQuery.cpp             | 10 +++
 src/Storages/StorageFactory.cpp               |  4 ++
 src/TableFunctions/TableFunctionFactory.cpp   |  4 ++
 ...56_test_query_log_factories_info.reference | 13 ++++
 .../01656_test_query_log_factories_info.sql   | 28 +++++++++
 16 files changed, 195 insertions(+), 19 deletions(-)
 create mode 100644 tests/queries/0_stateless/01656_test_query_log_factories_info.reference
 create mode 100644 tests/queries/0_stateless/01656_test_query_log_factories_info.sql

diff --git a/src/AggregateFunctions/AggregateFunctionFactory.cpp b/src/AggregateFunctions/AggregateFunctionFactory.cpp
index d1dcb8cf455..dc89eeb6be2 100644
--- a/src/AggregateFunctions/AggregateFunctionFactory.cpp
+++ b/src/AggregateFunctions/AggregateFunctionFactory.cpp
@@ -14,6 +14,7 @@
 
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/typeid_cast.h>
+#include <Common/CurrentThread.h>
 
 #include <Poco/String.h>
 #include "registerAggregateFunctions.h"
@@ -59,6 +60,10 @@ static DataTypes convertLowCardinalityTypesToNested(const DataTypes & types)
 AggregateFunctionPtr AggregateFunctionFactory::get(
     const String & name, const DataTypes & argument_types, const Array & parameters, AggregateFunctionProperties & out_properties) const
 {
+    auto query_context = CurrentThread::get().getQueryContext();
+    if (query_context && query_context->getSettingsRef().log_queries)
+        query_context->addQueryFactoriesInfo("AggregateFunction", name);
+
     auto type_without_low_cardinality = convertLowCardinalityTypesToNested(argument_types);
 
     /// If one of the types is Nullable, we apply aggregate function combinator "Null".
diff --git a/src/Common/ThreadStatus.h b/src/Common/ThreadStatus.h
index bdd39d93058..1be1f2cd4df 100644
--- a/src/Common/ThreadStatus.h
+++ b/src/Common/ThreadStatus.h
@@ -178,6 +178,11 @@ public:
         return query_id;
     }
 
+    const Context * getQueryContext() const
+    {
+        return query_context;
+    }
+
     /// Starts new query and create new thread group for it, current thread becomes master thread of the query
     void initializeQuery();
 
diff --git a/src/DataTypes/DataTypeFactory.cpp b/src/DataTypes/DataTypeFactory.cpp
index 1a1f51178ad..21fac9b8094 100644
--- a/src/DataTypes/DataTypeFactory.cpp
+++ b/src/DataTypes/DataTypeFactory.cpp
@@ -10,6 +10,8 @@
 #include <Common/StringUtils/StringUtils.h>
 #include <IO/WriteHelpers.h>
 #include <Core/Defines.h>
+#include <Common/CurrentThread.h>
+#include <Interpreters/Context.h>
 
 
 namespace DB
@@ -76,6 +78,13 @@ DataTypePtr DataTypeFactory::get(const String & family_name_param, const ASTPtr
         return get("LowCardinality", low_cardinality_params);
     }
 
+    if (CurrentThread::isInitialized())
+    {
+        auto query_context = CurrentThread::get().getQueryContext();
+        if (query_context && query_context->getSettingsRef().log_queries)
+            query_context->addQueryFactoriesInfo("DataType", family_name);
+    }
+
     return findCreatorByName(family_name)(parameters);
 }
 
diff --git a/src/Databases/DatabaseFactory.cpp b/src/Databases/DatabaseFactory.cpp
index c61472426a8..589300ca897 100644
--- a/src/Databases/DatabaseFactory.cpp
+++ b/src/Databases/DatabaseFactory.cpp
@@ -12,6 +12,7 @@
 #include <Parsers/formatAST.h>
 #include <Poco/File.h>
 #include <Poco/Path.h>
+#include <Interpreters/Context.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include "config_core.h"
@@ -96,6 +97,9 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
         throw Exception("Database engine " + engine_name + " cannot have parameters, primary_key, order_by, sample_by, settings",
                         ErrorCodes::UNKNOWN_ELEMENT_IN_AST);
 
+    if (context.hasQueryContext() && context.getSettingsRef().log_queries)
+        context.getQueryContext().addQueryFactoriesInfo("Database", engine_name);
+
     if (engine_name == "Ordinary")
         return std::make_shared<DatabaseOrdinary>(database_name, metadata_path, context);
     else if (engine_name == "Atomic")
diff --git a/src/Dictionaries/DictionaryFactory.cpp b/src/Dictionaries/DictionaryFactory.cpp
index ad19d7c20ea..86391aec94d 100644
--- a/src/Dictionaries/DictionaryFactory.cpp
+++ b/src/Dictionaries/DictionaryFactory.cpp
@@ -4,9 +4,10 @@
 #include "DictionarySourceFactory.h"
 #include "DictionaryStructure.h"
 #include "getDictionaryConfigurationFromAST.h"
-
+#include <Interpreters/Context.h>
 #include <common/logger_useful.h>
 
+
 namespace DB
 {
 namespace ErrorCodes
@@ -46,6 +47,9 @@ 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("Dictionary", name);
+
     const auto & layout_type = keys.front();
 
     {
diff --git a/src/Formats/FormatFactory.cpp b/src/Formats/FormatFactory.cpp
index e78190d2976..b408c71d4fd 100644
--- a/src/Formats/FormatFactory.cpp
+++ b/src/Formats/FormatFactory.cpp
@@ -278,6 +278,9 @@ InputFormatPtr FormatFactory::getInputFormat(
 
     const Settings & settings = context.getSettingsRef();
 
+    if (context.hasQueryContext() && settings.log_queries)
+        context.getQueryContext().addQueryFactoriesInfo("Format", name);
+
     auto format_settings = _format_settings
         ? *_format_settings : getFormatSettings(context);
 
@@ -320,6 +323,9 @@ OutputFormatPtr FormatFactory::getOutputFormatParallelIfPossible(
 
         ParallelFormattingOutputFormat::Params builder{buf, sample, formatter_creator, settings.max_threads};
 
+        if (context.hasQueryContext() && settings.log_queries)
+            context.getQueryContext().addQueryFactoriesInfo("Format", name);
+
         return std::make_shared<ParallelFormattingOutputFormat>(builder);
     }
 
@@ -336,6 +342,9 @@ OutputFormatPtr FormatFactory::getOutputFormat(
     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("Format", name);
+
     RowOutputFormatParams params;
     params.callback = std::move(callback);
 
diff --git a/src/Functions/FunctionFactory.cpp b/src/Functions/FunctionFactory.cpp
index 945a78c2734..efd59770875 100644
--- a/src/Functions/FunctionFactory.cpp
+++ b/src/Functions/FunctionFactory.cpp
@@ -58,6 +58,7 @@ FunctionOverloadResolverImplPtr FunctionFactory::getImpl(
         else
             throw Exception(ErrorCodes::UNKNOWN_FUNCTION, "Unknown function {}{}", name, extra_info);
     }
+
     return res;
 }
 
@@ -74,6 +75,9 @@ FunctionOverloadResolverPtr FunctionFactory::get(
     const std::string & name,
     const Context & context) const
 {
+    if (context.hasQueryContext() && context.getSettingsRef().log_queries)
+        context.getQueryContext().addQueryFactoriesInfo("Function", name);
+
     return std::make_shared<FunctionOverloadResolverAdaptor>(getImpl(name, context));
 }
 
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index 2a8fdce869b..2bc920471ff 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -954,6 +954,30 @@ void Context::addQueryAccessInfo(const String & quoted_database_name, const Stri
 }
 
 
+void Context::addQueryFactoriesInfo(String factory_type, const String & created_object) const
+{
+    assert(global_context != this || getApplicationType() == ApplicationType::LOCAL);
+    auto lock = getLock();
+
+    if (factory_type == "AggregateFunction")
+        query_factories_info.aggregate_functions.emplace(created_object);
+    else if (factory_type == "Database")
+        query_factories_info.databases.emplace(created_object);
+    else if (factory_type == "DataType")
+        query_factories_info.data_types.emplace(created_object);
+    else if (factory_type == "Dictionary")
+        query_factories_info.dictionaries.emplace(created_object);
+    else if (factory_type == "Format")
+        query_factories_info.formats.emplace(created_object);
+    else if (factory_type == "Function")
+        query_factories_info.functions.emplace(created_object);
+    else if (factory_type == "Storage")
+        query_factories_info.storages.emplace(created_object);
+    else if (factory_type == "TableFunction")
+        query_factories_info.table_functions.emplace(created_object);
+}
+
+
 StoragePtr Context::executeTableFunction(const ASTPtr & table_expression)
 {
     /// Slightly suboptimal.
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index 79140f0d209..5d3eacc945e 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -201,6 +201,20 @@ private:
 
     QueryAccessInfo query_access_info;
 
+    struct QueryFactoriesInfo
+    {
+        std::set<std::string> aggregate_functions;
+        std::set<std::string> databases;
+        std::set<std::string> data_types;
+        std::set<std::string> dictionaries;
+        std::set<std::string> formats;
+        std::set<std::string> functions;
+        std::set<std::string> storages;
+        std::set<std::string> table_functions;
+    };
+
+    mutable QueryFactoriesInfo query_factories_info;
+
     //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.
@@ -369,6 +383,9 @@ public:
     const QueryAccessInfo & getQueryAccessInfo() const { return query_access_info; }
     void addQueryAccessInfo(const String & quoted_database_name, const String & full_quoted_table_name, const Names & column_names);
 
+    const QueryFactoriesInfo & getQueryFactoriesInfo() const { return query_factories_info; }
+    void addQueryFactoriesInfo(String factory_type, const String & created_object) const;
+
     StoragePtr executeTableFunction(const ASTPtr & table_expression);
 
     void addViewSource(const StoragePtr & storage);
diff --git a/src/Interpreters/QueryLog.cpp b/src/Interpreters/QueryLog.cpp
index 78c4072cd4c..44ea814c5a3 100644
--- a/src/Interpreters/QueryLog.cpp
+++ b/src/Interpreters/QueryLog.cpp
@@ -95,7 +95,16 @@ Block QueryLogElement::createBlock()
         {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "ProfileEvents.Names"},
         {std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>()), "ProfileEvents.Values"},
         {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "Settings.Names"},
-        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "Settings.Values"}
+        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "Settings.Values"},
+
+        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "factory_aggregate_functions"},
+        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "factory_databases"},
+        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "factory_data_types"},
+        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "factory_dictionaries"},
+        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "factory_formats"},
+        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "factory_functions"},
+        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "factory_storages"},
+        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "factory_table_functions"}
     };
 
 }
@@ -127,25 +136,25 @@ void QueryLogElement::appendToBlock(MutableColumns & columns) const
     columns[i++]->insert(normalized_query_hash);
     columns[i++]->insertData(query_kind.data(), query_kind.size());
 
+    auto & column_databases = typeid_cast<ColumnArray &>(*columns[i++]);
+    auto & column_tables = typeid_cast<ColumnArray &>(*columns[i++]);
+    auto & column_columns = typeid_cast<ColumnArray &>(*columns[i++]);
+
+    auto insert_array_from_set = [](const std::set<String> & data, ColumnArray & column)
     {
-        auto & column_databases = typeid_cast<ColumnArray &>(*columns[i++]);
-        auto & column_tables = typeid_cast<ColumnArray &>(*columns[i++]);
-        auto & column_columns = typeid_cast<ColumnArray &>(*columns[i++]);
-        auto fill_column = [](const std::set<String> & data, ColumnArray & column)
+        size_t size = 0;
+        for (const auto & name : data)
         {
-            size_t size = 0;
-            for (const auto & name : data)
-            {
-                column.getData().insertData(name.data(), name.size());
-                ++size;
-            }
-            auto & offsets = column.getOffsets();
-            offsets.push_back(offsets.back() + size);
-        };
-        fill_column(query_databases, column_databases);
-        fill_column(query_tables, column_tables);
-        fill_column(query_columns, column_columns);
-    }
+            column.getData().insertData(name.data(), name.size());
+            ++size;
+        }
+        auto & offsets = column.getOffsets();
+        offsets.push_back(offsets.back() + size);
+    };
+
+    insert_array_from_set(query_databases, column_databases);
+    insert_array_from_set(query_tables, column_tables);
+    insert_array_from_set(query_columns, column_columns);
 
     columns[i++]->insert(exception_code);
     columns[i++]->insertData(exception.data(), exception.size());
@@ -186,6 +195,24 @@ void QueryLogElement::appendToBlock(MutableColumns & columns) const
         columns[i++]->insertDefault();
         columns[i++]->insertDefault();
     }
+
+    auto & column_aggregate_function_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+    auto & column_database_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+    auto & column_data_type_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+    auto & column_dictionary_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+    auto & column_format_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+    auto & column_function_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+    auto & column_storage_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+    auto & column_table_function_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+
+    insert_array_from_set(factory_aggregate_functions, column_aggregate_function_factory_objects);
+    insert_array_from_set(factory_databases, column_database_factory_objects);
+    insert_array_from_set(factory_data_types, column_data_type_factory_objects);
+    insert_array_from_set(factory_dictionaries, column_dictionary_factory_objects);
+    insert_array_from_set(factory_formats, column_format_factory_objects);
+    insert_array_from_set(factory_functions, column_function_factory_objects);
+    insert_array_from_set(factory_storages, column_storage_factory_objects);
+    insert_array_from_set(factory_table_functions, column_table_function_factory_objects);
 }
 
 void QueryLogElement::appendClientInfo(const ClientInfo & client_info, MutableColumns & columns, size_t & i)
diff --git a/src/Interpreters/QueryLog.h b/src/Interpreters/QueryLog.h
index 8b23a1f1ef9..45284f3dd9d 100644
--- a/src/Interpreters/QueryLog.h
+++ b/src/Interpreters/QueryLog.h
@@ -58,6 +58,15 @@ struct QueryLogElement
     std::set<String> query_tables;
     std::set<String> query_columns;
 
+    std::set<String> factory_aggregate_functions;
+    std::set<String> factory_databases;
+    std::set<String> factory_data_types;
+    std::set<String> factory_dictionaries;
+    std::set<String> factory_formats;
+    std::set<String> factory_functions;
+    std::set<String> factory_storages;
+    std::set<String> factory_table_functions;
+
     Int32 exception_code{}; // because ErrorCodes are int
     String exception;
     String stack_trace;
diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index e6aec4149fd..53e6df61dd4 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -734,6 +734,16 @@ 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();
+                elem.factory_aggregate_functions = factories_info.aggregate_functions;
+                elem.factory_databases = factories_info.databases;
+                elem.factory_data_types = factories_info.data_types;
+                elem.factory_dictionaries = factories_info.dictionaries;
+                elem.factory_formats = factories_info.formats;
+                elem.factory_functions = factories_info.functions;
+                elem.factory_storages = factories_info.storages;
+                elem.factory_table_functions = factories_info.table_functions;
+
                 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())
diff --git a/src/Storages/StorageFactory.cpp b/src/Storages/StorageFactory.cpp
index 93982c2f3a3..b00fa7dc37a 100644
--- a/src/Storages/StorageFactory.cpp
+++ b/src/Storages/StorageFactory.cpp
@@ -189,6 +189,10 @@ StoragePtr StorageFactory::get(
         storage_def->engine->children.push_back(storage_def->engine->arguments);
         storage_def->engine->arguments->children = empty_engine_args;
     }
+
+    if (local_context.hasQueryContext() && context.getSettingsRef().log_queries)
+        local_context.getQueryContext().addQueryFactoriesInfo("Storage", name);
+
     return res;
 }
 
diff --git a/src/TableFunctions/TableFunctionFactory.cpp b/src/TableFunctions/TableFunctionFactory.cpp
index 0399d83fe4d..aa3e70779cd 100644
--- a/src/TableFunctions/TableFunctionFactory.cpp
+++ b/src/TableFunctions/TableFunctionFactory.cpp
@@ -44,6 +44,10 @@ TableFunctionPtr TableFunctionFactory::get(
     }
 
     res->parseArguments(ast_function, context);
+
+    if (context.hasQueryContext() && context.getSettingsRef().log_queries)
+        context.getQueryContext().addQueryFactoriesInfo("TableFunction", table_function->name);
+
     return res;
 }
 
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
new file mode 100644
index 00000000000..14866dabfa3
--- /dev/null
+++ b/tests/queries/0_stateless/01656_test_query_log_factories_info.reference
@@ -0,0 +1,13 @@
+1	100
+aggreagte_functions	table_functions	functions
+['count','uniq']	['numbers']	['addDays','plus','toDate']
+
+\N
+\N
+functions	data_types
+['cast','toTypeName']	['Nullable','UInt8']
+
+data_types	databases	storages
+[]	['Atomic']	[]
+['DateTime','String']	[]	['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
new file mode 100644
index 00000000000..9a07ded2b42
--- /dev/null
+++ b/tests/queries/0_stateless/01656_test_query_log_factories_info.sql
@@ -0,0 +1,28 @@
+SELECT uniq(1, 1, 2, 2), count(toDate('2000-12-05') + number as d) FROM numbers(100);
+INSERT INTO function null('x Int128') SELECT * FROM numbers_mt(100);
+SYSTEM FLUSH LOGS;
+SELECT factory_aggregate_functions AS aggreagte_functions,
+       factory_table_functions AS table_functions,
+       factory_functions AS functions
+FROM system.query_log WHERE type = 'QueryFinish' AND
+(query LIKE '%toDate(\'2000-12-05\')%' OR query LIKE 'null(\'x Int128\')')
+ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
+SELECT '';
+
+SELECT CAST(arrayJoin([NULL, NULL]) AS Nullable(UInt8)) AS x;
+SYSTEM FLUSH LOGS;
+SELECT factory_functions AS functions, factory_data_types as data_types
+FROM system.query_log WHERE type = 'QueryFinish' AND query LIKE 'SELECT k, groupArray%'
+ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
+SELECT '';
+
+DROP database IF EXISTS test_query_log_factories_info1;
+CREATE database test_query_log_factories_info1 ENGINE=Atomic;
+CREATE OR REPLACE TABLE test_query_log_factories_info1.memory_table (event String, date DateTime) ENGINE=Memory();
+SYSTEM FLUSH LOGS;
+SELECT factory_data_types AS data_types, factory_databases AS databases, factory_storages AS storages
+FROM system.query_log
+WHERE type == 'QueryFinish' AND (query LIKE '%database test_query_log_factories_info%' OR query LIKE '%TABLE test%')
+ORDER BY query_start_time DESC LIMIT 2 FORMAT TabSeparatedWithNames;
+SELECT '';
+

From 0a155ee2f150d1aaed2c223ea7ec7bb816132ce5 Mon Sep 17 00:00:00 2001
From: Alexander Gololobov <agololobov@gmail.com>
Date: Thu, 21 Jan 2021 19:38:13 +0300
Subject: [PATCH 261/611] Fix IDisk::open parameters to match posix open

---
 src/Disks/DiskDecorator.cpp | 4 ++--
 src/Disks/DiskDecorator.h   | 2 +-
 src/Disks/DiskLocal.cpp     | 4 ++--
 src/Disks/DiskLocal.h       | 2 +-
 src/Disks/DiskMemory.cpp    | 2 +-
 src/Disks/DiskMemory.h      | 2 +-
 src/Disks/IDisk.h           | 2 +-
 src/Disks/S3/DiskS3.cpp     | 2 +-
 src/Disks/S3/DiskS3.h       | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Disks/DiskDecorator.cpp b/src/Disks/DiskDecorator.cpp
index a475f85f9d2..6e8a2798212 100644
--- a/src/Disks/DiskDecorator.cpp
+++ b/src/Disks/DiskDecorator.cpp
@@ -175,9 +175,9 @@ void DiskDecorator::truncateFile(const String & path, size_t size)
     delegate->truncateFile(path, size);
 }
 
-int DiskDecorator::open(const String & path, mode_t mode) const
+int DiskDecorator::open(const String & path, int flags) const
 {
-    return delegate->open(path, mode);
+    return delegate->open(path, flags);
 }
 
 void DiskDecorator::close(int fd) const
diff --git a/src/Disks/DiskDecorator.h b/src/Disks/DiskDecorator.h
index 87668e82a3d..4414959cca3 100644
--- a/src/Disks/DiskDecorator.h
+++ b/src/Disks/DiskDecorator.h
@@ -48,7 +48,7 @@ public:
     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 override;
+    int open(const String & path, int flags) const override;
     void close(int fd) const override;
     void sync(int fd) const override;
     const String getType() const override { return delegate->getType(); }
diff --git a/src/Disks/DiskLocal.cpp b/src/Disks/DiskLocal.cpp
index 2193d2a2a73..ed6b82fa73d 100644
--- a/src/Disks/DiskLocal.cpp
+++ b/src/Disks/DiskLocal.cpp
@@ -315,10 +315,10 @@ void DiskLocal::copy(const String & from_path, const std::shared_ptr<IDisk> & to
         IDisk::copy(from_path, to_disk, to_path); /// Copy files through buffers.
 }
 
-int DiskLocal::open(const String & path, mode_t mode) const
+int DiskLocal::open(const String & path, int flags) const
 {
     String full_path = disk_path + path;
-    int fd = ::open(full_path.c_str(), mode);
+    int fd = ::open(full_path.c_str(), flags);
     if (-1 == fd)
         throwFromErrnoWithPath("Cannot open file " + full_path, full_path,
                         errno == ENOENT ? ErrorCodes::FILE_DOESNT_EXIST : ErrorCodes::CANNOT_OPEN_FILE);
diff --git a/src/Disks/DiskLocal.h b/src/Disks/DiskLocal.h
index e82bac57825..09f08a01d27 100644
--- a/src/Disks/DiskLocal.h
+++ b/src/Disks/DiskLocal.h
@@ -98,7 +98,7 @@ public:
 
     void createHardLink(const String & src_path, const String & dst_path) override;
 
-    int open(const String & path, mode_t mode) const override;
+    int open(const String & path, int flags) const override;
     void close(int fd) const override;
     void sync(int fd) const override;
 
diff --git a/src/Disks/DiskMemory.cpp b/src/Disks/DiskMemory.cpp
index a3e57f32dcc..7317d8a75be 100644
--- a/src/Disks/DiskMemory.cpp
+++ b/src/Disks/DiskMemory.cpp
@@ -436,7 +436,7 @@ void DiskMemory::setReadOnly(const String &)
     throw Exception("Method setReadOnly is not implemented for memory disks", ErrorCodes::NOT_IMPLEMENTED);
 }
 
-int DiskMemory::open(const String & /*path*/, mode_t /*mode*/) const
+int DiskMemory::open(const String & /*path*/, int /*flags*/) const
 {
     throw Exception("Method open is not implemented for memory disks", ErrorCodes::NOT_IMPLEMENTED);
 }
diff --git a/src/Disks/DiskMemory.h b/src/Disks/DiskMemory.h
index f8c2815b269..10d1dc670af 100644
--- a/src/Disks/DiskMemory.h
+++ b/src/Disks/DiskMemory.h
@@ -89,7 +89,7 @@ public:
 
     void createHardLink(const String & src_path, const String & dst_path) override;
 
-    int open(const String & path, mode_t mode) const override;
+    int open(const String & path, int flags) const override;
     void close(int fd) const override;
     void sync(int fd) const override;
 
diff --git a/src/Disks/IDisk.h b/src/Disks/IDisk.h
index 36f07c3b110..b68bca07de1 100644
--- a/src/Disks/IDisk.h
+++ b/src/Disks/IDisk.h
@@ -175,7 +175,7 @@ public:
     virtual void createHardLink(const String & src_path, const String & dst_path) = 0;
 
     /// Wrapper for POSIX open
-    virtual int open(const String & path, mode_t mode) const = 0;
+    virtual int open(const String & path, int flags) const = 0;
 
     /// Wrapper for POSIX close
     virtual void close(int fd) const = 0;
diff --git a/src/Disks/S3/DiskS3.cpp b/src/Disks/S3/DiskS3.cpp
index 9a60879085e..081c62bd047 100644
--- a/src/Disks/S3/DiskS3.cpp
+++ b/src/Disks/S3/DiskS3.cpp
@@ -878,7 +878,7 @@ void DiskS3::setReadOnly(const String & path)
     metadata.save();
 }
 
-int DiskS3::open(const String & /*path*/, mode_t /*mode*/) const
+int DiskS3::open(const String & /*path*/, int /*flags*/) const
 {
     throw Exception("Method open is not implemented for S3 disks", ErrorCodes::NOT_IMPLEMENTED);
 }
diff --git a/src/Disks/S3/DiskS3.h b/src/Disks/S3/DiskS3.h
index abdc049a58e..7f742368d19 100644
--- a/src/Disks/S3/DiskS3.h
+++ b/src/Disks/S3/DiskS3.h
@@ -105,7 +105,7 @@ public:
 
     void setReadOnly(const String & path) override;
 
-    int open(const String & path, mode_t mode) const override;
+    int open(const String & path, int flags) const override;
     void close(int fd) const override;
     void sync(int fd) const override;
 

From 1b5af93571ed549c9336f23f165261e5ee3de755 Mon Sep 17 00:00:00 2001
From: Dmitriy <sevirov@yandex-team.ru>
Date: Thu, 21 Jan 2021 19:50:19 +0300
Subject: [PATCH 262/611] Translation into Russian
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Поправил английскую версию и выполнил перевод на руский язык.
---
 docs/en/operations/settings/settings.md         |  4 ++--
 docs/ru/operations/settings/settings.md         | 11 +++++++++++
 docs/ru/sql-reference/statements/select/from.md |  2 ++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index 01038d9bad5..d407430bc79 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -2557,12 +2557,12 @@ It can be useful when merges are CPU bounded not IO bounded (performing heavy da
 
 ## max_final_threads {#max-final-threads}
 
-Sets maximum number of threads to read from table with [FINAL](../../sql-reference/statements/select/from.md#select-from-final) modifier.
+Sets the maximum number of parallel threads to execute `SELECT` queries with the [FINAL](../../sql-reference/statements/select/from.md#select-from-final) modifier.
 
 Possible values:
 
 -   Positive integer.
--   0 or 1 — Disabled. Executed in a single thread.
+-   0 or 1 — Disabled. `SELECT` queries are executed in a single thread.
 
 Default value: `16`.
 
diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index aa549fc5776..0d5c1630045 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -2416,4 +2416,15 @@ WHERE 0
 
 Эта настройка полезна, когда скорость слияния ограничивается мощностью процессора, а не скоростью операций ввода-вывода (при выполнении "тяжелого" сжатия данных, при расчете агрегатных функций или выражений по умолчанию, требующих большого объема вычислений, или просто при большом количестве мелких слияний).
 
+## max_final_threads {#max-final-threads}
+
+Устанавливает максимальное количество параллельных потоков для выполнения `SELECT` запросов с модификатором [FINAL](../../sql-reference/statements/select/from.md#select-from-final).
+
+Возможные значения:
+
+-   Положительное целое число.
+-   0 или 1 — настройка отключена. `SELECT` запросы выполняются в один поток.
+
+Значение по умолчанию: `16`.
+
 [Оригинальная статья](https://clickhouse.tech/docs/ru/operations/settings/settings/) <!--hide-->
diff --git a/docs/ru/sql-reference/statements/select/from.md b/docs/ru/sql-reference/statements/select/from.md
index 8facf140118..63a00ef1d09 100644
--- a/docs/ru/sql-reference/statements/select/from.md
+++ b/docs/ru/sql-reference/statements/select/from.md
@@ -25,6 +25,8 @@ toc_title: FROM
 -   [Replicated](../../../engines/table-engines/mergetree-family/replication.md) варианты исполнения `MergeTree` движков.
 -   [View](../../../engines/table-engines/special/view.md), [Buffer](../../../engines/table-engines/special/buffer.md), [Distributed](../../../engines/table-engines/special/distributed.md), и [MaterializedView](../../../engines/table-engines/special/materializedview.md), которые работают поверх других движков, если они созданы для таблиц с движками семейства `MergeTree`.
 
+`SELECT` запросы с `FINAL` выполняются параллельно. Настройка [max_final_threads](../../../operations/settings/settings.md#max-final-threads) устанавливает максимальное количество потоков.
+
 ### Недостатки {#drawbacks}
 
 Запросы, которые используют `FINAL` выполняются немного медленее, чем аналогичные запросы без него, потому что:

From 86db47de273db274ff45a258b9acd04c2293094e Mon Sep 17 00:00:00 2001
From: Ildus Kurbangaliev <i.kurbangaliev@gmail.com>
Date: Thu, 21 Jan 2021 22:23:49 +0500
Subject: [PATCH 263/611] fix assert call

---
 src/AggregateFunctions/IAggregateFunction.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AggregateFunctions/IAggregateFunction.h b/src/AggregateFunctions/IAggregateFunction.h
index 2f3c882e777..4c76ccf7720 100644
--- a/src/AggregateFunctions/IAggregateFunction.h
+++ b/src/AggregateFunctions/IAggregateFunction.h
@@ -500,7 +500,7 @@ private:
             const IColumn * columns[args_count];
             const auto & tup_columns = col->getColumns();
 
-            assert(tup_columns.size == args_count);
+            assert(tup_columns.size() == args_count);
             for (size_t i = 0; i < tup_columns.size(); ++i)
             {
                 columns[i] = tup_columns[i].get();

From fb98e3f8dc82339f9329ff72bae7c0ca05e9b361 Mon Sep 17 00:00:00 2001
From: Mikhail Filimonov <mfilimonov@altinity.com>
Date: Thu, 21 Jan 2021 18:25:09 +0100
Subject: [PATCH 264/611] Allow docker to be executed with arbitrary uid

---
 docker/server/Dockerfile        |  8 ++++++--
 docker/server/Dockerfile.alpine | 10 ++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile
index fa9c0ae5f3a..954adf8559a 100644
--- a/docker/server/Dockerfile
+++ b/docker/server/Dockerfile
@@ -10,7 +10,6 @@ ARG gosu_ver=1.10
 # We do that in advance at the begining of Dockerfile before any packages will be
 # installed to prevent picking those uid / gid by some unrelated software.
 # The same uid / gid (101) is used both for alpine and ubuntu.
-# Number 101 is used by default in openshift
 
 RUN groupadd -r clickhouse --gid=101 \
     && useradd -r -g clickhouse --uid=101 --home-dir=/var/lib/clickhouse --shell=/bin/bash clickhouse \
@@ -37,7 +36,12 @@ RUN groupadd -r clickhouse --gid=101 \
         /var/lib/apt/lists/* \
         /var/cache/debconf \
         /tmp/* \
-    && apt-get clean
+    && apt-get clean \
+    && mkdir -p /var/lib/clickhouse /var/log/clickhouse-server /etc/clickhouse-server /etc/clickhouse-client \
+    && chmod ugo+Xrw -R /var/lib/clickhouse /var/log/clickhouse-server /etc/clickhouse-server /etc/clickhouse-client
+
+# we need to allow to allow "others" access to clickhouse folder, because docker container
+# can be started with arbitrary uid (openshift usecase)
 
 ADD https://github.com/tianon/gosu/releases/download/$gosu_ver/gosu-amd64 /bin/gosu
 
diff --git a/docker/server/Dockerfile.alpine b/docker/server/Dockerfile.alpine
index 090e20edab8..67f217f7b66 100644
--- a/docker/server/Dockerfile.alpine
+++ b/docker/server/Dockerfile.alpine
@@ -14,16 +14,18 @@ COPY alpine-root/ /
 # We do that in advance at the begining of Dockerfile before any packages will be
 # installed to prevent picking those uid / gid by some unrelated software.
 # The same uid / gid (101) is used both for alpine and ubuntu.
-# Number 101 is used by default in openshift
 
 RUN addgroup -S -g 101 clickhouse \
     && adduser -S -h /var/lib/clickhouse -s /bin/bash -G clickhouse -g "ClickHouse server" -u 101 clickhouse \
+    && mkdir -p /var/lib/clickhouse /var/log/clickhouse-server /etc/clickhouse-server /etc/clickhouse-client \
     && chown clickhouse:clickhouse /var/lib/clickhouse \
-    && chmod 700 /var/lib/clickhouse \
     && chown root:clickhouse /var/log/clickhouse-server \
-    && chmod 775 /var/log/clickhouse-server \
     && chmod +x /entrypoint.sh \
-    && apk add --no-cache su-exec bash
+    && apk add --no-cache su-exec bash \
+    && chmod ugo+Xrw -R /var/lib/clickhouse /var/log/clickhouse-server /etc/clickhouse-server /etc/clickhouse-client
+
+# we need to allow to allow "others" access to clickhouse folder, because docker container
+# can be started with arbitrary uid (openshift usecase)
 
 EXPOSE 9000 8123 9009
 

From e8a9768bd0daf9c4bf0362b1fedb8d8625c4488b Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <mikhaylovnikitka@gmail.com>
Date: Thu, 21 Jan 2021 20:47:57 +0300
Subject: [PATCH 265/611] Update map.cpp

---
 src/Functions/map.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Functions/map.cpp b/src/Functions/map.cpp
index 2561f06d9b8..25b3a96a9df 100644
--- a/src/Functions/map.cpp
+++ b/src/Functions/map.cpp
@@ -65,7 +65,7 @@ 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("Function " + getName() + " even number of arguments", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
         DataTypes keys, values;
         for (size_t i = 0; i < arguments.size(); i += 2)
@@ -164,7 +164,7 @@ public:
         const DataTypeMap * map_type = checkAndGetDataType<DataTypeMap>(arguments[0].type.get());
 
         if (!map_type)
-            throw Exception{"First argument for function " + getName() + " must be a map.",
+            throw Exception{"First argument for function " + getName() + " must be a map",
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
 
         auto key_type = map_type->getKeyType();
@@ -225,7 +225,7 @@ public:
         const DataTypeMap * map_type = checkAndGetDataType<DataTypeMap>(arguments[0].type.get());
 
         if (!map_type)
-            throw Exception{"First argument for function " + getName() + " must be a map.",
+            throw Exception{"First argument for function " + getName() + " must be a map",
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
 
         auto key_type = map_type->getKeyType();
@@ -270,7 +270,7 @@ public:
         const DataTypeMap * map_type = checkAndGetDataType<DataTypeMap>(arguments[0].type.get());
 
         if (!map_type)
-            throw Exception{"First argument for function " + getName() + " must be a map.",
+            throw Exception{"First argument for function " + getName() + " must be a map",
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
 
         auto value_type = map_type->getValueType();

From eb7b87ee8db2e98c33e1462edb6c2829144194fe Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Thu, 21 Jan 2021 21:01:32 +0300
Subject: [PATCH 266/611] update tests

---
 programs/client/Client.cpp                           |  2 +-
 tests/clickhouse-test                                |  5 ++++-
 tests/queries/0_stateless/00746_sql_fuzzy.pl         |  0
 .../00921_datetime64_compatibility.python            |  0
 tests/queries/0_stateless/00990_hasToken.python      |  0
 ...1293_client_interactive_vertical_multiline.expect | 12 ++++++++++--
 .../01293_client_interactive_vertical_multiline.sh   |  7 -------
 ...293_client_interactive_vertical_singleline.expect |  9 ++++++++-
 .../01293_client_interactive_vertical_singleline.sh  |  7 -------
 .../01300_client_save_history_when_terminated.expect | 11 +++++++++--
 .../01300_client_save_history_when_terminated.sh     |  7 -------
 ..._client_autocomplete_word_break_characters.expect |  9 ++++++++-
 ...1370_client_autocomplete_word_break_characters.sh |  7 -------
 .../0_stateless/01520_client_print_query_id.expect   |  9 ++++++++-
 .../0_stateless/01520_client_print_query_id.sh       |  7 -------
 ...526_client_start_and_exit.expect-not-a-test-case} |  0
 .../0_stateless/01526_client_start_and_exit.sh       |  2 +-
 17 files changed, 49 insertions(+), 45 deletions(-)
 mode change 100755 => 100644 tests/queries/0_stateless/00746_sql_fuzzy.pl
 mode change 100755 => 100644 tests/queries/0_stateless/00921_datetime64_compatibility.python
 mode change 100755 => 100644 tests/queries/0_stateless/00990_hasToken.python
 delete mode 100755 tests/queries/0_stateless/01293_client_interactive_vertical_multiline.sh
 delete mode 100755 tests/queries/0_stateless/01293_client_interactive_vertical_singleline.sh
 delete mode 100755 tests/queries/0_stateless/01300_client_save_history_when_terminated.sh
 delete mode 100755 tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.sh
 delete mode 100755 tests/queries/0_stateless/01520_client_print_query_id.sh
 rename tests/queries/0_stateless/{01526_client_start_and_exit.expect => 01526_client_start_and_exit.expect-not-a-test-case} (100%)

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index bf54aeba1cf..c7fd5847df6 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -680,7 +680,7 @@ private:
 
                     std::cerr << std::endl;
 
-                    client_exception.reset(new Exception(e));
+                    client_exception = std::make_unique<Exception>(e);
                 }
 
                 if (client_exception)
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index bc07d624cd9..d5c6019d28f 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -649,7 +649,10 @@ def main(args):
     def is_test_from_dir(suite_dir, case):
         case_file = os.path.join(suite_dir, case)
         (name, ext) = os.path.splitext(case)
-        return os.path.isfile(case_file) and (ext == '.sql' or ext == '.sh' or ext == '.py' or ext == '.expect' or os.access(case_file, os. X_OK))
+        # We could also test for executable files (os.access(case_file, os.X_OK),
+        # but it interferes with 01610_client_spawn_editor.editor, which is invoked
+        # as a query editor in the test, and must be marked as executable.
+        return os.path.isfile(case_file) and (ext == '.sql' or ext == '.sh' or ext == '.py' or ext == '.expect')
 
     def sute_key_func(item):
        if args.order == 'random':
diff --git a/tests/queries/0_stateless/00746_sql_fuzzy.pl b/tests/queries/0_stateless/00746_sql_fuzzy.pl
old mode 100755
new mode 100644
diff --git a/tests/queries/0_stateless/00921_datetime64_compatibility.python b/tests/queries/0_stateless/00921_datetime64_compatibility.python
old mode 100755
new mode 100644
diff --git a/tests/queries/0_stateless/00990_hasToken.python b/tests/queries/0_stateless/00990_hasToken.python
old mode 100755
new mode 100644
diff --git a/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect b/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect
index c7b3725b7ae..e87d340c6aa 100755
--- a/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect
+++ b/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect
@@ -1,10 +1,18 @@
 #!/usr/bin/expect -f
 
 log_user 0
-set timeout 60
-spawn bash -c "$env(CLICKHOUSE_CLIENT_BINARY) $env(CLICKHOUSE_CLIENT_OPT)"
+set timeout 5
 match_max 100000
 
+# A default timeout action is to do nothing, change it to fail
+expect_after {
+    timeout {
+        exit 1
+    }
+}
+
+set basedir [file dirname $argv0]
+spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT_BINARY \$CLICKHOUSE_CLIENT_OPT"
 expect ":) "
 
 send -- "SELECT 1\r"
diff --git a/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.sh b/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.sh
deleted file mode 100755
index 560d9472504..00000000000
--- a/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-${CURDIR}/01293_client_interactive_vertical_multiline.expect
diff --git a/tests/queries/0_stateless/01293_client_interactive_vertical_singleline.expect b/tests/queries/0_stateless/01293_client_interactive_vertical_singleline.expect
index 3df3de8da93..de0eaff2c34 100755
--- a/tests/queries/0_stateless/01293_client_interactive_vertical_singleline.expect
+++ b/tests/queries/0_stateless/01293_client_interactive_vertical_singleline.expect
@@ -2,9 +2,16 @@
 
 log_user 0
 set timeout 60
-spawn bash -c "$env(CLICKHOUSE_CLIENT_BINARY) $env(CLICKHOUSE_CLIENT_OPT)"
 match_max 100000
+# A default timeout action is to do nothing, change it to fail
+expect_after {
+    timeout {
+        exit 1
+    }
+}
 
+set basedir [file dirname $argv0]
+spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT_BINARY \$CLICKHOUSE_CLIENT_OPT"
 expect ":) "
 
 send -- "SELECT 1\r"
diff --git a/tests/queries/0_stateless/01293_client_interactive_vertical_singleline.sh b/tests/queries/0_stateless/01293_client_interactive_vertical_singleline.sh
deleted file mode 100755
index d1c513e0f83..00000000000
--- a/tests/queries/0_stateless/01293_client_interactive_vertical_singleline.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-${CURDIR}/01293_client_interactive_vertical_singleline.expect
diff --git a/tests/queries/0_stateless/01300_client_save_history_when_terminated.expect b/tests/queries/0_stateless/01300_client_save_history_when_terminated.expect
index 3394e3e6004..942eaef84c1 100755
--- a/tests/queries/0_stateless/01300_client_save_history_when_terminated.expect
+++ b/tests/queries/0_stateless/01300_client_save_history_when_terminated.expect
@@ -3,8 +3,15 @@
 log_user 0
 set timeout 60
 match_max 100000
+# A default timeout action is to do nothing, change it to fail
+expect_after {
+    timeout {
+        exit 1
+    }
+}
+set basedir [file dirname $argv0]
 
-spawn bash -c "$env(CLICKHOUSE_CLIENT_BINARY) $env(CLICKHOUSE_CLIENT_OPT)"
+spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT_BINARY \$CLICKHOUSE_CLIENT_OPT"
 expect ":) "
 
 # Make a query
@@ -17,7 +24,7 @@ exec kill -9 [exp_pid]
 close
 
 # Run client one more time and press "up" to see the last recorded query
-spawn bash -c "$env(CLICKHOUSE_CLIENT_BINARY) $env(CLICKHOUSE_CLIENT_OPT)"
+spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT_BINARY \$CLICKHOUSE_CLIENT_OPT"
 expect ":) "
 send -- "\[A"
 expect "SELECT 'for the history'"
diff --git a/tests/queries/0_stateless/01300_client_save_history_when_terminated.sh b/tests/queries/0_stateless/01300_client_save_history_when_terminated.sh
deleted file mode 100755
index 8e0f15e57f0..00000000000
--- a/tests/queries/0_stateless/01300_client_save_history_when_terminated.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-${CURDIR}/01300_client_save_history_when_terminated.expect
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 21d8b7c43ea..50ef009dee9 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
@@ -3,8 +3,15 @@
 log_user 0
 set timeout 1
 match_max 100000
+# A default timeout action is to do nothing, change it to fail
+expect_after {
+    timeout {
+        exit 1
+    }
+}
 
-spawn bash -c "$env(CLICKHOUSE_CLIENT_BINARY) $env(CLICKHOUSE_CLIENT_OPT)"
+set basedir [file dirname $argv0]
+spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT_BINARY \$CLICKHOUSE_CLIENT_OPT"
 expect ":) "
 
 # Make a query
diff --git a/tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.sh b/tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.sh
deleted file mode 100755
index aa7c9a94eb0..00000000000
--- a/tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-${CURDIR}/01370_client_autocomplete_word_break_characters.expect
diff --git a/tests/queries/0_stateless/01520_client_print_query_id.expect b/tests/queries/0_stateless/01520_client_print_query_id.expect
index 2fbf4073ab0..13c3ea1b99e 100755
--- a/tests/queries/0_stateless/01520_client_print_query_id.expect
+++ b/tests/queries/0_stateless/01520_client_print_query_id.expect
@@ -3,8 +3,15 @@
 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 1
+    }
+}
 
-spawn bash -c "$env(CLICKHOUSE_CLIENT_BINARY) $env(CLICKHOUSE_CLIENT_OPT)"
+set basedir [file dirname $argv0]
+spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT_BINARY \$CLICKHOUSE_CLIENT_OPT"
 expect ":) "
 
 # Make a query
diff --git a/tests/queries/0_stateless/01520_client_print_query_id.sh b/tests/queries/0_stateless/01520_client_print_query_id.sh
deleted file mode 100755
index b32f48239c2..00000000000
--- a/tests/queries/0_stateless/01520_client_print_query_id.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-${CURDIR}/01520_client_print_query_id.expect
diff --git a/tests/queries/0_stateless/01526_client_start_and_exit.expect b/tests/queries/0_stateless/01526_client_start_and_exit.expect-not-a-test-case
similarity index 100%
rename from tests/queries/0_stateless/01526_client_start_and_exit.expect
rename to tests/queries/0_stateless/01526_client_start_and_exit.expect-not-a-test-case
diff --git a/tests/queries/0_stateless/01526_client_start_and_exit.sh b/tests/queries/0_stateless/01526_client_start_and_exit.sh
index 40927cd7599..19f9cb8c37b 100755
--- a/tests/queries/0_stateless/01526_client_start_and_exit.sh
+++ b/tests/queries/0_stateless/01526_client_start_and_exit.sh
@@ -10,7 +10,7 @@ ${CLICKHOUSE_CLIENT} -q "SELECT 'CREATE TABLE test_' || hex(randomPrintableASCII
 function stress()
 {
     while true; do
-        "${CURDIR}"/01526_client_start_and_exit.expect | grep -v -P 'ClickHouse client|Connecting|Connected|:\) Bye\.|new year|^\s*$|spawn bash|^0\s*$'
+        "${CURDIR}"/01526_client_start_and_exit.expect-not-a-test-case | grep -v -P 'ClickHouse client|Connecting|Connected|:\) Bye\.|new year|^\s*$|spawn bash|^0\s*$'
     done
 }
 

From 2c42600cf9bd8e9962b5b5a0ebb4bf11a10887ea Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Thu, 21 Jan 2021 21:09:23 +0300
Subject: [PATCH 267/611] Add log message with elapsed time while pushing to
 view

Since right now theses queries are not logged and there is no way to
determine the time that it takes.

Proper fix will be to account them in system.processes (and all other
places), but this is not that easy.
---
 .../PushingToViewsBlockOutputStream.cpp       | 19 +++++++++++++++++++
 .../PushingToViewsBlockOutputStream.h         |  5 +++++
 2 files changed, 24 insertions(+)

diff --git a/src/DataStreams/PushingToViewsBlockOutputStream.cpp b/src/DataStreams/PushingToViewsBlockOutputStream.cpp
index 35607bcb182..a6e0dcd7356 100644
--- a/src/DataStreams/PushingToViewsBlockOutputStream.cpp
+++ b/src/DataStreams/PushingToViewsBlockOutputStream.cpp
@@ -17,6 +17,7 @@
 #include <Storages/StorageValues.h>
 #include <Storages/LiveView/StorageLiveView.h>
 #include <Storages/StorageMaterializedView.h>
+#include <common/logger_useful.h>
 
 
 namespace DB
@@ -30,6 +31,7 @@ PushingToViewsBlockOutputStream::PushingToViewsBlockOutputStream(
     bool no_destination)
     : storage(storage_)
     , metadata_snapshot(metadata_snapshot_)
+    , log(&Poco::Logger::get("PushingToViewsBlockOutputStream"))
     , context(context_)
     , query_ptr(query_ptr_)
 {
@@ -144,6 +146,8 @@ Block PushingToViewsBlockOutputStream::getHeader() const
 
 void PushingToViewsBlockOutputStream::write(const Block & block)
 {
+    Stopwatch watch;
+
     /** Throw an exception if the sizes of arrays - elements of nested data structures doesn't match.
       * We have to make this assertion before writing to table, because storage engine may assume that they have equal sizes.
       * NOTE It'd better to do this check in serialization of nested structures (in place when this assumption is required),
@@ -198,6 +202,14 @@ void PushingToViewsBlockOutputStream::write(const Block & block)
                 std::rethrow_exception(views[view_num].exception);
         }
     }
+
+    UInt64 milliseconds = watch.elapsedMilliseconds();
+    if (views.size() > 1)
+    {
+        LOG_TRACE(log, "Pushing from {} to {} views took {} ms.",
+            storage->getStorageID().getNameForLogs(), views.size(),
+            milliseconds);
+    }
 }
 
 void PushingToViewsBlockOutputStream::writePrefix()
@@ -304,6 +316,7 @@ void PushingToViewsBlockOutputStream::flush()
 
 void PushingToViewsBlockOutputStream::process(const Block & block, size_t view_num)
 {
+    Stopwatch watch;
     auto & view = views[view_num];
 
     try
@@ -365,6 +378,12 @@ void PushingToViewsBlockOutputStream::process(const Block & block, size_t view_n
     {
         view.exception = std::current_exception();
     }
+
+    UInt64 milliseconds = watch.elapsedMilliseconds();
+    LOG_TRACE(log, "Pushing from {} to {} took {} ms.",
+        storage->getStorageID().getNameForLogs(),
+        view.table_id.getNameForLogs(),
+        milliseconds);
 }
 
 }
diff --git a/src/DataStreams/PushingToViewsBlockOutputStream.h b/src/DataStreams/PushingToViewsBlockOutputStream.h
index e6fc49b7b46..30a223d26a3 100644
--- a/src/DataStreams/PushingToViewsBlockOutputStream.h
+++ b/src/DataStreams/PushingToViewsBlockOutputStream.h
@@ -4,6 +4,10 @@
 #include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage.h>
 
+namespace Poco
+{
+class Logger;
+};
 
 namespace DB
 {
@@ -36,6 +40,7 @@ private:
     StorageMetadataPtr metadata_snapshot;
     BlockOutputStreamPtr output;
     ReplicatedMergeTreeBlockOutputStream * replicated_output = nullptr;
+    Poco::Logger * log;
 
     const Context & context;
     ASTPtr query_ptr;

From c68f7cd5b1a3ec96218abd631b895e9c67014fa6 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Thu, 21 Jan 2021 21:11:39 +0300
Subject: [PATCH 268/611] Measure time that spend during flush of the Buffer to
 the underlying

---
 src/Storages/StorageBuffer.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Storages/StorageBuffer.cpp b/src/Storages/StorageBuffer.cpp
index e0657f31de5..77da8c9c972 100644
--- a/src/Storages/StorageBuffer.cpp
+++ b/src/Storages/StorageBuffer.cpp
@@ -736,10 +736,11 @@ void StorageBuffer::flushBuffer(Buffer & buffer, bool check_thresholds, bool loc
 
     ProfileEvents::increment(ProfileEvents::StorageBufferFlush);
 
-    LOG_TRACE(log, "Flushing buffer with {} rows, {} bytes, age {} seconds {}.", rows, bytes, time_passed, (check_thresholds ? "(bg)" : "(direct)"));
-
     if (!destination_id)
+    {
+        LOG_TRACE(log, "Flushing buffer with {} rows (discarded), {} bytes, age {} seconds {}.", rows, bytes, time_passed, (check_thresholds ? "(bg)" : "(direct)"));
         return;
+    }
 
     /** For simplicity, buffer is locked during write.
         * We could unlock buffer temporary, but it would lead to too many difficulties:
@@ -747,6 +748,8 @@ void StorageBuffer::flushBuffer(Buffer & buffer, bool check_thresholds, bool loc
         * - new data could be appended to buffer, and in case of exception, we must merge it with old data, that has not been written;
         * - this could lead to infinite memory growth.
         */
+
+    Stopwatch watch;
     try
     {
         writeBlockToDestination(block_to_write, DatabaseCatalog::instance().tryGetTable(destination_id, global_context));
@@ -770,6 +773,9 @@ void StorageBuffer::flushBuffer(Buffer & buffer, bool check_thresholds, bool loc
         /// After a while, the next write attempt will happen.
         throw;
     }
+
+    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)"));
 }
 
 

From cb951c2116a121178f5745a1c35b952612aca039 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Thu, 21 Jan 2021 21:17:00 +0300
Subject: [PATCH 269/611] Add metrics for MergeTree parts types

- PartsWide
- PartsCompact
- PartsInMemory
---
 src/Common/CurrentMetrics.cpp                 |  3 +
 src/Storages/MergeTree/IMergeTreeDataPart.cpp | 59 +++++++++++++++----
 .../MergeTree/MergeTreeDataPartType.h         |  2 +
 3 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/src/Common/CurrentMetrics.cpp b/src/Common/CurrentMetrics.cpp
index d8d836503f4..4fb2709c8e4 100644
--- a/src/Common/CurrentMetrics.cpp
+++ b/src/Common/CurrentMetrics.cpp
@@ -63,6 +63,9 @@
     M(PartsOutdated, "Not active data part, but could be used by only current SELECTs, could be deleted after SELECTs finishes.") \
     M(PartsDeleting, "Not active data part with identity refcounter, it is deleting right now by a cleaner.") \
     M(PartsDeleteOnDestroy, "Part was moved to another disk and should be deleted in own destructor.") \
+    M(PartsWide, "Wide parts.") \
+    M(PartsCompact, "Compact parts.") \
+    M(PartsInMemory, "In-memory parts.") \
 
 namespace CurrentMetrics
 {
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.cpp b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
index 5a2c17a7b98..4be79985461 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
@@ -28,6 +28,10 @@ namespace CurrentMetrics
     extern const Metric PartsOutdated;
     extern const Metric PartsDeleting;
     extern const Metric PartsDeleteOnDestroy;
+
+    extern const Metric PartsWide;
+    extern const Metric PartsCompact;
+    extern const Metric PartsInMemory;
 }
 
 namespace DB
@@ -150,7 +154,7 @@ void IMergeTreeDataPart::MinMaxIndex::merge(const MinMaxIndex & other)
 }
 
 
-static void incrementMetric(IMergeTreeDataPart::State state)
+static void incrementStateMetric(IMergeTreeDataPart::State state)
 {
     switch (state)
     {
@@ -173,11 +177,9 @@ static void incrementMetric(IMergeTreeDataPart::State state)
             CurrentMetrics::add(CurrentMetrics::PartsDeleteOnDestroy);
             return;
     }
-
-    __builtin_unreachable();
 }
 
-static void decrementMetric(IMergeTreeDataPart::State state)
+static void decrementStateMetric(IMergeTreeDataPart::State state)
 {
     switch (state)
     {
@@ -200,8 +202,42 @@ static void decrementMetric(IMergeTreeDataPart::State state)
             CurrentMetrics::sub(CurrentMetrics::PartsDeleteOnDestroy);
             return;
     }
+}
 
-    __builtin_unreachable();
+static void incrementTypeMetric(MergeTreeDataPartType type)
+{
+    switch (type.getValue())
+    {
+        case MergeTreeDataPartType::WIDE:
+            CurrentMetrics::add(CurrentMetrics::PartsWide);
+            return;
+        case MergeTreeDataPartType::COMPACT:
+            CurrentMetrics::add(CurrentMetrics::PartsCompact);
+            return;
+        case MergeTreeDataPartType::IN_MEMORY:
+            CurrentMetrics::add(CurrentMetrics::PartsInMemory);
+            return;
+        case MergeTreeDataPartType::UNKNOWN:
+            return;
+    }
+}
+
+static void decrementTypeMetric(MergeTreeDataPartType type)
+{
+    switch (type.getValue())
+    {
+        case MergeTreeDataPartType::WIDE:
+            CurrentMetrics::sub(CurrentMetrics::PartsWide);
+            return;
+        case MergeTreeDataPartType::COMPACT:
+            CurrentMetrics::sub(CurrentMetrics::PartsCompact);
+            return;
+        case MergeTreeDataPartType::IN_MEMORY:
+            CurrentMetrics::sub(CurrentMetrics::PartsInMemory);
+            return;
+        case MergeTreeDataPartType::UNKNOWN:
+            return;
+    }
 }
 
 
@@ -215,7 +251,8 @@ IMergeTreeDataPart::IMergeTreeDataPart(
     , index_granularity_info(storage_, part_type_)
     , part_type(part_type_)
 {
-    incrementMetric(state);
+    incrementStateMetric(state);
+    incrementTypeMetric(part_type);
 }
 
 IMergeTreeDataPart::IMergeTreeDataPart(
@@ -233,12 +270,14 @@ IMergeTreeDataPart::IMergeTreeDataPart(
     , index_granularity_info(storage_, part_type_)
     , part_type(part_type_)
 {
-    incrementMetric(state);
+    incrementStateMetric(state);
+    incrementTypeMetric(part_type);
 }
 
 IMergeTreeDataPart::~IMergeTreeDataPart()
 {
-    decrementMetric(state);
+    decrementStateMetric(state);
+    decrementTypeMetric(part_type);
 }
 
 
@@ -270,9 +309,9 @@ std::optional<size_t> IMergeTreeDataPart::getColumnPosition(const String & colum
 
 void IMergeTreeDataPart::setState(IMergeTreeDataPart::State new_state) const
 {
-    decrementMetric(state);
+    decrementStateMetric(state);
     state = new_state;
-    incrementMetric(state);
+    incrementStateMetric(state);
 }
 
 IMergeTreeDataPart::State IMergeTreeDataPart::getState() const
diff --git a/src/Storages/MergeTree/MergeTreeDataPartType.h b/src/Storages/MergeTree/MergeTreeDataPartType.h
index 6aec9c97f44..d658fafc510 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartType.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartType.h
@@ -50,6 +50,8 @@ public:
     void fromString(const String & str);
     String toString() const;
 
+    Value getValue() const { return value; }
+
 private:
     Value value;
 };

From 926b0ddc59b478978dcd7b9479f45d9ece1b6d63 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Thu, 21 Jan 2021 21:17:00 +0300
Subject: [PATCH 270/611] Rename 01600_count_of_parts_metrics to
 01600_parts_states_metrics

---
 ...rts_metrics.reference => 01600_parts_states_metrics.reference} | 0
 ...00_count_of_parts_metrics.sh => 01600_parts_states_metrics.sh} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/queries/0_stateless/{01600_count_of_parts_metrics.reference => 01600_parts_states_metrics.reference} (100%)
 rename tests/queries/0_stateless/{01600_count_of_parts_metrics.sh => 01600_parts_states_metrics.sh} (100%)

diff --git a/tests/queries/0_stateless/01600_count_of_parts_metrics.reference b/tests/queries/0_stateless/01600_parts_states_metrics.reference
similarity index 100%
rename from tests/queries/0_stateless/01600_count_of_parts_metrics.reference
rename to tests/queries/0_stateless/01600_parts_states_metrics.reference
diff --git a/tests/queries/0_stateless/01600_count_of_parts_metrics.sh b/tests/queries/0_stateless/01600_parts_states_metrics.sh
similarity index 100%
rename from tests/queries/0_stateless/01600_count_of_parts_metrics.sh
rename to tests/queries/0_stateless/01600_parts_states_metrics.sh

From 974f0daeb9c0ac3399d9eb2241490232b7249dea Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Thu, 21 Jan 2021 21:17:01 +0300
Subject: [PATCH 271/611] Add set
 database_atomic_wait_for_drop_and_detach_synchronously=1 for
 01600_parts_states_metrics

Without this setting the test will pass only when the table will be
actually removed by the background worker of the Atomic engine.

In CI this is not required since
database_atomic_wait_for_drop_and_detach_synchronously is set explicitly
in via tests/users.d.
---
 tests/queries/0_stateless/01600_parts_states_metrics.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/queries/0_stateless/01600_parts_states_metrics.sh b/tests/queries/0_stateless/01600_parts_states_metrics.sh
index 45ec6701fdf..e32210633bb 100755
--- a/tests/queries/0_stateless/01600_parts_states_metrics.sh
+++ b/tests/queries/0_stateless/01600_parts_states_metrics.sh
@@ -22,7 +22,7 @@ verify()
     echo 1
 }
 
-$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS test_table"
+$CLICKHOUSE_CLIENT --database_atomic_wait_for_drop_and_detach_synchronously=1 --query="DROP TABLE IF EXISTS test_table"
 $CLICKHOUSE_CLIENT --query="CREATE TABLE test_table(data Date) ENGINE = MergeTree  PARTITION BY toYear(data) ORDER BY data;"
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO test_table VALUES ('1992-01-01')"
@@ -34,5 +34,5 @@ verify
 $CLICKHOUSE_CLIENT --query="OPTIMIZE TABLE test_table FINAL"
 verify
 
-$CLICKHOUSE_CLIENT --query="DROP TABLE test_table"
+$CLICKHOUSE_CLIENT --database_atomic_wait_for_drop_and_detach_synchronously=1 --query="DROP TABLE test_table"
 verify

From 95c9e57ec13e450ec6535cf723f504a2e68e3e2c Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Thu, 21 Jan 2021 21:17:01 +0300
Subject: [PATCH 272/611] Add 01600_parts_types_metrics

---
 .../01600_parts_types_metrics.reference       |  4 ++
 .../0_stateless/01600_parts_types_metrics.sh  | 51 +++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 tests/queries/0_stateless/01600_parts_types_metrics.reference
 create mode 100755 tests/queries/0_stateless/01600_parts_types_metrics.sh

diff --git a/tests/queries/0_stateless/01600_parts_types_metrics.reference b/tests/queries/0_stateless/01600_parts_types_metrics.reference
new file mode 100644
index 00000000000..98fb6a68656
--- /dev/null
+++ b/tests/queries/0_stateless/01600_parts_types_metrics.reference
@@ -0,0 +1,4 @@
+1
+1
+1
+1
diff --git a/tests/queries/0_stateless/01600_parts_types_metrics.sh b/tests/queries/0_stateless/01600_parts_types_metrics.sh
new file mode 100755
index 00000000000..1a1942be32a
--- /dev/null
+++ b/tests/queries/0_stateless/01600_parts_types_metrics.sh
@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+set -e
+set -o pipefail
+
+verify_sql="SELECT
+    (SELECT sumIf(value, metric = 'PartsInMemory'), sumIf(value, metric = 'PartsCompact'), sumIf(value, metric = 'PartsWide') FROM system.metrics) =
+    (SELECT countIf(part_type == 'InMemory'), countIf(part_type == 'Compact'), countIf(part_type == 'Wide') FROM system.parts)"
+
+# The query is not atomic - it can compare states between system.parts and system.metrics from different points in time.
+# So, there is inherent race condition (especially in fasttest that runs tests in parallel).
+#
+# But it should get expected result eventually.
+# In case of test failure, this code will do infinite loop and timeout.
+verify()
+{
+    while true; do
+        result=$( $CLICKHOUSE_CLIENT -m --query="$verify_sql" )
+        if [ "$result" = "1" ]; then
+            echo 1
+            return
+        fi
+        sleep 0.1
+    done
+}
+
+$CLICKHOUSE_CLIENT --database_atomic_wait_for_drop_and_detach_synchronously=1 --query="DROP TABLE IF EXISTS data_01600"
+# InMemory - [0..5]
+# Compact  - (5..10]
+# Wide     - >10
+$CLICKHOUSE_CLIENT --query="CREATE TABLE data_01600 (part_type String, key Int) ENGINE = MergeTree PARTITION BY part_type ORDER BY key SETTINGS min_bytes_for_wide_part=0, min_bytes_for_compact_part=0, min_rows_for_wide_part=10, min_rows_for_compact_part=5"
+
+# InMemory
+$CLICKHOUSE_CLIENT --query="INSERT INTO data_01600 SELECT 'InMemory', number FROM system.numbers LIMIT 1"
+verify
+
+# Compact
+$CLICKHOUSE_CLIENT --query="INSERT INTO data_01600 SELECT 'Compact', number FROM system.numbers LIMIT 6 OFFSET 1"
+verify
+
+# Wide
+$CLICKHOUSE_CLIENT --query="INSERT INTO data_01600 SELECT 'Wide', number FROM system.numbers LIMIT 11 OFFSET 7"
+verify
+
+# DROP and check
+$CLICKHOUSE_CLIENT --database_atomic_wait_for_drop_and_detach_synchronously=1 --query="DROP TABLE data_01600"
+verify

From 44011061b57a075625116a55d0d49c36bcd69f3b Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 15 Jan 2021 01:00:10 +0300
Subject: [PATCH 273/611] Add missing DROP TABLE at the beginning of
 01268_mv_scalars test

---
 tests/queries/0_stateless/01268_mv_scalars.sql | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/queries/0_stateless/01268_mv_scalars.sql b/tests/queries/0_stateless/01268_mv_scalars.sql
index f6621502ca0..5b0e85dca59 100644
--- a/tests/queries/0_stateless/01268_mv_scalars.sql
+++ b/tests/queries/0_stateless/01268_mv_scalars.sql
@@ -1,4 +1,9 @@
+DROP TABLE IF EXISTS dest_table_mv;
+DROP TABLE IF EXISTS left_table;
+DROP TABLE IF EXISTS right_table;
+DROP TABLE IF EXISTS dest_table;
 DROP TABLE IF EXISTS src_table;
+DROP VIEW IF EXISTS dst_mv;
 
 create table src_table Engine=Memory as system.numbers;
 CREATE MATERIALIZED VIEW dst_mv Engine=Memory as select *, (SELECT count() FROM src_table) AS cnt FROM src_table;

From 82f6c642aee73bf2c67c5d7fdbb3032dfe821a6b Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Wed, 30 Dec 2020 23:35:37 +0300
Subject: [PATCH 274/611] identity: simple functions in oneline (coding style)

---
 src/Functions/identity.cpp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/Functions/identity.cpp b/src/Functions/identity.cpp
index ee73ab595a7..b9542347ca0 100644
--- a/src/Functions/identity.cpp
+++ b/src/Functions/identity.cpp
@@ -16,15 +16,8 @@ public:
         return std::make_shared<FunctionIdentity>();
     }
 
-    String getName() const override
-    {
-        return name;
-    }
-
-    size_t getNumberOfArguments() const override
-    {
-        return 1;
-    }
+    String getName() const override { return name; }
+    size_t getNumberOfArguments() const override { return 1; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {

From ea7528b85367ef9b59e4c99a97bc5a3d691adfe9 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Wed, 30 Dec 2020 23:36:30 +0300
Subject: [PATCH 275/611] identity: mark it as non suitable for constant
 folding

---
 docs/en/sql-reference/functions/other-functions.md | 2 +-
 src/Functions/identity.cpp                         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/functions/other-functions.md b/docs/en/sql-reference/functions/other-functions.md
index 1bf7b8f0640..08d34770f57 100644
--- a/docs/en/sql-reference/functions/other-functions.md
+++ b/docs/en/sql-reference/functions/other-functions.md
@@ -1468,7 +1468,7 @@ Code: 395. DB::Exception: Received from localhost:9000. DB::Exception: Too many.
 
 ## identity {#identity}
 
-Returns the same value that was used as its argument. Used for debugging and testing, allows to cancel using index, and get the query performance of a full scan. When query is analyzed for possible use of index, the analyzer doesn’t look inside `identity` functions.
+Returns the same value that was used as its argument. Used for debugging and testing, allows to cancel using index, and get the query performance of a full scan. When query is analyzed for possible use of index, the analyzer doesn’t look inside `identity` functions. Also constant folding is not applied too.
 
 **Syntax**
 
diff --git a/src/Functions/identity.cpp b/src/Functions/identity.cpp
index b9542347ca0..cb8fcf28c23 100644
--- a/src/Functions/identity.cpp
+++ b/src/Functions/identity.cpp
@@ -18,6 +18,7 @@ public:
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 1; }
+    bool isSuitableForConstantFolding() const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {

From 82e7e7d9cbbb6541016ef64852c9858cc3c7e4c4 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Wed, 23 Dec 2020 22:36:10 +0300
Subject: [PATCH 276/611] Fix constant folding for expressions depends from
 subqueries result

Do not use subquery result, when value is unknown, for constant folding.

v2: fix simple subqueries, fixes 00597_push_down_predicate.
v3:
- use identity over introducing yet another cast analog (as suggested by @akuzm)
- simpler suitable_for_const_folding check
v4: use identity(cast()) since only cast() can provide corrent type (for
data types that does not have it's own type, i.e. DateTime)
v5: do not optimize consts if only_analyze isset, regardless the block
content
---
 src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp    | 10 ++++++++++
 .../0_stateless/00597_push_down_predicate.reference    |  3 ++-
 .../01611_constant_folding_subqueries.reference        |  9 +++++++++
 .../0_stateless/01611_constant_folding_subqueries.sql  |  4 ++++
 4 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 tests/queries/0_stateless/01611_constant_folding_subqueries.reference
 create mode 100644 tests/queries/0_stateless/01611_constant_folding_subqueries.sql

diff --git a/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp b/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
index b3e8af90f28..affd9d0678f 100644
--- a/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
+++ b/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
@@ -168,6 +168,16 @@ void ExecuteScalarSubqueriesMatcher::visit(const ASTSubquery & subquery, ASTPtr
         lit->alias = subquery.alias;
         lit->prefer_alias_to_column_name = subquery.prefer_alias_to_column_name;
         ast = addTypeConversionToAST(std::move(lit), scalar.safeGetByPosition(0).type->getName());
+
+        /// If only analyze was requested the expression is not suitable for constant folding, disable it.
+        if (data.only_analyze)
+        {
+            ast->as<ASTFunction>()->alias.clear();
+            auto func = makeASTFunction("identity", std::move(ast));
+            func->alias = subquery.alias;
+            func->prefer_alias_to_column_name = subquery.prefer_alias_to_column_name;
+            ast = std::move(func);
+        }
     }
     else
     {
diff --git a/tests/queries/0_stateless/00597_push_down_predicate.reference b/tests/queries/0_stateless/00597_push_down_predicate.reference
index e239b1c27fd..cea533d6ccb 100644
--- a/tests/queries/0_stateless/00597_push_down_predicate.reference
+++ b/tests/queries/0_stateless/00597_push_down_predicate.reference
@@ -114,8 +114,9 @@ FROM
 (
     SELECT
         1 AS id,
-        cast(1, \'UInt8\') AS subquery
+        identity(cast(1, \'UInt8\')) AS subquery
 )
+WHERE subquery = 1
 1	1
 SELECT
     a,
diff --git a/tests/queries/0_stateless/01611_constant_folding_subqueries.reference b/tests/queries/0_stateless/01611_constant_folding_subqueries.reference
new file mode 100644
index 00000000000..ac91b53b754
--- /dev/null
+++ b/tests/queries/0_stateless/01611_constant_folding_subqueries.reference
@@ -0,0 +1,9 @@
+-- { echo }
+SELECT * FROM (SELECT (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUInt64(10 / n)) FORMAT CSV;
+1,10
+SELECT (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUInt64(10 / n) FORMAT CSV;
+1,10
+EXPLAIN SYNTAX SELECT (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUInt64(10 / n);
+SELECT
+    identity(cast(0, \'UInt64\')) AS n,
+    toUInt64(10 / n)
diff --git a/tests/queries/0_stateless/01611_constant_folding_subqueries.sql b/tests/queries/0_stateless/01611_constant_folding_subqueries.sql
new file mode 100644
index 00000000000..abf67a8ed6a
--- /dev/null
+++ b/tests/queries/0_stateless/01611_constant_folding_subqueries.sql
@@ -0,0 +1,4 @@
+-- { echo }
+SELECT * FROM (SELECT (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUInt64(10 / n)) FORMAT CSV;
+SELECT (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUInt64(10 / n) FORMAT CSV;
+EXPLAIN SYNTAX SELECT (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUInt64(10 / n);

From 3d931df276a2e4ae8702156522e88c0a39ce8f75 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 21 Jan 2021 21:40:14 +0300
Subject: [PATCH 277/611] Fix buffer overflow in Uber H3 library

---
 .gitmodules | 2 +-
 contrib/h3  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index c7ff7cea7db..ecccf0633e2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -84,7 +84,7 @@
 	url = https://github.com/google/brotli.git
 [submodule "contrib/h3"]
 	path = contrib/h3
-	url = https://github.com/uber/h3
+	url = https://github.com/ClickHouse-Extras/h3
 [submodule "contrib/hyperscan"]
 	path = contrib/hyperscan
 	url = https://github.com/ClickHouse-Extras/hyperscan.git
diff --git a/contrib/h3 b/contrib/h3
index 6cfd649e8c0..e209086ae1b 160000
--- a/contrib/h3
+++ b/contrib/h3
@@ -1 +1 @@
-Subproject commit 6cfd649e8c0d3ed913e8aae928a669fc3b8a2365
+Subproject commit e209086ae1b5477307f545a0f6111780edc59940

From bb56daf02622320e086da618407834473bc6f0ab Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 21 Jan 2021 21:42:26 +0300
Subject: [PATCH 278/611] Fix build

---
 contrib/h3-cmake/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/h3-cmake/CMakeLists.txt b/contrib/h3-cmake/CMakeLists.txt
index 80e76311f70..2911d7283f0 100644
--- a/contrib/h3-cmake/CMakeLists.txt
+++ b/contrib/h3-cmake/CMakeLists.txt
@@ -16,6 +16,7 @@ ${H3_SOURCE_DIR}/lib/mathExtensions.c
 ${H3_SOURCE_DIR}/lib/polygon.c
 ${H3_SOURCE_DIR}/lib/vec2d.c
 ${H3_SOURCE_DIR}/lib/vec3d.c
+${H3_SOURCE_DIR}/lib/vertex.c
 ${H3_SOURCE_DIR}/lib/vertexGraph.c
 )
 

From cc160813ce7b17057c7c215339460cdad80a6421 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 21 Jan 2021 21:44:48 +0300
Subject: [PATCH 279/611] Add a test

---
 .../0_stateless/01659_h3_buffer_overflow.reference       | 0
 tests/queries/0_stateless/01659_h3_buffer_overflow.sql   | 9 +++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 tests/queries/0_stateless/01659_h3_buffer_overflow.reference
 create mode 100644 tests/queries/0_stateless/01659_h3_buffer_overflow.sql

diff --git a/tests/queries/0_stateless/01659_h3_buffer_overflow.reference b/tests/queries/0_stateless/01659_h3_buffer_overflow.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01659_h3_buffer_overflow.sql b/tests/queries/0_stateless/01659_h3_buffer_overflow.sql
new file mode 100644
index 00000000000..b752059da48
--- /dev/null
+++ b/tests/queries/0_stateless/01659_h3_buffer_overflow.sql
@@ -0,0 +1,9 @@
+-- the behaviour on overflow can be implementation specific
+-- and we don't care about the results, but no buffer overflow should be possible.
+SELECT length(h3kRing(9223372036854775807, 1000)) FORMAT Null;
+SELECT h3kRing(toUInt64(0xFFFFFFFF), 1000) FORMAT Null;
+SELECT h3kRing(0xFFFFFFFFF, 1000) FORMAT Null;
+SELECT h3kRing(0xFFFFFFFFFFFFFF, 1000) FORMAT Null;
+SELECT h3GetBaseCell(0xFFFFFFFFFFFFFF) FORMAT Null;
+SELECT h3GetResolution(0xFFFFFFFFFFFFFF) FORMAT Null;
+SELECT h3kRing(0xFFFFFFFFFFFFFF, 10) FORMAT Null;

From b0a80af888d4fab5bfea8e03b01f4fcf7f800387 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Thu, 21 Jan 2021 21:11:39 +0300
Subject: [PATCH 280/611] Reduce lock contention for multiple layers of the
 Buffer engine

Otherwise you can see something like this for the following query:

    ```sql
    WITH
        arrayMap(x -> demangle(addressToSymbol(x)), s.trace) AS trace_array,
        arrayStringConcat(trace_array, '\n') AS trace_string
    SELECT
        p.thread_id,
        p.query_id,
        p.query,
        trace_string
    FROM
    (
        SELECT
            query_id,
            query,
            arrayJoin(thread_ids) AS thread_id
        FROM system.processes
    ) AS p
    INNER JOIN system.stack_trace AS s ON p.thread_id = s.thread_id
    ORDER BY p.query_id ASC
    SETTINGS enable_global_with_statement = 0, allow_introspection_functions = 1
    FORMAT PrettyCompactNoEscapes
    ```

Lots of the following:

    ```sql
    INSERT INTO buffer (...) VALUES

    __lll_lock_wait
    pthread_mutex_lock
    std::__1::mutex::lock()
    DB::StorageBuffer::reschedule()
    DB::BufferBlockOutputStream::write(DB::Block const&)
    ```

That will wait one of this:

    ```
    INSERT INTO buffer (...) VALUES

    ...
    DB::PushingToViewsBlockOutputStream::write(DB::Block const&)
    DB::AddingDefaultBlockOutputStream::write(DB::Block const&)
    DB::SquashingBlockOutputStream::finalize()
    DB::SquashingBlockOutputStream::writeSuffix()
    DB::PushingToViewsBlockOutputStream::writeSuffix()
    DB::StorageBuffer::writeBlockToDestination(DB::Block const&, std::__1::shared_ptr<DB::IStorage>)
    DB::StorageBuffer::flushBuffer(DB::StorageBuffer::Buffer&, bool, bool, bool)
    ```

P.S. we cannot simply unlock the buffer during flushing, see comments in
the code
---
 src/Storages/StorageBuffer.cpp | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/Storages/StorageBuffer.cpp b/src/Storages/StorageBuffer.cpp
index 77da8c9c972..ce74567c62b 100644
--- a/src/Storages/StorageBuffer.cpp
+++ b/src/Storages/StorageBuffer.cpp
@@ -867,9 +867,21 @@ void StorageBuffer::reschedule()
 
     for (auto & buffer : buffers)
     {
-        std::lock_guard lock(buffer.mutex);
-        min_first_write_time = buffer.first_write_time;
-        rows += buffer.data.rows();
+        /// try_to_lock here to avoid waiting for other layers flushing to be finished,
+        /// since the buffer table may:
+        /// - push to Distributed table, that may take too much time,
+        /// - push to table with materialized views attached,
+        ///   this is also may take some time.
+        ///
+        /// 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);
+        if (lock.owns_lock())
+        {
+            min_first_write_time = buffer.first_write_time;
+            rows += buffer.data.rows();
+        }
     }
 
     /// will be rescheduled via INSERT

From e06383e0ae9b15f8d4410a0d3f185d2ea023cf17 Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Thu, 21 Jan 2021 22:32:17 +0300
Subject: [PATCH 281/611] Darwin fixed build issues

---
 contrib/libpq                    | 2 +-
 docs/en/development/build-osx.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/libpq b/contrib/libpq
index 8e7e9058547..1f9c286dba6 160000
--- a/contrib/libpq
+++ b/contrib/libpq
@@ -1 +1 @@
-Subproject commit 8e7e905854714a7fbb49c124dbc45c7bd4b98e07
+Subproject commit 1f9c286dba60809edb64e384d6727d80d269b6cf
diff --git a/docs/en/development/build-osx.md b/docs/en/development/build-osx.md
index c3a0a540b6d..60365ad744a 100644
--- a/docs/en/development/build-osx.md
+++ b/docs/en/development/build-osx.md
@@ -16,7 +16,7 @@ $ /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/inst
 ## Install Required Compilers, Tools, and Libraries {#install-required-compilers-tools-and-libraries}
 
 ``` bash
-$ brew install cmake ninja libtool gettext
+$ brew install cmake ninja libtool gettext llvm
 ```
 
 ## Checkout ClickHouse Sources {#checkout-clickhouse-sources}

From 8c963c03cfa6fd22e2fae5ab1f1d04aaaa2932ea Mon Sep 17 00:00:00 2001
From: dankondr <dankondr@icloud.com>
Date: Thu, 21 Jan 2021 22:44:10 +0300
Subject: [PATCH 282/611] Make isNull case insensitive

---
 src/Functions/isNull.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Functions/isNull.cpp b/src/Functions/isNull.cpp
index 8aee78c1aaa..35ba6b7b86d 100644
--- a/src/Functions/isNull.cpp
+++ b/src/Functions/isNull.cpp
@@ -59,7 +59,7 @@ public:
 
 void registerFunctionIsNull(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionIsNull>();
+    factory.registerFunction<FunctionIsNull>(FunctionFactory::CaseInsensitive);
 }
 
 }

From d9cb1c1bdddf5810aadf70cbe6e44f5b40689a8a Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 21 Jan 2021 22:52:00 +0300
Subject: [PATCH 283/611] Avoid UBSan report in aggregate function sum

---
 src/AggregateFunctions/AggregateFunctionAvg.h       | 2 +-
 tests/queries/0_stateless/01660_sum_ubsan.reference | 1 +
 tests/queries/0_stateless/01660_sum_ubsan.sql       | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 tests/queries/0_stateless/01660_sum_ubsan.reference
 create mode 100644 tests/queries/0_stateless/01660_sum_ubsan.sql

diff --git a/src/AggregateFunctions/AggregateFunctionAvg.h b/src/AggregateFunctions/AggregateFunctionAvg.h
index a46796b9c8d..051a815d8dc 100644
--- a/src/AggregateFunctions/AggregateFunctionAvg.h
+++ b/src/AggregateFunctions/AggregateFunctionAvg.h
@@ -148,7 +148,7 @@ class AggregateFunctionAvg final : public AggregateFunctionAvgBase<AvgFieldType<
 public:
     using AggregateFunctionAvgBase<AvgFieldType<T>, UInt64, AggregateFunctionAvg<T>>::AggregateFunctionAvgBase;
 
-    void add(AggregateDataPtr place, const IColumn ** columns, size_t row_num, Arena *) const final
+    void NO_SANITIZE_UNDEFINED add(AggregateDataPtr 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;
diff --git a/tests/queries/0_stateless/01660_sum_ubsan.reference b/tests/queries/0_stateless/01660_sum_ubsan.reference
new file mode 100644
index 00000000000..6878a2eb73b
--- /dev/null
+++ b/tests/queries/0_stateless/01660_sum_ubsan.reference
@@ -0,0 +1 @@
+4233720368547758080
diff --git a/tests/queries/0_stateless/01660_sum_ubsan.sql b/tests/queries/0_stateless/01660_sum_ubsan.sql
new file mode 100644
index 00000000000..63c3122a519
--- /dev/null
+++ b/tests/queries/0_stateless/01660_sum_ubsan.sql
@@ -0,0 +1,3 @@
+-- Aggregate function 'sum' allows overflow with two's complement arithmetics.
+-- This contradicts the standard SQL semantic and we are totally fine with it.
+SELECT sum(-8000000000000000000) FROM numbers(11);

From df50b931599975321742f65340864b23762677b4 Mon Sep 17 00:00:00 2001
From: dankondr <dankondr@icloud.com>
Date: Thu, 21 Jan 2021 22:55:16 +0300
Subject: [PATCH 284/611] Make in case insensitive

---
 src/Functions/in.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Functions/in.cpp b/src/Functions/in.cpp
index b9a0c81b508..01afac4d818 100644
--- a/src/Functions/in.cpp
+++ b/src/Functions/in.cpp
@@ -129,14 +129,14 @@ public:
 template<bool ignore_set>
 void registerFunctionsInImpl(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionIn<false, false, true, ignore_set>>();
-    factory.registerFunction<FunctionIn<false, true, true, ignore_set>>();
-    factory.registerFunction<FunctionIn<true, false, true, ignore_set>>();
-    factory.registerFunction<FunctionIn<true, true, true, ignore_set>>();
-    factory.registerFunction<FunctionIn<false, false, false, ignore_set>>();
-    factory.registerFunction<FunctionIn<false, true, false, ignore_set>>();
-    factory.registerFunction<FunctionIn<true, false, false, ignore_set>>();
-    factory.registerFunction<FunctionIn<true, true, false, ignore_set>>();
+    factory.registerFunction<FunctionIn<false, false, true, ignore_set>>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionIn<false, true, true, ignore_set>>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionIn<true, false, true, ignore_set>>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionIn<true, true, true, ignore_set>>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionIn<false, false, false, ignore_set>>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionIn<false, true, false, ignore_set>>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionIn<true, false, false, ignore_set>>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionIn<true, true, false, ignore_set>>(FunctionFactory::CaseInsensitive);
 }
 
 }

From 71e663701d88f05e38a20c25c3369fa72d6aa078 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Thu, 21 Jan 2021 22:56:28 +0300
Subject: [PATCH 285/611] update the tests

---
 tests/queries/0_stateless/00746_sql_fuzzy.sh                 | 2 +-
 tests/queries/0_stateless/00921_datetime64_compatibility.sh  | 2 +-
 .../01293_client_interactive_vertical_multiline.expect       | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/tests/queries/0_stateless/00746_sql_fuzzy.sh b/tests/queries/0_stateless/00746_sql_fuzzy.sh
index 9fa64d10057..530703bd866 100755
--- a/tests/queries/0_stateless/00746_sql_fuzzy.sh
+++ b/tests/queries/0_stateless/00746_sql_fuzzy.sh
@@ -14,7 +14,7 @@ $CLICKHOUSE_CLIENT -q "select name from system.table_functions format TSV;" > "$
 # if you want long run use: env SQL_FUZZY_RUNS=100000 clickhouse-test sql_fuzzy
 
 for SQL_FUZZY_RUN in $(seq "${SQL_FUZZY_RUNS:=10}"); do
-    env SQL_FUZZY_RUN="$SQL_FUZZY_RUN" "$CURDIR"/00746_sql_fuzzy.pl | timeout 60 $CLICKHOUSE_CLIENT --format Null --max_execution_time 10 -n --ignore-error >/dev/null 2>&1
+    env SQL_FUZZY_RUN="$SQL_FUZZY_RUN" perl "$CURDIR"/00746_sql_fuzzy.pl | timeout 60 $CLICKHOUSE_CLIENT --format Null --max_execution_time 10 -n --ignore-error >/dev/null 2>&1
     if [[ $($CLICKHOUSE_CLIENT -q "SELECT 'Still alive'") != 'Still alive' ]]; then
         break
     fi
diff --git a/tests/queries/0_stateless/00921_datetime64_compatibility.sh b/tests/queries/0_stateless/00921_datetime64_compatibility.sh
index 564c456bc7f..1617e5b1f77 100755
--- a/tests/queries/0_stateless/00921_datetime64_compatibility.sh
+++ b/tests/queries/0_stateless/00921_datetime64_compatibility.sh
@@ -11,6 +11,6 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 # ${CURDIR}/00921_datetime64_compatibility.python
 
-"${CURDIR}"/00921_datetime64_compatibility.python \
+python3 "${CURDIR}"/00921_datetime64_compatibility.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'
diff --git a/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect b/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect
index e87d340c6aa..ea35f9a39ce 100755
--- a/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect
+++ b/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect
@@ -41,10 +41,7 @@ expect ":) "
 send -- ""
 expect eof
 
-set timeout 60
-spawn bash -c "$env(CLICKHOUSE_CLIENT_BINARY) $env(CLICKHOUSE_CLIENT_OPT) --multiline"
-match_max 100000
-
+spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT_BINARY \$CLICKHOUSE_CLIENT_OPT"
 expect ":) "
 
 send -- "SELECT 1;\r"

From 1ec463b61f818b6ee3753d70fd3b857e22515304 Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Thu, 21 Jan 2021 20:01:51 +0000
Subject: [PATCH 286/611] Fast test fix

---
 .../AggregateFunctionFactory.cpp                   |  9 ++++++---
 .../01656_test_query_log_factories_info.reference  |  4 ++--
 .../01656_test_query_log_factories_info.sql        | 14 ++++++++------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/AggregateFunctions/AggregateFunctionFactory.cpp b/src/AggregateFunctions/AggregateFunctionFactory.cpp
index dc89eeb6be2..b95ccadd666 100644
--- a/src/AggregateFunctions/AggregateFunctionFactory.cpp
+++ b/src/AggregateFunctions/AggregateFunctionFactory.cpp
@@ -60,9 +60,12 @@ static DataTypes convertLowCardinalityTypesToNested(const DataTypes & types)
 AggregateFunctionPtr AggregateFunctionFactory::get(
     const String & name, const DataTypes & argument_types, const Array & parameters, AggregateFunctionProperties & out_properties) const
 {
-    auto query_context = CurrentThread::get().getQueryContext();
-    if (query_context && query_context->getSettingsRef().log_queries)
-        query_context->addQueryFactoriesInfo("AggregateFunction", name);
+    if (CurrentThread::isInitialized())
+    {
+        auto query_context = CurrentThread::get().getQueryContext();
+        if (query_context && query_context->getSettingsRef().log_queries)
+            query_context->addQueryFactoriesInfo("AggregateFunction", name);
+    }
 
     auto type_without_low_cardinality = convertLowCardinalityTypesToNested(argument_types);
 
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 14866dabfa3..1e3cbf58b35 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
@@ -5,9 +5,9 @@ aggreagte_functions	table_functions	functions
 \N
 \N
 functions	data_types
-['cast','toTypeName']	['Nullable','UInt8']
+['cast']	['Nullable','UInt8']
 
 data_types	databases	storages
 []	['Atomic']	[]
+data_types	databases	storages
 ['DateTime','String']	[]	['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 9a07ded2b42..5eea96edacd 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
@@ -1,18 +1,17 @@
 SELECT uniq(1, 1, 2, 2), count(toDate('2000-12-05') + number as d) FROM numbers(100);
-INSERT INTO function null('x Int128') SELECT * FROM numbers_mt(100);
 SYSTEM FLUSH LOGS;
 SELECT factory_aggregate_functions AS aggreagte_functions,
        factory_table_functions AS table_functions,
        factory_functions AS functions
 FROM system.query_log WHERE type = 'QueryFinish' AND
-(query LIKE '%toDate(\'2000-12-05\')%' OR query LIKE 'null(\'x Int128\')')
+(query LIKE '%toDate(\'2000-12-05\')%')
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
 SELECT '';
 
 SELECT CAST(arrayJoin([NULL, NULL]) AS Nullable(UInt8)) AS x;
 SYSTEM FLUSH LOGS;
 SELECT factory_functions AS functions, factory_data_types as data_types
-FROM system.query_log WHERE type = 'QueryFinish' AND query LIKE 'SELECT k, groupArray%'
+FROM system.query_log WHERE type = 'QueryFinish' AND query LIKE 'SELECT CAST(arrayJ%'
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
 SELECT '';
 
@@ -22,7 +21,10 @@ CREATE OR REPLACE TABLE test_query_log_factories_info1.memory_table (event Strin
 SYSTEM FLUSH LOGS;
 SELECT factory_data_types AS data_types, factory_databases AS databases, factory_storages AS storages
 FROM system.query_log
-WHERE type == 'QueryFinish' AND (query LIKE '%database test_query_log_factories_info%' OR query LIKE '%TABLE test%')
-ORDER BY query_start_time DESC LIMIT 2 FORMAT TabSeparatedWithNames;
-SELECT '';
+WHERE type == 'QueryFinish' AND (query LIKE '%database test_query_log_factories_info%')
+ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
+SELECT factory_data_types AS data_types, factory_databases AS databases, factory_storages AS storages
+FROM system.query_log
+WHERE type == 'QueryFinish' AND (query LIKE '%TABLE test%')
+ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
 

From 661a00da4e3dc84e2102c6528850bd03b5ca19f1 Mon Sep 17 00:00:00 2001
From: dankondr <dankondr@icloud.com>
Date: Thu, 21 Jan 2021 23:03:13 +0300
Subject: [PATCH 287/611] Make hex case insensitive

---
 src/Functions/FunctionsCoding.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Functions/FunctionsCoding.cpp b/src/Functions/FunctionsCoding.cpp
index c2c746aad9e..239c4658823 100644
--- a/src/Functions/FunctionsCoding.cpp
+++ b/src/Functions/FunctionsCoding.cpp
@@ -24,7 +24,7 @@ void registerFunctionsCoding(FunctionFactory & factory)
     factory.registerFunction<FunctionMACStringTo<ParseOUIImpl>>();
     factory.registerFunction<FunctionUUIDNumToString>();
     factory.registerFunction<FunctionUUIDStringToNum>();
-    factory.registerFunction<FunctionHex>();
+    factory.registerFunction<FunctionHex>(FunctionFactory::CaseInsensitive);
     factory.registerFunction<FunctionUnhex>();
     factory.registerFunction<FunctionChar>(FunctionFactory::CaseInsensitive);
     factory.registerFunction<FunctionBitmaskToArray>();

From e9e331402634cdce8265a3a19612c9931d533396 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <36882414+akuzm@users.noreply.github.com>
Date: Thu, 21 Jan 2021 23:05:35 +0300
Subject: [PATCH 288/611] Update run-fuzzer.sh

---
 docker/test/fuzzer/run-fuzzer.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index 2c44f44bd65..200c7b6f4ce 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -75,7 +75,7 @@ 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 master "$SHA_TO_TEST" | grep -P 'tests/queries/0_stateless/.*\.sql' | sed -r -e 's!^!ch/!' | sort -R)
+    NEW_TESTS=$(git diff --name-only origin/master "$SHA_TO_TEST" | grep -P 'tests/queries/0_stateless/.*\.sql' | sed -r -e 's!^!ch/!' | sort -R)
     cd ..
     if [[ -n "$NEW_TESTS" ]]
     then

From c409508fbb484b5135637175b23008e4682e42ae Mon Sep 17 00:00:00 2001
From: dankondr <dankondr@icloud.com>
Date: Thu, 21 Jan 2021 23:05:38 +0300
Subject: [PATCH 289/611] Make extract case insensitive

---
 src/Functions/extract.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Functions/extract.cpp b/src/Functions/extract.cpp
index 0296602d205..cc3c97840bc 100644
--- a/src/Functions/extract.cpp
+++ b/src/Functions/extract.cpp
@@ -67,7 +67,7 @@ using FunctionExtract = FunctionsStringSearchToString<ExtractImpl, NameExtract>;
 
 void registerFunctionExtract(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionExtract>();
+    factory.registerFunction<FunctionExtract>(FunctionFactory::CaseInsensitive);
 }
 
 }

From 0cdf184242192daddb566ef4a8538d0e7050de3c Mon Sep 17 00:00:00 2001
From: Dmitriy <sevirov@yandex-team.ru>
Date: Thu, 21 Jan 2021 23:14:49 +0300
Subject: [PATCH 290/611] Fix materialize-mysql.md and index.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Поправил согласно комментариям разработчика.
---
 docs/en/engines/database-engines/index.md            |  4 ++--
 .../en/engines/database-engines/materialize-mysql.md |  6 ++++--
 docs/ru/engines/database-engines/index.md            |  4 ++--
 .../ru/engines/database-engines/materialize-mysql.md | 12 +++++++-----
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/docs/en/engines/database-engines/index.md b/docs/en/engines/database-engines/index.md
index 7b298ffe3f8..2a737e42c85 100644
--- a/docs/en/engines/database-engines/index.md
+++ b/docs/en/engines/database-engines/index.md
@@ -14,8 +14,8 @@ You can also use the following database engines:
 
 -   [MySQL](../../engines/database-engines/mysql.md)
 
--   [Lazy](../../engines/database-engines/lazy.md)
-
 -   [MaterializeMySQL](../../engines/database-engines/materialize-mysql.md)
 
+-   [Lazy](../../engines/database-engines/lazy.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 069fb9c55d3..89fe9304c4c 100644
--- a/docs/en/engines/database-engines/materialize-mysql.md
+++ b/docs/en/engines/database-engines/materialize-mysql.md
@@ -9,6 +9,8 @@ Creates ClickHouse database with all the tables existing in MySQL, and all the d
 
 ClickHouse server works as MySQL replica. It reads binlog and performs DDL and DML queries.
 
+This feature is experimental.
+
 ## Creating a Database {#creating-a-database}
 
 ``` sql
@@ -63,7 +65,7 @@ MySQL DDL queries are converted into the corresponding ClickHouse DDL queries ([
 
 ### Data Replication {#data-replication}
 
-MaterializeMySQL does not support direct `INSERT`, `DELETE` and `UPDATE` queries. However, they are supported in terms of data replication:
+`MaterializeMySQL` does not support direct `INSERT`, `DELETE` and `UPDATE` queries. However, they are supported in terms of data replication:
 
 - MySQL `INSERT` query is converted into `INSERT` with `_sign=1`.
 
@@ -73,7 +75,7 @@ MaterializeMySQL does not support direct `INSERT`, `DELETE` and `UPDATE` queries
 
 ### Selecting from MaterializeMySQL Tables {#select}
 
-`SELECT` query form MaterializeMySQL tables has some specifics:
+`SELECT` query from `MaterializeMySQL` tables has some specifics:
 
 - If `_version` is not specified in the `SELECT` query, [FINAL](../../sql-reference/statements/select/from.md#select-from-final) modifier is used. So only rows with `MAX(_version)` are selected.
 
diff --git a/docs/ru/engines/database-engines/index.md b/docs/ru/engines/database-engines/index.md
index 16608d9fd29..4dfe766f066 100644
--- a/docs/ru/engines/database-engines/index.md
+++ b/docs/ru/engines/database-engines/index.md
@@ -14,8 +14,8 @@ toc_title: "\u0412\u0432\u0435\u0434\u0435\u043d\u0438\u0435"
 
 -   [MySQL](../../engines/database-engines/mysql.md)
 
--   [Lazy](../../engines/database-engines/lazy.md)
-
 -   [MaterializeMySQL](../../engines/database-engines/materialize-mysql.md)
 
+-   [Lazy](../../engines/database-engines/lazy.md)
+
 [Оригинальная статья](https://clickhouse.tech/docs/ru/database_engines/) <!--hide-->
diff --git a/docs/ru/engines/database-engines/materialize-mysql.md b/docs/ru/engines/database-engines/materialize-mysql.md
index 77e6400ee69..f23ac0cddd6 100644
--- a/docs/ru/engines/database-engines/materialize-mysql.md
+++ b/docs/ru/engines/database-engines/materialize-mysql.md
@@ -9,6 +9,8 @@ toc_title: MaterializeMySQL
 
 Сервер ClickHouse работает как реплика MySQL. Он читает файл binlog и выполняет DDL and DML-запросы.
 
+`MaterializeMySQL` — экспериментальный движок баз данных.
+
 ## Создание базы данных {#creating-a-database}
 
 ``` sql
@@ -63,17 +65,17 @@ DDL-запросы в MySQL конвертируются в соответств
 
 ### Репликация данных {#data-replication}
 
-Движок MaterializeMySQL не поддерживает прямые запросы `INSERT`, `DELETE` и `UPDATE`. Однако они поддерживаются с точки зрения репликации данных:
+Данные являются неизменяемыми со стороны пользователя ClickHouse, но автоматически обновляются путём репликации следующих запросов из MySQL:
 
-- Запрос `INSERT` из MySQL конвертируется в ClickHouse в `INSERT` с `_sign=1`.
+- Запрос `INSERT` конвертируется в ClickHouse в `INSERT` с `_sign=1`.
 
-- Запрос `DELETE` из MySQL конвертируется в ClickHouse в `INSERT` с `_sign=-1`.
+- Запрос `DELETE` конвертируется в ClickHouse в `INSERT` с `_sign=-1`.
 
-- Запрос `UPDATE` из MySQL конвертируется в ClickHouse в `INSERT` с `_sign=-1` и `INSERT` с `_sign=1`.
+- Запрос `UPDATE` конвертируется в ClickHouse в `INSERT` с `_sign=-1` и `INSERT` с `_sign=1`.
 
 ### Выборка из таблиц движка MaterializeMySQL {#select}
 
-Запрос `SELECT` из таблиц движка MaterializeMySQL имеет некоторую специфику:
+Запрос `SELECT` из таблиц движка `MaterializeMySQL` имеет некоторую специфику:
 
 - Если в запросе `SELECT` напрямую не указан столбец `_version`, то используется модификатор [FINAL](../../sql-reference/statements/select/from.md#select-from-final). Таким образом, выбираются только строки с `MAX(_version)`.
 

From b8661e5caf632d6e572292ad3c61588ada69aa88 Mon Sep 17 00:00:00 2001
From: dankondr <dankondr@icloud.com>
Date: Thu, 21 Jan 2021 23:28:20 +0300
Subject: [PATCH 291/611] Add toHour MySQL compatibility alias

---
 src/Functions/toHour.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Functions/toHour.cpp b/src/Functions/toHour.cpp
index fb973a9b4b8..72709f990b0 100644
--- a/src/Functions/toHour.cpp
+++ b/src/Functions/toHour.cpp
@@ -12,6 +12,9 @@ using FunctionToHour = FunctionDateOrDateTimeToSomething<DataTypeUInt8, ToHourIm
 void registerFunctionToHour(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionToHour>();
+
+    /// MysQL compatibility alias.
+    factory.registerFunction<FunctionToHour>("HOUR", FunctionFactory::CaseInsensitive);
 }
 
 }

From 56687b2d84c23afbc43bd7a8e67d9efaa7d72fd4 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <36882414+akuzm@users.noreply.github.com>
Date: Thu, 21 Jan 2021 23:29:01 +0300
Subject: [PATCH 292/611] Update run.sh

---
 docker/test/fasttest/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index 437740506e5..fb3b3e3b459 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -332,7 +332,7 @@ function run_tests
         01622_defaults_for_url_engine
     )
 
-    time clickhouse-test -j 8 --order=random --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"
+    time clickhouse-test -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"
 
     # substr is to remove semicolon after test name
     readarray -t FAILED_TESTS < <(awk '/\[ FAIL|TIMEOUT|ERROR \]/ { print substr($3, 1, length($3)-1) }' "$FASTTEST_OUTPUT/test_log.txt" | tee "$FASTTEST_OUTPUT/failed-parallel-tests.txt")

From 54bef0568b292146c4e6852e5a33806f4fc34297 Mon Sep 17 00:00:00 2001
From: dankondr <dankondr@icloud.com>
Date: Thu, 21 Jan 2021 23:33:15 +0300
Subject: [PATCH 293/611] Add base64Encode MySQL compatibility alias

---
 src/Functions/base64Encode.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Functions/base64Encode.cpp b/src/Functions/base64Encode.cpp
index 8cf54eca768..0c038eb5fca 100644
--- a/src/Functions/base64Encode.cpp
+++ b/src/Functions/base64Encode.cpp
@@ -14,6 +14,9 @@ void registerFunctionBase64Encode(FunctionFactory & factory)
 {
     tb64ini(0, 1);
     factory.registerFunction<FunctionBase64Conversion<Base64Encode>>();
+
+    /// MysQL compatibility alias.
+    factory.registerFunction<FunctionBase64Conversion<Base64Encode>>("TO_BASE64", FunctionFactory::CaseInsensitive);
 }
 }
 #endif

From 685b4107d2f0cec72bed6edf0dbe8ba740496a76 Mon Sep 17 00:00:00 2001
From: dankondr <dankondr@icloud.com>
Date: Thu, 21 Jan 2021 23:36:26 +0300
Subject: [PATCH 294/611] Add base64Decode MySQL compatibility alias

---
 src/Functions/base64Decode.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Functions/base64Decode.cpp b/src/Functions/base64Decode.cpp
index e0f61b01e4b..66e0969783e 100644
--- a/src/Functions/base64Decode.cpp
+++ b/src/Functions/base64Decode.cpp
@@ -10,6 +10,9 @@ void registerFunctionBase64Decode(FunctionFactory & factory)
 {
     tb64ini(0, 1);
     factory.registerFunction<FunctionBase64Conversion<Base64Decode>>();
+
+    /// MysQL compatibility alias.
+    factory.registerFunction<FunctionBase64Conversion<Base64Decode>>("FROM_BASE64", FunctionFactory::CaseInsensitive);
 }
 }
 #endif

From 3025a09f7e660c56cc4070343c74f3ee40097256 Mon Sep 17 00:00:00 2001
From: dankondr <dankondr@icloud.com>
Date: Thu, 21 Jan 2021 23:42:08 +0300
Subject: [PATCH 295/611] Add toDayOfYear MySQL compatibility alias

---
 src/Functions/toDayOfYear.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Functions/toDayOfYear.cpp b/src/Functions/toDayOfYear.cpp
index 301232040b7..510e3253f87 100644
--- a/src/Functions/toDayOfYear.cpp
+++ b/src/Functions/toDayOfYear.cpp
@@ -12,6 +12,9 @@ using FunctionToDayOfYear = FunctionDateOrDateTimeToSomething<DataTypeUInt16, To
 void registerFunctionToDayOfYear(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionToDayOfYear>();
+
+    /// MysQL compatibility alias.
+    factory.registerFunction<FunctionToDayOfYear>("DAYOFYEAR", FunctionFactory::CaseInsensitive);
 }
 
 }

From 27bf42b67f3fef313de13ffe4bf941ffcb7b44ca Mon Sep 17 00:00:00 2001
From: dankondr <dankondr@icloud.com>
Date: Thu, 21 Jan 2021 23:46:00 +0300
Subject: [PATCH 296/611] Add toDayOfWeek MySQL compatibility alias

---
 src/Functions/toDayOfWeek.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Functions/toDayOfWeek.cpp b/src/Functions/toDayOfWeek.cpp
index 71303489321..9b2bb055eca 100644
--- a/src/Functions/toDayOfWeek.cpp
+++ b/src/Functions/toDayOfWeek.cpp
@@ -12,6 +12,9 @@ using FunctionToDayOfWeek = FunctionDateOrDateTimeToSomething<DataTypeUInt8, ToD
 void registerFunctionToDayOfWeek(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionToDayOfWeek>();
+
+    /// MysQL compatibility alias.
+    factory.registerFunction<FunctionToDayOfWeek>("DAYOFWEEK", FunctionFactory::CaseInsensitive);
 }
 
 }

From e066add261e39d96b02a8fd3f72953b8b3081fbe Mon Sep 17 00:00:00 2001
From: dankondr <dankondr@icloud.com>
Date: Thu, 21 Jan 2021 23:49:06 +0300
Subject: [PATCH 297/611] Add toDayOfMonth MySQL compatibility alias

---
 src/Functions/toDayOfMonth.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Functions/toDayOfMonth.cpp b/src/Functions/toDayOfMonth.cpp
index 0f6d2ad6a46..ad397a15276 100644
--- a/src/Functions/toDayOfMonth.cpp
+++ b/src/Functions/toDayOfMonth.cpp
@@ -12,6 +12,10 @@ using FunctionToDayOfMonth = FunctionDateOrDateTimeToSomething<DataTypeUInt8, To
 void registerFunctionToDayOfMonth(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionToDayOfMonth>();
+
+    /// MysQL compatibility alias.
+    factory.registerFunction<FunctionToDayOfMonth>("DAY", FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionToDayOfMonth>("DAYOFMONTH", FunctionFactory::CaseInsensitive);
 }
 
 }

From cf5c0dad94eff60d0ddec72abcf63c3c4b983250 Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Thu, 21 Jan 2021 23:56:29 +0300
Subject: [PATCH 298/611] Minor fix

---
 docs/en/operations/caches.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/operations/caches.md b/docs/en/operations/caches.md
index 0323fc84ef4..66f2eaeadc9 100644
--- a/docs/en/operations/caches.md
+++ b/docs/en/operations/caches.md
@@ -18,7 +18,7 @@ Additional cache types:
 - [Avro format](../interfaces/formats.md#data-format-avro) schemas cache
 - [dictionaries data cache](../sql-reference/dictionaries/index.md)
 
-Not directly used:
+Indirectly used:
 - OS page cache
 
 [Original article](https://clickhouse.tech/docs/en/operations/caches/) <!--hide-->

From e36cffe3d429894d5f4438c5fd94cdd422ba3b62 Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Fri, 22 Jan 2021 00:01:52 +0300
Subject: [PATCH 299/611] Query fixed.

---
 docs/en/sql-reference/table-functions/file.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs/en/sql-reference/table-functions/file.md b/docs/en/sql-reference/table-functions/file.md
index 2dd12a8b44b..fd1855653b9 100644
--- a/docs/en/sql-reference/table-functions/file.md
+++ b/docs/en/sql-reference/table-functions/file.md
@@ -39,12 +39,10 @@ $ cat /var/lib/clickhouse/user_files/test.csv
     78,43,45
 ```
 
-Table from `test.csv` and selection of the first two rows from it:
+Getting data from a table in `test.csv` and selecting first two rows from it:
 
 ``` 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

From 89b394ea575719c63d7be1ae160e7a5d4e41e976 Mon Sep 17 00:00:00 2001
From: dankondr <dankondr@icloud.com>
Date: Fri, 22 Jan 2021 00:02:35 +0300
Subject: [PATCH 300/611] Add toDate MySQL compatibility alias

---
 src/Functions/FunctionsConversion.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Functions/FunctionsConversion.cpp b/src/Functions/FunctionsConversion.cpp
index 257b852ecd8..8e5d389a13b 100644
--- a/src/Functions/FunctionsConversion.cpp
+++ b/src/Functions/FunctionsConversion.cpp
@@ -29,6 +29,9 @@ void registerFunctionsConversion(FunctionFactory & factory)
     factory.registerFunction<FunctionToDecimal256>();
 
     factory.registerFunction<FunctionToDate>();
+    /// MysQL compatibility alias.
+    factory.registerFunction<FunctionToDate>("DATE", FunctionFactory::CaseInsensitive);
+
     factory.registerFunction<FunctionToDateTime>();
     factory.registerFunction<FunctionToDateTime32>();
     factory.registerFunction<FunctionToDateTime64>();

From daab2c91bbf8e198219b062cadde933d0bdd0adb Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Thu, 21 Jan 2021 21:15:11 +0000
Subject: [PATCH 301/611] Better

---
 .../AggregateFunctionFactory.cpp              |  2 +-
 src/DataTypes/DataTypeFactory.cpp             |  2 +-
 src/Databases/DatabaseFactory.cpp             |  2 +-
 src/Dictionaries/DictionaryFactory.cpp        |  2 +-
 src/Formats/FormatFactory.cpp                 |  6 +-
 src/Functions/FunctionFactory.cpp             |  2 +-
 src/Interpreters/Context.cpp                  | 44 ++++++----
 src/Interpreters/Context.h                    | 33 +++++--
 src/Interpreters/QueryLog.cpp                 | 88 +++++++++++--------
 src/Interpreters/QueryLog.h                   | 16 ++--
 src/Interpreters/executeQuery.cpp             | 16 ++--
 src/Storages/StorageFactory.cpp               |  2 +-
 src/TableFunctions/TableFunctionFactory.cpp   |  2 +-
 ...56_test_query_log_factories_info.reference | 14 +--
 .../01656_test_query_log_factories_info.sql   | 13 ++-
 15 files changed, 141 insertions(+), 103 deletions(-)

diff --git a/src/AggregateFunctions/AggregateFunctionFactory.cpp b/src/AggregateFunctions/AggregateFunctionFactory.cpp
index b95ccadd666..8556f68f3e2 100644
--- a/src/AggregateFunctions/AggregateFunctionFactory.cpp
+++ b/src/AggregateFunctions/AggregateFunctionFactory.cpp
@@ -64,7 +64,7 @@ AggregateFunctionPtr AggregateFunctionFactory::get(
     {
         auto query_context = CurrentThread::get().getQueryContext();
         if (query_context && query_context->getSettingsRef().log_queries)
-            query_context->addQueryFactoriesInfo("AggregateFunction", name);
+            query_context->addQueryFactoriesInfo(Context::QueryLogFactories::AggregateFunction, name);
     }
 
     auto type_without_low_cardinality = convertLowCardinalityTypesToNested(argument_types);
diff --git a/src/DataTypes/DataTypeFactory.cpp b/src/DataTypes/DataTypeFactory.cpp
index 21fac9b8094..028f8536c6a 100644
--- a/src/DataTypes/DataTypeFactory.cpp
+++ b/src/DataTypes/DataTypeFactory.cpp
@@ -82,7 +82,7 @@ DataTypePtr DataTypeFactory::get(const String & family_name_param, const ASTPtr
     {
         auto query_context = CurrentThread::get().getQueryContext();
         if (query_context && query_context->getSettingsRef().log_queries)
-            query_context->addQueryFactoriesInfo("DataType", family_name);
+            query_context->addQueryFactoriesInfo(Context::QueryLogFactories::DataType, family_name);
     }
 
     return findCreatorByName(family_name)(parameters);
diff --git a/src/Databases/DatabaseFactory.cpp b/src/Databases/DatabaseFactory.cpp
index 589300ca897..344decf3da8 100644
--- a/src/Databases/DatabaseFactory.cpp
+++ b/src/Databases/DatabaseFactory.cpp
@@ -98,7 +98,7 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
                         ErrorCodes::UNKNOWN_ELEMENT_IN_AST);
 
     if (context.hasQueryContext() && context.getSettingsRef().log_queries)
-        context.getQueryContext().addQueryFactoriesInfo("Database", engine_name);
+        context.getQueryContext().addQueryFactoriesInfo(Context::QueryLogFactories::Database, engine_name);
 
     if (engine_name == "Ordinary")
         return std::make_shared<DatabaseOrdinary>(database_name, metadata_path, context);
diff --git a/src/Dictionaries/DictionaryFactory.cpp b/src/Dictionaries/DictionaryFactory.cpp
index 86391aec94d..a889b63107f 100644
--- a/src/Dictionaries/DictionaryFactory.cpp
+++ b/src/Dictionaries/DictionaryFactory.cpp
@@ -48,7 +48,7 @@ DictionaryPtr DictionaryFactory::create(
     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("Dictionary", name);
+        context.getQueryContext().addQueryFactoriesInfo(Context::QueryLogFactories::Dictionary, name);
 
     const auto & layout_type = keys.front();
 
diff --git a/src/Formats/FormatFactory.cpp b/src/Formats/FormatFactory.cpp
index b408c71d4fd..86cf12fbf68 100644
--- a/src/Formats/FormatFactory.cpp
+++ b/src/Formats/FormatFactory.cpp
@@ -279,7 +279,7 @@ InputFormatPtr FormatFactory::getInputFormat(
     const Settings & settings = context.getSettingsRef();
 
     if (context.hasQueryContext() && settings.log_queries)
-        context.getQueryContext().addQueryFactoriesInfo("Format", name);
+        context.getQueryContext().addQueryFactoriesInfo(Context::QueryLogFactories::Format, name);
 
     auto format_settings = _format_settings
         ? *_format_settings : getFormatSettings(context);
@@ -324,7 +324,7 @@ OutputFormatPtr FormatFactory::getOutputFormatParallelIfPossible(
         ParallelFormattingOutputFormat::Params builder{buf, sample, formatter_creator, settings.max_threads};
 
         if (context.hasQueryContext() && settings.log_queries)
-            context.getQueryContext().addQueryFactoriesInfo("Format", name);
+            context.getQueryContext().addQueryFactoriesInfo(Context::QueryLogFactories::Format, name);
 
         return std::make_shared<ParallelFormattingOutputFormat>(builder);
     }
@@ -343,7 +343,7 @@ OutputFormatPtr FormatFactory::getOutputFormat(
         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("Format", name);
+        context.getQueryContext().addQueryFactoriesInfo(Context::QueryLogFactories::Format, name);
 
     RowOutputFormatParams params;
     params.callback = std::move(callback);
diff --git a/src/Functions/FunctionFactory.cpp b/src/Functions/FunctionFactory.cpp
index efd59770875..859fe1de9a3 100644
--- a/src/Functions/FunctionFactory.cpp
+++ b/src/Functions/FunctionFactory.cpp
@@ -76,7 +76,7 @@ FunctionOverloadResolverPtr FunctionFactory::get(
     const Context & context) const
 {
     if (context.hasQueryContext() && context.getSettingsRef().log_queries)
-        context.getQueryContext().addQueryFactoriesInfo("Function", name);
+        context.getQueryContext().addQueryFactoriesInfo(Context::QueryLogFactories::Function, name);
 
     return std::make_shared<FunctionOverloadResolverAdaptor>(getImpl(name, context));
 }
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index 2bc920471ff..b2bd67c48f2 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -954,27 +954,37 @@ void Context::addQueryAccessInfo(const String & quoted_database_name, const Stri
 }
 
 
-void Context::addQueryFactoriesInfo(String factory_type, const String & created_object) const
+void Context::addQueryFactoriesInfo(QueryLogFactories factory_type, const String & created_object) const
 {
     assert(global_context != this || getApplicationType() == ApplicationType::LOCAL);
     auto lock = getLock();
 
-    if (factory_type == "AggregateFunction")
-        query_factories_info.aggregate_functions.emplace(created_object);
-    else if (factory_type == "Database")
-        query_factories_info.databases.emplace(created_object);
-    else if (factory_type == "DataType")
-        query_factories_info.data_types.emplace(created_object);
-    else if (factory_type == "Dictionary")
-        query_factories_info.dictionaries.emplace(created_object);
-    else if (factory_type == "Format")
-        query_factories_info.formats.emplace(created_object);
-    else if (factory_type == "Function")
-        query_factories_info.functions.emplace(created_object);
-    else if (factory_type == "Storage")
-        query_factories_info.storages.emplace(created_object);
-    else if (factory_type == "TableFunction")
-        query_factories_info.table_functions.emplace(created_object);
+    switch (factory_type)
+    {
+        case QueryLogFactories::AggregateFunction:
+            query_factories_info.aggregate_functions.emplace(created_object);
+            break;
+        case QueryLogFactories::Database:
+            query_factories_info.databases.emplace(created_object);
+            break;
+        case QueryLogFactories::DataType:
+            query_factories_info.data_types.emplace(created_object);
+            break;
+        case QueryLogFactories::Dictionary:
+            query_factories_info.dictionaries.emplace(created_object);
+            break;
+        case QueryLogFactories::Format:
+            query_factories_info.formats.emplace(created_object);
+            break;
+        case QueryLogFactories::Function:
+            query_factories_info.functions.emplace(created_object);
+            break;
+        case QueryLogFactories::Storage:
+            query_factories_info.storages.emplace(created_object);
+            break;
+        case QueryLogFactories::TableFunction:
+            query_factories_info.table_functions.emplace(created_object);
+    }
 }
 
 
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index 5d3eacc945e..ffede8b9b12 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -201,18 +201,20 @@ private:
 
     QueryAccessInfo query_access_info;
 
+    /// Record names of created objects of factories (for testing, etc)
     struct QueryFactoriesInfo
     {
-        std::set<std::string> aggregate_functions;
-        std::set<std::string> databases;
-        std::set<std::string> data_types;
-        std::set<std::string> dictionaries;
-        std::set<std::string> formats;
-        std::set<std::string> functions;
-        std::set<std::string> storages;
-        std::set<std::string> table_functions;
+        std::unordered_set<std::string> aggregate_functions;
+        std::unordered_set<std::string> databases;
+        std::unordered_set<std::string> data_types;
+        std::unordered_set<std::string> dictionaries;
+        std::unordered_set<std::string> formats;
+        std::unordered_set<std::string> functions;
+        std::unordered_set<std::string> storages;
+        std::unordered_set<std::string> table_functions;
     };
 
+    /// Needs to be chandged while having const context in factories methods
     mutable QueryFactoriesInfo query_factories_info;
 
     //TODO maybe replace with temporary tables?
@@ -383,8 +385,21 @@ public:
     const QueryAccessInfo & getQueryAccessInfo() const { return query_access_info; }
     void addQueryAccessInfo(const String & quoted_database_name, const String & full_quoted_table_name, const Names & column_names);
 
+    /// Supported factories for records in query_log
+    enum class QueryLogFactories
+    {
+        AggregateFunction,
+        Database,
+        DataType,
+        Dictionary,
+        Format,
+        Function,
+        Storage,
+        TableFunction
+    };
+
     const QueryFactoriesInfo & getQueryFactoriesInfo() const { return query_factories_info; }
-    void addQueryFactoriesInfo(String factory_type, const String & created_object) const;
+    void addQueryFactoriesInfo(QueryLogFactories factory_type, const String & created_object) const;
 
     StoragePtr executeTableFunction(const ASTPtr & table_expression);
 
diff --git a/src/Interpreters/QueryLog.cpp b/src/Interpreters/QueryLog.cpp
index 44ea814c5a3..5570213672a 100644
--- a/src/Interpreters/QueryLog.cpp
+++ b/src/Interpreters/QueryLog.cpp
@@ -97,14 +97,14 @@ Block QueryLogElement::createBlock()
         {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "Settings.Names"},
         {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "Settings.Values"},
 
-        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "factory_aggregate_functions"},
-        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "factory_databases"},
-        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "factory_data_types"},
-        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "factory_dictionaries"},
-        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "factory_formats"},
-        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "factory_functions"},
-        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "factory_storages"},
-        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "factory_table_functions"}
+        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "used_aggregate_functions"},
+        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "used_databases"},
+        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "used_data_types"},
+        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "used_dictionaries"},
+        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "used_formats"},
+        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "used_functions"},
+        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "used_storages"},
+        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "used_table_functions"}
     };
 
 }
@@ -140,21 +140,23 @@ void QueryLogElement::appendToBlock(MutableColumns & columns) const
     auto & column_tables = typeid_cast<ColumnArray &>(*columns[i++]);
     auto & column_columns = typeid_cast<ColumnArray &>(*columns[i++]);
 
-    auto insert_array_from_set = [](const std::set<String> & data, ColumnArray & column)
     {
-        size_t size = 0;
-        for (const auto & name : data)
+        auto fill_column = [](const std::set<String> & data, ColumnArray & column)
         {
-            column.getData().insertData(name.data(), name.size());
-            ++size;
-        }
-        auto & offsets = column.getOffsets();
-        offsets.push_back(offsets.back() + size);
-    };
+            size_t size = 0;
+            for (const auto & name : data)
+            {
+                column.getData().insertData(name.data(), name.size());
+                ++size;
+            }
+            auto & offsets = column.getOffsets();
+            offsets.push_back(offsets.back() + size);
+        };
 
-    insert_array_from_set(query_databases, column_databases);
-    insert_array_from_set(query_tables, column_tables);
-    insert_array_from_set(query_columns, column_columns);
+        fill_column(query_databases, column_databases);
+        fill_column(query_tables, column_tables);
+        fill_column(query_columns, column_columns);
+    }
 
     columns[i++]->insert(exception_code);
     columns[i++]->insertData(exception.data(), exception.size());
@@ -196,23 +198,37 @@ void QueryLogElement::appendToBlock(MutableColumns & columns) const
         columns[i++]->insertDefault();
     }
 
-    auto & column_aggregate_function_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
-    auto & column_database_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
-    auto & column_data_type_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
-    auto & column_dictionary_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
-    auto & column_format_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
-    auto & column_function_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
-    auto & column_storage_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
-    auto & column_table_function_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+    {
+        auto fill_column = [](const std::unordered_set<String> & data, ColumnArray & column)
+        {
+            size_t size = 0;
+            for (const auto & name : data)
+            {
+                column.getData().insertData(name.data(), name.size());
+                ++size;
+            }
+            auto & offsets = column.getOffsets();
+            offsets.push_back(offsets.back() + size);
+        };
 
-    insert_array_from_set(factory_aggregate_functions, column_aggregate_function_factory_objects);
-    insert_array_from_set(factory_databases, column_database_factory_objects);
-    insert_array_from_set(factory_data_types, column_data_type_factory_objects);
-    insert_array_from_set(factory_dictionaries, column_dictionary_factory_objects);
-    insert_array_from_set(factory_formats, column_format_factory_objects);
-    insert_array_from_set(factory_functions, column_function_factory_objects);
-    insert_array_from_set(factory_storages, column_storage_factory_objects);
-    insert_array_from_set(factory_table_functions, column_table_function_factory_objects);
+        auto & column_aggregate_function_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+        auto & column_database_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+        auto & column_data_type_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+        auto & column_dictionary_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+        auto & column_format_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+        auto & column_function_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+        auto & column_storage_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+        auto & column_table_function_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+
+        fill_column(used_aggregate_functions, column_aggregate_function_factory_objects);
+        fill_column(used_databases, column_database_factory_objects);
+        fill_column(used_data_types, column_data_type_factory_objects);
+        fill_column(used_dictionaries, column_dictionary_factory_objects);
+        fill_column(used_formats, column_format_factory_objects);
+        fill_column(used_functions, column_function_factory_objects);
+        fill_column(used_storages, column_storage_factory_objects);
+        fill_column(used_table_functions, column_table_function_factory_objects);
+    }
 }
 
 void QueryLogElement::appendClientInfo(const ClientInfo & client_info, MutableColumns & columns, size_t & i)
diff --git a/src/Interpreters/QueryLog.h b/src/Interpreters/QueryLog.h
index 45284f3dd9d..1099603f3c4 100644
--- a/src/Interpreters/QueryLog.h
+++ b/src/Interpreters/QueryLog.h
@@ -58,14 +58,14 @@ struct QueryLogElement
     std::set<String> query_tables;
     std::set<String> query_columns;
 
-    std::set<String> factory_aggregate_functions;
-    std::set<String> factory_databases;
-    std::set<String> factory_data_types;
-    std::set<String> factory_dictionaries;
-    std::set<String> factory_formats;
-    std::set<String> factory_functions;
-    std::set<String> factory_storages;
-    std::set<String> factory_table_functions;
+    std::unordered_set<String> used_aggregate_functions;
+    std::unordered_set<String> used_databases;
+    std::unordered_set<String> used_data_types;
+    std::unordered_set<String> used_dictionaries;
+    std::unordered_set<String> used_formats;
+    std::unordered_set<String> used_functions;
+    std::unordered_set<String> used_storages;
+    std::unordered_set<String> used_table_functions;
 
     Int32 exception_code{}; // because ErrorCodes are int
     String exception;
diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index 53e6df61dd4..d2df028e4fb 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -735,14 +735,14 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 elem.profile_counters = std::move(info.profile_counters);
 
                 const auto & factories_info = context.getQueryFactoriesInfo();
-                elem.factory_aggregate_functions = factories_info.aggregate_functions;
-                elem.factory_databases = factories_info.databases;
-                elem.factory_data_types = factories_info.data_types;
-                elem.factory_dictionaries = factories_info.dictionaries;
-                elem.factory_formats = factories_info.formats;
-                elem.factory_functions = factories_info.functions;
-                elem.factory_storages = factories_info.storages;
-                elem.factory_table_functions = factories_info.table_functions;
+                elem.used_aggregate_functions = factories_info.aggregate_functions;
+                elem.used_databases = factories_info.databases;
+                elem.used_data_types = factories_info.data_types;
+                elem.used_dictionaries = factories_info.dictionaries;
+                elem.used_formats = factories_info.formats;
+                elem.used_functions = factories_info.functions;
+                elem.used_storages = factories_info.storages;
+                elem.used_table_functions = factories_info.table_functions;
 
                 if (log_queries && elem.type >= log_queries_min_type && Int64(elem.query_duration_ms) >= log_queries_min_query_duration_ms)
                 {
diff --git a/src/Storages/StorageFactory.cpp b/src/Storages/StorageFactory.cpp
index b00fa7dc37a..85f3bea9e0c 100644
--- a/src/Storages/StorageFactory.cpp
+++ b/src/Storages/StorageFactory.cpp
@@ -191,7 +191,7 @@ StoragePtr StorageFactory::get(
     }
 
     if (local_context.hasQueryContext() && context.getSettingsRef().log_queries)
-        local_context.getQueryContext().addQueryFactoriesInfo("Storage", name);
+        local_context.getQueryContext().addQueryFactoriesInfo(Context::QueryLogFactories::Storage, name);
 
     return res;
 }
diff --git a/src/TableFunctions/TableFunctionFactory.cpp b/src/TableFunctions/TableFunctionFactory.cpp
index aa3e70779cd..d706d5be86b 100644
--- a/src/TableFunctions/TableFunctionFactory.cpp
+++ b/src/TableFunctions/TableFunctionFactory.cpp
@@ -46,7 +46,7 @@ TableFunctionPtr TableFunctionFactory::get(
     res->parseArguments(ast_function, context);
 
     if (context.hasQueryContext() && context.getSettingsRef().log_queries)
-        context.getQueryContext().addQueryFactoriesInfo("TableFunction", table_function->name);
+        context.getQueryContext().addQueryFactoriesInfo(Context::QueryLogFactories::TableFunction, table_function->name);
 
     return res;
 }
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 1e3cbf58b35..64195b333c7 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,13 +1,13 @@
 1	100
-aggreagte_functions	table_functions	functions
-['count','uniq']	['numbers']	['addDays','plus','toDate']
+used_aggregate_functions	used_table_functions	used_functions
+['uniq','count']	['numbers']	['plus','toDate','addDays']
 
 \N
 \N
-functions	data_types
+used_functions	used_data_types
 ['cast']	['Nullable','UInt8']
 
-data_types	databases	storages
-[]	['Atomic']	[]
-data_types	databases	storages
-['DateTime','String']	[]	['Memory']
+used_databases
+['Atomic']
+used_data_types	used_storages
+['DateTime','String']	['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 5eea96edacd..7304a236a8a 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
@@ -1,16 +1,13 @@
 SELECT uniq(1, 1, 2, 2), count(toDate('2000-12-05') + number as d) FROM numbers(100);
 SYSTEM FLUSH LOGS;
-SELECT factory_aggregate_functions AS aggreagte_functions,
-       factory_table_functions AS table_functions,
-       factory_functions AS functions
-FROM system.query_log WHERE type = 'QueryFinish' AND
-(query LIKE '%toDate(\'2000-12-05\')%')
+SELECT used_aggregate_functions, used_table_functions, used_functions
+FROM system.query_log WHERE type = 'QueryFinish' AND (query LIKE '%toDate(\'2000-12-05\')%')
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
 SELECT '';
 
 SELECT CAST(arrayJoin([NULL, NULL]) AS Nullable(UInt8)) AS x;
 SYSTEM FLUSH LOGS;
-SELECT factory_functions AS functions, factory_data_types as data_types
+SELECT used_functions, used_data_types
 FROM system.query_log WHERE type = 'QueryFinish' AND query LIKE 'SELECT CAST(arrayJ%'
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
 SELECT '';
@@ -19,11 +16,11 @@ DROP database IF EXISTS test_query_log_factories_info1;
 CREATE database test_query_log_factories_info1 ENGINE=Atomic;
 CREATE OR REPLACE TABLE test_query_log_factories_info1.memory_table (event String, date DateTime) ENGINE=Memory();
 SYSTEM FLUSH LOGS;
-SELECT factory_data_types AS data_types, factory_databases AS databases, factory_storages AS storages
+SELECT used_databases
 FROM system.query_log
 WHERE type == 'QueryFinish' AND (query LIKE '%database test_query_log_factories_info%')
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
-SELECT factory_data_types AS data_types, factory_databases AS databases, factory_storages AS storages
+SELECT used_data_types, used_storages
 FROM system.query_log
 WHERE type == 'QueryFinish' AND (query LIKE '%TABLE test%')
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;

From 41d75249a2f1e888efd0c39b425312d5dfca8fc3 Mon Sep 17 00:00:00 2001
From: dankondr <dankondr@icloud.com>
Date: Fri, 22 Jan 2021 00:19:14 +0300
Subject: [PATCH 302/611] Add IP num/string conversions MySQL compatibility
 alias

Functions:
- FunctionIPv6NumToString
- FunctionIPv6StringToNum
- FunctionIPv4NumToString
- FunctionIPv4StringToNum
---
 src/Functions/FunctionsCoding.cpp | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/Functions/FunctionsCoding.cpp b/src/Functions/FunctionsCoding.cpp
index 239c4658823..cf85b4512d5 100644
--- a/src/Functions/FunctionsCoding.cpp
+++ b/src/Functions/FunctionsCoding.cpp
@@ -12,12 +12,7 @@ struct NameFunctionIPv4NumToStringClassC { static constexpr auto name = "IPv4Num
 void registerFunctionsCoding(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionToStringCutToZero>();
-    factory.registerFunction<FunctionIPv6NumToString>();
     factory.registerFunction<FunctionCutIPv6>();
-    factory.registerFunction<FunctionIPv6StringToNum>();
-    factory.registerFunction<FunctionIPv4NumToString<0, NameFunctionIPv4NumToString>>();
-    factory.registerFunction<FunctionIPv4NumToString<1, NameFunctionIPv4NumToStringClassC>>();
-    factory.registerFunction<FunctionIPv4StringToNum>();
     factory.registerFunction<FunctionIPv4ToIPv6>();
     factory.registerFunction<FunctionMACNumToString>();
     factory.registerFunction<FunctionMACStringTo<ParseMACImpl>>();
@@ -34,6 +29,23 @@ void registerFunctionsCoding(FunctionFactory & factory)
     factory.registerFunction<FunctionIPv4CIDRToRange>();
     factory.registerFunction<FunctionIsIPv4String>();
     factory.registerFunction<FunctionIsIPv6String>();
+
+    factory.registerFunction<FunctionIPv4NumToString<0, NameFunctionIPv4NumToString>>();
+    factory.registerFunction<FunctionIPv4NumToString<1, NameFunctionIPv4NumToStringClassC>>();
+    /// MysQL compatibility alias.
+    factory.registerFunction<FunctionIPv4NumToString<0, NameFunctionIPv4NumToString>>("INET_NTOA", FunctionFactory::CaseInsensitive);
+
+    factory.registerFunction<FunctionIPv4StringToNum>();
+    /// MysQL compatibility alias.
+    factory.registerFunction<FunctionIPv4StringToNum>("INET_ATON", FunctionFactory::CaseInsensitive);
+
+    factory.registerFunction<FunctionIPv6NumToString>();
+    /// MysQL compatibility alias.
+    factory.registerFunction<FunctionIPv6NumToString>("INET6_NTOA", FunctionFactory::CaseInsensitive);
+
+    factory.registerFunction<FunctionIPv6StringToNum>();
+    /// MysQL compatibility alias.
+    factory.registerFunction<FunctionIPv6StringToNum>("INET6_ATON", FunctionFactory::CaseInsensitive);
 }
 
 }

From dcd03eb15508db5e0ed37d5bc5a00cb8247ede26 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Fri, 22 Jan 2021 00:56:49 +0300
Subject: [PATCH 303/611] Remove useless file

---
 src/Common/bitonicSortKernels.cl | 1250 ------------------------------
 1 file changed, 1250 deletions(-)
 delete mode 100644 src/Common/bitonicSortKernels.cl

diff --git a/src/Common/bitonicSortKernels.cl b/src/Common/bitonicSortKernels.cl
deleted file mode 100644
index c124dfe85bc..00000000000
--- a/src/Common/bitonicSortKernels.cl
+++ /dev/null
@@ -1,1250 +0,0 @@
-// Copyright (c) 2009-2011 Intel Corporation
-// All rights reserved.
-//
-// WARRANTY DISCLAIMER
-//
-// THESE MATERIALS ARE PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR ITS
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) 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 OF THESE
-// MATERIALS, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Intel Corporation is the author of the Materials, and requests that all
-// problem reports or change requests be submitted to it directly
-
-static const char * bitonic_sort_kernels = R"(
-
-uchar4 makeMask_uchar(uchar4 srcLeft, uchar4 srcRight, uint4 indexLeft, uint4 indexRight)
-{
-    uchar4 mask = convert_uchar4(srcLeft < srcRight);
-
-    if (srcLeft.x == srcRight.x)
-        mask.x = (indexLeft.x < indexRight.x) ? UCHAR_MAX : 0;
-    if (srcLeft.y == srcRight.y)
-        mask.y = (indexLeft.y < indexRight.y) ? UCHAR_MAX : 0;
-    if (srcLeft.z == srcRight.z)
-        mask.z = (indexLeft.z < indexRight.z) ? UCHAR_MAX : 0;
-    if (srcLeft.w == srcRight.w)
-        mask.w = (indexLeft.w < indexRight.w) ? UCHAR_MAX : 0;
-
-    return mask;
-}
-
-
-char4 makeMask_char(char4 srcLeft, char4 srcRight, uint4 indexLeft, uint4 indexRight)
-{
-    char4 mask = srcLeft < srcRight;
-
-    if (srcLeft.x == srcRight.x)
-        mask.x = -(indexLeft.x < indexRight.x);
-    if (srcLeft.y == srcRight.y)
-        mask.y = -(indexLeft.y < indexRight.y);
-    if (srcLeft.z == srcRight.z)
-        mask.z = -(indexLeft.z < indexRight.z);
-    if (srcLeft.w == srcRight.w)
-        mask.w = -(indexLeft.w < indexRight.w);
-
-    return mask;
-}
-
-
-ushort4 makeMask_ushort(ushort4 srcLeft, ushort4 srcRight, uint4 indexLeft, uint4 indexRight)
-{
-    ushort4 mask = convert_ushort4(srcLeft < srcRight);
-
-    if (srcLeft.x == srcRight.x)
-        mask.x = (indexLeft.x < indexRight.x) ? USHRT_MAX : 0;
-    if (srcLeft.y == srcRight.y)
-        mask.y = (indexLeft.y < indexRight.y) ? USHRT_MAX : 0;
-    if (srcLeft.z == srcRight.z)
-        mask.z = (indexLeft.z < indexRight.z) ? USHRT_MAX : 0;
-    if (srcLeft.w == srcRight.w)
-        mask.w = (indexLeft.w < indexRight.w) ? USHRT_MAX : 0;
-
-    return mask;
-}
-
-
-short4 makeMask_short(short4 srcLeft, short4 srcRight, uint4 indexLeft, uint4 indexRight)
-{
-    short4 mask = srcLeft < srcRight;
-
-    if (srcLeft.x == srcRight.x)
-        mask.x = -(indexLeft.x < indexRight.x);
-    if (srcLeft.y == srcRight.y)
-        mask.y = -(indexLeft.y < indexRight.y);
-    if (srcLeft.z == srcRight.z)
-        mask.z = -(indexLeft.z < indexRight.z);
-    if (srcLeft.w == srcRight.w)
-        mask.w = -(indexLeft.w < indexRight.w);
-
-    return mask;
-}
-
-
-uint4 makeMask_uint(uint4 srcLeft, uint4 srcRight, uint4 indexLeft, uint4 indexRight)
-{
-    uint4 mask = convert_uint4(srcLeft < srcRight);
-
-    if (srcLeft.x == srcRight.x)
-        mask.x = (indexLeft.x < indexRight.x) ? UINT_MAX : 0;
-    if (srcLeft.y == srcRight.y)
-        mask.y = (indexLeft.y < indexRight.y) ? UINT_MAX : 0;
-    if (srcLeft.z == srcRight.z)
-        mask.z = (indexLeft.z < indexRight.z) ? UINT_MAX : 0;
-    if (srcLeft.w == srcRight.w)
-        mask.w = (indexLeft.w < indexRight.w) ? UINT_MAX : 0;
-
-    return mask;
-}
-
-
-int4 makeMask_int(int4 srcLeft, int4 srcRight, uint4 indexLeft, uint4 indexRight)
-{
-    int4 mask = srcLeft < srcRight;
-
-    if (srcLeft.x == srcRight.x)
-        mask.x = -(indexLeft.x < indexRight.x);
-    if (srcLeft.y == srcRight.y)
-        mask.y = -(indexLeft.y < indexRight.y);
-    if (srcLeft.z == srcRight.z)
-        mask.z = -(indexLeft.z < indexRight.z);
-    if (srcLeft.w == srcRight.w)
-        mask.w = -(indexLeft.w < indexRight.w);
-
-    return mask;
-}
-
-
-ulong4 makeMask_ulong(ulong4 srcLeft, ulong4 srcRight, uint4 indexLeft, uint4 indexRight)
-{
-    ulong4 mask = convert_ulong4(srcLeft < srcRight);
-
-    if (srcLeft.x == srcRight.x)
-        mask.x = (indexLeft.x < indexRight.x) ? ULONG_MAX : 0;
-    if (srcLeft.y == srcRight.y)
-        mask.y = (indexLeft.y < indexRight.y) ? ULONG_MAX : 0;
-    if (srcLeft.z == srcRight.z)
-        mask.z = (indexLeft.z < indexRight.z) ? ULONG_MAX : 0;
-    if (srcLeft.w == srcRight.w)
-        mask.w = (indexLeft.w < indexRight.w) ? ULONG_MAX : 0;
-
-    return mask;
-}
-
-
-long4 makeMask_long(long4 srcLeft, long4 srcRight, uint4 indexLeft, uint4 indexRight)
-{
-    long4 mask = srcLeft < srcRight;
-
-    if (srcLeft.x == srcRight.x)
-        mask.x = -(indexLeft.x < indexRight.x);
-    if (srcLeft.y == srcRight.y)
-        mask.y = -(indexLeft.y < indexRight.y);
-    if (srcLeft.z == srcRight.z)
-        mask.z = -(indexLeft.z < indexRight.z);
-    if (srcLeft.w == srcRight.w)
-        mask.w = -(indexLeft.w < indexRight.w);
-
-    return mask;
-}
-
-
-__kernel void __attribute__((vec_type_hint(char4))) __attribute__((vec_type_hint(uint4))) bitonicSort_char(__global char4 * theArray,
-                         __global uint4 * indices,
-                         const uint stage,
-                         const uint passOfStage,
-                         const uint dir)
-{
-    size_t i = get_global_id(0);
-    char4 srcLeft, srcRight, mask;
-    char4 imask10 = (char4)(0,  0, -1, -1);
-    char4 imask11 = (char4)(0, -1,  0, -1);
-    uint4 indexLeft, indexRight;
-
-    if (stage > 0)
-    {
-        if (passOfStage > 0)    // upper level pass, exchange between two fours
-        {
-            size_t r = 1 << (passOfStage - 1); // length of arrow
-            size_t lmask = r - 1;
-            size_t left = ((i >> (passOfStage - 1)) << passOfStage) + (i & lmask);
-            size_t right = left + r;
-
-            srcLeft = theArray[left];
-            srcRight = theArray[right];
-            indexLeft = indices[left];
-            indexRight = indices[right];
-
-            mask = makeMask_char(srcLeft, srcRight, indexLeft, indexRight);
-
-            char4 imin = (srcLeft & mask) | (srcRight & ~mask);
-            char4 imax = (srcLeft & ~mask) | (srcRight & mask);
-
-            if (((i >> (stage - 1)) & 1) ^ dir)
-            {
-                theArray[left]  = imin;
-                theArray[right] = imax;
-
-                indices[left] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indices[right] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-            else
-            {
-                theArray[right] = imin;
-                theArray[left]  = imax;
-
-                indices[right] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indices[left] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-        }
-        else    // last pass, sort inside one four
-        {
-            srcLeft = theArray[i];
-            srcRight = srcLeft.zwxy;
-            indexLeft = indices[i];
-            indexRight = indexLeft.zwxy;
-
-            mask = makeMask_char(srcLeft, srcRight, indexLeft, indexRight) ^ imask10;
-
-            if (((i >> stage) & 1) ^ dir)
-            {
-                srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-                srcRight = srcLeft.yxwz;
-                indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indexRight = indexLeft.yxwz;
-
-                mask = makeMask_char(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-                theArray[i] = (srcLeft & mask) | (srcRight & ~mask);
-                indices[i] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-            }
-            else
-            {
-                srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-                srcRight = srcLeft.yxwz;
-                indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-                indexRight = indexLeft.yxwz;
-
-                mask = makeMask_char(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-                theArray[i] = (srcLeft & ~mask) | (srcRight & mask);
-                indices[i] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-        }
-    }
-    else    // first stage, sort inside one four
-    {
-        char4 imask0 = (char4)(0, -1, -1,  0);
-
-        srcLeft = theArray[i];
-        srcRight = srcLeft.yxwz;
-        indexLeft = indices[i];
-        indexRight = indexLeft.yxwz;
-
-        mask = makeMask_char(srcLeft, srcRight, indexLeft, indexRight) ^ imask0;
-
-        if (dir)
-        {
-            srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-            indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-        } else
-        {
-            srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-            indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-        }
-
-        srcRight = srcLeft.zwxy;
-        indexRight = indexLeft.zwxy;
-        mask = makeMask_char(srcLeft, srcRight, indexLeft, indexRight) ^ imask10;
-
-        if ((i & 1) ^ dir)
-        {
-            srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-            srcRight = srcLeft.yxwz;
-            indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-            indexRight = indexLeft.yxwz;
-
-            mask = makeMask_char(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-            theArray[i] = (srcLeft & mask) | (srcRight & ~mask);
-            indices[i] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-        }
-        else
-        {
-            srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-            srcRight = srcLeft.yxwz;
-            indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            indexRight = indexLeft.yxwz;
-
-            mask = makeMask_char(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-            theArray[i] = (srcLeft & ~mask) | (srcRight & mask);
-            indices[i] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-        }
-    }
-}
-
-
-__kernel void /*__attribute__((vec_type_hint(uchar4)))*/ bitonicSort_uchar(__global uchar4 * theArray,
-                         __global uint4 * indices,
-                         const uint stage,
-                         const uint passOfStage,
-                         const uint dir)
-{
-    size_t i = get_global_id(0);
-    uchar4 srcLeft, srcRight, mask;
-    uchar4 imask10 = (uchar4)(0,  0, -1, -1);
-    uchar4 imask11 = (uchar4)(0, -1,  0, -1);
-    uint4 indexLeft, indexRight;
-
-    if (stage > 0)
-    {
-        if (passOfStage > 0)    // upper level pass, exchange between two fours
-        {
-            size_t r = 1 << (passOfStage - 1); // length of arrow
-            size_t lmask = r - 1;
-            size_t left = ((i >> (passOfStage - 1)) << passOfStage) + (i & lmask);
-            size_t right = left + r;
-
-            srcLeft = theArray[left];
-            srcRight = theArray[right];
-            indexLeft = indices[left];
-            indexRight = indices[right];
-
-            mask = makeMask_uchar(srcLeft, srcRight, indexLeft, indexRight);
-
-            uchar4 imin = (srcLeft & mask) | (srcRight & ~mask);
-            uchar4 imax = (srcLeft & ~mask) | (srcRight & mask);
-
-            if (((i >> (stage - 1)) & 1) ^ dir)
-            {
-                theArray[left]  = imin;
-                theArray[right] = imax;
-
-                indices[left] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indices[right] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-            else
-            {
-                theArray[right] = imin;
-                theArray[left]  = imax;
-
-                indices[right] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indices[left] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-        }
-        else    // last pass, sort inside one four
-        {
-            srcLeft = theArray[i];
-            srcRight = srcLeft.zwxy;
-            indexLeft = indices[i];
-            indexRight = indexLeft.zwxy;
-
-            mask = makeMask_uchar(srcLeft, srcRight, indexLeft, indexRight) ^ imask10;
-
-            if (((i >> stage) & 1) ^ dir)
-            {
-                srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-                srcRight = srcLeft.yxwz;
-                indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indexRight = indexLeft.yxwz;
-
-                mask = makeMask_uchar(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-                theArray[i] = (srcLeft & mask) | (srcRight & ~mask);
-                indices[i] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-            }
-            else
-            {
-                srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-                srcRight = srcLeft.yxwz;
-                indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-                indexRight = indexLeft.yxwz;
-
-                mask = makeMask_uchar(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-                theArray[i] = (srcLeft & ~mask) | (srcRight & mask);
-                indices[i] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-        }
-    }
-    else    // first stage, sort inside one four
-    {
-        uchar4 imask0 = (uchar4)(0, -1, -1,  0);
-
-        srcLeft = theArray[i];
-        srcRight = srcLeft.yxwz;
-        indexLeft = indices[i];
-        indexRight = indexLeft.yxwz;
-
-        mask = makeMask_uchar(srcLeft, srcRight, indexLeft, indexRight) ^ imask0;
-
-        if (dir) {
-            srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-            indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-        } else {
-            srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-            indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-        }
-
-        srcRight = srcLeft.zwxy;
-        indexRight = indexLeft.zwxy;
-        mask = makeMask_uchar(srcLeft, srcRight, indexLeft, indexRight) ^ imask10;
-
-        if ((i & 1) ^ dir)
-        {
-            srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-            srcRight = srcLeft.yxwz;
-            indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-            indexRight = indexLeft.yxwz;
-
-            mask = makeMask_uchar(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-            theArray[i] = (srcLeft & mask) | (srcRight & ~mask);
-            indices[i] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-        }
-        else
-        {
-            srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-            srcRight = srcLeft.yxwz;
-            indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            indexRight = indexLeft.yxwz;
-
-            mask = makeMask_uchar(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-            theArray[i] = (srcLeft & ~mask) | (srcRight & mask);
-            indices[i] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-        }
-    }
-}
-
-
-__kernel void /*__attribute__((vec_type_hint(short4)))*/ bitonicSort_short(__global short4 * theArray,
-                         __global uint4 * indices,
-                         const uint stage,
-                         const uint passOfStage,
-                         const uint dir)
-{
-    size_t i = get_global_id(0);
-    short4 srcLeft, srcRight, mask;
-    short4 imask10 = (short4)(0,  0, -1, -1);
-    short4 imask11 = (short4)(0, -1,  0, -1);
-    uint4 indexLeft, indexRight;
-
-    if (stage > 0)
-    {
-        if (passOfStage > 0)    // upper level pass, exchange between two fours
-        {
-            size_t r = 1 << (passOfStage - 1); // length of arrow
-            size_t lmask = r - 1;
-            size_t left = ((i >> (passOfStage - 1)) << passOfStage) + (i & lmask);
-            size_t right = left + r;
-
-            srcLeft = theArray[left];
-            srcRight = theArray[right];
-            indexLeft = indices[left];
-            indexRight = indices[right];
-
-            mask = makeMask_short(srcLeft, srcRight, indexLeft, indexRight);
-
-            short4 imin = (srcLeft & mask) | (srcRight & ~mask);
-            short4 imax = (srcLeft & ~mask) | (srcRight & mask);
-
-            if (((i >> (stage - 1)) & 1) ^ dir)
-            {
-                theArray[left]  = imin;
-                theArray[right] = imax;
-
-                indices[left] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indices[right] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-            else
-            {
-                theArray[right] = imin;
-                theArray[left]  = imax;
-
-                indices[right] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indices[left] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-        }
-        else    // last pass, sort inside one four
-        {
-            srcLeft = theArray[i];
-            srcRight = srcLeft.zwxy;
-            indexLeft = indices[i];
-            indexRight = indexLeft.zwxy;
-
-            mask = makeMask_short(srcLeft, srcRight, indexLeft, indexRight) ^ imask10;
-
-            if (((i >> stage) & 1) ^ dir)
-            {
-                srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-                srcRight = srcLeft.yxwz;
-                indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indexRight = indexLeft.yxwz;
-
-                mask = makeMask_short(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-                theArray[i] = (srcLeft & mask) | (srcRight & ~mask);
-                indices[i] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-            }
-            else
-            {
-                srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-                srcRight = srcLeft.yxwz;
-                indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-                indexRight = indexLeft.yxwz;
-
-                mask = makeMask_short(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-                theArray[i] = (srcLeft & ~mask) | (srcRight & mask);
-                indices[i] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-        }
-    }
-    else    // first stage, sort inside one four
-    {
-        short4 imask0 = (short4)(0, -1, -1,  0);
-
-        srcLeft = theArray[i];
-        srcRight = srcLeft.yxwz;
-        indexLeft = indices[i];
-        indexRight = indexLeft.yxwz;
-
-        mask = makeMask_short(srcLeft, srcRight, indexLeft, indexRight) ^ imask0;
-
-        if (dir)
-        {
-            srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-            indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-        }
-        else
-        {
-            srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-            indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-        }
-
-        srcRight = srcLeft.zwxy;
-        indexRight = indexLeft.zwxy;
-        mask = makeMask_short(srcLeft, srcRight, indexLeft, indexRight) ^ imask10;
-
-        if ((i & 1) ^ dir)
-        {
-            srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-            srcRight = srcLeft.yxwz;
-            indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-            indexRight = indexLeft.yxwz;
-
-            mask = makeMask_short(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-            theArray[i] = (srcLeft & mask) | (srcRight & ~mask);
-            indices[i] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-        }
-        else
-        {
-            srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-            srcRight = srcLeft.yxwz;
-            indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            indexRight = indexLeft.yxwz;
-
-            mask = makeMask_short(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-            theArray[i] = (srcLeft & ~mask) | (srcRight & mask);
-            indices[i] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-        }
-    }
-}
-
-
-__kernel void /*__attribute__((vec_type_hint(ushort4)))*/ bitonicSort_ushort(__global ushort4 * theArray,
-                         __global uint4 * indices,
-                         const uint stage,
-                         const uint passOfStage,
-                         const uint dir)
-{
-    size_t i = get_global_id(0);
-    ushort4 srcLeft, srcRight, mask;
-    ushort4 imask10 = (ushort4)(0,  0, -1, -1);
-    ushort4 imask11 = (ushort4)(0, -1,  0, -1);
-    uint4 indexLeft, indexRight;
-
-    if (stage > 0)
-    {
-        if (passOfStage > 0)    // upper level pass, exchange between two fours
-        {
-            size_t r = 1 << (passOfStage - 1); // length of arrow
-            size_t lmask = r - 1;
-            size_t left = ((i >> (passOfStage - 1)) << passOfStage) + (i & lmask);
-            size_t right = left + r;
-
-            srcLeft = theArray[left];
-            srcRight = theArray[right];
-            indexLeft = indices[left];
-            indexRight = indices[right];
-
-            mask = makeMask_ushort(srcLeft, srcRight, indexLeft, indexRight);
-
-            ushort4 imin = (srcLeft & mask) | (srcRight & ~mask);
-            ushort4 imax = (srcLeft & ~mask) | (srcRight & mask);
-
-            if (((i >> (stage - 1)) & 1) ^ dir)
-            {
-                theArray[left]  = imin;
-                theArray[right] = imax;
-
-                indices[left] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indices[right] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-            else
-            {
-                theArray[right] = imin;
-                theArray[left]  = imax;
-
-                indices[right] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indices[left] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-        }
-        else    // last pass, sort inside one four
-        {
-            srcLeft = theArray[i];
-            srcRight = srcLeft.zwxy;
-            indexLeft = indices[i];
-            indexRight = indexLeft.zwxy;
-
-            mask = makeMask_ushort(srcLeft, srcRight, indexLeft, indexRight) ^ imask10;
-
-            if (((i >> stage) & 1) ^ dir)
-            {
-                srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-                srcRight = srcLeft.yxwz;
-                indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indexRight = indexLeft.yxwz;
-
-                mask = makeMask_ushort(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-                theArray[i] = (srcLeft & mask) | (srcRight & ~mask);
-                indices[i] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-            }
-            else
-            {
-                srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-                srcRight = srcLeft.yxwz;
-                indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-                indexRight = indexLeft.yxwz;
-
-                mask = makeMask_ushort(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-                theArray[i] = (srcLeft & ~mask) | (srcRight & mask);
-                indices[i] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-        }
-    }
-    else    // first stage, sort inside one four
-    {
-        ushort4 imask0 = (ushort4)(0, -1, -1,  0);
-
-        srcLeft = theArray[i];
-        srcRight = srcLeft.yxwz;
-        indexLeft = indices[i];
-        indexRight = indexLeft.yxwz;
-
-        mask = makeMask_ushort(srcLeft, srcRight, indexLeft, indexRight) ^ imask0;
-
-        if (dir) {
-            srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-            indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-        } else {
-            srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-            indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-        }
-
-        srcRight = srcLeft.zwxy;
-        indexRight = indexLeft.zwxy;
-        mask = makeMask_ushort(srcLeft, srcRight, indexLeft, indexRight) ^ imask10;
-
-        if ((i & 1) ^ dir)
-        {
-            srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-            srcRight = srcLeft.yxwz;
-            indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-            indexRight = indexLeft.yxwz;
-
-            mask = makeMask_ushort(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-            theArray[i] = (srcLeft & mask) | (srcRight & ~mask);
-            indices[i] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-        }
-        else
-        {
-            srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-            srcRight = srcLeft.yxwz;
-            indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            indexRight = indexLeft.yxwz;
-
-            mask = makeMask_ushort(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-            theArray[i] = (srcLeft & ~mask) | (srcRight & mask);
-            indices[i] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-        }
-    }
-}
-
-
-__kernel void /*__attribute__((vec_type_hint(int4)))*/ bitonicSort_int(__global int4 * theArray,
-                         __global uint4 * indices,
-                         const uint stage,
-                         const uint passOfStage,
-                         const uint dir)
-{
-
-    size_t i = get_global_id(0);
-    int4 srcLeft, srcRight, mask;
-    int4 imask10 = (int4)(0,  0, -1, -1);
-    int4 imask11 = (int4)(0, -1,  0, -1);
-    uint4 indexLeft, indexRight;
-
-    int random_id = (i * 5 + stage * 42 + passOfStage * 47 + dir * 88) % 100;
-
-    if (stage > 0)
-    {
-        if (passOfStage > 0)    // upper level pass, exchange between two fours
-        {
-            size_t r = 1 << (passOfStage - 1); // length of arrow
-            size_t lmask = r - 1;
-            size_t left = ((i >> (passOfStage - 1)) << passOfStage) + (i & lmask);
-            size_t right = left + r;
-
-            srcLeft = theArray[left];
-            srcRight = theArray[right];
-            indexLeft = indices[left];
-            indexRight = indices[right];
-
-            mask = makeMask_int(srcLeft, srcRight, indexLeft, indexRight);
-
-            int4 imin = (srcLeft & mask) | (srcRight & ~mask);
-            int4 imax = (srcLeft & ~mask) | (srcRight & mask);
-
-            if (((i >> (stage - 1)) & 1) ^ dir)
-            {
-                theArray[left]  = imin;
-                theArray[right] = imax;
-
-                indices[left] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indices[right] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-            else
-            {
-                theArray[right] = imin;
-                theArray[left]  = imax;
-
-                indices[right] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indices[left] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-        }
-        else    // last pass, sort inside one four
-        {
-            srcLeft = theArray[i];
-            srcRight = srcLeft.zwxy;
-            indexLeft = indices[i];
-            indexRight = indexLeft.zwxy;
-
-            mask = makeMask_int(srcLeft, srcRight, indexLeft, indexRight) ^ imask10;
-
-            if (((i >> stage) & 1) ^ dir)
-            {
-                srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-                srcRight = srcLeft.yxwz;
-                indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indexRight = indexLeft.yxwz;
-
-                mask = makeMask_int(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-                theArray[i] = (srcLeft & mask) | (srcRight & ~mask);
-                indices[i] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-            }
-            else
-            {
-                srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-                srcRight = srcLeft.yxwz;
-                indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-                indexRight = indexLeft.yxwz;
-
-                mask = makeMask_int(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-                theArray[i] = (srcLeft & ~mask) | (srcRight & mask);
-                indices[i] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-        }
-    }
-    else    // first stage, sort inside one four
-    {
-        int4 imask0 = (int4)(0, -1, -1,  0);
-
-        srcLeft = theArray[i];
-        srcRight = srcLeft.yxwz;
-        indexLeft = indices[i];
-        indexRight = indexLeft.yxwz;
-
-        mask = makeMask_int(srcLeft, srcRight, indexLeft, indexRight) ^ imask0;
-
-        if (dir)
-        {
-            srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-            indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-        }
-        else
-        {
-            srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-            indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-        }
-
-        srcRight = srcLeft.zwxy;
-        indexRight = indexLeft.zwxy;
-        mask = makeMask_int(srcLeft, srcRight, indexLeft, indexRight) ^ imask10;
-
-        if ((i & 1) ^ dir)
-        {
-            srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-            srcRight = srcLeft.yxwz;
-            indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-            indexRight = indexLeft.yxwz;
-
-            mask = makeMask_int(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-            theArray[i] = (srcLeft & mask) | (srcRight & ~mask);
-            indices[i] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-        }
-        else
-        {
-            srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-            srcRight = srcLeft.yxwz;
-            indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            indexRight = indexLeft.yxwz;
-
-            mask = makeMask_int(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-            theArray[i] = (srcLeft & ~mask) | (srcRight & mask);
-            indices[i] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-        }
-    }
-}
-
-
-__kernel void /*__attribute__((vec_type_hint(uint4)))*/ bitonicSort_uint(__global uint4 * theArray,
-                         __global uint4 * indices,
-                         const uint stage,
-                         const uint passOfStage,
-                         const uint dir)
-{
-    size_t i = get_global_id(0);
-    uint4 srcLeft, srcRight, mask;
-    uint4 imask10 = (uint4)(0,  0, -1, -1);
-    uint4 imask11 = (uint4)(0, -1,  0, -1);
-    uint4 indexLeft, indexRight;
-
-    if (stage > 0)
-    {
-        if (passOfStage > 0)    // upper level pass, exchange between two fours
-        {
-            size_t r = 1 << (passOfStage - 1); // length of arrow
-            size_t lmask = r - 1;
-            size_t left = ((i >> (passOfStage - 1)) << passOfStage) + (i & lmask);
-            size_t right = left + r;
-
-            srcLeft = theArray[left];
-            srcRight = theArray[right];
-            indexLeft = indices[left];
-            indexRight = indices[right];
-
-            mask = makeMask_uint(srcLeft, srcRight, indexLeft, indexRight);
-
-            uint4 imin = (srcLeft & mask) | (srcRight & ~mask);
-            uint4 imax = (srcLeft & ~mask) | (srcRight & mask);
-
-            if (((i >> (stage - 1)) & 1) ^ dir)
-            {
-                theArray[left]  = imin;
-                theArray[right] = imax;
-
-                indices[left] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indices[right] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-            else
-            {
-                theArray[right] = imin;
-                theArray[left]  = imax;
-
-                indices[right] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indices[left] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-        }
-        else    // last pass, sort inside one four
-        {
-            srcLeft = theArray[i];
-            srcRight = srcLeft.zwxy;
-            indexLeft = indices[i];
-            indexRight = indexLeft.zwxy;
-
-            mask = makeMask_uint(srcLeft, srcRight, indexLeft, indexRight) ^ imask10;
-
-            if (((i >> stage) & 1) ^ dir)
-            {
-                srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-                srcRight = srcLeft.yxwz;
-                indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indexRight = indexLeft.yxwz;
-
-                mask = makeMask_uint(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-                theArray[i] = (srcLeft & mask) | (srcRight & ~mask);
-                indices[i] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-            }
-            else
-            {
-                srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-                srcRight = srcLeft.yxwz;
-                indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-                indexRight = indexLeft.yxwz;
-
-                mask = makeMask_uint(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-                theArray[i] = (srcLeft & ~mask) | (srcRight & mask);
-                indices[i] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-        }
-    }
-    else    // first stage, sort inside one four
-    {
-        uint4 imask0 = (uint4)(0, -1, -1,  0);
-
-        srcLeft = theArray[i];
-        srcRight = srcLeft.yxwz;
-        indexLeft = indices[i];
-        indexRight = indexLeft.yxwz;
-
-        mask = makeMask_uint(srcLeft, srcRight, indexLeft, indexRight) ^ imask0;
-
-        if (dir)
-        {
-            srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-            indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-        }
-        else
-        {
-            srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-            indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-        }
-
-        srcRight = srcLeft.zwxy;
-        indexRight = indexLeft.zwxy;
-        mask = makeMask_uint(srcLeft, srcRight, indexLeft, indexRight) ^ imask10;
-
-        if ((i & 1) ^ dir)
-        {
-            srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-            srcRight = srcLeft.yxwz;
-            indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-            indexRight = indexLeft.yxwz;
-
-            mask = makeMask_uint(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-            theArray[i] = (srcLeft & mask) | (srcRight & ~mask);
-            indices[i] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-        }
-        else
-        {
-            srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-            srcRight = srcLeft.yxwz;
-            indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            indexRight = indexLeft.yxwz;
-
-            mask = makeMask_uint(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-            theArray[i] = (srcLeft & ~mask) | (srcRight & mask);
-            indices[i] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-        }
-    }
-}
-
-
-__kernel void /*__attribute__((vec_type_hint(long4)))*/ bitonicSort_long(__global long4 * theArray,
-                         __global uint4 * indices,
-                         const uint stage,
-                         const uint passOfStage,
-                         const uint dir)
-{
-    size_t i = get_global_id(0);
-    long4 srcLeft, srcRight, mask;
-    long4 imask10 = (long4)(0,  0, -1, -1);
-    long4 imask11 = (long4)(0, -1,  0, -1);
-    uint4 indexLeft, indexRight;
-
-    if (stage > 0)
-    {
-        if (passOfStage > 0)    // upper level pass, exchange between two fours
-        {
-            size_t r = 1 << (passOfStage - 1); // length of arrow
-            size_t lmask = r - 1;
-            size_t left = ((i >> (passOfStage - 1)) << passOfStage) + (i & lmask);
-            size_t right = left + r;
-
-            srcLeft = theArray[left];
-            srcRight = theArray[right];
-            indexLeft = indices[left];
-            indexRight = indices[right];
-
-            mask = makeMask_long(srcLeft, srcRight, indexLeft, indexRight);
-
-            long4 imin = (srcLeft & mask) | (srcRight & ~mask);
-            long4 imax = (srcLeft & ~mask) | (srcRight & mask);
-
-            if (((i >> (stage - 1)) & 1) ^ dir)
-            {
-                theArray[left]  = imin;
-                theArray[right] = imax;
-
-                indices[left] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indices[right] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-            else
-            {
-                theArray[right] = imin;
-                theArray[left]  = imax;
-
-                indices[right] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indices[left] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-        }
-        else    // last pass, sort inside one four
-        {
-            srcLeft = theArray[i];
-            srcRight = srcLeft.zwxy;
-            indexLeft = indices[i];
-            indexRight = indexLeft.zwxy;
-
-            mask = makeMask_long(srcLeft, srcRight, indexLeft, indexRight) ^ imask10;
-
-            if (((i >> stage) & 1) ^ dir)
-            {
-                srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-                srcRight = srcLeft.yxwz;
-                indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indexRight = indexLeft.yxwz;
-
-                mask = makeMask_long(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-                theArray[i] = (srcLeft & mask) | (srcRight & ~mask);
-                indices[i] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-            }
-            else
-            {
-                srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-                srcRight = srcLeft.yxwz;
-                indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-                indexRight = indexLeft.yxwz;
-
-                mask = makeMask_long(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-                theArray[i] = (srcLeft & ~mask) | (srcRight & mask);
-                indices[i] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-        }
-    }
-    else    // first stage, sort inside one four
-    {
-        long4 imask0 = (long4)(0, -1, -1,  0);
-
-        srcLeft = theArray[i];
-        srcRight = srcLeft.yxwz;
-        indexLeft = indices[i];
-        indexRight = indexLeft.yxwz;
-
-        mask = makeMask_long(srcLeft, srcRight, indexLeft, indexRight) ^ imask0;
-
-        if (dir)
-        {
-            srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-            indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-        }
-        else
-        {
-            srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-            indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-        }
-
-        srcRight = srcLeft.zwxy;
-        indexRight = indexLeft.zwxy;
-        mask = makeMask_long(srcLeft, srcRight, indexLeft, indexRight) ^ imask10;
-
-        if ((i & 1) ^ dir)
-        {
-            srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-            srcRight = srcLeft.yxwz;
-            indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-            indexRight = indexLeft.yxwz;
-
-            mask = makeMask_long(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-            theArray[i] = (srcLeft & mask) | (srcRight & ~mask);
-            indices[i] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-        }
-        else
-        {
-            srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-            srcRight = srcLeft.yxwz;
-            indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            indexRight = indexLeft.yxwz;
-
-            mask = makeMask_long(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-            theArray[i] = (srcLeft & ~mask) | (srcRight & mask);
-            indices[i] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-        }
-    }
-}
-
-
-__kernel void /*__attribute__((vec_type_hint(ulong4)))*/ bitonicSort_ulong(__global ulong4 * theArray,
-                         __global uint4 * indices,
-                         const uint stage,
-                         const uint passOfStage,
-                         const uint dir)
-{
-    size_t i = get_global_id(0);
-    ulong4 srcLeft, srcRight, mask;
-    ulong4 imask10 = (ulong4)(0,  0, -1, -1);
-    ulong4 imask11 = (ulong4)(0, -1,  0, -1);
-    uint4 indexLeft, indexRight;
-
-    if (stage > 0)
-    {
-        if (passOfStage > 0)    // upper level pass, exchange between two fours
-        {
-            size_t r = 1 << (passOfStage - 1); // length of arrow
-            size_t lmask = r - 1;
-            size_t left = ((i >> (passOfStage - 1)) << passOfStage) + (i & lmask);
-            size_t right = left + r;
-
-            srcLeft = theArray[left];
-            srcRight = theArray[right];
-            indexLeft = indices[left];
-            indexRight = indices[right];
-
-            mask = makeMask_ulong(srcLeft, srcRight, indexLeft, indexRight);
-
-            ulong4 imin = (srcLeft & mask) | (srcRight & ~mask);
-            ulong4 imax = (srcLeft & ~mask) | (srcRight & mask);
-
-            if (((i >> (stage - 1)) & 1) ^ dir)
-            {
-                theArray[left]  = imin;
-                theArray[right] = imax;
-
-                indices[left] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indices[right] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-            else
-            {
-                theArray[right] = imin;
-                theArray[left]  = imax;
-
-                indices[right] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indices[left] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-        }
-        else    // last pass, sort inside one four
-        {
-            srcLeft = theArray[i];
-            srcRight = srcLeft.zwxy;
-            indexLeft = indices[i];
-            indexRight = indexLeft.zwxy;
-
-            mask = makeMask_ulong(srcLeft, srcRight, indexLeft, indexRight) ^ imask10;
-
-            if (((i >> stage) & 1) ^ dir)
-            {
-                srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-                srcRight = srcLeft.yxwz;
-                indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-                indexRight = indexLeft.yxwz;
-
-                mask = makeMask_ulong(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-                theArray[i] = (srcLeft & mask) | (srcRight & ~mask);
-                indices[i] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-            }
-            else
-            {
-                srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-                srcRight = srcLeft.yxwz;
-                indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-                indexRight = indexLeft.yxwz;
-
-                mask = makeMask_ulong(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-                theArray[i] = (srcLeft & ~mask) | (srcRight & mask);
-                indices[i] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            }
-        }
-    }
-    else    // first stage, sort inside one four
-    {
-        ulong4 imask0 = (ulong4)(0, -1, -1,  0);
-
-        srcLeft = theArray[i];
-        srcRight = srcLeft.yxwz;
-        indexLeft = indices[i];
-        indexRight = indexLeft.yxwz;
-
-        mask = makeMask_ulong(srcLeft, srcRight, indexLeft, indexRight) ^ imask0;
-
-        if (dir)
-        {
-            srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-            indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-        }
-        else
-        {
-            srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-            indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-        }
-
-        srcRight = srcLeft.zwxy;
-        indexRight = indexLeft.zwxy;
-        mask = makeMask_ulong(srcLeft, srcRight, indexLeft, indexRight) ^ imask10;
-
-        if ((i & 1) ^ dir)
-        {
-            srcLeft = (srcLeft & mask) | (srcRight & ~mask);
-            srcRight = srcLeft.yxwz;
-            indexLeft = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-            indexRight = indexLeft.yxwz;
-
-            mask = makeMask_ulong(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-            theArray[i] = (srcLeft & mask) | (srcRight & ~mask);
-            indices[i] = (indexLeft & convert_uint4(mask)) | (indexRight & convert_uint4(~mask));
-        }
-        else
-        {
-            srcLeft = (srcLeft & ~mask) | (srcRight & mask);
-            srcRight = srcLeft.yxwz;
-            indexLeft = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-            indexRight = indexLeft.yxwz;
-
-            mask = makeMask_ulong(srcLeft, srcRight, indexLeft, indexRight) ^ imask11;
-
-            theArray[i] = (srcLeft & ~mask) | (srcRight & mask);
-            indices[i] = (indexLeft & convert_uint4(~mask)) | (indexRight & convert_uint4(mask));
-        }
-    }
-}
-
-)";

From 960d149e0bef08207ef6be7795e33bfc0b063328 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Fri, 22 Jan 2021 01:05:04 +0300
Subject: [PATCH 304/611] More annotations

---
 src/AggregateFunctions/AggregateFunctionAvg.h | 6 +++---
 src/AggregateFunctions/AggregateFunctionSum.h | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/AggregateFunctions/AggregateFunctionAvg.h b/src/AggregateFunctions/AggregateFunctionAvg.h
index 051a815d8dc..1b7b9320d01 100644
--- a/src/AggregateFunctions/AggregateFunctionAvg.h
+++ b/src/AggregateFunctions/AggregateFunctionAvg.h
@@ -98,7 +98,7 @@ public:
 
     DataTypePtr getReturnType() const final { return std::make_shared<DataTypeNumber<Float64>>(); }
 
-    void merge(AggregateDataPtr place, ConstAggregateDataPtr rhs, Arena *) const override
+    void NO_SANITIZE_UNDEFINED merge(AggregateDataPtr place, ConstAggregateDataPtr rhs, Arena *) const override
     {
         this->data(place).numerator += this->data(rhs).numerator;
         this->data(place).denominator += this->data(rhs).denominator;
@@ -137,12 +137,12 @@ private:
     UInt32 denom_scale;
 };
 
-template <class T>
+template <typename T>
 using AvgFieldType = std::conditional_t<IsDecimalNumber<T>,
     std::conditional_t<std::is_same_v<T, Decimal256>, Decimal256, Decimal128>,
     NearestFieldType<T>>;
 
-template <class T>
+template <typename T>
 class AggregateFunctionAvg final : public AggregateFunctionAvgBase<AvgFieldType<T>, UInt64, AggregateFunctionAvg<T>>
 {
 public:
diff --git a/src/AggregateFunctions/AggregateFunctionSum.h b/src/AggregateFunctions/AggregateFunctionSum.h
index 1038c8107a5..81239064169 100644
--- a/src/AggregateFunctions/AggregateFunctionSum.h
+++ b/src/AggregateFunctions/AggregateFunctionSum.h
@@ -20,14 +20,14 @@ struct AggregateFunctionSumData
 {
     T sum{};
 
-    void ALWAYS_INLINE add(T value)
+    void NO_SANITIZE_UNDEFINED ALWAYS_INLINE add(T value)
     {
         sum += value;
     }
 
     /// Vectorized version
     template <typename Value>
-    void NO_INLINE addMany(const Value * __restrict ptr, size_t count)
+    void NO_SANITIZE_UNDEFINED NO_INLINE addMany(const Value * __restrict ptr, size_t count)
     {
         const auto * end = ptr + count;
 
@@ -64,7 +64,7 @@ struct AggregateFunctionSumData
     }
 
     template <typename Value>
-    void NO_INLINE addManyNotNull(const Value * __restrict ptr, const UInt8 * __restrict null_map, size_t count)
+    void NO_SANITIZE_UNDEFINED NO_INLINE addManyNotNull(const Value * __restrict ptr, const UInt8 * __restrict null_map, size_t count)
     {
         const auto * end = ptr + count;
 
@@ -99,7 +99,7 @@ struct AggregateFunctionSumData
         sum += local_sum;
     }
 
-    void merge(const AggregateFunctionSumData & rhs)
+    void NO_SANITIZE_UNDEFINED merge(const AggregateFunctionSumData & rhs)
     {
         sum += rhs.sum;
     }

From b0fca03d79fed83f4d3bee2344641b06531baef6 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <36882414+akuzm@users.noreply.github.com>
Date: Fri, 22 Jan 2021 01:13:48 +0300
Subject: [PATCH 305/611] Update run-fuzzer.sh

---
 docker/test/fuzzer/run-fuzzer.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index 200c7b6f4ce..0a282133690 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -75,7 +75,7 @@ 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 origin/master "$SHA_TO_TEST" | grep -P 'tests/queries/0_stateless/.*\.sql' | sed -r -e 's!^!ch/!' | sort -R)
+    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 ..
     if [[ -n "$NEW_TESTS" ]]
     then

From 056b44b64f3c8f6600cf3df0a1da24b9d46dde14 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Fri, 22 Jan 2021 01:49:37 +0300
Subject: [PATCH 306/611] Add a test

---
 src/AggregateFunctions/AggregateFunctionAvg.h       | 8 ++++----
 tests/queries/0_stateless/01660_sum_ubsan.reference | 4 ++++
 tests/queries/0_stateless/01660_sum_ubsan.sql       | 6 ++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/AggregateFunctions/AggregateFunctionAvg.h b/src/AggregateFunctions/AggregateFunctionAvg.h
index 1b7b9320d01..e2f912cc320 100644
--- a/src/AggregateFunctions/AggregateFunctionAvg.h
+++ b/src/AggregateFunctions/AggregateFunctionAvg.h
@@ -12,10 +12,10 @@
 
 namespace DB
 {
-template <class T>
+template <typename T>
 using DecimalOrVectorCol = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
 
-template <class T> constexpr bool DecimalOrExtendedInt =
+template <typename T> constexpr bool DecimalOrExtendedInt =
     IsDecimalNumber<T>
     || std::is_same_v<T, Int128>
     || std::is_same_v<T, Int256>
@@ -25,7 +25,7 @@ template <class T> constexpr bool DecimalOrExtendedInt =
 /**
  * Helper class to encapsulate values conversion for avg and avgWeighted.
  */
-template <class Numerator, class Denominator>
+template <typename Numerator, typename Denominator>
 struct AvgFraction
 {
     Numerator numerator{0};
@@ -84,7 +84,7 @@ struct AvgFraction
  * @tparam Derived When deriving from this class, use the child class name as in CRTP, e.g.
  *         class Self : Agg<char, bool, bool, Self>.
  */
-template <class Numerator, class Denominator, class Derived>
+template <typename Numerator, typename Denominator, typename Derived>
 class AggregateFunctionAvgBase : public
         IAggregateFunctionDataHelper<AvgFraction<Numerator, Denominator>, Derived>
 {
diff --git a/tests/queries/0_stateless/01660_sum_ubsan.reference b/tests/queries/0_stateless/01660_sum_ubsan.reference
index 6878a2eb73b..c2ff9f590d5 100644
--- a/tests/queries/0_stateless/01660_sum_ubsan.reference
+++ b/tests/queries/0_stateless/01660_sum_ubsan.reference
@@ -1 +1,5 @@
 4233720368547758080
+384883669867978000
+4233720368547758080
+384883669867978000
+-88000000000000000000
diff --git a/tests/queries/0_stateless/01660_sum_ubsan.sql b/tests/queries/0_stateless/01660_sum_ubsan.sql
index 63c3122a519..1d544324f77 100644
--- a/tests/queries/0_stateless/01660_sum_ubsan.sql
+++ b/tests/queries/0_stateless/01660_sum_ubsan.sql
@@ -1,3 +1,9 @@
 -- Aggregate function 'sum' allows overflow with two's complement arithmetics.
 -- This contradicts the standard SQL semantic and we are totally fine with it.
 SELECT sum(-8000000000000000000) FROM numbers(11);
+SELECT avg(-8000000000000000000) FROM numbers(11);
+
+SELECT sum(-8000000000000000000) FROM remote('127.0.0.{1,2,3,4,5,6,7,8,9,10,11}', system.one);
+SELECT avg(-8000000000000000000) FROM remote('127.0.0.{1,2,3,4,5,6,7,8,9,10,11}', system.one);
+
+SELECT sumKahan(-8000000000000000000) FROM numbers(11);

From afc6f2fd8e65d989a0c9305930c57310959dc76e Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Fri, 22 Jan 2021 01:55:45 +0300
Subject: [PATCH 307/611] Add http_referer to client info

---
 cmake/autogenerated_versions.txt                  | 2 +-
 src/Core/Defines.h                                | 3 ++-
 src/Interpreters/ClientInfo.cpp                   | 6 ++++++
 src/Interpreters/ClientInfo.h                     | 1 +
 src/Interpreters/QueryLog.cpp                     | 2 ++
 src/Interpreters/QueryThreadLog.cpp               | 1 +
 src/Server/HTTPHandler.cpp                        | 1 +
 src/Storages/System/StorageSystemProcesses.cpp    | 2 ++
 tests/queries/0_stateless/01661_referer.reference | 2 ++
 tests/queries/0_stateless/01661_referer.sh        | 9 +++++++++
 10 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 tests/queries/0_stateless/01661_referer.reference
 create mode 100755 tests/queries/0_stateless/01661_referer.sh

diff --git a/cmake/autogenerated_versions.txt b/cmake/autogenerated_versions.txt
index 1c2e4c1f55e..5d643cc4bee 100644
--- a/cmake/autogenerated_versions.txt
+++ b/cmake/autogenerated_versions.txt
@@ -1,5 +1,5 @@
 # This strings autochanged from release_lib.sh:
-SET(VERSION_REVISION 54446)
+SET(VERSION_REVISION 54447)
 SET(VERSION_MAJOR 21)
 SET(VERSION_MINOR 2)
 SET(VERSION_PATCH 1)
diff --git a/src/Core/Defines.h b/src/Core/Defines.h
index f1cd1a8a708..fdf250a6dd1 100644
--- a/src/Core/Defines.h
+++ b/src/Core/Defines.h
@@ -74,9 +74,10 @@
 #define DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET 54441
 
 #define DBMS_MIN_REVISION_WITH_X_FORWARDED_FOR_IN_CLIENT_INFO 54443
+#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 54443
+#define DBMS_TCP_PROTOCOL_VERSION 54447
 
 /// The boundary on which the blocks for asynchronous file operations should be aligned.
 #define DEFAULT_AIO_FILE_BLOCK_SIZE 4096
diff --git a/src/Interpreters/ClientInfo.cpp b/src/Interpreters/ClientInfo.cpp
index 30aa8a0c692..5449f397f49 100644
--- a/src/Interpreters/ClientInfo.cpp
+++ b/src/Interpreters/ClientInfo.cpp
@@ -52,6 +52,9 @@ void ClientInfo::write(WriteBuffer & out, const UInt64 server_protocol_revision)
 
         if (server_protocol_revision >= DBMS_MIN_REVISION_WITH_X_FORWARDED_FOR_IN_CLIENT_INFO)
             writeBinary(forwarded_for, out);
+
+        if (server_protocol_revision >= DBMS_MIN_REVISION_WITH_REFERER_IN_CLIENT_INFO)
+            writeBinary(http_referer, out);
     }
 
     if (server_protocol_revision >= DBMS_MIN_REVISION_WITH_QUOTA_KEY_IN_CLIENT_INFO)
@@ -126,6 +129,9 @@ void ClientInfo::read(ReadBuffer & in, const UInt64 client_protocol_revision)
 
         if (client_protocol_revision >= DBMS_MIN_REVISION_WITH_X_FORWARDED_FOR_IN_CLIENT_INFO)
             readBinary(forwarded_for, in);
+
+        if (client_protocol_revision >= DBMS_MIN_REVISION_WITH_REFERER_IN_CLIENT_INFO)
+            readBinary(http_referer, in);
     }
 
     if (client_protocol_revision >= DBMS_MIN_REVISION_WITH_QUOTA_KEY_IN_CLIENT_INFO)
diff --git a/src/Interpreters/ClientInfo.h b/src/Interpreters/ClientInfo.h
index e188420d607..d2b7beb7d8c 100644
--- a/src/Interpreters/ClientInfo.h
+++ b/src/Interpreters/ClientInfo.h
@@ -82,6 +82,7 @@ public:
     /// For http
     HTTPMethod http_method = HTTPMethod::UNKNOWN;
     String http_user_agent;
+    String http_referer;
 
     /// 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.
diff --git a/src/Interpreters/QueryLog.cpp b/src/Interpreters/QueryLog.cpp
index 78c4072cd4c..3142e9af76d 100644
--- a/src/Interpreters/QueryLog.cpp
+++ b/src/Interpreters/QueryLog.cpp
@@ -86,6 +86,7 @@ Block QueryLogElement::createBlock()
         {std::make_shared<DataTypeUInt32>(),                                  "client_version_patch"},
         {std::make_shared<DataTypeUInt8>(),                                   "http_method"},
         {std::make_shared<DataTypeString>(),                                  "http_user_agent"},
+        {std::make_shared<DataTypeString>(),                                  "http_referer"},
         {std::make_shared<DataTypeString>(),                                  "forwarded_for"},
         {std::make_shared<DataTypeString>(),                                  "quota_key"},
 
@@ -214,6 +215,7 @@ void QueryLogElement::appendClientInfo(const ClientInfo & client_info, MutableCo
 
     columns[i++]->insert(UInt64(client_info.http_method));
     columns[i++]->insert(client_info.http_user_agent);
+    columns[i++]->insert(client_info.http_referer);
     columns[i++]->insert(client_info.forwarded_for);
 
     columns[i++]->insert(client_info.quota_key);
diff --git a/src/Interpreters/QueryThreadLog.cpp b/src/Interpreters/QueryThreadLog.cpp
index 5d325c05549..f1cce1a3da9 100644
--- a/src/Interpreters/QueryThreadLog.cpp
+++ b/src/Interpreters/QueryThreadLog.cpp
@@ -61,6 +61,7 @@ Block QueryThreadLogElement::createBlock()
         {std::make_shared<DataTypeUInt32>(),        "client_version_patch"},
         {std::make_shared<DataTypeUInt8>(),         "http_method"},
         {std::make_shared<DataTypeString>(),        "http_user_agent"},
+        {std::make_shared<DataTypeString>(),        "http_referer"},
         {std::make_shared<DataTypeString>(),        "forwarded_for"},
         {std::make_shared<DataTypeString>(),        "quota_key"},
 
diff --git a/src/Server/HTTPHandler.cpp b/src/Server/HTTPHandler.cpp
index 472850950d4..5006a817b5b 100644
--- a/src/Server/HTTPHandler.cpp
+++ b/src/Server/HTTPHandler.cpp
@@ -295,6 +295,7 @@ void HTTPHandler::processQuery(
 
     client_info.http_method = http_method;
     client_info.http_user_agent = request.get("User-Agent", "");
+    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
diff --git a/src/Storages/System/StorageSystemProcesses.cpp b/src/Storages/System/StorageSystemProcesses.cpp
index 178eedd9ad7..b397d941786 100644
--- a/src/Storages/System/StorageSystemProcesses.cpp
+++ b/src/Storages/System/StorageSystemProcesses.cpp
@@ -43,6 +43,7 @@ NamesAndTypesList StorageSystemProcesses::getNamesAndTypes()
 
         {"http_method", std::make_shared<DataTypeUInt8>()},
         {"http_user_agent", std::make_shared<DataTypeString>()},
+        {"http_referer", std::make_shared<DataTypeString>()},
         {"forwarded_for", std::make_shared<DataTypeString>()},
 
         {"quota_key", std::make_shared<DataTypeString>()},
@@ -99,6 +100,7 @@ void StorageSystemProcesses::fillData(MutableColumns & res_columns, const Contex
 
         res_columns[i++]->insert(UInt64(process.client_info.http_method));
         res_columns[i++]->insert(process.client_info.http_user_agent);
+        res_columns[i++]->insert(process.client_info.http_referer);
         res_columns[i++]->insert(process.client_info.forwarded_for);
 
         res_columns[i++]->insert(process.client_info.quota_key);
diff --git a/tests/queries/0_stateless/01661_referer.reference b/tests/queries/0_stateless/01661_referer.reference
new file mode 100644
index 00000000000..49d29c80f17
--- /dev/null
+++ b/tests/queries/0_stateless/01661_referer.reference
@@ -0,0 +1,2 @@
+1
+https://yandex.ru/
diff --git a/tests/queries/0_stateless/01661_referer.sh b/tests/queries/0_stateless/01661_referer.sh
new file mode 100755
index 00000000000..159f5e9036f
--- /dev/null
+++ b/tests/queries/0_stateless/01661_referer.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
+
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -d 'SELECT 1' --referer 'https://yandex.ru/'
+${CLICKHOUSE_CLIENT} --query "SYSTEM FLUSH LOGS"
+${CLICKHOUSE_CLIENT} --query "SELECT http_referer FROM system.query_log WHERE http_referer LIKE '%yandex%' LIMIT 1"

From 117708abc616a777014566cca6f1a00a3dae4109 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Fri, 22 Jan 2021 01:59:56 +0300
Subject: [PATCH 308/611] Skip Arcadia

---
 tests/queries/0_stateless/arcadia_skip_list.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/queries/0_stateless/arcadia_skip_list.txt b/tests/queries/0_stateless/arcadia_skip_list.txt
index 6315fa4b126..de717412858 100644
--- a/tests/queries/0_stateless/arcadia_skip_list.txt
+++ b/tests/queries/0_stateless/arcadia_skip_list.txt
@@ -188,3 +188,4 @@
 01650_fetch_patition_with_macro_in_zk_path
 01651_bugs_from_15889
 01655_agg_if_nullable
+01660_sum_ubsan

From 79229ef25a699c9eba8412a93945a8bfc099f141 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Fri, 22 Jan 2021 02:01:17 +0300
Subject: [PATCH 309/611] Skip Arcadia

---
 tests/queries/0_stateless/arcadia_skip_list.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/queries/0_stateless/arcadia_skip_list.txt b/tests/queries/0_stateless/arcadia_skip_list.txt
index 6315fa4b126..8df25c9dccf 100644
--- a/tests/queries/0_stateless/arcadia_skip_list.txt
+++ b/tests/queries/0_stateless/arcadia_skip_list.txt
@@ -25,6 +25,7 @@
 00877_memory_limit_for_new_delete
 00921_datetime64_basic
 00926_geo_to_h3
+01659_h3_buffer_overflow
 00926_multimatch
 00929_multi_match_edit_distance
 00952_insert_into_distributed_with_materialized_column

From 963699d9c89c68b977951669cfd51093fd553357 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <36882414+akuzm@users.noreply.github.com>
Date: Fri, 22 Jan 2021 02:26:49 +0300
Subject: [PATCH 310/611] Update run-fuzzer.sh

---
 docker/test/fuzzer/run-fuzzer.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index 0a282133690..0ce52c1eb4e 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -75,7 +75,7 @@ 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)
+    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 ..
     if [[ -n "$NEW_TESTS" ]]
     then

From bc52fe2cff35055822be4e8f0040d5eb07f52e7b Mon Sep 17 00:00:00 2001
From: dankondr <dankondr@icloud.com>
Date: Fri, 22 Jan 2021 02:32:56 +0300
Subject: [PATCH 311/611] Revert "Make in case insensitive"

This reverts commit df50b931
---
 src/Functions/in.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Functions/in.cpp b/src/Functions/in.cpp
index 01afac4d818..b9a0c81b508 100644
--- a/src/Functions/in.cpp
+++ b/src/Functions/in.cpp
@@ -129,14 +129,14 @@ public:
 template<bool ignore_set>
 void registerFunctionsInImpl(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionIn<false, false, true, ignore_set>>(FunctionFactory::CaseInsensitive);
-    factory.registerFunction<FunctionIn<false, true, true, ignore_set>>(FunctionFactory::CaseInsensitive);
-    factory.registerFunction<FunctionIn<true, false, true, ignore_set>>(FunctionFactory::CaseInsensitive);
-    factory.registerFunction<FunctionIn<true, true, true, ignore_set>>(FunctionFactory::CaseInsensitive);
-    factory.registerFunction<FunctionIn<false, false, false, ignore_set>>(FunctionFactory::CaseInsensitive);
-    factory.registerFunction<FunctionIn<false, true, false, ignore_set>>(FunctionFactory::CaseInsensitive);
-    factory.registerFunction<FunctionIn<true, false, false, ignore_set>>(FunctionFactory::CaseInsensitive);
-    factory.registerFunction<FunctionIn<true, true, false, ignore_set>>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionIn<false, false, true, ignore_set>>();
+    factory.registerFunction<FunctionIn<false, true, true, ignore_set>>();
+    factory.registerFunction<FunctionIn<true, false, true, ignore_set>>();
+    factory.registerFunction<FunctionIn<true, true, true, ignore_set>>();
+    factory.registerFunction<FunctionIn<false, false, false, ignore_set>>();
+    factory.registerFunction<FunctionIn<false, true, false, ignore_set>>();
+    factory.registerFunction<FunctionIn<true, false, false, ignore_set>>();
+    factory.registerFunction<FunctionIn<true, true, false, ignore_set>>();
 }
 
 }

From 970c75860ce35e53c48124dd84a01918dd3b1faf Mon Sep 17 00:00:00 2001
From: dankondr <dankondr@icloud.com>
Date: Fri, 22 Jan 2021 02:36:37 +0300
Subject: [PATCH 312/611] Revert "Make extract case insensitive"

This reverts commit c409508f
---
 src/Functions/extract.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Functions/extract.cpp b/src/Functions/extract.cpp
index cc3c97840bc..0296602d205 100644
--- a/src/Functions/extract.cpp
+++ b/src/Functions/extract.cpp
@@ -67,7 +67,7 @@ using FunctionExtract = FunctionsStringSearchToString<ExtractImpl, NameExtract>;
 
 void registerFunctionExtract(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionExtract>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionExtract>();
 }
 
 }

From 2eba7413e1c5eb0d6e2d85fa5c5b48eeb39ce599 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Fri, 22 Jan 2021 02:42:24 +0300
Subject: [PATCH 313/611] remove extra newline

---
 programs/client/Client.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index c7fd5847df6..06bd7d84526 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -920,12 +920,6 @@ private:
 
     void reportQueryError() const
     {
-        // If we probably have progress bar, we should add additional
-        // newline, otherwise exception may display concatenated with
-        // the progress bar.
-        if (need_render_progress)
-            std::cerr << '\n';
-
         if (server_exception)
         {
             std::string text = server_exception->displayText();

From e38ff3517d950b5393df2575291b43fb9a81645f Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Fri, 22 Jan 2021 02:48:26 +0300
Subject: [PATCH 314/611] Fail fast in incorrect usage of extractAllGroups

---
 src/Functions/extractAllGroups.h                 | 16 ++++++++++++----
 .../01661_extract_all_groups_fail_fast.reference |  0
 .../01661_extract_all_groups_fail_fast.sql       |  1 +
 3 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 tests/queries/0_stateless/01661_extract_all_groups_fail_fast.reference
 create mode 100644 tests/queries/0_stateless/01661_extract_all_groups_fail_fast.sql

diff --git a/src/Functions/extractAllGroups.h b/src/Functions/extractAllGroups.h
index ba14be2a217..7132c5dae82 100644
--- a/src/Functions/extractAllGroups.h
+++ b/src/Functions/extractAllGroups.h
@@ -14,12 +14,14 @@
 
 #include <Core/iostream_debug_helpers.h>
 
+
 namespace DB
 {
 
 namespace ErrorCodes
 {
     extern const int BAD_ARGUMENTS;
+    extern const int TOO_LARGE_ARRAY_SIZE;
 }
 
 
@@ -145,11 +147,11 @@ public:
         }
         else
         {
-            std::vector<StringPiece> all_matches;
-            // number of times RE matched on each row of haystack column.
-            std::vector<size_t> number_of_matches_per_row;
+            PODArray<StringPiece, 0> all_matches;
+            /// Number of times RE matched on each row of haystack column.
+            PODArray<size_t, 0> number_of_matches_per_row;
 
-            // we expect RE to match multiple times on each row, `* 8` is arbitrary to reduce number of re-allocations.
+            /// We expect RE to match multiple times on each row, `* 8` is arbitrary to reduce number of re-allocations.
             all_matches.reserve(input_rows_count * groups_count * 8);
             number_of_matches_per_row.reserve(input_rows_count);
 
@@ -170,6 +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());
+
                     pos = matched_groups[0].data() + std::max<size_t>(1, matched_groups[0].size());
 
                     ++matches_per_row;
diff --git a/tests/queries/0_stateless/01661_extract_all_groups_fail_fast.reference b/tests/queries/0_stateless/01661_extract_all_groups_fail_fast.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01661_extract_all_groups_fail_fast.sql b/tests/queries/0_stateless/01661_extract_all_groups_fail_fast.sql
new file mode 100644
index 00000000000..48d3baba0c5
--- /dev/null
+++ b/tests/queries/0_stateless/01661_extract_all_groups_fail_fast.sql
@@ -0,0 +1 @@
+SELECT repeat('abcdefghijklmnopqrstuvwxyz', number * 100) AS haystack, extractAllGroupsHorizontal(haystack, '(\\w)') AS matches FROM numbers(1023); -- { serverError 128 }

From 14adc2d5f095f247d70e04d383c180598d68619b Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Fri, 22 Jan 2021 03:05:45 +0300
Subject: [PATCH 315/611] Fix UBSan report in quantileExactWeighted

---
 .../QuantileExactWeighted.h                   | 19 +++++++++++++------
 ...01663_quantile_weighted_overflow.reference |  2 ++
 .../01663_quantile_weighted_overflow.sql      |  2 ++
 3 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 tests/queries/0_stateless/01663_quantile_weighted_overflow.reference
 create mode 100644 tests/queries/0_stateless/01663_quantile_weighted_overflow.sql

diff --git a/src/AggregateFunctions/QuantileExactWeighted.h b/src/AggregateFunctions/QuantileExactWeighted.h
index 666dbd6b622..86e426d9031 100644
--- a/src/AggregateFunctions/QuantileExactWeighted.h
+++ b/src/AggregateFunctions/QuantileExactWeighted.h
@@ -84,8 +84,15 @@ struct QuantileExactWeighted
         std::unique_ptr<Pair[]> array_holder(new Pair[size]);
         Pair * array = array_holder.get();
 
+        /// Note: 64-bit integer weight can overflow.
+        /// We do some implementation specific behaviour (return approximate or garbage results).
+        /// Float64 is used as accumulator here to get approximate results.
+        /// But weight can be already overflowed in computations in 'add' and 'merge' methods.
+        /// It will be reasonable to change the type of weight to Float64 in the map,
+        /// but we don't do that for compatibility of serialized data.
+
         size_t i = 0;
-        UInt64 sum_weight = 0;
+        Float64 sum_weight = 0;
         for (const auto & pair : map)
         {
             sum_weight += pair.getMapped();
@@ -95,8 +102,8 @@ struct QuantileExactWeighted
 
         std::sort(array, array + size, [](const Pair & a, const Pair & b) { return a.first < b.first; });
 
-        UInt64 threshold = std::ceil(sum_weight * level);
-        UInt64 accumulated = 0;
+        Float64 threshold = std::ceil(sum_weight * level);
+        Float64 accumulated = 0;
 
         const Pair * it = array;
         const Pair * end = array + size;
@@ -135,7 +142,7 @@ struct QuantileExactWeighted
         Pair * array = array_holder.get();
 
         size_t i = 0;
-        UInt64 sum_weight = 0;
+        Float64 sum_weight = 0;
         for (const auto & pair : map)
         {
             sum_weight += pair.getMapped();
@@ -145,13 +152,13 @@ struct QuantileExactWeighted
 
         std::sort(array, array + size, [](const Pair & a, const Pair & b) { return a.first < b.first; });
 
-        UInt64 accumulated = 0;
+        Float64 accumulated = 0;
 
         const Pair * it = array;
         const Pair * end = array + size;
 
         size_t level_index = 0;
-        UInt64 threshold = std::ceil(sum_weight * levels[indices[level_index]]);
+        Float64 threshold = std::ceil(sum_weight * levels[indices[level_index]]);
 
         while (it < end)
         {
diff --git a/tests/queries/0_stateless/01663_quantile_weighted_overflow.reference b/tests/queries/0_stateless/01663_quantile_weighted_overflow.reference
new file mode 100644
index 00000000000..3f6c3f15064
--- /dev/null
+++ b/tests/queries/0_stateless/01663_quantile_weighted_overflow.reference
@@ -0,0 +1,2 @@
+5
+\N	[0,9,9,0,0,0,9,0,0,4,9,9,0,0,9,9]
diff --git a/tests/queries/0_stateless/01663_quantile_weighted_overflow.sql b/tests/queries/0_stateless/01663_quantile_weighted_overflow.sql
new file mode 100644
index 00000000000..c8c75e64014
--- /dev/null
+++ b/tests/queries/0_stateless/01663_quantile_weighted_overflow.sql
@@ -0,0 +1,2 @@
+SELECT quantileExactWeighted(1)(number, 9223372036854775807) FROM numbers(6);
+SELECT quantileExactWeighted((NULL, NULL, NULL, NULL))((NULL), number, (NULL, 0, 255), 9223372036854775807), quantilesExactWeighted(0, 1., 0.9998999834060669, 0.00009999999747378752, 0., 0., 0.9998999834060669, 0., 0.00009999999747378752, 0.5, 1., 0.9998999834060669, 0.00009999999747378752, 0., 1., 1)(number, 9223372036854775807) FROM (SELECT (NULL, NULL, NULL, 0.9998999834060669), number FROM system.numbers LIMIT 10);

From af5c3a50340c5f212da2dd11a948023f256f8291 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Fri, 22 Jan 2021 03:13:47 +0300
Subject: [PATCH 316/611] Limit max memory usage in fuzz testing

---
 docker/test/fuzzer/query-fuzzer-tweaks-users.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker/test/fuzzer/query-fuzzer-tweaks-users.xml b/docker/test/fuzzer/query-fuzzer-tweaks-users.xml
index 542f7a673cd..88230e63d4a 100644
--- a/docker/test/fuzzer/query-fuzzer-tweaks-users.xml
+++ b/docker/test/fuzzer/query-fuzzer-tweaks-users.xml
@@ -11,6 +11,10 @@
                     <max>10</max>
                 </max_execution_time>
 
+                <max_memory_usage>
+                    <max>10GB</max>
+                </max_memory_usage>
+
                 <!-- Not ready for production -->
                 <compile_expressions>
                     <readonly />

From 56d09886e2239abae3b5aaaa1cff51c1871cd054 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Fri, 22 Jan 2021 04:08:10 +0300
Subject: [PATCH 317/611] Fix MSan report in AES functions

---
 src/Functions/FunctionsAES.h                       | 8 ++++++++
 tests/queries/0_stateless/01663_aes_msan.reference | 2 ++
 tests/queries/0_stateless/01663_aes_msan.sql       | 2 ++
 3 files changed, 12 insertions(+)
 create mode 100644 tests/queries/0_stateless/01663_aes_msan.reference
 create mode 100644 tests/queries/0_stateless/01663_aes_msan.sql

diff --git a/src/Functions/FunctionsAES.h b/src/Functions/FunctionsAES.h
index fea47074649..f9cf688c86a 100644
--- a/src/Functions/FunctionsAES.h
+++ b/src/Functions/FunctionsAES.h
@@ -303,6 +303,10 @@ private:
             if constexpr (!std::is_same_v<std::nullptr_t, std::decay_t<IvColumnType>>)
             {
                 iv_value = iv_column->getDataAt(r);
+
+                /// If the length is zero (empty string is passed) it should be treat as no IV.
+                if (iv_value.size == 0)
+                    iv_value.data = nullptr;
             }
 
             const auto input_value = input_column->getDataAt(r);
@@ -571,6 +575,10 @@ private:
             if constexpr (!std::is_same_v<std::nullptr_t, std::decay_t<IvColumnType>>)
             {
                 iv_value = iv_column->getDataAt(r);
+
+                /// If the length is zero (empty string is passed) it should be treat as no IV.
+                if (iv_value.size == 0)
+                    iv_value.data = nullptr;
             }
 
             auto input_value = input_column->getDataAt(r);
diff --git a/tests/queries/0_stateless/01663_aes_msan.reference b/tests/queries/0_stateless/01663_aes_msan.reference
new file mode 100644
index 00000000000..e760e58b19d
--- /dev/null
+++ b/tests/queries/0_stateless/01663_aes_msan.reference
@@ -0,0 +1,2 @@
+4DB2B0F12DE073FD063CE5478903DE68
+text
diff --git a/tests/queries/0_stateless/01663_aes_msan.sql b/tests/queries/0_stateless/01663_aes_msan.sql
new file mode 100644
index 00000000000..1d549aece56
--- /dev/null
+++ b/tests/queries/0_stateless/01663_aes_msan.sql
@@ -0,0 +1,2 @@
+SELECT hex(encrypt('aes-128-cbc', 'text', 'keykeykeykeykeyk', ''));
+SELECT decrypt('aes-128-cbc', encrypt('aes-128-cbc', 'text', 'keykeykeykeykeyk', ''), 'keykeykeykeykeyk', '');

From fe5d02a06f1f403296476ae27f5d4599525d757d Mon Sep 17 00:00:00 2001
From: achimbab <07c00h@gmail.com>
Date: Fri, 22 Jan 2021 12:59:21 +0900
Subject: [PATCH 318/611] Add kakao to adopters.md

---
 docs/en/introduction/adopters.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/en/introduction/adopters.md b/docs/en/introduction/adopters.md
index 9b08de99fc0..2684e6fdd3a 100644
--- a/docs/en/introduction/adopters.md
+++ b/docs/en/introduction/adopters.md
@@ -120,5 +120,6 @@ toc_title: Adopters
 | <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://www.kakaocorp.com/" class="favicon">kakaocorp</a>                                              | Internet company         |  — | —                                                          | —                                                                            | [if(kakao)2020 conference](https://if.kakao.com/session/117)                                                                                                |
 
 [Original article](https://clickhouse.tech/docs/en/introduction/adopters/) <!--hide-->

From f558747ef26313c9774779d81689999195a8a64e Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Fri, 22 Jan 2021 09:53:11 +0300
Subject: [PATCH 319/611] Link to DROP CACHE statements

---
 docs/en/operations/caches.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/en/operations/caches.md b/docs/en/operations/caches.md
index 66f2eaeadc9..7b096b76f75 100644
--- a/docs/en/operations/caches.md
+++ b/docs/en/operations/caches.md
@@ -21,4 +21,6 @@ Additional cache types:
 Indirectly used:
 - OS page cache
 
+To drop cache, use [SYSTEM DROP ... CACHE](../sql-reference/statements/system.md) statements.
+
 [Original article](https://clickhouse.tech/docs/en/operations/caches/) <!--hide-->

From 2adcde89f81a69fce1f36326c4b92880f288b8dd Mon Sep 17 00:00:00 2001
From: filimonov <1549571+filimonov@users.noreply.github.com>
Date: Fri, 22 Jan 2021 09:52:59 +0100
Subject: [PATCH 320/611] use __ARM_FEATURE_CRC32

---
 contrib/librdkafka-cmake/config.h.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/contrib/librdkafka-cmake/config.h.in b/contrib/librdkafka-cmake/config.h.in
index 9057af2bff9..80b6ea61b6e 100644
--- a/contrib/librdkafka-cmake/config.h.in
+++ b/contrib/librdkafka-cmake/config.h.in
@@ -66,8 +66,7 @@
 #cmakedefine WITH_SASL_OAUTHBEARER 1
 #cmakedefine WITH_SASL_CYRUS 1
 // crc32chw
-// actually some arch cpus may have hw crc, feature detection can be added.
-#if !defined(__aarch64__) && !defined(__PPC__)
+#if !defined(__PPC__) && (!defined(__aarch64__) || defined(__ARM_FEATURE_CRC32))
 #define WITH_CRC32C_HW 1
 #endif
 // regex

From bb91005356edcbe81e2a0424cc457b19fae354e9 Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Fri, 22 Jan 2021 09:02:58 +0000
Subject: [PATCH 321/611] Fix failing stateless test

---
 src/Functions/FunctionFactory.cpp | 10 ++++++++--
 src/Interpreters/QueryLog.cpp     | 26 +++++++++++++-------------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/Functions/FunctionFactory.cpp b/src/Functions/FunctionFactory.cpp
index 859fe1de9a3..f3e2998c48b 100644
--- a/src/Functions/FunctionFactory.cpp
+++ b/src/Functions/FunctionFactory.cpp
@@ -3,6 +3,7 @@
 #include <Interpreters/Context.h>
 
 #include <Common/Exception.h>
+#include <Common/CurrentThread.h>
 
 #include <Poco/String.h>
 
@@ -10,6 +11,7 @@
 
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 
+
 namespace DB
 {
 
@@ -75,8 +77,12 @@ FunctionOverloadResolverPtr FunctionFactory::get(
     const std::string & name,
     const Context & context) const
 {
-    if (context.hasQueryContext() && context.getSettingsRef().log_queries)
-        context.getQueryContext().addQueryFactoriesInfo(Context::QueryLogFactories::Function, name);
+    if (CurrentThread::isInitialized())
+    {
+        auto query_context = CurrentThread::get().getQueryContext();
+        if (query_context && query_context->getSettingsRef().log_queries)
+            query_context->addQueryFactoriesInfo(Context::QueryLogFactories::Function, name);
+    }
 
     return std::make_shared<FunctionOverloadResolverAdaptor>(getImpl(name, context));
 }
diff --git a/src/Interpreters/QueryLog.cpp b/src/Interpreters/QueryLog.cpp
index 5570213672a..8f5466d951b 100644
--- a/src/Interpreters/QueryLog.cpp
+++ b/src/Interpreters/QueryLog.cpp
@@ -136,11 +136,11 @@ void QueryLogElement::appendToBlock(MutableColumns & columns) const
     columns[i++]->insert(normalized_query_hash);
     columns[i++]->insertData(query_kind.data(), query_kind.size());
 
-    auto & column_databases = typeid_cast<ColumnArray &>(*columns[i++]);
-    auto & column_tables = typeid_cast<ColumnArray &>(*columns[i++]);
-    auto & column_columns = typeid_cast<ColumnArray &>(*columns[i++]);
-
     {
+        auto & column_databases = typeid_cast<ColumnArray &>(*columns[i++]);
+        auto & column_tables = typeid_cast<ColumnArray &>(*columns[i++]);
+        auto & column_columns = typeid_cast<ColumnArray &>(*columns[i++]);
+
         auto fill_column = [](const std::set<String> & data, ColumnArray & column)
         {
             size_t size = 0;
@@ -199,6 +199,15 @@ void QueryLogElement::appendToBlock(MutableColumns & columns) const
     }
 
     {
+        auto & column_aggregate_function_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+        auto & column_database_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+        auto & column_data_type_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+        auto & column_dictionary_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+        auto & column_format_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+        auto & column_function_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+        auto & column_storage_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+        auto & column_table_function_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+
         auto fill_column = [](const std::unordered_set<String> & data, ColumnArray & column)
         {
             size_t size = 0;
@@ -211,15 +220,6 @@ void QueryLogElement::appendToBlock(MutableColumns & columns) const
             offsets.push_back(offsets.back() + size);
         };
 
-        auto & column_aggregate_function_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
-        auto & column_database_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
-        auto & column_data_type_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
-        auto & column_dictionary_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
-        auto & column_format_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
-        auto & column_function_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
-        auto & column_storage_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
-        auto & column_table_function_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
-
         fill_column(used_aggregate_functions, column_aggregate_function_factory_objects);
         fill_column(used_databases, column_database_factory_objects);
         fill_column(used_data_types, column_data_type_factory_objects);

From beb0fec8bb5f81254687c5df9284d87e30e39152 Mon Sep 17 00:00:00 2001
From: feng lv <fenglv15@mails.ucas.ac.cn>
Date: Fri, 22 Jan 2021 09:13:22 +0000
Subject: [PATCH 322/611] mirror changes in code and comment

---
 src/Interpreters/Aggregator.cpp               |  2 +-
 src/Interpreters/Aggregator.h                 | 30 +++++++++----------
 src/Interpreters/ExpressionActions.cpp        |  2 +-
 src/Processors/Executors/PipelineExecutor.cpp |  2 +-
 src/Processors/IProcessor.h                   |  4 +--
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/Interpreters/Aggregator.cpp b/src/Interpreters/Aggregator.cpp
index b0f8f26c8e9..90af4352b42 100644
--- a/src/Interpreters/Aggregator.cpp
+++ b/src/Interpreters/Aggregator.cpp
@@ -2316,7 +2316,7 @@ void Aggregator::destroyAllAggregateStates(AggregatedDataVariants & result)
 }
 
 
-void Aggregator::setCancellationHook(const CancellationHook cancellation_hook)
+void Aggregator::setCancellationHook(const CancellationHook & cancellation_hook)
 {
     isCancelled = cancellation_hook;
 }
diff --git a/src/Interpreters/Aggregator.h b/src/Interpreters/Aggregator.h
index 331d50672ab..2a1224b0b48 100644
--- a/src/Interpreters/Aggregator.h
+++ b/src/Interpreters/Aggregator.h
@@ -134,7 +134,7 @@ struct AggregationDataWithNullKeyTwoLevel : public Base
 {
     using Base::impls;
 
-    AggregationDataWithNullKeyTwoLevel() {}
+    AggregationDataWithNullKeyTwoLevel() = default;
 
     template <typename Other>
     explicit AggregationDataWithNullKeyTwoLevel(const Other & other) : Base(other)
@@ -184,7 +184,7 @@ struct AggregationMethodOneNumber
 
     Data data;
 
-    AggregationMethodOneNumber() {}
+    AggregationMethodOneNumber() = default;
 
     template <typename Other>
     AggregationMethodOneNumber(const Other & other) : data(other.data) {}
@@ -199,8 +199,8 @@ struct AggregationMethodOneNumber
     // Insert the key from the hash table into columns.
     static void insertKeyIntoColumns(const Key & key, MutableColumns & key_columns, const Sizes & /*key_sizes*/)
     {
-        auto key_holder = reinterpret_cast<const char *>(&key);
-        auto column = static_cast<ColumnVectorHelper *>(key_columns[0].get());
+        const auto * key_holder = reinterpret_cast<const char *>(&key);
+        auto * column = static_cast<ColumnVectorHelper *>(key_columns[0].get());
         column->insertRawData<sizeof(FieldType)>(key_holder);
     }
 };
@@ -216,7 +216,7 @@ struct AggregationMethodString
 
     Data data;
 
-    AggregationMethodString() {}
+    AggregationMethodString() = default;
 
     template <typename Other>
     AggregationMethodString(const Other & other) : data(other.data) {}
@@ -242,7 +242,7 @@ struct AggregationMethodStringNoCache
 
     Data data;
 
-    AggregationMethodStringNoCache() {}
+    AggregationMethodStringNoCache() = default;
 
     template <typename Other>
     AggregationMethodStringNoCache(const Other & other) : data(other.data) {}
@@ -268,7 +268,7 @@ struct AggregationMethodFixedString
 
     Data data;
 
-    AggregationMethodFixedString() {}
+    AggregationMethodFixedString() = default;
 
     template <typename Other>
     AggregationMethodFixedString(const Other & other) : data(other.data) {}
@@ -293,7 +293,7 @@ struct AggregationMethodFixedStringNoCache
 
     Data data;
 
-    AggregationMethodFixedStringNoCache() {}
+    AggregationMethodFixedStringNoCache() = default;
 
     template <typename Other>
     AggregationMethodFixedStringNoCache(const Other & other) : data(other.data) {}
@@ -334,7 +334,7 @@ struct AggregationMethodSingleLowCardinalityColumn : public SingleColumnMethod
     static void insertKeyIntoColumns(const Key & key,
         MutableColumns & 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].get());
 
         if constexpr (std::is_same_v<Key, StringRef>)
         {
@@ -360,7 +360,7 @@ struct AggregationMethodKeysFixed
 
     Data data;
 
-    AggregationMethodKeysFixed() {}
+    AggregationMethodKeysFixed() = default;
 
     template <typename Other>
     AggregationMethodKeysFixed(const Other & other) : data(other.data) {}
@@ -438,7 +438,7 @@ struct AggregationMethodSerialized
 
     Data data;
 
-    AggregationMethodSerialized() {}
+    AggregationMethodSerialized() = default;
 
     template <typename Other>
     AggregationMethodSerialized(const Other & other) : data(other.data) {}
@@ -449,7 +449,7 @@ struct AggregationMethodSerialized
 
     static void insertKeyIntoColumns(const StringRef & key, MutableColumns & key_columns, const Sizes &)
     {
-        auto pos = key.data;
+        const auto * pos = key.data;
         for (auto & column : key_columns)
             pos = column->deserializeAndInsertFromArena(pos);
     }
@@ -783,9 +783,9 @@ struct AggregatedDataVariants : private boost::noncopyable
         M(low_cardinality_keys128_two_level) \
         M(low_cardinality_keys256_two_level) \
         M(low_cardinality_key_string_two_level) \
-        M(low_cardinality_key_fixed_string_two_level) \
+        M(low_cardinality_key_fixed_string_two_level)
 
-    bool isLowCardinality()
+    bool isLowCardinality() const
     {
         switch (type)
         {
@@ -972,7 +972,7 @@ public:
 
     /** Set a function that checks whether the current task can be aborted.
       */
-    void setCancellationHook(const CancellationHook cancellation_hook);
+    void setCancellationHook(const CancellationHook & cancellation_hook);
 
     /// For external aggregation.
     void writeToTemporaryFile(AggregatedDataVariants & data_variants, const String & tmp_path);
diff --git a/src/Interpreters/ExpressionActions.cpp b/src/Interpreters/ExpressionActions.cpp
index f0dcf830c82..13daf52f5fc 100644
--- a/src/Interpreters/ExpressionActions.cpp
+++ b/src/Interpreters/ExpressionActions.cpp
@@ -67,7 +67,7 @@ ExpressionActionsPtr ExpressionActions::clone() const
 
 void ExpressionActions::linearizeActions()
 {
-    /// This function does the topological sort or DAG and fills all the fields of ExpressionActions.
+    /// This function does the topological sort on DAG and fills all the fields of ExpressionActions.
     /// Algorithm traverses DAG starting from nodes without children.
     /// For every node we support the number of created children, and if all children are created, put node into queue.
     struct Data
diff --git a/src/Processors/Executors/PipelineExecutor.cpp b/src/Processors/Executors/PipelineExecutor.cpp
index 1646a1a01fe..6192828784f 100644
--- a/src/Processors/Executors/PipelineExecutor.cpp
+++ b/src/Processors/Executors/PipelineExecutor.cpp
@@ -491,7 +491,7 @@ void PipelineExecutor::executeStepImpl(size_t thread_num, size_t num_threads, st
     while (!finished && !yield)
     {
         /// First, find any processor to execute.
-        /// Just travers graph and prepare any processor.
+        /// Just traverse graph and prepare any processor.
         while (!finished && node == nullptr)
         {
             {
diff --git a/src/Processors/IProcessor.h b/src/Processors/IProcessor.h
index c3abe40c3b7..ffdb363663d 100644
--- a/src/Processors/IProcessor.h
+++ b/src/Processors/IProcessor.h
@@ -249,7 +249,7 @@ public:
     UInt64 getInputPortNumber(const InputPort * input_port) const
     {
         UInt64 number = 0;
-        for (auto & port : inputs)
+        for (const auto & port : inputs)
         {
             if (&port == input_port)
                 return number;
@@ -263,7 +263,7 @@ public:
     UInt64 getOutputPortNumber(const OutputPort * output_port) const
     {
         UInt64 number = 0;
-        for (auto & port : outputs)
+        for (const auto & port : outputs)
         {
             if (&port == output_port)
                 return number;

From 3cce851f187c91ea7aa39f47833adcdd547c0112 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Fri, 22 Jan 2021 12:35:15 +0300
Subject: [PATCH 323/611] Use pulling executor in GlobalSubqueriesMatcher

---
 src/Interpreters/GlobalSubqueriesVisitor.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Interpreters/GlobalSubqueriesVisitor.h b/src/Interpreters/GlobalSubqueriesVisitor.h
index e87ee6349f3..6b76f5b2822 100644
--- a/src/Interpreters/GlobalSubqueriesVisitor.h
+++ b/src/Interpreters/GlobalSubqueriesVisitor.h
@@ -17,6 +17,7 @@
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Interpreters/IdentifierSemantic.h>
 #include <Interpreters/Context.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
 
 namespace DB
 {
@@ -140,16 +141,15 @@ public:
             {
                 auto external_table = external_storage_holder->getTable();
                 auto table_out = external_table->write({}, external_table->getInMemoryMetadataPtr(), context);
-                auto stream = interpreter->execute().getInputStream();
+                auto io = interpreter->execute();
+                PullingPipelineExecutor executor(io.pipeline);
 
                 table_out->writePrefix();
-                stream->readPrefix();
-                while (Block block = stream->read())
-                {
+                Block block;
+                while (!executor.pull(block))
                     table_out->write(block);
-                }
+
                 table_out->writeSuffix();
-                stream->readSuffix();
             }
             else
             {

From 42d46e2a26e8b2fb450475416fa00b371331a8b6 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Fri, 22 Jan 2021 12:39:33 +0300
Subject: [PATCH 324/611] Update tests.

---
 tests/queries/0_stateless/00850_global_join_dups.sql | 3 +++
 tests/queries/0_stateless/01651_bugs_from_15889.sql  | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/queries/0_stateless/00850_global_join_dups.sql b/tests/queries/0_stateless/00850_global_join_dups.sql
index 46ff7dad472..faac82cbfdb 100644
--- a/tests/queries/0_stateless/00850_global_join_dups.sql
+++ b/tests/queries/0_stateless/00850_global_join_dups.sql
@@ -77,3 +77,6 @@ GLOBAL INNER JOIN
     GLOBAL INNER JOIN ( SELECT dummy FROM remote('127.0.0.3', system.one) ) t2_00850
     USING dummy
 ) USING dummy;
+
+-- query from fuzzer
+SELECT toDateTime64(toString(toString('0000-00-00 00:00:000000-00-00 00:00:00', toDateTime64(toDateTime64('655.36', -2, NULL)))), NULL) FROM t1_00850 GLOBAL INNER JOIN (SELECT toDateTime64(toDateTime64('6553.6', '', NULL), NULL), * FROM (SELECT * FROM t2_00850) INNER JOIN (SELECT toDateTime64('6553.7', 1024, NULL), * FROM t1_00850) USING (dummy)) USING (dummy);
diff --git a/tests/queries/0_stateless/01651_bugs_from_15889.sql b/tests/queries/0_stateless/01651_bugs_from_15889.sql
index 7b69061eb04..f364101ecc0 100644
--- a/tests/queries/0_stateless/01651_bugs_from_15889.sql
+++ b/tests/queries/0_stateless/01651_bugs_from_15889.sql
@@ -108,5 +108,4 @@ WITH (
 SELECT if(dateDiff('second', toDateTime(time_with_microseconds), toDateTime(t)) = -9223372036854775808, 'ok', '');
 
 
-
-
+SELECT number, number / 2 AS n, j1, j2 FROM remote('127.0.0.{2,3}', system.numbers) GLOBAL ANY LEFT JOIN (SELECT number / 3 AS n, number AS j1, 'Hello' AS j2 FROM system.numbers LIMIT 1048577) USING (n) LIMIT 10 format Null;

From 83862799cdcf2f4ebc4046812dd564af41e34df9 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Fri, 22 Jan 2021 13:02:48 +0300
Subject: [PATCH 325/611] Fix one more race in TestKeeper

---
 src/Server/TestKeeperTCPHandler.cpp | 51 ++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/Server/TestKeeperTCPHandler.cpp b/src/Server/TestKeeperTCPHandler.cpp
index bf407ba96b7..354540c797d 100644
--- a/src/Server/TestKeeperTCPHandler.cpp
+++ b/src/Server/TestKeeperTCPHandler.cpp
@@ -33,9 +33,9 @@ namespace ErrorCodes
 
 struct PollResult
 {
-    bool has_responses;
-    bool has_requests;
-    bool error;
+    size_t ready_responses_count{0};
+    bool has_requests{false};
+    bool error{false};
 };
 
 /// Queue with mutex. As simple as possible.
@@ -191,10 +191,17 @@ struct SocketInterruptablePollWrapper
                         result.has_requests = true;
                     else
                     {
-                        /// Skip all of them, we are not interested in exact
-                        /// amount because responses ordered in responses queue.
-                        response_in.ignore();
-                        result.has_responses = true;
+                        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());
                     }
                 }
             }
@@ -349,23 +356,27 @@ void TestKeeperTCPHandler::runImpl()
                 while (in->available());
             }
 
-            if (result.has_responses)
+            /// Process exact amout 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)
             {
                 Coordination::ZooKeeperResponsePtr response;
-                while (responses->tryPop(response))
-                {
-                    if (response->xid == close_xid)
-                    {
-                        LOG_DEBUG(log, "Session #{} successfully closed", session_id);
-                        return;
-                    }
+                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);
 
-                    if (response->error == Coordination::Error::ZOK)
-                        response->write(*out);
-                    else if (response->xid != Coordination::WATCH_XID)
-                        response->write(*out);
-                    /// skipping bad response for watch
+                if (response->xid == close_xid)
+                {
+                    LOG_DEBUG(log, "Session #{} successfully closed", session_id);
+                    return;
                 }
+
+                if (response->error == Coordination::Error::ZOK)
+                    response->write(*out);
+                else if (response->xid != Coordination::WATCH_XID)
+                    response->write(*out);
+                /// skipping bad response for watch
+                result.ready_responses_count--;
             }
 
             if (result.error)

From b19316a2af8549f4be9f1b516fee16cb317cb991 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Fri, 22 Jan 2021 13:06:59 +0300
Subject: [PATCH 326/611] Fix test.

---
 tests/queries/0_stateless/00850_global_join_dups.sql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/queries/0_stateless/00850_global_join_dups.sql b/tests/queries/0_stateless/00850_global_join_dups.sql
index faac82cbfdb..92c1d81aa8e 100644
--- a/tests/queries/0_stateless/00850_global_join_dups.sql
+++ b/tests/queries/0_stateless/00850_global_join_dups.sql
@@ -19,6 +19,9 @@ GLOBAL INNER JOIN
     USING dummy
 ) USING dummy;
 
+-- query from fuzzer
+SELECT toDateTime64(toString(toString('0000-00-00 00:00:000000-00-00 00:00:00', toDateTime64(toDateTime64('655.36', -2, NULL)))), NULL) FROM t1_00850 GLOBAL INNER JOIN (SELECT toDateTime64(toDateTime64('6553.6', '', NULL), NULL), * FROM (SELECT * FROM t2_00850) INNER JOIN (SELECT toDateTime64('6553.7', 1024, NULL), * FROM t1_00850) USING (dummy)) USING (dummy);
+
 DROP TABLE t_local;
 DROP TABLE t1_00850;
 DROP TABLE t2_00850;
@@ -77,6 +80,3 @@ GLOBAL INNER JOIN
     GLOBAL INNER JOIN ( SELECT dummy FROM remote('127.0.0.3', system.one) ) t2_00850
     USING dummy
 ) USING dummy;
-
--- query from fuzzer
-SELECT toDateTime64(toString(toString('0000-00-00 00:00:000000-00-00 00:00:00', toDateTime64(toDateTime64('655.36', -2, NULL)))), NULL) FROM t1_00850 GLOBAL INNER JOIN (SELECT toDateTime64(toDateTime64('6553.6', '', NULL), NULL), * FROM (SELECT * FROM t2_00850) INNER JOIN (SELECT toDateTime64('6553.7', 1024, NULL), * FROM t1_00850) USING (dummy)) USING (dummy);

From b2a492155868c922b7484bd7e73a4c0d5fb33c6e Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Fri, 22 Jan 2021 13:14:53 +0300
Subject: [PATCH 327/611] Fix style

---
 src/Server/TestKeeperTCPHandler.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Server/TestKeeperTCPHandler.cpp b/src/Server/TestKeeperTCPHandler.cpp
index 354540c797d..6bd8eaa65f7 100644
--- a/src/Server/TestKeeperTCPHandler.cpp
+++ b/src/Server/TestKeeperTCPHandler.cpp
@@ -28,6 +28,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int SYSTEM_ERROR;
+    extern const int LOGICAL_ERROR;
     extern const int UNEXPECTED_PACKET_FROM_CLIENT;
 }
 

From c04d1f8168dbf599a44a0f18b389fd914b34f11c Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Fri, 22 Jan 2021 13:20:28 +0300
Subject: [PATCH 328/611] Fix test.

---
 src/Interpreters/GlobalSubqueriesVisitor.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Interpreters/GlobalSubqueriesVisitor.h b/src/Interpreters/GlobalSubqueriesVisitor.h
index 6b76f5b2822..cde59d1e6c9 100644
--- a/src/Interpreters/GlobalSubqueriesVisitor.h
+++ b/src/Interpreters/GlobalSubqueriesVisitor.h
@@ -146,7 +146,7 @@ public:
 
                 table_out->writePrefix();
                 Block block;
-                while (!executor.pull(block))
+                while (executor.pull(block))
                     table_out->write(block);
 
                 table_out->writeSuffix();

From 8c0e207c9ce51b5076124a5e4065be089f67ce28 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <36882414+akuzm@users.noreply.github.com>
Date: Fri, 22 Jan 2021 13:20:45 +0300
Subject: [PATCH 329/611] Update run-fuzzer.sh

---
 docker/test/fuzzer/run-fuzzer.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index 0ce52c1eb4e..74f64d06a65 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -21,8 +21,8 @@ function clone
 
     git init
     git remote add origin https://github.com/ClickHouse/ClickHouse
-    git fetch --depth=1 origin "$SHA_TO_TEST"
-    git fetch --depth=1 origin master # Used to obtain the list of modified or added tests
+    git fetch --depth=100 origin "$SHA_TO_TEST"
+    git fetch --depth=100 origin master # Used to obtain the list of modified or added tests
 
     # If not master, try to fetch pull/.../{head,merge}
     if [ "$PR_TO_TEST" != "0" ]
@@ -175,7 +175,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.*" server.log > description.txt
+        if ! grep -ao "Received signal.*\|Logical error.*\|Assertion.*failed\|Failed assertion.*\|.*runtime error: .*\|.*is located.*\|SUMMARY: MemorySanitizer:.*" server.log > description.txt
         then
             echo "Lost connection to server. See the logs" > description.txt
         fi

From 3048fa84148efd96595d3d46c5ccbad177b57733 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <36882414+akuzm@users.noreply.github.com>
Date: Fri, 22 Jan 2021 13:21:29 +0300
Subject: [PATCH 330/611] Update run-fuzzer.sh

---
 docker/test/fuzzer/run-fuzzer.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index 74f64d06a65..ce68bad4094 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -27,7 +27,7 @@ function clone
     # If not master, try to fetch pull/.../{head,merge}
     if [ "$PR_TO_TEST" != "0" ]
     then
-        git fetch --depth=1 origin "refs/pull/$PR_TO_TEST/*:refs/heads/pull/$PR_TO_TEST/*"
+        git fetch --depth=100 origin "refs/pull/$PR_TO_TEST/*:refs/heads/pull/$PR_TO_TEST/*"
     fi
 
     git checkout "$SHA_TO_TEST"

From 2e95000d64f1555f5641786c039c8ba226b2bbf7 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Fri, 22 Jan 2021 13:25:59 +0300
Subject: [PATCH 331/611] Update tests.

---
 tests/queries/0_stateless/00850_global_join_dups.reference | 1 +
 tests/queries/0_stateless/01651_bugs_from_15889.sql        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/queries/0_stateless/00850_global_join_dups.reference b/tests/queries/0_stateless/00850_global_join_dups.reference
index dcaae3f745e..d94e4df3425 100644
--- a/tests/queries/0_stateless/00850_global_join_dups.reference
+++ b/tests/queries/0_stateless/00850_global_join_dups.reference
@@ -1,4 +1,5 @@
 1
+\N
 0
 0
 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 f364101ecc0..34fcfc64114 100644
--- a/tests/queries/0_stateless/01651_bugs_from_15889.sql
+++ b/tests/queries/0_stateless/01651_bugs_from_15889.sql
@@ -107,5 +107,5 @@ WITH (
     ) AS t)
 SELECT if(dateDiff('second', toDateTime(time_with_microseconds), toDateTime(t)) = -9223372036854775808, 'ok', '');
 
-
+set joined_subquery_requires_alias=0;
 SELECT number, number / 2 AS n, j1, j2 FROM remote('127.0.0.{2,3}', system.numbers) GLOBAL ANY LEFT JOIN (SELECT number / 3 AS n, number AS j1, 'Hello' AS j2 FROM system.numbers LIMIT 1048577) USING (n) LIMIT 10 format Null;

From 41afc5938b397e6057c4b9fa27ba39f5a8ee76d3 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Fri, 22 Jan 2021 13:44:24 +0300
Subject: [PATCH 332/611] Remove exception about extra extremes.

---
 src/Processors/QueryPipeline.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Processors/QueryPipeline.cpp b/src/Processors/QueryPipeline.cpp
index ff086fd5b11..97d753bf5fb 100644
--- a/src/Processors/QueryPipeline.cpp
+++ b/src/Processors/QueryPipeline.cpp
@@ -182,8 +182,11 @@ void QueryPipeline::addExtremesTransform()
 {
     checkInitializedAndNotCompleted();
 
+    /// It is possible that pipeline already have extremes.
+    /// For example, it may be added from VIEW subquery.
+    /// In this case, recalculate extremes again - they should be calculated for different rows.
     if (pipe.getExtremesPort())
-        throw Exception("Extremes transform was already added to pipeline.", ErrorCodes::LOGICAL_ERROR);
+        pipe.dropExtremes();
 
     resize(1);
     auto transform = std::make_shared<ExtremesTransform>(getHeader());

From cc2788af881c96701076b366259bc99525d926b1 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Fri, 22 Jan 2021 13:48:40 +0300
Subject: [PATCH 333/611] Fix typo

---
 src/Server/TestKeeperTCPHandler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Server/TestKeeperTCPHandler.cpp b/src/Server/TestKeeperTCPHandler.cpp
index 6bd8eaa65f7..97999c2b1c1 100644
--- a/src/Server/TestKeeperTCPHandler.cpp
+++ b/src/Server/TestKeeperTCPHandler.cpp
@@ -357,7 +357,7 @@ void TestKeeperTCPHandler::runImpl()
                 while (in->available());
             }
 
-            /// Process exact amout of responses from pipe
+            /// 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)

From 6dc32ae4cbaf9aee31133a34a77014b3a93b6024 Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Fri, 22 Jan 2021 11:58:29 +0000
Subject: [PATCH 334/611] More correct for functions and aggr. functions

---
 .../AggregateFunctionFactory.cpp              | 17 ++++----
 src/DataTypes/DataTypeFactory.cpp             |  2 +-
 src/Functions/FunctionFactory.cpp             | 14 +++----
 ...56_test_query_log_factories_info.reference | 26 +++++++-----
 .../01656_test_query_log_factories_info.sql   | 40 +++++++++++++++----
 5 files changed, 67 insertions(+), 32 deletions(-)

diff --git a/src/AggregateFunctions/AggregateFunctionFactory.cpp b/src/AggregateFunctions/AggregateFunctionFactory.cpp
index 8556f68f3e2..a298c982506 100644
--- a/src/AggregateFunctions/AggregateFunctionFactory.cpp
+++ b/src/AggregateFunctions/AggregateFunctionFactory.cpp
@@ -60,13 +60,6 @@ static DataTypes convertLowCardinalityTypesToNested(const DataTypes & types)
 AggregateFunctionPtr AggregateFunctionFactory::get(
     const String & name, const DataTypes & argument_types, const Array & parameters, AggregateFunctionProperties & out_properties) const
 {
-    if (CurrentThread::isInitialized())
-    {
-        auto query_context = CurrentThread::get().getQueryContext();
-        if (query_context && query_context->getSettingsRef().log_queries)
-            query_context->addQueryFactoriesInfo(Context::QueryLogFactories::AggregateFunction, name);
-    }
-
     auto type_without_low_cardinality = convertLowCardinalityTypesToNested(argument_types);
 
     /// If one of the types is Nullable, we apply aggregate function combinator "Null".
@@ -116,10 +109,17 @@ AggregateFunctionPtr AggregateFunctionFactory::getImpl(
     if (auto jt = case_insensitive_aggregate_functions.find(Poco::toLower(name)); jt != case_insensitive_aggregate_functions.end())
         found = jt->second;
 
+    const Context * query_context = nullptr;
+    if (CurrentThread::isInitialized())
+        query_context = CurrentThread::get().getQueryContext();
+
     if (found.creator)
     {
         out_properties = found.properties;
 
+        if (query_context && query_context->getSettingsRef().log_queries)
+            query_context->addQueryFactoriesInfo(Context::QueryLogFactories::AggregateFunction, 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)
             return nullptr;
@@ -136,6 +136,9 @@ AggregateFunctionPtr AggregateFunctionFactory::getImpl(
         if (combinator->isForInternalUsageOnly())
             throw Exception("Aggregate function combinator '" + combinator->getName() + "' is only for internal usage", ErrorCodes::UNKNOWN_AGGREGATE_FUNCTION);
 
+        if (query_context && query_context->getSettingsRef().log_queries)
+            query_context->addQueryFactoriesInfo(Context::QueryLogFactories::AggregateFunction, combinator->getName());
+
         String nested_name = name.substr(0, name.size() - combinator->getName().size());
         DataTypes nested_types = combinator->transformArguments(argument_types);
         Array nested_parameters = combinator->transformParameters(parameters);
diff --git a/src/DataTypes/DataTypeFactory.cpp b/src/DataTypes/DataTypeFactory.cpp
index 028f8536c6a..f95afa76deb 100644
--- a/src/DataTypes/DataTypeFactory.cpp
+++ b/src/DataTypes/DataTypeFactory.cpp
@@ -80,7 +80,7 @@ DataTypePtr DataTypeFactory::get(const String & family_name_param, const ASTPtr
 
     if (CurrentThread::isInitialized())
     {
-        auto query_context = CurrentThread::get().getQueryContext();
+        const auto * query_context = CurrentThread::get().getQueryContext();
         if (query_context && query_context->getSettingsRef().log_queries)
             query_context->addQueryFactoriesInfo(Context::QueryLogFactories::DataType, family_name);
     }
diff --git a/src/Functions/FunctionFactory.cpp b/src/Functions/FunctionFactory.cpp
index f3e2998c48b..630798f7631 100644
--- a/src/Functions/FunctionFactory.cpp
+++ b/src/Functions/FunctionFactory.cpp
@@ -77,13 +77,6 @@ FunctionOverloadResolverPtr FunctionFactory::get(
     const std::string & name,
     const Context & context) const
 {
-    if (CurrentThread::isInitialized())
-    {
-        auto query_context = CurrentThread::get().getQueryContext();
-        if (query_context && query_context->getSettingsRef().log_queries)
-            query_context->addQueryFactoriesInfo(Context::QueryLogFactories::Function, name);
-    }
-
     return std::make_shared<FunctionOverloadResolverAdaptor>(getImpl(name, context));
 }
 
@@ -93,6 +86,13 @@ FunctionOverloadResolverImplPtr FunctionFactory::tryGetImpl(
 {
     String name = getAliasToOrName(name_param);
 
+    if (CurrentThread::isInitialized())
+    {
+        const auto * query_context = CurrentThread::get().getQueryContext();
+        if (query_context && query_context->getSettingsRef().log_queries)
+            query_context->addQueryFactoriesInfo(Context::QueryLogFactories::Function, name);
+    }
+
     auto it = functions.find(name);
     if (functions.end() != it)
         return it->second(context);
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 64195b333c7..50d1775b445 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,13 +1,21 @@
-1	100
-used_aggregate_functions	used_table_functions	used_functions
-['uniq','count']	['numbers']	['plus','toDate','addDays']
+2	 worl	\N	50	4950	Nullable(UInt64)	50
+2	 worl	\N	50	4950	Nullable(UInt64)	50
 
-\N
-\N
-used_functions	used_data_types
-['cast']	['Nullable','UInt8']
+arraySort(used_aggregate_functions)
+['Array','If','OrDefault','OrNull','avg','count','sum','uniq']
+
+arraySort(used_table_functions)
+['numbers']
+
+arraySort(used_functions)
+['addDays','cast','modulo','plus','substring','toDate','toDayOfYear','toTypeName']
+
+arraySort(used_data_types)
+['Nullable','UInt8']
 
 used_databases
 ['Atomic']
-used_data_types	used_storages
-['DateTime','String']	['Memory']
+
+arraySort(used_data_types)	used_storages
+['DateTime','UInt64']	['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 7304a236a8a..0f5600b975a 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
@@ -1,27 +1,51 @@
-SELECT uniq(1, 1, 2, 2), count(toDate('2000-12-05') + number as d) FROM numbers(100);
+SELECT uniqArray([1, 1, 2]),
+       SUBSTRING('Hello, world', 7, 5),
+       CAST(arrayJoin([NULL, NULL]) AS Nullable(UInt8)),
+       avgOrDefaultIf(number, number % 2),
+       sumOrNull(number),
+       toTypeName(sumOrNull(number)),
+       countIf(toDate('2000-12-05') + number as d,
+       toDayOfYear(d) % 2)
+FROM numbers(100);
+SELECT '';
+
 SYSTEM FLUSH LOGS;
-SELECT used_aggregate_functions, used_table_functions, used_functions
+SELECT arraySort(used_aggregate_functions)
 FROM system.query_log WHERE type = 'QueryFinish' AND (query LIKE '%toDate(\'2000-12-05\')%')
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
 SELECT '';
 
-SELECT CAST(arrayJoin([NULL, NULL]) AS Nullable(UInt8)) AS x;
-SYSTEM FLUSH LOGS;
-SELECT used_functions, used_data_types
-FROM system.query_log WHERE type = 'QueryFinish' AND query LIKE 'SELECT CAST(arrayJ%'
+SELECT arraySort(used_table_functions)
+FROM system.query_log WHERE type = 'QueryFinish' AND (query LIKE '%toDate(\'2000-12-05\')%')
+ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
+SELECT '';
+
+SELECT arraySort(used_functions)
+FROM system.query_log WHERE type = 'QueryFinish' AND (query LIKE '%toDate(\'2000-12-05\')%')
+ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
+SELECT '';
+
+SELECT arraySort(used_data_types)
+FROM system.query_log WHERE type = 'QueryFinish' AND (query LIKE '%toDate(\'2000-12-05\')%')
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
 SELECT '';
 
 DROP database IF EXISTS test_query_log_factories_info1;
 CREATE database test_query_log_factories_info1 ENGINE=Atomic;
-CREATE OR REPLACE TABLE test_query_log_factories_info1.memory_table (event String, date DateTime) ENGINE=Memory();
+
 SYSTEM FLUSH LOGS;
 SELECT used_databases
 FROM system.query_log
 WHERE type == 'QueryFinish' AND (query LIKE '%database test_query_log_factories_info%')
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
-SELECT used_data_types, used_storages
+SELECT '';
+
+CREATE OR REPLACE TABLE test_query_log_factories_info1.memory_table (id UInt64, date DateTime) ENGINE=Memory();
+
+SYSTEM FLUSH LOGS;
+SELECT arraySort(used_data_types), used_storages
 FROM system.query_log
 WHERE type == 'QueryFinish' AND (query LIKE '%TABLE test%')
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
+SELECT '';
 

From 827ccc5395c40189a6102bfe76585f78f78faeea Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Fri, 22 Jan 2021 12:19:06 +0000
Subject: [PATCH 335/611] Fix failing stateless test (tsan)

---
 src/TableFunctions/TableFunctionFactory.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/TableFunctions/TableFunctionFactory.cpp b/src/TableFunctions/TableFunctionFactory.cpp
index d706d5be86b..c0b09e720b6 100644
--- a/src/TableFunctions/TableFunctionFactory.cpp
+++ b/src/TableFunctions/TableFunctionFactory.cpp
@@ -1,6 +1,7 @@
 #include <TableFunctions/TableFunctionFactory.h>
 
 #include <Interpreters/Context.h>
+#include <Common/CurrentThread.h>
 #include <Common/Exception.h>
 #include <IO/WriteHelpers.h>
 #include <Parsers/ASTFunction.h>
@@ -45,8 +46,13 @@ TableFunctionPtr TableFunctionFactory::get(
 
     res->parseArguments(ast_function, context);
 
-    if (context.hasQueryContext() && context.getSettingsRef().log_queries)
-        context.getQueryContext().addQueryFactoriesInfo(Context::QueryLogFactories::TableFunction, table_function->name);
+    if (CurrentThread::isInitialized())
+    {
+        const auto * query_context = CurrentThread::get().getQueryContext();
+        if (query_context && query_context->getSettingsRef().log_queries)
+            query_context->addQueryFactoriesInfo(Context::QueryLogFactories::TableFunction, table_function->name);
+    }
+
 
     return res;
 }

From 41a4f54bccdb54d42dc1e569331156f28d8d3b4b Mon Sep 17 00:00:00 2001
From: Ilya Yatsishin <2159081+qoega@users.noreply.github.com>
Date: Fri, 22 Jan 2021 15:36:15 +0300
Subject: [PATCH 336/611] Update
 docker/test/fuzzer/query-fuzzer-tweaks-users.xml

---
 docker/test/fuzzer/query-fuzzer-tweaks-users.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/test/fuzzer/query-fuzzer-tweaks-users.xml b/docker/test/fuzzer/query-fuzzer-tweaks-users.xml
index 88230e63d4a..810fb9249f8 100644
--- a/docker/test/fuzzer/query-fuzzer-tweaks-users.xml
+++ b/docker/test/fuzzer/query-fuzzer-tweaks-users.xml
@@ -12,7 +12,7 @@
                 </max_execution_time>
 
                 <max_memory_usage>
-                    <max>10GB</max>
+                    <max>10737418240</max>
                 </max_memory_usage>
 
                 <!-- Not ready for production -->

From 35608a1f6a04376364c2e19a72f30a2641c9e410 Mon Sep 17 00:00:00 2001
From: olgarev <56617294+olgarev@users.noreply.github.com>
Date: Fri, 22 Jan 2021 15:59:39 +0300
Subject: [PATCH 337/611] Apply suggestions from code review

Co-authored-by: tavplubix <tavplubix@gmail.com>
---
 docs/en/sql-reference/table-functions/file.md   | 5 ++---
 docs/en/sql-reference/table-functions/remote.md | 6 +++---
 docs/en/sql-reference/table-functions/url.md    | 6 +++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/docs/en/sql-reference/table-functions/file.md b/docs/en/sql-reference/table-functions/file.md
index fd1855653b9..d1eb81e52c6 100644
--- a/docs/en/sql-reference/table-functions/file.md
+++ b/docs/en/sql-reference/table-functions/file.md
@@ -60,9 +60,8 @@ SELECT * FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 U
 Inserting data from a file into a table:
 
 ``` sql
-CREATE TABLE file_engine_table (column1 UInt32, column2 UInt32, column3 UInt32) ENGINE=File(CSV);
-INSERT INTO file_engine_table FROM file('test.csv', 'CSV', 'column1 UInt32, column2 UInt32, column3 UInt32');
-SELECT * FROM file_engine_table;
+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
diff --git a/docs/en/sql-reference/table-functions/remote.md b/docs/en/sql-reference/table-functions/remote.md
index 5dc915a8522..8af5b588412 100644
--- a/docs/en/sql-reference/table-functions/remote.md
+++ b/docs/en/sql-reference/table-functions/remote.md
@@ -101,9 +101,9 @@ SELECT * FROM remote('127.0.0.1', db.remote_engine_table) LIMIT 3;
 Inserting data from a remote server into a table:
 
 ``` sql
-CREATE TABLE remote_engine_table (name String, value UInt32) ENGINE=Distributed(cluster, default, hits);
-INSERT INTO remote_engine_table FROM remote('127.0.0.1', db.remote_engine_table);
-SELECT * FROM remote_engine_table;
+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;
 ```
 
 [Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/remote/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/url.md b/docs/en/sql-reference/table-functions/url.md
index 1ef878f1074..07d05f12c7d 100644
--- a/docs/en/sql-reference/table-functions/url.md
+++ b/docs/en/sql-reference/table-functions/url.md
@@ -36,9 +36,9 @@ SELECT * FROM url('http://127.0.0.1:12345/', CSV, 'column1 String, column2 UInt3
 Inserting data from a URL into a table:
 
 ``` sql
-CREATE TABLE url_engine_table (column1 String, column2 UInt32) ENGINE=URL('http://127.0.0.1:12345/', CSV);
-INSERT INTO url_engine_table FROM url('http://127.0.0.1:12345/', 'CSV', 'column1 String, column2 UInt32');
-SELECT * FROM url_engine_table;
+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;
 ```
 
 [Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/url/) <!--hide-->

From 2d988f6791ac356ab269441dc85a18af06a44e44 Mon Sep 17 00:00:00 2001
From: tavplubix <avtokmakov@yandex-team.ru>
Date: Fri, 22 Jan 2021 16:01:04 +0300
Subject: [PATCH 338/611] Update arcadia_skip_list.txt

---
 tests/queries/0_stateless/arcadia_skip_list.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/queries/0_stateless/arcadia_skip_list.txt b/tests/queries/0_stateless/arcadia_skip_list.txt
index 6315fa4b126..f6877e36857 100644
--- a/tests/queries/0_stateless/arcadia_skip_list.txt
+++ b/tests/queries/0_stateless/arcadia_skip_list.txt
@@ -188,3 +188,4 @@
 01650_fetch_patition_with_macro_in_zk_path
 01651_bugs_from_15889
 01655_agg_if_nullable
+01182_materialized_view_different_structure

From 51d9f2ab0c0e111eab0084150b27abb7942ffa8d Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Fri, 22 Jan 2021 16:06:39 +0300
Subject: [PATCH 339/611] GET\POST specific

---
 docs/en/sql-reference/table-functions/url.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/table-functions/url.md b/docs/en/sql-reference/table-functions/url.md
index 07d05f12c7d..d70774b7588 100644
--- a/docs/en/sql-reference/table-functions/url.md
+++ b/docs/en/sql-reference/table-functions/url.md
@@ -17,7 +17,7 @@ url(URL, format, structure)
 
 **Input parameters**
 
-- `URL` - HTTP or HTTPS server address, which can accept `GET` and/or `POST` requests. Type: [String](../../sql-reference/data-types/string.md).
+- `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).
 

From d712748304f4201e1fa0d6258e23d927796bedcd Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Fri, 22 Jan 2021 16:24:51 +0300
Subject: [PATCH 340/611] Function accurateCastOrNull fixed unitialized values
 for numeric cast

---
 src/Functions/FunctionsConversion.h               |  8 ++++++++
 tests/performance/casts.xml                       | 15 +++++++++++++++
 .../01556_accurate_cast_or_null.reference         |  2 ++
 .../0_stateless/01556_accurate_cast_or_null.sql   |  2 ++
 4 files changed, 27 insertions(+)
 create mode 100644 tests/performance/casts.xml

diff --git a/src/Functions/FunctionsConversion.h b/src/Functions/FunctionsConversion.h
index 978fa0a79d8..0e162fc2469 100644
--- a/src/Functions/FunctionsConversion.h
+++ b/src/Functions/FunctionsConversion.h
@@ -188,7 +188,10 @@ struct ConvertImpl
                     (std::is_same_v<FromFieldType, UInt128> || std::is_same_v<ToFieldType, UInt128>))
                 {
                     if constexpr (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>)
+                    {
+                        vec_to[i] = 0;
                         (*vec_null_map_to)[i] = true;
+                    }
                     else
                         throw Exception("Unexpected UInt128 to big int conversion", ErrorCodes::NOT_IMPLEMENTED);
                 }
@@ -215,7 +218,10 @@ struct ConvertImpl
                             if (convert_result)
                                 vec_to[i] = result;
                             else
+                            {
+                                vec_to[i] = static_cast<ToFieldType>(0);
                                 (*vec_null_map_to)[i] = true;
+                            }
                         }
                         else
                         {
@@ -238,6 +244,7 @@ struct ConvertImpl
                             {
                                 if constexpr (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>)
                                 {
+                                    vec_to[i] = 0;
                                     (*vec_null_map_to)[i] = true;
                                     continue;
                                 }
@@ -255,6 +262,7 @@ struct ConvertImpl
                             {
                                 if (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>)
                                 {
+                                    vec_to[i] = 0;
                                     (*vec_null_map_to)[i] = true;
                                 }
                                 else
diff --git a/tests/performance/casts.xml b/tests/performance/casts.xml
new file mode 100644
index 00000000000..17a1c774353
--- /dev/null
+++ b/tests/performance/casts.xml
@@ -0,0 +1,15 @@
+<test max_ignored_relative_change="0.2">
+    <settings>
+        <max_memory_usage>15G</max_memory_usage>
+    </settings>
+
+    <create_query>CREATE TABLE t (x UInt64) ENGINE = Memory</create_query>
+    <!-- use less threads to save memory -->
+    <fill_query>INSERT INTO t SELECT number AS x FROM numbers_mt(200000000) SETTINGS max_threads = 8</fill_query>
+    <drop_query>DROP TABLE IF EXISTS t</drop_query>
+
+    <query>SELECT cast(x, 'Int64'), cast(x, 'Int128'), cast(x, 'Int256'), cast(x, 'String'), cast(x, 'Decimal64(8)') FROM t FORMAT Null</query>
+    <query>SELECT accurateCast(x, 'Int64'), accurateCast(x, 'Int128'), accurateCast(x, 'Int256'), accurateCast(x, 'String'), accurateCast(x, 'Decimal64(8)') FROM t FORMAT Null</query>
+    <query>SELECT accurateCastOrNull(x, 'Int64'), accurateCastOrNull(x, 'Int128'), accurateCastOrNull(x, 'Int256'), accurateCastOrNull(x, 'String'), accurateCastOrNull(x, 'Decimal64(8)') FROM t FORMAT Null</query>
+
+</test>
diff --git a/tests/queries/0_stateless/01556_accurate_cast_or_null.reference b/tests/queries/0_stateless/01556_accurate_cast_or_null.reference
index 4287c755c3f..3b27dd2e2e1 100644
--- a/tests/queries/0_stateless/01556_accurate_cast_or_null.reference
+++ b/tests/queries/0_stateless/01556_accurate_cast_or_null.reference
@@ -28,3 +28,5 @@
 \N
 \N
 \N
+127
+\N
diff --git a/tests/queries/0_stateless/01556_accurate_cast_or_null.sql b/tests/queries/0_stateless/01556_accurate_cast_or_null.sql
index b11ed5939fa..b45bbe35662 100644
--- a/tests/queries/0_stateless/01556_accurate_cast_or_null.sql
+++ b/tests/queries/0_stateless/01556_accurate_cast_or_null.sql
@@ -33,3 +33,5 @@ SELECT accurateCastOrNull(inf, 'UInt64');
 SELECT accurateCastOrNull(inf, 'UInt256');
 SELECT accurateCastOrNull(nan, 'UInt64');
 SELECT accurateCastOrNull(nan, 'UInt256');
+
+SELECT accurateCastOrNull(number + 127, 'Int8') AS x FROM numbers (2) ORDER BY x;

From 70b419986998ff517d90ac978462662635696a46 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Fri, 22 Jan 2021 16:30:01 +0300
Subject: [PATCH 341/611] Add test.

---
 .../01660_second_extremes_bug.reference          | 16 ++++++++++++++++
 .../0_stateless/01660_second_extremes_bug.sql    | 10 ++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 tests/queries/0_stateless/01660_second_extremes_bug.reference
 create mode 100644 tests/queries/0_stateless/01660_second_extremes_bug.sql

diff --git a/tests/queries/0_stateless/01660_second_extremes_bug.reference b/tests/queries/0_stateless/01660_second_extremes_bug.reference
new file mode 100644
index 00000000000..9b6a60d5b25
--- /dev/null
+++ b/tests/queries/0_stateless/01660_second_extremes_bug.reference
@@ -0,0 +1,16 @@
+{
+	"meta":
+	[
+		{
+			"name": "a",
+			"type": "String"
+		}
+	],
+
+	"data":
+	[
+
+	],
+
+	"rows": 0
+}
diff --git a/tests/queries/0_stateless/01660_second_extremes_bug.sql b/tests/queries/0_stateless/01660_second_extremes_bug.sql
new file mode 100644
index 00000000000..f5515470208
--- /dev/null
+++ b/tests/queries/0_stateless/01660_second_extremes_bug.sql
@@ -0,0 +1,10 @@
+DROP TABLE IF EXISTS t;
+DROP TABLE IF EXISTS t_v;
+
+CREATE TABLE t ( a String ) ENGINE = Memory();
+CREATE VIEW t_v AS SELECT * FROM t;
+SET output_format_write_statistics = 0;
+SELECT * FROM t_v FORMAT JSON SETTINGS extremes = 1;
+
+DROP TABLE IF EXISTS t;
+DROP TABLE IF EXISTS t_v;

From d683bf42ce3b52b6453832a076ff182a4c523f8b Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Fri, 22 Jan 2021 16:46:56 +0300
Subject: [PATCH 342/611] Review fixes.

---
 src/Interpreters/ActionsDAG.cpp        | 2 +-
 src/Processors/QueryPlan/QueryPlan.cpp | 6 ++++++
 tests/performance/split_filter.xml     | 4 ++--
 tests/queries/skip_list.json           | 3 ++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index 4eae60488b9..4c3a4cbe0fa 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -946,7 +946,7 @@ std::pair<ActionsDAGPtr, ActionsDAGPtr> ActionsDAG::split(std::unordered_set<con
                     {
                         auto & child_data = data[child];
 
-                        /// If children is not created, int may be from split part.
+                        /// If children is not created, it may be from split part.
                         if (!child_data.to_second)
                         {
                             if (child->type == ActionType::COLUMN) /// Just create new node for COLUMN action.
diff --git a/src/Processors/QueryPlan/QueryPlan.cpp b/src/Processors/QueryPlan/QueryPlan.cpp
index 92ee5d4a1d2..6fba991a56c 100644
--- a/src/Processors/QueryPlan/QueryPlan.cpp
+++ b/src/Processors/QueryPlan/QueryPlan.cpp
@@ -600,6 +600,12 @@ static bool trySplitFilter(QueryPlan::Node * node, QueryPlan::Nodes & nodes)
 
 void QueryPlan::optimize()
 {
+    /* Stack contains info for every nodes in the path from tree root to the current node.
+     * Every optimization changes only current node and it's children.
+     * Optimization may change QueryPlanStep, but not QueryPlan::Node (only add a new one).
+     * So, QueryPlan::Node::children will be always valid.
+     */
+
     struct Frame
     {
         Node * node;
diff --git a/tests/performance/split_filter.xml b/tests/performance/split_filter.xml
index 4b503a6645b..56b1f5ff6ae 100644
--- a/tests/performance/split_filter.xml
+++ b/tests/performance/split_filter.xml
@@ -1,4 +1,4 @@
 <test>
-    <query>select sum(x), sum(y) from (select sipHash64(number) as x, bitAnd(number, 1024) as y from numbers_mt(200000000)) where y = 0 settings enable_optimize_predicate_expression=0</query>
-    <query>select sum(x), sum(y) from (select sipHash64(number) as x, bitAnd(number, 1024) as y from numbers_mt(200000000) limit 200000000) where y = 0</query>
+    <query>select sum(x), sum(y) from (select sipHash64(number) as x, bitAnd(number, 1023) as y from numbers_mt(200000000)) where y = 0 settings enable_optimize_predicate_expression=0</query>
+    <query>select sum(x), sum(y) from (select sipHash64(number) as x, bitAnd(number, 1023) as y from numbers_mt(200000000) limit 200000000) where y = 0</query>
 </test>
diff --git a/tests/queries/skip_list.json b/tests/queries/skip_list.json
index cfbac463932..35c7b4ffb10 100644
--- a/tests/queries/skip_list.json
+++ b/tests/queries/skip_list.json
@@ -309,7 +309,8 @@
         "01632_max_partitions_to_read",
         "01638_div_mod_ambiguities",
         "01642_if_nullable_regression",
-        "01643_system_suspend"
+        "01643_system_suspend",
+        "01655_plan_optimizations"
     ],
     "parallel":
     [

From 136e9652d0a9551d08c2625381e0aaacb215b1f6 Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Fri, 22 Jan 2021 17:16:08 +0300
Subject: [PATCH 343/611] Update query-fuzzer-tweaks-users.xml

---
 docker/test/fuzzer/query-fuzzer-tweaks-users.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/test/fuzzer/query-fuzzer-tweaks-users.xml b/docker/test/fuzzer/query-fuzzer-tweaks-users.xml
index 810fb9249f8..1e82f137961 100644
--- a/docker/test/fuzzer/query-fuzzer-tweaks-users.xml
+++ b/docker/test/fuzzer/query-fuzzer-tweaks-users.xml
@@ -12,7 +12,7 @@
                 </max_execution_time>
 
                 <max_memory_usage>
-                    <max>10737418240</max>
+                    <max>10G</max>
                 </max_memory_usage>
 
                 <!-- Not ready for production -->

From 14e842c197f8299d178935b55e8bb74695596072 Mon Sep 17 00:00:00 2001
From: Alexander Tokmakov <avtokmakov@yandex-team.ru>
Date: Fri, 22 Jan 2021 17:27:23 +0300
Subject: [PATCH 344/611] print stderr of failed subprocess

---
 tests/integration/helpers/cluster.py          | 30 ++++++++++++-------
 tests/integration/helpers/network.py          |  2 +-
 tests/integration/test_grpc_protocol/test.py  |  5 ++--
 .../test_grpc_protocol_ssl/test.py            |  5 ++--
 .../materialize_with_ddl.py                   |  8 ++---
 .../test_materialize_mysql_database/test.py   | 13 ++++----
 tests/integration/test_mysql_protocol/test.py | 13 ++++----
 .../test_postgresql_protocol/test.py          |  9 ++----
 utils/check-style/check-style                 |  4 +++
 9 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/tests/integration/helpers/cluster.py b/tests/integration/helpers/cluster.py
index d8ef6d89d44..4d8f3c68025 100644
--- a/tests/integration/helpers/cluster.py
+++ b/tests/integration/helpers/cluster.py
@@ -45,10 +45,19 @@ def _create_env_file(path, variables, fname=DEFAULT_ENV_NAME):
             f.write("=".join([var, value]) + "\n")
     return full_path
 
+def run_and_check(args, env=None, shell=False):
+    res = subprocess.run(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env, shell=shell)
+    if res.returncode != 0:
+        # check_call(...) from subprocess does not print stderr, so we do it manually
+        print('Stderr:\n{}\n'.format(res.stderr))
+        print('Stdout:\n{}\n'.format(res.stdout))
+        raise Exception('Command {} return non-zero code {}: {}'.format(args, res.returncode, res.stderr))
+
+
 def subprocess_check_call(args):
     # Uncomment for debugging
     # print('run:', ' ' . join(args))
-    subprocess.check_call(args)
+    run_and_check(args)
 
 
 def subprocess_call(args):
@@ -56,7 +65,6 @@ def subprocess_call(args):
     # print('run:', ' ' . join(args))
     subprocess.call(args)
 
-
 def get_odbc_bridge_path():
     path = os.environ.get('CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH')
     if path is None:
@@ -390,9 +398,9 @@ class ClickHouseCluster:
                 raise Exception("You should specity ipv4_address in add_node method")
             self._replace(node.docker_compose_path, node.ipv4_address, new_ip)
             node.ipv4_address = new_ip
-        subprocess.check_call(self.base_cmd + ["stop", node.name])
-        subprocess.check_call(self.base_cmd + ["rm", "--force", "--stop", node.name])
-        subprocess.check_call(self.base_cmd + ["up", "--force-recreate", "--no-deps", "-d", node.name])
+        run_and_check(self.base_cmd + ["stop", node.name])
+        run_and_check(self.base_cmd + ["rm", "--force", "--stop", node.name])
+        run_and_check(self.base_cmd + ["up", "--force-recreate", "--no-deps", "-d", node.name])
         node.ip_address = self.get_instance_ip(node.name)
         node.client = Client(node.ip_address, command=self.client_bin_path)
         start_deadline = time.time() + 20.0  # seconds
@@ -637,7 +645,7 @@ class ClickHouseCluster:
                             os.mkdir(zk_log_data_path)
                         env['ZK_DATA' + str(i)] = zk_data_path
                         env['ZK_DATA_LOG' + str(i)] = zk_log_data_path
-                subprocess.check_call(self.base_zookeeper_cmd + common_opts, env=env)
+                run_and_check(self.base_zookeeper_cmd + common_opts, env=env)
                 for command in self.pre_zookeeper_commands:
                     self.run_kazoo_commands_with_retries(command, repeats=5)
                 self.wait_zookeeper_to_start(120)
@@ -662,7 +670,7 @@ class ClickHouseCluster:
                 print('Setup kerberized kafka')
                 env = os.environ.copy()
                 env['KERBERIZED_KAFKA_DIR'] = instance.path + '/'
-                subprocess.check_call(self.base_kerberized_kafka_cmd + common_opts + ['--renew-anon-volumes'], env=env)
+                run_and_check(self.base_kerberized_kafka_cmd + common_opts + ['--renew-anon-volumes'], env=env)
                 self.kerberized_kafka_docker_id = self.get_instance_docker_id('kerberized_kafka1')
             if self.with_rabbitmq and self.base_rabbitmq_cmd:
                 subprocess_check_call(self.base_rabbitmq_cmd + common_opts + ['--renew-anon-volumes'])
@@ -678,13 +686,13 @@ class ClickHouseCluster:
                 print('Setup kerberized HDFS')
                 env = os.environ.copy()
                 env['KERBERIZED_HDFS_DIR'] = instance.path + '/'
-                subprocess.check_call(self.base_kerberized_hdfs_cmd + common_opts, env=env)
+                run_and_check(self.base_kerberized_hdfs_cmd + common_opts, env=env)
                 self.make_hdfs_api(kerberized=True)
                 self.wait_hdfs_to_start(timeout=300)
 
             if self.with_mongo and self.base_mongo_cmd:
                 print('Setup Mongo')
-                subprocess_check_call(self.base_mongo_cmd + common_opts)
+                run_and_check(self.base_mongo_cmd + common_opts)
                 self.wait_mongo_to_start(30)
 
             if self.with_redis and self.base_redis_cmd:
@@ -709,7 +717,7 @@ class ClickHouseCluster:
                 minio_start_cmd = self.base_minio_cmd + common_opts
 
                 logging.info("Trying to create Minio instance by command %s", ' '.join(map(str, minio_start_cmd)))
-                subprocess.check_call(minio_start_cmd, env=env)
+                run_and_check(minio_start_cmd, env=env)
 
                 try:
                     logging.info("Trying to connect to Minio...")
@@ -754,7 +762,7 @@ class ClickHouseCluster:
         sanitizer_assert_instance = None
         with open(self.docker_logs_path, "w+") as f:
             try:
-                subprocess.check_call(self.base_cmd + ['logs'], stdout=f)
+                subprocess.check_call(self.base_cmd + ['logs'], stdout=f)   # STYLE_CHECK_ALLOW_SUBPROCESS_CHECK_CALL
             except Exception as e:
                 print("Unable to get logs from docker.")
             f.seek(0)
diff --git a/tests/integration/helpers/network.py b/tests/integration/helpers/network.py
index cf411201128..aa697c63d72 100644
--- a/tests/integration/helpers/network.py
+++ b/tests/integration/helpers/network.py
@@ -191,7 +191,7 @@ class _NetworkManager:
                 # before running
                 for i in range(5):
                     try:
-                        subprocess.check_call("docker pull yandex/clickhouse-integration-helper", shell=True)
+                        subprocess.check_call("docker pull yandex/clickhouse-integration-helper", shell=True)   # STYLE_CHECK_ALLOW_SUBPROCESS_CHECK_CALL
                         break
                     except:
                         time.sleep(i)
diff --git a/tests/integration/test_grpc_protocol/test.py b/tests/integration/test_grpc_protocol/test.py
index 3a3dc464155..d8604276281 100644
--- a/tests/integration/test_grpc_protocol/test.py
+++ b/tests/integration/test_grpc_protocol/test.py
@@ -1,10 +1,9 @@
 import os
 import pytest
-import subprocess
 import sys
 import time
 import grpc
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, run_and_check
 from threading import Thread
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
@@ -15,7 +14,7 @@ SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 proto_dir = os.path.join(SCRIPT_DIR, './protos')
 gen_dir = os.path.join(SCRIPT_DIR, './_gen')
 os.makedirs(gen_dir, exist_ok=True)
-subprocess.check_call(
+run_and_check(
     'python3 -m grpc_tools.protoc -I{proto_dir} --python_out={gen_dir} --grpc_python_out={gen_dir} \
     {proto_dir}/clickhouse_grpc.proto'.format(proto_dir=proto_dir, gen_dir=gen_dir), shell=True)
 
diff --git a/tests/integration/test_grpc_protocol_ssl/test.py b/tests/integration/test_grpc_protocol_ssl/test.py
index a311dee8781..c040ccd041f 100644
--- a/tests/integration/test_grpc_protocol_ssl/test.py
+++ b/tests/integration/test_grpc_protocol_ssl/test.py
@@ -1,9 +1,8 @@
 import os
 import pytest
-import subprocess
 import sys
 import grpc
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, run_and_check
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
@@ -13,7 +12,7 @@ SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 proto_dir = os.path.join(SCRIPT_DIR, './protos')
 gen_dir = os.path.join(SCRIPT_DIR, './_gen')
 os.makedirs(gen_dir, exist_ok=True)
-subprocess.check_call(
+run_and_check(
     'python3 -m grpc_tools.protoc -I{proto_dir} --python_out={gen_dir} --grpc_python_out={gen_dir} \
     {proto_dir}/clickhouse_grpc.proto'.format(proto_dir=proto_dir, gen_dir=gen_dir), shell=True)
 
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 c04194c8ebb..4f547ffa1f5 100644
--- a/tests/integration/test_materialize_mysql_database/materialize_with_ddl.py
+++ b/tests/integration/test_materialize_mysql_database/materialize_with_ddl.py
@@ -1,13 +1,11 @@
 import time
 
 import pymysql.cursors
-import subprocess
 import pytest
-from helpers.client import QueryRuntimeException
 from helpers.network import PartitionManager
 import pytest
 from helpers.client import QueryRuntimeException
-from helpers.cluster import get_docker_compose_path
+from helpers.cluster import get_docker_compose_path, run_and_check
 import random
 
 import threading
@@ -684,7 +682,7 @@ def mysql_killed_while_insert(clickhouse_node, mysql_node, service_name):
         t = threading.Thread(target=insert, args=(10000,))
         t.start()
 
-        subprocess.check_call(
+        run_and_check(
             ['docker-compose', '-p', mysql_node.project_name, '-f', mysql_node.docker_compose, 'stop'])
     finally:
         with pytest.raises(QueryRuntimeException) as execption:
@@ -692,7 +690,7 @@ def mysql_killed_while_insert(clickhouse_node, mysql_node, service_name):
             clickhouse_node.query("SELECT count() FROM kill_mysql_while_insert.test")
         assert "Master maybe lost." in str(execption.value)
 
-        subprocess.check_call(
+        run_and_check(
             ['docker-compose', '-p', mysql_node.project_name, '-f', mysql_node.docker_compose, 'start'])
         mysql_node.wait_mysql_to_start(120)
 
diff --git a/tests/integration/test_materialize_mysql_database/test.py b/tests/integration/test_materialize_mysql_database/test.py
index 1b7aa041540..dbd6e894987 100644
--- a/tests/integration/test_materialize_mysql_database/test.py
+++ b/tests/integration/test_materialize_mysql_database/test.py
@@ -1,12 +1,11 @@
 import os
 import os.path as p
-import subprocess
 import time
 import pwd
 import re
 import pymysql.cursors
 import pytest
-from helpers.cluster import ClickHouseCluster, get_docker_compose_path
+from helpers.cluster import ClickHouseCluster, get_docker_compose_path, run_and_check
 import docker
 
 from . import materialize_with_ddl
@@ -87,7 +86,7 @@ class MySQLNodeInstance:
                 print("Can't connect to MySQL " + str(ex))
                 time.sleep(0.5)
 
-        subprocess.check_call(['docker-compose', 'ps', '--services', 'all'])
+        run_and_check(['docker-compose', 'ps', '--services', 'all'])
         raise Exception("Cannot wait MySQL container")
 
 @pytest.fixture(scope="module")
@@ -96,13 +95,13 @@ def started_mysql_5_7():
     mysql_node = MySQLNodeInstance('root', 'clickhouse', '127.0.0.1', 3308, docker_compose)
 
     try:
-        subprocess.check_call(
+        run_and_check(
             ['docker-compose', '-p', cluster.project_name, '-f', docker_compose, 'up', '--no-recreate', '-d'])
         mysql_node.wait_mysql_to_start(120)
         yield mysql_node
     finally:
         mysql_node.close()
-        subprocess.check_call(['docker-compose', '-p', cluster.project_name, '-f', docker_compose, 'down', '--volumes',
+        run_and_check(['docker-compose', '-p', cluster.project_name, '-f', docker_compose, 'down', '--volumes',
                                '--remove-orphans'])
 
 
@@ -112,13 +111,13 @@ def started_mysql_8_0():
     mysql_node = MySQLNodeInstance('root', 'clickhouse', '127.0.0.1', 33308, docker_compose)
 
     try:
-        subprocess.check_call(
+        run_and_check(
             ['docker-compose', '-p', cluster.project_name, '-f', docker_compose, 'up', '--no-recreate', '-d'])
         mysql_node.wait_mysql_to_start(120)
         yield mysql_node
     finally:
         mysql_node.close()
-        subprocess.check_call(['docker-compose', '-p', cluster.project_name, '-f', docker_compose, 'down', '--volumes',
+        run_and_check(['docker-compose', '-p', cluster.project_name, '-f', docker_compose, 'down', '--volumes',
                                '--remove-orphans'])
 
 
diff --git a/tests/integration/test_mysql_protocol/test.py b/tests/integration/test_mysql_protocol/test.py
index e2f787f9ee3..9532d4b8ba2 100644
--- a/tests/integration/test_mysql_protocol/test.py
+++ b/tests/integration/test_mysql_protocol/test.py
@@ -3,14 +3,13 @@
 import datetime
 import math
 import os
-import subprocess
 import time
 
 import docker
 import pymysql.connections
 import pytest
 from docker.models.containers import Container
-from helpers.cluster import ClickHouseCluster, get_docker_compose_path
+from helpers.cluster import ClickHouseCluster, get_docker_compose_path, run_and_check
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 DOCKER_COMPOSE_PATH = get_docker_compose_path()
@@ -35,7 +34,7 @@ def server_address():
 @pytest.fixture(scope='module')
 def mysql_client():
     docker_compose = os.path.join(DOCKER_COMPOSE_PATH, 'docker_compose_mysql_client.yml')
-    subprocess.check_call(
+    run_and_check(
         ['docker-compose', '-p', cluster.project_name, '-f', docker_compose, 'up', '--no-recreate', '-d', '--no-build'])
     yield docker.from_env().containers.get(cluster.project_name + '_mysql1_1')
 
@@ -62,7 +61,7 @@ def mysql_server(mysql_client):
 @pytest.fixture(scope='module')
 def golang_container():
     docker_compose = os.path.join(DOCKER_COMPOSE_PATH, 'docker_compose_mysql_golang_client.yml')
-    subprocess.check_call(
+    run_and_check(
         ['docker-compose', '-p', cluster.project_name, '-f', docker_compose, 'up', '--no-recreate', '-d', '--no-build'])
     yield docker.from_env().containers.get(cluster.project_name + '_golang1_1')
 
@@ -70,7 +69,7 @@ def golang_container():
 @pytest.fixture(scope='module')
 def php_container():
     docker_compose = os.path.join(DOCKER_COMPOSE_PATH, 'docker_compose_mysql_php_client.yml')
-    subprocess.check_call(
+    run_and_check(
         ['docker-compose', '-p', cluster.project_name, '-f', docker_compose, 'up', '--no-recreate', '-d', '--no-build'])
     yield docker.from_env().containers.get(cluster.project_name + '_php1_1')
 
@@ -78,7 +77,7 @@ def php_container():
 @pytest.fixture(scope='module')
 def nodejs_container():
     docker_compose = os.path.join(DOCKER_COMPOSE_PATH, 'docker_compose_mysql_js_client.yml')
-    subprocess.check_call(
+    run_and_check(
         ['docker-compose', '-p', cluster.project_name, '-f', docker_compose, 'up', '--no-recreate', '-d', '--no-build'])
     yield docker.from_env().containers.get(cluster.project_name + '_mysqljs1_1')
 
@@ -86,7 +85,7 @@ def nodejs_container():
 @pytest.fixture(scope='module')
 def java_container():
     docker_compose = os.path.join(DOCKER_COMPOSE_PATH, 'docker_compose_mysql_java_client.yml')
-    subprocess.check_call(
+    run_and_check(
         ['docker-compose', '-p', cluster.project_name, '-f', docker_compose, 'up', '--no-recreate', '-d', '--no-build'])
     yield docker.from_env().containers.get(cluster.project_name + '_java1_1')
 
diff --git a/tests/integration/test_postgresql_protocol/test.py b/tests/integration/test_postgresql_protocol/test.py
index 3436fc5bace..c63896eb196 100644
--- a/tests/integration/test_postgresql_protocol/test.py
+++ b/tests/integration/test_postgresql_protocol/test.py
@@ -1,11 +1,8 @@
 # -*- coding: utf-8 -*-
 
-
-
 import datetime
 import decimal
 import os
-import subprocess
 import sys
 import time
 import uuid
@@ -14,7 +11,7 @@ import docker
 import psycopg2 as py_psql
 import psycopg2.extras
 import pytest
-from helpers.cluster import ClickHouseCluster, get_docker_compose_path
+from helpers.cluster import ClickHouseCluster, get_docker_compose_path, run_and_check
 
 psycopg2.extras.register_uuid()
 
@@ -42,7 +39,7 @@ def server_address():
 @pytest.fixture(scope='module')
 def psql_client():
     docker_compose = os.path.join(DOCKER_COMPOSE_PATH, 'docker_compose_postgesql.yml')
-    subprocess.check_call(
+    run_and_check(
         ['docker-compose', '-p', cluster.project_name, '-f', docker_compose, 'up', '--no-recreate', '-d', '--build'])
     yield docker.from_env().containers.get(cluster.project_name + '_psql_1')
 
@@ -66,7 +63,7 @@ def psql_server(psql_client):
 @pytest.fixture(scope='module')
 def java_container():
     docker_compose = os.path.join(DOCKER_COMPOSE_PATH, 'docker_compose_postgesql_java_client.yml')
-    subprocess.check_call(
+    run_and_check(
         ['docker-compose', '-p', cluster.project_name, '-f', docker_compose, 'up', '--no-recreate', '-d', '--build'])
     yield docker.from_env().containers.get(cluster.project_name + '_java_1')
 
diff --git a/utils/check-style/check-style b/utils/check-style/check-style
index ddad0a5ddac..f1f7b3fab16 100755
--- a/utils/check-style/check-style
+++ b/utils/check-style/check-style
@@ -126,3 +126,7 @@ find $ROOT_PATH/{src,programs,utils} -name '*.h' -or -name '*.cpp' |
 # Conflict markers
 find $ROOT_PATH/{src,base,programs,utils,tests,docs,website,cmake} -name '*.md' -or -name '*.cpp' -or -name '*.h' |
     xargs grep -P '^(<<<<<<<|=======|>>>>>>>)$' | grep -P '.' && echo "Conflict markers are found in files"
+
+# Forbid subprocess.check_call(...) in integration tests because it does not provide enough information on errors
+find $ROOT_PATH'/tests/integration' -name '*.py' |
+    xargs grep -F 'subprocess.check_call' | grep -v "STYLE_CHECK_ALLOW_SUBPROCESS_CHECK_CALL" && echo "Use helpers.cluster.run_and_check or subprocess.run instead of subprocess.check_call to print detailed info on error"

From 8fdb9d901859b547f8d79f5688cf6f752129a27b Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Fri, 22 Jan 2021 17:28:25 +0300
Subject: [PATCH 345/611] Update Dockerfile

---
 docker/server/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile
index 954adf8559a..209d158fe67 100644
--- a/docker/server/Dockerfile
+++ b/docker/server/Dockerfile
@@ -40,7 +40,7 @@ RUN groupadd -r clickhouse --gid=101 \
     && mkdir -p /var/lib/clickhouse /var/log/clickhouse-server /etc/clickhouse-server /etc/clickhouse-client \
     && chmod ugo+Xrw -R /var/lib/clickhouse /var/log/clickhouse-server /etc/clickhouse-server /etc/clickhouse-client
 
-# we need to allow to allow "others" access to clickhouse folder, because docker container
+# we need to allow "others" access to clickhouse folder, because docker container
 # can be started with arbitrary uid (openshift usecase)
 
 ADD https://github.com/tianon/gosu/releases/download/$gosu_ver/gosu-amd64 /bin/gosu

From 04b950ecbdba5c407cd3b33ba25ccfae3abbe296 Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Fri, 22 Jan 2021 17:28:36 +0300
Subject: [PATCH 346/611] Update Dockerfile.alpine

---
 docker/server/Dockerfile.alpine | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/server/Dockerfile.alpine b/docker/server/Dockerfile.alpine
index 67f217f7b66..0f9de1996ab 100644
--- a/docker/server/Dockerfile.alpine
+++ b/docker/server/Dockerfile.alpine
@@ -24,7 +24,7 @@ RUN addgroup -S -g 101 clickhouse \
     && apk add --no-cache su-exec bash \
     && chmod ugo+Xrw -R /var/lib/clickhouse /var/log/clickhouse-server /etc/clickhouse-server /etc/clickhouse-client
 
-# we need to allow to allow "others" access to clickhouse folder, because docker container
+# we need to allow "others" access to clickhouse folder, because docker container
 # can be started with arbitrary uid (openshift usecase)
 
 EXPOSE 9000 8123 9009

From 963dadae54c4f615080f389da63e2ad8df63134c Mon Sep 17 00:00:00 2001
From: Alexander Tokmakov <avtokmakov@yandex-team.ru>
Date: Fri, 22 Jan 2021 19:07:19 +0300
Subject: [PATCH 347/611] fix wrong parts in parts_to_do

---
 src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
index d87c6b75fbf..71574b6ef9d 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
@@ -310,6 +310,11 @@ void ReplicatedMergeTreeQueue::addPartToMutations(const String & part_name)
     for (auto it = from_it; it != in_partition->second.end(); ++it)
     {
         MutationStatus & status = *it->second;
+        /// Do not add special virtual parts to parts_to_do
+        auto max_level = MergeTreePartInfo::MAX_LEVEL;      /// DROP/DETACH PARTITION
+        auto another_max_level = std::numeric_limits<decltype(part_info.level)>::max();    /// REPLACE/MOVE PARTITION
+        if (part_info.level == max_level || part_info.level == another_max_level)
+            continue;
         status.parts_to_do.add(part_name);
     }
 }
@@ -723,7 +728,10 @@ void ReplicatedMergeTreeQueue::updateMutations(zkutil::ZooKeeperPtr zookeeper, C
                 /// Initialize `mutation.parts_to_do`. First we need to mutate all parts in `current_parts`.
                 Strings current_parts_to_mutate = getPartNamesToMutate(*entry, current_parts);
                 for (const String & current_part_to_mutate : current_parts_to_mutate)
+                {
+                    assert(MergeTreePartInfo::fromPartName(current_part_to_mutate, format_version).level < MergeTreePartInfo::MAX_LEVEL);
                     mutation.parts_to_do.add(current_part_to_mutate);
+                }
 
                 /// And next we would need to mutate all parts with getDataVersion() greater than
                 /// mutation block number that would appear as a result of executing the queue.

From ad73dc6c721bb7e8a7d988a3aaa1d7c44391d9e5 Mon Sep 17 00:00:00 2001
From: vdimir <vdimir@yandex-team.ru>
Date: Fri, 22 Jan 2021 19:21:45 +0300
Subject: [PATCH 348/611] Check literal types in RewriteSumIfFunctionMatcher
 (#19406)

---
 src/Interpreters/RewriteSumIfFunctionVisitor.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Interpreters/RewriteSumIfFunctionVisitor.cpp b/src/Interpreters/RewriteSumIfFunctionVisitor.cpp
index b856f9164e0..2fb0765db13 100644
--- a/src/Interpreters/RewriteSumIfFunctionVisitor.cpp
+++ b/src/Interpreters/RewriteSumIfFunctionVisitor.cpp
@@ -35,13 +35,16 @@ void RewriteSumIfFunctionMatcher::visit(const ASTFunction & func, ASTPtr & ast,
     if (lower_name != "sum" && lower_name != "sumif")
         return;
 
-    auto & func_arguments = func.arguments->children;
+    const auto & func_arguments = func.arguments->children;
 
     if (lower_name == "sumif")
     {
         /// sumIf(1, cond) -> countIf(cond)
         const auto * literal = func_arguments[0]->as<ASTLiteral>();
-        if (func_arguments.size() == 2 && literal && literal->value.get<UInt64>() == 1)
+        if (!literal || !DB::isInt64FieldType(literal->value.getType()))
+            return;
+
+        if (func_arguments.size() == 2 && literal->value.get<UInt64>() == 1)
         {
             auto new_func = createNewFunctionWithOneArgument("countIf", func_arguments[1]);
             new_func->setAlias(func.alias);
@@ -49,7 +52,6 @@ void RewriteSumIfFunctionMatcher::visit(const ASTFunction & func, ASTPtr & ast,
             return;
         }
     }
-
     else
     {
         const auto * nested_func = func_arguments[0]->as<ASTFunction>();
@@ -57,13 +59,16 @@ void RewriteSumIfFunctionMatcher::visit(const ASTFunction & func, ASTPtr & ast,
         if (!nested_func || Poco::toLower(nested_func->name) != "if" || nested_func->arguments->children.size() != 3)
             return;
 
-        auto & if_arguments = nested_func->arguments->children;
+        const auto & if_arguments = nested_func->arguments->children;
 
         const auto * first_literal = if_arguments[1]->as<ASTLiteral>();
         const auto * second_literal = if_arguments[2]->as<ASTLiteral>();
 
         if (first_literal && second_literal)
         {
+            if (!DB::isInt64FieldType(first_literal->value.getType()) || !DB::isInt64FieldType(second_literal->value.getType()))
+                return;
+
             auto first_value = first_literal->value.get<UInt64>();
             auto second_value = second_literal->value.get<UInt64>();
             /// sum(if(cond, 1, 0)) -> countIf(cond)

From f13a075797b861eae34232e249968aef6c627f05 Mon Sep 17 00:00:00 2001
From: Daria Mozhaeva <dmozhaeva@yandex-team.ru>
Date: Fri, 22 Jan 2021 19:40:58 +0300
Subject: [PATCH 349/611] Fixed notes.

---
 .../integrations/embedded-rocksdb.md          | 15 ++++--------
 .../integrations/embedded-rocksdb.md          | 14 ++++-------
 docs/ru/operations/settings/settings.md       | 24 +++++++++----------
 3 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/docs/en/engines/table-engines/integrations/embedded-rocksdb.md b/docs/en/engines/table-engines/integrations/embedded-rocksdb.md
index 79e0e040377..95602fa313a 100644
--- a/docs/en/engines/table-engines/integrations/embedded-rocksdb.md
+++ b/docs/en/engines/table-engines/integrations/embedded-rocksdb.md
@@ -1,4 +1,4 @@
----
+.---
 toc_priority: 6
 toc_title: EmbeddedRocksDB
 ---
@@ -7,8 +7,6 @@ toc_title: EmbeddedRocksDB
 
 This engine allows integrating ClickHouse with [rocksdb](http://rocksdb.org/).
 
-`EmbeddedRocksDB` lets you:
-
 ## Creating a Table {#table_engine-EmbeddedRocksDB-creating-a-table}
 
 ``` sql
@@ -23,6 +21,9 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 Required parameters:
 
 -  `primary_key_name` – any column name in the column list.
+- `primary key` must be specified, it supports only one column in the primary key. The primary key will be serialized in binary as a `rocksdb key`.
+- columns other than the primary key will be serialized in binary as `rocksdb` value in corresponding order.
+- queries with key `equals` or `in` filtering will be optimized to multi keys lookup from `rocksdb`.
 
 Example:
 
@@ -36,10 +37,4 @@ CREATE TABLE test
 )
 ENGINE = EmbeddedRocksDB
 PRIMARY KEY key
-```
-
-## Description {#description}
-
-- `primary key` must be specified, it supports only one column in the primary key. The primary key will be serialized in binary as a rocksdb key.
-- columns other than the primary key will be serialized in binary as rocksdb value in corresponding order.
-- queries with key `equals` or `in` filtering will be optimized to multi keys lookup from rocksdb.
+```
\ No newline at end of file
diff --git a/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md b/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md
index 575fc279b74..cb59cc9b568 100644
--- a/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md
+++ b/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md
@@ -7,8 +7,6 @@ toc_title: EmbeddedRocksDB
 
 Этот движок позволяет интегрировать ClickHouse с [rocksdb](http://rocksdb.org/).
 
-`EmbeddedRocksDB` дает возможность:
-
 ## Создание таблицы {#table_engine-EmbeddedRocksDB-creating-a-table}
 
 ``` sql
@@ -23,7 +21,9 @@ PRIMARY KEY(primary_key_name);
 
 Обязательные параметры:
 
--  `primary_key_name` – любое имя столбца из списка столбцов.
+`primary_key_name` может быть любое имя столбца из списка столбцов.
+Указание первичного ключа `primary key` является обязательным. Он будет сериализован в двоичном формате как ключ `rocksdb`. Поддерживается только один столбец в первичном ключе.
+Столбцы, которые отличаются от первичного ключа, будут сериализованы в двоичном формате как значение `rockdb` в соответствующем порядке. Запросы с фильтрацией по ключу `equals` или `in` оптимизируются для поиска по нескольким ключам из `rocksdb`.
 
 Пример:
 
@@ -37,10 +37,4 @@ CREATE TABLE test
 )
 ENGINE = EmbeddedRocksDB
 PRIMARY KEY key;
-```
-
-## Описание {#description}
-
-- должен быть указан `primary key`, он поддерживает только один столбец в первичном ключе. Первичный ключ будет сериализован в двоичном формате как ключ rocksdb.
-- столбцы, отличные от первичного ключа, будут сериализованы в двоичном формате как значение rockdb в соответствующем порядке.
-- запросы с фильтрацией по ключу `equals` или `in` будут оптимизированы для поиска по нескольким ключам из rocksdb.
+```
\ No newline at end of file
diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index b48ca668aa4..ace0ede7c4d 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -406,15 +406,15 @@ INSERT INTO table_with_enum_column_for_tsv_insert FORMAT TSV 102	2;
 
 Возможные значения:
 
--   `'best_effort'` — включает расширенный парсинг.
+-   `best_effort` — включает расширенный парсинг.
 
-        ClickHouse может парсить базовый формат `YYYY-MM-DD HH:MM:SS` и все форматы [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601). Например, `'2018-06-08T01:02:03.000Z'`.
+        ClickHouse может парсить базовый формат `YYYY-MM-DD HH:MM:SS` и все форматы [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601). Например, `2018-06-08T01:02:03.000Z`.
 
--   `'basic'` — используется базовый парсер.
+-   `basic` — используется базовый парсер.
 
-        ClickHouse может парсить только базовый формат `YYYY-MM-DD HH:MM:SS`. Например, `'2019-08-20 10:18:56'`.
+        ClickHouse может парсить только базовый формат `YYYY-MM-DD HH:MM:SS`. Например, `2019-08-20 10:18:56`.
 
-Значение по умолчанию: `'basic'`.
+Значение по умолчанию: `basic`.
 
 См. также:
 
@@ -427,19 +427,19 @@ INSERT INTO table_with_enum_column_for_tsv_insert FORMAT TSV 102	2;
 
 Возможные значения:
 
--   `'simple'` - простой выходной формат.
+-   `simple` - простой выходной формат.
 
-    Выходные дата и время Clickhouse в формате `YYYY-MM-DD hh:mm:ss`. Например, `'2019-08-20 10:18:56'`. Расчет выполняется в соответствии с часовым поясом типа данных (если он есть) или часовым поясом сервера.
+    Выходные дата и время Clickhouse в формате `YYYY-MM-DD hh:mm:ss`. Например, `2019-08-20 10:18:56`. Расчет выполняется в соответствии с часовым поясом типа данных (если он есть) или часовым поясом сервера.
 
--   `'iso'` - выходной формат ISO.
+-   `iso` - выходной формат ISO.
 
-    Выходные дата и время Clickhouse в формате [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) `YYYY-MM-DDThh:mm:ssZ`. Например, `'2019-08-20T10:18:56Z'`. Обратите внимание, что выходные данные отображаются в формате UTC (`Z` означает UTC).
+    Выходные дата и время Clickhouse в формате [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) `YYYY-MM-DDThh:mm:ssZ`. Например, `2019-08-20T10:18:56Z`. Обратите внимание, что выходные данные отображаются в формате UTC (`Z` означает UTC).
 
--   `'unix_timestamp'` - выходной формат Unix.
+-   `unix_timestamp` - выходной формат Unix.
 
-    Выходные дата и время в формате [Unix](https://en.wikipedia.org/wiki/Unix_time). Например `'1566285536'`.
+    Выходные дата и время в формате [Unix](https://en.wikipedia.org/wiki/Unix_time). Например `1566285536`.
 
-Значение по умолчанию: `'simple'`.
+Значение по умолчанию: `simple`.
 
 См. также:
 

From 7014729aad53ef88aa54ae69d43d28f99dc722db Mon Sep 17 00:00:00 2001
From: Daria Mozhaeva <dmozhaeva@yandex-team.ru>
Date: Fri, 22 Jan 2021 20:11:00 +0300
Subject: [PATCH 350/611] add punctuation.

---
 docs/en/operations/settings/settings.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index 1ff2ea77fd0..3591ee200e5 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -443,19 +443,19 @@ Allows choosing different output formats of the text representation of date and
 
 Possible values:
 
--   `'simple'` - Simple output format.
+-   `simple` - Simple output format.
 
-    Clickhouse output date and time `YYYY-MM-DD hh:mm:ss` format. For example, `'2019-08-20 10:18:56'`. The calculation is performed according to the data type's time zone (if present) or server time zone.
+    Clickhouse output date and time `YYYY-MM-DD hh:mm:ss` format. For example, `2019-08-20 10:18:56`. The calculation is performed according to the data type's time zone (if present) or server time zone.
 
--   `'iso'` - ISO output format.
+-   `iso` - ISO output format.
 
-    Clickhouse output date and time in [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) `YYYY-MM-DDThh:mm:ssZ` format. For example, `'2019-08-20T10:18:56Z'`. Note that output is in UTC (`Z` means UTC).
+    Clickhouse output date and time in [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) `YYYY-MM-DDThh:mm:ssZ` format. For example, `2019-08-20T10:18:56Z`. Note that output is in UTC (`Z` means UTC).
 
--   `'unix_timestamp'` - Unix timestamp output format.
+-   `unix_timestamp` - Unix timestamp output format.
 
-    Clickhouse output date and time in [Unix timestamp](https://en.wikipedia.org/wiki/Unix_time) format. For example `'1566285536'`.
+    Clickhouse output date and time in [Unix timestamp](https://en.wikipedia.org/wiki/Unix_time) format. For example `1566285536`.
 
-Default value: `'simple'`.
+Default value: `simple`.
 
 See also:
 

From ccf332ea7e459a28c6d05b90d2783aad831b91ea Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Fri, 22 Jan 2021 20:15:31 +0300
Subject: [PATCH 351/611] Don't dwell on the past in query fuzzer

When we remember too many query fragments, just clean the database
and start collecting it anew. Hopefully this should make the fuzzer more
aggressive.
---
 programs/client/QueryFuzzer.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/programs/client/QueryFuzzer.cpp b/programs/client/QueryFuzzer.cpp
index 3892e8e5732..ae0de450a10 100644
--- a/programs/client/QueryFuzzer.cpp
+++ b/programs/client/QueryFuzzer.cpp
@@ -479,7 +479,7 @@ void QueryFuzzer::addTableLike(const ASTPtr ast)
 {
     if (table_like_map.size() > 1000)
     {
-        return;
+        table_like_map.clear();
     }
 
     const auto name = ast->formatForErrorMessage();
@@ -493,7 +493,7 @@ void QueryFuzzer::addColumnLike(const ASTPtr ast)
 {
     if (column_like_map.size() > 1000)
     {
-        return;
+        column_like_map.clear();
     }
 
     const auto name = ast->formatForErrorMessage();
@@ -507,10 +507,12 @@ void QueryFuzzer::collectFuzzInfoRecurse(const ASTPtr ast)
 {
     if (auto * impl = dynamic_cast<ASTWithAlias *>(ast.get()))
     {
-        if (aliases_set.size() < 1000)
+        if (aliases_set.size() > 1000)
         {
-            aliases_set.insert(impl->alias);
+            aliases_set.clear();
         }
+
+        aliases_set.insert(impl->alias);
     }
 
     if (typeid_cast<ASTLiteral *>(ast.get()))

From 23c7f4a0ead312c565607e11231aa79c9130e74f Mon Sep 17 00:00:00 2001
From: Dmitriy <sevirov@yandex-team.ru>
Date: Fri, 22 Jan 2021 20:41:28 +0300
Subject: [PATCH 352/611] Fix the translation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Поправил перевод на русский язык.
---
 docs/ru/interfaces/formats.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/ru/interfaces/formats.md b/docs/ru/interfaces/formats.md
index d767ceb2b8d..98426b489e8 100644
--- a/docs/ru/interfaces/formats.md
+++ b/docs/ru/interfaces/formats.md
@@ -493,9 +493,9 @@ ClickHouse поддерживает [NULL](../sql-reference/syntax.md), кото
 
 ## JSONAsString {#jsonasstring}
 
-В этом формате один объект JSON интерпретируется как одно значение. Если входные данные имеют несколько объектов JSON, разделенных запятой, то они будут интерпретироваться как отдельные строки.
+В этом формате один объект JSON интерпретируется как одно строковое значение. Если входные данные имеют несколько объектов JSON, разделенных запятой, то они будут интерпретироваться как отдельные строки таблицы.
 
-В этом формате парситься может только таблица с единственным полем типа [String](../sql-reference/data-types/string.md). Остальные столбцы должны быть заданы как `DEFAULT` или `MATERIALIZED`(смотрите раздел [Значения по умолчанию](../sql-reference/statements/create/table.md#create-default-values)), либо отсутствовать. Как только вы соберете весь объект JSON в строку, для его обработки вы можете использовать [функции для работы с JSON](../sql-reference/functions/json-functions.md).
+В этом формате парситься может только таблица с единственным полем типа [String](../sql-reference/data-types/string.md). Остальные столбцы должны быть заданы как `DEFAULT` или `MATERIALIZED`(смотрите раздел [Значения по умолчанию](../sql-reference/statements/create/table.md#create-default-values)), либо отсутствовать. Для дальнейшей обработки объекта JSON, представленного в строке, вы можете использовать [функции для работы с JSON](../sql-reference/functions/json-functions.md).
 
 **Пример**
 

From 76ef420d15c2583fa1a86e2ac6074aac56db7ce3 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Fri, 22 Jan 2021 21:05:25 +0300
Subject: [PATCH 353/611] Update fast test

---
 docker/test/fasttest/run.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index fb3b3e3b459..96e14b2910d 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -269,6 +269,7 @@ function run_tests
         01281_group_by_limit_memory_tracking    # max_memory_usage_for_user can interfere another queries running concurrently
         01318_encrypt                           # Depends on OpenSSL
         01318_decrypt                           # Depends on OpenSSL
+        01663_aes_msan                          # Depends on OpenSSL
         01281_unsucceeded_insert_select_queries_counter
         01292_create_user
         01294_lazy_database_concurrent

From 70b8c0117d6b187fa351cd9897180f13506e3a66 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Fri, 22 Jan 2021 21:06:40 +0300
Subject: [PATCH 354/611] Remove some suppressions

---
 tests/msan_suppressions.txt  | 10 ----------
 tests/ubsan_suppressions.txt |  4 +---
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/tests/msan_suppressions.txt b/tests/msan_suppressions.txt
index 45e460a23f6..e0edd7f3dd7 100644
--- a/tests/msan_suppressions.txt
+++ b/tests/msan_suppressions.txt
@@ -5,19 +5,9 @@ fun:__gxx_personality_*
 # it is OK. Reproduce with "select ngramDistanceCaseInsensitive(materialize(''), '')"
 fun:tolower
 
-# May be it's not OK, but suppress it to run other tests
-# Some functions in OpenSSL:
-fun:probable_prime
-fun:BN_bin2bn
-fun:BN_add_word
-fun:bn_div_fixed_top
-fun:bn_mul_words
-fun:BN_cmp
-
 # 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/openssl/*
 src:*/contrib/simdjson/*
 src:*/contrib/lz4/*
 
diff --git a/tests/ubsan_suppressions.txt b/tests/ubsan_suppressions.txt
index c29da437a11..6a55155e330 100644
--- a/tests/ubsan_suppressions.txt
+++ b/tests/ubsan_suppressions.txt
@@ -1,3 +1 @@
-# Suppress some failures in contrib so that we can enable UBSan in CI.
-# Ideally, we should report these upstream.
-src:*/contrib/openssl/*
\ No newline at end of file
+# We have no suppressions!

From 109dbe5df4e893279aa7afa21ce9c2c07cf17d07 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 22 Jan 2021 21:26:47 +0300
Subject: [PATCH 355/611] Check the stream before sending while hanlding async
 INSERTs into Distributed

It is possible to get corruption (even though it is very unlikely, and
initially it wasn't corruption) just before the data block goes in the
file on disk, and in case of batching, it will break the packets, since
it will write the packet type but will not write any data after.
---
 src/Client/Connection.cpp                     | 4 ++++
 src/Storages/Distributed/DirectoryMonitor.cpp | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/Client/Connection.cpp b/src/Client/Connection.cpp
index 084f169bb9f..7a216961df4 100644
--- a/src/Client/Connection.cpp
+++ b/src/Client/Connection.cpp
@@ -54,6 +54,7 @@ namespace ErrorCodes
     extern const int UNKNOWN_PACKET_FROM_SERVER;
     extern const int SUPPORT_IS_DISABLED;
     extern const int BAD_ARGUMENTS;
+    extern const int EMPTY_DATA_PASSED;
 }
 
 
@@ -545,6 +546,9 @@ void Connection::sendPreparedData(ReadBuffer & input, size_t size, const String
 {
     /// NOTE 'Throttler' is not used in this method (could use, but it's not important right now).
 
+    if (input.eof())
+        throw Exception("Buffer is empty (some kind of corruption)", ErrorCodes::EMPTY_DATA_PASSED);
+
     writeVarUInt(Protocol::Client::Data, *out);
     writeStringBinary(name, *out);
 
diff --git a/src/Storages/Distributed/DirectoryMonitor.cpp b/src/Storages/Distributed/DirectoryMonitor.cpp
index 1b0b78ba0d9..f54a19c4d15 100644
--- a/src/Storages/Distributed/DirectoryMonitor.cpp
+++ b/src/Storages/Distributed/DirectoryMonitor.cpp
@@ -46,6 +46,7 @@ namespace ErrorCodes
     extern const int CHECKSUM_DOESNT_MATCH;
     extern const int TOO_LARGE_SIZE_COMPRESSED;
     extern const int ATTEMPT_TO_READ_AFTER_EOF;
+    extern const int EMPTY_DATA_PASSED;
 }
 
 
@@ -170,6 +171,7 @@ namespace
     bool isFileBrokenErrorCode(int code, bool remote_error)
     {
         return code == ErrorCodes::CHECKSUM_DOESNT_MATCH
+            || code == ErrorCodes::EMPTY_DATA_PASSED
             || code == ErrorCodes::TOO_LARGE_SIZE_COMPRESSED
             || code == ErrorCodes::CANNOT_READ_ALL_DATA
             || code == ErrorCodes::UNKNOWN_CODEC

From d1d82bc897f8e94d6c69ef0bc11f9c0ef11cebb2 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 22 Jan 2021 21:34:41 +0300
Subject: [PATCH 356/611] Fix build with unbundled poco

Refs: #13405
Cc: @excitoon
---
 src/IO/HTTPCommon.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/IO/HTTPCommon.cpp b/src/IO/HTTPCommon.cpp
index 6a3ebb97734..c869b212595 100644
--- a/src/IO/HTTPCommon.cpp
+++ b/src/IO/HTTPCommon.cpp
@@ -120,7 +120,7 @@ namespace
                 session->setProxyHost(proxy_host);
                 session->setProxyPort(proxy_port);
 
-#if !defined(ARCADIA_BUILD)
+#if defined(POCO_CLICKHOUSE_PATCH)
                 session->setProxyProtocol(proxy_scheme);
 
                 /// Turn on tunnel mode if proxy scheme is HTTP while endpoint scheme is HTTPS.

From fb71a0704e52c043684886506a4abb8355615644 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Fri, 22 Jan 2021 23:35:16 +0300
Subject: [PATCH 357/611] Fix UBSan report in arraySlice

---
 src/Functions/array/arraySlice.cpp                          | 4 ++--
 tests/queries/0_stateless/01664_array_slice_ubsan.reference | 1 +
 tests/queries/0_stateless/01664_array_slice_ubsan.sql       | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 tests/queries/0_stateless/01664_array_slice_ubsan.reference
 create mode 100644 tests/queries/0_stateless/01664_array_slice_ubsan.sql

diff --git a/src/Functions/array/arraySlice.cpp b/src/Functions/array/arraySlice.cpp
index 0044de0e93e..1e72e6a45cf 100644
--- a/src/Functions/array/arraySlice.cpp
+++ b/src/Functions/array/arraySlice.cpp
@@ -119,7 +119,7 @@ public:
                 if (offset > 0)
                     sink = GatherUtils::sliceFromLeftConstantOffsetUnbounded(*source, static_cast<size_t>(offset - 1));
                 else
-                    sink = GatherUtils::sliceFromRightConstantOffsetUnbounded(*source, static_cast<size_t>(-offset));
+                    sink = GatherUtils::sliceFromRightConstantOffsetUnbounded(*source, -static_cast<size_t>(offset));
             }
             else if (isColumnConst(*length_column))
             {
@@ -127,7 +127,7 @@ public:
                 if (offset > 0)
                     sink = GatherUtils::sliceFromLeftConstantOffsetBounded(*source, static_cast<size_t>(offset - 1), length);
                 else
-                    sink = GatherUtils::sliceFromRightConstantOffsetBounded(*source, static_cast<size_t>(-offset), length);
+                    sink = GatherUtils::sliceFromRightConstantOffsetBounded(*source, -static_cast<size_t>(offset), length);
             }
             else
                 sink = GatherUtils::sliceDynamicOffsetBounded(*source, *offset_column, *length_column);
diff --git a/tests/queries/0_stateless/01664_array_slice_ubsan.reference b/tests/queries/0_stateless/01664_array_slice_ubsan.reference
new file mode 100644
index 00000000000..abae410d95c
--- /dev/null
+++ b/tests/queries/0_stateless/01664_array_slice_ubsan.reference
@@ -0,0 +1 @@
+[0,0,0]
diff --git a/tests/queries/0_stateless/01664_array_slice_ubsan.sql b/tests/queries/0_stateless/01664_array_slice_ubsan.sql
new file mode 100644
index 00000000000..604aa1c584b
--- /dev/null
+++ b/tests/queries/0_stateless/01664_array_slice_ubsan.sql
@@ -0,0 +1 @@
+SELECT arraySlice(groupArray(x), -9223372036854775808, NULL) AS y FROM (SELECT '6553.5', uniqState(NULL) AS x FROM numbers(3) GROUP BY number);
\ No newline at end of file

From a04360e6b2303f441e03c8aed262f6d3c9fd193e Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Fri, 22 Jan 2021 23:36:10 +0300
Subject: [PATCH 358/611] Update 01664_array_slice_ubsan.sql

---
 tests/queries/0_stateless/01664_array_slice_ubsan.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/queries/0_stateless/01664_array_slice_ubsan.sql b/tests/queries/0_stateless/01664_array_slice_ubsan.sql
index 604aa1c584b..dc79283c141 100644
--- a/tests/queries/0_stateless/01664_array_slice_ubsan.sql
+++ b/tests/queries/0_stateless/01664_array_slice_ubsan.sql
@@ -1 +1 @@
-SELECT arraySlice(groupArray(x), -9223372036854775808, NULL) AS y FROM (SELECT '6553.5', uniqState(NULL) AS x FROM numbers(3) GROUP BY number);
\ No newline at end of file
+SELECT arraySlice(groupArray(x), -9223372036854775808, NULL) AS y FROM (SELECT '6553.5', uniqState(NULL) AS x FROM numbers(3) GROUP BY number);

From ae8de8259f9066f4890cdb09321f7f6d15a7df91 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Fri, 22 Jan 2021 23:40:04 +0300
Subject: [PATCH 359/611] Fix UBSan report in substring

---
 src/Functions/substring.cpp                          | 12 ++++++++----
 .../0_stateless/01665_substring_ubsan.reference      |  7 +++++++
 tests/queries/0_stateless/01665_substring_ubsan.sql  |  1 +
 3 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 tests/queries/0_stateless/01665_substring_ubsan.reference
 create mode 100644 tests/queries/0_stateless/01665_substring_ubsan.sql

diff --git a/src/Functions/substring.cpp b/src/Functions/substring.cpp
index cc2e1c70fd5..3fe82b5e0b0 100644
--- a/src/Functions/substring.cpp
+++ b/src/Functions/substring.cpp
@@ -91,9 +91,11 @@ public:
             if (column_start_const)
             {
                 if (start_value > 0)
-                    sliceFromLeftConstantOffsetUnbounded(source, StringSink(*col_res, input_rows_count), start_value - 1);
+                    sliceFromLeftConstantOffsetUnbounded(
+                        source, StringSink(*col_res, input_rows_count), static_cast<size_t>(start_value - 1));
                 else if (start_value < 0)
-                    sliceFromRightConstantOffsetUnbounded(source, StringSink(*col_res, input_rows_count), -start_value);
+                    sliceFromRightConstantOffsetUnbounded(
+                        source, StringSink(*col_res, input_rows_count), -static_cast<size_t>(start_value));
                 else
                     throw Exception("Indices in strings are 1-based", ErrorCodes::ZERO_ARRAY_OR_TUPLE_INDEX);
             }
@@ -105,9 +107,11 @@ public:
             if (column_start_const && column_length_const)
             {
                 if (start_value > 0)
-                    sliceFromLeftConstantOffsetBounded(source, StringSink(*col_res, input_rows_count), start_value - 1, length_value);
+                    sliceFromLeftConstantOffsetBounded(
+                        source, StringSink(*col_res, input_rows_count), static_cast<size_t>(start_value - 1), length_value);
                 else if (start_value < 0)
-                    sliceFromRightConstantOffsetBounded(source, StringSink(*col_res, input_rows_count), -start_value, length_value);
+                    sliceFromRightConstantOffsetBounded(
+                        source, StringSink(*col_res, input_rows_count), -static_cast<size_t>(start_value), length_value);
                 else
                     throw Exception("Indices in strings are 1-based", ErrorCodes::ZERO_ARRAY_OR_TUPLE_INDEX);
             }
diff --git a/tests/queries/0_stateless/01665_substring_ubsan.reference b/tests/queries/0_stateless/01665_substring_ubsan.reference
new file mode 100644
index 00000000000..9e5f5f8a47c
--- /dev/null
+++ b/tests/queries/0_stateless/01665_substring_ubsan.reference
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/tests/queries/0_stateless/01665_substring_ubsan.sql b/tests/queries/0_stateless/01665_substring_ubsan.sql
new file mode 100644
index 00000000000..670998aee31
--- /dev/null
+++ b/tests/queries/0_stateless/01665_substring_ubsan.sql
@@ -0,0 +1 @@
+SELECT substringUTF8(materialize(''), -9223372036854775808) FROM numbers(7);

From 4afcb94a8ad05c0bf38b41dbb921e9c4f5e6bc89 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Fri, 22 Jan 2021 23:41:26 +0300
Subject: [PATCH 360/611] Fix Style check

---
 ...st.reference => 01661_extract_all_groups_throw_fast.reference} | 0
 ...oups_fail_fast.sql => 01661_extract_all_groups_throw_fast.sql} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/queries/0_stateless/{01661_extract_all_groups_fail_fast.reference => 01661_extract_all_groups_throw_fast.reference} (100%)
 rename tests/queries/0_stateless/{01661_extract_all_groups_fail_fast.sql => 01661_extract_all_groups_throw_fast.sql} (100%)

diff --git a/tests/queries/0_stateless/01661_extract_all_groups_fail_fast.reference b/tests/queries/0_stateless/01661_extract_all_groups_throw_fast.reference
similarity index 100%
rename from tests/queries/0_stateless/01661_extract_all_groups_fail_fast.reference
rename to tests/queries/0_stateless/01661_extract_all_groups_throw_fast.reference
diff --git a/tests/queries/0_stateless/01661_extract_all_groups_fail_fast.sql b/tests/queries/0_stateless/01661_extract_all_groups_throw_fast.sql
similarity index 100%
rename from tests/queries/0_stateless/01661_extract_all_groups_fail_fast.sql
rename to tests/queries/0_stateless/01661_extract_all_groups_throw_fast.sql

From 4047542b6156781be2fee8f29f923223dc9dc2f2 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Fri, 22 Jan 2021 23:46:51 +0300
Subject: [PATCH 361/611] Fix UBSan report in runningDifference

---
 src/Functions/runningDifference.h                              | 3 ++-
 .../0_stateless/01665_running_difference_ubsan.reference       | 0
 tests/queries/0_stateless/01665_running_difference_ubsan.sql   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 tests/queries/0_stateless/01665_running_difference_ubsan.reference
 create mode 100644 tests/queries/0_stateless/01665_running_difference_ubsan.sql

diff --git a/src/Functions/runningDifference.h b/src/Functions/runningDifference.h
index 00874272496..db32b5f9a3f 100644
--- a/src/Functions/runningDifference.h
+++ b/src/Functions/runningDifference.h
@@ -46,7 +46,7 @@ private:
     /// It is possible to track value from previous columns, to calculate continuously across all columnss. Not implemented.
 
     template <typename Src, typename Dst>
-    static void process(const PaddedPODArray<Src> & src, PaddedPODArray<Dst> & dst, const NullMap * null_map)
+    static NO_SANITIZE_UNDEFINED void process(const PaddedPODArray<Src> & src, PaddedPODArray<Dst> & dst, const NullMap * null_map)
     {
         size_t size = src.size();
         dst.resize(size);
@@ -76,6 +76,7 @@ private:
             else
             {
                 auto cur = src[i];
+                /// Overflow is Ok.
                 dst[i] = static_cast<Dst>(cur) - prev;
                 prev = cur;
             }
diff --git a/tests/queries/0_stateless/01665_running_difference_ubsan.reference b/tests/queries/0_stateless/01665_running_difference_ubsan.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01665_running_difference_ubsan.sql b/tests/queries/0_stateless/01665_running_difference_ubsan.sql
new file mode 100644
index 00000000000..fa09502a105
--- /dev/null
+++ b/tests/queries/0_stateless/01665_running_difference_ubsan.sql
@@ -0,0 +1 @@
+SELECT k, d, i FROM (SELECT t.1 AS k, t.2 AS v, runningDifference(v) AS d, runningDifference(cityHash64(t.1)) AS i FROM (SELECT arrayJoin([(NULL, 65535), ('a', 7), ('a', 3), ('b', 11), ('b', 2), ('', -9223372036854775808)]) AS t)) WHERE i = 9223372036854775807;

From 0528ca60d64c3970bd347aa58a8ff7718d9527df Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 23 Jan 2021 00:03:59 +0300
Subject: [PATCH 362/611] Avoid UBSan report in greatCircleDistance

---
 src/Functions/greatCircleDistance.cpp                     | 8 +++++++-
 .../01666_great_circle_distance_ubsan.reference           | 0
 .../0_stateless/01666_great_circle_distance_ubsan.sql     | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 tests/queries/0_stateless/01666_great_circle_distance_ubsan.reference
 create mode 100644 tests/queries/0_stateless/01666_great_circle_distance_ubsan.sql

diff --git a/src/Functions/greatCircleDistance.cpp b/src/Functions/greatCircleDistance.cpp
index ee4d89be2ae..94f44ba37ba 100644
--- a/src/Functions/greatCircleDistance.cpp
+++ b/src/Functions/greatCircleDistance.cpp
@@ -160,6 +160,12 @@ DECLARE_MULTITARGET_CODE(
 namespace
 {
 
+inline NO_SANITIZE_UNDEFINED size_t metricLUTIndex(float latitude_midpoint)
+{
+    /// Implementation specific behaviour on overflow or infinite value.
+    return static_cast<size_t>(latitude_midpoint) & (METRIC_LUT_SIZE - 1);
+}
+
 template <Method method>
 float distance(float lon1deg, float lat1deg, float lon2deg, float lat2deg)
 {
@@ -177,7 +183,7 @@ float distance(float lon1deg, float lat1deg, float lon2deg, float lat2deg)
         /// But if longitude is close but latitude is different enough, there is no difference between meridian and great circle line.
 
         float latitude_midpoint = (lat1deg + lat2deg + 180) * METRIC_LUT_SIZE / 360; // [-90, 90] degrees -> [0, KTABLE] indexes
-        size_t latitude_midpoint_index = static_cast<size_t>(latitude_midpoint) & (METRIC_LUT_SIZE - 1);
+        size_t latitude_midpoint_index = metricLUTIndex(latitude_midpoint);
 
         /// This is linear interpolation between two table items at index "latitude_midpoint_index" and "latitude_midpoint_index + 1".
 
diff --git a/tests/queries/0_stateless/01666_great_circle_distance_ubsan.reference b/tests/queries/0_stateless/01666_great_circle_distance_ubsan.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01666_great_circle_distance_ubsan.sql b/tests/queries/0_stateless/01666_great_circle_distance_ubsan.sql
new file mode 100644
index 00000000000..a24e4747ed1
--- /dev/null
+++ b/tests/queries/0_stateless/01666_great_circle_distance_ubsan.sql
@@ -0,0 +1 @@
+SELECT greatCircleAngle(0, -9223372036854775808, number, number) FROM numbers(3) FORMAT Null;

From eeafd738906bc04eed59bb3f2002d4d6766c5ca9 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 23 Jan 2021 00:08:53 +0300
Subject: [PATCH 363/611] Fix typo in docs, tnx Egor Savin

---
 docs/ru/development/developer-instruction.md | 2 +-
 docs/zh/development/developer-instruction.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/ru/development/developer-instruction.md b/docs/ru/development/developer-instruction.md
index 5d7c0caeafa..7d88c97fe46 100644
--- a/docs/ru/development/developer-instruction.md
+++ b/docs/ru/development/developer-instruction.md
@@ -210,7 +210,7 @@ Mac OS X:
 
 Для запуска сервера из под текущего пользователя, с выводом логов в терминал и с использованием примеров конфигурационных файлов, расположенных в исходниках, перейдите в директорию `ClickHouse/programs/server/` (эта директория находится не в директории build) и выполните:
 
-    ../../../build/programs/clickhouse server
+    ../../build/programs/clickhouse server
 
 В этом случае, ClickHouse будет использовать конфигурационные файлы, расположенные в текущей директории. Вы можете запустить `clickhouse server` из любой директории, передав ему путь к конфигурационному файлу в аргументе командной строки `--config-file`.
 
diff --git a/docs/zh/development/developer-instruction.md b/docs/zh/development/developer-instruction.md
index 5a5d8d82144..53aab5dc086 100644
--- a/docs/zh/development/developer-instruction.md
+++ b/docs/zh/development/developer-instruction.md
@@ -193,7 +193,7 @@ Yandex官方当前使用GCC构建ClickHouse，因为它生成的机器代码性
 
 要以当前的用户身份运行服务，请进入到`ClickHouse/programs/server/` 目录（在`build`文件夹外）并运行：
 
-    ../../../build/programs/clickhouse server
+    ../../build/programs/clickhouse server
 
 在这种情况下，ClickHouse将使用位于当前目录中的配置文件。您可以从任何目录运行`Clickhouse server`，并将配置文件`--config-file`的路径指定为命令行参数。
 

From f2910deec2ca90fdf655dc3bd0ad32f54990dcba Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sat, 23 Jan 2021 00:25:49 +0300
Subject: [PATCH 364/611] Fix UBsan report in date functions

Found with fuzzer [1]:

  [1]: https://clickhouse-test-reports.s3.yandex.net/19381/95c9e57ec13e450ec6535cf723f504a2e68e3e2c/fuzzer_ubsan/report.html#fail1
---
 src/Functions/FunctionDateOrDateTimeAddInterval.h    | 6 +++---
 tests/queries/0_stateless/01662_date_ubsan.reference | 8 ++++++++
 tests/queries/0_stateless/01662_date_ubsan.sql       | 5 +++++
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 tests/queries/0_stateless/01662_date_ubsan.reference
 create mode 100644 tests/queries/0_stateless/01662_date_ubsan.sql

diff --git a/src/Functions/FunctionDateOrDateTimeAddInterval.h b/src/Functions/FunctionDateOrDateTimeAddInterval.h
index aa753916987..4513c12b03e 100644
--- a/src/Functions/FunctionDateOrDateTimeAddInterval.h
+++ b/src/Functions/FunctionDateOrDateTimeAddInterval.h
@@ -87,7 +87,7 @@ struct AddMinutesImpl : public AddOnDateTime64DefaultImpl<AddMinutesImpl>
 
     static constexpr auto name = "addMinutes";
 
-    static inline UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl &)
+    static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl &)
     {
         return t + delta * 60;
     }
@@ -106,7 +106,7 @@ struct AddHoursImpl : public AddOnDateTime64DefaultImpl<AddHoursImpl>
 
     static constexpr auto name = "addHours";
 
-    static inline UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl &)
+    static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl &)
     {
         return t + delta * 3600;
     }
@@ -150,7 +150,7 @@ struct AddWeeksImpl : public AddOnDateTime64DefaultImpl<AddWeeksImpl>
 
     static constexpr auto name = "addWeeks";
 
-    static inline UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl & time_zone)
+    static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl & time_zone)
     {
         return time_zone.addWeeks(t, delta);
     }
diff --git a/tests/queries/0_stateless/01662_date_ubsan.reference b/tests/queries/0_stateless/01662_date_ubsan.reference
new file mode 100644
index 00000000000..e1691ea0933
--- /dev/null
+++ b/tests/queries/0_stateless/01662_date_ubsan.reference
@@ -0,0 +1,8 @@
+-- { echo }
+-- tests with INT64_MIN
+SELECT addMinutes(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
+2021-01-01 00:00:00
+SELECT addHours(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
+2021-01-01 00:00:00
+SELECT addWeeks(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
+2021-01-01 00:00:00
diff --git a/tests/queries/0_stateless/01662_date_ubsan.sql b/tests/queries/0_stateless/01662_date_ubsan.sql
new file mode 100644
index 00000000000..b5b208167c5
--- /dev/null
+++ b/tests/queries/0_stateless/01662_date_ubsan.sql
@@ -0,0 +1,5 @@
+-- { echo }
+-- tests with INT64_MIN
+SELECT addMinutes(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
+SELECT addHours(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
+SELECT addWeeks(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);

From bb6f775b89da564cff9892a2443332a758e884c0 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sat, 23 Jan 2021 00:25:50 +0300
Subject: [PATCH 365/611] Fix UBsan report in arraySlice (with INT64_MIN as
 offset)

- arraySlice([], INT64_MIN) -- FunctionArraySlice::executeImpl

Found with fuzzer [1].

  [1]: https://clickhouse-test-reports.s3.yandex.net/19378/2c42600cf9bd8e9962b5b5a0ebb4bf11a10887ea/fuzzer_ubsan/report.html#fail1

v2: removed fixes that is already included into #19459
    - arraySlice(groupArray([]), INT64_MIN) -- sliceDynamicOffsetUnbounded
---
 src/Functions/GatherUtils/Algorithms.h                     | 2 +-
 tests/queries/0_stateless/01661_arraySlice_ubsan.reference | 4 ++++
 tests/queries/0_stateless/01661_arraySlice_ubsan.sql       | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 tests/queries/0_stateless/01661_arraySlice_ubsan.reference
 create mode 100644 tests/queries/0_stateless/01661_arraySlice_ubsan.sql

diff --git a/src/Functions/GatherUtils/Algorithms.h b/src/Functions/GatherUtils/Algorithms.h
index 101e1354bc6..e8679c4c400 100644
--- a/src/Functions/GatherUtils/Algorithms.h
+++ b/src/Functions/GatherUtils/Algorithms.h
@@ -342,7 +342,7 @@ void NO_INLINE sliceDynamicOffsetUnbounded(Source && src, Sink && sink, const IC
             if (offset > 0)
                 slice = src.getSliceFromLeft(offset - 1);
             else
-                slice = src.getSliceFromRight(-UInt64(offset));
+                slice = src.getSliceFromRight(-static_cast<UInt64>(offset));
 
             writeSlice(slice, sink);
         }
diff --git a/tests/queries/0_stateless/01661_arraySlice_ubsan.reference b/tests/queries/0_stateless/01661_arraySlice_ubsan.reference
new file mode 100644
index 00000000000..fb7942a12d2
--- /dev/null
+++ b/tests/queries/0_stateless/01661_arraySlice_ubsan.reference
@@ -0,0 +1,4 @@
+-- { echo }
+-- tests with INT64_MIN (UBsan)
+select arraySlice([], -9223372036854775808);
+[]
diff --git a/tests/queries/0_stateless/01661_arraySlice_ubsan.sql b/tests/queries/0_stateless/01661_arraySlice_ubsan.sql
new file mode 100644
index 00000000000..95cdfab1dac
--- /dev/null
+++ b/tests/queries/0_stateless/01661_arraySlice_ubsan.sql
@@ -0,0 +1,3 @@
+-- { echo }
+-- tests with INT64_MIN (UBsan)
+select arraySlice([], -9223372036854775808);

From 3fffa16aab8f5342926b3a6b1e3c6a14208e3322 Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Sat, 23 Jan 2021 00:43:02 +0300
Subject: [PATCH 366/611] Update src/IO/HTTPCommon.cpp

Co-authored-by: Azat Khuzhin <a3at.mail@gmail.com>
---
 src/IO/HTTPCommon.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/IO/HTTPCommon.cpp b/src/IO/HTTPCommon.cpp
index c869b212595..d12aa10fe6a 100644
--- a/src/IO/HTTPCommon.cpp
+++ b/src/IO/HTTPCommon.cpp
@@ -120,7 +120,7 @@ namespace
                 session->setProxyHost(proxy_host);
                 session->setProxyPort(proxy_port);
 
-#if defined(POCO_CLICKHOUSE_PATCH)
+#if !defined(ARCADIA_BUILD) && defined(POCO_CLICKHOUSE_PATCH)
                 session->setProxyProtocol(proxy_scheme);
 
                 /// Turn on tunnel mode if proxy scheme is HTTP while endpoint scheme is HTTPS.

From 9ee9d7293a70ed2c63996829431dac5ccca23daa Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 23 Jan 2021 00:48:03 +0300
Subject: [PATCH 367/611] Remove complications from FunctionsAES

---
 src/Functions/FunctionsAES.h | 69 +++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 36 deletions(-)

diff --git a/src/Functions/FunctionsAES.h b/src/Functions/FunctionsAES.h
index fea47074649..0fcf429d2aa 100644
--- a/src/Functions/FunctionsAES.h
+++ b/src/Functions/FunctionsAES.h
@@ -223,13 +223,13 @@ private:
         return result_column;
     }
 
-    template <typename InputColumnType, typename KeyColumnType, typename IvColumnType, typename AadColumnType>
-    static ColumnPtr doEncrypt(const EVP_CIPHER * evp_cipher,
-                    size_t input_rows_count,
-                    const InputColumnType & input_column,
-                    const KeyColumnType & key_column,
-                    const IvColumnType & iv_column,
-                    const AadColumnType & aad_column)
+    static ColumnPtr doEncrypt(
+        const EVP_CIPHER * evp_cipher,
+        size_t input_rows_count,
+        const ColumnPtr & input_column,
+        const ColumnPtr & key_column,
+        const ColumnPtr & iv_column,
+        const ColumnPtr & aad_column)
     {
         if constexpr (compatibility_mode == OpenSSLDetails::CompatibilityMode::MySQL)
         {
@@ -250,13 +250,14 @@ private:
         return nullptr;
     }
 
-    template <CipherMode mode, typename InputColumnType, typename KeyColumnType, typename IvColumnType, typename AadColumnType>
-    static ColumnPtr doEncryptImpl(const EVP_CIPHER * evp_cipher,
-                    size_t input_rows_count,
-                    const InputColumnType & input_column,
-                    const KeyColumnType & key_column,
-                    [[maybe_unused]] const IvColumnType & iv_column,
-                    [[maybe_unused]] const AadColumnType & aad_column)
+    template <CipherMode mode>
+    static ColumnPtr doEncryptImpl(
+        const EVP_CIPHER * evp_cipher,
+        size_t input_rows_count,
+        const ColumnPtr & input_column,
+        const ColumnPtr & key_column,
+        [[maybe_unused]] const ColumnPtr & iv_column,
+        [[maybe_unused]] const ColumnPtr & aad_column)
     {
         using namespace OpenSSLDetails;
 
@@ -300,12 +301,10 @@ private:
         {
             const auto key_value = key_holder.setKey(key_size, key_column->getDataAt(r));
             auto iv_value = StringRef{};
-            if constexpr (!std::is_same_v<std::nullptr_t, std::decay_t<IvColumnType>>)
-            {
+            if (iv_column)
                 iv_value = iv_column->getDataAt(r);
-            }
 
-            const auto input_value = input_column->getDataAt(r);
+            const StringRef input_value = input_column->getDataAt(r);
 
             if constexpr (mode != CipherMode::MySQLCompatibility)
             {
@@ -342,7 +341,7 @@ private:
                         onError("Failed to set key and IV");
 
                     // 1.a.2 Set AAD
-                    if constexpr (!std::is_same_v<std::nullptr_t, std::decay_t<AadColumnType>>)
+                    if (aad_column)
                     {
                         const auto aad_data = aad_column->getDataAt(r);
                         int tmp_len = 0;
@@ -490,13 +489,13 @@ private:
         return result_column;
     }
 
-    template <typename InputColumnType, typename KeyColumnType, typename IvColumnType, typename AadColumnType>
-    static ColumnPtr doDecrypt(const EVP_CIPHER * evp_cipher,
-                    size_t input_rows_count,
-                    const InputColumnType & input_column,
-                    const KeyColumnType & key_column,
-                    const IvColumnType & iv_column,
-                    const AadColumnType & aad_column)
+    static ColumnPtr doDecrypt(
+        const EVP_CIPHER * evp_cipher,
+        size_t input_rows_count,
+        const ColumnPtr & input_column,
+        const ColumnPtr & key_column,
+        const ColumnPtr & iv_column,
+        const ColumnPtr & aad_column)
     {
         if constexpr (compatibility_mode == OpenSSLDetails::CompatibilityMode::MySQL)
         {
@@ -518,13 +517,13 @@ private:
         return nullptr;
     }
 
-    template <CipherMode mode, typename InputColumnType, typename KeyColumnType, typename IvColumnType, typename AadColumnType>
+    template <CipherMode mode>
     static ColumnPtr doDecryptImpl(const EVP_CIPHER * evp_cipher,
-                    size_t input_rows_count,
-                    const InputColumnType & input_column,
-                    const KeyColumnType & key_column,
-                    [[maybe_unused]] const IvColumnType & iv_column,
-                    [[maybe_unused]] const AadColumnType & aad_column)
+        size_t input_rows_count,
+        const ColumnPtr & input_column,
+        const ColumnPtr & key_column,
+        [[maybe_unused]] const ColumnPtr & iv_column,
+        [[maybe_unused]] const ColumnPtr & aad_column)
     {
         using namespace OpenSSLDetails;
 
@@ -568,10 +567,8 @@ private:
             // 0: prepare key if required
             auto key_value = key_holder.setKey(key_size, key_column->getDataAt(r));
             auto iv_value = StringRef{};
-            if constexpr (!std::is_same_v<std::nullptr_t, std::decay_t<IvColumnType>>)
-            {
+            if (iv_column)
                 iv_value = iv_column->getDataAt(r);
-            }
 
             auto input_value = input_column->getDataAt(r);
             if constexpr (mode == CipherMode::RFC5116_AEAD_AES_GCM)
@@ -620,7 +617,7 @@ private:
                         onError("Failed to set key and IV");
 
                     // 1.a.2: Set AAD if present
-                    if constexpr (!std::is_same_v<std::nullptr_t, std::decay_t<AadColumnType>>)
+                    if (aad_column)
                     {
                         const auto aad_data = aad_column->getDataAt(r);
                         int tmp_len = 0;

From 505898747e70565e7d749745aa1d977ac1f9e33d Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 23 Jan 2021 01:58:41 +0300
Subject: [PATCH 368/611] Fix buffer overflow in DateLUT

---
 base/common/DateLUTImpl.h                                   | 6 +++++-
 .../0_stateless/01666_date_lut_buffer_overflow.reference    | 0
 .../queries/0_stateless/01666_date_lut_buffer_overflow.sql  | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 tests/queries/0_stateless/01666_date_lut_buffer_overflow.reference
 create mode 100644 tests/queries/0_stateless/01666_date_lut_buffer_overflow.sql

diff --git a/base/common/DateLUTImpl.h b/base/common/DateLUTImpl.h
index ef74182b333..4354f4df3ab 100644
--- a/base/common/DateLUTImpl.h
+++ b/base/common/DateLUTImpl.h
@@ -229,8 +229,12 @@ public:
 
     inline UInt8 daysInMonth(UInt16 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[year - DATE_LUT_MIN_YEAR] + 32 * (month - 1));
+        DayNum any_day_of_month = DayNum(years_lut[idx] + 32 * (month - 1));
         return lut[any_day_of_month].days_in_month;
     }
 
diff --git a/tests/queries/0_stateless/01666_date_lut_buffer_overflow.reference b/tests/queries/0_stateless/01666_date_lut_buffer_overflow.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01666_date_lut_buffer_overflow.sql b/tests/queries/0_stateless/01666_date_lut_buffer_overflow.sql
new file mode 100644
index 00000000000..f1cf610ff48
--- /dev/null
+++ b/tests/queries/0_stateless/01666_date_lut_buffer_overflow.sql
@@ -0,0 +1 @@
+SELECT toDate('2105-12-31') + INTERVAL number MONTH FROM system.numbers LIMIT 25000 FORMAT Null;

From 60278279744ab869bfe3aa39b726655e202b60cd Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <36882414+akuzm@users.noreply.github.com>
Date: Sat, 23 Jan 2021 02:05:18 +0300
Subject: [PATCH 369/611] Update run-fuzzer.sh

---
 docker/test/fuzzer/run-fuzzer.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index ce68bad4094..e92bb056f90 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -175,7 +175,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:.*" server.log > description.txt
+        if ! grep -ao "Received signal.*\|Logical error.*\|Assertion.*failed\|Failed assertion.*\|.*runtime error: .*\|.*is located.*\|SUMMARY: MemorySanitizer:.*\|SUMMARY: ThreadSanitizer:.*" server.log > description.txt
         then
             echo "Lost connection to server. See the logs" > description.txt
         fi

From f7db6e10d3cd5c6f55e6ff300a0e2c2013ff1824 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 23 Jan 2021 02:35:40 +0300
Subject: [PATCH 370/611] Fix very strange code in AES functions

---
 docker/test/fasttest/run.sh                              | 1 +
 src/Functions/FunctionsAES.h                             | 2 +-
 tests/queries/0_stateless/01667_aes_args_check.reference | 0
 tests/queries/0_stateless/01667_aes_args_check.sql       | 1 +
 4 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 tests/queries/0_stateless/01667_aes_args_check.reference
 create mode 100644 tests/queries/0_stateless/01667_aes_args_check.sql

diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index 96e14b2910d..c9707a6a995 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -270,6 +270,7 @@ function run_tests
         01318_encrypt                           # Depends on OpenSSL
         01318_decrypt                           # Depends on OpenSSL
         01663_aes_msan                          # Depends on OpenSSL
+        01667_aes_args_check                    # Depends on OpenSSL
         01281_unsucceeded_insert_select_queries_counter
         01292_create_user
         01294_lazy_database_concurrent
diff --git a/src/Functions/FunctionsAES.h b/src/Functions/FunctionsAES.h
index fd78dfeaf58..132e94907f5 100644
--- a/src/Functions/FunctionsAES.h
+++ b/src/Functions/FunctionsAES.h
@@ -168,7 +168,7 @@ private:
         validateFunctionArgumentTypes(*this, arguments,
             FunctionArgumentDescriptors{
                 {"mode", isStringOrFixedString, isColumnConst, "encryption mode string"},
-                {"input", nullptr, nullptr, "plaintext"},
+                {"input", isStringOrFixedString, nullptr, "plaintext"},
                 {"key", isStringOrFixedString, nullptr, "encryption key binary string"},
             },
             optional_args
diff --git a/tests/queries/0_stateless/01667_aes_args_check.reference b/tests/queries/0_stateless/01667_aes_args_check.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01667_aes_args_check.sql b/tests/queries/0_stateless/01667_aes_args_check.sql
new file mode 100644
index 00000000000..b1d7088c956
--- /dev/null
+++ b/tests/queries/0_stateless/01667_aes_args_check.sql
@@ -0,0 +1 @@
+SELECT encrypt('aes-128-ecb', [1, -1, 0, NULL], 'text'); -- { serverError 43 }

From 7d2108d4e9d7864e962fa25a0232c37116823374 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 23 Jan 2021 02:57:35 +0300
Subject: [PATCH 371/611] Fix double whitespace

---
 src/Storages/MergeTree/MergeTreeIndexFullText.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Storages/MergeTree/MergeTreeIndexFullText.cpp b/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
index 99629144680..c140ebafec0 100644
--- a/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
@@ -661,7 +661,7 @@ bool SplitTokenExtractor::next(const char * data, size_t len, size_t * pos, size
         const auto alpha_lower_end =   _mm_set1_epi8('z' + 1);
         const auto alpha_upper_begin = _mm_set1_epi8('A' - 1);
         const auto alpha_upper_end =   _mm_set1_epi8('Z' + 1);
-        const auto zero  =             _mm_set1_epi8(0);
+        const auto zero =              _mm_set1_epi8(0);
 
         // every bit represents if `haystack` character `c` satisfies condition:
         // (c < 0) || (c > '0' - 1 && c < '9' + 1) || (c > 'a' - 1 && c < 'z' + 1) || (c > 'A' - 1 && c < 'Z' + 1)
@@ -717,7 +717,7 @@ bool SplitTokenExtractor::next(const char * data, size_t len, size_t * pos, size
     }
 
 #if defined(__SSE2__) && !defined(MEMORY_SANITIZER)
-    // Could happen only if string is not padded with zeroes, and we accidentally hopped over end of data.
+    // Could happen only if string is not padded with zeros, and we accidentally hopped over the end of data.
     if (*token_start > len)
         return false;
     *token_len = std::min(len - *token_start, *token_len);

From 9a28823041a478a7033875d288eb2ac62ea5bcde Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 23 Jan 2021 03:14:16 +0300
Subject: [PATCH 372/611] Additions

---
 src/Functions/greatCircleDistance.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Functions/greatCircleDistance.cpp b/src/Functions/greatCircleDistance.cpp
index 94f44ba37ba..8b9df91e117 100644
--- a/src/Functions/greatCircleDistance.cpp
+++ b/src/Functions/greatCircleDistance.cpp
@@ -99,6 +99,12 @@ void geodistInit()
     }
 }
 
+inline NO_SANITIZE_UNDEFINED size_t floatToIndex(float x)
+{
+    /// Implementation specific behaviour on overflow or infinite value.
+    return static_cast<size_t>(x);
+}
+
 inline float geodistDegDiff(float f)
 {
     f = fabsf(f);
@@ -110,7 +116,7 @@ inline float geodistDegDiff(float f)
 inline float geodistFastCos(float x)
 {
     float y = fabsf(x) * (COS_LUT_SIZE / PI / 2);
-    size_t i = static_cast<size_t>(y);
+    size_t i = floatToIndex(y);
     y -= i;
     i &= (COS_LUT_SIZE - 1);
     return cos_lut[i] + (cos_lut[i + 1] - cos_lut[i]) * y;
@@ -119,7 +125,7 @@ inline float geodistFastCos(float x)
 inline float geodistFastSin(float x)
 {
     float y = fabsf(x) * (COS_LUT_SIZE / PI / 2);
-    size_t i = static_cast<size_t>(y);
+    size_t i = floatToIndex(y);
     y -= i;
     i = (i - COS_LUT_SIZE / 4) & (COS_LUT_SIZE - 1); // cos(x - pi / 2) = sin(x), costable / 4 = pi / 2
     return cos_lut[i] + (cos_lut[i + 1] - cos_lut[i]) * y;
@@ -139,7 +145,7 @@ inline float geodistFastAsinSqrt(float x)
     {
         // distance under 17083 km, 512-entry LUT error under 0.00072%
         x *= ASIN_SQRT_LUT_SIZE;
-        size_t i = static_cast<size_t>(x);
+        size_t i = floatToIndex(x);
         return asin_sqrt_lut[i] + (asin_sqrt_lut[i + 1] - asin_sqrt_lut[i]) * (x - i);
     }
     return asinf(sqrtf(x)); // distance over 17083 km, just compute exact
@@ -160,12 +166,6 @@ DECLARE_MULTITARGET_CODE(
 namespace
 {
 
-inline NO_SANITIZE_UNDEFINED size_t metricLUTIndex(float latitude_midpoint)
-{
-    /// Implementation specific behaviour on overflow or infinite value.
-    return static_cast<size_t>(latitude_midpoint) & (METRIC_LUT_SIZE - 1);
-}
-
 template <Method method>
 float distance(float lon1deg, float lat1deg, float lon2deg, float lat2deg)
 {
@@ -183,7 +183,7 @@ float distance(float lon1deg, float lat1deg, float lon2deg, float lat2deg)
         /// But if longitude is close but latitude is different enough, there is no difference between meridian and great circle line.
 
         float latitude_midpoint = (lat1deg + lat2deg + 180) * METRIC_LUT_SIZE / 360; // [-90, 90] degrees -> [0, KTABLE] indexes
-        size_t latitude_midpoint_index = metricLUTIndex(latitude_midpoint);
+        size_t latitude_midpoint_index = floatToIndex(latitude_midpoint) & (METRIC_LUT_SIZE - 1);
 
         /// This is linear interpolation between two table items at index "latitude_midpoint_index" and "latitude_midpoint_index + 1".
 

From 02d28c1f9b9558ca5af267167a542819b9e1d061 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 23 Jan 2021 03:17:58 +0300
Subject: [PATCH 373/611] Fix UBSan report in avgWeighted

---
 src/AggregateFunctions/AggregateFunctionAvgWeighted.h        | 2 +-
 tests/queries/0_stateless/01668_avg_weighted_ubsan.reference | 1 +
 tests/queries/0_stateless/01668_avg_weighted_ubsan.sql       | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 tests/queries/0_stateless/01668_avg_weighted_ubsan.reference
 create mode 100644 tests/queries/0_stateless/01668_avg_weighted_ubsan.sql

diff --git a/src/AggregateFunctions/AggregateFunctionAvgWeighted.h b/src/AggregateFunctions/AggregateFunctionAvgWeighted.h
index 6538367ad93..ab9ce9c2a61 100644
--- a/src/AggregateFunctions/AggregateFunctionAvgWeighted.h
+++ b/src/AggregateFunctions/AggregateFunctionAvgWeighted.h
@@ -28,7 +28,7 @@ public:
 
     using ValueT = MaxFieldType<Value, Weight>;
 
-    void add(AggregateDataPtr place, const IColumn ** columns, size_t row_num, Arena *) const override
+    void NO_SANITIZE_UNDEFINED add(AggregateDataPtr place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         const auto& weights = static_cast<const DecimalOrVectorCol<Weight> &>(*columns[1]);
 
diff --git a/tests/queries/0_stateless/01668_avg_weighted_ubsan.reference b/tests/queries/0_stateless/01668_avg_weighted_ubsan.reference
new file mode 100644
index 00000000000..ec064f61ba7
--- /dev/null
+++ b/tests/queries/0_stateless/01668_avg_weighted_ubsan.reference
@@ -0,0 +1 @@
+-0
diff --git a/tests/queries/0_stateless/01668_avg_weighted_ubsan.sql b/tests/queries/0_stateless/01668_avg_weighted_ubsan.sql
new file mode 100644
index 00000000000..24e7dc0cb90
--- /dev/null
+++ b/tests/queries/0_stateless/01668_avg_weighted_ubsan.sql
@@ -0,0 +1 @@
+SELECT round(avgWeighted(x, y)) FROM (SELECT 1023 AS x, 1000000000 AS y UNION ALL SELECT 10 AS x, -9223372036854775808 AS y);

From 7005e3a8263e9f2bb1c42aa08efd0688ac47ed81 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 23 Jan 2021 04:11:18 +0300
Subject: [PATCH 374/611] Fix wrong serde of ColumnsDescription

---
 src/Storages/ColumnsDescription.cpp           | 53 +++++++++++--------
 .../01669_columns_declaration_serde.reference |  3 ++
 .../01669_columns_declaration_serde.sql       | 19 +++++++
 3 files changed, 54 insertions(+), 21 deletions(-)
 create mode 100644 tests/queries/0_stateless/01669_columns_declaration_serde.reference
 create mode 100644 tests/queries/0_stateless/01669_columns_declaration_serde.sql

diff --git a/src/Storages/ColumnsDescription.cpp b/src/Storages/ColumnsDescription.cpp
index b4ddde7c0f3..ff584da5536 100644
--- a/src/Storages/ColumnsDescription.cpp
+++ b/src/Storages/ColumnsDescription.cpp
@@ -62,6 +62,8 @@ bool ColumnDescription::operator==(const ColumnDescription & other) const
 
 void ColumnDescription::writeText(WriteBuffer & buf) const
 {
+    /// NOTE: Serialization format is insane.
+
     writeBackQuotedString(name, buf);
     writeChar(' ', buf);
     writeEscapedString(type->getName(), buf);
@@ -99,32 +101,41 @@ void ColumnDescription::writeText(WriteBuffer & buf) const
 
 void ColumnDescription::readText(ReadBuffer & buf)
 {
-    ParserColumnDeclaration column_parser(/* require type */ true);
-    String column_line;
-    readEscapedStringUntilEOL(column_line, buf);
-    ASTPtr ast = parseQuery(column_parser, column_line, "column parser", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
-    if (const auto * col_ast = ast->as<ASTColumnDeclaration>())
+    readBackQuotedString(name, buf);
+    assertChar(' ', buf);
+
+    String type_string;
+    readEscapedString(type_string, buf);
+    type = DataTypeFactory::instance().get(type_string);
+
+    if (checkChar('\t', buf))
     {
-        name = col_ast->name;
-        type = DataTypeFactory::instance().get(col_ast->type);
+        String modifiers;
+        readEscapedStringUntilEOL(modifiers, buf);
 
-        if (col_ast->default_expression)
+        ParserColumnDeclaration column_parser(/* require type */ true);
+        ASTPtr ast = parseQuery(column_parser, "x T " + modifiers, "column parser", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+
+        if (const auto * col_ast = ast->as<ASTColumnDeclaration>())
         {
-            default_desc.kind = columnDefaultKindFromString(col_ast->default_specifier);
-            default_desc.expression = std::move(col_ast->default_expression);
+            if (col_ast->default_expression)
+            {
+                default_desc.kind = columnDefaultKindFromString(col_ast->default_specifier);
+                default_desc.expression = std::move(col_ast->default_expression);
+            }
+
+            if (col_ast->comment)
+                comment = col_ast->comment->as<ASTLiteral &>().value.get<String>();
+
+            if (col_ast->codec)
+                codec = CompressionCodecFactory::instance().validateCodecAndGetPreprocessedAST(col_ast->codec, type, false);
+
+            if (col_ast->ttl)
+                ttl = col_ast->ttl;
         }
-
-        if (col_ast->comment)
-            comment = col_ast->comment->as<ASTLiteral &>().value.get<String>();
-
-        if (col_ast->codec)
-            codec = CompressionCodecFactory::instance().validateCodecAndGetPreprocessedAST(col_ast->codec, type, false);
-
-        if (col_ast->ttl)
-            ttl = col_ast->ttl;
+        else
+            throw Exception("Cannot parse column description", ErrorCodes::CANNOT_PARSE_TEXT);
     }
-    else
-        throw Exception("Cannot parse column description", ErrorCodes::CANNOT_PARSE_TEXT);
 }
 
 
diff --git a/tests/queries/0_stateless/01669_columns_declaration_serde.reference b/tests/queries/0_stateless/01669_columns_declaration_serde.reference
new file mode 100644
index 00000000000..8e1ace21953
--- /dev/null
+++ b/tests/queries/0_stateless/01669_columns_declaration_serde.reference
@@ -0,0 +1,3 @@
+Hello, world!
+Hello, world!
+1	\r\n\t\\\n
diff --git a/tests/queries/0_stateless/01669_columns_declaration_serde.sql b/tests/queries/0_stateless/01669_columns_declaration_serde.sql
new file mode 100644
index 00000000000..c0a0857b254
--- /dev/null
+++ b/tests/queries/0_stateless/01669_columns_declaration_serde.sql
@@ -0,0 +1,19 @@
+CREATE TEMPORARY TABLE test ("\\" String DEFAULT '\r\n\t\\' || '
+');
+
+INSERT INTO test VALUES ('Hello, world!');
+INSERT INTO test ("\\") VALUES ('Hello, world!');
+
+SELECT * FROM test;
+
+DROP TEMPORARY TABLE test;
+DROP TABLE IF EXISTS test;
+
+CREATE TABLE test (x UInt64, "\\" String DEFAULT '\r\n\t\\' || '
+') ENGINE = MergeTree ORDER BY x;
+
+INSERT INTO test (x) VALUES (1);
+
+SELECT * FROM test;
+
+DROP TABLE test;

From 1b6ee55c6a955270da4d45ab286493c938a0a9b1 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 23 Jan 2021 04:26:03 +0300
Subject: [PATCH 375/611] More tests

---
 .../01669_columns_declaration_serde.reference |  4 ++++
 .../01669_columns_declaration_serde.sql       | 21 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/tests/queries/0_stateless/01669_columns_declaration_serde.reference b/tests/queries/0_stateless/01669_columns_declaration_serde.reference
index 8e1ace21953..40fa9db0ae7 100644
--- a/tests/queries/0_stateless/01669_columns_declaration_serde.reference
+++ b/tests/queries/0_stateless/01669_columns_declaration_serde.reference
@@ -1,3 +1,7 @@
 Hello, world!
 Hello, world!
 1	\r\n\t\\\n
+---
+0	\\
+---
+0	\\
diff --git a/tests/queries/0_stateless/01669_columns_declaration_serde.sql b/tests/queries/0_stateless/01669_columns_declaration_serde.sql
index c0a0857b254..8e3354d63cd 100644
--- a/tests/queries/0_stateless/01669_columns_declaration_serde.sql
+++ b/tests/queries/0_stateless/01669_columns_declaration_serde.sql
@@ -17,3 +17,24 @@ INSERT INTO test (x) VALUES (1);
 SELECT * FROM test;
 
 DROP TABLE test;
+
+DROP TABLE IF EXISTS test_r1;
+DROP TABLE IF EXISTS test_r2;
+
+CREATE TABLE test_r1 (x UInt64, "\\" String DEFAULT '\r\n\t\\' || '
+') ENGINE = ReplicatedMergeTree('/clickhouse/test', 'r1') ORDER BY "\\";
+
+INSERT INTO test_r1 ("\\") VALUES ('\\');
+
+CREATE TABLE test_r2 (x UInt64, "\\" String DEFAULT '\r\n\t\\' || '
+') ENGINE = ReplicatedMergeTree('/clickhouse/test', 'r2') ORDER BY "\\";
+
+SYSTEM SYNC REPLICA test_r2;
+
+SELECT '---';
+SELECT * FROM test_r1;
+SELECT '---';
+SELECT * FROM test_r2;
+
+DROP TABLE test_r1;
+DROP TABLE test_r2;

From b326a4b7f9d47d43716ecf4ebb39933aaed81698 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 23 Jan 2021 04:42:04 +0300
Subject: [PATCH 376/611] Integrate with Big List of Naughty Strings for better
 fuzzing

---
 .../queries/0_stateless/01666_blns.reference  |  10 +
 tests/queries/0_stateless/01666_blns.sql      | 580 ++++++++++++++++++
 2 files changed, 590 insertions(+)
 create mode 100644 tests/queries/0_stateless/01666_blns.reference
 create mode 100644 tests/queries/0_stateless/01666_blns.sql

diff --git a/tests/queries/0_stateless/01666_blns.reference b/tests/queries/0_stateless/01666_blns.reference
new file mode 100644
index 00000000000..52a3266268c
--- /dev/null
+++ b/tests/queries/0_stateless/01666_blns.reference
@@ -0,0 +1,10 @@
+1
+1
+2
+2
+2
+['undefined','undef','null','NULL','(null)','nil','NIL','true','false','True','False','TRUE','FALSE','None','hasOwnProperty','then','\\','\\\\','0','1','1.00','$1.00','1/2','1E2','1E02','1E+02','-1','-1.00','-$1.00','-1/2','-1E2','-1E02','-1E+02','1/0','0/0','-2147483648/-1','-9223372036854775808/-1','-0','-0.0','+0','+0.0','0.00','0..0','.','0.0.0','0,00','0,,0',',','0,0,0','0.0/0','1.0/0.0','0.0/0.0','1,0/0,0','0,0/0,0','--1','-','-.','-,','999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999','NaN','Infinity','-Infinity','INF','1#INF','-1#IND','1#QNAN','1#SNAN','1#IND','0x0','0xffffffff','0xffffffffffffffff','0xabad1dea','123456789012345678901234567890123456789','1,000.00','1 000.00','1\'000.00','1,000,000.00','1 000 000.00','1\'000\'000.00','1.000,00','1 000,00','1\'000,00','1.000.000,00','1 000 000,00','1\'000\'000,00','01000','08','09','2.2250738585072011e-308',',./;\'[]\\-=','<>?:"{}|_+','!@#$%^&*()`~','\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\b\\u000e\\u000f\\u0010\\u0011\\u0012\\u0013\\u0014\\u0015\\u0016\\u0017\\u0018\\u0019\\u001a\\u001b\\u001c\\u001d\\u001e\\u001f','€‚ƒ„†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ','\t\\u000b\f …             ​

  　','­؀؁؂؃؄؅؜۝܏᠎​‌‍‎‏‪‫‬‭‮⁠⁡⁢⁣⁤⁦⁧⁨⁩𑂽𛲠𛲡𛲢𛲣𝅳𝅴𝅵𝅶𝅷𝅸𝅹𝅺󠀁󠀠󠀡󠀢󠀣󠀤󠀥󠀦󠀧󠀨󠀩󠀪󠀫󠀬󠀭󠀮󠀯󠀰󠀱󠀲󠀳󠀴󠀵󠀶󠀷󠀸󠀹󠀺󠀻󠀼󠀽󠀾󠀿󠁀󠁁󠁂󠁃󠁄󠁅󠁆󠁇󠁈󠁉󠁊󠁋󠁌󠁍󠁎󠁏󠁐󠁑󠁒󠁓󠁔󠁕󠁖󠁗󠁘󠁙󠁚󠁛󠁜󠁝󠁞󠁟󠁠󠁡󠁢󠁣󠁤󠁥󠁦󠁧󠁨󠁩󠁪󠁫󠁬󠁭󠁮󠁯󠁰󠁱󠁲󠁳󠁴󠁵󠁶󠁷󠁸󠁹󠁺󠁻󠁼󠁽󠁾󠁿','','￾','Ω≈ç√∫˜µ≤≥÷','åß∂ƒ©˙∆˚¬…æ','œ∑´®†¥¨ˆøπ“‘','¡™£¢∞§¶•ªº–≠','¸˛Ç◊ı˜Â¯˘¿','ÅÍÎÏ˝ÓÔÒÚÆ☃','Œ„´‰ˇÁ¨ˆØ∏”’','`⁄€‹›fifl‡°·‚—±','⅛⅜⅝⅞','ЁЂЃЄЅІЇЈЉЊЋЌЍЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя','٠١٢٣٤٥٦٧٨٩','⁰⁴⁵','₀₁₂','⁰⁴⁵₀₁₂','ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็ ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็ ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็','\'','"','\'\'','""','\'"\'','"\'\'\'\'"\'"','"\'"\'"\'\'\'\'"','<foo val=“bar” />','<foo val=”bar“ />','<foo val=`bar\' />','田中さんにあげて下さい','パーティーへ行かないか','和製漢語','部落格','사회과학원 어학연구소','찦차를 타고 온 펲시맨과 쑛다리 똠방각하','社會科學院語學研究所','울란바토르','𠜎𠜱𠝹𠱓𠱸𠲖𠳏','𐐜 𐐔𐐇𐐝𐐀𐐡𐐇𐐓 𐐙𐐊𐐡𐐝𐐓/𐐝𐐇𐐗𐐊𐐤𐐔 𐐒𐐋𐐗 𐐒𐐌 𐐜 𐐡𐐀𐐖𐐇𐐤𐐓𐐝 𐐱𐑂 𐑄 𐐔𐐇𐐝𐐀𐐡𐐇𐐓 𐐏𐐆𐐅𐐤𐐆𐐚𐐊𐐡𐐝𐐆𐐓𐐆','表ポあA鷗ŒéＢ逍Üߪąñ丂㐀𠀀','Ⱥ','Ⱦ','ヽ༼ຈل͜ຈ༽ﾉ ヽ༼ຈل͜ຈ༽ﾉ','(｡◕ ∀ ◕｡)','｀ｨ(´∀｀∩','__ﾛ(,_,*)','・(￣∀￣)・:*:','ﾟ･✿ヾ╲(｡◕‿◕｡)╱✿･ﾟ',',。・:*:・゜’( ☻ ω ☻ )。・:*:・゜’','(╯°□°）╯︵ ┻━┻)','(ﾉಥ益ಥ）ﾉ ┻━┻','┬─┬ノ( º _ ºノ)','( ͡° ͜ʖ ͡°)','¯\\_(ツ)_/¯','😍','👩🏽','👨‍🦰 👨🏿‍🦰 👨‍🦱 👨🏿‍🦱 🦹🏿‍♂️','👾 🙇 💁 🙅 🙆 🙋 🙎 🙍','🐵 🙈 🙉 🙊','❤️ 💔 💌 💕 💞 💓 💗 💖 💘 💝 💟 💜 💛 💚 💙','✋🏿 💪🏿 👐🏿 🙌🏿 👏🏿 🙏🏿','👨‍👩‍👦 👨‍👩‍👧‍👦 👨‍👨‍👦 👩‍👩‍👧 👨‍👦 👨‍👧‍👦 👩‍👦 👩‍👧‍👦','🚾 🆒 🆓 🆕 🆖 🆗 🆙 🏧','0️⃣ 1️⃣ 2️⃣ 3️⃣ 4️⃣ 5️⃣ 6️⃣ 7️⃣ 8️⃣ 9️⃣ 🔟','🇺🇸🇷🇺🇸 🇦🇫🇦🇲🇸','🇺🇸🇷🇺🇸🇦🇫🇦🇲','🇺🇸🇷🇺🇸🇦','１２３','١٢٣','ثم نفس سقطت وبالتحديد،, جزيرتي باستخدام أن دنو. إذ هنا؟ الستار وتنصيب كان. أهّل ايطاليا، بريطانيا-فرنسا قد أخذ. سليمان، إتفاقية بين ما , يذكر الحدود أي بعد, معاملة بولندا، الإطلاق عل إيو.','בְּרֵאשִׁית, בָּרָא אֱלֹהִים, אֵת הַשָּׁמַיִם, וְאֵת הָאָרֶץ','הָיְתָהtestالصفحات التّحول','﷽','ﷺ','مُنَاقَشَةُ سُبُلِ اِسْتِخْدَامِ اللُّغَةِ فِي النُّظُمِ الْقَائِمَةِ وَفِيم يَخُصَّ التَّطْبِيقَاتُ الْحاسُوبِيَّةُ، ','᚛ᚄᚓᚐᚋᚒᚄ ᚑᚄᚂᚑᚏᚅ᚜‪‪‪','‪‪᚛                 ᚜‪','‪‪test‪','‫test‫','
test
','test⁠test‫','⁦test⁧','Ṱ̺̺̕o͞ ̷i̲̬͇̪͙n̝̗͕v̟̜̘̦͟o̶̙̰̠kè͚̮̺̪̹̱̤ ̖t̝͕̳̣̻̪͞h̼͓̲̦̳̘̲e͇̣̰̦̬͎ ̢̼̻̱̘h͚͎͙̜̣̲ͅi̦̲̣̰̤v̻͍e̺̭̳̪̰-m̢iͅn̖̺̞̲̯̰d̵̼̟͙̩̼̘̳ ̞̥̱̳̭r̛̗̘e͙p͠r̼̞̻̭̗e̺̠̣͟s̘͇̳͍̝͉e͉̥̯̞̲͚̬͜ǹ̬͎͎̟̖͇̤t͍̬̤͓̼̭͘ͅi̪̱n͠g̴͉ ͏͉ͅc̬̟h͡a̫̻̯͘o̫̟̖͍̙̝͉s̗̦̲.̨̹͈̣','̡͓̞ͅI̗̘̦͝n͇͇͙v̮̫ok̲̫̙͈i̖͙̭̹̠̞n̡̻̮̣̺g̲͈͙̭͙̬͎ ̰t͔̦h̞̲e̢̤ ͍̬̲͖f̴̘͕̣è͖ẹ̥̩l͖͔͚i͓͚̦͠n͖͍̗͓̳̮g͍ ̨o͚̪͡f̘̣̬ ̖̘͖̟͙̮c҉͔̫͖͓͇͖ͅh̵̤̣͚͔á̗̼͕ͅo̼̣̥s̱͈̺̖̦̻͢.̛̖̞̠̫̰','̗̺͖̹̯͓Ṯ̤͍̥͇͈h̲́e͏͓̼̗̙̼̣͔ ͇̜̱̠͓͍ͅN͕͠e̗̱z̘̝̜̺͙p̤̺̹͍̯͚e̠̻̠͜r̨̤͍̺̖͔̖̖d̠̟̭̬̝͟i̦͖̩͓͔̤a̠̗̬͉̙n͚͜ ̻̞̰͚ͅh̵͉i̳̞v̢͇ḙ͎͟-҉̭̩̼͔m̤̭̫i͕͇̝̦n̗͙ḍ̟ ̯̲͕͞ǫ̟̯̰̲͙̻̝f ̪̰̰̗̖̭̘͘c̦͍̲̞͍̩̙ḥ͚a̮͎̟̙͜ơ̩̹͎s̤.̝̝ ҉Z̡̖̜͖̰̣͉̜a͖̰͙̬͡l̲̫̳͍̩g̡̟̼̱͚̞̬ͅo̗͜.̟','̦H̬̤̗̤͝e͜ ̜̥̝̻͍̟́w̕h̖̯͓o̝͙̖͎̱̮ ҉̺̙̞̟͈W̷̼̭a̺̪͍į͈͕̭͙̯̜t̶̼̮s̘͙͖̕ ̠̫̠B̻͍͙͉̳ͅe̵h̵̬͇̫͙i̹͓̳̳̮͎̫̕n͟d̴̪̜̖ ̰͉̩͇͙̲͞ͅT͖̼͓̪͢h͏͓̮̻e̬̝̟ͅ ̤̹̝W͙̞̝͔͇͝ͅa͏͓͔̹̼̣l̴͔̰̤̟͔ḽ̫.͕','Z̮̞̠͙͔ͅḀ̗̞͈̻̗Ḷ͙͎̯̹̞͓G̻O̭̗̮','˙ɐnbᴉlɐ ɐuƃɐɯ ǝɹolop ʇǝ ǝɹoqɐl ʇn ʇunpᴉpᴉɔuᴉ ɹodɯǝʇ poɯsnᴉǝ op pǝs \'ʇᴉlǝ ƃuᴉɔsᴉdᴉpɐ ɹnʇǝʇɔǝsuoɔ \'ʇǝɯɐ ʇᴉs ɹolop ɯnsdᴉ ɯǝɹo˥','00˙Ɩ$-','Ｔｈｅ ｑｕｉｃｋ ｂｒｏｗｎ ｆｏｘ ｊｕｍｐｓ ｏｖｅｒ ｔｈｅ ｌａｚｙ ｄｏｇ','𝐓𝐡𝐞 𝐪𝐮𝐢𝐜𝐤 𝐛𝐫𝐨𝐰𝐧 𝐟𝐨𝐱 𝐣𝐮𝐦𝐩𝐬 𝐨𝐯𝐞𝐫 𝐭𝐡𝐞 𝐥𝐚𝐳𝐲 𝐝𝐨𝐠','𝕿𝖍𝖊 𝖖𝖚𝖎𝖈𝖐 𝖇𝖗𝖔𝖜𝖓 𝖋𝖔𝖝 𝖏𝖚𝖒𝖕𝖘 𝖔𝖛𝖊𝖗 𝖙𝖍𝖊 𝖑𝖆𝖟𝖞 𝖉𝖔𝖌','𝑻𝒉𝒆 𝒒𝒖𝒊𝒄𝒌 𝒃𝒓𝒐𝒘𝒏 𝒇𝒐𝒙 𝒋𝒖𝒎𝒑𝒔 𝒐𝒗𝒆𝒓 𝒕𝒉𝒆 𝒍𝒂𝒛𝒚 𝒅𝒐𝒈','𝓣𝓱𝓮 𝓺𝓾𝓲𝓬𝓴 𝓫𝓻𝓸𝔀𝓷 𝓯𝓸𝔁 𝓳𝓾𝓶𝓹𝓼 𝓸𝓿𝓮𝓻 𝓽𝓱𝓮 𝓵𝓪𝔃𝔂 𝓭𝓸𝓰','𝕋𝕙𝕖 𝕢𝕦𝕚𝕔𝕜 𝕓𝕣𝕠𝕨𝕟 𝕗𝕠𝕩 𝕛𝕦𝕞𝕡𝕤 𝕠𝕧𝕖𝕣 𝕥𝕙𝕖 𝕝𝕒𝕫𝕪 𝕕𝕠𝕘','𝚃𝚑𝚎 𝚚𝚞𝚒𝚌𝚔 𝚋𝚛𝚘𝚠𝚗 𝚏𝚘𝚡 𝚓𝚞𝚖𝚙𝚜 𝚘𝚟𝚎𝚛 𝚝𝚑𝚎 𝚕𝚊𝚣𝚢 𝚍𝚘𝚐','⒯⒣⒠ ⒬⒰⒤⒞⒦ ⒝⒭⒪⒲⒩ ⒡⒪⒳ ⒥⒰⒨⒫⒮ ⒪⒱⒠⒭ ⒯⒣⒠ ⒧⒜⒵⒴ ⒟⒪⒢','<script>alert(123)</script>','&lt;script&gt;alert(&#39;123&#39;);&lt;/script&gt;','<img src=x onerror=alert(123) />','<svg><script>123<1>alert(123)</script>','"><script>alert(123)</script>','\'><script>alert(123)</script>','><script>alert(123)</script>','</script><script>alert(123)</script>','< / script >< script >alert(123)< / script >',' onfocus=JaVaSCript:alert(123) autofocus','" onfocus=JaVaSCript:alert(123) autofocus','\' onfocus=JaVaSCript:alert(123) autofocus','＜script＞alert(123)＜/script＞','<sc<script>ript>alert(123)</sc</script>ript>','--><script>alert(123)</script>','";alert(123);t="','\';alert(123);t=\'','JavaSCript:alert(123)',';alert(123);','src=JaVaSCript:prompt(132)','"><script>alert(123);</script x="','\'><script>alert(123);</script x=\'','><script>alert(123);</script x=','" autofocus onkeyup="javascript:alert(123)','\' autofocus onkeyup=\'javascript:alert(123)','<script\\x20type="text/javascript">javascript:alert(1);</script>','<script\\x3Etype="text/javascript">javascript:alert(1);</script>','<script\\x0Dtype="text/javascript">javascript:alert(1);</script>','<script\\x09type="text/javascript">javascript:alert(1);</script>','<script\\x0Ctype="text/javascript">javascript:alert(1);</script>','<script\\x2Ftype="text/javascript">javascript:alert(1);</script>','<script\\x0Atype="text/javascript">javascript:alert(1);</script>','\'`"><\\x3Cscript>javascript:alert(1)</script>','\'`"><\\x00script>javascript:alert(1)</script>','ABC<div style="x\\x3Aexpression(javascript:alert(1)">DEF','ABC<div style="x:expression\\x5C(javascript:alert(1)">DEF','ABC<div style="x:expression\\x00(javascript:alert(1)">DEF','ABC<div style="x:exp\\x00ression(javascript:alert(1)">DEF','ABC<div style="x:exp\\x5Cression(javascript:alert(1)">DEF','ABC<div style="x:\\x0Aexpression(javascript:alert(1)">DEF','ABC<div style="x:\\x09expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE3\\x80\\x80expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x84expression(javascript:alert(1)">DEF','ABC<div style="x:\\xC2\\xA0expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x80expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x8Aexpression(javascript:alert(1)">DEF','ABC<div style="x:\\x0Dexpression(javascript:alert(1)">DEF','ABC<div style="x:\\x0Cexpression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x87expression(javascript:alert(1)">DEF','ABC<div style="x:\\xEF\\xBB\\xBFexpression(javascript:alert(1)">DEF','ABC<div style="x:\\x20expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x88expression(javascript:alert(1)">DEF','ABC<div style="x:\\x00expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x8Bexpression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x86expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x85expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x82expression(javascript:alert(1)">DEF','ABC<div style="x:\\x0Bexpression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x81expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x83expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x89expression(javascript:alert(1)">DEF','<a href="\\x0Bjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x0Fjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xC2\\xA0javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x05javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE1\\xA0\\x8Ejavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x18javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x11javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x88javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x89javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x80javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x17javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x03javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x0Ejavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Ajavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x00javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x10javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x82javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x20javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x13javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x09javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x8Ajavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x14javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x19javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\xAFjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Fjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x81javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Djavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x87javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x07javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE1\\x9A\\x80javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x83javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x04javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x01javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x08javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x84javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x86javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE3\\x80\\x80javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x12javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x0Djavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x0Ajavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x0Cjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x15javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\xA8javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x16javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x02javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Bjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x06javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\xA9javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x85javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Ejavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x81\\x9Fjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Cjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="javascript\\x00:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="javascript\\x3A:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="javascript\\x09:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="javascript\\x0D:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="javascript\\x0A:javascript:alert(1)" id="fuzzelement1">test</a>','`"\'><img src=xxx:x \\x0Aonerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x22onerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x0Bonerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x0Donerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x2Fonerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x09onerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x0Conerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x00onerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x27onerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x20onerror=javascript:alert(1)>','"`\'><script>\\x3Bjavascript:alert(1)</script>','"`\'><script>\\x0Djavascript:alert(1)</script>','"`\'><script>\\xEF\\xBB\\xBFjavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x81javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x84javascript:alert(1)</script>','"`\'><script>\\xE3\\x80\\x80javascript:alert(1)</script>','"`\'><script>\\x09javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x89javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x85javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x88javascript:alert(1)</script>','"`\'><script>\\x00javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\xA8javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x8Ajavascript:alert(1)</script>','"`\'><script>\\xE1\\x9A\\x80javascript:alert(1)</script>','"`\'><script>\\x0Cjavascript:alert(1)</script>','"`\'><script>\\x2Bjavascript:alert(1)</script>','"`\'><script>\\xF0\\x90\\x96\\x9Ajavascript:alert(1)</script>','"`\'><script>-javascript:alert(1)</script>','"`\'><script>\\x0Ajavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\xAFjavascript:alert(1)</script>','"`\'><script>\\x7Ejavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x87javascript:alert(1)</script>','"`\'><script>\\xE2\\x81\\x9Fjavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\xA9javascript:alert(1)</script>','"`\'><script>\\xC2\\x85javascript:alert(1)</script>','"`\'><script>\\xEF\\xBF\\xAEjavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x83javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x8Bjavascript:alert(1)</script>','"`\'><script>\\xEF\\xBF\\xBEjavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x80javascript:alert(1)</script>','"`\'><script>\\x21javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x82javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x86javascript:alert(1)</script>','"`\'><script>\\xE1\\xA0\\x8Ejavascript:alert(1)</script>','"`\'><script>\\x0Bjavascript:alert(1)</script>','"`\'><script>\\x20javascript:alert(1)</script>','"`\'><script>\\xC2\\xA0javascript:alert(1)</script>','<img \\x00src=x onerror="alert(1)">','<img \\x47src=x onerror="javascript:alert(1)">','<img \\x11src=x onerror="javascript:alert(1)">','<img \\x12src=x onerror="javascript:alert(1)">','<img\\x47src=x onerror="javascript:alert(1)">','<img\\x10src=x onerror="javascript:alert(1)">','<img\\x13src=x onerror="javascript:alert(1)">','<img\\x32src=x onerror="javascript:alert(1)">','<img\\x11src=x onerror="javascript:alert(1)">','<img \\x34src=x onerror="javascript:alert(1)">','<img \\x39src=x onerror="javascript:alert(1)">','<img \\x00src=x onerror="javascript:alert(1)">','<img src\\x09=x onerror="javascript:alert(1)">','<img src\\x10=x onerror="javascript:alert(1)">','<img src\\x13=x onerror="javascript:alert(1)">','<img src\\x32=x onerror="javascript:alert(1)">','<img src\\x12=x onerror="javascript:alert(1)">','<img src\\x11=x onerror="javascript:alert(1)">','<img src\\x00=x onerror="javascript:alert(1)">','<img src\\x47=x onerror="javascript:alert(1)">','<img src=x\\x09onerror="javascript:alert(1)">','<img src=x\\x10onerror="javascript:alert(1)">','<img src=x\\x11onerror="javascript:alert(1)">','<img src=x\\x12onerror="javascript:alert(1)">','<img src=x\\x13onerror="javascript:alert(1)">','<img[a][b][c]src[d]=x[e]onerror=[f]"alert(1)">','<img src=x onerror=\\x09"javascript:alert(1)">','<img src=x onerror=\\x10"javascript:alert(1)">','<img src=x onerror=\\x11"javascript:alert(1)">','<img src=x onerror=\\x12"javascript:alert(1)">','<img src=x onerror=\\x32"javascript:alert(1)">','<img src=x onerror=\\x00"javascript:alert(1)">','<a href=java&#1&#2&#3&#4&#5&#6&#7&#8&#11&#12script:javascript:alert(1)>XXX</a>','<img src="x` `<script>javascript:alert(1)</script>"` `>','<img src onerror /" \'"= alt=javascript:alert(1)//">','<title onpropertychange=javascript:alert(1)></title><title title=>','<a href=http://foo.bar/#x=`y></a><img alt="`><img src=x:x onerror=javascript:alert(1)></a>">','<!--[if]><script>javascript:alert(1)</script -->','<!--[if<img src=x onerror=javascript:alert(1)//]> -->','<script src="/\\%(jscript)s"></script>','<script src="\\\\%(jscript)s"></script>','<IMG """><SCRIPT>alert("XSS")</SCRIPT>">','<IMG SRC=javascript:alert(String.fromCharCode(88,83,83))>','<IMG SRC=# onmouseover="alert(\'xxs\')">','<IMG SRC= onmouseover="alert(\'xxs\')">','<IMG onmouseover="alert(\'xxs\')">','<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>','<IMG SRC=&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058&#0000097&#0000108&#0000101&#0000114&#0000116&#0000040&#0000039&#0000088&#0000083&#0000083&#0000039&#0000041>','<IMG SRC=&#x6A&#x61&#x76&#x61&#x73&#x63&#x72&#x69&#x70&#x74&#x3A&#x61&#x6C&#x65&#x72&#x74&#x28&#x27&#x58&#x53&#x53&#x27&#x29>','<IMG SRC="jav   ascript:alert(\'XSS\');">','<IMG SRC="jav&#x09;ascript:alert(\'XSS\');">','<IMG SRC="jav&#x0A;ascript:alert(\'XSS\');">','<IMG SRC="jav&#x0D;ascript:alert(\'XSS\');">','perl -e \'print "<IMG SRC=java\\0script:alert(\\"XSS\\")>";\' > out','<IMG SRC=" &#14;  javascript:alert(\'XSS\');">','<SCRIPT/XSS SRC="http://ha.ckers.org/xss.js"></SCRIPT>','<BODY onload!#$%&()*~+-_.,:;?@[/|\\]^`=alert("XSS")>','<SCRIPT/SRC="http://ha.ckers.org/xss.js"></SCRIPT>','<<SCRIPT>alert("XSS");//<</SCRIPT>','<SCRIPT SRC=http://ha.ckers.org/xss.js?< B >','<SCRIPT SRC=//ha.ckers.org/.j>','<IMG SRC="javascript:alert(\'XSS\')"','<iframe src=http://ha.ckers.org/scriptlet.html <','\\";alert(\'XSS\');//','<u oncopy=alert()> Copy me</u>','<i onwheel=alert(1)> Scroll over me </i>','<plaintext>','http://a/%%30%30','</textarea><script>alert(123)</script>','1;DROP TABLE users','1\'; DROP TABLE users-- 1','\' OR 1=1 -- 1','\' OR \'1\'=\'1','\'; EXEC sp_MSForEachTable \'DROP TABLE ?\'; --',' ','%','_','--','--version','--help','$USER','/dev/null; touch /tmp/blns.fail ; echo','`touch /tmp/blns.fail`','$(touch /tmp/blns.fail)','@{[system "touch /tmp/blns.fail"]}','eval("puts \'hello world\'")','System("ls -al /")','`ls -al /`','Kernel.exec("ls -al /")','Kernel.exit(1)','%x(\'ls -al /\')','<?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE foo [ <!ELEMENT foo ANY ><!ENTITY xxe SYSTEM "file:///etc/passwd" >]><foo>&xxe;</foo>','$HOME','$ENV{\'HOME\'}','%d','%s%s%s%s%s','{0}','%*.*s','%@','%n','File:///','../../../../../../../../../../../etc/passwd%00','../../../../../../../../../../../etc/hosts','() { 0; }; touch /tmp/blns.shellshock1.fail;','() { _; } >_[$($())] { touch /tmp/blns.shellshock2.fail; }','<<< %s(un=\'%s\') = %u','+++ATH0','CON','PRN','AUX','CLOCK$','NUL','A:','ZZ:','COM1','LPT1','LPT2','LPT3','COM2','COM3','COM4','DCC SEND STARTKEYLOGGER 0 0 0','Scunthorpe General Hospital','Penistone Community Church','Lightwater Country Park','Jimmy Clitheroe','Horniman Museum','shitake mushrooms','RomansInSussex.co.uk','http://www.cum.qc.ca/','Craig Cockburn, Software Specialist','Linda Callahan','Dr. Herman I. Libshitz','magna cum laude','Super Bowl XXX','medieval erection of parapets','evaluate','mocha','expression','Arsenal canal','classic','Tyson Gay','Dick Van Dyke','basement','If you\'re reading this, you\'ve been in a coma for almost 20 years now. We\'re trying a new technique. We don\'t know where this message will end up in your dream, but we hope it works. Please wake up, we miss you.','Roses are \\u001b[0;31mred\\u001b[0m, violets are \\u001b[0;34mblue. Hope you enjoy terminal hue','But now...\\u001b[20Cfor my greatest trick...\\u001b[8m','The quic\b\b\b\b\b\bk brown fo\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007x... [Beeeep]','Powerلُلُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ冗','🏳0🌈️','జ్ఞ‌ా','گچپژ','{% print \'x\' * 64 * 1024**3 %}','{{ "".__class__.__mro__[2].__subclasses__()[40]("/etc/passwd").read() }}']
+┌─'undefined'─┬─'undef'─┬─'null'─┬─'NULL'─┬─'(null)'─┬─'nil'─┬─'NIL'─┬─'true'─┬─'false'─┬─'True'─┬─'False'─┬─'TRUE'─┬─'FALSE'─┬─'None'─┬─'hasOwnProperty'─┬─'then'─┬─'\\'─┬─'\\\\'─┬─'0'─┬─'1'─┬─'1.00'─┬─'$1.00'─┬─'1/2'─┬─'1E2'─┬─'1E02'─┬─'1E+02'─┬─'-1'─┬─'-1.00'─┬─'-$1.00'─┬─'-1/2'─┬─'-1E2'─┬─'-1E02'─┬─'-1E+02'─┬─'1/0'─┬─'0/0'─┬─'-2147483648/-1'─┬─'-9223372036854775808/-1'─┬─'-0'─┬─'-0.0'─┬─'+0'─┬─'+0.0'─┬─'0.00'─┬─'0..0'─┬─'.'─┬─'0.0.0'─┬─'0,00'─┬─'0,,0'─┬─','─┬─'0,0,0'─┬─'0.0/0'─┬─'1.0/0.0'─┬─'0.0/0.0'─┬─'1,0/0,0'─┬─'0,0/0,0'─┬─'--1'─┬─'-'─┬─'-.'─┬─'-,'─┬─'999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999'─┬─'NaN'─┬─'Infinity'─┬─'-Infinity'─┬─'INF'─┬─'1#INF'─┬─'-1#IND'─┬─'1#QNAN'─┬─'1#SNAN'─┬─'1#IND'─┬─'0x0'─┬─'0xffffffff'─┬─'0xffffffffffffffff'─┬─'0xabad1dea'─┬─'123456789012345678901234567890123456789'─┬─'1,000.00'─┬─'1 000.00'─┬─'1\'000.00'─┬─'1,000,000.00'─┬─'1 000 000.00'─┬─'1\'000\'000.00'─┬─'1.000,00'─┬─'1 000,00'─┬─'1\'000,00'─┬─'1.000.000,00'─┬─'1 000 000,00'─┬─'1\'000\'000,00'─┬─'01000'─┬─'08'─┬─'09'─┬─'2.2250738585072011e-308'─┬─',./;\'[]\\-='─┬─'<>?:"{}|_+'─┬─'!@#$%^&*()`~'─┬─'\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\b\\u000e\\u000f\\u0010\\u0011\\u0012\\u0013\\u0014\\u0015\\u0016\\u0017\\u0018\\u0019\\u001a\\u001b\\u001c\\u001d\\u001e\\u001f'─┬─'€‚ƒ„†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ'─┬─'\t\\u000b\f …             ​

  　'─┬─'­؀؁؂؃؄؅؜۝܏᠎​‌‍‎‏‪‫‬‭‮⁠⁡⁢⁣⁤⁦⁧⁨⁩𑂽𛲠𛲡𛲢𛲣𝅳𝅴𝅵𝅶𝅷𝅸𝅹𝅺󠀁󠀠󠀡󠀢󠀣󠀤󠀥󠀦󠀧󠀨󠀩󠀪󠀫󠀬󠀭󠀮󠀯󠀰󠀱󠀲󠀳󠀴󠀵󠀶󠀷󠀸󠀹󠀺󠀻󠀼󠀽󠀾󠀿󠁀󠁁󠁂󠁃󠁄󠁅󠁆󠁇󠁈󠁉󠁊󠁋󠁌󠁍󠁎󠁏󠁐󠁑󠁒󠁓󠁔󠁕󠁖󠁗󠁘󠁙󠁚󠁛󠁜󠁝󠁞󠁟󠁠󠁡󠁢󠁣󠁤󠁥󠁦󠁧󠁨󠁩󠁪󠁫󠁬󠁭󠁮󠁯󠁰󠁱󠁲󠁳󠁴󠁵󠁶󠁷󠁸󠁹󠁺󠁻󠁼󠁽󠁾󠁿'─┬─''─┬─'￾'─┬─'Ω≈ç√∫˜µ≤≥÷'─┬─'åß∂ƒ©˙∆˚¬…æ'─┬─'œ∑´®†¥¨ˆøπ“‘'─┬─'¡™£¢∞§¶•ªº–≠'─┬─'¸˛Ç◊ı˜Â¯˘¿'─┬─'ÅÍÎÏ˝ÓÔÒÚÆ☃'─┬─'Œ„´‰ˇÁ¨ˆØ∏”’'─┬─'`⁄€‹›fifl‡°·‚—±'─┬─'⅛⅜⅝⅞'─┬─'ЁЂЃЄЅІЇЈЉЊЋЌЍЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя'─┬─'٠١٢٣٤٥٦٧٨٩'─┬─'⁰⁴⁵'─┬─'₀₁₂'─┬─'⁰⁴⁵₀₁₂'─┬─'ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็ ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็ ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็'─┬─'\''─┬─'"'─┬─'\'\''─┬─'""'─┬─'\'"\''─┬─'"\'\'\'\'"\'"'─┬─'"\'"\'"\'\'\'\'"'─┬─'<foo val=“bar” />'─┬─'<foo val=”bar“ />'─┬─'<foo val=`bar\' />'─┬─'田中さんにあげて下さい'─┬─'パーティーへ行かないか'─┬─'和製漢語'─┬─'部落格'─┬─'사회과학원 어학연구소'─┬─'찦차를 타고 온 펲시맨과 쑛다리 똠방각하'─┬─'社會科學院語學研究所'─┬─'울란바토르'─┬─'𠜎𠜱𠝹𠱓𠱸𠲖𠳏'─┬─'𐐜 𐐔𐐇𐐝𐐀𐐡𐐇𐐓 𐐙𐐊𐐡𐐝𐐓/𐐝𐐇𐐗𐐊𐐤𐐔 𐐒𐐋𐐗 𐐒𐐌 𐐜 𐐡𐐀𐐖𐐇𐐤𐐓𐐝 𐐱𐑂 𐑄 𐐔𐐇𐐝𐐀𐐡𐐇𐐓 𐐏𐐆𐐅𐐤𐐆𐐚𐐊𐐡𐐝𐐆𐐓𐐆'─┬─'表ポあA鷗ŒéＢ逍Üߪąñ丂㐀𠀀'─┬─'Ⱥ'─┬─'Ⱦ'─┬─'ヽ༼ຈل͜ຈ༽ﾉ ヽ༼ຈل͜ຈ༽ﾉ'─┬─'(｡◕ ∀ ◕｡)'─┬─'｀ｨ(´∀｀∩'─┬─'__ﾛ(,_,*)'─┬─'・(￣∀￣)・:*:'─┬─'ﾟ･✿ヾ╲(｡◕‿◕｡)╱✿･ﾟ'─┬─',。・:*:・゜’( ☻ ω ☻ )。・:*:・゜’'─┬─'(╯°□°）╯︵ ┻━┻)'─┬─'(ﾉಥ益ಥ）ﾉ ┻━┻'─┬─'┬─┬ノ( º _ ºノ)'─┬─'( ͡° ͜ʖ ͡°)'─┬─'¯\\_(ツ)_/¯'─┬─'😍'─┬─'👩🏽'─┬─'👨‍🦰 👨🏿‍🦰 👨‍🦱 👨🏿‍🦱 🦹🏿‍♂️'─┬─'👾 🙇 💁 🙅 🙆 🙋 🙎 🙍'─┬─'🐵 🙈 🙉 🙊'─┬─'❤️ 💔 💌 💕 💞 💓 💗 💖 💘 💝 💟 💜 💛 💚 💙'─┬─'✋🏿 💪🏿 👐🏿 🙌🏿 👏🏿 🙏🏿'─┬─'👨‍👩‍👦 👨‍👩‍👧‍👦 👨‍👨‍👦 👩‍👩‍👧 👨‍👦 👨‍👧‍👦 👩‍👦 👩‍👧‍👦'─┬─'🚾 🆒 🆓 🆕 🆖 🆗 🆙 🏧'─┬─'0️⃣ 1️⃣ 2️⃣ 3️⃣ 4️⃣ 5️⃣ 6️⃣ 7️⃣ 8️⃣ 9️⃣ 🔟'─┬─'🇺🇸🇷🇺🇸 🇦🇫🇦🇲🇸'─┬─'🇺🇸🇷🇺🇸🇦🇫🇦🇲'─┬─'🇺🇸🇷🇺🇸🇦'─┬─'１２３'─┬─'١٢٣'─┬─'ثم نفس سقطت وبالتحديد،, جزيرتي باستخدام أن دنو. إذ هنا؟ الستار وتنصيب كان. أهّل ايطاليا، بريطانيا-فرنسا قد أخذ. سليمان، إتفاقية بين ما , يذكر الحدود أي بعد, معاملة بولندا، الإطلاق عل إيو.'─┬─'בְּרֵאשִׁית, בָּרָא אֱלֹהִים, אֵת הַשָּׁמַיִם, וְאֵת הָאָרֶץ'─┬─'הָיְתָהtestالصفحات التّحول'─┬─'﷽'─┬─'ﷺ'─┬─'مُنَاقَشَةُ سُبُلِ اِسْتِخْدَامِ اللُّغَةِ فِي النُّظُمِ الْقَائِمَةِ وَفِيم يَخُصَّ التَّطْبِيقَاتُ الْحاسُوبِيَّةُ، '─┬─'᚛ᚄᚓᚐᚋᚒᚄ ᚑᚄᚂᚑᚏᚅ᚜‪‪‪'─┬─'‪‪᚛                 ᚜‪'─┬─'‪‪test‪'─┬─'‫test‫'─┬─'
test
'─┬─'test⁠test‫'─┬─'⁦test⁧'─┬─'Ṱ̺̺̕o͞ ̷i̲̬͇̪͙n̝̗͕v̟̜̘̦͟o̶̙̰̠kè͚̮̺̪̹̱̤ ̖t̝͕̳̣̻̪͞h̼͓̲̦̳̘̲e͇̣̰̦̬͎ ̢̼̻̱̘h͚͎͙̜̣̲ͅi̦̲̣̰̤v̻͍e̺̭̳̪̰-m̢iͅn̖̺̞̲̯̰d̵̼̟͙̩̼̘̳ ̞̥̱̳̭r̛̗̘e͙p͠r̼̞̻̭̗e̺̠̣͟s̘͇̳͍̝͉e͉̥̯̞̲͚̬͜ǹ̬͎͎̟̖͇̤t͍̬̤͓̼̭͘ͅi̪̱n͠g̴͉ ͏͉ͅc̬̟h͡a̫̻̯͘o̫̟̖͍̙̝͉s̗̦̲.̨̹͈̣'─┬─'̡͓̞ͅI̗̘̦͝n͇͇͙v̮̫ok̲̫̙͈i̖͙̭̹̠̞n̡̻̮̣̺g̲͈͙̭͙̬͎ ̰t͔̦h̞̲e̢̤ ͍̬̲͖f̴̘͕̣è͖ẹ̥̩l͖͔͚i͓͚̦͠n͖͍̗͓̳̮g͍ ̨o͚̪͡f̘̣̬ ̖̘͖̟͙̮c҉͔̫͖͓͇͖ͅh̵̤̣͚͔á̗̼͕ͅo̼̣̥s̱͈̺̖̦̻͢.̛̖̞̠̫̰'─┬─'̗̺͖̹̯͓Ṯ̤͍̥͇͈h̲́e͏͓̼̗̙̼̣͔ ͇̜̱̠͓͍ͅN͕͠e̗̱z̘̝̜̺͙p̤̺̹͍̯͚e̠̻̠͜r̨̤͍̺̖͔̖̖d̠̟̭̬̝͟i̦͖̩͓͔̤a̠̗̬͉̙n͚͜ ̻̞̰͚ͅh̵͉i̳̞v̢͇ḙ͎͟-҉̭̩̼͔m̤̭̫i͕͇̝̦n̗͙ḍ̟ ̯̲͕͞ǫ̟̯̰̲͙̻̝f ̪̰̰̗̖̭̘͘c̦͍̲̞͍̩̙ḥ͚a̮͎̟̙͜ơ̩̹͎s̤.̝̝ ҉Z̡̖̜͖̰̣͉̜a͖̰͙̬͡l̲̫̳͍̩g̡̟̼̱͚̞̬ͅo̗͜.̟'─┬─'̦H̬̤̗̤͝e͜ ̜̥̝̻͍̟́w̕h̖̯͓o̝͙̖͎̱̮ ҉̺̙̞̟͈W̷̼̭a̺̪͍į͈͕̭͙̯̜t̶̼̮s̘͙͖̕ ̠̫̠B̻͍͙͉̳ͅe̵h̵̬͇̫͙i̹͓̳̳̮͎̫̕n͟d̴̪̜̖ ̰͉̩͇͙̲͞ͅT͖̼͓̪͢h͏͓̮̻e̬̝̟ͅ ̤̹̝W͙̞̝͔͇͝ͅa͏͓͔̹̼̣l̴͔̰̤̟͔ḽ̫.͕'─┬─'Z̮̞̠͙͔ͅḀ̗̞͈̻̗Ḷ͙͎̯̹̞͓G̻O̭̗̮'─┬─'˙ɐnbᴉlɐ ɐuƃɐɯ ǝɹolop ʇǝ ǝɹoqɐl ʇn ʇunpᴉpᴉɔuᴉ ɹodɯǝʇ poɯsnᴉǝ op pǝs \'ʇᴉlǝ ƃuᴉɔsᴉdᴉpɐ ɹnʇǝʇɔǝsuoɔ \'ʇǝɯɐ ʇᴉs ɹolop ɯnsdᴉ ɯǝɹo˥'─┬─'00˙Ɩ$-'─┬─'Ｔｈｅ ｑｕｉｃｋ ｂｒｏｗｎ ｆｏｘ ｊｕｍｐｓ ｏｖｅｒ ｔｈｅ ｌａｚｙ ｄｏｇ'─┬─'𝐓𝐡𝐞 𝐪𝐮𝐢𝐜𝐤 𝐛𝐫𝐨𝐰𝐧 𝐟𝐨𝐱 𝐣𝐮𝐦𝐩𝐬 𝐨𝐯𝐞𝐫 𝐭𝐡𝐞 𝐥𝐚𝐳𝐲 𝐝𝐨𝐠'─┬─'𝕿𝖍𝖊 𝖖𝖚𝖎𝖈𝖐 𝖇𝖗𝖔𝖜𝖓 𝖋𝖔𝖝 𝖏𝖚𝖒𝖕𝖘 𝖔𝖛𝖊𝖗 𝖙𝖍𝖊 𝖑𝖆𝖟𝖞 𝖉𝖔𝖌'─┬─'𝑻𝒉𝒆 𝒒𝒖𝒊𝒄𝒌 𝒃𝒓𝒐𝒘𝒏 𝒇𝒐𝒙 𝒋𝒖𝒎𝒑𝒔 𝒐𝒗𝒆𝒓 𝒕𝒉𝒆 𝒍𝒂𝒛𝒚 𝒅𝒐𝒈'─┬─'𝓣𝓱𝓮 𝓺𝓾𝓲𝓬𝓴 𝓫𝓻𝓸𝔀𝓷 𝓯𝓸𝔁 𝓳𝓾𝓶𝓹𝓼 𝓸𝓿𝓮𝓻 𝓽𝓱𝓮 𝓵𝓪𝔃𝔂 𝓭𝓸𝓰'─┬─'𝕋𝕙𝕖 𝕢𝕦𝕚𝕔𝕜 𝕓𝕣𝕠𝕨𝕟 𝕗𝕠𝕩 𝕛𝕦𝕞𝕡𝕤 𝕠𝕧𝕖𝕣 𝕥𝕙𝕖 𝕝𝕒𝕫𝕪 𝕕𝕠𝕘'─┬─'𝚃𝚑𝚎 𝚚𝚞𝚒𝚌𝚔 𝚋𝚛𝚘𝚠𝚗 𝚏𝚘𝚡 𝚓𝚞𝚖𝚙𝚜 𝚘𝚟𝚎𝚛 𝚝𝚑𝚎 𝚕𝚊𝚣𝚢 𝚍𝚘𝚐'─┬─'⒯⒣⒠ ⒬⒰⒤⒞⒦ ⒝⒭⒪⒲⒩ ⒡⒪⒳ ⒥⒰⒨⒫⒮ ⒪⒱⒠⒭ ⒯⒣⒠ ⒧⒜⒵⒴ ⒟⒪⒢'─┬─'<script>alert(123)</script>'─┬─'&lt;script&gt;alert(&#39;123&#39;);&lt;/script&gt;'─┬─'<img src=x onerror=alert(123) />'─┬─'<svg><script>123<1>alert(123)</script>'─┬─'"><script>alert(123)</script>'─┬─'\'><script>alert(123)</script>'─┬─'><script>alert(123)</script>'─┬─'</script><script>alert(123)</script>'─┬─'< / script >< script >alert(123)< / script >'─┬─' onfocus=JaVaSCript:alert(123) autofocus'─┬─'" onfocus=JaVaSCript:alert(123) autofocus'─┬─'\' onfocus=JaVaSCript:alert(123) autofocus'─┬─'＜script＞alert(123)＜/script＞'─┬─'<sc<script>ript>alert(123)</sc</script>ript>'─┬─'--><script>alert(123)</script>'─┬─'";alert(123);t="'─┬─'\';alert(123);t=\''─┬─'JavaSCript:alert(123)'─┬─';alert(123);'─┬─'src=JaVaSCript:prompt(132)'─┬─'"><script>alert(123);</script x="'─┬─'\'><script>alert(123);</script x=\''─┬─'><script>alert(123);</script x='─┬─'" autofocus onkeyup="javascript:alert(123)'─┬─'\' autofocus onkeyup=\'javascript:alert(123)'─┬─'<script\\x20type="text/javascript">javascript:alert(1);</script>'─┬─'<script\\x3Etype="text/javascript">javascript:alert(1);</script>'─┬─'<script\\x0Dtype="text/javascript">javascript:alert(1);</script>'─┬─'<script\\x09type="text/javascript">javascript:alert(1);</script>'─┬─'<script\\x0Ctype="text/javascript">javascript:alert(1);</script>'─┬─'<script\\x2Ftype="text/javascript">javascript:alert(1);</script>'─┬─'<script\\x0Atype="text/javascript">javascript:alert(1);</script>'─┬─'\'`"><\\x3Cscript>javascript:alert(1)</script>'─┬─'\'`"><\\x00script>javascript:alert(1)</script>'─┬─'ABC<div style="x\\x3Aexpression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:expression\\x5C(javascript:alert(1)">DEF'─┬─'ABC<div style="x:expression\\x00(javascript:alert(1)">DEF'─┬─'ABC<div style="x:exp\\x00ression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:exp\\x5Cression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:\\x0Aexpression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:\\x09expression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:\\xE3\\x80\\x80expression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:\\xE2\\x80\\x84expression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:\\xC2\\xA0expression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:\\xE2\\x80\\x80expression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:\\xE2\\x80\\x8Aexpression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:\\x0Dexpression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:\\x0Cexpression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:\\xE2\\x80\\x87expression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:\\xEF\\xBB\\xBFexpression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:\\x20expression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:\\xE2\\x80\\x88expression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:\\x00expression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:\\xE2\\x80\\x8Bexpression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:\\xE2\\x80\\x86expression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:\\xE2\\x80\\x85expression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:\\xE2\\x80\\x82expression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:\\x0Bexpression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:\\xE2\\x80\\x81expression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:\\xE2\\x80\\x83expression(javascript:alert(1)">DEF'─┬─'ABC<div style="x:\\xE2\\x80\\x89expression(javascript:alert(1)">DEF'─┬─'<a href="\\x0Bjavascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x0Fjavascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\xC2\\xA0javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x05javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\xE1\\xA0\\x8Ejavascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x18javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x11javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\xE2\\x80\\x88javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\xE2\\x80\\x89javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\xE2\\x80\\x80javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x17javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x03javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x0Ejavascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x1Ajavascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x00javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x10javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\xE2\\x80\\x82javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x20javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x13javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x09javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\xE2\\x80\\x8Ajavascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x14javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x19javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\xE2\\x80\\xAFjavascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x1Fjavascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\xE2\\x80\\x81javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x1Djavascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\xE2\\x80\\x87javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x07javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\xE1\\x9A\\x80javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\xE2\\x80\\x83javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x04javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x01javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x08javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\xE2\\x80\\x84javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\xE2\\x80\\x86javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\xE3\\x80\\x80javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x12javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x0Djavascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x0Ajavascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x0Cjavascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x15javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\xE2\\x80\\xA8javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x16javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x02javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x1Bjavascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x06javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\xE2\\x80\\xA9javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\xE2\\x80\\x85javascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x1Ejavascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\xE2\\x81\\x9Fjavascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="\\x1Cjavascript:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="javascript\\x00:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="javascript\\x3A:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="javascript\\x09:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="javascript\\x0D:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'<a href="javascript\\x0A:javascript:alert(1)" id="fuzzelement1">test</a>'─┬─'`"\'><img src=xxx:x \\x0Aonerror=javascript:alert(1)>'─┬─'`"\'><img src=xxx:x \\x22onerror=javascript:alert(1)>'─┬─'`"\'><img src=xxx:x \\x0Bonerror=javascript:alert(1)>'─┬─'`"\'><img src=xxx:x \\x0Donerror=javascript:alert(1)>'─┬─'`"\'><img src=xxx:x \\x2Fonerror=javascript:alert(1)>'─┬─'`"\'><img src=xxx:x \\x09onerror=javascript:alert(1)>'─┬─'`"\'><img src=xxx:x \\x0Conerror=javascript:alert(1)>'─┬─'`"\'><img src=xxx:x \\x00onerror=javascript:alert(1)>'─┬─'`"\'><img src=xxx:x \\x27onerror=javascript:alert(1)>'─┬─'`"\'><img src=xxx:x \\x20onerror=javascript:alert(1)>'─┬─'"`\'><script>\\x3Bjavascript:alert(1)</script>'─┬─'"`\'><script>\\x0Djavascript:alert(1)</script>'─┬─'"`\'><script>\\xEF\\xBB\\xBFjavascript:alert(1)</script>'─┬─'"`\'><script>\\xE2\\x80\\x81javascript:alert(1)</script>'─┬─'"`\'><script>\\xE2\\x80\\x84javascript:alert(1)</script>'─┬─'"`\'><script>\\xE3\\x80\\x80javascript:alert(1)</script>'─┬─'"`\'><script>\\x09javascript:alert(1)</script>'─┬─'"`\'><script>\\xE2\\x80\\x89javascript:alert(1)</script>'─┬─'"`\'><script>\\xE2\\x80\\x85javascript:alert(1)</script>'─┬─'"`\'><script>\\xE2\\x80\\x88javascript:alert(1)</script>'─┬─'"`\'><script>\\x00javascript:alert(1)</script>'─┬─'"`\'><script>\\xE2\\x80\\xA8javascript:alert(1)</script>'─┬─'"`\'><script>\\xE2\\x80\\x8Ajavascript:alert(1)</script>'─┬─'"`\'><script>\\xE1\\x9A\\x80javascript:alert(1)</script>'─┬─'"`\'><script>\\x0Cjavascript:alert(1)</script>'─┬─'"`\'><script>\\x2Bjavascript:alert(1)</script>'─┬─'"`\'><script>\\xF0\\x90\\x96\\x9Ajavascript:alert(1)</script>'─┬─'"`\'><script>-javascript:alert(1)</script>'─┬─'"`\'><script>\\x0Ajavascript:alert(1)</script>'─┬─'"`\'><script>\\xE2\\x80\\xAFjavascript:alert(1)</script>'─┬─'"`\'><script>\\x7Ejavascript:alert(1)</script>'─┬─'"`\'><script>\\xE2\\x80\\x87javascript:alert(1)</script>'─┬─'"`\'><script>\\xE2\\x81\\x9Fjavascript:alert(1)</script>'─┬─'"`\'><script>\\xE2\\x80\\xA9javascript:alert(1)</script>'─┬─'"`\'><script>\\xC2\\x85javascript:alert(1)</script>'─┬─'"`\'><script>\\xEF\\xBF\\xAEjavascript:alert(1)</script>'─┬─'"`\'><script>\\xE2\\x80\\x83javascript:alert(1)</script>'─┬─'"`\'><script>\\xE2\\x80\\x8Bjavascript:alert(1)</script>'─┬─'"`\'><script>\\xEF\\xBF\\xBEjavascript:alert(1)</script>'─┬─'"`\'><script>\\xE2\\x80\\x80javascript:alert(1)</script>'─┬─'"`\'><script>\\x21javascript:alert(1)</script>'─┬─'"`\'><script>\\xE2\\x80\\x82javascript:alert(1)</script>'─┬─'"`\'><script>\\xE2\\x80\\x86javascript:alert(1)</script>'─┬─'"`\'><script>\\xE1\\xA0\\x8Ejavascript:alert(1)</script>'─┬─'"`\'><script>\\x0Bjavascript:alert(1)</script>'─┬─'"`\'><script>\\x20javascript:alert(1)</script>'─┬─'"`\'><script>\\xC2\\xA0javascript:alert(1)</script>'─┬─'<img \\x00src=x onerror="alert(1)">'─┬─'<img \\x47src=x onerror="javascript:alert(1)">'─┬─'<img \\x11src=x onerror="javascript:alert(1)">'─┬─'<img \\x12src=x onerror="javascript:alert(1)">'─┬─'<img\\x47src=x onerror="javascript:alert(1)">'─┬─'<img\\x10src=x onerror="javascript:alert(1)">'─┬─'<img\\x13src=x onerror="javascript:alert(1)">'─┬─'<img\\x32src=x onerror="javascript:alert(1)">'─┬─'<img\\x11src=x onerror="javascript:alert(1)">'─┬─'<img \\x34src=x onerror="javascript:alert(1)">'─┬─'<img \\x39src=x onerror="javascript:alert(1)">'─┬─'<img \\x00src=x onerror="javascript:alert(1)">'─┬─'<img src\\x09=x onerror="javascript:alert(1)">'─┬─'<img src\\x10=x onerror="javascript:alert(1)">'─┬─'<img src\\x13=x onerror="javascript:alert(1)">'─┬─'<img src\\x32=x onerror="javascript:alert(1)">'─┬─'<img src\\x12=x onerror="javascript:alert(1)">'─┬─'<img src\\x11=x onerror="javascript:alert(1)">'─┬─'<img src\\x00=x onerror="javascript:alert(1)">'─┬─'<img src\\x47=x onerror="javascript:alert(1)">'─┬─'<img src=x\\x09onerror="javascript:alert(1)">'─┬─'<img src=x\\x10onerror="javascript:alert(1)">'─┬─'<img src=x\\x11onerror="javascript:alert(1)">'─┬─'<img src=x\\x12onerror="javascript:alert(1)">'─┬─'<img src=x\\x13onerror="javascript:alert(1)">'─┬─'<img[a][b][c]src[d]=x[e]onerror=[f]"alert(1)">'─┬─'<img src=x onerror=\\x09"javascript:alert(1)">'─┬─'<img src=x onerror=\\x10"javascript:alert(1)">'─┬─'<img src=x onerror=\\x11"javascript:alert(1)">'─┬─'<img src=x onerror=\\x12"javascript:alert(1)">'─┬─'<img src=x onerror=\\x32"javascript:alert(1)">'─┬─'<img src=x onerror=\\x00"javascript:alert(1)">'─┬─'<a href=java&#1&#2&#3&#4&#5&#6&#7&#8&#11&#12script:javascript:alert(1)>XXX</a>'─┬─'<img src="x` `<script>javascript:alert(1)</script>"` `>'─┬─'<img src onerror /" \'"= alt=javascript:alert(1)//">'─┬─'<title onpropertychange=javascript:alert(1)></title><title title=>'─┬─'<a href=http://foo.bar/#x=`y></a><img alt="`><img src=x:x onerror=javascript:alert(1)></a>">'─┬─'<!--[if]><script>javascript:alert(1)</script -->'─┬─'<!--[if<img src=x onerror=javascript:alert(1)//]> -->'─┬─'<script src="/\\%(jscript)s"></script>'─┬─'<script src="\\\\%(jscript)s"></script>'─┬─'<IMG """><SCRIPT>alert("XSS")</SCRIPT>">'─┬─'<IMG SRC=javascript:alert(String.fromCharCode(88,83,83))>'─┬─'<IMG SRC=# onmouseover="alert(\'xxs\')">'─┬─'<IMG SRC= onmouseover="alert(\'xxs\')">'─┬─'<IMG onmouseover="alert(\'xxs\')">'─┬─'<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>'─┬─'<IMG SRC=&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058&#0000097&#0000108&#0000101&#0000114&#0000116&#0000040&#0000039&#0000088&#0000083&#0000083&#0000039&#0000041>'─┬─'<IMG SRC=&#x6A&#x61&#x76&#x61&#x73&#x63&#x72&#x69&#x70&#x74&#x3A&#x61&#x6C&#x65&#x72&#x74&#x28&#x27&#x58&#x53&#x53&#x27&#x29>'─┬─'<IMG SRC="jav   ascript:alert(\'XSS\');">'─┬─'<IMG SRC="jav&#x09;ascript:alert(\'XSS\');">'─┬─'<IMG SRC="jav&#x0A;ascript:alert(\'XSS\');">'─┬─'<IMG SRC="jav&#x0D;ascript:alert(\'XSS\');">'─┬─'perl -e \'print "<IMG SRC=java\\0script:alert(\\"XSS\\")>";\' > out'─┬─'<IMG SRC=" &#14;  javascript:alert(\'XSS\');">'─┬─'<SCRIPT/XSS SRC="http://ha.ckers.org/xss.js"></SCRIPT>'─┬─'<BODY onload!#$%&()*~+-_.,:;?@[/|\\]^`=alert("XSS")>'─┬─'<SCRIPT/SRC="http://ha.ckers.org/xss.js"></SCRIPT>'─┬─'<<SCRIPT>alert("XSS");//<</SCRIPT>'─┬─'<SCRIPT SRC=http://ha.ckers.org/xss.js?< B >'─┬─'<SCRIPT SRC=//ha.ckers.org/.j>'─┬─'<IMG SRC="javascript:alert(\'XSS\')"'─┬─'<iframe src=http://ha.ckers.org/scriptlet.html <'─┬─'\\";alert(\'XSS\');//'─┬─'<u oncopy=alert()> Copy me</u>'─┬─'<i onwheel=alert(1)> Scroll over me </i>'─┬─'<plaintext>'─┬─'http://a/%%30%30'─┬─'</textarea><script>alert(123)</script>'─┬─'1;DROP TABLE users'─┬─'1\'; DROP TABLE users-- 1'─┬─'\' OR 1=1 -- 1'─┬─'\' OR \'1\'=\'1'─┬─'\'; EXEC sp_MSForEachTable \'DROP TABLE ?\'; --'─┬─' '─┬─'%'─┬─'_'─┬─'--'─┬─'--version'─┬─'--help'─┬─'$USER'─┬─'/dev/null; touch /tmp/blns.fail ; echo'─┬─'`touch /tmp/blns.fail`'─┬─'$(touch /tmp/blns.fail)'─┬─'@{[system "touch /tmp/blns.fail"]}'─┬─'eval("puts \'hello world\'")'─┬─'System("ls -al /")'─┬─'`ls -al /`'─┬─'Kernel.exec("ls -al /")'─┬─'Kernel.exit(1)'─┬─'%x(\'ls -al /\')'─┬─'<?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE foo [ <!ELEMENT foo ANY ><!ENTITY xxe SYSTEM "file:///etc/passwd" >]><foo>&xxe;</foo>'─┬─'$HOME'─┬─'$ENV{\'HOME\'}'─┬─'%d'─┬─'%s%s%s%s%s'─┬─'{0}'─┬─'%*.*s'─┬─'%@'─┬─'%n'─┬─'File:///'─┬─'../../../../../../../../../../../etc/passwd%00'─┬─'../../../../../../../../../../../etc/hosts'─┬─'() { 0; }; touch /tmp/blns.shellshock1.fail;'─┬─'() { _; } >_[$($())] { touch /tmp/blns.shellshock2.fail; }'─┬─'<<< %s(un=\'%s\') = %u'─┬─'+++ATH0'─┬─'CON'─┬─'PRN'─┬─'AUX'─┬─'CLOCK$'─┬─'NUL'─┬─'A:'─┬─'ZZ:'─┬─'COM1'─┬─'LPT1'─┬─'LPT2'─┬─'LPT3'─┬─'COM2'─┬─'COM3'─┬─'COM4'─┬─'DCC SEND STARTKEYLOGGER 0 0 0'─┬─'Scunthorpe General Hospital'─┬─'Penistone Community Church'─┬─'Lightwater Country Park'─┬─'Jimmy Clitheroe'─┬─'Horniman Museum'─┬─'shitake mushrooms'─┬─'RomansInSussex.co.uk'─┬─'http://www.cum.qc.ca/'─┬─'Craig Cockburn, Software Specialist'─┬─'Linda Callahan'─┬─'Dr. Herman I. Libshitz'─┬─'magna cum laude'─┬─'Super Bowl XXX'─┬─'medieval erection of parapets'─┬─'evaluate'─┬─'mocha'─┬─'expression'─┬─'Arsenal canal'─┬─'classic'─┬─'Tyson Gay'─┬─'Dick Van Dyke'─┬─'basement'─┬─'If you\'re reading this, you\'ve been in a coma for almost 20 years now. We\'re trying a new technique. We don\'t know where this message will end up in your dream, but we hope it works. Please wake up, we miss you.'─┬─'Roses are \\u001b[0;31mred\\u001b[0m, violets are \\u001b[0;34mblue. Hope you enjoy terminal hue'─┬─'But now...\\u001b[20Cfor my greatest trick...\\u001b[8m'─┬─'The quic\b\b\b\b\b\bk brown fo\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007x... [Beeeep]'─┬─'Powerلُلُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ冗'─┬─'🏳0🌈️'─┬─'జ్ఞ‌ా'─┬─'گچپژ'─┬─'{% print \'x\' * 64 * 1024**3 %}'─┬─'{{ "".__class__.__mro__[2].__subclasses__()[40]("/etc/passwd").read() }}'─┐
+│ undefined   │ undef   │ null   │ NULL   │ (null)   │ nil   │ NIL   │ true   │ false   │ True   │ False   │ TRUE   │ FALSE   │ None   │ hasOwnProperty   │ then   │ \    │ \\     │ 0   │ 1   │ 1.00   │ $1.00   │ 1/2   │ 1E2   │ 1E02   │ 1E+02   │ -1   │ -1.00   │ -$1.00   │ -1/2   │ -1E2   │ -1E02   │ -1E+02   │ 1/0   │ 0/0   │ -2147483648/-1   │ -9223372036854775808/-1   │ -0   │ -0.0   │ +0   │ +0.0   │ 0.00   │ 0..0   │ .   │ 0.0.0   │ 0,00   │ 0,,0   │ ,   │ 0,0,0   │ 0.0/0   │ 1.0/0.0   │ 0.0/0.0   │ 1,0/0,0   │ 0,0/0,0   │ --1   │ -   │ -.   │ -,   │ 999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999   │ NaN   │ Infinity   │ -Infinity   │ INF   │ 1#INF   │ -1#IND   │ 1#QNAN   │ 1#SNAN   │ 1#IND   │ 0x0   │ 0xffffffff   │ 0xffffffffffffffff   │ 0xabad1dea   │ 123456789012345678901234567890123456789   │ 1,000.00   │ 1 000.00   │ 1'000.00    │ 1,000,000.00   │ 1 000 000.00   │ 1'000'000.00     │ 1.000,00   │ 1 000,00   │ 1'000,00    │ 1.000.000,00   │ 1 000 000,00   │ 1'000'000,00     │ 01000   │ 08   │ 09   │ 2.2250738585072011e-308   │ ,./;'[]\-=     │ <>?:"{}|_+   │ !@#$%^&*()`~   │ \u0001\u0002\u0003\u0004\u0005\u0006\u0007\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f                              │ €‚ƒ„†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ   │ 	\u000b …             ​

  　   │ ­؀؁؂؃؄؅؜۝܏᠎​‌‍‎‏‪‫‬‭‮⁠⁡⁢⁣⁤⁦⁧⁨⁩𑂽𛲠𛲡𛲢𛲣𝅳𝅴𝅵𝅶𝅷𝅸𝅹𝅺󠀁󠀠󠀡󠀢󠀣󠀤󠀥󠀦󠀧󠀨󠀩󠀪󠀫󠀬󠀭󠀮󠀯󠀰󠀱󠀲󠀳󠀴󠀵󠀶󠀷󠀸󠀹󠀺󠀻󠀼󠀽󠀾󠀿󠁀󠁁󠁂󠁃󠁄󠁅󠁆󠁇󠁈󠁉󠁊󠁋󠁌󠁍󠁎󠁏󠁐󠁑󠁒󠁓󠁔󠁕󠁖󠁗󠁘󠁙󠁚󠁛󠁜󠁝󠁞󠁟󠁠󠁡󠁢󠁣󠁤󠁥󠁦󠁧󠁨󠁩󠁪󠁫󠁬󠁭󠁮󠁯󠁰󠁱󠁲󠁳󠁴󠁵󠁶󠁷󠁸󠁹󠁺󠁻󠁼󠁽󠁾󠁿   │    │ ￾   │ Ω≈ç√∫˜µ≤≥÷   │ åß∂ƒ©˙∆˚¬…æ   │ œ∑´®†¥¨ˆøπ“‘   │ ¡™£¢∞§¶•ªº–≠   │ ¸˛Ç◊ı˜Â¯˘¿   │ ÅÍÎÏ˝ÓÔÒÚÆ☃   │ Œ„´‰ˇÁ¨ˆØ∏”’   │ `⁄€‹›fifl‡°·‚—±   │ ⅛⅜⅝⅞   │ ЁЂЃЄЅІЇЈЉЊЋЌЍЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя   │ ٠١٢٣٤٥٦٧٨٩   │ ⁰⁴⁵   │ ₀₁₂   │ ⁰⁴⁵₀₁₂   │ ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็ ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็ ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็   │ '    │ "   │ ''     │ ""   │ '"'     │ "''''"'"        │ "'"'"''''"         │ <foo val=“bar” />   │ <foo val=”bar“ />   │ <foo val=`bar' />    │ 田中さんにあげて下さい   │ パーティーへ行かないか   │ 和製漢語   │ 部落格   │ 사회과학원 어학연구소   │ 찦차를 타고 온 펲시맨과 쑛다리 똠방각하   │ 社會科學院語學研究所   │ 울란바토르   │ 𠜎𠜱𠝹𠱓𠱸𠲖𠳏   │ 𐐜 𐐔𐐇𐐝𐐀𐐡𐐇𐐓 𐐙𐐊𐐡𐐝𐐓/𐐝𐐇𐐗𐐊𐐤𐐔 𐐒𐐋𐐗 𐐒𐐌 𐐜 𐐡𐐀𐐖𐐇𐐤𐐓𐐝 𐐱𐑂 𐑄 𐐔𐐇𐐝𐐀𐐡𐐇𐐓 𐐏𐐆𐐅𐐤𐐆𐐚𐐊𐐡𐐝𐐆𐐓𐐆   │ 表ポあA鷗ŒéＢ逍Üߪąñ丂㐀𠀀   │ Ⱥ   │ Ⱦ   │ ヽ༼ຈل͜ຈ༽ﾉ ヽ༼ຈل͜ຈ༽ﾉ   │ (｡◕ ∀ ◕｡)   │ ｀ｨ(´∀｀∩   │ __ﾛ(,_,*)   │ ・(￣∀￣)・:*:   │ ﾟ･✿ヾ╲(｡◕‿◕｡)╱✿･ﾟ   │ ,。・:*:・゜’( ☻ ω ☻ )。・:*:・゜’   │ (╯°□°）╯︵ ┻━┻)   │ (ﾉಥ益ಥ）ﾉ ┻━┻   │ ┬─┬ノ( º _ ºノ)   │ ( ͡° ͜ʖ ͡°)   │ ¯\_(ツ)_/¯    │ 😍   │ 👩🏽   │ 👨‍🦰 👨🏿‍🦰 👨‍🦱 👨🏿‍🦱 🦹🏿‍♂️   │ 👾 🙇 💁 🙅 🙆 🙋 🙎 🙍   │ 🐵 🙈 🙉 🙊   │ ❤️ 💔 💌 💕 💞 💓 💗 💖 💘 💝 💟 💜 💛 💚 💙   │ ✋🏿 💪🏿 👐🏿 🙌🏿 👏🏿 🙏🏿   │ 👨‍👩‍👦 👨‍👩‍👧‍👦 👨‍👨‍👦 👩‍👩‍👧 👨‍👦 👨‍👧‍👦 👩‍👦 👩‍👧‍👦   │ 🚾 🆒 🆓 🆕 🆖 🆗 🆙 🏧   │ 0️⃣ 1️⃣ 2️⃣ 3️⃣ 4️⃣ 5️⃣ 6️⃣ 7️⃣ 8️⃣ 9️⃣ 🔟   │ 🇺🇸🇷🇺🇸 🇦🇫🇦🇲🇸   │ 🇺🇸🇷🇺🇸🇦🇫🇦🇲   │ 🇺🇸🇷🇺🇸🇦   │ １２３   │ ١٢٣   │ ثم نفس سقطت وبالتحديد،, جزيرتي باستخدام أن دنو. إذ هنا؟ الستار وتنصيب كان. أهّل ايطاليا، بريطانيا-فرنسا قد أخذ. سليمان، إتفاقية بين ما , يذكر الحدود أي بعد, معاملة بولندا، الإطلاق عل إيو.   │ בְּרֵאשִׁית, בָּרָא אֱלֹהִים, אֵת הַשָּׁמַיִם, וְאֵת הָאָרֶץ   │ הָיְתָהtestالصفحات التّحول   │ ﷽   │ ﷺ   │ مُنَاقَشَةُ سُبُلِ اِسْتِخْدَامِ اللُّغَةِ فِي النُّظُمِ الْقَائِمَةِ وَفِيم يَخُصَّ التَّطْبِيقَاتُ الْحاسُوبِيَّةُ،    │ ᚛ᚄᚓᚐᚋᚒᚄ ᚑᚄᚂᚑᚏᚅ᚜‪‪‪   │ ‪‪᚛                 ᚜‪   │ ‪‪test‪   │ ‫test‫   │ 
test
   │ test⁠test‫   │ ⁦test⁧   │ Ṱ̺̺̕o͞ ̷i̲̬͇̪͙n̝̗͕v̟̜̘̦͟o̶̙̰̠kè͚̮̺̪̹̱̤ ̖t̝͕̳̣̻̪͞h̼͓̲̦̳̘̲e͇̣̰̦̬͎ ̢̼̻̱̘h͚͎͙̜̣̲ͅi̦̲̣̰̤v̻͍e̺̭̳̪̰-m̢iͅn̖̺̞̲̯̰d̵̼̟͙̩̼̘̳ ̞̥̱̳̭r̛̗̘e͙p͠r̼̞̻̭̗e̺̠̣͟s̘͇̳͍̝͉e͉̥̯̞̲͚̬͜ǹ̬͎͎̟̖͇̤t͍̬̤͓̼̭͘ͅi̪̱n͠g̴͉ ͏͉ͅc̬̟h͡a̫̻̯͘o̫̟̖͍̙̝͉s̗̦̲.̨̹͈̣   │ ̡͓̞ͅI̗̘̦͝n͇͇͙v̮̫ok̲̫̙͈i̖͙̭̹̠̞n̡̻̮̣̺g̲͈͙̭͙̬͎ ̰t͔̦h̞̲e̢̤ ͍̬̲͖f̴̘͕̣è͖ẹ̥̩l͖͔͚i͓͚̦͠n͖͍̗͓̳̮g͍ ̨o͚̪͡f̘̣̬ ̖̘͖̟͙̮c҉͔̫͖͓͇͖ͅh̵̤̣͚͔á̗̼͕ͅo̼̣̥s̱͈̺̖̦̻͢.̛̖̞̠̫̰   │ ̗̺͖̹̯͓Ṯ̤͍̥͇͈h̲́e͏͓̼̗̙̼̣͔ ͇̜̱̠͓͍ͅN͕͠e̗̱z̘̝̜̺͙p̤̺̹͍̯͚e̠̻̠͜r̨̤͍̺̖͔̖̖d̠̟̭̬̝͟i̦͖̩͓͔̤a̠̗̬͉̙n͚͜ ̻̞̰͚ͅh̵͉i̳̞v̢͇ḙ͎͟-҉̭̩̼͔m̤̭̫i͕͇̝̦n̗͙ḍ̟ ̯̲͕͞ǫ̟̯̰̲͙̻̝f ̪̰̰̗̖̭̘͘c̦͍̲̞͍̩̙ḥ͚a̮͎̟̙͜ơ̩̹͎s̤.̝̝ ҉Z̡̖̜͖̰̣͉̜a͖̰͙̬͡l̲̫̳͍̩g̡̟̼̱͚̞̬ͅo̗͜.̟   │ ̦H̬̤̗̤͝e͜ ̜̥̝̻͍̟́w̕h̖̯͓o̝͙̖͎̱̮ ҉̺̙̞̟͈W̷̼̭a̺̪͍į͈͕̭͙̯̜t̶̼̮s̘͙͖̕ ̠̫̠B̻͍͙͉̳ͅe̵h̵̬͇̫͙i̹͓̳̳̮͎̫̕n͟d̴̪̜̖ ̰͉̩͇͙̲͞ͅT͖̼͓̪͢h͏͓̮̻e̬̝̟ͅ ̤̹̝W͙̞̝͔͇͝ͅa͏͓͔̹̼̣l̴͔̰̤̟͔ḽ̫.͕   │ Z̮̞̠͙͔ͅḀ̗̞͈̻̗Ḷ͙͎̯̹̞͓G̻O̭̗̮   │ ˙ɐnbᴉlɐ ɐuƃɐɯ ǝɹolop ʇǝ ǝɹoqɐl ʇn ʇunpᴉpᴉɔuᴉ ɹodɯǝʇ poɯsnᴉǝ op pǝs 'ʇᴉlǝ ƃuᴉɔsᴉdᴉpɐ ɹnʇǝʇɔǝsuoɔ 'ʇǝɯɐ ʇᴉs ɹolop ɯnsdᴉ ɯǝɹo˥     │ 00˙Ɩ$-   │ Ｔｈｅ ｑｕｉｃｋ ｂｒｏｗｎ ｆｏｘ ｊｕｍｐｓ ｏｖｅｒ ｔｈｅ ｌａｚｙ ｄｏｇ   │ 𝐓𝐡𝐞 𝐪𝐮𝐢𝐜𝐤 𝐛𝐫𝐨𝐰𝐧 𝐟𝐨𝐱 𝐣𝐮𝐦𝐩𝐬 𝐨𝐯𝐞𝐫 𝐭𝐡𝐞 𝐥𝐚𝐳𝐲 𝐝𝐨𝐠   │ 𝕿𝖍𝖊 𝖖𝖚𝖎𝖈𝖐 𝖇𝖗𝖔𝖜𝖓 𝖋𝖔𝖝 𝖏𝖚𝖒𝖕𝖘 𝖔𝖛𝖊𝖗 𝖙𝖍𝖊 𝖑𝖆𝖟𝖞 𝖉𝖔𝖌   │ 𝑻𝒉𝒆 𝒒𝒖𝒊𝒄𝒌 𝒃𝒓𝒐𝒘𝒏 𝒇𝒐𝒙 𝒋𝒖𝒎𝒑𝒔 𝒐𝒗𝒆𝒓 𝒕𝒉𝒆 𝒍𝒂𝒛𝒚 𝒅𝒐𝒈   │ 𝓣𝓱𝓮 𝓺𝓾𝓲𝓬𝓴 𝓫𝓻𝓸𝔀𝓷 𝓯𝓸𝔁 𝓳𝓾𝓶𝓹𝓼 𝓸𝓿𝓮𝓻 𝓽𝓱𝓮 𝓵𝓪𝔃𝔂 𝓭𝓸𝓰   │ 𝕋𝕙𝕖 𝕢𝕦𝕚𝕔𝕜 𝕓𝕣𝕠𝕨𝕟 𝕗𝕠𝕩 𝕛𝕦𝕞𝕡𝕤 𝕠𝕧𝕖𝕣 𝕥𝕙𝕖 𝕝𝕒𝕫𝕪 𝕕𝕠𝕘   │ 𝚃𝚑𝚎 𝚚𝚞𝚒𝚌𝚔 𝚋𝚛𝚘𝚠𝚗 𝚏𝚘𝚡 𝚓𝚞𝚖𝚙𝚜 𝚘𝚟𝚎𝚛 𝚝𝚑𝚎 𝚕𝚊𝚣𝚢 𝚍𝚘𝚐   │ ⒯⒣⒠ ⒬⒰⒤⒞⒦ ⒝⒭⒪⒲⒩ ⒡⒪⒳ ⒥⒰⒨⒫⒮ ⒪⒱⒠⒭ ⒯⒣⒠ ⒧⒜⒵⒴ ⒟⒪⒢   │ <script>alert(123)</script>   │ &lt;script&gt;alert(&#39;123&#39;);&lt;/script&gt;   │ <img src=x onerror=alert(123) />   │ <svg><script>123<1>alert(123)</script>   │ "><script>alert(123)</script>   │ '><script>alert(123)</script>    │ ><script>alert(123)</script>   │ </script><script>alert(123)</script>   │ < / script >< script >alert(123)< / script >   │  onfocus=JaVaSCript:alert(123) autofocus   │ " onfocus=JaVaSCript:alert(123) autofocus   │ ' onfocus=JaVaSCript:alert(123) autofocus    │ ＜script＞alert(123)＜/script＞   │ <sc<script>ript>alert(123)</sc</script>ript>   │ --><script>alert(123)</script>   │ ";alert(123);t="   │ ';alert(123);t='     │ JavaSCript:alert(123)   │ ;alert(123);   │ src=JaVaSCript:prompt(132)   │ "><script>alert(123);</script x="   │ '><script>alert(123);</script x='     │ ><script>alert(123);</script x=   │ " autofocus onkeyup="javascript:alert(123)   │ ' autofocus onkeyup='javascript:alert(123)     │ <script\x20type="text/javascript">javascript:alert(1);</script>    │ <script\x3Etype="text/javascript">javascript:alert(1);</script>    │ <script\x0Dtype="text/javascript">javascript:alert(1);</script>    │ <script\x09type="text/javascript">javascript:alert(1);</script>    │ <script\x0Ctype="text/javascript">javascript:alert(1);</script>    │ <script\x2Ftype="text/javascript">javascript:alert(1);</script>    │ <script\x0Atype="text/javascript">javascript:alert(1);</script>    │ '`"><\x3Cscript>javascript:alert(1)</script>     │ '`"><\x00script>javascript:alert(1)</script>     │ ABC<div style="x\x3Aexpression(javascript:alert(1)">DEF    │ ABC<div style="x:expression\x5C(javascript:alert(1)">DEF    │ ABC<div style="x:expression\x00(javascript:alert(1)">DEF    │ ABC<div style="x:exp\x00ression(javascript:alert(1)">DEF    │ ABC<div style="x:exp\x5Cression(javascript:alert(1)">DEF    │ ABC<div style="x:\x0Aexpression(javascript:alert(1)">DEF    │ ABC<div style="x:\x09expression(javascript:alert(1)">DEF    │ ABC<div style="x:\xE3\x80\x80expression(javascript:alert(1)">DEF      │ ABC<div style="x:\xE2\x80\x84expression(javascript:alert(1)">DEF      │ ABC<div style="x:\xC2\xA0expression(javascript:alert(1)">DEF     │ ABC<div style="x:\xE2\x80\x80expression(javascript:alert(1)">DEF      │ ABC<div style="x:\xE2\x80\x8Aexpression(javascript:alert(1)">DEF      │ ABC<div style="x:\x0Dexpression(javascript:alert(1)">DEF    │ ABC<div style="x:\x0Cexpression(javascript:alert(1)">DEF    │ ABC<div style="x:\xE2\x80\x87expression(javascript:alert(1)">DEF      │ ABC<div style="x:\xEF\xBB\xBFexpression(javascript:alert(1)">DEF      │ ABC<div style="x:\x20expression(javascript:alert(1)">DEF    │ ABC<div style="x:\xE2\x80\x88expression(javascript:alert(1)">DEF      │ ABC<div style="x:\x00expression(javascript:alert(1)">DEF    │ ABC<div style="x:\xE2\x80\x8Bexpression(javascript:alert(1)">DEF      │ ABC<div style="x:\xE2\x80\x86expression(javascript:alert(1)">DEF      │ ABC<div style="x:\xE2\x80\x85expression(javascript:alert(1)">DEF      │ ABC<div style="x:\xE2\x80\x82expression(javascript:alert(1)">DEF      │ ABC<div style="x:\x0Bexpression(javascript:alert(1)">DEF    │ ABC<div style="x:\xE2\x80\x81expression(javascript:alert(1)">DEF      │ ABC<div style="x:\xE2\x80\x83expression(javascript:alert(1)">DEF      │ ABC<div style="x:\xE2\x80\x89expression(javascript:alert(1)">DEF      │ <a href="\x0Bjavascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\x0Fjavascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\xC2\xA0javascript:javascript:alert(1)" id="fuzzelement1">test</a>     │ <a href="\x05javascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\xE1\xA0\x8Ejavascript:javascript:alert(1)" id="fuzzelement1">test</a>      │ <a href="\x18javascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\x11javascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\xE2\x80\x88javascript:javascript:alert(1)" id="fuzzelement1">test</a>      │ <a href="\xE2\x80\x89javascript:javascript:alert(1)" id="fuzzelement1">test</a>      │ <a href="\xE2\x80\x80javascript:javascript:alert(1)" id="fuzzelement1">test</a>      │ <a href="\x17javascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\x03javascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\x0Ejavascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\x1Ajavascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\x00javascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\x10javascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\xE2\x80\x82javascript:javascript:alert(1)" id="fuzzelement1">test</a>      │ <a href="\x20javascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\x13javascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\x09javascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\xE2\x80\x8Ajavascript:javascript:alert(1)" id="fuzzelement1">test</a>      │ <a href="\x14javascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\x19javascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\xE2\x80\xAFjavascript:javascript:alert(1)" id="fuzzelement1">test</a>      │ <a href="\x1Fjavascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\xE2\x80\x81javascript:javascript:alert(1)" id="fuzzelement1">test</a>      │ <a href="\x1Djavascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\xE2\x80\x87javascript:javascript:alert(1)" id="fuzzelement1">test</a>      │ <a href="\x07javascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\xE1\x9A\x80javascript:javascript:alert(1)" id="fuzzelement1">test</a>      │ <a href="\xE2\x80\x83javascript:javascript:alert(1)" id="fuzzelement1">test</a>      │ <a href="\x04javascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\x01javascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\x08javascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\xE2\x80\x84javascript:javascript:alert(1)" id="fuzzelement1">test</a>      │ <a href="\xE2\x80\x86javascript:javascript:alert(1)" id="fuzzelement1">test</a>      │ <a href="\xE3\x80\x80javascript:javascript:alert(1)" id="fuzzelement1">test</a>      │ <a href="\x12javascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\x0Djavascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\x0Ajavascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\x0Cjavascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\x15javascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\xE2\x80\xA8javascript:javascript:alert(1)" id="fuzzelement1">test</a>      │ <a href="\x16javascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\x02javascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\x1Bjavascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\x06javascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\xE2\x80\xA9javascript:javascript:alert(1)" id="fuzzelement1">test</a>      │ <a href="\xE2\x80\x85javascript:javascript:alert(1)" id="fuzzelement1">test</a>      │ <a href="\x1Ejavascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="\xE2\x81\x9Fjavascript:javascript:alert(1)" id="fuzzelement1">test</a>      │ <a href="\x1Cjavascript:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="javascript\x00:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="javascript\x3A:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="javascript\x09:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="javascript\x0D:javascript:alert(1)" id="fuzzelement1">test</a>    │ <a href="javascript\x0A:javascript:alert(1)" id="fuzzelement1">test</a>    │ `"'><img src=xxx:x \x0Aonerror=javascript:alert(1)>     │ `"'><img src=xxx:x \x22onerror=javascript:alert(1)>     │ `"'><img src=xxx:x \x0Bonerror=javascript:alert(1)>     │ `"'><img src=xxx:x \x0Donerror=javascript:alert(1)>     │ `"'><img src=xxx:x \x2Fonerror=javascript:alert(1)>     │ `"'><img src=xxx:x \x09onerror=javascript:alert(1)>     │ `"'><img src=xxx:x \x0Conerror=javascript:alert(1)>     │ `"'><img src=xxx:x \x00onerror=javascript:alert(1)>     │ `"'><img src=xxx:x \x27onerror=javascript:alert(1)>     │ `"'><img src=xxx:x \x20onerror=javascript:alert(1)>     │ "`'><script>\x3Bjavascript:alert(1)</script>     │ "`'><script>\x0Djavascript:alert(1)</script>     │ "`'><script>\xEF\xBB\xBFjavascript:alert(1)</script>       │ "`'><script>\xE2\x80\x81javascript:alert(1)</script>       │ "`'><script>\xE2\x80\x84javascript:alert(1)</script>       │ "`'><script>\xE3\x80\x80javascript:alert(1)</script>       │ "`'><script>\x09javascript:alert(1)</script>     │ "`'><script>\xE2\x80\x89javascript:alert(1)</script>       │ "`'><script>\xE2\x80\x85javascript:alert(1)</script>       │ "`'><script>\xE2\x80\x88javascript:alert(1)</script>       │ "`'><script>\x00javascript:alert(1)</script>     │ "`'><script>\xE2\x80\xA8javascript:alert(1)</script>       │ "`'><script>\xE2\x80\x8Ajavascript:alert(1)</script>       │ "`'><script>\xE1\x9A\x80javascript:alert(1)</script>       │ "`'><script>\x0Cjavascript:alert(1)</script>     │ "`'><script>\x2Bjavascript:alert(1)</script>     │ "`'><script>\xF0\x90\x96\x9Ajavascript:alert(1)</script>        │ "`'><script>-javascript:alert(1)</script>    │ "`'><script>\x0Ajavascript:alert(1)</script>     │ "`'><script>\xE2\x80\xAFjavascript:alert(1)</script>       │ "`'><script>\x7Ejavascript:alert(1)</script>     │ "`'><script>\xE2\x80\x87javascript:alert(1)</script>       │ "`'><script>\xE2\x81\x9Fjavascript:alert(1)</script>       │ "`'><script>\xE2\x80\xA9javascript:alert(1)</script>       │ "`'><script>\xC2\x85javascript:alert(1)</script>      │ "`'><script>\xEF\xBF\xAEjavascript:alert(1)</script>       │ "`'><script>\xE2\x80\x83javascript:alert(1)</script>       │ "`'><script>\xE2\x80\x8Bjavascript:alert(1)</script>       │ "`'><script>\xEF\xBF\xBEjavascript:alert(1)</script>       │ "`'><script>\xE2\x80\x80javascript:alert(1)</script>       │ "`'><script>\x21javascript:alert(1)</script>     │ "`'><script>\xE2\x80\x82javascript:alert(1)</script>       │ "`'><script>\xE2\x80\x86javascript:alert(1)</script>       │ "`'><script>\xE1\xA0\x8Ejavascript:alert(1)</script>       │ "`'><script>\x0Bjavascript:alert(1)</script>     │ "`'><script>\x20javascript:alert(1)</script>     │ "`'><script>\xC2\xA0javascript:alert(1)</script>      │ <img \x00src=x onerror="alert(1)">    │ <img \x47src=x onerror="javascript:alert(1)">    │ <img \x11src=x onerror="javascript:alert(1)">    │ <img \x12src=x onerror="javascript:alert(1)">    │ <img\x47src=x onerror="javascript:alert(1)">    │ <img\x10src=x onerror="javascript:alert(1)">    │ <img\x13src=x onerror="javascript:alert(1)">    │ <img\x32src=x onerror="javascript:alert(1)">    │ <img\x11src=x onerror="javascript:alert(1)">    │ <img \x34src=x onerror="javascript:alert(1)">    │ <img \x39src=x onerror="javascript:alert(1)">    │ <img \x00src=x onerror="javascript:alert(1)">    │ <img src\x09=x onerror="javascript:alert(1)">    │ <img src\x10=x onerror="javascript:alert(1)">    │ <img src\x13=x onerror="javascript:alert(1)">    │ <img src\x32=x onerror="javascript:alert(1)">    │ <img src\x12=x onerror="javascript:alert(1)">    │ <img src\x11=x onerror="javascript:alert(1)">    │ <img src\x00=x onerror="javascript:alert(1)">    │ <img src\x47=x onerror="javascript:alert(1)">    │ <img src=x\x09onerror="javascript:alert(1)">    │ <img src=x\x10onerror="javascript:alert(1)">    │ <img src=x\x11onerror="javascript:alert(1)">    │ <img src=x\x12onerror="javascript:alert(1)">    │ <img src=x\x13onerror="javascript:alert(1)">    │ <img[a][b][c]src[d]=x[e]onerror=[f]"alert(1)">   │ <img src=x onerror=\x09"javascript:alert(1)">    │ <img src=x onerror=\x10"javascript:alert(1)">    │ <img src=x onerror=\x11"javascript:alert(1)">    │ <img src=x onerror=\x12"javascript:alert(1)">    │ <img src=x onerror=\x32"javascript:alert(1)">    │ <img src=x onerror=\x00"javascript:alert(1)">    │ <a href=java&#1&#2&#3&#4&#5&#6&#7&#8&#11&#12script:javascript:alert(1)>XXX</a>   │ <img src="x` `<script>javascript:alert(1)</script>"` `>   │ <img src onerror /" '"= alt=javascript:alert(1)//">    │ <title onpropertychange=javascript:alert(1)></title><title title=>   │ <a href=http://foo.bar/#x=`y></a><img alt="`><img src=x:x onerror=javascript:alert(1)></a>">   │ <!--[if]><script>javascript:alert(1)</script -->   │ <!--[if<img src=x onerror=javascript:alert(1)//]> -->   │ <script src="/\%(jscript)s"></script>    │ <script src="\\%(jscript)s"></script>     │ <IMG """><SCRIPT>alert("XSS")</SCRIPT>">   │ <IMG SRC=javascript:alert(String.fromCharCode(88,83,83))>   │ <IMG SRC=# onmouseover="alert('xxs')">     │ <IMG SRC= onmouseover="alert('xxs')">     │ <IMG onmouseover="alert('xxs')">     │ <IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>   │ <IMG SRC=&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058&#0000097&#0000108&#0000101&#0000114&#0000116&#0000040&#0000039&#0000088&#0000083&#0000083&#0000039&#0000041>   │ <IMG SRC=&#x6A&#x61&#x76&#x61&#x73&#x63&#x72&#x69&#x70&#x74&#x3A&#x61&#x6C&#x65&#x72&#x74&#x28&#x27&#x58&#x53&#x53&#x27&#x29>   │ <IMG SRC="jav   ascript:alert('XSS');">     │ <IMG SRC="jav&#x09;ascript:alert('XSS');">     │ <IMG SRC="jav&#x0A;ascript:alert('XSS');">     │ <IMG SRC="jav&#x0D;ascript:alert('XSS');">     │ perl -e 'print "<IMG SRC=java\0script:alert(\"XSS\")>";' > out        │ <IMG SRC=" &#14;  javascript:alert('XSS');">     │ <SCRIPT/XSS SRC="http://ha.ckers.org/xss.js"></SCRIPT>   │ <BODY onload!#$%&()*~+-_.,:;?@[/|\]^`=alert("XSS")>    │ <SCRIPT/SRC="http://ha.ckers.org/xss.js"></SCRIPT>   │ <<SCRIPT>alert("XSS");//<</SCRIPT>   │ <SCRIPT SRC=http://ha.ckers.org/xss.js?< B >   │ <SCRIPT SRC=//ha.ckers.org/.j>   │ <IMG SRC="javascript:alert('XSS')"     │ <iframe src=http://ha.ckers.org/scriptlet.html <   │ \";alert('XSS');//      │ <u oncopy=alert()> Copy me</u>   │ <i onwheel=alert(1)> Scroll over me </i>   │ <plaintext>   │ http://a/%%30%30   │ </textarea><script>alert(123)</script>   │ 1;DROP TABLE users   │ 1'; DROP TABLE users-- 1    │ ' OR 1=1 -- 1    │ ' OR '1'='1       │ '; EXEC sp_MSForEachTable 'DROP TABLE ?'; --      │     │ %   │ _   │ --   │ --version   │ --help   │ $USER   │ /dev/null; touch /tmp/blns.fail ; echo   │ `touch /tmp/blns.fail`   │ $(touch /tmp/blns.fail)   │ @{[system "touch /tmp/blns.fail"]}   │ eval("puts 'hello world'")     │ System("ls -al /")   │ `ls -al /`   │ Kernel.exec("ls -al /")   │ Kernel.exit(1)   │ %x('ls -al /')     │ <?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE foo [ <!ELEMENT foo ANY ><!ENTITY xxe SYSTEM "file:///etc/passwd" >]><foo>&xxe;</foo>   │ $HOME   │ $ENV{'HOME'}     │ %d   │ %s%s%s%s%s   │ {0}   │ %*.*s   │ %@   │ %n   │ File:///   │ ../../../../../../../../../../../etc/passwd%00   │ ../../../../../../../../../../../etc/hosts   │ () { 0; }; touch /tmp/blns.shellshock1.fail;   │ () { _; } >_[$($())] { touch /tmp/blns.shellshock2.fail; }   │ <<< %s(un='%s') = %u     │ +++ATH0   │ CON   │ PRN   │ AUX   │ CLOCK$   │ NUL   │ A:   │ ZZ:   │ COM1   │ LPT1   │ LPT2   │ LPT3   │ COM2   │ COM3   │ COM4   │ DCC SEND STARTKEYLOGGER 0 0 0   │ Scunthorpe General Hospital   │ Penistone Community Church   │ Lightwater Country Park   │ Jimmy Clitheroe   │ Horniman Museum   │ shitake mushrooms   │ RomansInSussex.co.uk   │ http://www.cum.qc.ca/   │ Craig Cockburn, Software Specialist   │ Linda Callahan   │ Dr. Herman I. Libshitz   │ magna cum laude   │ Super Bowl XXX   │ medieval erection of parapets   │ evaluate   │ mocha   │ expression   │ Arsenal canal   │ classic   │ Tyson Gay   │ Dick Van Dyke   │ basement   │ If you're reading this, you've been in a coma for almost 20 years now. We're trying a new technique. We don't know where this message will end up in your dream, but we hope it works. Please wake up, we miss you.       │ Roses are \u001b[0;31mred\u001b[0m, violets are \u001b[0;34mblue. Hope you enjoy terminal hue      │ But now...\u001b[20Cfor my greatest trick...\u001b[8m     │ The quick brown fo\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007x... [Beeeep]                          │ Powerلُلُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ冗   │ 🏳0🌈️   │ జ్ఞ‌ా   │ گچپژ   │ {% print 'x' * 64 * 1024**3 %}     │ {{ "".__class__.__mro__[2].__subclasses__()[40]("/etc/passwd").read() }}   │
+└─────────────┴─────────┴────────┴────────┴──────────┴───────┴───────┴────────┴─────────┴────────┴─────────┴────────┴─────────┴────────┴──────────────────┴────────┴──────┴────────┴─────┴─────┴────────┴─────────┴───────┴───────┴────────┴─────────┴──────┴─────────┴──────────┴────────┴────────┴─────────┴──────────┴───────┴───────┴──────────────────┴───────────────────────────┴──────┴────────┴──────┴────────┴────────┴────────┴─────┴─────────┴────────┴────────┴─────┴─────────┴─────────┴───────────┴───────────┴───────────┴───────────┴───────┴─────┴──────┴──────┴────────────────────────────────────────────────────────────────────────────────────────────────────┴───────┴────────────┴─────────────┴───────┴─────────┴──────────┴──────────┴──────────┴─────────┴───────┴──────────────┴──────────────────────┴──────────────┴───────────────────────────────────────────┴────────────┴────────────┴─────────────┴────────────────┴────────────────┴──────────────────┴────────────┴────────────┴─────────────┴────────────────┴────────────────┴──────────────────┴─────────┴──────┴──────┴───────────────────────────┴────────────────┴──────────────┴────────────────┴─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴────┴─────────────────────────────────┴────┴────┴────┴──────────────┴───────────────┴────────────────┴────────────────┴──────────────┴────────────────┴────────────────┴─────────────────┴────────┴───────────────────────────────────────────────────────────────────────────────────┴──────────────┴───────┴───────┴──────────┴─────────┴──────┴─────┴────────┴──────┴─────────┴─────────────────┴────────────────────┴─────────────────────┴─────────────────────┴──────────────────────┴──────────────────────────┴──────────────────────────┴────────────┴──────────┴─────────────────────────┴───────────────────────────────────────────┴────────────────────────┴──────────────┴──────────────────┴─────────────────────────────────────────────────────────────────────┴──────────────────────────────┴─────┴─────┴─────────────────────┴─────────────┴─────────────┴─────────────┴──────────────────┴─────────────────────┴──────────────────────────────────────┴───────────────────┴─────────────────┴───────────────────┴────────────┴───────────────┴─────┴──────┴──────────────────────────┴───────────────────┴───────────┴─────────────────────────────────┴──────────────────────┴──────────────────────────────────┴───────────────────┴─────────────────────────┴───────────────┴─────────────┴──────────┴──────────┴───────┴──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴─────────────────────────────────────────┴──────────────────────────┴─────┴─────┴────────────────────────────────────────────────────────────────────────────┴───────────────────┴───────────────────────┴────────┴────────┴────────┴────────────┴────────┴───────────────────────────────────────────────┴──────────────────────────────────┴─────────────────────────────────────────────┴─────────────────────────────────┴─────────┴─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────┴──────────────────────────────────────────────────────────────────────────────────┴───────────────────────────────────────────────┴───────────────────────────────────────────────┴───────────────────────────────────────────────┴───────────────────────────────────────────────┴───────────────────────────────────────────────┴───────────────────────────────────────────────┴───────────────────────────────────────────────┴───────────────────────────────┴──────────────────────────────────────────────────────┴────────────────────────────────────┴──────────────────────────────────────────┴─────────────────────────────────┴──────────────────────────────────┴────────────────────────────────┴────────────────────────────────────────┴────────────────────────────────────────────────┴────────────────────────────────────────────┴─────────────────────────────────────────────┴──────────────────────────────────────────────┴───────────────────────────────────┴────────────────────────────────────────────────┴──────────────────────────────────┴────────────────────┴──────────────────────┴─────────────────────────┴────────────────┴──────────────────────────────┴─────────────────────────────────────┴───────────────────────────────────────┴───────────────────────────────────┴──────────────────────────────────────────────┴────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────────┴───────────────────────────────────────────────────────────────────────┴───────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────────┴───────────────────────────────────────────────────────────────────────┴───────────────────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────────┴───────────────────────────────────────────────────────────────────────┴───────────────────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────────┴───────────────────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────────┴───────────────────────────────────────────────────────────────────────┴───────────────────────────────────────────────────────────────────────┴───────────────────────────────────────────────────────────────────────┴───────────────────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────────┴───────────────────────────────────────────────────────────────────────┴───────────────────────────────────────────────────────────────────────┴───────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────┴─────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────┴──────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┴───────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────┴───────────────────────────────────────────────────────┴───────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────┴─────────────────────────────────────────────────┴─────────────────────────────────────────────────┴─────────────────────────────────────────────────┴─────────────────────────────────────────────────┴─────────────────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────┴─────────────────────────────────────────────────┴─────────────────────────────────────────────────┴─────────────────────────────────────────────────┴─────────────────────────────────────────────────┴─────────────────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────────────────────────┴───────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────┴──────────────────────────────────────────┴───────────────────────────────────────────┴────────────────────────────────────────────┴─────────────────────────────────────────────────────────────┴────────────────────────────────────────────┴───────────────────────────────────────────┴──────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴─────────────────────────────────────────────┴────────────────────────────────────────────────┴────────────────────────────────────────────────┴────────────────────────────────────────────────┴───────────────────────────────────────────────────────────────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────┴──────────────────────────────────────────────────────┴──────────────────────────────────────┴────────────────────────────────────────────────┴──────────────────────────────────┴────────────────────────────────────────┴────────────────────────────────────────────────────┴─────────────────────────┴──────────────────────────────────┴────────────────────────────────────────────┴───────────────┴────────────────────┴──────────────────────────────────────────┴──────────────────────┴─────────────────────────────┴──────────────────┴───────────────────┴───────────────────────────────────────────────────┴─────┴─────┴─────┴──────┴─────────────┴──────────┴─────────┴──────────────────────────────────────────┴──────────────────────────┴───────────────────────────┴──────────────────────────────────────┴────────────────────────────────┴──────────────────────┴──────────────┴───────────────────────────┴──────────────────┴────────────────────┴──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴─────────┴──────────────────┴──────┴──────────────┴───────┴─────────┴──────┴──────┴────────────┴──────────────────────────────────────────────────┴──────────────────────────────────────────────┴────────────────────────────────────────────────┴──────────────────────────────────────────────────────────────┴──────────────────────────┴───────────┴───────┴───────┴───────┴──────────┴───────┴──────┴───────┴────────┴────────┴────────┴────────┴────────┴────────┴────────┴─────────────────────────────────┴───────────────────────────────┴──────────────────────────────┴───────────────────────────┴───────────────────┴───────────────────┴─────────────────────┴────────────────────────┴─────────────────────────┴───────────────────────────────────────┴──────────────────┴──────────────────────────┴───────────────────┴──────────────────┴─────────────────────────────────┴────────────┴─────────┴──────────────┴─────────────────┴───────────┴─────────────┴─────────────────┴────────────┴───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────┴───────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────────────────┴───────┴──────┴────────┴────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────┘
+(['','undefined','undef','null','NULL','(null)','nil','NIL','true','false','True','False','TRUE','FALSE','None','hasOwnProperty','then','\\','\\\\','0','1','1.00','$1.00','1/2','1E2','1E02','1E+02','-1','-1.00','-$1.00','-1/2','-1E2','-1E02','-1E+02','1/0','0/0','-2147483648/-1','-9223372036854775808/-1','-0','-0.0','+0','+0.0','0.00','0..0','.','0.0.0','0,00','0,,0',',','0,0,0','0.0/0','1.0/0.0','0.0/0.0','1,0/0,0','0,0/0,0','--1','-','-.','-,','999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999','NaN','Infinity','-Infinity','INF','1#INF','-1#IND','1#QNAN','1#SNAN','1#IND','0x0','0xffffffff','0xffffffffffffffff','0xabad1dea','123456789012345678901234567890123456789','1,000.00','1 000.00','1\'000.00','1,000,000.00','1 000 000.00','1\'000\'000.00','1.000,00','1 000,00','1\'000,00','1.000.000,00','1 000 000,00','1\'000\'000,00','01000','08','09','2.2250738585072011e-308',',./;\'[]\\-=','<>?:"{}|_+','!@#$%^&*()`~','
\b','€‚ƒ„†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ','\t\f …             ​

  　','­؀؁؂؃؄؅؜۝܏᠎​‌‍‎‏‪‫‬‭‮⁠⁡⁢⁣⁤⁦⁧⁨⁩𑂽𛲠𛲡𛲢𛲣𝅳𝅴𝅵𝅶𝅷𝅸𝅹𝅺󠀁󠀠󠀡󠀢󠀣󠀤󠀥󠀦󠀧󠀨󠀩󠀪󠀫󠀬󠀭󠀮󠀯󠀰󠀱󠀲󠀳󠀴󠀵󠀶󠀷󠀸󠀹󠀺󠀻󠀼󠀽󠀾󠀿󠁀󠁁󠁂󠁃󠁄󠁅󠁆󠁇󠁈󠁉󠁊󠁋󠁌󠁍󠁎󠁏󠁐󠁑󠁒󠁓󠁔󠁕󠁖󠁗󠁘󠁙󠁚󠁛󠁜󠁝󠁞󠁟󠁠󠁡󠁢󠁣󠁤󠁥󠁦󠁧󠁨󠁩󠁪󠁫󠁬󠁭󠁮󠁯󠁰󠁱󠁲󠁳󠁴󠁵󠁶󠁷󠁸󠁹󠁺󠁻󠁼󠁽󠁾󠁿','','￾','Ω≈ç√∫˜µ≤≥÷','åß∂ƒ©˙∆˚¬…æ','œ∑´®†¥¨ˆøπ“‘','¡™£¢∞§¶•ªº–≠','¸˛Ç◊ı˜Â¯˘¿','ÅÍÎÏ˝ÓÔÒÚÆ☃','Œ„´‰ˇÁ¨ˆØ∏”’','`⁄€‹›fifl‡°·‚—±','⅛⅜⅝⅞','ЁЂЃЄЅІЇЈЉЊЋЌЍЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя','٠١٢٣٤٥٦٧٨٩','⁰⁴⁵','₀₁₂','⁰⁴⁵₀₁₂','ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็ ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็ ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็','\'','"','\'\'','""','\'"\'','"\'\'\'\'"\'"','"\'"\'"\'\'\'\'"','<foo val=“bar” />','<foo val=“bar” />','<foo val=”bar“ />','<foo val=`bar\' />','田中さんにあげて下さい','パーティーへ行かないか','和製漢語','部落格','사회과학원 어학연구소','찦차를 타고 온 펲시맨과 쑛다리 똠방각하','社會科學院語學研究所','울란바토르','𠜎𠜱𠝹𠱓𠱸𠲖𠳏','𐐜 𐐔𐐇𐐝𐐀𐐡𐐇𐐓 𐐙𐐊𐐡𐐝𐐓/𐐝𐐇𐐗𐐊𐐤𐐔 𐐒𐐋𐐗 𐐒𐐌 𐐜 𐐡𐐀𐐖𐐇𐐤𐐓𐐝 𐐱𐑂 𐑄 𐐔𐐇𐐝𐐀𐐡𐐇𐐓 𐐏𐐆𐐅𐐤𐐆𐐚𐐊𐐡𐐝𐐆𐐓𐐆','表ポあA鷗ŒéＢ逍Üߪąñ丂㐀𠀀','Ⱥ','Ⱦ','ヽ༼ຈل͜ຈ༽ﾉ ヽ༼ຈل͜ຈ༽ﾉ','(｡◕ ∀ ◕｡)','｀ｨ(´∀｀∩','__ﾛ(,_,*)','・(￣∀￣)・:*:','ﾟ･✿ヾ╲(｡◕‿◕｡)╱✿･ﾟ',',。・:*:・゜’( ☻ ω ☻ )。・:*:・゜’','(╯°□°）╯︵ ┻━┻)','(ﾉಥ益ಥ）ﾉ ┻━┻','┬─┬ノ( º _ ºノ)','( ͡° ͜ʖ ͡°)','¯\\_(ツ)_/¯','😍','👩🏽','👨‍🦰 👨🏿‍🦰 👨‍🦱 👨🏿‍🦱 🦹🏿‍♂️','👾 🙇 💁 🙅 🙆 🙋 🙎 🙍','🐵 🙈 🙉 🙊','❤️ 💔 💌 💕 💞 💓 💗 💖 💘 💝 💟 💜 💛 💚 💙','✋🏿 💪🏿 👐🏿 🙌🏿 👏🏿 🙏🏿','👨‍👩‍👦 👨‍👩‍👧‍👦 👨‍👨‍👦 👩‍👩‍👧 👨‍👦 👨‍👧‍👦 👩‍👦 👩‍👧‍👦','🚾 🆒 🆓 🆕 🆖 🆗 🆙 🏧','0️⃣ 1️⃣ 2️⃣ 3️⃣ 4️⃣ 5️⃣ 6️⃣ 7️⃣ 8️⃣ 9️⃣ 🔟','🇺🇸🇷🇺🇸 🇦🇫🇦🇲🇸','🇺🇸🇷🇺🇸🇦🇫🇦🇲','🇺🇸🇷🇺🇸🇦','１２３','١٢٣','ثم نفس سقطت وبالتحديد،, جزيرتي باستخدام أن دنو. إذ هنا؟ الستار وتنصيب كان. أهّل ايطاليا، بريطانيا-فرنسا قد أخذ. سليمان، إتفاقية بين ما, يذكر الحدود أي بعد, معاملة بولندا، الإطلاق عل إيو.','בְּרֵאשִׁית, בָּרָא אֱלֹהִים, אֵת הַשָּׁמַיִם, וְאֵת הָאָרֶץ','הָיְתָהtestالصفحات التّحول','﷽','ﷺ','مُنَاقَشَةُ سُبُلِ اِسْتِخْدَامِ اللُّغَةِ فِي النُّظُمِ الْقَائِمَةِ وَفِيم يَخُصَّ التَّطْبِيقَاتُ الْحاسُوبِيَّةُ، ','᚛ᚄᚓᚐᚋᚒᚄ ᚑᚄᚂᚑᚏᚅ᚜‪‪‪','‪‪᚛                 ᚜‪','‪‪test‪','‫test‫','
test
','test⁠test‫','⁦test⁧','Ṱ̺̺̕o͞ ̷i̲̬͇̪͙n̝̗͕v̟̜̘̦͟o̶̙̰̠kè͚̮̺̪̹̱̤ ̖t̝͕̳̣̻̪͞h̼͓̲̦̳̘̲e͇̣̰̦̬͎ ̢̼̻̱̘h͚͎͙̜̣̲ͅi̦̲̣̰̤v̻͍e̺̭̳̪̰-m̢iͅn̖̺̞̲̯̰d̵̼̟͙̩̼̘̳ ̞̥̱̳̭r̛̗̘e͙p͠r̼̞̻̭̗e̺̠̣͟s̘͇̳͍̝͉e͉̥̯̞̲͚̬͜ǹ̬͎͎̟̖͇̤t͍̬̤͓̼̭͘ͅi̪̱n͠g̴͉ ͏͉ͅc̬̟h͡a̫̻̯͘o̫̟̖͍̙̝͉s̗̦̲.̨̹͈̣','̡͓̞ͅI̗̘̦͝n͇͇͙v̮̫ok̲̫̙͈i̖͙̭̹̠̞n̡̻̮̣̺g̲͈͙̭͙̬͎ ̰t͔̦h̞̲e̢̤ ͍̬̲͖f̴̘͕̣è͖ẹ̥̩l͖͔͚i͓͚̦͠n͖͍̗͓̳̮g͍ ̨o͚̪͡f̘̣̬ ̖̘͖̟͙̮c҉͔̫͖͓͇͖ͅh̵̤̣͚͔á̗̼͕ͅo̼̣̥s̱͈̺̖̦̻͢.̛̖̞̠̫̰','̗̺͖̹̯͓Ṯ̤͍̥͇͈h̲́e͏͓̼̗̙̼̣͔ ͇̜̱̠͓͍ͅN͕͠e̗̱z̘̝̜̺͙p̤̺̹͍̯͚e̠̻̠͜r̨̤͍̺̖͔̖̖d̠̟̭̬̝͟i̦͖̩͓͔̤a̠̗̬͉̙n͚͜ ̻̞̰͚ͅh̵͉i̳̞v̢͇ḙ͎͟-҉̭̩̼͔m̤̭̫i͕͇̝̦n̗͙ḍ̟ ̯̲͕͞ǫ̟̯̰̲͙̻̝f ̪̰̰̗̖̭̘͘c̦͍̲̞͍̩̙ḥ͚a̮͎̟̙͜ơ̩̹͎s̤.̝̝ ҉Z̡̖̜͖̰̣͉̜a͖̰͙̬͡l̲̫̳͍̩g̡̟̼̱͚̞̬ͅo̗͜.̟','̦H̬̤̗̤͝e͜ ̜̥̝̻͍̟́w̕h̖̯͓o̝͙̖͎̱̮ ҉̺̙̞̟͈W̷̼̭a̺̪͍į͈͕̭͙̯̜t̶̼̮s̘͙͖̕ ̠̫̠B̻͍͙͉̳ͅe̵h̵̬͇̫͙i̹͓̳̳̮͎̫̕n͟d̴̪̜̖ ̰͉̩͇͙̲͞ͅT͖̼͓̪͢h͏͓̮̻e̬̝̟ͅ ̤̹̝W͙̞̝͔͇͝ͅa͏͓͔̹̼̣l̴͔̰̤̟͔ḽ̫.͕','Z̮̞̠͙͔ͅḀ̗̞͈̻̗Ḷ͙͎̯̹̞͓G̻O̭̗̮','˙ɐnbᴉlɐ ɐuƃɐɯ ǝɹolop ʇǝ ǝɹoqɐl ʇn ʇunpᴉpᴉɔuᴉ ɹodɯǝʇ poɯsnᴉǝ op pǝs \'ʇᴉlǝ ƃuᴉɔsᴉdᴉpɐ ɹnʇǝʇɔǝsuoɔ \'ʇǝɯɐ ʇᴉs ɹolop ɯnsdᴉ ɯǝɹo˥','00˙Ɩ$-','Ｔｈｅ ｑｕｉｃｋ ｂｒｏｗｎ ｆｏｘ ｊｕｍｐｓ ｏｖｅｒ ｔｈｅ ｌａｚｙ ｄｏｇ','𝐓𝐡𝐞 𝐪𝐮𝐢𝐜𝐤 𝐛𝐫𝐨𝐰𝐧 𝐟𝐨𝐱 𝐣𝐮𝐦𝐩𝐬 𝐨𝐯𝐞𝐫 𝐭𝐡𝐞 𝐥𝐚𝐳𝐲 𝐝𝐨𝐠','𝕿𝖍𝖊 𝖖𝖚𝖎𝖈𝖐 𝖇𝖗𝖔𝖜𝖓 𝖋𝖔𝖝 𝖏𝖚𝖒𝖕𝖘 𝖔𝖛𝖊𝖗 𝖙𝖍𝖊 𝖑𝖆𝖟𝖞 𝖉𝖔𝖌','𝑻𝒉𝒆 𝒒𝒖𝒊𝒄𝒌 𝒃𝒓𝒐𝒘𝒏 𝒇𝒐𝒙 𝒋𝒖𝒎𝒑𝒔 𝒐𝒗𝒆𝒓 𝒕𝒉𝒆 𝒍𝒂𝒛𝒚 𝒅𝒐𝒈','𝓣𝓱𝓮 𝓺𝓾𝓲𝓬𝓴 𝓫𝓻𝓸𝔀𝓷 𝓯𝓸𝔁 𝓳𝓾𝓶𝓹𝓼 𝓸𝓿𝓮𝓻 𝓽𝓱𝓮 𝓵𝓪𝔃𝔂 𝓭𝓸𝓰','𝕋𝕙𝕖 𝕢𝕦𝕚𝕔𝕜 𝕓𝕣𝕠𝕨𝕟 𝕗𝕠𝕩 𝕛𝕦𝕞𝕡𝕤 𝕠𝕧𝕖𝕣 𝕥𝕙𝕖 𝕝𝕒𝕫𝕪 𝕕𝕠𝕘','𝚃𝚑𝚎 𝚚𝚞𝚒𝚌𝚔 𝚋𝚛𝚘𝚠𝚗 𝚏𝚘𝚡 𝚓𝚞𝚖𝚙𝚜 𝚘𝚟𝚎𝚛 𝚝𝚑𝚎 𝚕𝚊𝚣𝚢 𝚍𝚘𝚐','⒯⒣⒠ ⒬⒰⒤⒞⒦ ⒝⒭⒪⒲⒩ ⒡⒪⒳ ⒥⒰⒨⒫⒮ ⒪⒱⒠⒭ ⒯⒣⒠ ⒧⒜⒵⒴ ⒟⒪⒢','<script>alert(123)</script>','&lt;script&gt;alert(&#39;123&#39;);&lt;/script&gt;','<img src=x onerror=alert(123) />','<svg><script>123<1>alert(123)</script>','"><script>alert(123)</script>','\'><script>alert(123)</script>','><script>alert(123)</script>','</script><script>alert(123)</script>','< / script >< script >alert(123)< / script >',' onfocus=JaVaSCript:alert(123) autofocus','" onfocus=JaVaSCript:alert(123) autofocus','\' onfocus=JaVaSCript:alert(123) autofocus','＜script＞alert(123)＜/script＞','<sc<script>ript>alert(123)</sc</script>ript>','--><script>alert(123)</script>','";alert(123);t="','\';alert(123);t=\'','JavaSCript:alert(123)',';alert(123);','src=JaVaSCript:prompt(132)','"><script>alert(123);</script x="','\'><script>alert(123);</script x=\'','><script>alert(123);</script x=','" autofocus onkeyup="javascript:alert(123)','\' autofocus onkeyup=\'javascript:alert(123)','<script\\x20type="text/javascript">javascript:alert(1);</script>','<script\\x3Etype="text/javascript">javascript:alert(1);</script>','<script\\x0Dtype="text/javascript">javascript:alert(1);</script>','<script\\x09type="text/javascript">javascript:alert(1);</script>','<script\\x0Ctype="text/javascript">javascript:alert(1);</script>','<script\\x2Ftype="text/javascript">javascript:alert(1);</script>','<script\\x0Atype="text/javascript">javascript:alert(1);</script>','\'`"><\\x3Cscript>javascript:alert(1)</script>','\'`"><\\x00script>javascript:alert(1)</script>','ABC<div style="x\\x3Aexpression(javascript:alert(1)">DEF','ABC<div style="x:expression\\x5C(javascript:alert(1)">DEF','ABC<div style="x:expression\\x00(javascript:alert(1)">DEF','ABC<div style="x:exp\\x00ression(javascript:alert(1)">DEF','ABC<div style="x:exp\\x5Cression(javascript:alert(1)">DEF','ABC<div style="x:\\x0Aexpression(javascript:alert(1)">DEF','ABC<div style="x:\\x09expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE3\\x80\\x80expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x84expression(javascript:alert(1)">DEF','ABC<div style="x:\\xC2\\xA0expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x80expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x8Aexpression(javascript:alert(1)">DEF','ABC<div style="x:\\x0Dexpression(javascript:alert(1)">DEF','ABC<div style="x:\\x0Cexpression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x87expression(javascript:alert(1)">DEF','ABC<div style="x:\\xEF\\xBB\\xBFexpression(javascript:alert(1)">DEF','ABC<div style="x:\\x20expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x88expression(javascript:alert(1)">DEF','ABC<div style="x:\\x00expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x8Bexpression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x86expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x85expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x82expression(javascript:alert(1)">DEF','ABC<div style="x:\\x0Bexpression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x81expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x83expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x89expression(javascript:alert(1)">DEF','<a href="\\x0Bjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x0Fjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xC2\\xA0javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x05javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE1\\xA0\\x8Ejavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x18javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x11javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x88javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x89javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x80javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x17javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x03javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x0Ejavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Ajavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x00javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x10javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x82javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x20javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x13javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x09javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x8Ajavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x14javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x19javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\xAFjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Fjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x81javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Djavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x87javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x07javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE1\\x9A\\x80javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x83javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x04javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x01javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x08javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x84javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x86javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE3\\x80\\x80javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x12javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x0Djavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x0Ajavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x0Cjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x15javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\xA8javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x16javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x02javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Bjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x06javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\xA9javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x85javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Ejavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x81\\x9Fjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Cjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="javascript\\x00:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="javascript\\x3A:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="javascript\\x09:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="javascript\\x0D:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="javascript\\x0A:javascript:alert(1)" id="fuzzelement1">test</a>','`"\'><img src=xxx:x \\x0Aonerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x22onerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x0Bonerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x0Donerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x2Fonerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x09onerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x0Conerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x00onerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x27onerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x20onerror=javascript:alert(1)>','"`\'><script>\\x3Bjavascript:alert(1)</script>','"`\'><script>\\x0Djavascript:alert(1)</script>','"`\'><script>\\xEF\\xBB\\xBFjavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x81javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x84javascript:alert(1)</script>','"`\'><script>\\xE3\\x80\\x80javascript:alert(1)</script>','"`\'><script>\\x09javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x89javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x85javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x88javascript:alert(1)</script>','"`\'><script>\\x00javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\xA8javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x8Ajavascript:alert(1)</script>','"`\'><script>\\xE1\\x9A\\x80javascript:alert(1)</script>','"`\'><script>\\x0Cjavascript:alert(1)</script>','"`\'><script>\\x2Bjavascript:alert(1)</script>','"`\'><script>\\xF0\\x90\\x96\\x9Ajavascript:alert(1)</script>','"`\'><script>-javascript:alert(1)</script>','"`\'><script>\\x0Ajavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\xAFjavascript:alert(1)</script>','"`\'><script>\\x7Ejavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x87javascript:alert(1)</script>','"`\'><script>\\xE2\\x81\\x9Fjavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\xA9javascript:alert(1)</script>','"`\'><script>\\xC2\\x85javascript:alert(1)</script>','"`\'><script>\\xEF\\xBF\\xAEjavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x83javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x8Bjavascript:alert(1)</script>','"`\'><script>\\xEF\\xBF\\xBEjavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x80javascript:alert(1)</script>','"`\'><script>\\x21javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x82javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x86javascript:alert(1)</script>','"`\'><script>\\xE1\\xA0\\x8Ejavascript:alert(1)</script>','"`\'><script>\\x0Bjavascript:alert(1)</script>','"`\'><script>\\x20javascript:alert(1)</script>','"`\'><script>\\xC2\\xA0javascript:alert(1)</script>','<img \\x00src=x onerror="alert(1)">','<img \\x47src=x onerror="javascript:alert(1)">','<img \\x11src=x onerror="javascript:alert(1)">','<img \\x12src=x onerror="javascript:alert(1)">','<img\\x47src=x onerror="javascript:alert(1)">','<img\\x10src=x onerror="javascript:alert(1)">','<img\\x13src=x onerror="javascript:alert(1)">','<img\\x32src=x onerror="javascript:alert(1)">','<img\\x47src=x onerror="javascript:alert(1)">','<img\\x11src=x onerror="javascript:alert(1)">','<img \\x47src=x onerror="javascript:alert(1)">','<img \\x34src=x onerror="javascript:alert(1)">','<img \\x39src=x onerror="javascript:alert(1)">','<img \\x00src=x onerror="javascript:alert(1)">','<img src\\x09=x onerror="javascript:alert(1)">','<img src\\x10=x onerror="javascript:alert(1)">','<img src\\x13=x onerror="javascript:alert(1)">','<img src\\x32=x onerror="javascript:alert(1)">','<img src\\x12=x onerror="javascript:alert(1)">','<img src\\x11=x onerror="javascript:alert(1)">','<img src\\x00=x onerror="javascript:alert(1)">','<img src\\x47=x onerror="javascript:alert(1)">','<img src=x\\x09onerror="javascript:alert(1)">','<img src=x\\x10onerror="javascript:alert(1)">','<img src=x\\x11onerror="javascript:alert(1)">','<img src=x\\x12onerror="javascript:alert(1)">','<img src=x\\x13onerror="javascript:alert(1)">','<img[a][b][c]src[d]=x[e]onerror=[f]"alert(1)">','<img src=x onerror=\\x09"javascript:alert(1)">','<img src=x onerror=\\x10"javascript:alert(1)">','<img src=x onerror=\\x11"javascript:alert(1)">','<img src=x onerror=\\x12"javascript:alert(1)">','<img src=x onerror=\\x32"javascript:alert(1)">','<img src=x onerror=\\x00"javascript:alert(1)">','<a href=java&#1&#2&#3&#4&#5&#6&#7&#8&#11&#12script:javascript:alert(1)>XXX</a>','<img src="x` `<script>javascript:alert(1)</script>"` `>','<img src onerror /" \'"= alt=javascript:alert(1)//">','<title onpropertychange=javascript:alert(1)></title><title title=>','<a href=http://foo.bar/#x=`y></a><img alt="`><img src=x:x onerror=javascript:alert(1)></a>">','<!--[if]><script>javascript:alert(1)</script -->','<!--[if<img src=x onerror=javascript:alert(1)//]> -->','<script src="/\\%(jscript)s"></script>','<script src="\\\\%(jscript)s"></script>','<IMG """><SCRIPT>alert("XSS")</SCRIPT>">','<IMG SRC=javascript:alert(String.fromCharCode(88,83,83))>','<IMG SRC=# onmouseover="alert(\'xxs\')">','<IMG SRC= onmouseover="alert(\'xxs\')">','<IMG onmouseover="alert(\'xxs\')">','<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>','<IMG SRC=&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058&#0000097&#0000108&#0000101&#0000114&#0000116&#0000040&#0000039&#0000088&#0000083&#0000083&#0000039&#0000041>','<IMG SRC=&#x6A&#x61&#x76&#x61&#x73&#x63&#x72&#x69&#x70&#x74&#x3A&#x61&#x6C&#x65&#x72&#x74&#x28&#x27&#x58&#x53&#x53&#x27&#x29>','<IMG SRC="jav   ascript:alert(\'XSS\');">','<IMG SRC="jav&#x09;ascript:alert(\'XSS\');">','<IMG SRC="jav&#x0A;ascript:alert(\'XSS\');">','<IMG SRC="jav&#x0D;ascript:alert(\'XSS\');">','perl -e \'print "<IMG SRC=java\\0script:alert(\\"XSS\\")>";\' > out','<IMG SRC=" &#14;  javascript:alert(\'XSS\');">','<SCRIPT/XSS SRC="http://ha.ckers.org/xss.js"></SCRIPT>','<BODY onload!#$%&()*~+-_.,:;?@[/|\\]^`=alert("XSS")>','<SCRIPT/SRC="http://ha.ckers.org/xss.js"></SCRIPT>','<<SCRIPT>alert("XSS");//<</SCRIPT>','<SCRIPT SRC=http://ha.ckers.org/xss.js?< B >','<SCRIPT SRC=//ha.ckers.org/.j>','<IMG SRC="javascript:alert(\'XSS\')"','<iframe src=http://ha.ckers.org/scriptlet.html <','\\";alert(\'XSS\');//','<u oncopy=alert()> Copy me</u>','<i onwheel=alert(1)> Scroll over me </i>','<plaintext>','http://a/%%30%30','</textarea><script>alert(123)</script>','1;DROP TABLE users','1\'; DROP TABLE users-- 1','\' OR 1=1 -- 1','\' OR \'1\'=\'1','\'; EXEC sp_MSForEachTable \'DROP TABLE ?\'; --',' ','%','_','-','--','--version','--help','$USER','/dev/null; touch /tmp/blns.fail ; echo','`touch /tmp/blns.fail`','$(touch /tmp/blns.fail)','@{[system "touch /tmp/blns.fail"]}','eval("puts \'hello world\'")','System("ls -al /")','`ls -al /`','Kernel.exec("ls -al /")','Kernel.exit(1)','%x(\'ls -al /\')','<?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE foo [ <!ELEMENT foo ANY ><!ENTITY xxe SYSTEM "file:///etc/passwd" >]><foo>&xxe;</foo>','$HOME','$ENV{\'HOME\'}','%d','%s%s%s%s%s','{0}','%*.*s','%@','%n','File:///','../../../../../../../../../../../etc/passwd%00','../../../../../../../../../../../etc/hosts','() { 0; }; touch /tmp/blns.shellshock1.fail;','() { _; } >_[$($())] { touch /tmp/blns.shellshock2.fail; }','<<< %s(un=\'%s\') = %u','+++ATH0','CON','PRN','AUX','CLOCK$','NUL','A:','ZZ:','COM1','LPT1','LPT2','LPT3','COM2','COM3','COM4','DCC SEND STARTKEYLOGGER 0 0 0','Scunthorpe General Hospital','Penistone Community Church','Lightwater Country Park','Jimmy Clitheroe','Horniman Museum','shitake mushrooms','RomansInSussex.co.uk','http://www.cum.qc.ca/','Craig Cockburn, Software Specialist','Linda Callahan','Dr. Herman I. Libshitz','magna cum laude','Super Bowl XXX','medieval erection of parapets','evaluate','mocha','expression','Arsenal canal','classic','Tyson Gay','Dick Van Dyke','basement','If you\'re reading this, you\'ve been in a coma for almost 20 years now. We\'re trying a new technique. We don\'t know where this message will end up in your dream, but we hope it works. Please wake up, we miss you.','Roses are red, violets are blue. Hope you enjoy terminal hue','But now...for my greatest trick...','The quic\b\b\b\b\b\bk brown fox... [Beeeep]','Powerلُلُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ冗','🏳0🌈️','జ్ఞ‌ా','گچپژ','{% print \'x\' * 64 * 1024**3 %}','{{ "".__class__.__mro__[2].__subclasses__()[40]("/etc/passwd").read() }}'])	undefined	undef	null	NULL	(null)	nil	NIL	true	false	True	False	TRUE	FALSE	None	hasOwnProperty	then	\\	\\\\	0	1	1.00	$1.00	1/2	1E2	1E02	1E+02	-1	-1.00	-$1.00	-1/2	-1E2	-1E02	-1E+02	1/0	0/0	-2147483648/-1	-9223372036854775808/-1	-0	-0.0	+0	+0.0	0.00	0..0	.	0.0.0	0,00	0,,0	,	0,0,0	0.0/0	1.0/0.0	0.0/0.0	1,0/0,0	0,0/0,0	--1	-	-.	-,	999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999	NaN	Infinity	-Infinity	INF	1#INF	-1#IND	1#QNAN	1#SNAN	1#IND	0x0	0xffffffff	0xffffffffffffffff	0xabad1dea	123456789012345678901234567890123456789	1,000.00	1 000.00	1\'000.00	1,000,000.00	1 000 000.00	1\'000\'000.00	1.000,00	1 000,00	1\'000,00	1.000.000,00	1 000 000,00	1\'000\'000,00	01000	08	09	2.2250738585072011e-308	,./;\'[]\\-=	<>?:"{}|_+	!@#$%^&*()`~	
\b	€‚ƒ„†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ	\t\f …             ​

  　	­؀؁؂؃؄؅؜۝܏᠎​‌‍‎‏‪‫‬‭‮⁠⁡⁢⁣⁤⁦⁧⁨⁩𑂽𛲠𛲡𛲢𛲣𝅳𝅴𝅵𝅶𝅷𝅸𝅹𝅺󠀁󠀠󠀡󠀢󠀣󠀤󠀥󠀦󠀧󠀨󠀩󠀪󠀫󠀬󠀭󠀮󠀯󠀰󠀱󠀲󠀳󠀴󠀵󠀶󠀷󠀸󠀹󠀺󠀻󠀼󠀽󠀾󠀿󠁀󠁁󠁂󠁃󠁄󠁅󠁆󠁇󠁈󠁉󠁊󠁋󠁌󠁍󠁎󠁏󠁐󠁑󠁒󠁓󠁔󠁕󠁖󠁗󠁘󠁙󠁚󠁛󠁜󠁝󠁞󠁟󠁠󠁡󠁢󠁣󠁤󠁥󠁦󠁧󠁨󠁩󠁪󠁫󠁬󠁭󠁮󠁯󠁰󠁱󠁲󠁳󠁴󠁵󠁶󠁷󠁸󠁹󠁺󠁻󠁼󠁽󠁾󠁿		￾	Ω≈ç√∫˜µ≤≥÷	åß∂ƒ©˙∆˚¬…æ	œ∑´®†¥¨ˆøπ“‘	¡™£¢∞§¶•ªº–≠	¸˛Ç◊ı˜Â¯˘¿	ÅÍÎÏ˝ÓÔÒÚÆ☃	Œ„´‰ˇÁ¨ˆØ∏”’	`⁄€‹›fifl‡°·‚—±	⅛⅜⅝⅞	ЁЂЃЄЅІЇЈЉЊЋЌЍЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя	٠١٢٣٤٥٦٧٨٩	⁰⁴⁵	₀₁₂	⁰⁴⁵₀₁₂	ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็ ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็ ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็	\'	"	\'\'	""	\'"\'	"\'\'\'\'"\'"	"\'"\'"\'\'\'\'"	<foo val=“bar” />	<foo val=“bar” />	<foo val=”bar“ />	<foo val=`bar\' />	田中さんにあげて下さい	パーティーへ行かないか	和製漢語	部落格	사회과학원 어학연구소	찦차를 타고 온 펲시맨과 쑛다리 똠방각하	社會科學院語學研究所	울란바토르	𠜎𠜱𠝹𠱓𠱸𠲖𠳏	𐐜 𐐔𐐇𐐝𐐀𐐡𐐇𐐓 𐐙𐐊𐐡𐐝𐐓/𐐝𐐇𐐗𐐊𐐤𐐔 𐐒𐐋𐐗 𐐒𐐌 𐐜 𐐡𐐀𐐖𐐇𐐤𐐓𐐝 𐐱𐑂 𐑄 𐐔𐐇𐐝𐐀𐐡𐐇𐐓 𐐏𐐆𐐅𐐤𐐆𐐚𐐊𐐡𐐝𐐆𐐓𐐆	表ポあA鷗ŒéＢ逍Üߪąñ丂㐀𠀀	Ⱥ	Ⱦ	ヽ༼ຈل͜ຈ༽ﾉ ヽ༼ຈل͜ຈ༽ﾉ	(｡◕ ∀ ◕｡)	｀ｨ(´∀｀∩	__ﾛ(,_,*)	・(￣∀￣)・:*:	ﾟ･✿ヾ╲(｡◕‿◕｡)╱✿･ﾟ	,。・:*:・゜’( ☻ ω ☻ )。・:*:・゜’	(╯°□°）╯︵ ┻━┻)	(ﾉಥ益ಥ）ﾉ ┻━┻	┬─┬ノ( º _ ºノ)	( ͡° ͜ʖ ͡°)	¯\\_(ツ)_/¯	😍	👩🏽	👨‍🦰 👨🏿‍🦰 👨‍🦱 👨🏿‍🦱 🦹🏿‍♂️	👾 🙇 💁 🙅 🙆 🙋 🙎 🙍	🐵 🙈 🙉 🙊	❤️ 💔 💌 💕 💞 💓 💗 💖 💘 💝 💟 💜 💛 💚 💙	✋🏿 💪🏿 👐🏿 🙌🏿 👏🏿 🙏🏿	👨‍👩‍👦 👨‍👩‍👧‍👦 👨‍👨‍👦 👩‍👩‍👧 👨‍👦 👨‍👧‍👦 👩‍👦 👩‍👧‍👦	🚾 🆒 🆓 🆕 🆖 🆗 🆙 🏧	0️⃣ 1️⃣ 2️⃣ 3️⃣ 4️⃣ 5️⃣ 6️⃣ 7️⃣ 8️⃣ 9️⃣ 🔟	🇺🇸🇷🇺🇸 🇦🇫🇦🇲🇸	🇺🇸🇷🇺🇸🇦🇫🇦🇲	🇺🇸🇷🇺🇸🇦	１２３	١٢٣	ثم نفس سقطت وبالتحديد،, جزيرتي باستخدام أن دنو. إذ هنا؟ الستار وتنصيب كان. أهّل ايطاليا، بريطانيا-فرنسا قد أخذ. سليمان، إتفاقية بين ما, يذكر الحدود أي بعد, معاملة بولندا، الإطلاق عل إيو.	בְּרֵאשִׁית, בָּרָא אֱלֹהִים, אֵת הַשָּׁמַיִם, וְאֵת הָאָרֶץ	הָיְתָהtestالصفحات التّحول	﷽	ﷺ	مُنَاقَشَةُ سُبُلِ اِسْتِخْدَامِ اللُّغَةِ فِي النُّظُمِ الْقَائِمَةِ وَفِيم يَخُصَّ التَّطْبِيقَاتُ الْحاسُوبِيَّةُ، 	᚛ᚄᚓᚐᚋᚒᚄ ᚑᚄᚂᚑᚏᚅ᚜‪‪‪	‪‪᚛                 ᚜‪	‪‪test‪	‫test‫	
test
	test⁠test‫	⁦test⁧	Ṱ̺̺̕o͞ ̷i̲̬͇̪͙n̝̗͕v̟̜̘̦͟o̶̙̰̠kè͚̮̺̪̹̱̤ ̖t̝͕̳̣̻̪͞h̼͓̲̦̳̘̲e͇̣̰̦̬͎ ̢̼̻̱̘h͚͎͙̜̣̲ͅi̦̲̣̰̤v̻͍e̺̭̳̪̰-m̢iͅn̖̺̞̲̯̰d̵̼̟͙̩̼̘̳ ̞̥̱̳̭r̛̗̘e͙p͠r̼̞̻̭̗e̺̠̣͟s̘͇̳͍̝͉e͉̥̯̞̲͚̬͜ǹ̬͎͎̟̖͇̤t͍̬̤͓̼̭͘ͅi̪̱n͠g̴͉ ͏͉ͅc̬̟h͡a̫̻̯͘o̫̟̖͍̙̝͉s̗̦̲.̨̹͈̣	̡͓̞ͅI̗̘̦͝n͇͇͙v̮̫ok̲̫̙͈i̖͙̭̹̠̞n̡̻̮̣̺g̲͈͙̭͙̬͎ ̰t͔̦h̞̲e̢̤ ͍̬̲͖f̴̘͕̣è͖ẹ̥̩l͖͔͚i͓͚̦͠n͖͍̗͓̳̮g͍ ̨o͚̪͡f̘̣̬ ̖̘͖̟͙̮c҉͔̫͖͓͇͖ͅh̵̤̣͚͔á̗̼͕ͅo̼̣̥s̱͈̺̖̦̻͢.̛̖̞̠̫̰	̗̺͖̹̯͓Ṯ̤͍̥͇͈h̲́e͏͓̼̗̙̼̣͔ ͇̜̱̠͓͍ͅN͕͠e̗̱z̘̝̜̺͙p̤̺̹͍̯͚e̠̻̠͜r̨̤͍̺̖͔̖̖d̠̟̭̬̝͟i̦͖̩͓͔̤a̠̗̬͉̙n͚͜ ̻̞̰͚ͅh̵͉i̳̞v̢͇ḙ͎͟-҉̭̩̼͔m̤̭̫i͕͇̝̦n̗͙ḍ̟ ̯̲͕͞ǫ̟̯̰̲͙̻̝f ̪̰̰̗̖̭̘͘c̦͍̲̞͍̩̙ḥ͚a̮͎̟̙͜ơ̩̹͎s̤.̝̝ ҉Z̡̖̜͖̰̣͉̜a͖̰͙̬͡l̲̫̳͍̩g̡̟̼̱͚̞̬ͅo̗͜.̟	̦H̬̤̗̤͝e͜ ̜̥̝̻͍̟́w̕h̖̯͓o̝͙̖͎̱̮ ҉̺̙̞̟͈W̷̼̭a̺̪͍į͈͕̭͙̯̜t̶̼̮s̘͙͖̕ ̠̫̠B̻͍͙͉̳ͅe̵h̵̬͇̫͙i̹͓̳̳̮͎̫̕n͟d̴̪̜̖ ̰͉̩͇͙̲͞ͅT͖̼͓̪͢h͏͓̮̻e̬̝̟ͅ ̤̹̝W͙̞̝͔͇͝ͅa͏͓͔̹̼̣l̴͔̰̤̟͔ḽ̫.͕	Z̮̞̠͙͔ͅḀ̗̞͈̻̗Ḷ͙͎̯̹̞͓G̻O̭̗̮	˙ɐnbᴉlɐ ɐuƃɐɯ ǝɹolop ʇǝ ǝɹoqɐl ʇn ʇunpᴉpᴉɔuᴉ ɹodɯǝʇ poɯsnᴉǝ op pǝs \'ʇᴉlǝ ƃuᴉɔsᴉdᴉpɐ ɹnʇǝʇɔǝsuoɔ \'ʇǝɯɐ ʇᴉs ɹolop ɯnsdᴉ ɯǝɹo˥	00˙Ɩ$-	Ｔｈｅ ｑｕｉｃｋ ｂｒｏｗｎ ｆｏｘ ｊｕｍｐｓ ｏｖｅｒ ｔｈｅ ｌａｚｙ ｄｏｇ	𝐓𝐡𝐞 𝐪𝐮𝐢𝐜𝐤 𝐛𝐫𝐨𝐰𝐧 𝐟𝐨𝐱 𝐣𝐮𝐦𝐩𝐬 𝐨𝐯𝐞𝐫 𝐭𝐡𝐞 𝐥𝐚𝐳𝐲 𝐝𝐨𝐠	𝕿𝖍𝖊 𝖖𝖚𝖎𝖈𝖐 𝖇𝖗𝖔𝖜𝖓 𝖋𝖔𝖝 𝖏𝖚𝖒𝖕𝖘 𝖔𝖛𝖊𝖗 𝖙𝖍𝖊 𝖑𝖆𝖟𝖞 𝖉𝖔𝖌	𝑻𝒉𝒆 𝒒𝒖𝒊𝒄𝒌 𝒃𝒓𝒐𝒘𝒏 𝒇𝒐𝒙 𝒋𝒖𝒎𝒑𝒔 𝒐𝒗𝒆𝒓 𝒕𝒉𝒆 𝒍𝒂𝒛𝒚 𝒅𝒐𝒈	𝓣𝓱𝓮 𝓺𝓾𝓲𝓬𝓴 𝓫𝓻𝓸𝔀𝓷 𝓯𝓸𝔁 𝓳𝓾𝓶𝓹𝓼 𝓸𝓿𝓮𝓻 𝓽𝓱𝓮 𝓵𝓪𝔃𝔂 𝓭𝓸𝓰	𝕋𝕙𝕖 𝕢𝕦𝕚𝕔𝕜 𝕓𝕣𝕠𝕨𝕟 𝕗𝕠𝕩 𝕛𝕦𝕞𝕡𝕤 𝕠𝕧𝕖𝕣 𝕥𝕙𝕖 𝕝𝕒𝕫𝕪 𝕕𝕠𝕘	𝚃𝚑𝚎 𝚚𝚞𝚒𝚌𝚔 𝚋𝚛𝚘𝚠𝚗 𝚏𝚘𝚡 𝚓𝚞𝚖𝚙𝚜 𝚘𝚟𝚎𝚛 𝚝𝚑𝚎 𝚕𝚊𝚣𝚢 𝚍𝚘𝚐	⒯⒣⒠ ⒬⒰⒤⒞⒦ ⒝⒭⒪⒲⒩ ⒡⒪⒳ ⒥⒰⒨⒫⒮ ⒪⒱⒠⒭ ⒯⒣⒠ ⒧⒜⒵⒴ ⒟⒪⒢	<script>alert(123)</script>	&lt;script&gt;alert(&#39;123&#39;);&lt;/script&gt;	<img src=x onerror=alert(123) />	<svg><script>123<1>alert(123)</script>	"><script>alert(123)</script>	\'><script>alert(123)</script>	><script>alert(123)</script>	</script><script>alert(123)</script>	< / script >< script >alert(123)< / script >	 onfocus=JaVaSCript:alert(123) autofocus	" onfocus=JaVaSCript:alert(123) autofocus	\' onfocus=JaVaSCript:alert(123) autofocus	＜script＞alert(123)＜/script＞	<sc<script>ript>alert(123)</sc</script>ript>	--><script>alert(123)</script>	";alert(123);t="	\';alert(123);t=\'	JavaSCript:alert(123)	;alert(123);	src=JaVaSCript:prompt(132)	"><script>alert(123);</script x="	\'><script>alert(123);</script x=\'	><script>alert(123);</script x=	" autofocus onkeyup="javascript:alert(123)	\' autofocus onkeyup=\'javascript:alert(123)	<script\\x20type="text/javascript">javascript:alert(1);</script>	<script\\x3Etype="text/javascript">javascript:alert(1);</script>	<script\\x0Dtype="text/javascript">javascript:alert(1);</script>	<script\\x09type="text/javascript">javascript:alert(1);</script>	<script\\x0Ctype="text/javascript">javascript:alert(1);</script>	<script\\x2Ftype="text/javascript">javascript:alert(1);</script>	<script\\x0Atype="text/javascript">javascript:alert(1);</script>	\'`"><\\x3Cscript>javascript:alert(1)</script>	\'`"><\\x00script>javascript:alert(1)</script>	ABC<div style="x\\x3Aexpression(javascript:alert(1)">DEF	ABC<div style="x:expression\\x5C(javascript:alert(1)">DEF	ABC<div style="x:expression\\x00(javascript:alert(1)">DEF	ABC<div style="x:exp\\x00ression(javascript:alert(1)">DEF	ABC<div style="x:exp\\x5Cression(javascript:alert(1)">DEF	ABC<div style="x:\\x0Aexpression(javascript:alert(1)">DEF	ABC<div style="x:\\x09expression(javascript:alert(1)">DEF	ABC<div style="x:\\xE3\\x80\\x80expression(javascript:alert(1)">DEF	ABC<div style="x:\\xE2\\x80\\x84expression(javascript:alert(1)">DEF	ABC<div style="x:\\xC2\\xA0expression(javascript:alert(1)">DEF	ABC<div style="x:\\xE2\\x80\\x80expression(javascript:alert(1)">DEF	ABC<div style="x:\\xE2\\x80\\x8Aexpression(javascript:alert(1)">DEF	ABC<div style="x:\\x0Dexpression(javascript:alert(1)">DEF	ABC<div style="x:\\x0Cexpression(javascript:alert(1)">DEF	ABC<div style="x:\\xE2\\x80\\x87expression(javascript:alert(1)">DEF	ABC<div style="x:\\xEF\\xBB\\xBFexpression(javascript:alert(1)">DEF	ABC<div style="x:\\x20expression(javascript:alert(1)">DEF	ABC<div style="x:\\xE2\\x80\\x88expression(javascript:alert(1)">DEF	ABC<div style="x:\\x00expression(javascript:alert(1)">DEF	ABC<div style="x:\\xE2\\x80\\x8Bexpression(javascript:alert(1)">DEF	ABC<div style="x:\\xE2\\x80\\x86expression(javascript:alert(1)">DEF	ABC<div style="x:\\xE2\\x80\\x85expression(javascript:alert(1)">DEF	ABC<div style="x:\\xE2\\x80\\x82expression(javascript:alert(1)">DEF	ABC<div style="x:\\x0Bexpression(javascript:alert(1)">DEF	ABC<div style="x:\\xE2\\x80\\x81expression(javascript:alert(1)">DEF	ABC<div style="x:\\xE2\\x80\\x83expression(javascript:alert(1)">DEF	ABC<div style="x:\\xE2\\x80\\x89expression(javascript:alert(1)">DEF	<a href="\\x0Bjavascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x0Fjavascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\xC2\\xA0javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x05javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\xE1\\xA0\\x8Ejavascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x18javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x11javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\xE2\\x80\\x88javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\xE2\\x80\\x89javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\xE2\\x80\\x80javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x17javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x03javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x0Ejavascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x1Ajavascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x00javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x10javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\xE2\\x80\\x82javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x20javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x13javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x09javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\xE2\\x80\\x8Ajavascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x14javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x19javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\xE2\\x80\\xAFjavascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x1Fjavascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\xE2\\x80\\x81javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x1Djavascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\xE2\\x80\\x87javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x07javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\xE1\\x9A\\x80javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\xE2\\x80\\x83javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x04javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x01javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x08javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\xE2\\x80\\x84javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\xE2\\x80\\x86javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\xE3\\x80\\x80javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x12javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x0Djavascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x0Ajavascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x0Cjavascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x15javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\xE2\\x80\\xA8javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x16javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x02javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x1Bjavascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x06javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\xE2\\x80\\xA9javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\xE2\\x80\\x85javascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x1Ejavascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\xE2\\x81\\x9Fjavascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="\\x1Cjavascript:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="javascript\\x00:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="javascript\\x3A:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="javascript\\x09:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="javascript\\x0D:javascript:alert(1)" id="fuzzelement1">test</a>	<a href="javascript\\x0A:javascript:alert(1)" id="fuzzelement1">test</a>	`"\'><img src=xxx:x \\x0Aonerror=javascript:alert(1)>	`"\'><img src=xxx:x \\x22onerror=javascript:alert(1)>	`"\'><img src=xxx:x \\x0Bonerror=javascript:alert(1)>	`"\'><img src=xxx:x \\x0Donerror=javascript:alert(1)>	`"\'><img src=xxx:x \\x2Fonerror=javascript:alert(1)>	`"\'><img src=xxx:x \\x09onerror=javascript:alert(1)>	`"\'><img src=xxx:x \\x0Conerror=javascript:alert(1)>	`"\'><img src=xxx:x \\x00onerror=javascript:alert(1)>	`"\'><img src=xxx:x \\x27onerror=javascript:alert(1)>	`"\'><img src=xxx:x \\x20onerror=javascript:alert(1)>	"`\'><script>\\x3Bjavascript:alert(1)</script>	"`\'><script>\\x0Djavascript:alert(1)</script>	"`\'><script>\\xEF\\xBB\\xBFjavascript:alert(1)</script>	"`\'><script>\\xE2\\x80\\x81javascript:alert(1)</script>	"`\'><script>\\xE2\\x80\\x84javascript:alert(1)</script>	"`\'><script>\\xE3\\x80\\x80javascript:alert(1)</script>	"`\'><script>\\x09javascript:alert(1)</script>	"`\'><script>\\xE2\\x80\\x89javascript:alert(1)</script>	"`\'><script>\\xE2\\x80\\x85javascript:alert(1)</script>	"`\'><script>\\xE2\\x80\\x88javascript:alert(1)</script>	"`\'><script>\\x00javascript:alert(1)</script>	"`\'><script>\\xE2\\x80\\xA8javascript:alert(1)</script>	"`\'><script>\\xE2\\x80\\x8Ajavascript:alert(1)</script>	"`\'><script>\\xE1\\x9A\\x80javascript:alert(1)</script>	"`\'><script>\\x0Cjavascript:alert(1)</script>	"`\'><script>\\x2Bjavascript:alert(1)</script>	"`\'><script>\\xF0\\x90\\x96\\x9Ajavascript:alert(1)</script>	"`\'><script>-javascript:alert(1)</script>	"`\'><script>\\x0Ajavascript:alert(1)</script>	"`\'><script>\\xE2\\x80\\xAFjavascript:alert(1)</script>	"`\'><script>\\x7Ejavascript:alert(1)</script>	"`\'><script>\\xE2\\x80\\x87javascript:alert(1)</script>	"`\'><script>\\xE2\\x81\\x9Fjavascript:alert(1)</script>	"`\'><script>\\xE2\\x80\\xA9javascript:alert(1)</script>	"`\'><script>\\xC2\\x85javascript:alert(1)</script>	"`\'><script>\\xEF\\xBF\\xAEjavascript:alert(1)</script>	"`\'><script>\\xE2\\x80\\x83javascript:alert(1)</script>	"`\'><script>\\xE2\\x80\\x8Bjavascript:alert(1)</script>	"`\'><script>\\xEF\\xBF\\xBEjavascript:alert(1)</script>	"`\'><script>\\xE2\\x80\\x80javascript:alert(1)</script>	"`\'><script>\\x21javascript:alert(1)</script>	"`\'><script>\\xE2\\x80\\x82javascript:alert(1)</script>	"`\'><script>\\xE2\\x80\\x86javascript:alert(1)</script>	"`\'><script>\\xE1\\xA0\\x8Ejavascript:alert(1)</script>	"`\'><script>\\x0Bjavascript:alert(1)</script>	"`\'><script>\\x20javascript:alert(1)</script>	"`\'><script>\\xC2\\xA0javascript:alert(1)</script>	<img \\x00src=x onerror="alert(1)">	<img \\x47src=x onerror="javascript:alert(1)">	<img \\x11src=x onerror="javascript:alert(1)">	<img \\x12src=x onerror="javascript:alert(1)">	<img\\x47src=x onerror="javascript:alert(1)">	<img\\x10src=x onerror="javascript:alert(1)">	<img\\x13src=x onerror="javascript:alert(1)">	<img\\x32src=x onerror="javascript:alert(1)">	<img\\x47src=x onerror="javascript:alert(1)">	<img\\x11src=x onerror="javascript:alert(1)">	<img \\x47src=x onerror="javascript:alert(1)">	<img \\x34src=x onerror="javascript:alert(1)">	<img \\x39src=x onerror="javascript:alert(1)">	<img \\x00src=x onerror="javascript:alert(1)">	<img src\\x09=x onerror="javascript:alert(1)">	<img src\\x10=x onerror="javascript:alert(1)">	<img src\\x13=x onerror="javascript:alert(1)">	<img src\\x32=x onerror="javascript:alert(1)">	<img src\\x12=x onerror="javascript:alert(1)">	<img src\\x11=x onerror="javascript:alert(1)">	<img src\\x00=x onerror="javascript:alert(1)">	<img src\\x47=x onerror="javascript:alert(1)">	<img src=x\\x09onerror="javascript:alert(1)">	<img src=x\\x10onerror="javascript:alert(1)">	<img src=x\\x11onerror="javascript:alert(1)">	<img src=x\\x12onerror="javascript:alert(1)">	<img src=x\\x13onerror="javascript:alert(1)">	<img[a][b][c]src[d]=x[e]onerror=[f]"alert(1)">	<img src=x onerror=\\x09"javascript:alert(1)">	<img src=x onerror=\\x10"javascript:alert(1)">	<img src=x onerror=\\x11"javascript:alert(1)">	<img src=x onerror=\\x12"javascript:alert(1)">	<img src=x onerror=\\x32"javascript:alert(1)">	<img src=x onerror=\\x00"javascript:alert(1)">	<a href=java&#1&#2&#3&#4&#5&#6&#7&#8&#11&#12script:javascript:alert(1)>XXX</a>	<img src="x` `<script>javascript:alert(1)</script>"` `>	<img src onerror /" \'"= alt=javascript:alert(1)//">	<title onpropertychange=javascript:alert(1)></title><title title=>	<a href=http://foo.bar/#x=`y></a><img alt="`><img src=x:x onerror=javascript:alert(1)></a>">	<!--[if]><script>javascript:alert(1)</script -->	<!--[if<img src=x onerror=javascript:alert(1)//]> -->	<script src="/\\%(jscript)s"></script>	<script src="\\\\%(jscript)s"></script>	<IMG """><SCRIPT>alert("XSS")</SCRIPT>">	<IMG SRC=javascript:alert(String.fromCharCode(88,83,83))>	<IMG SRC=# onmouseover="alert(\'xxs\')">	<IMG SRC= onmouseover="alert(\'xxs\')">	<IMG onmouseover="alert(\'xxs\')">	<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>	<IMG SRC=&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058&#0000097&#0000108&#0000101&#0000114&#0000116&#0000040&#0000039&#0000088&#0000083&#0000083&#0000039&#0000041>	<IMG SRC=&#x6A&#x61&#x76&#x61&#x73&#x63&#x72&#x69&#x70&#x74&#x3A&#x61&#x6C&#x65&#x72&#x74&#x28&#x27&#x58&#x53&#x53&#x27&#x29>	<IMG SRC="jav   ascript:alert(\'XSS\');">	<IMG SRC="jav&#x09;ascript:alert(\'XSS\');">	<IMG SRC="jav&#x0A;ascript:alert(\'XSS\');">	<IMG SRC="jav&#x0D;ascript:alert(\'XSS\');">	perl -e \'print "<IMG SRC=java\\0script:alert(\\"XSS\\")>";\' > out	<IMG SRC=" &#14;  javascript:alert(\'XSS\');">	<SCRIPT/XSS SRC="http://ha.ckers.org/xss.js"></SCRIPT>	<BODY onload!#$%&()*~+-_.,:;?@[/|\\]^`=alert("XSS")>	<SCRIPT/SRC="http://ha.ckers.org/xss.js"></SCRIPT>	<<SCRIPT>alert("XSS");//<</SCRIPT>	<SCRIPT SRC=http://ha.ckers.org/xss.js?< B >	<SCRIPT SRC=//ha.ckers.org/.j>	<IMG SRC="javascript:alert(\'XSS\')"	<iframe src=http://ha.ckers.org/scriptlet.html <	\\";alert(\'XSS\');//	<u oncopy=alert()> Copy me</u>	<i onwheel=alert(1)> Scroll over me </i>	<plaintext>	http://a/%%30%30	</textarea><script>alert(123)</script>	1;DROP TABLE users	1\'; DROP TABLE users-- 1	\' OR 1=1 -- 1	\' OR \'1\'=\'1	\'; EXEC sp_MSForEachTable \'DROP TABLE ?\'; --	 	%	_	-	--	--version	--help	$USER	/dev/null; touch /tmp/blns.fail ; echo	`touch /tmp/blns.fail`	$(touch /tmp/blns.fail)	@{[system "touch /tmp/blns.fail"]}	eval("puts \'hello world\'")	System("ls -al /")	`ls -al /`	Kernel.exec("ls -al /")	Kernel.exit(1)	%x(\'ls -al /\')	<?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE foo [ <!ELEMENT foo ANY ><!ENTITY xxe SYSTEM "file:///etc/passwd" >]><foo>&xxe;</foo>	$HOME	$ENV{\'HOME\'}	%d	%s%s%s%s%s	{0}	%*.*s	%@	%n	File:///	../../../../../../../../../../../etc/passwd%00	../../../../../../../../../../../etc/hosts	() { 0; }; touch /tmp/blns.shellshock1.fail;	() { _; } >_[$($())] { touch /tmp/blns.shellshock2.fail; }	<<< %s(un=\'%s\') = %u	+++ATH0	CON	PRN	AUX	CLOCK$	NUL	A:	ZZ:	COM1	LPT1	LPT2	LPT3	COM2	COM3	COM4	DCC SEND STARTKEYLOGGER 0 0 0	Scunthorpe General Hospital	Penistone Community Church	Lightwater Country Park	Jimmy Clitheroe	Horniman Museum	shitake mushrooms	RomansInSussex.co.uk	http://www.cum.qc.ca/	Craig Cockburn, Software Specialist	Linda Callahan	Dr. Herman I. Libshitz	magna cum laude	Super Bowl XXX	medieval erection of parapets	evaluate	mocha	expression	Arsenal canal	classic	Tyson Gay	Dick Van Dyke	basement	If you\'re reading this, you\'ve been in a coma for almost 20 years now. We\'re trying a new technique. We don\'t know where this message will end up in your dream, but we hope it works. Please wake up, we miss you.	Roses are red, violets are blue. Hope you enjoy terminal hue	But now...for my greatest trick...	The quic\b\b\b\b\b\bk brown fox... [Beeeep]	Powerلُلُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ冗	🏳0🌈️	జ్ఞ‌ా	گچپژ	{% print \'x\' * 64 * 1024**3 %}	{{ "".__class__.__mro__[2].__subclasses__()[40]("/etc/passwd").read() }}
diff --git a/tests/queries/0_stateless/01666_blns.sql b/tests/queries/0_stateless/01666_blns.sql
new file mode 100644
index 00000000000..8141e669560
--- /dev/null
+++ b/tests/queries/0_stateless/01666_blns.sql
@@ -0,0 +1,580 @@
+-- https://github.com/minimaxir/big-list-of-naughty-strings
+
+/*
+The MIT License (MIT)
+
+Copyright (c) 2015-2020 Max Woolf
+
+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.
+*/
+
+DROP TABLE IF EXISTS test;
+
+CREATE TABLE test
+(
+  "undefined" String,
+  "undef" String,
+  "null" String,
+  "NULL" String,
+  "(null)" String,
+  "nil" String,
+  "NIL" String,
+  "true" String,
+  "false" String,
+  "True" String,
+  "False" String,
+  "TRUE" String,
+  "FALSE" String,
+  "None" String,
+  "hasOwnProperty" String,
+  "then" String,
+  "\\" String,
+  "\\\\" String,
+  "0" String,
+  "1" String,
+  "1.00" String,
+  "$1.00" String,
+  "1/2" String,
+  "1E2" String,
+  "1E02" String,
+  "1E+02" String,
+  "-1" String,
+  "-1.00" String,
+  "-$1.00" String,
+  "-1/2" String,
+  "-1E2" String,
+  "-1E02" String,
+  "-1E+02" String,
+  "1/0" String,
+  "0/0" String,
+  "-2147483648/-1" String,
+  "-9223372036854775808/-1" String,
+  "-0" String,
+  "-0.0" String,
+  "+0" String,
+  "+0.0" String,
+  "0.00" String,
+  "0..0" String,
+  "." String,
+  "0.0.0" String,
+  "0,00" String,
+  "0,,0" String,
+  "," String,
+  "0,0,0" String,
+  "0.0/0" String,
+  "1.0/0.0" String,
+  "0.0/0.0" String,
+  "1,0/0,0" String,
+  "0,0/0,0" String,
+  "--1" String,
+  "-" String,
+  "-." String,
+  "-," String,
+  "999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999" String,
+  "NaN" String,
+  "Infinity" String,
+  "-Infinity" String,
+  "INF" String,
+  "1#INF" String,
+  "-1#IND" String,
+  "1#QNAN" String,
+  "1#SNAN" String,
+  "1#IND" String,
+  "0x0" String,
+  "0xffffffff" String,
+  "0xffffffffffffffff" String,
+  "0xabad1dea" String,
+  "123456789012345678901234567890123456789" String,
+  "1,000.00" String,
+  "1 000.00" String,
+  "1'000.00" String,
+  "1,000,000.00" String,
+  "1 000 000.00" String,
+  "1'000'000.00" String,
+  "1.000,00" String,
+  "1 000,00" String,
+  "1'000,00" String,
+  "1.000.000,00" String,
+  "1 000 000,00" String,
+  "1'000'000,00" String,
+  "01000" String,
+  "08" String,
+  "09" String,
+  "2.2250738585072011e-308" String,
+  ",./;'[]\\-=" String,
+  "<>?:\"{}|_+" String,
+  "!@#$%^&*()`~" String,
+  "\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f" String,
+  "€‚ƒ„†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ" String,
+  "\t\u000b\f …             ​

  　" String,
+  "­؀؁؂؃؄؅؜۝܏᠎​‌‍‎‏‪‫‬‭‮⁠⁡⁢⁣⁤⁦⁧⁨⁩𑂽𛲠𛲡𛲢𛲣𝅳𝅴𝅵𝅶𝅷𝅸𝅹𝅺󠀁󠀠󠀡󠀢󠀣󠀤󠀥󠀦󠀧󠀨󠀩󠀪󠀫󠀬󠀭󠀮󠀯󠀰󠀱󠀲󠀳󠀴󠀵󠀶󠀷󠀸󠀹󠀺󠀻󠀼󠀽󠀾󠀿󠁀󠁁󠁂󠁃󠁄󠁅󠁆󠁇󠁈󠁉󠁊󠁋󠁌󠁍󠁎󠁏󠁐󠁑󠁒󠁓󠁔󠁕󠁖󠁗󠁘󠁙󠁚󠁛󠁜󠁝󠁞󠁟󠁠󠁡󠁢󠁣󠁤󠁥󠁦󠁧󠁨󠁩󠁪󠁫󠁬󠁭󠁮󠁯󠁰󠁱󠁲󠁳󠁴󠁵󠁶󠁷󠁸󠁹󠁺󠁻󠁼󠁽󠁾󠁿" String,
+  "" String,
+  "￾" String,
+  "Ω≈ç√∫˜µ≤≥÷" String,
+  "åß∂ƒ©˙∆˚¬…æ" String,
+  "œ∑´®†¥¨ˆøπ“‘" String,
+  "¡™£¢∞§¶•ªº–≠" String,
+  "¸˛Ç◊ı˜Â¯˘¿" String,
+  "ÅÍÎÏ˝ÓÔÒÚÆ☃" String,
+  "Œ„´‰ˇÁ¨ˆØ∏”’" String,
+  "`⁄€‹›fifl‡°·‚—±" String,
+  "⅛⅜⅝⅞" String,
+  "ЁЂЃЄЅІЇЈЉЊЋЌЍЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя" String,
+  "٠١٢٣٤٥٦٧٨٩" String,
+  "⁰⁴⁵" String,
+  "₀₁₂" String,
+  "⁰⁴⁵₀₁₂" String,
+  "ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็ ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็ ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็" String,
+  "'" String,
+  "\"" String,
+  "''" String,
+  "\"\"" String,
+  "'\"'" String,
+  "\"''''\"'\"" String,
+  "\"'\"'\"''''\"" String,
+  "<foo val=“bar” />" String,
+  "<foo val=”bar“ />" String,
+  "<foo val=`bar' />" String,
+  "田中さんにあげて下さい" String,
+  "パーティーへ行かないか" String,
+  "和製漢語" String,
+  "部落格" String,
+  "사회과학원 어학연구소" String,
+  "찦차를 타고 온 펲시맨과 쑛다리 똠방각하" String,
+  "社會科學院語學研究所" String,
+  "울란바토르" String,
+  "𠜎𠜱𠝹𠱓𠱸𠲖𠳏" String,
+  "𐐜 𐐔𐐇𐐝𐐀𐐡𐐇𐐓 𐐙𐐊𐐡𐐝𐐓/𐐝𐐇𐐗𐐊𐐤𐐔 𐐒𐐋𐐗 𐐒𐐌 𐐜 𐐡𐐀𐐖𐐇𐐤𐐓𐐝 𐐱𐑂 𐑄 𐐔𐐇𐐝𐐀𐐡𐐇𐐓 𐐏𐐆𐐅𐐤𐐆𐐚𐐊𐐡𐐝𐐆𐐓𐐆" String,
+  "表ポあA鷗ŒéＢ逍Üߪąñ丂㐀𠀀" String,
+  "Ⱥ" String,
+  "Ⱦ" String,
+  "ヽ༼ຈل͜ຈ༽ﾉ ヽ༼ຈل͜ຈ༽ﾉ" String,
+  "(｡◕ ∀ ◕｡)" String,
+  "｀ｨ(´∀｀∩" String,
+  "__ﾛ(,_,*)" String,
+  "・(￣∀￣)・:*:" String,
+  "ﾟ･✿ヾ╲(｡◕‿◕｡)╱✿･ﾟ" String,
+  ",。・:*:・゜’( ☻ ω ☻ )。・:*:・゜’" String,
+  "(╯°□°）╯︵ ┻━┻)" String,
+  "(ﾉಥ益ಥ）ﾉ ┻━┻" String,
+  "┬─┬ノ( º _ ºノ)" String,
+  "( ͡° ͜ʖ ͡°)" String,
+  "¯\\_(ツ)_/¯" String,
+  "😍" String,
+  "👩🏽" String,
+  "👨‍🦰 👨🏿‍🦰 👨‍🦱 👨🏿‍🦱 🦹🏿‍♂️" String,
+  "👾 🙇 💁 🙅 🙆 🙋 🙎 🙍" String,
+  "🐵 🙈 🙉 🙊" String,
+  "❤️ 💔 💌 💕 💞 💓 💗 💖 💘 💝 💟 💜 💛 💚 💙" String,
+  "✋🏿 💪🏿 👐🏿 🙌🏿 👏🏿 🙏🏿" String,
+  "👨‍👩‍👦 👨‍👩‍👧‍👦 👨‍👨‍👦 👩‍👩‍👧 👨‍👦 👨‍👧‍👦 👩‍👦 👩‍👧‍👦" String,
+  "🚾 🆒 🆓 🆕 🆖 🆗 🆙 🏧" String,
+  "0️⃣ 1️⃣ 2️⃣ 3️⃣ 4️⃣ 5️⃣ 6️⃣ 7️⃣ 8️⃣ 9️⃣ 🔟" String,
+  "🇺🇸🇷🇺🇸 🇦🇫🇦🇲🇸" String,
+  "🇺🇸🇷🇺🇸🇦🇫🇦🇲" String,
+  "🇺🇸🇷🇺🇸🇦" String,
+  "１２３" String,
+  "١٢٣" String,
+  "ثم نفس سقطت وبالتحديد،, جزيرتي باستخدام أن دنو. إذ هنا؟ الستار وتنصيب كان. أهّل ايطاليا، بريطانيا-فرنسا قد أخذ. سليمان، إتفاقية بين ما , يذكر الحدود أي بعد, معاملة بولندا، الإطلاق عل إيو." String,
+  "בְּרֵאשִׁית, בָּרָא אֱלֹהִים, אֵת הַשָּׁמַיִם, וְאֵת הָאָרֶץ" String,
+  "הָיְתָהtestالصفحات التّحول" String,
+  "﷽" String,
+  "ﷺ" String,
+  "مُنَاقَشَةُ سُبُلِ اِسْتِخْدَامِ اللُّغَةِ فِي النُّظُمِ الْقَائِمَةِ وَفِيم يَخُصَّ التَّطْبِيقَاتُ الْحاسُوبِيَّةُ، " String,
+  "᚛ᚄᚓᚐᚋᚒᚄ ᚑᚄᚂᚑᚏᚅ᚜‪‪‪" String,
+  "‪‪᚛                 ᚜‪" String,
+  "‪‪test‪" String,
+  "‫test‫" String,
+  "
test
" String,
+  "test⁠test‫" String,
+  "⁦test⁧" String,
+  "Ṱ̺̺̕o͞ ̷i̲̬͇̪͙n̝̗͕v̟̜̘̦͟o̶̙̰̠kè͚̮̺̪̹̱̤ ̖t̝͕̳̣̻̪͞h̼͓̲̦̳̘̲e͇̣̰̦̬͎ ̢̼̻̱̘h͚͎͙̜̣̲ͅi̦̲̣̰̤v̻͍e̺̭̳̪̰-m̢iͅn̖̺̞̲̯̰d̵̼̟͙̩̼̘̳ ̞̥̱̳̭r̛̗̘e͙p͠r̼̞̻̭̗e̺̠̣͟s̘͇̳͍̝͉e͉̥̯̞̲͚̬͜ǹ̬͎͎̟̖͇̤t͍̬̤͓̼̭͘ͅi̪̱n͠g̴͉ ͏͉ͅc̬̟h͡a̫̻̯͘o̫̟̖͍̙̝͉s̗̦̲.̨̹͈̣" String,
+  "̡͓̞ͅI̗̘̦͝n͇͇͙v̮̫ok̲̫̙͈i̖͙̭̹̠̞n̡̻̮̣̺g̲͈͙̭͙̬͎ ̰t͔̦h̞̲e̢̤ ͍̬̲͖f̴̘͕̣è͖ẹ̥̩l͖͔͚i͓͚̦͠n͖͍̗͓̳̮g͍ ̨o͚̪͡f̘̣̬ ̖̘͖̟͙̮c҉͔̫͖͓͇͖ͅh̵̤̣͚͔á̗̼͕ͅo̼̣̥s̱͈̺̖̦̻͢.̛̖̞̠̫̰" String,
+  "̗̺͖̹̯͓Ṯ̤͍̥͇͈h̲́e͏͓̼̗̙̼̣͔ ͇̜̱̠͓͍ͅN͕͠e̗̱z̘̝̜̺͙p̤̺̹͍̯͚e̠̻̠͜r̨̤͍̺̖͔̖̖d̠̟̭̬̝͟i̦͖̩͓͔̤a̠̗̬͉̙n͚͜ ̻̞̰͚ͅh̵͉i̳̞v̢͇ḙ͎͟-҉̭̩̼͔m̤̭̫i͕͇̝̦n̗͙ḍ̟ ̯̲͕͞ǫ̟̯̰̲͙̻̝f ̪̰̰̗̖̭̘͘c̦͍̲̞͍̩̙ḥ͚a̮͎̟̙͜ơ̩̹͎s̤.̝̝ ҉Z̡̖̜͖̰̣͉̜a͖̰͙̬͡l̲̫̳͍̩g̡̟̼̱͚̞̬ͅo̗͜.̟" String,
+  "̦H̬̤̗̤͝e͜ ̜̥̝̻͍̟́w̕h̖̯͓o̝͙̖͎̱̮ ҉̺̙̞̟͈W̷̼̭a̺̪͍į͈͕̭͙̯̜t̶̼̮s̘͙͖̕ ̠̫̠B̻͍͙͉̳ͅe̵h̵̬͇̫͙i̹͓̳̳̮͎̫̕n͟d̴̪̜̖ ̰͉̩͇͙̲͞ͅT͖̼͓̪͢h͏͓̮̻e̬̝̟ͅ ̤̹̝W͙̞̝͔͇͝ͅa͏͓͔̹̼̣l̴͔̰̤̟͔ḽ̫.͕" String,
+  "Z̮̞̠͙͔ͅḀ̗̞͈̻̗Ḷ͙͎̯̹̞͓G̻O̭̗̮" String,
+  "˙ɐnbᴉlɐ ɐuƃɐɯ ǝɹolop ʇǝ ǝɹoqɐl ʇn ʇunpᴉpᴉɔuᴉ ɹodɯǝʇ poɯsnᴉǝ op pǝs 'ʇᴉlǝ ƃuᴉɔsᴉdᴉpɐ ɹnʇǝʇɔǝsuoɔ 'ʇǝɯɐ ʇᴉs ɹolop ɯnsdᴉ ɯǝɹo˥" String,
+  "00˙Ɩ$-" String,
+  "Ｔｈｅ ｑｕｉｃｋ ｂｒｏｗｎ ｆｏｘ ｊｕｍｐｓ ｏｖｅｒ ｔｈｅ ｌａｚｙ ｄｏｇ" String,
+  "𝐓𝐡𝐞 𝐪𝐮𝐢𝐜𝐤 𝐛𝐫𝐨𝐰𝐧 𝐟𝐨𝐱 𝐣𝐮𝐦𝐩𝐬 𝐨𝐯𝐞𝐫 𝐭𝐡𝐞 𝐥𝐚𝐳𝐲 𝐝𝐨𝐠" String,
+  "𝕿𝖍𝖊 𝖖𝖚𝖎𝖈𝖐 𝖇𝖗𝖔𝖜𝖓 𝖋𝖔𝖝 𝖏𝖚𝖒𝖕𝖘 𝖔𝖛𝖊𝖗 𝖙𝖍𝖊 𝖑𝖆𝖟𝖞 𝖉𝖔𝖌" String,
+  "𝑻𝒉𝒆 𝒒𝒖𝒊𝒄𝒌 𝒃𝒓𝒐𝒘𝒏 𝒇𝒐𝒙 𝒋𝒖𝒎𝒑𝒔 𝒐𝒗𝒆𝒓 𝒕𝒉𝒆 𝒍𝒂𝒛𝒚 𝒅𝒐𝒈" String,
+  "𝓣𝓱𝓮 𝓺𝓾𝓲𝓬𝓴 𝓫𝓻𝓸𝔀𝓷 𝓯𝓸𝔁 𝓳𝓾𝓶𝓹𝓼 𝓸𝓿𝓮𝓻 𝓽𝓱𝓮 𝓵𝓪𝔃𝔂 𝓭𝓸𝓰" String,
+  "𝕋𝕙𝕖 𝕢𝕦𝕚𝕔𝕜 𝕓𝕣𝕠𝕨𝕟 𝕗𝕠𝕩 𝕛𝕦𝕞𝕡𝕤 𝕠𝕧𝕖𝕣 𝕥𝕙𝕖 𝕝𝕒𝕫𝕪 𝕕𝕠𝕘" String,
+  "𝚃𝚑𝚎 𝚚𝚞𝚒𝚌𝚔 𝚋𝚛𝚘𝚠𝚗 𝚏𝚘𝚡 𝚓𝚞𝚖𝚙𝚜 𝚘𝚟𝚎𝚛 𝚝𝚑𝚎 𝚕𝚊𝚣𝚢 𝚍𝚘𝚐" String,
+  "⒯⒣⒠ ⒬⒰⒤⒞⒦ ⒝⒭⒪⒲⒩ ⒡⒪⒳ ⒥⒰⒨⒫⒮ ⒪⒱⒠⒭ ⒯⒣⒠ ⒧⒜⒵⒴ ⒟⒪⒢" String,
+  "<script>alert(123)</script>" String,
+  "&lt;script&gt;alert(&#39;123&#39;);&lt;/script&gt;" String,
+  "<img src=x onerror=alert(123) />" String,
+  "<svg><script>123<1>alert(123)</script>" String,
+  "\"><script>alert(123)</script>" String,
+  "'><script>alert(123)</script>" String,
+  "><script>alert(123)</script>" String,
+  "</script><script>alert(123)</script>" String,
+  "< / script >< script >alert(123)< / script >" String,
+  " onfocus=JaVaSCript:alert(123) autofocus" String,
+  "\" onfocus=JaVaSCript:alert(123) autofocus" String,
+  "' onfocus=JaVaSCript:alert(123) autofocus" String,
+  "＜script＞alert(123)＜/script＞" String,
+  "<sc<script>ript>alert(123)</sc</script>ript>" String,
+  "--><script>alert(123)</script>" String,
+  "\";alert(123);t=\"" String,
+  "';alert(123);t='" String,
+  "JavaSCript:alert(123)" String,
+  ";alert(123);" String,
+  "src=JaVaSCript:prompt(132)" String,
+  "\"><script>alert(123);</script x=\"" String,
+  "'><script>alert(123);</script x='" String,
+  "><script>alert(123);</script x=" String,
+  "\" autofocus onkeyup=\"javascript:alert(123)" String,
+  "' autofocus onkeyup='javascript:alert(123)" String,
+  "<script\\x20type=\"text/javascript\">javascript:alert(1);</script>" String,
+  "<script\\x3Etype=\"text/javascript\">javascript:alert(1);</script>" String,
+  "<script\\x0Dtype=\"text/javascript\">javascript:alert(1);</script>" String,
+  "<script\\x09type=\"text/javascript\">javascript:alert(1);</script>" String,
+  "<script\\x0Ctype=\"text/javascript\">javascript:alert(1);</script>" String,
+  "<script\\x2Ftype=\"text/javascript\">javascript:alert(1);</script>" String,
+  "<script\\x0Atype=\"text/javascript\">javascript:alert(1);</script>" String,
+  "'`\"><\\x3Cscript>javascript:alert(1)</script>" String,
+  "'`\"><\\x00script>javascript:alert(1)</script>" String,
+  "ABC<div style=\"x\\x3Aexpression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:expression\\x5C(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:expression\\x00(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:exp\\x00ression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:exp\\x5Cression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:\\x0Aexpression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:\\x09expression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:\\xE3\\x80\\x80expression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:\\xE2\\x80\\x84expression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:\\xC2\\xA0expression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:\\xE2\\x80\\x80expression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:\\xE2\\x80\\x8Aexpression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:\\x0Dexpression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:\\x0Cexpression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:\\xE2\\x80\\x87expression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:\\xEF\\xBB\\xBFexpression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:\\x20expression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:\\xE2\\x80\\x88expression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:\\x00expression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:\\xE2\\x80\\x8Bexpression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:\\xE2\\x80\\x86expression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:\\xE2\\x80\\x85expression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:\\xE2\\x80\\x82expression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:\\x0Bexpression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:\\xE2\\x80\\x81expression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:\\xE2\\x80\\x83expression(javascript:alert(1)\">DEF" String,
+  "ABC<div style=\"x:\\xE2\\x80\\x89expression(javascript:alert(1)\">DEF" String,
+  "<a href=\"\\x0Bjavascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x0Fjavascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\xC2\\xA0javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x05javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\xE1\\xA0\\x8Ejavascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x18javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x11javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\xE2\\x80\\x88javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\xE2\\x80\\x89javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\xE2\\x80\\x80javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x17javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x03javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x0Ejavascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x1Ajavascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x00javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x10javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\xE2\\x80\\x82javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x20javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x13javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x09javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\xE2\\x80\\x8Ajavascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x14javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x19javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\xE2\\x80\\xAFjavascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x1Fjavascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\xE2\\x80\\x81javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x1Djavascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\xE2\\x80\\x87javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x07javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\xE1\\x9A\\x80javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\xE2\\x80\\x83javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x04javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x01javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x08javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\xE2\\x80\\x84javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\xE2\\x80\\x86javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\xE3\\x80\\x80javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x12javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x0Djavascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x0Ajavascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x0Cjavascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x15javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\xE2\\x80\\xA8javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x16javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x02javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x1Bjavascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x06javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\xE2\\x80\\xA9javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\xE2\\x80\\x85javascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x1Ejavascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\xE2\\x81\\x9Fjavascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"\\x1Cjavascript:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"javascript\\x00:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"javascript\\x3A:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"javascript\\x09:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"javascript\\x0D:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "<a href=\"javascript\\x0A:javascript:alert(1)\" id=\"fuzzelement1\">test</a>" String,
+  "`\"'><img src=xxx:x \\x0Aonerror=javascript:alert(1)>" String,
+  "`\"'><img src=xxx:x \\x22onerror=javascript:alert(1)>" String,
+  "`\"'><img src=xxx:x \\x0Bonerror=javascript:alert(1)>" String,
+  "`\"'><img src=xxx:x \\x0Donerror=javascript:alert(1)>" String,
+  "`\"'><img src=xxx:x \\x2Fonerror=javascript:alert(1)>" String,
+  "`\"'><img src=xxx:x \\x09onerror=javascript:alert(1)>" String,
+  "`\"'><img src=xxx:x \\x0Conerror=javascript:alert(1)>" String,
+  "`\"'><img src=xxx:x \\x00onerror=javascript:alert(1)>" String,
+  "`\"'><img src=xxx:x \\x27onerror=javascript:alert(1)>" String,
+  "`\"'><img src=xxx:x \\x20onerror=javascript:alert(1)>" String,
+  "\"`'><script>\\x3Bjavascript:alert(1)</script>" String,
+  "\"`'><script>\\x0Djavascript:alert(1)</script>" String,
+  "\"`'><script>\\xEF\\xBB\\xBFjavascript:alert(1)</script>" String,
+  "\"`'><script>\\xE2\\x80\\x81javascript:alert(1)</script>" String,
+  "\"`'><script>\\xE2\\x80\\x84javascript:alert(1)</script>" String,
+  "\"`'><script>\\xE3\\x80\\x80javascript:alert(1)</script>" String,
+  "\"`'><script>\\x09javascript:alert(1)</script>" String,
+  "\"`'><script>\\xE2\\x80\\x89javascript:alert(1)</script>" String,
+  "\"`'><script>\\xE2\\x80\\x85javascript:alert(1)</script>" String,
+  "\"`'><script>\\xE2\\x80\\x88javascript:alert(1)</script>" String,
+  "\"`'><script>\\x00javascript:alert(1)</script>" String,
+  "\"`'><script>\\xE2\\x80\\xA8javascript:alert(1)</script>" String,
+  "\"`'><script>\\xE2\\x80\\x8Ajavascript:alert(1)</script>" String,
+  "\"`'><script>\\xE1\\x9A\\x80javascript:alert(1)</script>" String,
+  "\"`'><script>\\x0Cjavascript:alert(1)</script>" String,
+  "\"`'><script>\\x2Bjavascript:alert(1)</script>" String,
+  "\"`'><script>\\xF0\\x90\\x96\\x9Ajavascript:alert(1)</script>" String,
+  "\"`'><script>-javascript:alert(1)</script>" String,
+  "\"`'><script>\\x0Ajavascript:alert(1)</script>" String,
+  "\"`'><script>\\xE2\\x80\\xAFjavascript:alert(1)</script>" String,
+  "\"`'><script>\\x7Ejavascript:alert(1)</script>" String,
+  "\"`'><script>\\xE2\\x80\\x87javascript:alert(1)</script>" String,
+  "\"`'><script>\\xE2\\x81\\x9Fjavascript:alert(1)</script>" String,
+  "\"`'><script>\\xE2\\x80\\xA9javascript:alert(1)</script>" String,
+  "\"`'><script>\\xC2\\x85javascript:alert(1)</script>" String,
+  "\"`'><script>\\xEF\\xBF\\xAEjavascript:alert(1)</script>" String,
+  "\"`'><script>\\xE2\\x80\\x83javascript:alert(1)</script>" String,
+  "\"`'><script>\\xE2\\x80\\x8Bjavascript:alert(1)</script>" String,
+  "\"`'><script>\\xEF\\xBF\\xBEjavascript:alert(1)</script>" String,
+  "\"`'><script>\\xE2\\x80\\x80javascript:alert(1)</script>" String,
+  "\"`'><script>\\x21javascript:alert(1)</script>" String,
+  "\"`'><script>\\xE2\\x80\\x82javascript:alert(1)</script>" String,
+  "\"`'><script>\\xE2\\x80\\x86javascript:alert(1)</script>" String,
+  "\"`'><script>\\xE1\\xA0\\x8Ejavascript:alert(1)</script>" String,
+  "\"`'><script>\\x0Bjavascript:alert(1)</script>" String,
+  "\"`'><script>\\x20javascript:alert(1)</script>" String,
+  "\"`'><script>\\xC2\\xA0javascript:alert(1)</script>" String,
+  "<img \\x00src=x onerror=\"alert(1)\">" String,
+  "<img \\x47src=x onerror=\"javascript:alert(1)\">" String,
+  "<img \\x11src=x onerror=\"javascript:alert(1)\">" String,
+  "<img \\x12src=x onerror=\"javascript:alert(1)\">" String,
+  "<img\\x47src=x onerror=\"javascript:alert(1)\">" String,
+  "<img\\x10src=x onerror=\"javascript:alert(1)\">" String,
+  "<img\\x13src=x onerror=\"javascript:alert(1)\">" String,
+  "<img\\x32src=x onerror=\"javascript:alert(1)\">" String,
+  "<img\\x11src=x onerror=\"javascript:alert(1)\">" String,
+  "<img \\x34src=x onerror=\"javascript:alert(1)\">" String,
+  "<img \\x39src=x onerror=\"javascript:alert(1)\">" String,
+  "<img \\x00src=x onerror=\"javascript:alert(1)\">" String,
+  "<img src\\x09=x onerror=\"javascript:alert(1)\">" String,
+  "<img src\\x10=x onerror=\"javascript:alert(1)\">" String,
+  "<img src\\x13=x onerror=\"javascript:alert(1)\">" String,
+  "<img src\\x32=x onerror=\"javascript:alert(1)\">" String,
+  "<img src\\x12=x onerror=\"javascript:alert(1)\">" String,
+  "<img src\\x11=x onerror=\"javascript:alert(1)\">" String,
+  "<img src\\x00=x onerror=\"javascript:alert(1)\">" String,
+  "<img src\\x47=x onerror=\"javascript:alert(1)\">" String,
+  "<img src=x\\x09onerror=\"javascript:alert(1)\">" String,
+  "<img src=x\\x10onerror=\"javascript:alert(1)\">" String,
+  "<img src=x\\x11onerror=\"javascript:alert(1)\">" String,
+  "<img src=x\\x12onerror=\"javascript:alert(1)\">" String,
+  "<img src=x\\x13onerror=\"javascript:alert(1)\">" String,
+  "<img[a][b][c]src[d]=x[e]onerror=[f]\"alert(1)\">" String,
+  "<img src=x onerror=\\x09\"javascript:alert(1)\">" String,
+  "<img src=x onerror=\\x10\"javascript:alert(1)\">" String,
+  "<img src=x onerror=\\x11\"javascript:alert(1)\">" String,
+  "<img src=x onerror=\\x12\"javascript:alert(1)\">" String,
+  "<img src=x onerror=\\x32\"javascript:alert(1)\">" String,
+  "<img src=x onerror=\\x00\"javascript:alert(1)\">" String,
+  "<a href=java&#1&#2&#3&#4&#5&#6&#7&#8&#11&#12script:javascript:alert(1)>XXX</a>" String,
+  "<img src=\"x` `<script>javascript:alert(1)</script>\"` `>" String,
+  "<img src onerror /\" '\"= alt=javascript:alert(1)//\">" String,
+  "<title onpropertychange=javascript:alert(1)></title><title title=>" String,
+  "<a href=http://foo.bar/#x=`y></a><img alt=\"`><img src=x:x onerror=javascript:alert(1)></a>\">" String,
+  "<!--[if]><script>javascript:alert(1)</script -->" String,
+  "<!--[if<img src=x onerror=javascript:alert(1)//]> -->" String,
+  "<script src=\"/\\%(jscript)s\"></script>" String,
+  "<script src=\"\\\\%(jscript)s\"></script>" String,
+  "<IMG \"\"\"><SCRIPT>alert(\"XSS\")</SCRIPT>\">" String,
+  "<IMG SRC=javascript:alert(String.fromCharCode(88,83,83))>" String,
+  "<IMG SRC=# onmouseover=\"alert('xxs')\">" String,
+  "<IMG SRC= onmouseover=\"alert('xxs')\">" String,
+  "<IMG onmouseover=\"alert('xxs')\">" String,
+  "<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>" String,
+  "<IMG SRC=&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058&#0000097&#0000108&#0000101&#0000114&#0000116&#0000040&#0000039&#0000088&#0000083&#0000083&#0000039&#0000041>" String,
+  "<IMG SRC=&#x6A&#x61&#x76&#x61&#x73&#x63&#x72&#x69&#x70&#x74&#x3A&#x61&#x6C&#x65&#x72&#x74&#x28&#x27&#x58&#x53&#x53&#x27&#x29>" String,
+  "<IMG SRC=\"jav   ascript:alert('XSS');\">" String,
+  "<IMG SRC=\"jav&#x09;ascript:alert('XSS');\">" String,
+  "<IMG SRC=\"jav&#x0A;ascript:alert('XSS');\">" String,
+  "<IMG SRC=\"jav&#x0D;ascript:alert('XSS');\">" String,
+  "perl -e 'print \"<IMG SRC=java\\0script:alert(\\\"XSS\\\")>\";' > out" String,
+  "<IMG SRC=\" &#14;  javascript:alert('XSS');\">" String,
+  "<SCRIPT/XSS SRC=\"http://ha.ckers.org/xss.js\"></SCRIPT>" String,
+  "<BODY onload!#$%&()*~+-_.,:;?@[/|\\]^`=alert(\"XSS\")>" String,
+  "<SCRIPT/SRC=\"http://ha.ckers.org/xss.js\"></SCRIPT>" String,
+  "<<SCRIPT>alert(\"XSS\");//<</SCRIPT>" String,
+  "<SCRIPT SRC=http://ha.ckers.org/xss.js?< B >" String,
+  "<SCRIPT SRC=//ha.ckers.org/.j>" String,
+  "<IMG SRC=\"javascript:alert('XSS')\"" String,
+  "<iframe src=http://ha.ckers.org/scriptlet.html <" String,
+  "\\\";alert('XSS');//" String,
+  "<u oncopy=alert()> Copy me</u>" String,
+  "<i onwheel=alert(1)> Scroll over me </i>" String,
+  "<plaintext>" String,
+  "http://a/%%30%30" String,
+  "</textarea><script>alert(123)</script>" String,
+  "1;DROP TABLE users" String,
+  "1'; DROP TABLE users-- 1" String,
+  "' OR 1=1 -- 1" String,
+  "' OR '1'='1" String,
+  "'; EXEC sp_MSForEachTable 'DROP TABLE ?'; --" String,
+  " " String,
+  "%" String,
+  "_" String,
+  "--" String,
+  "--version" String,
+  "--help" String,
+  "$USER" String,
+  "/dev/null; touch /tmp/blns.fail ; echo" String,
+  "`touch /tmp/blns.fail`" String,
+  "$(touch /tmp/blns.fail)" String,
+  "@{[system \"touch /tmp/blns.fail\"]}" String,
+  "eval(\"puts 'hello world'\")" String,
+  "System(\"ls -al /\")" String,
+  "`ls -al /`" String,
+  "Kernel.exec(\"ls -al /\")" String,
+  "Kernel.exit(1)" String,
+  "%x('ls -al /')" String,
+  "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?><!DOCTYPE foo [ <!ELEMENT foo ANY ><!ENTITY xxe SYSTEM \"file:///etc/passwd\" >]><foo>&xxe;</foo>" String,
+  "$HOME" String,
+  "$ENV{'HOME'}" String,
+  "%d" String,
+  "%s%s%s%s%s" String,
+  "{0}" String,
+  "%*.*s" String,
+  "%@" String,
+  "%n" String,
+  "File:///" String,
+  "../../../../../../../../../../../etc/passwd%00" String,
+  "../../../../../../../../../../../etc/hosts" String,
+  "() { 0; }; touch /tmp/blns.shellshock1.fail;" String,
+  "() { _; } >_[$($())] { touch /tmp/blns.shellshock2.fail; }" String,
+  "<<< %s(un='%s') = %u" String,
+  "+++ATH0" String,
+  "CON" String,
+  "PRN" String,
+  "AUX" String,
+  "CLOCK$" String,
+  "NUL" String,
+  "A:" String,
+  "ZZ:" String,
+  "COM1" String,
+  "LPT1" String,
+  "LPT2" String,
+  "LPT3" String,
+  "COM2" String,
+  "COM3" String,
+  "COM4" String,
+  "DCC SEND STARTKEYLOGGER 0 0 0" String,
+  "Scunthorpe General Hospital" String,
+  "Penistone Community Church" String,
+  "Lightwater Country Park" String,
+  "Jimmy Clitheroe" String,
+  "Horniman Museum" String,
+  "shitake mushrooms" String,
+  "RomansInSussex.co.uk" String,
+  "http://www.cum.qc.ca/" String,
+  "Craig Cockburn, Software Specialist" String,
+  "Linda Callahan" String,
+  "Dr. Herman I. Libshitz" String,
+  "magna cum laude" String,
+  "Super Bowl XXX" String,
+  "medieval erection of parapets" String,
+  "evaluate" String,
+  "mocha" String,
+  "expression" String,
+  "Arsenal canal" String,
+  "classic" String,
+  "Tyson Gay" String,
+  "Dick Van Dyke" String,
+  "basement" String,
+  "If you're reading this, you've been in a coma for almost 20 years now. We're trying a new technique. We don't know where this message will end up in your dream, but we hope it works. Please wake up, we miss you." String,
+  "Roses are \u001b[0;31mred\u001b[0m, violets are \u001b[0;34mblue. Hope you enjoy terminal hue" String,
+  "But now...\u001b[20Cfor my greatest trick...\u001b[8m" String,
+  "The quic\b\b\b\b\b\bk brown fo\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007\u0007x... [Beeeep]" String,
+  "Powerلُلُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ冗" String,
+  "🏳0🌈️" String,
+  "జ్ఞ‌ా" String,
+  "گچپژ" String,
+  "{% print 'x' * 64 * 1024**3 %}" String,
+  "{{ \"\".__class__.__mro__[2].__subclasses__()[40](\"/etc/passwd\").read() }}" String
+) ENGINE = MergeTree ORDER BY "{{ \"\".__class__.__mro__[2].__subclasses__()[40](\"/etc/passwd\").read() }}";
+
+INSERT INTO test ("0") SELECT 'Hello, world!';
+SELECT count() FROM test;
+
+DETACH TABLE test;
+ATTACH TABLE test;
+
+SELECT count() FROM test;
+
+INSERT INTO test ("0") VALUES ('Hello, world!');
+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 "\\";
+INSERT INTO test_r1 SELECT * FROM test;
+CREATE TABLE test_r2 AS test ENGINE = ReplicatedMergeTree('/clickhouse/test', 'r2') ORDER BY "\\";
+
+SYSTEM SYNC REPLICA test_r2;
+
+SELECT count() FROM test_r1;
+SELECT count() FROM test_r2;
+
+DROP TABLE test_r1;
+DROP TABLE test_r2;
+
+SELECT groupArray(name) FROM system.columns WHERE database = currentDatabase() AND table = 'test';
+
+DROP TABLE test;
+
+SELECT 'undefined','undef','null','NULL','(null)','nil','NIL','true','false','True','False','TRUE','FALSE','None','hasOwnProperty','then','\\','\\\\','0','1','1.00','$1.00','1/2','1E2','1E02','1E+02','-1','-1.00','-$1.00','-1/2','-1E2','-1E02','-1E+02','1/0','0/0','-2147483648/-1','-9223372036854775808/-1','-0','-0.0','+0','+0.0','0.00','0..0','.','0.0.0','0,00','0,,0',',','0,0,0','0.0/0','1.0/0.0','0.0/0.0','1,0/0,0','0,0/0,0','--1','-','-.','-,','999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999','NaN','Infinity','-Infinity','INF','1#INF','-1#IND','1#QNAN','1#SNAN','1#IND','0x0','0xffffffff','0xffffffffffffffff','0xabad1dea','123456789012345678901234567890123456789','1,000.00','1 000.00','1\'000.00','1,000,000.00','1 000 000.00','1\'000\'000.00','1.000,00','1 000,00','1\'000,00','1.000.000,00','1 000 000,00','1\'000\'000,00','01000','08','09','2.2250738585072011e-308',',./;\'[]\\-=','<>?:"{}|_+','!@#$%^&*()`~','\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\b\\u000e\\u000f\\u0010\\u0011\\u0012\\u0013\\u0014\\u0015\\u0016\\u0017\\u0018\\u0019\\u001a\\u001b\\u001c\\u001d\\u001e\\u001f','€‚ƒ„†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ','\t\\u000b\f …             ​

  　','­؀؁؂؃؄؅؜۝܏᠎​‌‍‎‏‪‫‬‭‮⁠⁡⁢⁣⁤⁦⁧⁨⁩𑂽𛲠𛲡𛲢𛲣𝅳𝅴𝅵𝅶𝅷𝅸𝅹𝅺󠀁󠀠󠀡󠀢󠀣󠀤󠀥󠀦󠀧󠀨󠀩󠀪󠀫󠀬󠀭󠀮󠀯󠀰󠀱󠀲󠀳󠀴󠀵󠀶󠀷󠀸󠀹󠀺󠀻󠀼󠀽󠀾󠀿󠁀󠁁󠁂󠁃󠁄󠁅󠁆󠁇󠁈󠁉󠁊󠁋󠁌󠁍󠁎󠁏󠁐󠁑󠁒󠁓󠁔󠁕󠁖󠁗󠁘󠁙󠁚󠁛󠁜󠁝󠁞󠁟󠁠󠁡󠁢󠁣󠁤󠁥󠁦󠁧󠁨󠁩󠁪󠁫󠁬󠁭󠁮󠁯󠁰󠁱󠁲󠁳󠁴󠁵󠁶󠁷󠁸󠁹󠁺󠁻󠁼󠁽󠁾󠁿','','￾','Ω≈ç√∫˜µ≤≥÷','åß∂ƒ©˙∆˚¬…æ','œ∑´®†¥¨ˆøπ“‘','¡™£¢∞§¶•ªº–≠','¸˛Ç◊ı˜Â¯˘¿','ÅÍÎÏ˝ÓÔÒÚÆ☃','Œ„´‰ˇÁ¨ˆØ∏”’','`⁄€‹›fifl‡°·‚—±','⅛⅜⅝⅞','ЁЂЃЄЅІЇЈЉЊЋЌЍЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя','٠١٢٣٤٥٦٧٨٩','⁰⁴⁵','₀₁₂','⁰⁴⁵₀₁₂','ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็ ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็ ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็','\'','"','\'\'','""','\'"\'','"\'\'\'\'"\'"','"\'"\'"\'\'\'\'"','<foo val=“bar” />','<foo val=”bar“ />','<foo val=`bar\' />','田中さんにあげて下さい','パーティーへ行かないか','和製漢語','部落格','사회과학원 어학연구소','찦차를 타고 온 펲시맨과 쑛다리 똠방각하','社會科學院語學研究所','울란바토르','𠜎𠜱𠝹𠱓𠱸𠲖𠳏','𐐜 𐐔𐐇𐐝𐐀𐐡𐐇𐐓 𐐙𐐊𐐡𐐝𐐓/𐐝𐐇𐐗𐐊𐐤𐐔 𐐒𐐋𐐗 𐐒𐐌 𐐜 𐐡𐐀𐐖𐐇𐐤𐐓𐐝 𐐱𐑂 𐑄 𐐔𐐇𐐝𐐀𐐡𐐇𐐓 𐐏𐐆𐐅𐐤𐐆𐐚𐐊𐐡𐐝𐐆𐐓𐐆','表ポあA鷗ŒéＢ逍Üߪąñ丂㐀𠀀','Ⱥ','Ⱦ','ヽ༼ຈل͜ຈ༽ﾉ ヽ༼ຈل͜ຈ༽ﾉ','(｡◕ ∀ ◕｡)','｀ｨ(´∀｀∩','__ﾛ(,_,*)','・(￣∀￣)・:*:','ﾟ･✿ヾ╲(｡◕‿◕｡)╱✿･ﾟ',',。・:*:・゜’( ☻ ω ☻ )。・:*:・゜’','(╯°□°）╯︵ ┻━┻)','(ﾉಥ益ಥ）ﾉ ┻━┻','┬─┬ノ( º _ ºノ)','( ͡° ͜ʖ ͡°)','¯\\_(ツ)_/¯','😍','👩🏽','👨‍🦰 👨🏿‍🦰 👨‍🦱 👨🏿‍🦱 🦹🏿‍♂️','👾 🙇 💁 🙅 🙆 🙋 🙎 🙍','🐵 🙈 🙉 🙊','❤️ 💔 💌 💕 💞 💓 💗 💖 💘 💝 💟 💜 💛 💚 💙','✋🏿 💪🏿 👐🏿 🙌🏿 👏🏿 🙏🏿','👨‍👩‍👦 👨‍👩‍👧‍👦 👨‍👨‍👦 👩‍👩‍👧 👨‍👦 👨‍👧‍👦 👩‍👦 👩‍👧‍👦','🚾 🆒 🆓 🆕 🆖 🆗 🆙 🏧','0️⃣ 1️⃣ 2️⃣ 3️⃣ 4️⃣ 5️⃣ 6️⃣ 7️⃣ 8️⃣ 9️⃣ 🔟','🇺🇸🇷🇺🇸 🇦🇫🇦🇲🇸','🇺🇸🇷🇺🇸🇦🇫🇦🇲','🇺🇸🇷🇺🇸🇦','１２３','١٢٣','ثم نفس سقطت وبالتحديد،, جزيرتي باستخدام أن دنو. إذ هنا؟ الستار وتنصيب كان. أهّل ايطاليا، بريطانيا-فرنسا قد أخذ. سليمان، إتفاقية بين ما , يذكر الحدود أي بعد, معاملة بولندا، الإطلاق عل إيو.','בְּרֵאשִׁית, בָּרָא אֱלֹהִים, אֵת הַשָּׁמַיִם, וְאֵת הָאָרֶץ','הָיְתָהtestالصفحات التّحول','﷽','ﷺ','مُنَاقَشَةُ سُبُلِ اِسْتِخْدَامِ اللُّغَةِ فِي النُّظُمِ الْقَائِمَةِ وَفِيم يَخُصَّ التَّطْبِيقَاتُ الْحاسُوبِيَّةُ، ','᚛ᚄᚓᚐᚋᚒᚄ ᚑᚄᚂᚑᚏᚅ᚜‪‪‪','‪‪᚛                 ᚜‪','‪‪test‪','‫test‫','
test
','test⁠test‫','⁦test⁧','Ṱ̺̺̕o͞ ̷i̲̬͇̪͙n̝̗͕v̟̜̘̦͟o̶̙̰̠kè͚̮̺̪̹̱̤ ̖t̝͕̳̣̻̪͞h̼͓̲̦̳̘̲e͇̣̰̦̬͎ ̢̼̻̱̘h͚͎͙̜̣̲ͅi̦̲̣̰̤v̻͍e̺̭̳̪̰-m̢iͅn̖̺̞̲̯̰d̵̼̟͙̩̼̘̳ ̞̥̱̳̭r̛̗̘e͙p͠r̼̞̻̭̗e̺̠̣͟s̘͇̳͍̝͉e͉̥̯̞̲͚̬͜ǹ̬͎͎̟̖͇̤t͍̬̤͓̼̭͘ͅi̪̱n͠g̴͉ ͏͉ͅc̬̟h͡a̫̻̯͘o̫̟̖͍̙̝͉s̗̦̲.̨̹͈̣','̡͓̞ͅI̗̘̦͝n͇͇͙v̮̫ok̲̫̙͈i̖͙̭̹̠̞n̡̻̮̣̺g̲͈͙̭͙̬͎ ̰t͔̦h̞̲e̢̤ ͍̬̲͖f̴̘͕̣è͖ẹ̥̩l͖͔͚i͓͚̦͠n͖͍̗͓̳̮g͍ ̨o͚̪͡f̘̣̬ ̖̘͖̟͙̮c҉͔̫͖͓͇͖ͅh̵̤̣͚͔á̗̼͕ͅo̼̣̥s̱͈̺̖̦̻͢.̛̖̞̠̫̰','̗̺͖̹̯͓Ṯ̤͍̥͇͈h̲́e͏͓̼̗̙̼̣͔ ͇̜̱̠͓͍ͅN͕͠e̗̱z̘̝̜̺͙p̤̺̹͍̯͚e̠̻̠͜r̨̤͍̺̖͔̖̖d̠̟̭̬̝͟i̦͖̩͓͔̤a̠̗̬͉̙n͚͜ ̻̞̰͚ͅh̵͉i̳̞v̢͇ḙ͎͟-҉̭̩̼͔m̤̭̫i͕͇̝̦n̗͙ḍ̟ ̯̲͕͞ǫ̟̯̰̲͙̻̝f ̪̰̰̗̖̭̘͘c̦͍̲̞͍̩̙ḥ͚a̮͎̟̙͜ơ̩̹͎s̤.̝̝ ҉Z̡̖̜͖̰̣͉̜a͖̰͙̬͡l̲̫̳͍̩g̡̟̼̱͚̞̬ͅo̗͜.̟','̦H̬̤̗̤͝e͜ ̜̥̝̻͍̟́w̕h̖̯͓o̝͙̖͎̱̮ ҉̺̙̞̟͈W̷̼̭a̺̪͍į͈͕̭͙̯̜t̶̼̮s̘͙͖̕ ̠̫̠B̻͍͙͉̳ͅe̵h̵̬͇̫͙i̹͓̳̳̮͎̫̕n͟d̴̪̜̖ ̰͉̩͇͙̲͞ͅT͖̼͓̪͢h͏͓̮̻e̬̝̟ͅ ̤̹̝W͙̞̝͔͇͝ͅa͏͓͔̹̼̣l̴͔̰̤̟͔ḽ̫.͕','Z̮̞̠͙͔ͅḀ̗̞͈̻̗Ḷ͙͎̯̹̞͓G̻O̭̗̮','˙ɐnbᴉlɐ ɐuƃɐɯ ǝɹolop ʇǝ ǝɹoqɐl ʇn ʇunpᴉpᴉɔuᴉ ɹodɯǝʇ poɯsnᴉǝ op pǝs \'ʇᴉlǝ ƃuᴉɔsᴉdᴉpɐ ɹnʇǝʇɔǝsuoɔ \'ʇǝɯɐ ʇᴉs ɹolop ɯnsdᴉ ɯǝɹo˥','00˙Ɩ$-','Ｔｈｅ ｑｕｉｃｋ ｂｒｏｗｎ ｆｏｘ ｊｕｍｐｓ ｏｖｅｒ ｔｈｅ ｌａｚｙ ｄｏｇ','𝐓𝐡𝐞 𝐪𝐮𝐢𝐜𝐤 𝐛𝐫𝐨𝐰𝐧 𝐟𝐨𝐱 𝐣𝐮𝐦𝐩𝐬 𝐨𝐯𝐞𝐫 𝐭𝐡𝐞 𝐥𝐚𝐳𝐲 𝐝𝐨𝐠','𝕿𝖍𝖊 𝖖𝖚𝖎𝖈𝖐 𝖇𝖗𝖔𝖜𝖓 𝖋𝖔𝖝 𝖏𝖚𝖒𝖕𝖘 𝖔𝖛𝖊𝖗 𝖙𝖍𝖊 𝖑𝖆𝖟𝖞 𝖉𝖔𝖌','𝑻𝒉𝒆 𝒒𝒖𝒊𝒄𝒌 𝒃𝒓𝒐𝒘𝒏 𝒇𝒐𝒙 𝒋𝒖𝒎𝒑𝒔 𝒐𝒗𝒆𝒓 𝒕𝒉𝒆 𝒍𝒂𝒛𝒚 𝒅𝒐𝒈','𝓣𝓱𝓮 𝓺𝓾𝓲𝓬𝓴 𝓫𝓻𝓸𝔀𝓷 𝓯𝓸𝔁 𝓳𝓾𝓶𝓹𝓼 𝓸𝓿𝓮𝓻 𝓽𝓱𝓮 𝓵𝓪𝔃𝔂 𝓭𝓸𝓰','𝕋𝕙𝕖 𝕢𝕦𝕚𝕔𝕜 𝕓𝕣𝕠𝕨𝕟 𝕗𝕠𝕩 𝕛𝕦𝕞𝕡𝕤 𝕠𝕧𝕖𝕣 𝕥𝕙𝕖 𝕝𝕒𝕫𝕪 𝕕𝕠𝕘','𝚃𝚑𝚎 𝚚𝚞𝚒𝚌𝚔 𝚋𝚛𝚘𝚠𝚗 𝚏𝚘𝚡 𝚓𝚞𝚖𝚙𝚜 𝚘𝚟𝚎𝚛 𝚝𝚑𝚎 𝚕𝚊𝚣𝚢 𝚍𝚘𝚐','⒯⒣⒠ ⒬⒰⒤⒞⒦ ⒝⒭⒪⒲⒩ ⒡⒪⒳ ⒥⒰⒨⒫⒮ ⒪⒱⒠⒭ ⒯⒣⒠ ⒧⒜⒵⒴ ⒟⒪⒢','<script>alert(123)</script>','&lt;script&gt;alert(&#39;123&#39;);&lt;/script&gt;','<img src=x onerror=alert(123) />','<svg><script>123<1>alert(123)</script>','"><script>alert(123)</script>','\'><script>alert(123)</script>','><script>alert(123)</script>','</script><script>alert(123)</script>','< / script >< script >alert(123)< / script >',' onfocus=JaVaSCript:alert(123) autofocus','" onfocus=JaVaSCript:alert(123) autofocus','\' onfocus=JaVaSCript:alert(123) autofocus','＜script＞alert(123)＜/script＞','<sc<script>ript>alert(123)</sc</script>ript>','--><script>alert(123)</script>','";alert(123);t="','\';alert(123);t=\'','JavaSCript:alert(123)',';alert(123);','src=JaVaSCript:prompt(132)','"><script>alert(123);</script x="','\'><script>alert(123);</script x=\'','><script>alert(123);</script x=','" autofocus onkeyup="javascript:alert(123)','\' autofocus onkeyup=\'javascript:alert(123)','<script\\x20type="text/javascript">javascript:alert(1);</script>','<script\\x3Etype="text/javascript">javascript:alert(1);</script>','<script\\x0Dtype="text/javascript">javascript:alert(1);</script>','<script\\x09type="text/javascript">javascript:alert(1);</script>','<script\\x0Ctype="text/javascript">javascript:alert(1);</script>','<script\\x2Ftype="text/javascript">javascript:alert(1);</script>','<script\\x0Atype="text/javascript">javascript:alert(1);</script>','\'`"><\\x3Cscript>javascript:alert(1)</script>','\'`"><\\x00script>javascript:alert(1)</script>','ABC<div style="x\\x3Aexpression(javascript:alert(1)">DEF','ABC<div style="x:expression\\x5C(javascript:alert(1)">DEF','ABC<div style="x:expression\\x00(javascript:alert(1)">DEF','ABC<div style="x:exp\\x00ression(javascript:alert(1)">DEF','ABC<div style="x:exp\\x5Cression(javascript:alert(1)">DEF','ABC<div style="x:\\x0Aexpression(javascript:alert(1)">DEF','ABC<div style="x:\\x09expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE3\\x80\\x80expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x84expression(javascript:alert(1)">DEF','ABC<div style="x:\\xC2\\xA0expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x80expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x8Aexpression(javascript:alert(1)">DEF','ABC<div style="x:\\x0Dexpression(javascript:alert(1)">DEF','ABC<div style="x:\\x0Cexpression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x87expression(javascript:alert(1)">DEF','ABC<div style="x:\\xEF\\xBB\\xBFexpression(javascript:alert(1)">DEF','ABC<div style="x:\\x20expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x88expression(javascript:alert(1)">DEF','ABC<div style="x:\\x00expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x8Bexpression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x86expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x85expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x82expression(javascript:alert(1)">DEF','ABC<div style="x:\\x0Bexpression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x81expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x83expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x89expression(javascript:alert(1)">DEF','<a href="\\x0Bjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x0Fjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xC2\\xA0javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x05javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE1\\xA0\\x8Ejavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x18javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x11javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x88javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x89javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x80javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x17javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x03javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x0Ejavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Ajavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x00javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x10javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x82javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x20javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x13javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x09javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x8Ajavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x14javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x19javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\xAFjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Fjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x81javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Djavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x87javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x07javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE1\\x9A\\x80javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x83javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x04javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x01javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x08javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x84javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x86javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE3\\x80\\x80javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x12javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x0Djavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x0Ajavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x0Cjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x15javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\xA8javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x16javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x02javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Bjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x06javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\xA9javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x85javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Ejavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x81\\x9Fjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Cjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="javascript\\x00:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="javascript\\x3A:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="javascript\\x09:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="javascript\\x0D:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="javascript\\x0A:javascript:alert(1)" id="fuzzelement1">test</a>','`"\'><img src=xxx:x \\x0Aonerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x22onerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x0Bonerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x0Donerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x2Fonerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x09onerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x0Conerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x00onerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x27onerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x20onerror=javascript:alert(1)>','"`\'><script>\\x3Bjavascript:alert(1)</script>','"`\'><script>\\x0Djavascript:alert(1)</script>','"`\'><script>\\xEF\\xBB\\xBFjavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x81javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x84javascript:alert(1)</script>','"`\'><script>\\xE3\\x80\\x80javascript:alert(1)</script>','"`\'><script>\\x09javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x89javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x85javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x88javascript:alert(1)</script>','"`\'><script>\\x00javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\xA8javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x8Ajavascript:alert(1)</script>','"`\'><script>\\xE1\\x9A\\x80javascript:alert(1)</script>','"`\'><script>\\x0Cjavascript:alert(1)</script>','"`\'><script>\\x2Bjavascript:alert(1)</script>','"`\'><script>\\xF0\\x90\\x96\\x9Ajavascript:alert(1)</script>','"`\'><script>-javascript:alert(1)</script>','"`\'><script>\\x0Ajavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\xAFjavascript:alert(1)</script>','"`\'><script>\\x7Ejavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x87javascript:alert(1)</script>','"`\'><script>\\xE2\\x81\\x9Fjavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\xA9javascript:alert(1)</script>','"`\'><script>\\xC2\\x85javascript:alert(1)</script>','"`\'><script>\\xEF\\xBF\\xAEjavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x83javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x8Bjavascript:alert(1)</script>','"`\'><script>\\xEF\\xBF\\xBEjavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x80javascript:alert(1)</script>','"`\'><script>\\x21javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x82javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x86javascript:alert(1)</script>','"`\'><script>\\xE1\\xA0\\x8Ejavascript:alert(1)</script>','"`\'><script>\\x0Bjavascript:alert(1)</script>','"`\'><script>\\x20javascript:alert(1)</script>','"`\'><script>\\xC2\\xA0javascript:alert(1)</script>','<img \\x00src=x onerror="alert(1)">','<img \\x47src=x onerror="javascript:alert(1)">','<img \\x11src=x onerror="javascript:alert(1)">','<img \\x12src=x onerror="javascript:alert(1)">','<img\\x47src=x onerror="javascript:alert(1)">','<img\\x10src=x onerror="javascript:alert(1)">','<img\\x13src=x onerror="javascript:alert(1)">','<img\\x32src=x onerror="javascript:alert(1)">','<img\\x11src=x onerror="javascript:alert(1)">','<img \\x34src=x onerror="javascript:alert(1)">','<img \\x39src=x onerror="javascript:alert(1)">','<img \\x00src=x onerror="javascript:alert(1)">','<img src\\x09=x onerror="javascript:alert(1)">','<img src\\x10=x onerror="javascript:alert(1)">','<img src\\x13=x onerror="javascript:alert(1)">','<img src\\x32=x onerror="javascript:alert(1)">','<img src\\x12=x onerror="javascript:alert(1)">','<img src\\x11=x onerror="javascript:alert(1)">','<img src\\x00=x onerror="javascript:alert(1)">','<img src\\x47=x onerror="javascript:alert(1)">','<img src=x\\x09onerror="javascript:alert(1)">','<img src=x\\x10onerror="javascript:alert(1)">','<img src=x\\x11onerror="javascript:alert(1)">','<img src=x\\x12onerror="javascript:alert(1)">','<img src=x\\x13onerror="javascript:alert(1)">','<img[a][b][c]src[d]=x[e]onerror=[f]"alert(1)">','<img src=x onerror=\\x09"javascript:alert(1)">','<img src=x onerror=\\x10"javascript:alert(1)">','<img src=x onerror=\\x11"javascript:alert(1)">','<img src=x onerror=\\x12"javascript:alert(1)">','<img src=x onerror=\\x32"javascript:alert(1)">','<img src=x onerror=\\x00"javascript:alert(1)">','<a href=java&#1&#2&#3&#4&#5&#6&#7&#8&#11&#12script:javascript:alert(1)>XXX</a>','<img src="x` `<script>javascript:alert(1)</script>"` `>','<img src onerror /" \'"= alt=javascript:alert(1)//">','<title onpropertychange=javascript:alert(1)></title><title title=>','<a href=http://foo.bar/#x=`y></a><img alt="`><img src=x:x onerror=javascript:alert(1)></a>">','<!--[if]><script>javascript:alert(1)</script -->','<!--[if<img src=x onerror=javascript:alert(1)//]> -->','<script src="/\\%(jscript)s"></script>','<script src="\\\\%(jscript)s"></script>','<IMG """><SCRIPT>alert("XSS")</SCRIPT>">','<IMG SRC=javascript:alert(String.fromCharCode(88,83,83))>','<IMG SRC=# onmouseover="alert(\'xxs\')">','<IMG SRC= onmouseover="alert(\'xxs\')">','<IMG onmouseover="alert(\'xxs\')">','<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>','<IMG SRC=&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058&#0000097&#0000108&#0000101&#0000114&#0000116&#0000040&#0000039&#0000088&#0000083&#0000083&#0000039&#0000041>','<IMG SRC=&#x6A&#x61&#x76&#x61&#x73&#x63&#x72&#x69&#x70&#x74&#x3A&#x61&#x6C&#x65&#x72&#x74&#x28&#x27&#x58&#x53&#x53&#x27&#x29>','<IMG SRC="jav   ascript:alert(\'XSS\');">','<IMG SRC="jav&#x09;ascript:alert(\'XSS\');">','<IMG SRC="jav&#x0A;ascript:alert(\'XSS\');">','<IMG SRC="jav&#x0D;ascript:alert(\'XSS\');">','perl -e \'print "<IMG SRC=java\\0script:alert(\\"XSS\\")>";\' > out','<IMG SRC=" &#14;  javascript:alert(\'XSS\');">','<SCRIPT/XSS SRC="http://ha.ckers.org/xss.js"></SCRIPT>','<BODY onload!#$%&()*~+-_.,:;?@[/|\\]^`=alert("XSS")>','<SCRIPT/SRC="http://ha.ckers.org/xss.js"></SCRIPT>','<<SCRIPT>alert("XSS");//<</SCRIPT>','<SCRIPT SRC=http://ha.ckers.org/xss.js?< B >','<SCRIPT SRC=//ha.ckers.org/.j>','<IMG SRC="javascript:alert(\'XSS\')"','<iframe src=http://ha.ckers.org/scriptlet.html <','\\";alert(\'XSS\');//','<u oncopy=alert()> Copy me</u>','<i onwheel=alert(1)> Scroll over me </i>','<plaintext>','http://a/%%30%30','</textarea><script>alert(123)</script>','1;DROP TABLE users','1\'; DROP TABLE users-- 1','\' OR 1=1 -- 1','\' OR \'1\'=\'1','\'; EXEC sp_MSForEachTable \'DROP TABLE ?\'; --',' ','%','_','--','--version','--help','$USER','/dev/null; touch /tmp/blns.fail ; echo','`touch /tmp/blns.fail`','$(touch /tmp/blns.fail)','@{[system "touch /tmp/blns.fail"]}','eval("puts \'hello world\'")','System("ls -al /")','`ls -al /`','Kernel.exec("ls -al /")','Kernel.exit(1)','%x(\'ls -al /\')','<?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE foo [ <!ELEMENT foo ANY ><!ENTITY xxe SYSTEM "file:///etc/passwd" >]><foo>&xxe;</foo>','$HOME','$ENV{\'HOME\'}','%d','%s%s%s%s%s','{0}','%*.*s','%@','%n','File:///','../../../../../../../../../../../etc/passwd%00','../../../../../../../../../../../etc/hosts','() { 0; }; touch /tmp/blns.shellshock1.fail;','() { _; } >_[$($())] { touch /tmp/blns.shellshock2.fail; }','<<< %s(un=\'%s\') = %u','+++ATH0','CON','PRN','AUX','CLOCK$','NUL','A:','ZZ:','COM1','LPT1','LPT2','LPT3','COM2','COM3','COM4','DCC SEND STARTKEYLOGGER 0 0 0','Scunthorpe General Hospital','Penistone Community Church','Lightwater Country Park','Jimmy Clitheroe','Horniman Museum','shitake mushrooms','RomansInSussex.co.uk','http://www.cum.qc.ca/','Craig Cockburn, Software Specialist','Linda Callahan','Dr. Herman I. Libshitz','magna cum laude','Super Bowl XXX','medieval erection of parapets','evaluate','mocha','expression','Arsenal canal','classic','Tyson Gay','Dick Van Dyke','basement','If you\'re reading this, you\'ve been in a coma for almost 20 years now. We\'re trying a new technique. We don\'t know where this message will end up in your dream, but we hope it works. Please wake up, we miss you.','Roses are \\u001b[0;31mred\\u001b[0m, violets are \\u001b[0;34mblue. Hope you enjoy terminal hue','But now...\\u001b[20Cfor my greatest trick...\\u001b[8m','The quic\b\b\b\b\b\bk brown fo\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007x... [Beeeep]','Powerلُلُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ冗','🏳0🌈️','జ్ఞ‌ా','گچپژ','{% print \'x\' * 64 * 1024**3 %}','{{ "".__class__.__mro__[2].__subclasses__()[40]("/etc/passwd").read() }}' FORMAT PrettyCompactNoEscapes;
+
+SELECT JSONExtract(
+    '{"x": [\n  "", \n  "undefined", \n  "undef", \n  "null", \n  "NULL", \n  "(null)", \n  "nil", \n  "NIL", \n  "true", \n  "false", \n  "True", \n  "False", \n  "TRUE", \n  "FALSE", \n  "None", \n  "hasOwnProperty", \n  "then", \n  "\\\\", \n  "\\\\\\\\", \n  "0", \n  "1", \n  "1.00", \n  "$1.00", \n  "1/2", \n  "1E2", \n  "1E02", \n  "1E+02", \n  "-1", \n  "-1.00", \n  "-$1.00", \n  "-1/2", \n  "-1E2", \n  "-1E02", \n  "-1E+02", \n  "1/0", \n  "0/0", \n  "-2147483648/-1", \n  "-9223372036854775808/-1", \n  "-0", \n  "-0.0", \n  "+0", \n  "+0.0", \n  "0.00", \n  "0..0", \n  ".", \n  "0.0.0", \n  "0,00", \n  "0,,0", \n  ",", \n  "0,0,0", \n  "0.0/0", \n  "1.0/0.0", \n  "0.0/0.0", \n  "1,0/0,0", \n  "0,0/0,0", \n  "--1", \n  "-", \n  "-.", \n  "-,", \n  "999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999", \n  "NaN", \n  "Infinity", \n  "-Infinity", \n  "INF", \n  "1#INF", \n  "-1#IND", \n  "1#QNAN", \n  "1#SNAN", \n  "1#IND", \n  "0x0", \n  "0xffffffff", \n  "0xffffffffffffffff", \n  "0xabad1dea", \n  "123456789012345678901234567890123456789", \n  "1,000.00", \n  "1 000.00", \n  "1\'000.00", \n  "1,000,000.00", \n  "1 000 000.00", \n  "1\'000\'000.00", \n  "1.000,00", \n  "1 000,00", \n  "1\'000,00", \n  "1.000.000,00", \n  "1 000 000,00", \n  "1\'000\'000,00", \n  "01000", \n  "08", \n  "09", \n  "2.2250738585072011e-308", \n  ",./;\'[]\\\\-=", \n  "<>?:\\"{}|_+", \n  "!@#$%^&*()`~", \n  "\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\\b\\u000e\\u000f\\u0010\\u0011\\u0012\\u0013\\u0014\\u0015\\u0016\\u0017\\u0018\\u0019\\u001a\\u001b\\u001c\\u001d\\u001e\\u001f", \n  "€‚ƒ„†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ", \n  "\\t\\u000b\\f …             ​

  　", \n  "­؀؁؂؃؄؅؜۝܏᠎​‌‍‎‏‪‫‬‭‮⁠⁡⁢⁣⁤⁦⁧⁨⁩𑂽𛲠𛲡𛲢𛲣𝅳𝅴𝅵𝅶𝅷𝅸𝅹𝅺󠀁󠀠󠀡󠀢󠀣󠀤󠀥󠀦󠀧󠀨󠀩󠀪󠀫󠀬󠀭󠀮󠀯󠀰󠀱󠀲󠀳󠀴󠀵󠀶󠀷󠀸󠀹󠀺󠀻󠀼󠀽󠀾󠀿󠁀󠁁󠁂󠁃󠁄󠁅󠁆󠁇󠁈󠁉󠁊󠁋󠁌󠁍󠁎󠁏󠁐󠁑󠁒󠁓󠁔󠁕󠁖󠁗󠁘󠁙󠁚󠁛󠁜󠁝󠁞󠁟󠁠󠁡󠁢󠁣󠁤󠁥󠁦󠁧󠁨󠁩󠁪󠁫󠁬󠁭󠁮󠁯󠁰󠁱󠁲󠁳󠁴󠁵󠁶󠁷󠁸󠁹󠁺󠁻󠁼󠁽󠁾󠁿", \n  "", \n  "￾", \n  "Ω≈ç√∫˜µ≤≥÷", \n  "åß∂ƒ©˙∆˚¬…æ", \n  "œ∑´®†¥¨ˆøπ“‘", \n  "¡™£¢∞§¶•ªº–≠", \n  "¸˛Ç◊ı˜Â¯˘¿", \n  "ÅÍÎÏ˝ÓÔÒÚÆ☃", \n  "Œ„´‰ˇÁ¨ˆØ∏”’", \n  "`⁄€‹›fifl‡°·‚—±", \n  "⅛⅜⅝⅞", \n  "ЁЂЃЄЅІЇЈЉЊЋЌЍЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя", \n  "٠١٢٣٤٥٦٧٨٩", \n  "⁰⁴⁵", \n  "₀₁₂", \n  "⁰⁴⁵₀₁₂", \n  "ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็ ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็ ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็", \n  "\'", \n  "\\"", \n  "\'\'", \n  "\\"\\"", \n  "\'\\"\'", \n  "\\"\'\'\'\'\\"\'\\"", \n  "\\"\'\\"\'\\"\'\'\'\'\\"", \n  "<foo val=“bar” />", \n  "<foo val=“bar” />", \n  "<foo val=”bar“ />", \n  "<foo val=`bar\' />", \n  "田中さんにあげて下さい", \n  "パーティーへ行かないか", \n  "和製漢語", \n  "部落格", \n  "사회과학원 어학연구소", \n  "찦차를 타고 온 펲시맨과 쑛다리 똠방각하", \n  "社會科學院語學研究所", \n  "울란바토르", \n  "𠜎𠜱𠝹𠱓𠱸𠲖𠳏", \n  "𐐜 𐐔𐐇𐐝𐐀𐐡𐐇𐐓 𐐙𐐊𐐡𐐝𐐓/𐐝𐐇𐐗𐐊𐐤𐐔 𐐒𐐋𐐗 𐐒𐐌 𐐜 𐐡𐐀𐐖𐐇𐐤𐐓𐐝 𐐱𐑂 𐑄 𐐔𐐇𐐝𐐀𐐡𐐇𐐓 𐐏𐐆𐐅𐐤𐐆𐐚𐐊𐐡𐐝𐐆𐐓𐐆",\n  "表ポあA鷗ŒéＢ逍Üߪąñ丂㐀𠀀", \n  "Ⱥ", \n  "Ⱦ", \n  "ヽ༼ຈل͜ຈ༽ﾉ ヽ༼ຈل͜ຈ༽ﾉ", \n  "(｡◕ ∀ ◕｡)", \n  "｀ｨ(´∀｀∩", \n  "__ﾛ(,_,*)", \n  "・(￣∀￣)・:*:", \n  "ﾟ･✿ヾ╲(｡◕‿◕｡)╱✿･ﾟ", \n  ",。・:*:・゜’( ☻ ω ☻ )。・:*:・゜’", \n  "(╯°□°）╯︵ ┻━┻)", \n  "(ﾉಥ益ಥ）ﾉ ┻━┻", \n  "┬─┬ノ( º _ ºノ)", \n  "( ͡° ͜ʖ ͡°)", \n  "¯\\\\_(ツ)_/¯", \n  "😍", \n  "👩🏽", \n  "👨‍🦰 👨🏿‍🦰 👨‍🦱 👨🏿‍🦱 🦹🏿‍♂️", \n  "👾 🙇 💁 🙅 🙆 🙋 🙎 🙍", \n  "🐵 🙈 🙉 🙊", \n  "❤️ 💔 💌 💕 💞 💓 💗 💖 💘 💝 💟 💜 💛 💚 💙", \n  "✋🏿 💪🏿 👐🏿 🙌🏿 👏🏿 🙏🏿", \n  "👨‍👩‍👦 👨‍👩‍👧‍👦 👨‍👨‍👦 👩‍👩‍👧 👨‍👦 👨‍👧‍👦 👩‍👦 👩‍👧‍👦", \n  "🚾 🆒 🆓 🆕 🆖 🆗 🆙 🏧", \n  "0️⃣ 1️⃣ 2️⃣ 3️⃣ 4️⃣ 5️⃣ 6️⃣ 7️⃣ 8️⃣ 9️⃣ 🔟", \n  "🇺🇸🇷🇺🇸 🇦🇫🇦🇲🇸", \n  "🇺🇸🇷🇺🇸🇦🇫🇦🇲", \n  "🇺🇸🇷🇺🇸🇦", \n  "１２３", \n  "١٢٣", \n  "ثم نفس سقطت وبالتحديد،, جزيرتي باستخدام أن دنو. إذ هنا؟ الستار وتنصيب كان. أهّل ايطاليا، بريطانيا-فرنسا قد أخذ. سليمان، إتفاقية بين ما, يذكر الحدود أي بعد, معاملة بولندا، الإطلاق عل إيو.", \n  "בְּרֵאשִׁית, בָּרָא אֱלֹהִים, אֵת הַשָּׁמַיִם, וְאֵת הָאָרֶץ", \n  "הָיְתָהtestالصفحات التّحول", \n  "﷽", \n  "ﷺ",\n  "مُنَاقَشَةُ سُبُلِ اِسْتِخْدَامِ اللُّغَةِ فِي النُّظُمِ الْقَائِمَةِ وَفِيم يَخُصَّ التَّطْبِيقَاتُ الْحاسُوبِيَّةُ، ", \n  "᚛ᚄᚓᚐᚋᚒᚄ ᚑᚄᚂᚑᚏᚅ᚜‪‪‪", \n  "‪‪᚛                 ᚜‪",\n  "‪‪test‪", \n  "‫test‫", \n  "
test
", \n  "test⁠test‫", \n  "⁦test⁧", \n  "Ṱ̺̺̕o͞ ̷i̲̬͇̪͙n̝̗͕v̟̜̘̦͟o̶̙̰̠kè͚̮̺̪̹̱̤ ̖t̝͕̳̣̻̪͞h̼͓̲̦̳̘̲e͇̣̰̦̬͎ ̢̼̻̱̘h͚͎͙̜̣̲ͅi̦̲̣̰̤v̻͍e̺̭̳̪̰-m̢iͅn̖̺̞̲̯̰d̵̼̟͙̩̼̘̳ ̞̥̱̳̭r̛̗̘e͙p͠r̼̞̻̭̗e̺̠̣͟s̘͇̳͍̝͉e͉̥̯̞̲͚̬͜ǹ̬͎͎̟̖͇̤t͍̬̤͓̼̭͘ͅi̪̱n͠g̴͉ ͏͉ͅc̬̟h͡a̫̻̯͘o̫̟̖͍̙̝͉s̗̦̲.̨̹͈̣", \n  "̡͓̞ͅI̗̘̦͝n͇͇͙v̮̫ok̲̫̙͈i̖͙̭̹̠̞n̡̻̮̣̺g̲͈͙̭͙̬͎ ̰t͔̦h̞̲e̢̤ ͍̬̲͖f̴̘͕̣è͖ẹ̥̩l͖͔͚i͓͚̦͠n͖͍̗͓̳̮g͍ ̨o͚̪͡f̘̣̬ ̖̘͖̟͙̮c҉͔̫͖͓͇͖ͅh̵̤̣͚͔á̗̼͕ͅo̼̣̥s̱͈̺̖̦̻͢.̛̖̞̠̫̰", \n  "̗̺͖̹̯͓Ṯ̤͍̥͇͈h̲́e͏͓̼̗̙̼̣͔ ͇̜̱̠͓͍ͅN͕͠e̗̱z̘̝̜̺͙p̤̺̹͍̯͚e̠̻̠͜r̨̤͍̺̖͔̖̖d̠̟̭̬̝͟i̦͖̩͓͔̤a̠̗̬͉̙n͚͜ ̻̞̰͚ͅh̵͉i̳̞v̢͇ḙ͎͟-҉̭̩̼͔m̤̭̫i͕͇̝̦n̗͙ḍ̟ ̯̲͕͞ǫ̟̯̰̲͙̻̝f ̪̰̰̗̖̭̘͘c̦͍̲̞͍̩̙ḥ͚a̮͎̟̙͜ơ̩̹͎s̤.̝̝ ҉Z̡̖̜͖̰̣͉̜a͖̰͙̬͡l̲̫̳͍̩g̡̟̼̱͚̞̬ͅo̗͜.̟", \n  "̦H̬̤̗̤͝e͜ ̜̥̝̻͍̟́w̕h̖̯͓o̝͙̖͎̱̮ ҉̺̙̞̟͈W̷̼̭a̺̪͍į͈͕̭͙̯̜t̶̼̮s̘͙͖̕ ̠̫̠B̻͍͙͉̳ͅe̵h̵̬͇̫͙i̹͓̳̳̮͎̫̕n͟d̴̪̜̖ ̰͉̩͇͙̲͞ͅT͖̼͓̪͢h͏͓̮̻e̬̝̟ͅ ̤̹̝W͙̞̝͔͇͝ͅa͏͓͔̹̼̣l̴͔̰̤̟͔ḽ̫.͕", \n  "Z̮̞̠͙͔ͅḀ̗̞͈̻̗Ḷ͙͎̯̹̞͓G̻O̭̗̮", \n  "˙ɐnbᴉlɐ ɐuƃɐɯ ǝɹolop ʇǝ ǝɹoqɐl ʇn ʇunpᴉpᴉɔuᴉ ɹodɯǝʇ poɯsnᴉǝ op pǝs \'ʇᴉlǝ ƃuᴉɔsᴉdᴉpɐ ɹnʇǝʇɔǝsuoɔ \'ʇǝɯɐ ʇᴉs ɹolop ɯnsdᴉ ɯǝɹo˥", \n  "00˙Ɩ$-", \n  "Ｔｈｅ ｑｕｉｃｋ ｂｒｏｗｎ ｆｏｘ ｊｕｍｐｓ ｏｖｅｒ ｔｈｅ ｌａｚｙ ｄｏｇ", \n  "𝐓𝐡𝐞 𝐪𝐮𝐢𝐜𝐤 𝐛𝐫𝐨𝐰𝐧 𝐟𝐨𝐱 𝐣𝐮𝐦𝐩𝐬 𝐨𝐯𝐞𝐫 𝐭𝐡𝐞 𝐥𝐚𝐳𝐲 𝐝𝐨𝐠", \n  "𝕿𝖍𝖊 𝖖𝖚𝖎𝖈𝖐 𝖇𝖗𝖔𝖜𝖓 𝖋𝖔𝖝 𝖏𝖚𝖒𝖕𝖘 𝖔𝖛𝖊𝖗 𝖙𝖍𝖊 𝖑𝖆𝖟𝖞 𝖉𝖔𝖌", \n  "𝑻𝒉𝒆 𝒒𝒖𝒊𝒄𝒌 𝒃𝒓𝒐𝒘𝒏 𝒇𝒐𝒙 𝒋𝒖𝒎𝒑𝒔 𝒐𝒗𝒆𝒓 𝒕𝒉𝒆 𝒍𝒂𝒛𝒚 𝒅𝒐𝒈", \n  "𝓣𝓱𝓮 𝓺𝓾𝓲𝓬𝓴 𝓫𝓻𝓸𝔀𝓷 𝓯𝓸𝔁 𝓳𝓾𝓶𝓹𝓼 𝓸𝓿𝓮𝓻 𝓽𝓱𝓮 𝓵𝓪𝔃𝔂 𝓭𝓸𝓰", \n  "𝕋𝕙𝕖 𝕢𝕦𝕚𝕔𝕜 𝕓𝕣𝕠𝕨𝕟 𝕗𝕠𝕩 𝕛𝕦𝕞𝕡𝕤 𝕠𝕧𝕖𝕣 𝕥𝕙𝕖 𝕝𝕒𝕫𝕪 𝕕𝕠𝕘", \n  "𝚃𝚑𝚎 𝚚𝚞𝚒𝚌𝚔 𝚋𝚛𝚘𝚠𝚗 𝚏𝚘𝚡 𝚓𝚞𝚖𝚙𝚜 𝚘𝚟𝚎𝚛 𝚝𝚑𝚎 𝚕𝚊𝚣𝚢 𝚍𝚘𝚐", \n  "⒯⒣⒠ ⒬⒰⒤⒞⒦ ⒝⒭⒪⒲⒩ ⒡⒪⒳ ⒥⒰⒨⒫⒮ ⒪⒱⒠⒭ ⒯⒣⒠ ⒧⒜⒵⒴ ⒟⒪⒢", \n  "<script>alert(123)</script>", \n  "&lt;script&gt;alert(&#39;123&#39;);&lt;/script&gt;", \n  "<img src=x onerror=alert(123) />", \n  "<svg><script>123<1>alert(123)</script>", \n  "\\"><script>alert(123)</script>", \n  "\'><script>alert(123)</script>", \n  "><script>alert(123)</script>", \n  "</script><script>alert(123)</script>", \n  "< / script >< script >alert(123)< / script >", \n  " onfocus=JaVaSCript:alert(123) autofocus", \n  "\\" onfocus=JaVaSCript:alert(123) autofocus", \n  "\' onfocus=JaVaSCript:alert(123) autofocus", \n  "＜script＞alert(123)＜/script＞", \n  "<sc<script>ript>alert(123)</sc</script>ript>", \n  "--><script>alert(123)</script>", \n  "\\";alert(123);t=\\"", \n  "\';alert(123);t=\'", \n  "JavaSCript:alert(123)", \n  ";alert(123);", \n  "src=JaVaSCript:prompt(132)", \n  "\\"><script>alert(123);</script x=\\"", \n  "\'><script>alert(123);</script x=\'", \n  "><script>alert(123);</script x=", \n  "\\" autofocus onkeyup=\\"javascript:alert(123)", \n  "\' autofocus onkeyup=\'javascript:alert(123)", \n  "<script\\\\x20type=\\"text/javascript\\">javascript:alert(1);</script>", \n  "<script\\\\x3Etype=\\"text/javascript\\">javascript:alert(1);</script>", \n  "<script\\\\x0Dtype=\\"text/javascript\\">javascript:alert(1);</script>", \n  "<script\\\\x09type=\\"text/javascript\\">javascript:alert(1);</script>", \n  "<script\\\\x0Ctype=\\"text/javascript\\">javascript:alert(1);</script>", \n  "<script\\\\x2Ftype=\\"text/javascript\\">javascript:alert(1);</script>", \n  "<script\\\\x0Atype=\\"text/javascript\\">javascript:alert(1);</script>", \n  "\'`\\"><\\\\x3Cscript>javascript:alert(1)</script>", \n  "\'`\\"><\\\\x00script>javascript:alert(1)</script>", \n  "ABC<div style=\\"x\\\\x3Aexpression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:expression\\\\x5C(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:expression\\\\x00(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:exp\\\\x00ression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:exp\\\\x5Cression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:\\\\x0Aexpression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:\\\\x09expression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:\\\\xE3\\\\x80\\\\x80expression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:\\\\xE2\\\\x80\\\\x84expression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:\\\\xC2\\\\xA0expression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:\\\\xE2\\\\x80\\\\x80expression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:\\\\xE2\\\\x80\\\\x8Aexpression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:\\\\x0Dexpression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:\\\\x0Cexpression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:\\\\xE2\\\\x80\\\\x87expression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:\\\\xEF\\\\xBB\\\\xBFexpression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:\\\\x20expression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:\\\\xE2\\\\x80\\\\x88expression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:\\\\x00expression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:\\\\xE2\\\\x80\\\\x8Bexpression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:\\\\xE2\\\\x80\\\\x86expression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:\\\\xE2\\\\x80\\\\x85expression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:\\\\xE2\\\\x80\\\\x82expression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:\\\\x0Bexpression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:\\\\xE2\\\\x80\\\\x81expression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:\\\\xE2\\\\x80\\\\x83expression(javascript:alert(1)\\">DEF", \n  "ABC<div style=\\"x:\\\\xE2\\\\x80\\\\x89expression(javascript:alert(1)\\">DEF", \n  "<a href=\\"\\\\x0Bjavascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x0Fjavascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\xC2\\\\xA0javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x05javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\xE1\\\\xA0\\\\x8Ejavascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x18javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x11javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\xE2\\\\x80\\\\x88javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\xE2\\\\x80\\\\x89javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\xE2\\\\x80\\\\x80javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x17javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x03javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x0Ejavascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x1Ajavascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x00javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x10javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\xE2\\\\x80\\\\x82javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x20javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x13javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x09javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\xE2\\\\x80\\\\x8Ajavascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x14javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x19javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\xE2\\\\x80\\\\xAFjavascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x1Fjavascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\xE2\\\\x80\\\\x81javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x1Djavascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\xE2\\\\x80\\\\x87javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x07javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\xE1\\\\x9A\\\\x80javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\xE2\\\\x80\\\\x83javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x04javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x01javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x08javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\xE2\\\\x80\\\\x84javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\xE2\\\\x80\\\\x86javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\xE3\\\\x80\\\\x80javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x12javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x0Djavascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x0Ajavascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x0Cjavascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x15javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\xE2\\\\x80\\\\xA8javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x16javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x02javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x1Bjavascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x06javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\xE2\\\\x80\\\\xA9javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\xE2\\\\x80\\\\x85javascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x1Ejavascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\xE2\\\\x81\\\\x9Fjavascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"\\\\x1Cjavascript:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"javascript\\\\x00:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"javascript\\\\x3A:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"javascript\\\\x09:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"javascript\\\\x0D:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "<a href=\\"javascript\\\\x0A:javascript:alert(1)\\" id=\\"fuzzelement1\\">test</a>", \n  "`\\"\'><img src=xxx:x \\\\x0Aonerror=javascript:alert(1)>", \n  "`\\"\'><img src=xxx:x \\\\x22onerror=javascript:alert(1)>", \n  "`\\"\'><img src=xxx:x \\\\x0Bonerror=javascript:alert(1)>", \n  "`\\"\'><img src=xxx:x \\\\x0Donerror=javascript:alert(1)>", \n  "`\\"\'><img src=xxx:x \\\\x2Fonerror=javascript:alert(1)>", \n  "`\\"\'><img src=xxx:x \\\\x09onerror=javascript:alert(1)>", \n  "`\\"\'><img src=xxx:x \\\\x0Conerror=javascript:alert(1)>", \n  "`\\"\'><img src=xxx:x \\\\x00onerror=javascript:alert(1)>", \n  "`\\"\'><img src=xxx:x \\\\x27onerror=javascript:alert(1)>", \n  "`\\"\'><img src=xxx:x \\\\x20onerror=javascript:alert(1)>", \n  "\\"`\'><script>\\\\x3Bjavascript:alert(1)</script>", \n  "\\"`\'><script>\\\\x0Djavascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xEF\\\\xBB\\\\xBFjavascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xE2\\\\x80\\\\x81javascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xE2\\\\x80\\\\x84javascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xE3\\\\x80\\\\x80javascript:alert(1)</script>", \n  "\\"`\'><script>\\\\x09javascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xE2\\\\x80\\\\x89javascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xE2\\\\x80\\\\x85javascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xE2\\\\x80\\\\x88javascript:alert(1)</script>", \n  "\\"`\'><script>\\\\x00javascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xE2\\\\x80\\\\xA8javascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xE2\\\\x80\\\\x8Ajavascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xE1\\\\x9A\\\\x80javascript:alert(1)</script>", \n  "\\"`\'><script>\\\\x0Cjavascript:alert(1)</script>", \n  "\\"`\'><script>\\\\x2Bjavascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xF0\\\\x90\\\\x96\\\\x9Ajavascript:alert(1)</script>", \n  "\\"`\'><script>-javascript:alert(1)</script>", \n  "\\"`\'><script>\\\\x0Ajavascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xE2\\\\x80\\\\xAFjavascript:alert(1)</script>", \n  "\\"`\'><script>\\\\x7Ejavascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xE2\\\\x80\\\\x87javascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xE2\\\\x81\\\\x9Fjavascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xE2\\\\x80\\\\xA9javascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xC2\\\\x85javascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xEF\\\\xBF\\\\xAEjavascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xE2\\\\x80\\\\x83javascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xE2\\\\x80\\\\x8Bjavascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xEF\\\\xBF\\\\xBEjavascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xE2\\\\x80\\\\x80javascript:alert(1)</script>", \n  "\\"`\'><script>\\\\x21javascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xE2\\\\x80\\\\x82javascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xE2\\\\x80\\\\x86javascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xE1\\\\xA0\\\\x8Ejavascript:alert(1)</script>", \n  "\\"`\'><script>\\\\x0Bjavascript:alert(1)</script>", \n  "\\"`\'><script>\\\\x20javascript:alert(1)</script>", \n  "\\"`\'><script>\\\\xC2\\\\xA0javascript:alert(1)</script>", \n  "<img \\\\x00src=x onerror=\\"alert(1)\\">", \n  "<img \\\\x47src=x onerror=\\"javascript:alert(1)\\">", \n  "<img \\\\x11src=x onerror=\\"javascript:alert(1)\\">", \n  "<img \\\\x12src=x onerror=\\"javascript:alert(1)\\">", \n  "<img\\\\x47src=x onerror=\\"javascript:alert(1)\\">", \n  "<img\\\\x10src=x onerror=\\"javascript:alert(1)\\">", \n  "<img\\\\x13src=x onerror=\\"javascript:alert(1)\\">", \n  "<img\\\\x32src=x onerror=\\"javascript:alert(1)\\">", \n  "<img\\\\x47src=x onerror=\\"javascript:alert(1)\\">", \n  "<img\\\\x11src=x onerror=\\"javascript:alert(1)\\">", \n  "<img \\\\x47src=x onerror=\\"javascript:alert(1)\\">", \n  "<img \\\\x34src=x onerror=\\"javascript:alert(1)\\">", \n  "<img \\\\x39src=x onerror=\\"javascript:alert(1)\\">", \n  "<img \\\\x00src=x onerror=\\"javascript:alert(1)\\">", \n  "<img src\\\\x09=x onerror=\\"javascript:alert(1)\\">", \n  "<img src\\\\x10=x onerror=\\"javascript:alert(1)\\">", \n  "<img src\\\\x13=x onerror=\\"javascript:alert(1)\\">", \n  "<img src\\\\x32=x onerror=\\"javascript:alert(1)\\">", \n  "<img src\\\\x12=x onerror=\\"javascript:alert(1)\\">", \n  "<img src\\\\x11=x onerror=\\"javascript:alert(1)\\">", \n  "<img src\\\\x00=x onerror=\\"javascript:alert(1)\\">", \n  "<img src\\\\x47=x onerror=\\"javascript:alert(1)\\">", \n  "<img src=x\\\\x09onerror=\\"javascript:alert(1)\\">", \n  "<img src=x\\\\x10onerror=\\"javascript:alert(1)\\">", \n  "<img src=x\\\\x11onerror=\\"javascript:alert(1)\\">", \n  "<img src=x\\\\x12onerror=\\"javascript:alert(1)\\">", \n  "<img src=x\\\\x13onerror=\\"javascript:alert(1)\\">", \n  "<img[a][b][c]src[d]=x[e]onerror=[f]\\"alert(1)\\">", \n  "<img src=x onerror=\\\\x09\\"javascript:alert(1)\\">", \n  "<img src=x onerror=\\\\x10\\"javascript:alert(1)\\">", \n  "<img src=x onerror=\\\\x11\\"javascript:alert(1)\\">", \n  "<img src=x onerror=\\\\x12\\"javascript:alert(1)\\">", \n  "<img src=x onerror=\\\\x32\\"javascript:alert(1)\\">", \n  "<img src=x onerror=\\\\x00\\"javascript:alert(1)\\">", \n  "<a href=java&#1&#2&#3&#4&#5&#6&#7&#8&#11&#12script:javascript:alert(1)>XXX</a>", \n  "<img src=\\"x` `<script>javascript:alert(1)</script>\\"` `>", \n  "<img src onerror /\\" \'\\"= alt=javascript:alert(1)//\\">", \n  "<title onpropertychange=javascript:alert(1)></title><title title=>", \n  "<a href=http://foo.bar/#x=`y></a><img alt=\\"`><img src=x:x onerror=javascript:alert(1)></a>\\">", \n  "<!--[if]><script>javascript:alert(1)</script -->", \n  "<!--[if<img src=x onerror=javascript:alert(1)//]> -->", \n  "<script src=\\"/\\\\%(jscript)s\\"></script>", \n  "<script src=\\"\\\\\\\\%(jscript)s\\"></script>", \n  "<IMG \\"\\"\\"><SCRIPT>alert(\\"XSS\\")</SCRIPT>\\">", \n  "<IMG SRC=javascript:alert(String.fromCharCode(88,83,83))>", \n  "<IMG SRC=# onmouseover=\\"alert(\'xxs\')\\">", \n  "<IMG SRC= onmouseover=\\"alert(\'xxs\')\\">", \n  "<IMG onmouseover=\\"alert(\'xxs\')\\">", \n  "<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>", \n  "<IMG SRC=&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058&#0000097&#0000108&#0000101&#0000114&#0000116&#0000040&#0000039&#0000088&#0000083&#0000083&#0000039&#0000041>", \n  "<IMG SRC=&#x6A&#x61&#x76&#x61&#x73&#x63&#x72&#x69&#x70&#x74&#x3A&#x61&#x6C&#x65&#x72&#x74&#x28&#x27&#x58&#x53&#x53&#x27&#x29>", \n  "<IMG SRC=\\"jav   ascript:alert(\'XSS\');\\">", \n  "<IMG SRC=\\"jav&#x09;ascript:alert(\'XSS\');\\">", \n  "<IMG SRC=\\"jav&#x0A;ascript:alert(\'XSS\');\\">", \n  "<IMG SRC=\\"jav&#x0D;ascript:alert(\'XSS\');\\">", \n  "perl -e \'print \\"<IMG SRC=java\\\\0script:alert(\\\\\\"XSS\\\\\\")>\\";\' > out", \n  "<IMG SRC=\\" &#14;  javascript:alert(\'XSS\');\\">", \n  "<SCRIPT/XSS SRC=\\"http://ha.ckers.org/xss.js\\"></SCRIPT>", \n  "<BODY onload!#$%&()*~+-_.,:;?@[/|\\\\]^`=alert(\\"XSS\\")>", \n  "<SCRIPT/SRC=\\"http://ha.ckers.org/xss.js\\"></SCRIPT>", \n  "<<SCRIPT>alert(\\"XSS\\");//<</SCRIPT>", \n  "<SCRIPT SRC=http://ha.ckers.org/xss.js?< B >", \n  "<SCRIPT SRC=//ha.ckers.org/.j>", \n  "<IMG SRC=\\"javascript:alert(\'XSS\')\\"", \n  "<iframe src=http://ha.ckers.org/scriptlet.html <", \n  "\\\\\\";alert(\'XSS\');//", \n  "<u oncopy=alert()> Copy me</u>", \n  "<i onwheel=alert(1)> Scroll over me </i>", \n  "<plaintext>", \n  "http://a/%%30%30", \n  "</textarea><script>alert(123)</script>", \n  "1;DROP TABLE users", \n  "1\'; DROP TABLE users-- 1", \n  "\' OR 1=1 -- 1", \n  "\' OR \'1\'=\'1", \n  "\'; EXEC sp_MSForEachTable \'DROP TABLE ?\'; --",\n  " ", \n  "%", \n  "_", \n  "-", \n  "--", \n  "--version", \n  "--help", \n  "$USER", \n  "/dev/null; touch /tmp/blns.fail ; echo", \n  "`touch /tmp/blns.fail`", \n  "$(touch /tmp/blns.fail)", \n  "@{[system \\"touch /tmp/blns.fail\\"]}", \n  "eval(\\"puts \'hello world\'\\")", \n  "System(\\"ls -al /\\")", \n  "`ls -al /`", \n  "Kernel.exec(\\"ls -al /\\")", \n  "Kernel.exit(1)", \n  "%x(\'ls -al /\')", \n  "<?xml version=\\"1.0\\" encoding=\\"ISO-8859-1\\"?><!DOCTYPE foo [ <!ELEMENT foo ANY ><!ENTITY xxe SYSTEM \\"file:///etc/passwd\\" >]><foo>&xxe;</foo>", \n  "$HOME", \n  "$ENV{\'HOME\'}", \n  "%d", \n  "%s%s%s%s%s", \n  "{0}", \n  "%*.*s", \n  "%@", \n  "%n", \n  "File:///", \n  "../../../../../../../../../../../etc/passwd%00", \n  "../../../../../../../../../../../etc/hosts", \n  "() { 0; }; touch /tmp/blns.shellshock1.fail;", \n  "() { _; } >_[$($())] { touch /tmp/blns.shellshock2.fail; }", \n  "<<< %s(un=\'%s\') = %u", \n  "+++ATH0", \n  "CON", \n  "PRN", \n  "AUX", \n  "CLOCK$", \n  "NUL", \n  "A:", \n  "ZZ:", \n  "COM1", \n  "LPT1", \n  "LPT2", \n  "LPT3", \n  "COM2", \n  "COM3", \n  "COM4", \n  "DCC SEND STARTKEYLOGGER 0 0 0", \n  "Scunthorpe General Hospital", \n  "Penistone Community Church", \n  "Lightwater Country Park", \n  "Jimmy Clitheroe", \n  "Horniman Museum", \n  "shitake mushrooms", \n  "RomansInSussex.co.uk", \n  "http://www.cum.qc.ca/", \n  "Craig Cockburn, Software Specialist", \n  "Linda Callahan", \n  "Dr. Herman I. Libshitz", \n  "magna cum laude", \n  "Super Bowl XXX", \n  "medieval erection of parapets", \n  "evaluate", \n  "mocha", \n  "expression", \n  "Arsenal canal", \n  "classic", \n  "Tyson Gay", \n  "Dick Van Dyke", \n  "basement", \n  "If you\'re reading this, you\'ve been in a coma for almost 20 years now. We\'re trying a new technique. We don\'t know where this message will end up in your dream, but we hope it works. Please wake up, we miss you.", \n  "Roses are \\u001b[0;31mred\\u001b[0m, violets are \\u001b[0;34mblue. Hope you enjoy terminal hue", \n  "But now...\\u001b[20Cfor my greatest trick...\\u001b[8m", \n  "The quic\\b\\b\\b\\b\\b\\bk brown fo\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007\\u0007x... [Beeeep]", \n  "Powerلُلُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ冗", \n  "🏳0🌈️",\n  "జ్ఞ‌ా",\n  "گچپژ",\n  "{% print \'x\' * 64 * 1024**3 %}",\n  "{{ \\"\\".__class__.__mro__[2].__subclasses__()[40](\\"/etc/passwd\\").read() }}"\n]\n}',
+    'x',
+    'Array(String)') FORMAT Values;
+
+SELECT '','undefined','undef','null','NULL','(null)','nil','NIL','true','false','True','False','TRUE','FALSE','None','hasOwnProperty','then','\\','\\\\','0','1','1.00','$1.00','1/2','1E2','1E02','1E+02','-1','-1.00','-$1.00','-1/2','-1E2','-1E02','-1E+02','1/0','0/0','-2147483648/-1','-9223372036854775808/-1','-0','-0.0','+0','+0.0','0.00','0..0','.','0.0.0','0,00','0,,0',',','0,0,0','0.0/0','1.0/0.0','0.0/0.0','1,0/0,0','0,0/0,0','--1','-','-.','-,','999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999','NaN','Infinity','-Infinity','INF','1#INF','-1#IND','1#QNAN','1#SNAN','1#IND','0x0','0xffffffff','0xffffffffffffffff','0xabad1dea','123456789012345678901234567890123456789','1,000.00','1 000.00','1\'000.00','1,000,000.00','1 000 000.00','1\'000\'000.00','1.000,00','1 000,00','1\'000,00','1.000.000,00','1 000 000,00','1\'000\'000,00','01000','08','09','2.2250738585072011e-308',',./;\'[]\\-=','<>?:"{}|_+','!@#$%^&*()`~','
\b','€‚ƒ„†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ','\t\f …             ​

  　','­؀؁؂؃؄؅؜۝܏᠎​‌‍‎‏‪‫‬‭‮⁠⁡⁢⁣⁤⁦⁧⁨⁩𑂽𛲠𛲡𛲢𛲣𝅳𝅴𝅵𝅶𝅷𝅸𝅹𝅺󠀁󠀠󠀡󠀢󠀣󠀤󠀥󠀦󠀧󠀨󠀩󠀪󠀫󠀬󠀭󠀮󠀯󠀰󠀱󠀲󠀳󠀴󠀵󠀶󠀷󠀸󠀹󠀺󠀻󠀼󠀽󠀾󠀿󠁀󠁁󠁂󠁃󠁄󠁅󠁆󠁇󠁈󠁉󠁊󠁋󠁌󠁍󠁎󠁏󠁐󠁑󠁒󠁓󠁔󠁕󠁖󠁗󠁘󠁙󠁚󠁛󠁜󠁝󠁞󠁟󠁠󠁡󠁢󠁣󠁤󠁥󠁦󠁧󠁨󠁩󠁪󠁫󠁬󠁭󠁮󠁯󠁰󠁱󠁲󠁳󠁴󠁵󠁶󠁷󠁸󠁹󠁺󠁻󠁼󠁽󠁾󠁿','','￾','Ω≈ç√∫˜µ≤≥÷','åß∂ƒ©˙∆˚¬…æ','œ∑´®†¥¨ˆøπ“‘','¡™£¢∞§¶•ªº–≠','¸˛Ç◊ı˜Â¯˘¿','ÅÍÎÏ˝ÓÔÒÚÆ☃','Œ„´‰ˇÁ¨ˆØ∏”’','`⁄€‹›fifl‡°·‚—±','⅛⅜⅝⅞','ЁЂЃЄЅІЇЈЉЊЋЌЍЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя','٠١٢٣٤٥٦٧٨٩','⁰⁴⁵','₀₁₂','⁰⁴⁵₀₁₂','ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็ ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็ ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็','\'','"','\'\'','""','\'"\'','"\'\'\'\'"\'"','"\'"\'"\'\'\'\'"','<foo val=“bar” />','<foo val=“bar” />','<foo val=”bar“ />','<foo val=`bar\' />','田中さんにあげて下さい','パーティーへ行かないか','和製漢語','部落格','사회과학원 어학연구소','찦차를 타고 온 펲시맨과 쑛다리 똠방각하','社會科學院語學研究所','울란바토르','𠜎𠜱𠝹𠱓𠱸𠲖𠳏','𐐜 𐐔𐐇𐐝𐐀𐐡𐐇𐐓 𐐙𐐊𐐡𐐝𐐓/𐐝𐐇𐐗𐐊𐐤𐐔 𐐒𐐋𐐗 𐐒𐐌 𐐜 𐐡𐐀𐐖𐐇𐐤𐐓𐐝 𐐱𐑂 𐑄 𐐔𐐇𐐝𐐀𐐡𐐇𐐓 𐐏𐐆𐐅𐐤𐐆𐐚𐐊𐐡𐐝𐐆𐐓𐐆','表ポあA鷗ŒéＢ逍Üߪąñ丂㐀𠀀','Ⱥ','Ⱦ','ヽ༼ຈل͜ຈ༽ﾉ ヽ༼ຈل͜ຈ༽ﾉ','(｡◕ ∀ ◕｡)','｀ｨ(´∀｀∩','__ﾛ(,_,*)','・(￣∀￣)・:*:','ﾟ･✿ヾ╲(｡◕‿◕｡)╱✿･ﾟ',',。・:*:・゜’( ☻ ω ☻ )。・:*:・゜’','(╯°□°）╯︵ ┻━┻)','(ﾉಥ益ಥ）ﾉ ┻━┻','┬─┬ノ( º _ ºノ)','( ͡° ͜ʖ ͡°)','¯\\_(ツ)_/¯','😍','👩🏽','👨‍🦰 👨🏿‍🦰 👨‍🦱 👨🏿‍🦱 🦹🏿‍♂️','👾 🙇 💁 🙅 🙆 🙋 🙎 🙍','🐵 🙈 🙉 🙊','❤️ 💔 💌 💕 💞 💓 💗 💖 💘 💝 💟 💜 💛 💚 💙','✋🏿 💪🏿 👐🏿 🙌🏿 👏🏿 🙏🏿','👨‍👩‍👦 👨‍👩‍👧‍👦 👨‍👨‍👦 👩‍👩‍👧 👨‍👦 👨‍👧‍👦 👩‍👦 👩‍👧‍👦','🚾 🆒 🆓 🆕 🆖 🆗 🆙 🏧','0️⃣ 1️⃣ 2️⃣ 3️⃣ 4️⃣ 5️⃣ 6️⃣ 7️⃣ 8️⃣ 9️⃣ 🔟','🇺🇸🇷🇺🇸 🇦🇫🇦🇲🇸','🇺🇸🇷🇺🇸🇦🇫🇦🇲','🇺🇸🇷🇺🇸🇦','１２３','١٢٣','ثم نفس سقطت وبالتحديد،, جزيرتي باستخدام أن دنو. إذ هنا؟ الستار وتنصيب كان. أهّل ايطاليا، بريطانيا-فرنسا قد أخذ. سليمان، إتفاقية بين ما, يذكر الحدود أي بعد, معاملة بولندا، الإطلاق عل إيو.','בְּרֵאשִׁית, בָּרָא אֱלֹהִים, אֵת הַשָּׁמַיִם, וְאֵת הָאָרֶץ','הָיְתָהtestالصفحات التّحول','﷽','ﷺ','مُنَاقَشَةُ سُبُلِ اِسْتِخْدَامِ اللُّغَةِ فِي النُّظُمِ الْقَائِمَةِ وَفِيم يَخُصَّ التَّطْبِيقَاتُ الْحاسُوبِيَّةُ، ','᚛ᚄᚓᚐᚋᚒᚄ ᚑᚄᚂᚑᚏᚅ᚜‪‪‪','‪‪᚛                 ᚜‪','‪‪test‪','‫test‫','
test
','test⁠test‫','⁦test⁧','Ṱ̺̺̕o͞ ̷i̲̬͇̪͙n̝̗͕v̟̜̘̦͟o̶̙̰̠kè͚̮̺̪̹̱̤ ̖t̝͕̳̣̻̪͞h̼͓̲̦̳̘̲e͇̣̰̦̬͎ ̢̼̻̱̘h͚͎͙̜̣̲ͅi̦̲̣̰̤v̻͍e̺̭̳̪̰-m̢iͅn̖̺̞̲̯̰d̵̼̟͙̩̼̘̳ ̞̥̱̳̭r̛̗̘e͙p͠r̼̞̻̭̗e̺̠̣͟s̘͇̳͍̝͉e͉̥̯̞̲͚̬͜ǹ̬͎͎̟̖͇̤t͍̬̤͓̼̭͘ͅi̪̱n͠g̴͉ ͏͉ͅc̬̟h͡a̫̻̯͘o̫̟̖͍̙̝͉s̗̦̲.̨̹͈̣','̡͓̞ͅI̗̘̦͝n͇͇͙v̮̫ok̲̫̙͈i̖͙̭̹̠̞n̡̻̮̣̺g̲͈͙̭͙̬͎ ̰t͔̦h̞̲e̢̤ ͍̬̲͖f̴̘͕̣è͖ẹ̥̩l͖͔͚i͓͚̦͠n͖͍̗͓̳̮g͍ ̨o͚̪͡f̘̣̬ ̖̘͖̟͙̮c҉͔̫͖͓͇͖ͅh̵̤̣͚͔á̗̼͕ͅo̼̣̥s̱͈̺̖̦̻͢.̛̖̞̠̫̰','̗̺͖̹̯͓Ṯ̤͍̥͇͈h̲́e͏͓̼̗̙̼̣͔ ͇̜̱̠͓͍ͅN͕͠e̗̱z̘̝̜̺͙p̤̺̹͍̯͚e̠̻̠͜r̨̤͍̺̖͔̖̖d̠̟̭̬̝͟i̦͖̩͓͔̤a̠̗̬͉̙n͚͜ ̻̞̰͚ͅh̵͉i̳̞v̢͇ḙ͎͟-҉̭̩̼͔m̤̭̫i͕͇̝̦n̗͙ḍ̟ ̯̲͕͞ǫ̟̯̰̲͙̻̝f ̪̰̰̗̖̭̘͘c̦͍̲̞͍̩̙ḥ͚a̮͎̟̙͜ơ̩̹͎s̤.̝̝ ҉Z̡̖̜͖̰̣͉̜a͖̰͙̬͡l̲̫̳͍̩g̡̟̼̱͚̞̬ͅo̗͜.̟','̦H̬̤̗̤͝e͜ ̜̥̝̻͍̟́w̕h̖̯͓o̝͙̖͎̱̮ ҉̺̙̞̟͈W̷̼̭a̺̪͍į͈͕̭͙̯̜t̶̼̮s̘͙͖̕ ̠̫̠B̻͍͙͉̳ͅe̵h̵̬͇̫͙i̹͓̳̳̮͎̫̕n͟d̴̪̜̖ ̰͉̩͇͙̲͞ͅT͖̼͓̪͢h͏͓̮̻e̬̝̟ͅ ̤̹̝W͙̞̝͔͇͝ͅa͏͓͔̹̼̣l̴͔̰̤̟͔ḽ̫.͕','Z̮̞̠͙͔ͅḀ̗̞͈̻̗Ḷ͙͎̯̹̞͓G̻O̭̗̮','˙ɐnbᴉlɐ ɐuƃɐɯ ǝɹolop ʇǝ ǝɹoqɐl ʇn ʇunpᴉpᴉɔuᴉ ɹodɯǝʇ poɯsnᴉǝ op pǝs \'ʇᴉlǝ ƃuᴉɔsᴉdᴉpɐ ɹnʇǝʇɔǝsuoɔ \'ʇǝɯɐ ʇᴉs ɹolop ɯnsdᴉ ɯǝɹo˥','00˙Ɩ$-','Ｔｈｅ ｑｕｉｃｋ ｂｒｏｗｎ ｆｏｘ ｊｕｍｐｓ ｏｖｅｒ ｔｈｅ ｌａｚｙ ｄｏｇ','𝐓𝐡𝐞 𝐪𝐮𝐢𝐜𝐤 𝐛𝐫𝐨𝐰𝐧 𝐟𝐨𝐱 𝐣𝐮𝐦𝐩𝐬 𝐨𝐯𝐞𝐫 𝐭𝐡𝐞 𝐥𝐚𝐳𝐲 𝐝𝐨𝐠','𝕿𝖍𝖊 𝖖𝖚𝖎𝖈𝖐 𝖇𝖗𝖔𝖜𝖓 𝖋𝖔𝖝 𝖏𝖚𝖒𝖕𝖘 𝖔𝖛𝖊𝖗 𝖙𝖍𝖊 𝖑𝖆𝖟𝖞 𝖉𝖔𝖌','𝑻𝒉𝒆 𝒒𝒖𝒊𝒄𝒌 𝒃𝒓𝒐𝒘𝒏 𝒇𝒐𝒙 𝒋𝒖𝒎𝒑𝒔 𝒐𝒗𝒆𝒓 𝒕𝒉𝒆 𝒍𝒂𝒛𝒚 𝒅𝒐𝒈','𝓣𝓱𝓮 𝓺𝓾𝓲𝓬𝓴 𝓫𝓻𝓸𝔀𝓷 𝓯𝓸𝔁 𝓳𝓾𝓶𝓹𝓼 𝓸𝓿𝓮𝓻 𝓽𝓱𝓮 𝓵𝓪𝔃𝔂 𝓭𝓸𝓰','𝕋𝕙𝕖 𝕢𝕦𝕚𝕔𝕜 𝕓𝕣𝕠𝕨𝕟 𝕗𝕠𝕩 𝕛𝕦𝕞𝕡𝕤 𝕠𝕧𝕖𝕣 𝕥𝕙𝕖 𝕝𝕒𝕫𝕪 𝕕𝕠𝕘','𝚃𝚑𝚎 𝚚𝚞𝚒𝚌𝚔 𝚋𝚛𝚘𝚠𝚗 𝚏𝚘𝚡 𝚓𝚞𝚖𝚙𝚜 𝚘𝚟𝚎𝚛 𝚝𝚑𝚎 𝚕𝚊𝚣𝚢 𝚍𝚘𝚐','⒯⒣⒠ ⒬⒰⒤⒞⒦ ⒝⒭⒪⒲⒩ ⒡⒪⒳ ⒥⒰⒨⒫⒮ ⒪⒱⒠⒭ ⒯⒣⒠ ⒧⒜⒵⒴ ⒟⒪⒢','<script>alert(123)</script>','&lt;script&gt;alert(&#39;123&#39;);&lt;/script&gt;','<img src=x onerror=alert(123) />','<svg><script>123<1>alert(123)</script>','"><script>alert(123)</script>','\'><script>alert(123)</script>','><script>alert(123)</script>','</script><script>alert(123)</script>','< / script >< script >alert(123)< / script >',' onfocus=JaVaSCript:alert(123) autofocus','" onfocus=JaVaSCript:alert(123) autofocus','\' onfocus=JaVaSCript:alert(123) autofocus','＜script＞alert(123)＜/script＞','<sc<script>ript>alert(123)</sc</script>ript>','--><script>alert(123)</script>','";alert(123);t="','\';alert(123);t=\'','JavaSCript:alert(123)',';alert(123);','src=JaVaSCript:prompt(132)','"><script>alert(123);</script x="','\'><script>alert(123);</script x=\'','><script>alert(123);</script x=','" autofocus onkeyup="javascript:alert(123)','\' autofocus onkeyup=\'javascript:alert(123)','<script\\x20type="text/javascript">javascript:alert(1);</script>','<script\\x3Etype="text/javascript">javascript:alert(1);</script>','<script\\x0Dtype="text/javascript">javascript:alert(1);</script>','<script\\x09type="text/javascript">javascript:alert(1);</script>','<script\\x0Ctype="text/javascript">javascript:alert(1);</script>','<script\\x2Ftype="text/javascript">javascript:alert(1);</script>','<script\\x0Atype="text/javascript">javascript:alert(1);</script>','\'`"><\\x3Cscript>javascript:alert(1)</script>','\'`"><\\x00script>javascript:alert(1)</script>','ABC<div style="x\\x3Aexpression(javascript:alert(1)">DEF','ABC<div style="x:expression\\x5C(javascript:alert(1)">DEF','ABC<div style="x:expression\\x00(javascript:alert(1)">DEF','ABC<div style="x:exp\\x00ression(javascript:alert(1)">DEF','ABC<div style="x:exp\\x5Cression(javascript:alert(1)">DEF','ABC<div style="x:\\x0Aexpression(javascript:alert(1)">DEF','ABC<div style="x:\\x09expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE3\\x80\\x80expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x84expression(javascript:alert(1)">DEF','ABC<div style="x:\\xC2\\xA0expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x80expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x8Aexpression(javascript:alert(1)">DEF','ABC<div style="x:\\x0Dexpression(javascript:alert(1)">DEF','ABC<div style="x:\\x0Cexpression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x87expression(javascript:alert(1)">DEF','ABC<div style="x:\\xEF\\xBB\\xBFexpression(javascript:alert(1)">DEF','ABC<div style="x:\\x20expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x88expression(javascript:alert(1)">DEF','ABC<div style="x:\\x00expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x8Bexpression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x86expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x85expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x82expression(javascript:alert(1)">DEF','ABC<div style="x:\\x0Bexpression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x81expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x83expression(javascript:alert(1)">DEF','ABC<div style="x:\\xE2\\x80\\x89expression(javascript:alert(1)">DEF','<a href="\\x0Bjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x0Fjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xC2\\xA0javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x05javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE1\\xA0\\x8Ejavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x18javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x11javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x88javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x89javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x80javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x17javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x03javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x0Ejavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Ajavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x00javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x10javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x82javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x20javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x13javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x09javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x8Ajavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x14javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x19javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\xAFjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Fjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x81javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Djavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x87javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x07javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE1\\x9A\\x80javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x83javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x04javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x01javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x08javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x84javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x86javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE3\\x80\\x80javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x12javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x0Djavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x0Ajavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x0Cjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x15javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\xA8javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x16javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x02javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Bjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x06javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\xA9javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x80\\x85javascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Ejavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\xE2\\x81\\x9Fjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="\\x1Cjavascript:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="javascript\\x00:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="javascript\\x3A:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="javascript\\x09:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="javascript\\x0D:javascript:alert(1)" id="fuzzelement1">test</a>','<a href="javascript\\x0A:javascript:alert(1)" id="fuzzelement1">test</a>','`"\'><img src=xxx:x \\x0Aonerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x22onerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x0Bonerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x0Donerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x2Fonerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x09onerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x0Conerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x00onerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x27onerror=javascript:alert(1)>','`"\'><img src=xxx:x \\x20onerror=javascript:alert(1)>','"`\'><script>\\x3Bjavascript:alert(1)</script>','"`\'><script>\\x0Djavascript:alert(1)</script>','"`\'><script>\\xEF\\xBB\\xBFjavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x81javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x84javascript:alert(1)</script>','"`\'><script>\\xE3\\x80\\x80javascript:alert(1)</script>','"`\'><script>\\x09javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x89javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x85javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x88javascript:alert(1)</script>','"`\'><script>\\x00javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\xA8javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x8Ajavascript:alert(1)</script>','"`\'><script>\\xE1\\x9A\\x80javascript:alert(1)</script>','"`\'><script>\\x0Cjavascript:alert(1)</script>','"`\'><script>\\x2Bjavascript:alert(1)</script>','"`\'><script>\\xF0\\x90\\x96\\x9Ajavascript:alert(1)</script>','"`\'><script>-javascript:alert(1)</script>','"`\'><script>\\x0Ajavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\xAFjavascript:alert(1)</script>','"`\'><script>\\x7Ejavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x87javascript:alert(1)</script>','"`\'><script>\\xE2\\x81\\x9Fjavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\xA9javascript:alert(1)</script>','"`\'><script>\\xC2\\x85javascript:alert(1)</script>','"`\'><script>\\xEF\\xBF\\xAEjavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x83javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x8Bjavascript:alert(1)</script>','"`\'><script>\\xEF\\xBF\\xBEjavascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x80javascript:alert(1)</script>','"`\'><script>\\x21javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x82javascript:alert(1)</script>','"`\'><script>\\xE2\\x80\\x86javascript:alert(1)</script>','"`\'><script>\\xE1\\xA0\\x8Ejavascript:alert(1)</script>','"`\'><script>\\x0Bjavascript:alert(1)</script>','"`\'><script>\\x20javascript:alert(1)</script>','"`\'><script>\\xC2\\xA0javascript:alert(1)</script>','<img \\x00src=x onerror="alert(1)">','<img \\x47src=x onerror="javascript:alert(1)">','<img \\x11src=x onerror="javascript:alert(1)">','<img \\x12src=x onerror="javascript:alert(1)">','<img\\x47src=x onerror="javascript:alert(1)">','<img\\x10src=x onerror="javascript:alert(1)">','<img\\x13src=x onerror="javascript:alert(1)">','<img\\x32src=x onerror="javascript:alert(1)">','<img\\x47src=x onerror="javascript:alert(1)">','<img\\x11src=x onerror="javascript:alert(1)">','<img \\x47src=x onerror="javascript:alert(1)">','<img \\x34src=x onerror="javascript:alert(1)">','<img \\x39src=x onerror="javascript:alert(1)">','<img \\x00src=x onerror="javascript:alert(1)">','<img src\\x09=x onerror="javascript:alert(1)">','<img src\\x10=x onerror="javascript:alert(1)">','<img src\\x13=x onerror="javascript:alert(1)">','<img src\\x32=x onerror="javascript:alert(1)">','<img src\\x12=x onerror="javascript:alert(1)">','<img src\\x11=x onerror="javascript:alert(1)">','<img src\\x00=x onerror="javascript:alert(1)">','<img src\\x47=x onerror="javascript:alert(1)">','<img src=x\\x09onerror="javascript:alert(1)">','<img src=x\\x10onerror="javascript:alert(1)">','<img src=x\\x11onerror="javascript:alert(1)">','<img src=x\\x12onerror="javascript:alert(1)">','<img src=x\\x13onerror="javascript:alert(1)">','<img[a][b][c]src[d]=x[e]onerror=[f]"alert(1)">','<img src=x onerror=\\x09"javascript:alert(1)">','<img src=x onerror=\\x10"javascript:alert(1)">','<img src=x onerror=\\x11"javascript:alert(1)">','<img src=x onerror=\\x12"javascript:alert(1)">','<img src=x onerror=\\x32"javascript:alert(1)">','<img src=x onerror=\\x00"javascript:alert(1)">','<a href=java&#1&#2&#3&#4&#5&#6&#7&#8&#11&#12script:javascript:alert(1)>XXX</a>','<img src="x` `<script>javascript:alert(1)</script>"` `>','<img src onerror /" \'"= alt=javascript:alert(1)//">','<title onpropertychange=javascript:alert(1)></title><title title=>','<a href=http://foo.bar/#x=`y></a><img alt="`><img src=x:x onerror=javascript:alert(1)></a>">','<!--[if]><script>javascript:alert(1)</script -->','<!--[if<img src=x onerror=javascript:alert(1)//]> -->','<script src="/\\%(jscript)s"></script>','<script src="\\\\%(jscript)s"></script>','<IMG """><SCRIPT>alert("XSS")</SCRIPT>">','<IMG SRC=javascript:alert(String.fromCharCode(88,83,83))>','<IMG SRC=# onmouseover="alert(\'xxs\')">','<IMG SRC= onmouseover="alert(\'xxs\')">','<IMG onmouseover="alert(\'xxs\')">','<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>','<IMG SRC=&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058&#0000097&#0000108&#0000101&#0000114&#0000116&#0000040&#0000039&#0000088&#0000083&#0000083&#0000039&#0000041>','<IMG SRC=&#x6A&#x61&#x76&#x61&#x73&#x63&#x72&#x69&#x70&#x74&#x3A&#x61&#x6C&#x65&#x72&#x74&#x28&#x27&#x58&#x53&#x53&#x27&#x29>','<IMG SRC="jav   ascript:alert(\'XSS\');">','<IMG SRC="jav&#x09;ascript:alert(\'XSS\');">','<IMG SRC="jav&#x0A;ascript:alert(\'XSS\');">','<IMG SRC="jav&#x0D;ascript:alert(\'XSS\');">','perl -e \'print "<IMG SRC=java\\0script:alert(\\"XSS\\")>";\' > out','<IMG SRC=" &#14;  javascript:alert(\'XSS\');">','<SCRIPT/XSS SRC="http://ha.ckers.org/xss.js"></SCRIPT>','<BODY onload!#$%&()*~+-_.,:;?@[/|\\]^`=alert("XSS")>','<SCRIPT/SRC="http://ha.ckers.org/xss.js"></SCRIPT>','<<SCRIPT>alert("XSS");//<</SCRIPT>','<SCRIPT SRC=http://ha.ckers.org/xss.js?< B >','<SCRIPT SRC=//ha.ckers.org/.j>','<IMG SRC="javascript:alert(\'XSS\')"','<iframe src=http://ha.ckers.org/scriptlet.html <','\\";alert(\'XSS\');//','<u oncopy=alert()> Copy me</u>','<i onwheel=alert(1)> Scroll over me </i>','<plaintext>','http://a/%%30%30','</textarea><script>alert(123)</script>','1;DROP TABLE users','1\'; DROP TABLE users-- 1','\' OR 1=1 -- 1','\' OR \'1\'=\'1','\'; EXEC sp_MSForEachTable \'DROP TABLE ?\'; --',' ','%','_','-','--','--version','--help','$USER','/dev/null; touch /tmp/blns.fail ; echo','`touch /tmp/blns.fail`','$(touch /tmp/blns.fail)','@{[system "touch /tmp/blns.fail"]}','eval("puts \'hello world\'")','System("ls -al /")','`ls -al /`','Kernel.exec("ls -al /")','Kernel.exit(1)','%x(\'ls -al /\')','<?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE foo [ <!ELEMENT foo ANY ><!ENTITY xxe SYSTEM "file:///etc/passwd" >]><foo>&xxe;</foo>','$HOME','$ENV{\'HOME\'}','%d','%s%s%s%s%s','{0}','%*.*s','%@','%n','File:///','../../../../../../../../../../../etc/passwd%00','../../../../../../../../../../../etc/hosts','() { 0; }; touch /tmp/blns.shellshock1.fail;','() { _; } >_[$($())] { touch /tmp/blns.shellshock2.fail; }','<<< %s(un=\'%s\') = %u','+++ATH0','CON','PRN','AUX','CLOCK$','NUL','A:','ZZ:','COM1','LPT1','LPT2','LPT3','COM2','COM3','COM4','DCC SEND STARTKEYLOGGER 0 0 0','Scunthorpe General Hospital','Penistone Community Church','Lightwater Country Park','Jimmy Clitheroe','Horniman Museum','shitake mushrooms','RomansInSussex.co.uk','http://www.cum.qc.ca/','Craig Cockburn, Software Specialist','Linda Callahan','Dr. Herman I. Libshitz','magna cum laude','Super Bowl XXX','medieval erection of parapets','evaluate','mocha','expression','Arsenal canal','classic','Tyson Gay','Dick Van Dyke','basement','If you\'re reading this, you\'ve been in a coma for almost 20 years now. We\'re trying a new technique. We don\'t know where this message will end up in your dream, but we hope it works. Please wake up, we miss you.','Roses are red, violets are blue. Hope you enjoy terminal hue','But now...for my greatest trick...','The quic\b\b\b\b\b\bk brown fox... [Beeeep]','Powerلُلُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ冗','🏳0🌈️','జ్ఞ‌ా','گچپژ','{% print \'x\' * 64 * 1024**3 %}','{{ "".__class__.__mro__[2].__subclasses__()[40]("/etc/passwd").read() }}';

From 6b06fbe791899e3fe9d61376710670a4fc54fa27 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 23 Jan 2021 05:43:33 +0300
Subject: [PATCH 377/611] Fix fast test

---
 docker/test/fasttest/run.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index fb3b3e3b459..b3cbf628af9 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -330,6 +330,9 @@ function run_tests
         # nc - command not found
         01601_proxy_protocol
         01622_defaults_for_url_engine
+
+        # JSON functions
+        01666_blns
     )
 
     time clickhouse-test -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"

From 5bb3c8941313ab91324f5ee4ba1a7288287852ea Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Sat, 23 Jan 2021 07:38:49 +0300
Subject: [PATCH 378/611] CREATE QUOTA and ALTER QUOTA syntax updated.

---
 .../sql-reference/statements/alter/quota.md   | 23 +++++++++++++++---
 .../sql-reference/statements/create/quota.md  | 24 +++++++++++++++++--
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/docs/en/sql-reference/statements/alter/quota.md b/docs/en/sql-reference/statements/alter/quota.md
index 2923fd04c4b..08a36e8598c 100644
--- a/docs/en/sql-reference/statements/alter/quota.md
+++ b/docs/en/sql-reference/statements/alter/quota.md
@@ -5,16 +5,33 @@ toc_title: QUOTA
 
 # ALTER QUOTA {#alter-quota-statement}
 
-Changes quotas.
+Changes [quotas](../../../operations/access-rights.md#quotas-management).
 
 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'}]
+    [KEYED BY {NONE | 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 | ERRORS | RESULT_ROWS | RESULT_BYTES | READ_ROWS | READ_BYTES | EXECUTION_TIME} = number } [,...] |
         NO LIMITS | TRACKING ONLY} [,...]]
     [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
 ```
+Multiword key types may be written either with underscores (`CLIENT_KEY`), or with spaces and in simple quotes (`'client key'`). You may also use `'client key or user name'` instead of `CLIENT_KEY, USER_NAME`, and `'client key or ip address'` instead of `CLIENT_KEY, IP_ADDRESS`.
+
+Multiword resource types may be written either with underscores (`RESULT_ROWS`) or without them (`RESULT ROWS`). 
+
+**Examples**
+
+Limit the maximum number of queries for the current user with 123 queries in 15 months constraint:
+
+``` sql
+ALTER QUOTA IF EXISTS qA FOR INTERVAL 15 MONTH MAX QUERIES 123 TO CURRENT_USER;
+```
+
+For the default user limit the maximum execution time with half a second in 30 minutes, and limit the maximum number of queries with 321 and the maximum number of errors with 10 in 5 quaters:
+
+``` sql
+ALTER QUOTA IF EXISTS qB FOR INTERVAL 30 MINUTE MAX EXECUTION_TIME = 0.5, FOR INTERVAL 5 QUATER MAX QUERIES = 321, ERRORS = 10 TO default;
+```
diff --git a/docs/en/sql-reference/statements/create/quota.md b/docs/en/sql-reference/statements/create/quota.md
index 20537b98a46..8ae49e4e1a8 100644
--- a/docs/en/sql-reference/statements/create/quota.md
+++ b/docs/en/sql-reference/statements/create/quota.md
@@ -11,15 +11,18 @@ Syntax:
 
 ``` sql
 CREATE QUOTA [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
-    [KEYED BY {'none' | 'user name' | 'ip address' | 'forwarded ip address' | 'client key' | 'client key or user name' | 'client key or ip address'}]
+    [KEYED BY {NONE | 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 | ERRORS | RESULT_ROWS | RESULT_BYTES | READ_ROWS | READ_BYTES | EXECUTION_TIME} = number } [,...] |
          NO LIMITS | TRACKING ONLY} [,...]]
     [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
 ```
 
 `ON CLUSTER` clause allows creating quotas on a cluster, see [Distributed DDL](../../../sql-reference/distributed-ddl.md).
 
+Multiword key types may be written either with underscores (`CLIENT_KEY`), or with spaces and in simple quotes (`'client key'`). You may also use `'client key or user name'` instead of `CLIENT_KEY, USER_NAME`, and `'client key or ip address'` instead of `CLIENT_KEY, IP_ADDRESS`.
+
+Multiword resource types may be written either with underscores (`RESULT_ROWS`) or without them (`RESULT ROWS`). 
 ## Example {#create-quota-example}
 
 Limit the maximum number of queries for the current user with 123 queries in 15 months constraint:
@@ -27,3 +30,20 @@ Limit the maximum number of queries for the current user with 123 queries in 15
 ``` sql
 CREATE QUOTA qA FOR INTERVAL 15 MONTH MAX QUERIES 123 TO CURRENT_USER
 ```
+Multiword key types may be written either with underscores (`CLIENT_KEY`), or with spaces and in simple quotes (`'client key'`). You can also use `'client key or user name'` instead of `CLIENT_KEY, USER_NAME`, and `'client key or ip address'` instead of `CLIENT_KEY, IP_ADDRESS`.
+
+Multiword resource types may be written either with underscores (`RESULT_ROWS`) or without them (`RESULT ROWS`). 
+
+## Examples {#create-quota-example}
+
+Limit the maximum number of queries for the current user with 123 queries in 15 months constraint:
+
+``` sql
+CREATE QUOTA qA FOR INTERVAL 15 MONTH MAX QUERIES 123 TO CURRENT_USER;
+```
+
+For the default user limit the maximum execution time with half a second in 30 minutes, and limit the maximum number of queries with 321 and the maximum number of errors with 10 in 5 quaters:
+
+``` sql
+CREATE QUOTA qB FOR INTERVAL 30 MINUTE MAX EXECUTION_TIME = 0.5, FOR INTERVAL 5 QUATER MAX QUERIES = 321, ERRORS = 10 TO default;
+```

From 86ead0f0a9df8bb0e372b860b5fe8c287282fcbd Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sat, 23 Jan 2021 08:25:07 +0300
Subject: [PATCH 379/611] Suppress UBsan for addMinutes/addHours/addWeeks with
 inf

https://clickhouse-test-reports.s3.yandex.net/19466/bb6f775b89da564cff9892a2443332a758e884c0/fuzzer_ubsan/report.html#fail1
---
 src/Functions/FunctionDateOrDateTimeAddInterval.h    | 4 ++--
 tests/queries/0_stateless/01662_date_ubsan.reference | 7 +++++++
 tests/queries/0_stateless/01662_date_ubsan.sql       | 4 ++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Functions/FunctionDateOrDateTimeAddInterval.h b/src/Functions/FunctionDateOrDateTimeAddInterval.h
index 4513c12b03e..b1d04fd60f0 100644
--- a/src/Functions/FunctionDateOrDateTimeAddInterval.h
+++ b/src/Functions/FunctionDateOrDateTimeAddInterval.h
@@ -288,14 +288,14 @@ struct Adder
 
 private:
     template <typename FromVectorType, typename ToVectorType, typename DeltaColumnType>
-    void NO_INLINE 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>
-    void NO_INLINE 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);
diff --git a/tests/queries/0_stateless/01662_date_ubsan.reference b/tests/queries/0_stateless/01662_date_ubsan.reference
index e1691ea0933..9d7947bd7b7 100644
--- a/tests/queries/0_stateless/01662_date_ubsan.reference
+++ b/tests/queries/0_stateless/01662_date_ubsan.reference
@@ -6,3 +6,10 @@ SELECT addHours(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
 2021-01-01 00:00:00
 SELECT addWeeks(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
 2021-01-01 00:00:00
+-- tests with inf
+SELECT addMinutes(toDateTime('2021-01-01 00:00:00', 'GMT'), inf);
+2021-01-01 00:00:00
+SELECT addHours(toDateTime('2021-01-01 00:00:00', 'GMT'), inf);
+2021-01-01 00:00:00
+SELECT addWeeks(toDateTime('2021-01-01 00:00:00', 'GMT'), inf);
+2021-01-01 00:00:00
diff --git a/tests/queries/0_stateless/01662_date_ubsan.sql b/tests/queries/0_stateless/01662_date_ubsan.sql
index b5b208167c5..ef6fd479be2 100644
--- a/tests/queries/0_stateless/01662_date_ubsan.sql
+++ b/tests/queries/0_stateless/01662_date_ubsan.sql
@@ -3,3 +3,7 @@
 SELECT addMinutes(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
 SELECT addHours(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
 SELECT addWeeks(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
+-- tests with inf
+SELECT addMinutes(toDateTime('2021-01-01 00:00:00', 'GMT'), inf);
+SELECT addHours(toDateTime('2021-01-01 00:00:00', 'GMT'), inf);
+SELECT addWeeks(toDateTime('2021-01-01 00:00:00', 'GMT'), inf);

From cc5022f312f2637e5c2e5525a5c7d987ff545bad Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Sat, 23 Jan 2021 08:33:05 +0300
Subject: [PATCH 380/611] Docs for SHOW ACCESS statement (en, ru)

---
 docs/en/sql-reference/statements/show.md |  9 ++++++++-
 docs/ru/sql-reference/statements/show.md | 10 ++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/statements/show.md b/docs/en/sql-reference/statements/show.md
index 83c4caa3f08..dd539ea5f0e 100644
--- a/docs/en/sql-reference/statements/show.md
+++ b/docs/en/sql-reference/statements/show.md
@@ -307,7 +307,6 @@ Returns a list of [roles](../../operations/access-rights.md#role-management). To
 ``` sql
 SHOW [CURRENT|ENABLED] ROLES
 ```
-
 ## SHOW PROFILES {#show-profiles-statement}
 
 Returns a list of [setting profiles](../../operations/access-rights.md#settings-profiles-management). To view user accounts parameters, see the system table [settings_profiles](../../operations/system-tables/settings_profiles.md#system_tables-settings_profiles).
@@ -347,7 +346,15 @@ Returns a [quota](../../operations/quotas.md) consumption for all users or for c
 ``` sql
 SHOW [CURRENT] QUOTA
 ```
+## SHOW ACCESS {#show-access-statement}
 
+Shows all [users](../../operations/access-rights.md#user-account-management), [roles](../../operations/access-rights.md#role-management), [profiles](../../operations/access-rights.md#settings-profiles-management), etc. and all their [grants](../../sql-reference/statements/grant.md#grant-privileges).
+
+### Syntax {#show-access-syntax}
+
+``` sql
+SHOW ACCESS
+```
 ## SHOW CLUSTER(s) {#show-cluster-statement}
 
 Returns a list of clusters. All available clusters are listed in the [system.clusters](../../operations/system-tables/clusters.md) table.
diff --git a/docs/ru/sql-reference/statements/show.md b/docs/ru/sql-reference/statements/show.md
index 4516a401de9..c0f5bd83a2c 100644
--- a/docs/ru/sql-reference/statements/show.md
+++ b/docs/ru/sql-reference/statements/show.md
@@ -359,4 +359,14 @@ SHOW QUOTAS
 SHOW [CURRENT] QUOTA
 ```
 
+## SHOW ACCESS {#show-access-statement}
+
+Выводит список всех [пользователей](../../operations/access-rights.md#user-account-management), [ролей](../../operations/access-rights.md#role-management), [профилей](../../operations/access-rights.md#settings-profiles-management) и пр., а также все [привилегии](../../sql-reference/statements/grant.md#grant-privileges).
+
+### Синтаксис {#show-access-syntax}
+
+``` sql
+SHOW ACCESS
+```
+
 [Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/show/) <!--hide-->

From 9fdae60497ad0a8c2df63dffa6e97503df8735ce Mon Sep 17 00:00:00 2001
From: feng lv <fenglv15@mails.ucas.ac.cn>
Date: Sat, 23 Jan 2021 05:45:36 +0000
Subject: [PATCH 381/611] remove part of misleading exception message

---
 src/Interpreters/TreeRewriter.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Interpreters/TreeRewriter.cpp b/src/Interpreters/TreeRewriter.cpp
index 190d063f935..ce4103e97ec 100644
--- a/src/Interpreters/TreeRewriter.cpp
+++ b/src/Interpreters/TreeRewriter.cpp
@@ -693,12 +693,18 @@ void TreeRewriterResult::collectUsedColumns(const ASTPtr & query, bool is_select
 
         if (storage)
         {
-            ss << ", maybe you meant: ";
+            String hint_name{};
             for (const auto & name : columns_context.requiredColumns())
             {
                 auto hints = storage->getHints(name);
                 if (!hints.empty())
-                    ss << " '" << toString(hints) << "'";
+                    hint_name = hint_name + " '" + toString(hints) + "'";
+            }
+
+            if (!hint_name.empty())
+            {
+                ss << ", maybe you meant: ";
+                ss << hint_name;
             }
         }
         else

From 42e5c3c41346142428ac03e8d5271e22166363f1 Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Sat, 23 Jan 2021 09:27:57 +0300
Subject: [PATCH 382/611] Translated to ru

---
 .../sql-reference/statements/alter/quota.md   | 27 +++++++++++++++----
 .../sql-reference/statements/create/quota.md  | 24 ++++++++++++-----
 2 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/docs/ru/sql-reference/statements/alter/quota.md b/docs/ru/sql-reference/statements/alter/quota.md
index 707f56e7cd4..4f524db2a6d 100644
--- a/docs/ru/sql-reference/statements/alter/quota.md
+++ b/docs/ru/sql-reference/statements/alter/quota.md
@@ -5,18 +5,35 @@ toc_title: QUOTA
 
 # ALTER QUOTA {#alter-quota-statement}
 
-Изменяет квоту.
+Изменяет [квоту](../../../operations/access-rights.md#quotas-management).
 
-## Синтаксис {#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'}]
+    [KEYED BY {NONE | 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 | ERRORS | RESULT_ROWS | RESULT_BYTES | READ_ROWS | READ_BYTES | EXECUTION_TIME} = number } [,...] |
         NO LIMITS | TRACKING ONLY} [,...]]
     [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
 ```
+Поддерживаются два варианта написания составных типов ключей: с подчеркиванием (`CLIENT_KEY`) или через пробел и в одинарных кавычках (`'client key'`). Также можно использовать ключ `'client key or user name'` вместо `CLIENT_KEY, USER_NAME`, и ключ `'client key or ip address'` вместо `CLIENT_KEY, IP_ADDRESS`.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/alter/quota/) <!--hide-->
\ No newline at end of file
+Поддерживаются также два варианта написания составных типов ресурсов: с подчеркиванием (`RESULT_ROWS`) или без подчеркивания, через пробел (`RESULT ROWS`). 
+
+**Примеры**
+
+Ограничить для текущего пользователя максимальное число запросов — не более 123 запросов за каждые 15 месяцев:
+
+``` sql
+ALTER QUOTA IF EXISTS qA FOR INTERVAL 15 MONTH MAX QUERIES 123 TO CURRENT_USER;
+```
+
+Ограничить по умолчанию максимальное время выполнения запроса — не более полсекунды за каждые 30 минут, а также максимальное число запросов — не более 321 и максимальное число ошибок — не более 10 за каждые 5 кварталов:
+
+``` sql
+ALTER QUOTA IF EXISTS qB FOR INTERVAL 30 MINUTE MAX EXECUTION_TIME = 0.5, FOR INTERVAL 5 QUATER MAX QUERIES = 321, ERRORS = 10 TO default;
+```
+
+[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/alter/quota/) <!--hide-->
diff --git a/docs/ru/sql-reference/statements/create/quota.md b/docs/ru/sql-reference/statements/create/quota.md
index fe18869bf2e..073c4eda85c 100644
--- a/docs/ru/sql-reference/statements/create/quota.md
+++ b/docs/ru/sql-reference/statements/create/quota.md
@@ -7,23 +7,35 @@ toc_title: "\u041a\u0432\u043e\u0442\u0430"
 
 Создает [квоту](../../../operations/access-rights.md#quotas-management), которая может быть присвоена пользователю или роли.
 
-### Синтаксис {#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'}]
+    [KEYED BY {NONE | 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 | ERRORS | RESULT_ROWS | RESULT_BYTES | READ_ROWS | READ_BYTES | EXECUTION_TIME} = number } [,...] |
          NO LIMITS | TRACKING ONLY} [,...]]
     [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
 ```
 
-### Пример {#create-quota-example}
+В секции `ON CLUSTER` можно указать кластеры, на которых создается квота, см. [Распределенные DDL запросы](../../../sql-reference/distributed-ddl.md).
 
-Ограничить максимальное количество запросов для текущего пользователя до 123 запросов каждые 15 месяцев:
+Поддерживаются два варианта написания составных типов ключей: с подчеркиванием (`CLIENT_KEY`) или через пробел и в одинарных кавычках (`'client key'`). Также можно использовать ключ `'client key or user name'` вместо `CLIENT_KEY, USER_NAME`, и ключ `'client key or ip address'` вместо `CLIENT_KEY, IP_ADDRESS`.
+
+Поддерживаются также два варианта написания составных типов ресурсов: с подчеркиванием (`RESULT_ROWS`) или без подчеркивания, через пробел (`RESULT ROWS`). 
+
+**Примеры**
+
+Ограничить максимальное количество запросов для текущего пользователя — не более 123 запросов за каждые 15 месяцев:
 
 ``` sql
-CREATE QUOTA qA FOR INTERVAL 15 MONTH MAX QUERIES 123 TO CURRENT_USER
+CREATE QUOTA qA FOR INTERVAL 15 MONTH MAX QUERIES 123 TO CURRENT_USER;
+```
+
+Ограничить по умолчанию максимальное время выполнения запроса — не более полсекунды за каждые 30 минут, а также максимальное число запросов — не более 321 и максимальное число ошибок — не более 10 за каждые 5 кварталов:
+
+``` sql
+CREATE QUOTA qB FOR INTERVAL 30 MINUTE MAX EXECUTION_TIME = 0.5, FOR INTERVAL 5 QUATER MAX QUERIES = 321, ERRORS = 10 TO default;
 ```
 
 [Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/create/quota) 

From 9acd37a2e2b2b3511aa7e70d10df0292f9e2c5e1 Mon Sep 17 00:00:00 2001
From: bharatnc <bharatnc@gmail.com>
Date: Fri, 22 Jan 2021 22:30:31 -0800
Subject: [PATCH 383/611] Docs - isIPv4String, isIPv6String functions

This PR documents and explains the use of the functions `isIPv4String`
and `isIPv6String.
---
 .../functions/ip-address-functions.md         | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/docs/en/sql-reference/functions/ip-address-functions.md b/docs/en/sql-reference/functions/ip-address-functions.md
index 8c894fe6311..a7540c2fc84 100644
--- a/docs/en/sql-reference/functions/ip-address-functions.md
+++ b/docs/en/sql-reference/functions/ip-address-functions.md
@@ -243,4 +243,37 @@ SELECT
 └───────────────────────────────────┴──────────────────────────────────┘
 ```
 
+
+## isIPv4String
+
+Determines if the input string is an IPv4 address or not. Returns `1` if true `0` otherwise.
+
+``` sql
+SELECT isIPv4String('127.0.0.1')
+
+Query id: 031fdb77-fa98-456e-9323-c68c7788fdde
+
+┌─isIPv4String('127.0.0.1')─┐
+│                         1 │
+└───────────────────────────┘
+
+1 rows in set. Elapsed: 0.009 sec. 
+```
+
+## isIPv6String
+
+Determines if the input string is an IPv6 address or not. Returns `1` if true `0` otherwise.
+
+``` sql
+SELECT isIPv6String('2001:438:ffff::407d:1bc1')
+
+Query id: f8e3cd94-b1f6-4f3b-bfd6-955b6e3d278d
+
+┌─isIPv6String('2001:438:ffff::407d:1bc1')─┐
+│                                        1 │
+└──────────────────────────────────────────┘
+
+1 rows in set. Elapsed: 0.009 sec. 
+```
+
 [Original article](https://clickhouse.tech/docs/en/query_language/functions/ip_address_functions/) <!--hide-->

From ba7438a89384fc43458992f5c869383e16502c67 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 23 Jan 2021 12:07:58 +0300
Subject: [PATCH 384/611] Remove Arcadia

---
 tests/queries/0_stateless/arcadia_skip_list.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/queries/0_stateless/arcadia_skip_list.txt b/tests/queries/0_stateless/arcadia_skip_list.txt
index 2aeaa7b3ac2..a6dd9e1103e 100644
--- a/tests/queries/0_stateless/arcadia_skip_list.txt
+++ b/tests/queries/0_stateless/arcadia_skip_list.txt
@@ -191,3 +191,4 @@
 01655_agg_if_nullable
 01182_materialized_view_different_structure
 01660_sum_ubsan
+01669_columns_declaration_serde

From 9983beed838f3b9111113845a43abcaf6ea6b7c9 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 23 Jan 2021 12:08:54 +0300
Subject: [PATCH 385/611] Remove Arcadia

---
 tests/queries/0_stateless/arcadia_skip_list.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/queries/0_stateless/arcadia_skip_list.txt b/tests/queries/0_stateless/arcadia_skip_list.txt
index a6dd9e1103e..f2bac038e38 100644
--- a/tests/queries/0_stateless/arcadia_skip_list.txt
+++ b/tests/queries/0_stateless/arcadia_skip_list.txt
@@ -192,3 +192,4 @@
 01182_materialized_view_different_structure
 01660_sum_ubsan
 01669_columns_declaration_serde
+01666_blns

From 598952c24325871dc0af43e8d6cc3ebed1ea82cb Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 23 Jan 2021 12:32:30 +0300
Subject: [PATCH 386/611] Remove flawed variants of "encrypt" from tests

---
 tests/queries/0_stateless/01318_encrypt.reference | 3 ---
 tests/queries/0_stateless/01318_encrypt.sql       | 8 --------
 2 files changed, 11 deletions(-)

diff --git a/tests/queries/0_stateless/01318_encrypt.reference b/tests/queries/0_stateless/01318_encrypt.reference
index dbf8e62a562..e423bcf24fb 100644
--- a/tests/queries/0_stateless/01318_encrypt.reference
+++ b/tests/queries/0_stateless/01318_encrypt.reference
@@ -1,6 +1,3 @@
-UInt64	5417DEA8D67A1A03FD561809C62402FF
-Float64	9B66D0AA685DC0F1EFFA2E385F7EA2F2
-Decimal64	5417DEA8D67A1A03FD561809C62402FF
 MySQL-compatitable mode, with key folding, no length checks, etc.
 aes-128-cbc	B2EB028BC2236566A946085E65A5632B
 aes-128-cbc	25026C55954363AEF90325822218C370
diff --git a/tests/queries/0_stateless/01318_encrypt.sql b/tests/queries/0_stateless/01318_encrypt.sql
index 087e8a5bc94..0e55a9a2aee 100644
--- a/tests/queries/0_stateless/01318_encrypt.sql
+++ b/tests/queries/0_stateless/01318_encrypt.sql
@@ -48,14 +48,6 @@ SELECT aes_encrypt_mysql('aes-128-ecb', 'text', 'key', 'IV', 1213); --{serverErr
 SELECT encrypt('aes-128-ecb', 'text', 'key', 'IV', 1213); --{serverError 43} bad AAD type
 SELECT encrypt('aes-128-gcm', 'text', 'key', 'IV', 1213); --{serverError 43} bad AAD type
 
------------------------------------------------------------------------------------------
--- Valid cases
------------------------------------------------------------------------------------------
-
-SELECT 'UInt64', hex(aes_encrypt_mysql('aes-128-ecb', 123456789101112, 'keykeykeykeykeykeykeykeykeykeyke'));
-SELECT 'Float64', hex(aes_encrypt_mysql('aes-128-ecb', 1234567891011.12, 'keykeykeykeykeykeykeykeykeykeyke'));
-SELECT 'Decimal64', hex(aes_encrypt_mysql('aes-128-ecb', toDecimal64(1234567891011.12, 2), 'keykeykeykeykeykeykeykeykeykeyke'));
-
 -----------------------------------------------------------------------------------------
 -- Validate against predefined ciphertext,plaintext,key and IV for MySQL compatibility mode
 -----------------------------------------------------------------------------------------

From a98c6d333c4989abb1dfa5a89d0e37ae8110e5ff Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Sat, 23 Jan 2021 10:18:40 +0000
Subject: [PATCH 387/611] Make sure not to log non-existent objects

---
 src/DataTypes/DataTypeFactory.cpp           |  4 ++-
 src/Databases/DatabaseFactory.cpp           | 12 +++++---
 src/Functions/FunctionFactory.cpp           | 24 ++++++++++------
 src/TableFunctions/TableFunctionFactory.cpp | 32 ++++++++++++---------
 4 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/src/DataTypes/DataTypeFactory.cpp b/src/DataTypes/DataTypeFactory.cpp
index f95afa76deb..2f100202ee9 100644
--- a/src/DataTypes/DataTypeFactory.cpp
+++ b/src/DataTypes/DataTypeFactory.cpp
@@ -78,6 +78,8 @@ 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();
@@ -85,7 +87,7 @@ DataTypePtr DataTypeFactory::get(const String & family_name_param, const ASTPtr
             query_context->addQueryFactoriesInfo(Context::QueryLogFactories::DataType, family_name);
     }
 
-    return findCreatorByName(family_name)(parameters);
+    return res;
 }
 
 DataTypePtr DataTypeFactory::getCustom(DataTypeCustomDescPtr customization) const
diff --git a/src/Databases/DatabaseFactory.cpp b/src/Databases/DatabaseFactory.cpp
index 344decf3da8..5166e15b7b4 100644
--- a/src/Databases/DatabaseFactory.cpp
+++ b/src/Databases/DatabaseFactory.cpp
@@ -60,7 +60,14 @@ DatabasePtr DatabaseFactory::get(const ASTCreateQuery & create, const String & m
         /// In this case Ordinary database is created on server startup if the corresponding metadata directory exists.
         /// So we should remove metadata directory if database creation failed.
         created = Poco::File(metadata_path).createDirectory();
-        return getImpl(create, metadata_path, context);
+
+        DatabasePtr impl = getImpl(create, metadata_path, context);
+
+        if (impl && context.hasQueryContext() && context.getSettingsRef().log_queries)
+            context.getQueryContext().addQueryFactoriesInfo(Context::QueryLogFactories::Database, impl->getEngineName());
+
+        return impl;
+
     }
     catch (...)
     {
@@ -97,9 +104,6 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
         throw Exception("Database engine " + engine_name + " cannot have parameters, primary_key, order_by, sample_by, settings",
                         ErrorCodes::UNKNOWN_ELEMENT_IN_AST);
 
-    if (context.hasQueryContext() && context.getSettingsRef().log_queries)
-        context.getQueryContext().addQueryFactoriesInfo(Context::QueryLogFactories::Database, engine_name);
-
     if (engine_name == "Ordinary")
         return std::make_shared<DatabaseOrdinary>(database_name, metadata_path, context);
     else if (engine_name == "Atomic")
diff --git a/src/Functions/FunctionFactory.cpp b/src/Functions/FunctionFactory.cpp
index 630798f7631..768f1cfe487 100644
--- a/src/Functions/FunctionFactory.cpp
+++ b/src/Functions/FunctionFactory.cpp
@@ -85,6 +85,20 @@ FunctionOverloadResolverImplPtr FunctionFactory::tryGetImpl(
     const Context & context) const
 {
     String name = getAliasToOrName(name_param);
+    FunctionOverloadResolverImplPtr res;
+
+    auto it = functions.find(name);
+    if (functions.end() != it)
+        res = it->second(context);
+    else
+    {
+        it = case_insensitive_functions.find(Poco::toLower(name));
+        if (case_insensitive_functions.end() != it)
+            res = it->second(context);
+    }
+
+    if (!res)
+        return nullptr;
 
     if (CurrentThread::isInitialized())
     {
@@ -93,15 +107,7 @@ FunctionOverloadResolverImplPtr FunctionFactory::tryGetImpl(
             query_context->addQueryFactoriesInfo(Context::QueryLogFactories::Function, name);
     }
 
-    auto it = functions.find(name);
-    if (functions.end() != it)
-        return it->second(context);
-
-    it = case_insensitive_functions.find(Poco::toLower(name));
-    if (case_insensitive_functions.end() != it)
-        return it->second(context);
-
-    return {};
+    return res;
 }
 
 FunctionOverloadResolverPtr FunctionFactory::tryGet(
diff --git a/src/TableFunctions/TableFunctionFactory.cpp b/src/TableFunctions/TableFunctionFactory.cpp
index c0b09e720b6..e8f844e8074 100644
--- a/src/TableFunctions/TableFunctionFactory.cpp
+++ b/src/TableFunctions/TableFunctionFactory.cpp
@@ -45,15 +45,6 @@ TableFunctionPtr TableFunctionFactory::get(
     }
 
     res->parseArguments(ast_function, context);
-
-    if (CurrentThread::isInitialized())
-    {
-        const auto * query_context = CurrentThread::get().getQueryContext();
-        if (query_context && query_context->getSettingsRef().log_queries)
-            query_context->addQueryFactoriesInfo(Context::QueryLogFactories::TableFunction, table_function->name);
-    }
-
-
     return res;
 }
 
@@ -62,16 +53,29 @@ TableFunctionPtr TableFunctionFactory::tryGet(
         const Context &) const
 {
     String name = getAliasToOrName(name_param);
+    TableFunctionPtr res;
 
     auto it = table_functions.find(name);
     if (table_functions.end() != it)
-        return it->second();
+        res = it->second();
+    else
+    {
+        it = case_insensitive_table_functions.find(Poco::toLower(name));
+        if (case_insensitive_table_functions.end() != it)
+            res = it->second();
+    }
 
-    it = case_insensitive_table_functions.find(Poco::toLower(name));
-    if (case_insensitive_table_functions.end() != it)
-        return it->second();
+    if (!res)
+        return nullptr;
 
-    return {};
+    if (CurrentThread::isInitialized())
+    {
+        const auto * query_context = CurrentThread::get().getQueryContext();
+        if (query_context && query_context->getSettingsRef().log_queries)
+            query_context->addQueryFactoriesInfo(Context::QueryLogFactories::TableFunction, name);
+    }
+
+    return res;
 }
 
 bool TableFunctionFactory::isTableFunctionName(const std::string & name) const

From 0d940c61370f04659674d88053310fa683d72ee5 Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Sat, 23 Jan 2021 12:07:37 +0000
Subject: [PATCH 388/611] Add AggregateFunctionCombinatorFactory, better names

---
 .../AggregateFunctionFactory.cpp              |  2 +-
 src/Interpreters/Context.cpp                  |  7 +++++--
 src/Interpreters/Context.h                    |  6 ++++--
 src/Interpreters/QueryLog.cpp                 | 11 ++++++----
 src/Interpreters/QueryLog.h                   |  5 +++--
 src/Interpreters/executeQuery.cpp             |  5 +++--
 ...56_test_query_log_factories_info.reference | 21 +++++++++++--------
 .../01656_test_query_log_factories_info.sql   | 17 ++++++++++-----
 8 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/src/AggregateFunctions/AggregateFunctionFactory.cpp b/src/AggregateFunctions/AggregateFunctionFactory.cpp
index a298c982506..5fc690d59f2 100644
--- a/src/AggregateFunctions/AggregateFunctionFactory.cpp
+++ b/src/AggregateFunctions/AggregateFunctionFactory.cpp
@@ -137,7 +137,7 @@ AggregateFunctionPtr AggregateFunctionFactory::getImpl(
             throw Exception("Aggregate function combinator '" + combinator->getName() + "' is only for internal usage", ErrorCodes::UNKNOWN_AGGREGATE_FUNCTION);
 
         if (query_context && query_context->getSettingsRef().log_queries)
-            query_context->addQueryFactoriesInfo(Context::QueryLogFactories::AggregateFunction, combinator->getName());
+            query_context->addQueryFactoriesInfo(Context::QueryLogFactories::AggregateFunctionCombinator, combinator->getName());
 
         String nested_name = name.substr(0, name.size() - combinator->getName().size());
         DataTypes nested_types = combinator->transformArguments(argument_types);
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index b2bd67c48f2..4f9a5c63dae 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -964,11 +964,14 @@ void Context::addQueryFactoriesInfo(QueryLogFactories factory_type, const String
         case QueryLogFactories::AggregateFunction:
             query_factories_info.aggregate_functions.emplace(created_object);
             break;
+        case QueryLogFactories::AggregateFunctionCombinator:
+            query_factories_info.aggregate_function_combinators.emplace(created_object);
+            break;
         case QueryLogFactories::Database:
-            query_factories_info.databases.emplace(created_object);
+            query_factories_info.database_engines.emplace(created_object);
             break;
         case QueryLogFactories::DataType:
-            query_factories_info.data_types.emplace(created_object);
+            query_factories_info.data_type_families.emplace(created_object);
             break;
         case QueryLogFactories::Dictionary:
             query_factories_info.dictionaries.emplace(created_object);
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index ffede8b9b12..c9aaf090d3c 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -205,8 +205,9 @@ private:
     struct QueryFactoriesInfo
     {
         std::unordered_set<std::string> aggregate_functions;
-        std::unordered_set<std::string> databases;
-        std::unordered_set<std::string> data_types;
+        std::unordered_set<std::string> aggregate_function_combinators;
+        std::unordered_set<std::string> database_engines;
+        std::unordered_set<std::string> data_type_families;
         std::unordered_set<std::string> dictionaries;
         std::unordered_set<std::string> formats;
         std::unordered_set<std::string> functions;
@@ -389,6 +390,7 @@ public:
     enum class QueryLogFactories
     {
         AggregateFunction,
+        AggregateFunctionCombinator,
         Database,
         DataType,
         Dictionary,
diff --git a/src/Interpreters/QueryLog.cpp b/src/Interpreters/QueryLog.cpp
index 8f5466d951b..f49a9cfef34 100644
--- a/src/Interpreters/QueryLog.cpp
+++ b/src/Interpreters/QueryLog.cpp
@@ -98,8 +98,9 @@ Block QueryLogElement::createBlock()
         {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "Settings.Values"},
 
         {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "used_aggregate_functions"},
-        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "used_databases"},
-        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "used_data_types"},
+        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "used_aggregate_function_combinators"},
+        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "used_database_engines"},
+        {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "used_data_type_families"},
         {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "used_dictionaries"},
         {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "used_formats"},
         {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "used_functions"},
@@ -200,6 +201,7 @@ void QueryLogElement::appendToBlock(MutableColumns & columns) const
 
     {
         auto & column_aggregate_function_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
+        auto & column_aggregate_function_combinator_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
         auto & column_database_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
         auto & column_data_type_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
         auto & column_dictionary_factory_objects = typeid_cast<ColumnArray &>(*columns[i++]);
@@ -221,8 +223,9 @@ void QueryLogElement::appendToBlock(MutableColumns & columns) const
         };
 
         fill_column(used_aggregate_functions, column_aggregate_function_factory_objects);
-        fill_column(used_databases, column_database_factory_objects);
-        fill_column(used_data_types, column_data_type_factory_objects);
+        fill_column(used_aggregate_function_combinators, column_aggregate_function_combinator_factory_objects);
+        fill_column(used_database_engines, column_database_factory_objects);
+        fill_column(used_data_type_families, column_data_type_factory_objects);
         fill_column(used_dictionaries, column_dictionary_factory_objects);
         fill_column(used_formats, column_format_factory_objects);
         fill_column(used_functions, column_function_factory_objects);
diff --git a/src/Interpreters/QueryLog.h b/src/Interpreters/QueryLog.h
index 1099603f3c4..ceb9124cbec 100644
--- a/src/Interpreters/QueryLog.h
+++ b/src/Interpreters/QueryLog.h
@@ -59,8 +59,9 @@ struct QueryLogElement
     std::set<String> query_columns;
 
     std::unordered_set<String> used_aggregate_functions;
-    std::unordered_set<String> used_databases;
-    std::unordered_set<String> used_data_types;
+    std::unordered_set<String> used_aggregate_function_combinators;
+    std::unordered_set<String> used_database_engines;
+    std::unordered_set<String> used_data_type_families;
     std::unordered_set<String> used_dictionaries;
     std::unordered_set<String> used_formats;
     std::unordered_set<String> used_functions;
diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index d2df028e4fb..3b6984cf8e6 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -736,8 +736,9 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
 
                 const auto & factories_info = context.getQueryFactoriesInfo();
                 elem.used_aggregate_functions = factories_info.aggregate_functions;
-                elem.used_databases = factories_info.databases;
-                elem.used_data_types = factories_info.data_types;
+                elem.used_aggregate_function_combinators = factories_info.aggregate_function_combinators;
+                elem.used_database_engines = factories_info.database_engines;
+                elem.used_data_type_families = factories_info.data_type_families;
                 elem.used_dictionaries = factories_info.dictionaries;
                 elem.used_formats = factories_info.formats;
                 elem.used_functions = factories_info.functions;
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 50d1775b445..3c93cd9ec26 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,21 +1,24 @@
-2	 worl	\N	50	4950	Nullable(UInt64)	50
-2	 worl	\N	50	4950	Nullable(UInt64)	50
+2	 worl	[123,1,1]	49	\N	50	4950	Nullable(UInt64)	50
+2	 worl	[123,1,1]	49	\N	50	4950	Nullable(UInt64)	50
 
 arraySort(used_aggregate_functions)
-['Array','If','OrDefault','OrNull','avg','count','sum','uniq']
+['avg','count','groupBitAnd','sum','uniq']
+
+arraySort(used_aggregate_function_combinators)
+['Array','If','OrDefault','OrNull']
 
 arraySort(used_table_functions)
 ['numbers']
 
 arraySort(used_functions)
-['addDays','cast','modulo','plus','substring','toDate','toDayOfYear','toTypeName']
+['addDays','array','arrayFlatten','cast','modulo','plus','substring','toDate','toDayOfYear','toTypeName','toWeek']
 
-arraySort(used_data_types)
-['Nullable','UInt8']
+arraySort(used_data_type_families)
+['Array','Int32','Nullable','String']
 
-used_databases
+used_database_engines
 ['Atomic']
 
-arraySort(used_data_types)	used_storages
-['DateTime','UInt64']	['Memory']
+arraySort(used_data_type_families)	used_storages
+['DateTime','Int64']	['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 0f5600b975a..3ac71d03ec1 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
@@ -1,6 +1,8 @@
 SELECT uniqArray([1, 1, 2]),
        SUBSTRING('Hello, world', 7, 5),
-       CAST(arrayJoin([NULL, NULL]) AS Nullable(UInt8)),
+       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)),
@@ -15,6 +17,11 @@ FROM system.query_log WHERE type = 'QueryFinish' AND (query LIKE '%toDate(\'2000
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
 SELECT '';
 
+SELECT arraySort(used_aggregate_function_combinators)
+FROM system.query_log WHERE type = 'QueryFinish' AND (query LIKE '%toDate(\'2000-12-05\')%')
+ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
+SELECT '';
+
 SELECT arraySort(used_table_functions)
 FROM system.query_log WHERE type = 'QueryFinish' AND (query LIKE '%toDate(\'2000-12-05\')%')
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
@@ -25,7 +32,7 @@ FROM system.query_log WHERE type = 'QueryFinish' AND (query LIKE '%toDate(\'2000
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
 SELECT '';
 
-SELECT arraySort(used_data_types)
+SELECT arraySort(used_data_type_families)
 FROM system.query_log WHERE type = 'QueryFinish' AND (query LIKE '%toDate(\'2000-12-05\')%')
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
 SELECT '';
@@ -34,16 +41,16 @@ DROP database IF EXISTS test_query_log_factories_info1;
 CREATE database test_query_log_factories_info1 ENGINE=Atomic;
 
 SYSTEM FLUSH LOGS;
-SELECT used_databases
+SELECT used_database_engines
 FROM system.query_log
 WHERE type == 'QueryFinish' AND (query LIKE '%database test_query_log_factories_info%')
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
 SELECT '';
 
-CREATE OR REPLACE TABLE test_query_log_factories_info1.memory_table (id UInt64, 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_types), used_storages
+SELECT arraySort(used_data_type_families), used_storages
 FROM system.query_log
 WHERE type == 'QueryFinish' AND (query LIKE '%TABLE test%')
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;

From 2b85007af9b348eaf9ab189582d1d819f297e1de Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 23 Jan 2021 15:15:03 +0300
Subject: [PATCH 389/611] Update test

---
 tests/queries/0_stateless/01666_blns.sql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/queries/0_stateless/01666_blns.sql b/tests/queries/0_stateless/01666_blns.sql
index 8141e669560..787f0369244 100644
--- a/tests/queries/0_stateless/01666_blns.sql
+++ b/tests/queries/0_stateless/01666_blns.sql
@@ -538,7 +538,7 @@ CREATE TABLE test
   "گچپژ" String,
   "{% print 'x' * 64 * 1024**3 %}" String,
   "{{ \"\".__class__.__mro__[2].__subclasses__()[40](\"/etc/passwd\").read() }}" String
-) ENGINE = MergeTree ORDER BY "{{ \"\".__class__.__mro__[2].__subclasses__()[40](\"/etc/passwd\").read() }}";
+) ENGINE = MergeTree ORDER BY "{{ \"\".__class__.__mro__[2].__subclasses__()[40](\"/etc/passwd\").read() }}" SETTINGS min_bytes_for_wide_part = '100G';
 
 INSERT INTO test ("0") SELECT 'Hello, world!';
 SELECT count() FROM test;
@@ -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 "\\";
+CREATE TABLE test_r1 AS test ENGINE = ReplicatedMergeTree('/clickhouse/test', '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 "\\";
+CREATE TABLE test_r2 AS test ENGINE = ReplicatedMergeTree('/clickhouse/test', 'r2') ORDER BY "\\" SETTINGS min_bytes_for_wide_part = '100G';
 
 SYSTEM SYNC REPLICA test_r2;
 

From cecd201a3b7fac04338c7cc724d2bc260d91192a Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Sat, 23 Jan 2021 16:14:01 +0300
Subject: [PATCH 390/611] Multiple names

Multiple names in CREATE, ALTER, SHOW CREATE for USERS, ROLES, ROW POLICIES, SETTINGS PROFILES, and SHOW CREATE QUOTAS
---
 .../en/sql-reference/statements/alter/role.md |  4 ++--
 .../statements/alter/row-policy.md            |  4 ++--
 .../statements/alter/settings-profile.md      |  4 ++--
 .../en/sql-reference/statements/alter/user.md |  4 ++--
 .../sql-reference/statements/create/role.md   |  2 +-
 .../statements/create/row-policy.md           |  5 +++--
 .../statements/create/settings-profile.md     |  3 ++-
 .../sql-reference/statements/create/user.md   |  5 +++--
 docs/en/sql-reference/statements/show.md      | 20 +++++++++----------
 9 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/docs/en/sql-reference/statements/alter/role.md b/docs/en/sql-reference/statements/alter/role.md
index 45bd7dacc77..5f781d7f8e6 100644
--- a/docs/en/sql-reference/statements/alter/role.md
+++ b/docs/en/sql-reference/statements/alter/role.md
@@ -10,7 +10,7 @@ Changes roles.
 Syntax:
 
 ``` sql
-ALTER ROLE [IF EXISTS] name [ON CLUSTER cluster_name]
-    [RENAME TO new_name]
+ALTER {ROLE | ROLES} [IF EXISTS] name1 [ON CLUSTER cluster_name1] [RENAME TO new_name1] 
+        [, name2 [ON CLUSTER cluster_name2] [RENAME TO new_name2] ...]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
 ```
diff --git a/docs/en/sql-reference/statements/alter/row-policy.md b/docs/en/sql-reference/statements/alter/row-policy.md
index 03f21ca497b..fe9a91be665 100644
--- a/docs/en/sql-reference/statements/alter/row-policy.md
+++ b/docs/en/sql-reference/statements/alter/row-policy.md
@@ -10,8 +10,8 @@ Changes row policy.
 Syntax:
 
 ``` sql
-ALTER [ROW] POLICY [IF EXISTS] name [ON CLUSTER cluster_name] ON [database.]table
-    [RENAME TO new_name]
+ALTER [ROW] {POLICY | POLICIES} [IF EXISTS] name1 [ON CLUSTER cluster_name1] ON [database1.]table1 [RENAME TO new_name1] 
+        [, name2 [ON CLUSTER cluster_name2] ON [database2.]table2 [RENAME TO new_name2] ...]
     [AS {PERMISSIVE | RESTRICTIVE}]
     [FOR SELECT]
     [USING {condition | NONE}][,...]
diff --git a/docs/en/sql-reference/statements/alter/settings-profile.md b/docs/en/sql-reference/statements/alter/settings-profile.md
index 4b7941a9e86..ead7fa9a960 100644
--- a/docs/en/sql-reference/statements/alter/settings-profile.md
+++ b/docs/en/sql-reference/statements/alter/settings-profile.md
@@ -10,7 +10,7 @@ Changes settings profiles.
 Syntax:
 
 ``` sql
-ALTER SETTINGS PROFILE [IF EXISTS] TO name [ON CLUSTER cluster_name]
-    [RENAME TO new_name]
+ALTER SETTINGS {PROFILE | PROFILES} [IF EXISTS] TO name1 [ON CLUSTER cluster_name1] [RENAME TO new_name1]
+        [, name2 [ON CLUSTER cluster_name2] [RENAME TO new_name2] ...]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | INHERIT 'profile_name'] [,...]
 ```
diff --git a/docs/en/sql-reference/statements/alter/user.md b/docs/en/sql-reference/statements/alter/user.md
index eb3d39a2f7f..e69be2430b5 100644
--- a/docs/en/sql-reference/statements/alter/user.md
+++ b/docs/en/sql-reference/statements/alter/user.md
@@ -10,8 +10,8 @@ Changes ClickHouse user accounts.
 Syntax:
 
 ``` sql
-ALTER USER [IF EXISTS] name [ON CLUSTER cluster_name]
-    [RENAME TO new_name]
+ALTER {USER | USERS} [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]
     [DEFAULT ROLE role [,...] | ALL | ALL EXCEPT role [,...] ]
diff --git a/docs/en/sql-reference/statements/create/role.md b/docs/en/sql-reference/statements/create/role.md
index 19db2b79b61..f9d26d33c6d 100644
--- a/docs/en/sql-reference/statements/create/role.md
+++ b/docs/en/sql-reference/statements/create/role.md
@@ -10,7 +10,7 @@ Creates a new [role](../../../operations/access-rights.md#role-management). Role
 Syntax:
 
 ``` sql
-CREATE ROLE [IF NOT EXISTS | OR REPLACE] name
+CREATE {ROLE | ROLES} [IF NOT EXISTS | OR REPLACE] name1 [, name2 ...]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
 ```
 
diff --git a/docs/en/sql-reference/statements/create/row-policy.md b/docs/en/sql-reference/statements/create/row-policy.md
index 9f8b6b87d3b..7dc6974127a 100644
--- a/docs/en/sql-reference/statements/create/row-policy.md
+++ b/docs/en/sql-reference/statements/create/row-policy.md
@@ -10,11 +10,12 @@ Creates a [filter for rows](../../../operations/access-rights.md#row-policy-mana
 Syntax:
 
 ``` sql
-CREATE [ROW] POLICY [IF NOT EXISTS | OR REPLACE] policy_name [ON CLUSTER cluster_name] ON [db.]table
+CREATE [ROW] {POLICY | POLICIES} [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]
-    [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
+    [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).
diff --git a/docs/en/sql-reference/statements/create/settings-profile.md b/docs/en/sql-reference/statements/create/settings-profile.md
index 196c336bb4d..000c057e42e 100644
--- a/docs/en/sql-reference/statements/create/settings-profile.md
+++ b/docs/en/sql-reference/statements/create/settings-profile.md
@@ -10,7 +10,8 @@ Creates a [settings profile](../../../operations/access-rights.md#settings-profi
 Syntax:
 
 ``` sql
-CREATE SETTINGS PROFILE [IF NOT EXISTS | OR REPLACE] TO name [ON CLUSTER cluster_name]
+CREATE SETTINGS {PROFILE | PROFILES} [IF NOT EXISTS | OR REPLACE] TO name1 [ON CLUSTER cluster_name1] 
+        [, name2 [ON CLUSTER cluster_name2] ...]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | INHERIT 'profile_name'] [,...]
 ```
 
diff --git a/docs/en/sql-reference/statements/create/user.md b/docs/en/sql-reference/statements/create/user.md
index 273882fd639..b3b898bd891 100644
--- a/docs/en/sql-reference/statements/create/user.md
+++ b/docs/en/sql-reference/statements/create/user.md
@@ -5,12 +5,13 @@ toc_title: USER
 
 # CREATE USER {#create-user-statement}
 
-Creates a [user account](../../../operations/access-rights.md#user-account-management).
+Creates one [user account](../../../operations/access-rights.md#user-account-management).
 
 Syntax:
 
 ``` sql
-CREATE USER [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
+CREATE {USER | USERS} [IF NOT EXISTS | OR REPLACE] name1 [ON CLUSTER cluster_name] 
+        [, name2 [ON CLUSTER cluster_name2] ...]
     [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 [,...]]
diff --git a/docs/en/sql-reference/statements/show.md b/docs/en/sql-reference/statements/show.md
index 83c4caa3f08..fbbedeca0c1 100644
--- a/docs/en/sql-reference/statements/show.md
+++ b/docs/en/sql-reference/statements/show.md
@@ -236,7 +236,7 @@ SHOW GRANTS [FOR user]
 
 If user is not specified, the query returns privileges for the current user.
 
-## SHOW CREATE USER {#show-create-user-statement}
+## SHOW CREATE USER, SHOW CREATE USERS {#show-create-user-statement}
 
 Shows parameters that were used at a [user creation](../../sql-reference/statements/create/user.md).
 
@@ -245,47 +245,47 @@ Shows parameters that were used at a [user creation](../../sql-reference/stateme
 ### Syntax {#show-create-user-syntax}
 
 ``` sql
-SHOW CREATE USER [name | CURRENT_USER]
+SHOW CREATE {USER | USERS} [name1 [, name2 ...] | CURRENT_USER]
 ```
 
-## SHOW CREATE ROLE {#show-create-role-statement}
+## SHOW CREATE ROLE, SHOW CREATE ROLES {#show-create-role-statement}
 
 Shows parameters that were used at a [role creation](../../sql-reference/statements/create/role.md).
 
 ### Syntax {#show-create-role-syntax}
 
 ``` sql
-SHOW CREATE ROLE name
+SHOW CREATE {ROLE | ROLES} name1 [, name2 ...]
 ```
 
-## SHOW CREATE ROW POLICY {#show-create-row-policy-statement}
+## SHOW CREATE ROW POLICY, SHOW CREATE ROW POLICIES {#show-create-row-policy-statement}
 
 Shows parameters that were used at a [row policy creation](../../sql-reference/statements/create/row-policy.md).
 
 ### Syntax {#show-create-row-policy-syntax}
 
 ``` sql
-SHOW CREATE [ROW] POLICY name ON [database.]table
+SHOW CREATE [ROW] {POLICY | POLICIES} name ON [database1.]table1 [, [database2.]table2 ...]
 ```
 
-## SHOW CREATE QUOTA {#show-create-quota-statement}
+## SHOW CREATE QUOTA, SHOW CREATE QUOTAS {#show-create-quota-statement}
 
 Shows parameters that were used at a [quota creation](../../sql-reference/statements/create/quota.md).
 
 ### Syntax {#show-create-quota-syntax}
 
 ``` sql
-SHOW CREATE QUOTA [name | CURRENT]
+SHOW CREATE {QUOTA | QUOTAS} [name1 [, name2 ...] | CURRENT]
 ```
 
-## SHOW CREATE SETTINGS PROFILE {#show-create-settings-profile-statement}
+## SHOW CREATE SETTINGS PROFILE, SHOW CREATE SETTINGS PROFILES {#show-create-settings-profile-statement}
 
 Shows parameters that were used at a [settings profile creation](../../sql-reference/statements/create/settings-profile.md).
 
 ### Syntax {#show-create-settings-profile-syntax}
 
 ``` sql
-SHOW CREATE [SETTINGS] PROFILE name
+SHOW CREATE [SETTINGS] {PROFILE | PROFILES} name1 [, name2 ...]
 ```
 
 ## SHOW USERS {#show-users-statement}

From 24c0d1ecdc4c1ca38940b69dd93737a39ae05292 Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Sat, 23 Jan 2021 16:35:26 +0300
Subject: [PATCH 391/611] Multiple names in SHOW GRANTS

---
 docs/en/sql-reference/statements/create/user.md | 2 +-
 docs/en/sql-reference/statements/show.md        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/sql-reference/statements/create/user.md b/docs/en/sql-reference/statements/create/user.md
index b3b898bd891..ec87fc739fc 100644
--- a/docs/en/sql-reference/statements/create/user.md
+++ b/docs/en/sql-reference/statements/create/user.md
@@ -10,7 +10,7 @@ Creates one [user account](../../../operations/access-rights.md#user-account-man
 Syntax:
 
 ``` sql
-CREATE {USER | USERS} [IF NOT EXISTS | OR REPLACE] name1 [ON CLUSTER cluster_name] 
+CREATE {USER | USERS} [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'}]
     [HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
diff --git a/docs/en/sql-reference/statements/show.md b/docs/en/sql-reference/statements/show.md
index fbbedeca0c1..750f45d3cff 100644
--- a/docs/en/sql-reference/statements/show.md
+++ b/docs/en/sql-reference/statements/show.md
@@ -231,7 +231,7 @@ Shows privileges for a user.
 ### Syntax {#show-grants-syntax}
 
 ``` sql
-SHOW GRANTS [FOR user]
+SHOW GRANTS [FOR user1 [, user2 ...]]
 ```
 
 If user is not specified, the query returns privileges for the current user.

From 7f8a0e337d09006557145e2b466de5e88adeeca2 Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Sat, 23 Jan 2021 16:55:40 +0300
Subject: [PATCH 392/611] Link to SHOW ACCESS from Access Control and Account
 Management

---
 docs/en/operations/access-rights.md | 2 ++
 docs/ru/operations/access-rights.md | 1 +
 2 files changed, 3 insertions(+)

diff --git a/docs/en/operations/access-rights.md b/docs/en/operations/access-rights.md
index 2059bb4e4ab..be2b3692584 100644
--- a/docs/en/operations/access-rights.md
+++ b/docs/en/operations/access-rights.md
@@ -27,6 +27,8 @@ We recommend using SQL-driven workflow. Both of the configuration methods work s
 !!! note "Warning"
     You can’t manage the same access entity by both configuration methods simultaneously.
 
+To see all users, roles, profiles, etc. and all their grants use [SHOW ACCESS](../sql-reference/statements/show.md#show-access-statement).
+
 ## Usage {#access-control-usage}
 
 By default, the ClickHouse server provides the `default` user account which is not allowed using SQL-driven access control and account management but has all the rights and permissions. The `default` user account is used in any cases when the username is not defined, for example, at login from client or in distributed queries. In distributed query processing a default user account is used, if the configuration of the server or cluster doesn’t specify the [user and password](../engines/table-engines/special/distributed.md) properties.
diff --git a/docs/ru/operations/access-rights.md b/docs/ru/operations/access-rights.md
index 9973de91161..00e55da7a82 100644
--- a/docs/ru/operations/access-rights.md
+++ b/docs/ru/operations/access-rights.md
@@ -28,6 +28,7 @@ ClickHouse поддерживает управление доступом на 
 !!! note "Внимание"
     Нельзя одновременно использовать оба метода для управления одним и тем же объектом системы доступа.
 
+Чтобы посмотреть список всех пользователей, ролей, профилей и пр., а также все привилегии, используйте запрос [SHOW ACCESS](../sql-reference/statements/show.md#show-access-statement).
 
 ## Использование {#access-control-usage}
 

From 65674c4e8478ace9fe4c8417c5f0f37d93214e91 Mon Sep 17 00:00:00 2001
From: jyz0309 <45495947@qq.com>
Date: Sat, 23 Jan 2021 21:56:38 +0800
Subject: [PATCH 393/611] update the date

Signed-off-by: jyz0309 <45495947@qq.com>
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 61adf4c9cc0..7dfc786e624 100644
--- a/README.md
+++ b/README.md
@@ -16,5 +16,5 @@ ClickHouse® is an open-source column-oriented database management system that a
 * You can also [fill this form](https://clickhouse.tech/#meet) to meet Yandex ClickHouse team in person.
 
 ## Upcoming Events
-* [SF Bay Area ClickHouse Virtual Office Hours (online)](https://www.meetup.com/San-Francisco-Bay-Area-ClickHouse-Meetup/events/274273549/) on 20 January 2020.
-* [Chinese ClickHouse Meetup (online)](http://hdxu.cn/8KxZE) on 6 February 2020.
+* [SF Bay Area ClickHouse Virtual Office Hours (online)](https://www.meetup.com/San-Francisco-Bay-Area-ClickHouse-Meetup/events/274273549/) on 20 January 2021.
+* [Chinese ClickHouse Meetup (online)](http://hdxu.cn/8KxZE) on 6 February 2021.

From ca082164c0210995970919edec3d9d8be61103c9 Mon Sep 17 00:00:00 2001
From: benbiti <wangshouben@hotmail.com>
Date: Sat, 23 Jan 2021 22:31:57 +0800
Subject: [PATCH 394/611] fix parquet translate

---
 docs/zh/interfaces/formats.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/zh/interfaces/formats.md b/docs/zh/interfaces/formats.md
index b37ef559aa7..7537166a0bd 100644
--- a/docs/zh/interfaces/formats.md
+++ b/docs/zh/interfaces/formats.md
@@ -1225,9 +1225,9 @@ SELECT * FROM topic1_stream;
 !!! note "警告"
     设置 `format_avro_schema_registry_url` 需要在配置 `users.xml` restart动后保持它的价值。
 
-## 镶木地板 {#data-format-parquet}
+## Parquet {#data-format-parquet}
 
-[阿帕奇地板](http://parquet.apache.org/) 是Hadoop生态系统中普遍存在的列式存储格式。 ClickHouse支持此格式的读写操作。
+[Apache Parquet](http://parquet.apache.org/) 是Hadoop生态系统中普遍存在的列式存储格式。 ClickHouse支持此格式的读写操作。
 
 ### 数据类型匹配{#sql_reference/data_types-matching-2} {#data-types-matching-sql_referencedata_types-matching-2}
 
@@ -1251,7 +1251,7 @@ SELECT * FROM topic1_stream;
 | —                          | [固定字符串](../sql-reference/data-types/fixedstring.md) | `STRING`                   |
 | `DECIMAL`                  | [十进制](../sql-reference/data-types/decimal.md)         | `DECIMAL`                  |
 
-ClickHouse支持可配置的精度 `Decimal` 类型。 该 `INSERT` 查询对待实木复合地板 `DECIMAL` 键入为ClickHouse `Decimal128` 类型。
+ClickHouse支持可配置的精度 `Decimal` 类型。 该 `INSERT` 查询对待 Parquet `DECIMAL` 键入为ClickHouse `Decimal128` 类型。
 
 不支持的Parquet数据类型: `DATE32`, `TIME32`, `FIXED_SIZE_BINARY`, `JSON`, `UUID`, `ENUM`.
 

From 143b84240e71d898f9b13f04a1dc33aef87415f0 Mon Sep 17 00:00:00 2001
From: hexiaoting <hewenting_ict@163.com>
Date: Sat, 23 Jan 2021 22:48:14 +0800
Subject: [PATCH 395/611] Add const column test case for mapKeys and mapValues

---
 src/Functions/map.cpp                                   | 4 ++++
 tests/queries/0_stateless/01651_map_functions.reference | 1 +
 tests/queries/0_stateless/01651_map_functions.sql       | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/src/Functions/map.cpp b/src/Functions/map.cpp
index 2561f06d9b8..84cd0f7ede7 100644
--- a/src/Functions/map.cpp
+++ b/src/Functions/map.cpp
@@ -233,6 +233,8 @@ public:
         return std::make_shared<DataTypeArray>(key_type);
     }
 
+    bool useDefaultImplementationForConstants() const override { return true; }
+
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t /*input_rows_count*/) const override
     {
         const ColumnMap * col_map = typeid_cast<const ColumnMap *>(arguments[0].column.get());
@@ -278,6 +280,8 @@ public:
         return std::make_shared<DataTypeArray>(value_type);
     }
 
+    bool useDefaultImplementationForConstants() const override { return true; }
+
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t /*input_rows_count*/) const override
     {
         const ColumnMap * col_map = typeid_cast<const ColumnMap *>(arguments[0].column.get());
diff --git a/tests/queries/0_stateless/01651_map_functions.reference b/tests/queries/0_stateless/01651_map_functions.reference
index ede7a6f5e68..0689144977c 100644
--- a/tests/queries/0_stateless/01651_map_functions.reference
+++ b/tests/queries/0_stateless/01651_map_functions.reference
@@ -17,3 +17,4 @@
 [1000]
 [1001]
 [1002]
+{'aa':4,'44':5}	['aa','44']	[4,5]
diff --git a/tests/queries/0_stateless/01651_map_functions.sql b/tests/queries/0_stateless/01651_map_functions.sql
index c3b5bd7edd1..dfc08851e5c 100644
--- a/tests/queries/0_stateless/01651_map_functions.sql
+++ b/tests/queries/0_stateless/01651_map_functions.sql
@@ -20,3 +20,7 @@ select mapContains(b, 'aaa') from table_map; -- { serverError 43 }
 select mapKeys(a) from table_map;
 select mapValues(a) from table_map;
 drop table if exists table_map;
+
+
+-- Const column
+select map( 'aa', 4, '44' , 5) as c, mapKeys(c), mapValues(c);

From a0dd5068dac7f1055e972705cea41cb0f31591e0 Mon Sep 17 00:00:00 2001
From: benbiti <wangshouben@hotmail.com>
Date: Sat, 23 Jan 2021 22:48:28 +0800
Subject: [PATCH 396/611] recheck


From 0f05b0ac9ae07ce3a91b47c226609e3d736f0db9 Mon Sep 17 00:00:00 2001
From: hexiaoting <hewenting_ict@163.com>
Date: Sat, 23 Jan 2021 22:53:08 +0800
Subject: [PATCH 397/611] Add Const column test cases for
 mapContains/Keys/Values

---
 src/Functions/map.cpp                                   | 2 ++
 tests/queries/0_stateless/01651_map_functions.reference | 3 ++-
 tests/queries/0_stateless/01651_map_functions.sql       | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Functions/map.cpp b/src/Functions/map.cpp
index 84cd0f7ede7..83fc822aa11 100644
--- a/src/Functions/map.cpp
+++ b/src/Functions/map.cpp
@@ -177,6 +177,8 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
+    bool useDefaultImplementationForConstants() const override { return true; }
+
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         const ColumnMap * col_map = typeid_cast<const ColumnMap *>(arguments[0].column.get());
diff --git a/tests/queries/0_stateless/01651_map_functions.reference b/tests/queries/0_stateless/01651_map_functions.reference
index 0689144977c..cbbadbb5162 100644
--- a/tests/queries/0_stateless/01651_map_functions.reference
+++ b/tests/queries/0_stateless/01651_map_functions.reference
@@ -17,4 +17,5 @@
 [1000]
 [1001]
 [1002]
-{'aa':4,'44':5}	['aa','44']	[4,5]
+{'aa':4,'bb':5}	['aa','bb']	[4,5]
+{'aa':4,'bb':5}	1	0
diff --git a/tests/queries/0_stateless/01651_map_functions.sql b/tests/queries/0_stateless/01651_map_functions.sql
index dfc08851e5c..062547ea620 100644
--- a/tests/queries/0_stateless/01651_map_functions.sql
+++ b/tests/queries/0_stateless/01651_map_functions.sql
@@ -23,4 +23,5 @@ drop table if exists table_map;
 
 
 -- Const column
-select map( 'aa', 4, '44' , 5) as c, mapKeys(c), mapValues(c);
+select map( 'aa', 4, 'bb' , 5) as m, mapKeys(m), mapValues(m);
+select map( 'aa', 4, 'bb' , 5) as m, mapContains(m, 'aa'), mapContains(m, 'k'); 

From ffd7bc7256de7f0797ccb90a2435274e18b55ffb Mon Sep 17 00:00:00 2001
From: bharatnc <bharatnc@gmail.com>
Date: Sat, 23 Jan 2021 09:35:37 -0800
Subject: [PATCH 398/611] docs - clean output

---
 docs/en/sql-reference/functions/ip-address-functions.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/docs/en/sql-reference/functions/ip-address-functions.md b/docs/en/sql-reference/functions/ip-address-functions.md
index a7540c2fc84..9a758df0041 100644
--- a/docs/en/sql-reference/functions/ip-address-functions.md
+++ b/docs/en/sql-reference/functions/ip-address-functions.md
@@ -251,13 +251,9 @@ Determines if the input string is an IPv4 address or not. Returns `1` if true `0
 ``` sql
 SELECT isIPv4String('127.0.0.1')
 
-Query id: 031fdb77-fa98-456e-9323-c68c7788fdde
-
 ┌─isIPv4String('127.0.0.1')─┐
 │                         1 │
 └───────────────────────────┘
-
-1 rows in set. Elapsed: 0.009 sec. 
 ```
 
 ## isIPv6String
@@ -267,13 +263,9 @@ Determines if the input string is an IPv6 address or not. Returns `1` if true `0
 ``` sql
 SELECT isIPv6String('2001:438:ffff::407d:1bc1')
 
-Query id: f8e3cd94-b1f6-4f3b-bfd6-955b6e3d278d
-
 ┌─isIPv6String('2001:438:ffff::407d:1bc1')─┐
 │                                        1 │
 └──────────────────────────────────────────┘
-
-1 rows in set. Elapsed: 0.009 sec. 
 ```
 
 [Original article](https://clickhouse.tech/docs/en/query_language/functions/ip_address_functions/) <!--hide-->

From f385f6c2c10edd02e9a6f51ddadc7c509ab97dc4 Mon Sep 17 00:00:00 2001
From: bharatnc <bharatnc@gmail.com>
Date: Sat, 23 Jan 2021 09:37:12 -0800
Subject: [PATCH 399/611] docs - split query and output as separate blocks

---
 docs/en/sql-reference/functions/ip-address-functions.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/en/sql-reference/functions/ip-address-functions.md b/docs/en/sql-reference/functions/ip-address-functions.md
index 9a758df0041..faf551601ac 100644
--- a/docs/en/sql-reference/functions/ip-address-functions.md
+++ b/docs/en/sql-reference/functions/ip-address-functions.md
@@ -250,7 +250,9 @@ Determines if the input string is an IPv4 address or not. Returns `1` if true `0
 
 ``` sql
 SELECT isIPv4String('127.0.0.1')
+```
 
+``` text
 ┌─isIPv4String('127.0.0.1')─┐
 │                         1 │
 └───────────────────────────┘
@@ -262,7 +264,9 @@ Determines if the input string is an IPv6 address or not. Returns `1` if true `0
 
 ``` sql
 SELECT isIPv6String('2001:438:ffff::407d:1bc1')
+```
 
+``` text
 ┌─isIPv6String('2001:438:ffff::407d:1bc1')─┐
 │                                        1 │
 └──────────────────────────────────────────┘

From 554663a53392bd2bd06e603e1f5c363f1bd18c5d Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Sun, 24 Jan 2021 03:03:54 +0800
Subject: [PATCH 400/611] Support new .debug location

---
 src/Common/SymbolIndex.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/Common/SymbolIndex.cpp b/src/Common/SymbolIndex.cpp
index a9b657e671b..cc12fc668c0 100644
--- a/src/Common/SymbolIndex.cpp
+++ b/src/Common/SymbolIndex.cpp
@@ -324,6 +324,27 @@ void collectSymbolsFromELF(dl_phdr_info * info,
         object_name = local_debug_info_path;
     else if (std::filesystem::exists(debug_info_path))
         object_name = debug_info_path;
+    else if (!build_id.empty())
+    {
+        // Check if there is a .debug file in .build-id folder. For example:
+        // /usr/lib/debug/.build-id/e4/0526a12e9a8f3819a18694f6b798f10c624d5c.debug
+        String build_id_hex;
+        build_id_hex.resize(build_id.size() * 2);
+
+        char * pos = build_id_hex.data();
+        for (auto c : build_id)
+        {
+            writeHexByteLowercase(c, pos);
+            pos += 2;
+        }
+
+        std::filesystem::path build_id_debug_info_path(
+            fmt::format("/usr/lib/debug/.build-id/{}/{}.debug", build_id_hex.substr(0, 2), build_id_hex.substr(2)));
+        if (std::filesystem::exists(build_id_debug_info_path))
+            object_name = build_id_debug_info_path;
+        else
+            object_name = canonical_path;
+    }
     else
         object_name = canonical_path;
 

From ea26e5e784844ecf5e9702013fd7f96887b0efea Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 23 Jan 2021 22:04:45 +0300
Subject: [PATCH 401/611] Remove unneeded case

---
 tests/performance/encrypt_decrypt.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/performance/encrypt_decrypt.xml b/tests/performance/encrypt_decrypt.xml
index 09058f1a577..c2398a83b8f 100644
--- a/tests/performance/encrypt_decrypt.xml
+++ b/tests/performance/encrypt_decrypt.xml
@@ -61,7 +61,6 @@
         <substitution>
            <name>plaintext</name>
            <values>
-              <value>number</value>
               <value>'paintext'</value>
               <value>'\x12\x2B\xF9\x16\x93\xA4\xD6\x74\x22\xD9\x17\x5E\x38\xCD\x1D\x7B\xB0\x12\xEC\x43\x6B\xC7\x76\xFD\xA1\xA2\x4E\xFC\xBC\x19\x92\x3A\x12\x8B\xD4\xB3\x62\xA8\x9D\xBB\x3E\x0C\x08\x12\x67\x20\x7D\x02\x58\xCF\xE7\xD6\x06\xB8\xB0\x14\x0A\x70\xA1\x81\x94\x14\x24\x74'</value>
            </values>

From ae4a2e9c6ff9ec383def0f65e763fd95f427b43a Mon Sep 17 00:00:00 2001
From: Anna <annaconda@bk.ru>
Date: Sat, 23 Jan 2021 22:46:24 +0300
Subject: [PATCH 402/611] Add REPLACE query desc

---
 docs/en/engines/database-engines/atomic.md    | 15 ++++
 docs/en/engines/database-engines/index.md     |  2 +
 .../sql-reference/statements/create/table.md  | 75 +++++++++++++++++--
 3 files changed, 87 insertions(+), 5 deletions(-)
 create mode 100644 docs/en/engines/database-engines/atomic.md

diff --git a/docs/en/engines/database-engines/atomic.md b/docs/en/engines/database-engines/atomic.md
new file mode 100644
index 00000000000..026f1ba04e4
--- /dev/null
+++ b/docs/en/engines/database-engines/atomic.md
@@ -0,0 +1,15 @@
+---
+toc_priority: 32
+toc_title: Atomic
+---
+
+
+# Atomic {#atomic}
+
+It is an experimental database engine, it supports non-blocking `DROP` and `RENAME TABLE` queries and atomic `EXCHANGE TABLES t1 AND t2` queries.
+
+## Creating a Database {#creating-a-database}
+
+    CREATE DATABASE test ENGINE = Atomic;
+
+[Original article](https://clickhouse.tech/docs/en/engines/database_engines/atomic/) <!--hide-->
diff --git a/docs/en/engines/database-engines/index.md b/docs/en/engines/database-engines/index.md
index 7b298ffe3f8..e2a45be9c09 100644
--- a/docs/en/engines/database-engines/index.md
+++ b/docs/en/engines/database-engines/index.md
@@ -18,4 +18,6 @@ You can also use the following database engines:
 
 -   [MaterializeMySQL](../../engines/database-engines/materialize-mysql.md)
 
+-   [Atomic](../../engines/database-engines/atomic.md)
+
 [Original article](https://clickhouse.tech/docs/en/database_engines/) <!--hide-->
diff --git a/docs/en/sql-reference/statements/create/table.md b/docs/en/sql-reference/statements/create/table.md
index b1a5fdb19b5..3e7b53426c2 100644
--- a/docs/en/sql-reference/statements/create/table.md
+++ b/docs/en/sql-reference/statements/create/table.md
@@ -14,7 +14,7 @@ By default, tables are created only on the current server. Distributed DDL queri
 ### With Explicit Schema {#with-explicit-schema}
 
 ``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
+CREATE [OR REPLACE] TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 (
     name1 [type1] [NULL|NOT NULL] [DEFAULT|MATERIALIZED|ALIAS expr1] [compression_codec] [TTL expr1],
     name2 [type2] [NULL|NOT NULL] [DEFAULT|MATERIALIZED|ALIAS expr2] [compression_codec] [TTL expr2],
@@ -34,21 +34,21 @@ If necessary, primary key can be specified, with one or more key expressions.
 ### With a Schema Similar to Other Table {#with-a-schema-similar-to-other-table}
 
 ``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name AS [db2.]name2 [ENGINE = engine]
+CREATE [OR REPLACE]  TABLE [IF NOT EXISTS] [db.]table_name AS [db2.]name2 [ENGINE = engine]
 ```
 
 Creates a table with the same structure as another table. You can specify a different engine for the table. If the engine is not specified, the same engine will be used as for the `db2.name2` table.
 
-## From a Table Function {#from-a-table-function}
+### From a Table Function {#from-a-table-function}
 
 ``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name AS table_function()
+CREATE [OR REPLACE] TABLE [IF NOT EXISTS] [db.]table_name AS table_function()
 ```
 
 Creates a table with the structure and data returned by a [table function](../../../sql-reference/table-functions/index.md#table-functions).
 
 ``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name ENGINE = engine AS SELECT ...
+CREATE [OR REPLACE] TABLE [IF NOT EXISTS] [db.]table_name 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.
@@ -259,3 +259,68 @@ CREATE TEMPORARY TABLE [IF NOT EXISTS] table_name
 In most cases, temporary tables are not created manually, but when using external data for a query, or for distributed `(GLOBAL) IN`. For more information, see the appropriate sections
 
 It’s possible to use tables with [ENGINE = Memory](../../../engines/table-engines/special/memory.md) instead of temporary tables.
+
+## REPLACE TABLE {#replace-table-query}
+
+`REPLACE` query allows you to add, drop, and rename data in the tables.
+
+!!!note "Note"
+    This query is supported only for [Atomic](../../../engines/database_engines/atomic.md) database engine.
+
+If you need to reject(delete) some data from a table, you can create a new table and fill it with a `SELECT` statement that doesn't retrieve unwanted data, then rename it to old table name:
+
+```sql
+CREATE TABLE myNewTable AS myOldTable;
+```
+
+Then load data with:
+
+```sql
+INSERT INTO myNewTable SELECT * FROM myOldTable WHERE CounterID <12345;
+```
+
+Drop old table and rename:
+
+```sql
+DROP TABLE myOldTable;
+RENAME TABLE myNewTable TO myOldTable;
+```
+
+Instead of above, you can use the following:
+
+```sql
+REPLACE TABLE myOldTable SELECT * FROM myOldTable WHERE CounterID <12345;
+```
+
+**Examples:**
+
+`REPLACE` for a non-existent table will cause an error.
+
+```sql
+CREATE DATABASE base ENGINE = Atomic;
+REPLACE TABLE base.t1 (n UInt64, s String) ENGINE = MergeTree ORDER BY n; -- { serverError 60 }
+```
+
+Using `REPLACE` query to change data in columns.
+
+```sql
+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;
+
+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;
+
+REPLACE TABLE base.t1 (n UInt64) ENGINE = MergeTree ORDER BY n;
+INSERT INTO base.t1 VALUES (3);
+SELECT * FROM base.t1;
+```
+
+```text
+1   test
+2   \N
+3
+```
+
+ [Original article](https://clickhouse.tech/docs/en/sql-reference/statements/create/table) <!--hide-->

From 95c2cae3558f5f145a5fd7c2c10506996c4f7201 Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Sat, 23 Jan 2021 23:45:52 +0300
Subject: [PATCH 403/611] Update README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 7dfc786e624..8e114d5abe9 100644
--- a/README.md
+++ b/README.md
@@ -16,5 +16,4 @@ ClickHouse® is an open-source column-oriented database management system that a
 * You can also [fill this form](https://clickhouse.tech/#meet) to meet Yandex ClickHouse team in person.
 
 ## Upcoming Events
-* [SF Bay Area ClickHouse Virtual Office Hours (online)](https://www.meetup.com/San-Francisco-Bay-Area-ClickHouse-Meetup/events/274273549/) on 20 January 2021.
 * [Chinese ClickHouse Meetup (online)](http://hdxu.cn/8KxZE) on 6 February 2021.

From 8d335b1490591db37cd3722e9825dd04c1fe40d3 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 23 Jan 2021 23:58:36 +0300
Subject: [PATCH 404/611] Allow to enable or disable watchdog via env var

---
 programs/server/Server.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index 94cd6854f78..2bb5181d348 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -109,8 +109,20 @@ int mainEntryClickHouseServer(int argc, char ** argv)
 
     /// Do not fork separate process from watchdog if we attached to terminal.
     /// Otherwise it breaks gdb usage.
-    if (argc > 0 && !isatty(STDIN_FILENO) && !isatty(STDOUT_FILENO) && !isatty(STDERR_FILENO))
-        app.shouldSetupWatchdog(argv[0]);
+    /// Can be overridden by environment variable (cannot use server config at this moment).
+    if (argc > 0)
+    {
+        const char * env_watchdog = getenv("CLICKHOUSE_WATCHDOG_ENABLE");
+        if (env_watchdog)
+        {
+            if (0 == strcmp(env_watchdog, "1"))
+                app.shouldSetupWatchdog(argv[0]);
+
+            /// Other values disable watchdog explicitly.
+        }
+        else if (!isatty(STDIN_FILENO) && !isatty(STDOUT_FILENO) && !isatty(STDERR_FILENO))
+            app.shouldSetupWatchdog(argv[0]);
+    }
 
     try
     {

From 47b4b94cc42e576857605bbc30f9f9f3aee5773e Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sun, 24 Jan 2021 00:45:17 +0300
Subject: [PATCH 405/611] More diagnostics in fuzzer #19108

---
 docker/test/fuzzer/run-fuzzer.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index e92bb056f90..4f733d7449a 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -85,6 +85,7 @@ function fuzz
     fi
 
     ./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
@@ -92,6 +93,17 @@ function fuzz
     kill -0 $server_pid
     echo Server started
 
+    echo "
+handle all noprint
+handle SIGSEGV stop print
+handle SIGBUS stop print
+continue
+thread apply all backtrace
+continue
+" > script.gdb
+
+    gdb -batch -command test.gdb -p $server_pid &
+
     fuzzer_exit_code=0
     # 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.

From a541241017e6226ac164d35bd335d58379cfae57 Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Sun, 24 Jan 2021 01:52:50 +0300
Subject: [PATCH 406/611] Global MySQL Variables Support

---
 docs/en/engines/database-engines/mysql.md | 14 ++++++++++++++
 docs/ru/engines/database-engines/mysql.md | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/docs/en/engines/database-engines/mysql.md b/docs/en/engines/database-engines/mysql.md
index 6e6b9ae3d0b..d6a84d5f68c 100644
--- a/docs/en/engines/database-engines/mysql.md
+++ b/docs/en/engines/database-engines/mysql.md
@@ -51,6 +51,20 @@ All other MySQL data types are converted into [String](../../sql-reference/data-
 
 [Nullable](../../sql-reference/data-types/nullable.md) is supported.
 
+## Global Variables Support {#global-variables-support}
+
+For better compatibility you may address global variables in MySQL style, as `@@identifier`. 
+
+By now only these variables are supported:
+- `version`
+- `max_allowed_packet`
+
+Example:
+
+``` sql
+SELECT @@version;
+```
+
 ## Examples of Use {#examples-of-use}
 
 Table in MySQL:
diff --git a/docs/ru/engines/database-engines/mysql.md b/docs/ru/engines/database-engines/mysql.md
index 2f8335de73a..28f4f8fddcb 100644
--- a/docs/ru/engines/database-engines/mysql.md
+++ b/docs/ru/engines/database-engines/mysql.md
@@ -51,6 +51,20 @@ ENGINE = MySQL('host:port', ['database' | database], 'user', 'password')
 
 [Nullable](../../engines/database-engines/mysql.md) поддержан.
 
+## Использование глобальных переменных {#global-variables-support}
+
+Для лучшей совместимости к глобальным переменным можно обращаться в формате MySQL, как `@@identifier`. 
+
+В настоящее время поддерживаются следующие переменные:
+- `version`
+- `max_allowed_packet`
+
+Пример:
+
+``` sql
+SELECT @@version;
+```
+
 ## Примеры использования {#primery-ispolzovaniia}
 
 Таблица в MySQL:

From a69911a2dcf255b46c6629aca25e87d85eb41cd2 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sun, 24 Jan 2021 02:59:00 +0300
Subject: [PATCH 407/611] More diagnostics in fuzzer #19108

---
 docker/test/fuzzer/run-fuzzer.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index 4f733d7449a..a04943f157f 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -102,7 +102,7 @@ thread apply all backtrace
 continue
 " > script.gdb
 
-    gdb -batch -command test.gdb -p $server_pid &
+    gdb -batch -command script.gdb -p $server_pid &
 
     fuzzer_exit_code=0
     # SC2012: Use find instead of ls to better handle non-alphanumeric filenames. They are all alphanumeric.

From 366c75ed294c4c9e4219e32bca340f94d05a67b3 Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Sun, 24 Jan 2021 10:28:43 +0800
Subject: [PATCH 408/611] Ensure buildid length

---
 src/Common/SymbolIndex.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Common/SymbolIndex.cpp b/src/Common/SymbolIndex.cpp
index cc12fc668c0..bd6c5d9eda0 100644
--- a/src/Common/SymbolIndex.cpp
+++ b/src/Common/SymbolIndex.cpp
@@ -324,7 +324,7 @@ void collectSymbolsFromELF(dl_phdr_info * info,
         object_name = local_debug_info_path;
     else if (std::filesystem::exists(debug_info_path))
         object_name = debug_info_path;
-    else if (!build_id.empty())
+    else if (build_id.size() >= 2)
     {
         // Check if there is a .debug file in .build-id folder. For example:
         // /usr/lib/debug/.build-id/e4/0526a12e9a8f3819a18694f6b798f10c624d5c.debug

From 667119918e5321108f26243127f60778387c6d30 Mon Sep 17 00:00:00 2001
From: feng lv <fenglv15@mails.ucas.ac.cn>
Date: Sun, 24 Jan 2021 05:18:59 +0000
Subject: [PATCH 409/611] add sign math function

---
 src/Functions/registerFunctionsMath.cpp       |  2 +
 src/Functions/sign.cpp                        | 98 +++++++++++++++++++
 src/Functions/ya.make                         |  1 +
 .../0_stateless/01670_sign_function.reference | 23 +++++
 .../0_stateless/01670_sign_function.sql       | 32 ++++++
 5 files changed, 156 insertions(+)
 create mode 100644 src/Functions/sign.cpp
 create mode 100644 tests/queries/0_stateless/01670_sign_function.reference
 create mode 100644 tests/queries/0_stateless/01670_sign_function.sql

diff --git a/src/Functions/registerFunctionsMath.cpp b/src/Functions/registerFunctionsMath.cpp
index 004fccfbec1..bc851de9b93 100644
--- a/src/Functions/registerFunctionsMath.cpp
+++ b/src/Functions/registerFunctionsMath.cpp
@@ -33,6 +33,7 @@ void registerFunctionAsinh(FunctionFactory & factory);
 void registerFunctionAcosh(FunctionFactory & factory);
 void registerFunctionAtanh(FunctionFactory & factory);
 void registerFunctionPow(FunctionFactory & factory);
+void registerFunctionSign(FunctionFactory & factory);
 
 
 void registerFunctionsMath(FunctionFactory & factory)
@@ -68,6 +69,7 @@ void registerFunctionsMath(FunctionFactory & factory)
     registerFunctionAcosh(factory);
     registerFunctionAtanh(factory);
     registerFunctionPow(factory);
+    registerFunctionSign(factory);
 }
 
 }
diff --git a/src/Functions/sign.cpp b/src/Functions/sign.cpp
new file mode 100644
index 00000000000..e1d6137ffa0
--- /dev/null
+++ b/src/Functions/sign.cpp
@@ -0,0 +1,98 @@
+#include <Columns/ColumnVector.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/IFunction.h>
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+class FunctionSign : public IFunction
+{
+private:
+    const Context & context;
+
+public:
+    static constexpr auto name = "sign";
+
+    explicit FunctionSign(const Context & context_) : context(context_) { }
+    static FunctionPtr create(const Context & context) { return std::make_shared<FunctionSign>(context); }
+
+    String getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 1; }
+
+    bool useDefaultImplementationForConstants() const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        if (!isNumber(arguments[0].type))
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Argument of function {} should be a number, got {}",
+                getName(),
+                arguments[0].type->getName());
+
+        ColumnWithTypeAndName compare_elem{arguments[0].column, arguments[0].type, {}};
+
+        auto greater = FunctionFactory::instance().get("greater", context);
+        auto greater_compare = greater->build(ColumnsWithTypeAndName{compare_elem, compare_elem});
+
+        if (isUnsignedInteger(arguments[0].type.get()))
+        {
+            return greater_compare->getResultType();
+        }
+
+        auto compare_type = greater_compare->getResultType();
+
+        ColumnWithTypeAndName minus_elem = {compare_type, {}};
+
+        auto minus = FunctionFactory::instance().get("minus", context);
+        auto elem_minus = minus->build(ColumnsWithTypeAndName{minus_elem, minus_elem});
+
+        return elem_minus->getResultType();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        auto zero_column = arguments[0].type->createColumnConstWithDefaultValue(input_rows_count);
+
+        ColumnWithTypeAndName left{arguments[0].column, arguments[0].type, {}};
+        ColumnWithTypeAndName right{zero_column, arguments[0].type, {}};
+
+        auto greater = FunctionFactory::instance().get("greater", context);
+        auto greater_compare = greater->build(ColumnsWithTypeAndName{left, right});
+
+        /// Unsigned number: sign(n) = greater(n, 0)
+        if (isUnsignedInteger(arguments[0].type.get()))
+        {
+            return greater_compare->execute({left, right}, greater_compare->getResultType(), input_rows_count);
+        }
+
+        /// Signed number: sign(n) = minus (greater(n, 0), less(n, 0))
+        auto less = FunctionFactory::instance().get("less", context);
+        auto less_compare = less->build(ColumnsWithTypeAndName{left, right});
+
+        ColumnsWithTypeAndName columns(2);
+
+        columns[0].type = greater_compare->getResultType();
+        columns[0].column = greater_compare->execute({left, right}, greater_compare->getResultType(), input_rows_count);
+        columns[1].type = less_compare->getResultType();
+        columns[1].column = less_compare->execute({left, right}, less_compare->getResultType(), input_rows_count);
+
+        auto minus = FunctionFactory::instance().get("minus", context);
+        auto elem_minus = minus->build(columns);
+
+        return elem_minus->execute(columns, elem_minus->getResultType(), input_rows_count);
+    }
+};
+
+void registerFunctionSign(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionSign>();
+}
+}
diff --git a/src/Functions/ya.make b/src/Functions/ya.make
index a3fd93d3783..9488c9d7d4e 100644
--- a/src/Functions/ya.make
+++ b/src/Functions/ya.make
@@ -428,6 +428,7 @@ SRCS(
     runningDifference.cpp
     runningDifferenceStartingWithFirstValue.cpp
     sigmoid.cpp
+    sign.cpp
     sin.cpp
     sinh.cpp
     sleep.cpp
diff --git a/tests/queries/0_stateless/01670_sign_function.reference b/tests/queries/0_stateless/01670_sign_function.reference
new file mode 100644
index 00000000000..2826549e61c
--- /dev/null
+++ b/tests/queries/0_stateless/01670_sign_function.reference
@@ -0,0 +1,23 @@
+0
+1
+-1
+sign(Int32)
+1
+-1
+1
+sign(UInt32)
+1
+0
+1
+sign(Float32)
+-1
+1
+1
+sign(Float64)
+1
+-1
+0
+sign(Decimal32(5))
+1
+-1
+1
diff --git a/tests/queries/0_stateless/01670_sign_function.sql b/tests/queries/0_stateless/01670_sign_function.sql
new file mode 100644
index 00000000000..af5559a08e2
--- /dev/null
+++ b/tests/queries/0_stateless/01670_sign_function.sql
@@ -0,0 +1,32 @@
+SELECT sign(0);
+SELECT sign(1);
+SELECT sign(-1);
+
+DROP TABLE IF EXISTS test;
+
+CREATE TABLE test(
+	n1 Int32,
+	n2 UInt32,
+	n3 Float32,
+	n4 Float64,
+	n5 Decimal32(5)
+) ENGINE = Memory;
+
+INSERT INTO test VALUES (1, 2, -0.0001, 1.5, 0.5) (-2, 0, 2.5, -4, -5) (4, 5, 5, 0, 7);
+
+SELECT 'sign(Int32)';
+SELECT sign(n1) FROM test;
+
+SELECT 'sign(UInt32)';
+SELECT sign(n2) FROM test;
+
+SELECT 'sign(Float32)';
+SELECT sign(n3) FROM test;
+
+SELECT 'sign(Float64)';
+SELECT sign(n4) FROM test;
+
+SELECT 'sign(Decimal32(5))';
+SELECT sign(n5) FROM test;
+
+DROP TABLE test;

From df53438a66ee95de790b60d35f36eca986590027 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sat, 23 Jan 2021 09:05:07 +0300
Subject: [PATCH 410/611] Fix UBsan report in sumWithOverflow(Decimal)

https://clickhouse-test-reports.s3.yandex.net/19450/3fffa16aab8f5342926b3a6b1e3c6a14208e3322/fuzzer_ubsan/report.html#fail1
---
 src/AggregateFunctions/AggregateFunctionSum.h | 49 +++++++++++++++----
 src/Core/Types.h                              |  4 ++
 .../0_stateless/01664_decimal_ubsan.reference |  3 ++
 .../0_stateless/01664_decimal_ubsan.sql       |  2 +
 4 files changed, 48 insertions(+), 10 deletions(-)
 create mode 100644 tests/queries/0_stateless/01664_decimal_ubsan.reference
 create mode 100644 tests/queries/0_stateless/01664_decimal_ubsan.sql

diff --git a/src/AggregateFunctions/AggregateFunctionSum.h b/src/AggregateFunctions/AggregateFunctionSum.h
index 15fc93dec75..ffd8a077390 100644
--- a/src/AggregateFunctions/AggregateFunctionSum.h
+++ b/src/AggregateFunctions/AggregateFunctionSum.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <experimental/type_traits>
 #include <type_traits>
 
 #include <IO/WriteHelpers.h>
@@ -15,14 +16,37 @@
 namespace DB
 {
 
+/// Uses addOverflow method (if available) to avoid UB for sumWithOverflow()
+///
+/// Since NO_SANITIZE_UNDEFINED works only for the function itself, without
+/// callers, and in case of non-POD type (i.e. Decimal) you have overwritten
+/// operator+=(), which will have UB.
+template <typename T>
+struct AggregateFunctionSumAddOverflowImpl
+{
+    static void NO_SANITIZE_UNDEFINED ALWAYS_INLINE add(T & lhs, const T & rhs)
+    {
+        lhs += rhs;
+    }
+};
+template <typename DecimalNativeType>
+struct AggregateFunctionSumAddOverflowImpl<Decimal<DecimalNativeType>>
+{
+    static void NO_SANITIZE_UNDEFINED ALWAYS_INLINE add(Decimal<DecimalNativeType> & lhs, const Decimal<DecimalNativeType> & rhs)
+    {
+        lhs.addOverflow(rhs);
+    }
+};
+
 template <typename T>
 struct AggregateFunctionSumData
 {
+    using Impl = AggregateFunctionSumAddOverflowImpl<T>;
     T sum{};
 
     void NO_SANITIZE_UNDEFINED ALWAYS_INLINE add(T value)
     {
-        sum += value;
+        Impl::add(sum, value);
     }
 
     /// Vectorized version
@@ -45,22 +69,22 @@ struct AggregateFunctionSumData
             while (ptr < unrolled_end)
             {
                 for (size_t i = 0; i < unroll_count; ++i)
-                    partial_sums[i] += ptr[i];
+                    Impl::add(partial_sums[i], ptr[i]);
                 ptr += unroll_count;
             }
 
             for (size_t i = 0; i < unroll_count; ++i)
-                sum += partial_sums[i];
+                Impl::add(sum, partial_sums[i]);
         }
 
         /// clang cannot vectorize the loop if accumulator is class member instead of local variable.
         T local_sum{};
         while (ptr < end)
         {
-            local_sum += *ptr;
+            Impl::add(local_sum, *ptr);
             ++ptr;
         }
-        sum += local_sum;
+        Impl::add(sum, local_sum);
     }
 
     template <typename Value>
@@ -78,30 +102,34 @@ struct AggregateFunctionSumData
             while (ptr < unrolled_end)
             {
                 for (size_t i = 0; i < unroll_count; ++i)
+                {
                     if (!null_map[i])
-                        partial_sums[i] += ptr[i];
+                    {
+                        Impl::add(partial_sums[i], ptr[i]);
+                    }
+                }
                 ptr += unroll_count;
                 null_map += unroll_count;
             }
 
             for (size_t i = 0; i < unroll_count; ++i)
-                sum += partial_sums[i];
+                Impl::add(sum, partial_sums[i]);
         }
 
         T local_sum{};
         while (ptr < end)
         {
             if (!*null_map)
-                local_sum += *ptr;
+                Impl::add(local_sum, *ptr);
             ++ptr;
             ++null_map;
         }
-        sum += local_sum;
+        Impl::add(sum, local_sum);
     }
 
     void NO_SANITIZE_UNDEFINED merge(const AggregateFunctionSumData & rhs)
     {
-        sum += rhs.sum;
+        Impl::add(sum, rhs.sum);
     }
 
     void write(WriteBuffer & buf) const
@@ -118,6 +146,7 @@ struct AggregateFunctionSumData
     {
         return sum;
     }
+
 };
 
 template <typename T>
diff --git a/src/Core/Types.h b/src/Core/Types.h
index cc8a4d7269a..d96506f31cc 100644
--- a/src/Core/Types.h
+++ b/src/Core/Types.h
@@ -4,6 +4,7 @@
 #include <string>
 #include <vector>
 #include <common/extended_types.h>
+#include <common/defines.h>
 
 
 namespace DB
@@ -166,6 +167,9 @@ struct Decimal
     const Decimal<T> & operator /= (const T & x) { value /= x; return *this; }
     const Decimal<T> & operator %= (const T & x) { value %= x; return *this; }
 
+    /// This is to avoid UB for sumWithOverflow()
+    void NO_SANITIZE_UNDEFINED addOverflow(const T & x) { value += x; }
+
     T value;
 };
 
diff --git a/tests/queries/0_stateless/01664_decimal_ubsan.reference b/tests/queries/0_stateless/01664_decimal_ubsan.reference
new file mode 100644
index 00000000000..f3f57ebe049
--- /dev/null
+++ b/tests/queries/0_stateless/01664_decimal_ubsan.reference
@@ -0,0 +1,3 @@
+-- { echo }
+SELECT sumWithOverflow(a - 65537) FROM (SELECT cast(number AS Decimal32(4)) a FROM numbers(10));
+203668.4592
diff --git a/tests/queries/0_stateless/01664_decimal_ubsan.sql b/tests/queries/0_stateless/01664_decimal_ubsan.sql
new file mode 100644
index 00000000000..46f3ef78752
--- /dev/null
+++ b/tests/queries/0_stateless/01664_decimal_ubsan.sql
@@ -0,0 +1,2 @@
+-- { echo }
+SELECT sumWithOverflow(a - 65537) FROM (SELECT cast(number AS Decimal32(4)) a FROM numbers(10));

From 4593ca80ff8621d0285a57b387694c536b13e097 Mon Sep 17 00:00:00 2001
From: zhang2014 <coswde@gmail.com>
Date: Sun, 24 Jan 2021 15:45:55 +0800
Subject: [PATCH 411/611] ISSUES-18684 fix MaterializeMySQL integration failure

---
 src/Databases/MySQL/MaterializeMySQLSyncThread.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp b/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp
index 5b7ba99baf9..08d170768f4 100644
--- a/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp
+++ b/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp
@@ -44,6 +44,10 @@ static Context createQueryContext(const Context & global_context)
     Settings new_query_settings = global_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);
     CurrentThread::QueryScope query_scope(query_context);

From ab8b78d19dfb0617f711cd4aa82afd003f32b212 Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Sun, 24 Jan 2021 11:32:59 +0300
Subject: [PATCH 412/611] Warning added

---
 docs/en/engines/database-engines/mysql.md | 5 ++++-
 docs/ru/engines/database-engines/mysql.md | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/en/engines/database-engines/mysql.md b/docs/en/engines/database-engines/mysql.md
index d6a84d5f68c..2de07d1fe4b 100644
--- a/docs/en/engines/database-engines/mysql.md
+++ b/docs/en/engines/database-engines/mysql.md
@@ -55,10 +55,13 @@ All other MySQL data types are converted into [String](../../sql-reference/data-
 
 For better compatibility you may address global variables in MySQL style, as `@@identifier`. 
 
-By now only these variables are supported:
+These variables are supported:
 - `version`
 - `max_allowed_packet`
 
+!!! warning "Warning"
+    By now these variables are stubs and don't correspond to anything.
+
 Example:
 
 ``` sql
diff --git a/docs/ru/engines/database-engines/mysql.md b/docs/ru/engines/database-engines/mysql.md
index 28f4f8fddcb..8d9354a7d7a 100644
--- a/docs/ru/engines/database-engines/mysql.md
+++ b/docs/ru/engines/database-engines/mysql.md
@@ -55,10 +55,13 @@ ENGINE = MySQL('host:port', ['database' | database], 'user', 'password')
 
 Для лучшей совместимости к глобальным переменным можно обращаться в формате MySQL, как `@@identifier`. 
 
-В настоящее время поддерживаются следующие переменные:
+Поддерживаются следующие переменные:
 - `version`
 - `max_allowed_packet`
 
+!!! warning "Предупреждение"
+    В настоящее время эти переменные реализованы только как "заглушки" и не содержат актуальных данных.
+
 Пример:
 
 ``` sql

From 173c4b0c3627ebcdd71354f7f84891b13d444ed3 Mon Sep 17 00:00:00 2001
From: feng lv <fenglv15@mails.ucas.ac.cn>
Date: Sun, 24 Jan 2021 09:15:47 +0000
Subject: [PATCH 413/611] add document

---
 .../sql-reference/functions/math-functions.md | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/docs/en/sql-reference/functions/math-functions.md b/docs/en/sql-reference/functions/math-functions.md
index 1f45b69f7a1..8dc287593c7 100644
--- a/docs/en/sql-reference/functions/math-functions.md
+++ b/docs/en/sql-reference/functions/math-functions.md
@@ -413,4 +413,68 @@ Result:
 
 -   [log(x)](../../sql-reference/functions/math-functions.md#logx-lnx)
 
+## sign(x) {#signx}
+
+The `sign` function can extract the sign of a real number.
+
+**Syntax**
+
+``` sql
+sign(x)
+```
+
+**Parameters**
+
+-   `x` — Values from  `-∞` to `+∞`. Support all numeric types in ClickHouse.
+
+**Returned value**
+
+- -1 for `x < 0`
+-  0 for `x = 0`
+-  1 for `x > 0`
+
+**Example**
+
+Query:
+
+``` sql
+SELECT sign(0);
+```
+
+Result:
+
+``` text
+┌─sign(0)─┐
+│       0 │
+└─────────┘
+```
+
+Query:
+
+``` sql
+SELECT sign(1);
+```
+
+Result:
+
+``` text
+┌─sign(1)─┐
+│       1 │
+└─────────┘
+```
+
+Query:
+
+``` sql
+SELECT sign(-1);
+```
+
+Result:
+
+``` text
+┌─sign(-1)─┐
+│       -1 │
+└──────────┘
+```
+
 [Original article](https://clickhouse.tech/docs/en/query_language/functions/math_functions/) <!--hide-->

From fdc6abaaa10a843551d3421df8fb830fc11130e2 Mon Sep 17 00:00:00 2001
From: feng lv <fenglv15@mails.ucas.ac.cn>
Date: Sun, 24 Jan 2021 09:30:25 +0000
Subject: [PATCH 414/611] fix

---
 src/Functions/sign.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Functions/sign.cpp b/src/Functions/sign.cpp
index e1d6137ffa0..bf0938ad6e4 100644
--- a/src/Functions/sign.cpp
+++ b/src/Functions/sign.cpp
@@ -64,25 +64,27 @@ public:
         ColumnWithTypeAndName left{arguments[0].column, arguments[0].type, {}};
         ColumnWithTypeAndName right{zero_column, arguments[0].type, {}};
 
+        auto func_arg = ColumnsWithTypeAndName{left, right};
+
         auto greater = FunctionFactory::instance().get("greater", context);
-        auto greater_compare = greater->build(ColumnsWithTypeAndName{left, right});
+        auto greater_compare = greater->build(func_arg);
 
         /// Unsigned number: sign(n) = greater(n, 0)
         if (isUnsignedInteger(arguments[0].type.get()))
         {
-            return greater_compare->execute({left, right}, greater_compare->getResultType(), input_rows_count);
+            return greater_compare->execute(func_arg, greater_compare->getResultType(), input_rows_count);
         }
 
-        /// Signed number: sign(n) = minus (greater(n, 0), less(n, 0))
+        /// Signed number: sign(n) = minus(greater(n, 0), less(n, 0))
         auto less = FunctionFactory::instance().get("less", context);
-        auto less_compare = less->build(ColumnsWithTypeAndName{left, right});
+        auto less_compare = less->build(func_arg);
 
         ColumnsWithTypeAndName columns(2);
 
         columns[0].type = greater_compare->getResultType();
-        columns[0].column = greater_compare->execute({left, right}, greater_compare->getResultType(), input_rows_count);
+        columns[0].column = greater_compare->execute(func_arg, greater_compare->getResultType(), input_rows_count);
         columns[1].type = less_compare->getResultType();
-        columns[1].column = less_compare->execute({left, right}, less_compare->getResultType(), input_rows_count);
+        columns[1].column = less_compare->execute(func_arg, less_compare->getResultType(), input_rows_count);
 
         auto minus = FunctionFactory::instance().get("minus", context);
         auto elem_minus = minus->build(columns);

From cb30a02540a0f223df6668c5f88ff84aa666ff54 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sun, 24 Jan 2021 11:32:00 +0300
Subject: [PATCH 415/611] Fix UBsan report in addDays(INT64_MAX)

https://clickhouse-test-reports.s3.yandex.net/19466/df53438a66ee95de790b60d35f36eca986590027/fuzzer_ubsan/report.html#fail1
---
 base/common/DateLUTImpl.h                         |  2 +-
 .../0_stateless/01662_date_ubsan.reference        | 15 ++++++++++++++-
 tests/queries/0_stateless/01662_date_ubsan.sql    |  9 ++++++++-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/base/common/DateLUTImpl.h b/base/common/DateLUTImpl.h
index ef74182b333..738455bf52f 100644
--- a/base/common/DateLUTImpl.h
+++ b/base/common/DateLUTImpl.h
@@ -767,7 +767,7 @@ public:
     /// Adding calendar intervals.
     /// Implementation specific behaviour when delta is too big.
 
-    inline time_t addDays(time_t t, Int64 delta) const
+    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);
diff --git a/tests/queries/0_stateless/01662_date_ubsan.reference b/tests/queries/0_stateless/01662_date_ubsan.reference
index 9d7947bd7b7..44fe6b620d5 100644
--- a/tests/queries/0_stateless/01662_date_ubsan.reference
+++ b/tests/queries/0_stateless/01662_date_ubsan.reference
@@ -1,11 +1,22 @@
 -- { echo }
--- tests with INT64_MIN
+-- tests with INT64_MIN (via overflow)
 SELECT addMinutes(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
 2021-01-01 00:00:00
 SELECT addHours(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
 2021-01-01 00:00:00
 SELECT addWeeks(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
 2021-01-01 00:00:00
+SELECT addDays(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
+2021-01-01 00:00:00
+-- tests with INT64_MAX
+SELECT addMinutes(toDateTime('2020-01-01 00:00:00', 'GMT'), 9223372036854775807);
+2019-12-31 23:59:00
+SELECT addHours(toDateTime('2020-01-01 00:00:00', 'GMT'), 9223372036854775807);
+2019-12-31 23:00:00
+SELECT addWeeks(toDateTime('2020-01-01 00:00:00', 'GMT'), 9223372036854775807);
+2019-12-25 00:00:00
+SELECT addDays(toDateTime('2020-01-01 00:00:00', 'GMT'), 9223372036854775807);
+2019-12-31 00:00:00
 -- tests with inf
 SELECT addMinutes(toDateTime('2021-01-01 00:00:00', 'GMT'), inf);
 2021-01-01 00:00:00
@@ -13,3 +24,5 @@ SELECT addHours(toDateTime('2021-01-01 00:00:00', 'GMT'), inf);
 2021-01-01 00:00:00
 SELECT addWeeks(toDateTime('2021-01-01 00:00:00', 'GMT'), inf);
 2021-01-01 00:00:00
+SELECT addDays(toDateTime('2021-01-01 00:00:00', 'GMT'), inf);
+2021-01-01 00:00:00
diff --git a/tests/queries/0_stateless/01662_date_ubsan.sql b/tests/queries/0_stateless/01662_date_ubsan.sql
index ef6fd479be2..07d068d9685 100644
--- a/tests/queries/0_stateless/01662_date_ubsan.sql
+++ b/tests/queries/0_stateless/01662_date_ubsan.sql
@@ -1,9 +1,16 @@
 -- { echo }
--- tests with INT64_MIN
+-- tests with INT64_MIN (via overflow)
 SELECT addMinutes(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
 SELECT addHours(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
 SELECT addWeeks(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
+SELECT addDays(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
+-- tests with INT64_MAX
+SELECT addMinutes(toDateTime('2020-01-01 00:00:00', 'GMT'), 9223372036854775807);
+SELECT addHours(toDateTime('2020-01-01 00:00:00', 'GMT'), 9223372036854775807);
+SELECT addWeeks(toDateTime('2020-01-01 00:00:00', 'GMT'), 9223372036854775807);
+SELECT addDays(toDateTime('2020-01-01 00:00:00', 'GMT'), 9223372036854775807);
 -- tests with inf
 SELECT addMinutes(toDateTime('2021-01-01 00:00:00', 'GMT'), inf);
 SELECT addHours(toDateTime('2021-01-01 00:00:00', 'GMT'), inf);
 SELECT addWeeks(toDateTime('2021-01-01 00:00:00', 'GMT'), inf);
+SELECT addDays(toDateTime('2021-01-01 00:00:00', 'GMT'), inf);

From 1c364b6ee3a44487529954cf2792e615f7de0f82 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sun, 24 Jan 2021 11:00:08 +0300
Subject: [PATCH 416/611] Fix SIGSEGV with
 merge_tree_min_rows_for_concurrent_read/merge_tree_min_bytes_for_concurrent_read=0/UINT64_MAX

In case of 0 or too huge value it will try to read not existing marks
and got:

    Logical error: 'Trying to get non existing mark 11936128518282651045, while size is 2'.
---
 .../MergeTree/MergeTreeDataSelectExecutor.cpp | 43 ++++++++++++++++---
 ...rge_tree_min_for_concurrent_read.reference |  2 +
 ...665_merge_tree_min_for_concurrent_read.sql |  6 +++
 3 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 tests/queries/0_stateless/01665_merge_tree_min_for_concurrent_read.reference
 create mode 100644 tests/queries/0_stateless/01665_merge_tree_min_for_concurrent_read.sql

diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
index 4e1f307137a..6b2e3c5a8a4 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
@@ -849,15 +849,14 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
 namespace
 {
 
+/// Marks are placed whenever threshold on rows or bytes is met.
+/// So we have to return the number of marks on whatever estimate is higher - by rows or by bytes.
 size_t roundRowsOrBytesToMarks(
     size_t rows_setting,
     size_t bytes_setting,
     size_t rows_granularity,
     size_t bytes_granularity)
 {
-    /// Marks are placed whenever threshold on rows or bytes is met.
-    /// So we have to return the number of marks on whatever estimate is higher - by rows or by bytes.
-
     size_t res = (rows_setting + rows_granularity - 1) / rows_granularity;
 
     if (bytes_granularity == 0)
@@ -865,6 +864,34 @@ size_t roundRowsOrBytesToMarks(
     else
         return std::max(res, (bytes_setting + bytes_granularity - 1) / bytes_granularity);
 }
+/// Same as roundRowsOrBytesToMarks() but do not return more then max_marks
+size_t minMarksForConcurrentRead(
+    size_t rows_setting,
+    size_t bytes_setting,
+    size_t rows_granularity,
+    size_t bytes_granularity,
+    size_t max_marks)
+{
+    size_t marks = 1;
+
+    if (rows_setting + rows_granularity <= rows_setting) /// overflow
+        marks = max_marks;
+    else if (rows_setting)
+        marks = (rows_setting + rows_granularity - 1) / rows_granularity;
+
+    if (bytes_granularity == 0)
+        return marks;
+    else
+    {
+        /// Overflow
+        if (bytes_setting + bytes_granularity <= bytes_setting) /// overflow
+            return max_marks;
+        if (bytes_setting)
+            return std::max(marks, (bytes_setting + bytes_granularity - 1) / bytes_granularity);
+        else
+            return marks;
+    }
+}
 
 }
 
@@ -920,11 +947,12 @@ QueryPlanPtr MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreams(
         data_settings->index_granularity,
         index_granularity_bytes);
 
-    const size_t min_marks_for_concurrent_read = roundRowsOrBytesToMarks(
+    const size_t min_marks_for_concurrent_read = minMarksForConcurrentRead(
         settings.merge_tree_min_rows_for_concurrent_read,
         settings.merge_tree_min_bytes_for_concurrent_read,
         data_settings->index_granularity,
-        index_granularity_bytes);
+        index_granularity_bytes,
+        sum_marks);
 
     if (sum_marks > max_marks_to_use_cache)
         use_uncompressed_cache = false;
@@ -1051,11 +1079,12 @@ QueryPlanPtr MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreamsWithOrder(
         data_settings->index_granularity,
         index_granularity_bytes);
 
-    const size_t min_marks_for_concurrent_read = roundRowsOrBytesToMarks(
+    const size_t min_marks_for_concurrent_read = minMarksForConcurrentRead(
         settings.merge_tree_min_rows_for_concurrent_read,
         settings.merge_tree_min_bytes_for_concurrent_read,
         data_settings->index_granularity,
-        index_granularity_bytes);
+        index_granularity_bytes,
+        sum_marks);
 
     if (sum_marks > max_marks_to_use_cache)
         use_uncompressed_cache = false;
diff --git a/tests/queries/0_stateless/01665_merge_tree_min_for_concurrent_read.reference b/tests/queries/0_stateless/01665_merge_tree_min_for_concurrent_read.reference
new file mode 100644
index 00000000000..6ed281c757a
--- /dev/null
+++ b/tests/queries/0_stateless/01665_merge_tree_min_for_concurrent_read.reference
@@ -0,0 +1,2 @@
+1
+1
diff --git a/tests/queries/0_stateless/01665_merge_tree_min_for_concurrent_read.sql b/tests/queries/0_stateless/01665_merge_tree_min_for_concurrent_read.sql
new file mode 100644
index 00000000000..ca324acdce3
--- /dev/null
+++ b/tests/queries/0_stateless/01665_merge_tree_min_for_concurrent_read.sql
@@ -0,0 +1,6 @@
+DROP TABLE IF EXISTS data_01655;
+CREATE TABLE data_01655 (key Int) Engine=MergeTree() ORDER BY key;
+INSERT INTO data_01655 VALUES (1);
+SELECT * FROM data_01655 SETTINGS merge_tree_min_rows_for_concurrent_read=0, merge_tree_min_bytes_for_concurrent_read=0;
+-- UINT64_MAX
+SELECT * FROM data_01655 SETTINGS merge_tree_min_rows_for_concurrent_read=18446744073709551615, merge_tree_min_bytes_for_concurrent_read=18446744073709551615;

From f51c3ee9a3ce9de8967a31784ca0cefd9c0a4455 Mon Sep 17 00:00:00 2001
From: taiyang-li <taiyang_li@163.com>
Date: Sun, 24 Jan 2021 22:54:08 +0800
Subject: [PATCH 417/611] enable length for map, which returns keys number in
 map

---
 src/DataTypes/IDataType.h                     |  1 +
 src/Functions/FunctionStringOrArrayToT.h      | 19 ++++++++++++++++++-
 .../0_stateless/01592_length_map.reference    |  2 ++
 .../queries/0_stateless/01592_length_map.sql  |  6 ++++++
 4 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 tests/queries/0_stateless/01592_length_map.reference
 create mode 100644 tests/queries/0_stateless/01592_length_map.sql

diff --git a/src/DataTypes/IDataType.h b/src/DataTypes/IDataType.h
index cb9fc7f122c..dba5bc3f5a9 100644
--- a/src/DataTypes/IDataType.h
+++ b/src/DataTypes/IDataType.h
@@ -597,6 +597,7 @@ inline bool isEnum(const DataTypePtr & data_type) { return WhichDataType(data_ty
 inline bool isDecimal(const DataTypePtr & data_type) { return WhichDataType(data_type).isDecimal(); }
 inline bool isTuple(const DataTypePtr & data_type) { return WhichDataType(data_type).isTuple(); }
 inline bool isArray(const DataTypePtr & data_type) { return WhichDataType(data_type).isArray(); }
+inline bool isMap(const DataTypePtr & data_type) {return WhichDataType(data_type).isMap(); }
 
 template <typename T>
 inline bool isUInt8(const T & data_type)
diff --git a/src/Functions/FunctionStringOrArrayToT.h b/src/Functions/FunctionStringOrArrayToT.h
index 6330d8f90d6..2108fa7e8b6 100644
--- a/src/Functions/FunctionStringOrArrayToT.h
+++ b/src/Functions/FunctionStringOrArrayToT.h
@@ -7,6 +7,7 @@
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnArray.h>
+#include <Columns/ColumnMap.h>
 
 
 namespace DB
@@ -42,7 +43,7 @@ public:
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isStringOrFixedString(arguments[0])
-            && !isArray(arguments[0]))
+            && !isArray(arguments[0]) && !isMap(arguments[0]))
             throw Exception("Illegal type " + arguments[0]->getName() + " of argument of function " + getName(), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
         return std::make_shared<DataTypeNumber<ResultType>>();
@@ -93,6 +94,22 @@ public:
 
             return col_res;
         }
+        else if (const ColumnMap* col_map = checkAndGetColumn<ColumnMap>(column.get()))
+        {
+            // only function length is implemented for ColumnMap
+            // TODO implemented other functions which use FunctionStringOrArrayToT
+            if (getName() != "length")
+                throw Exception("Illegal column " + arguments[0].column->getName() + " of argument of function " + getName(),
+                    ErrorCodes::ILLEGAL_COLUMN);
+
+            auto col_res = ColumnVector<ResultType>::create();
+            typename ColumnVector<ResultType>::Container & vec_res = col_res->getData();
+            vec_res.resize(col_map->size());
+            const auto & col_nested = col_map->getNestedColumn();
+
+            Impl::array(col_nested.getOffsets(), vec_res);
+            return col_res;
+        }
         else
             throw Exception("Illegal column " + arguments[0].column->getName() + " of argument of function " + getName(),
                 ErrorCodes::ILLEGAL_COLUMN);
diff --git a/tests/queries/0_stateless/01592_length_map.reference b/tests/queries/0_stateless/01592_length_map.reference
new file mode 100644
index 00000000000..51993f072d5
--- /dev/null
+++ b/tests/queries/0_stateless/01592_length_map.reference
@@ -0,0 +1,2 @@
+2
+2
diff --git a/tests/queries/0_stateless/01592_length_map.sql b/tests/queries/0_stateless/01592_length_map.sql
new file mode 100644
index 00000000000..4f2b0737d82
--- /dev/null
+++ b/tests/queries/0_stateless/01592_length_map.sql
@@ -0,0 +1,6 @@
+set allow_experimental_map_type = 1;
+
+drop table if exists table_map;
+create table table_map (a Map(String, String)) engine = Memory;
+insert into table_map values ({'name':'zhangsan', 'gender':'male'}), ({'name':'lisi', 'gender':'female'});
+select length(a) from table_map; 

From 3746f6cbd780f9a415912cb1adb8611e01b34818 Mon Sep 17 00:00:00 2001
From: dankondr <dankondr@icloud.com>
Date: Sun, 24 Jan 2021 15:16:34 +0000
Subject: [PATCH 418/611] Add tests

---
 .../0_stateless/01655_test_isnull_mysql_dialect.reference      | 3 +++
 tests/queries/0_stateless/01655_test_isnull_mysql_dialect.sql  | 3 +++
 .../queries/0_stateless/01656_test_hex_mysql_dialect.reference | 1 +
 tests/queries/0_stateless/01656_test_hex_mysql_dialect.sql     | 1 +
 .../01657_test_toHour_mysql_compatibility.reference            | 1 +
 .../0_stateless/01657_test_toHour_mysql_compatibility.sql      | 1 +
 .../01658_test_base64Encode_mysql_compatibility.reference      | 1 +
 .../01658_test_base64Encode_mysql_compatibility.sql            | 1 +
 .../01659_test_base64Decode_mysql_compatibility.reference      | 1 +
 .../01659_test_base64Decode_mysql_compatibility.sql            | 1 +
 .../01660_test_toDayOfYear_mysql_compatibility.reference       | 1 +
 .../0_stateless/01660_test_toDayOfYear_mysql_compatibility.sql | 1 +
 .../01661_test_toDayOfWeek_mysql_compatibility.reference       | 1 +
 .../0_stateless/01661_test_toDayOfWeek_mysql_compatibility.sql | 1 +
 .../01662_test_toDayOfMonth_mysql_compatibility.reference      | 3 +++
 .../01662_test_toDayOfMonth_mysql_compatibility.sql            | 3 +++
 .../01663_test_toDate_mysql_compatibility.reference            | 1 +
 .../0_stateless/01663_test_toDate_mysql_compatibility.sql      | 1 +
 ..._test_FunctionIPv6NumToString_mysql_compatibility.reference | 1 +
 .../01664_test_FunctionIPv6NumToString_mysql_compatibility.sql | 1 +
 ..._test_FunctionIPv6StringToNum_mysql_compatibility.reference | 1 +
 .../01665_test_FunctionIPv6StringToNum_mysql_compatibility.sql | 1 +
 ..._test_FunctionIPv4NumToString_mysql_compatibility.reference | 1 +
 .../01666_test_FunctionIPv4NumToString_mysql_compatibility.sql | 1 +
 ..._test_FunctionIPv4StringToNum_mysql_compatibility.reference | 1 +
 .../01667_test_FunctionIPv4StringToNum_mysql_compatibility.sql | 1 +
 26 files changed, 34 insertions(+)
 create mode 100644 tests/queries/0_stateless/01655_test_isnull_mysql_dialect.reference
 create mode 100644 tests/queries/0_stateless/01655_test_isnull_mysql_dialect.sql
 create mode 100644 tests/queries/0_stateless/01656_test_hex_mysql_dialect.reference
 create mode 100644 tests/queries/0_stateless/01656_test_hex_mysql_dialect.sql
 create mode 100644 tests/queries/0_stateless/01657_test_toHour_mysql_compatibility.reference
 create mode 100644 tests/queries/0_stateless/01657_test_toHour_mysql_compatibility.sql
 create mode 100644 tests/queries/0_stateless/01658_test_base64Encode_mysql_compatibility.reference
 create mode 100644 tests/queries/0_stateless/01658_test_base64Encode_mysql_compatibility.sql
 create mode 100644 tests/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.reference
 create mode 100644 tests/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.sql
 create mode 100644 tests/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.reference
 create mode 100644 tests/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.sql
 create mode 100644 tests/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.reference
 create mode 100644 tests/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.sql
 create mode 100644 tests/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.reference
 create mode 100644 tests/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.sql
 create mode 100644 tests/queries/0_stateless/01663_test_toDate_mysql_compatibility.reference
 create mode 100644 tests/queries/0_stateless/01663_test_toDate_mysql_compatibility.sql
 create mode 100644 tests/queries/0_stateless/01664_test_FunctionIPv6NumToString_mysql_compatibility.reference
 create mode 100644 tests/queries/0_stateless/01664_test_FunctionIPv6NumToString_mysql_compatibility.sql
 create mode 100644 tests/queries/0_stateless/01665_test_FunctionIPv6StringToNum_mysql_compatibility.reference
 create mode 100644 tests/queries/0_stateless/01665_test_FunctionIPv6StringToNum_mysql_compatibility.sql
 create mode 100644 tests/queries/0_stateless/01666_test_FunctionIPv4NumToString_mysql_compatibility.reference
 create mode 100644 tests/queries/0_stateless/01666_test_FunctionIPv4NumToString_mysql_compatibility.sql
 create mode 100644 tests/queries/0_stateless/01667_test_FunctionIPv4StringToNum_mysql_compatibility.reference
 create mode 100644 tests/queries/0_stateless/01667_test_FunctionIPv4StringToNum_mysql_compatibility.sql

diff --git a/tests/queries/0_stateless/01655_test_isnull_mysql_dialect.reference b/tests/queries/0_stateless/01655_test_isnull_mysql_dialect.reference
new file mode 100644
index 00000000000..9bc58367cea
--- /dev/null
+++ b/tests/queries/0_stateless/01655_test_isnull_mysql_dialect.reference
@@ -0,0 +1,3 @@
+1
+---
+0
diff --git a/tests/queries/0_stateless/01655_test_isnull_mysql_dialect.sql b/tests/queries/0_stateless/01655_test_isnull_mysql_dialect.sql
new file mode 100644
index 00000000000..03970134ca0
--- /dev/null
+++ b/tests/queries/0_stateless/01655_test_isnull_mysql_dialect.sql
@@ -0,0 +1,3 @@
+SELECT ISNULL(NULL);
+SELECT '---';
+SELECT ISNULL('abc');
diff --git a/tests/queries/0_stateless/01656_test_hex_mysql_dialect.reference b/tests/queries/0_stateless/01656_test_hex_mysql_dialect.reference
new file mode 100644
index 00000000000..d9bb888f803
--- /dev/null
+++ b/tests/queries/0_stateless/01656_test_hex_mysql_dialect.reference
@@ -0,0 +1 @@
+0A
diff --git a/tests/queries/0_stateless/01656_test_hex_mysql_dialect.sql b/tests/queries/0_stateless/01656_test_hex_mysql_dialect.sql
new file mode 100644
index 00000000000..7ac335062b8
--- /dev/null
+++ b/tests/queries/0_stateless/01656_test_hex_mysql_dialect.sql
@@ -0,0 +1 @@
+SELECT HEX(10);
diff --git a/tests/queries/0_stateless/01657_test_toHour_mysql_compatibility.reference b/tests/queries/0_stateless/01657_test_toHour_mysql_compatibility.reference
new file mode 100644
index 00000000000..409940768f2
--- /dev/null
+++ b/tests/queries/0_stateless/01657_test_toHour_mysql_compatibility.reference
@@ -0,0 +1 @@
+23
diff --git a/tests/queries/0_stateless/01657_test_toHour_mysql_compatibility.sql b/tests/queries/0_stateless/01657_test_toHour_mysql_compatibility.sql
new file mode 100644
index 00000000000..f691481dfc4
--- /dev/null
+++ b/tests/queries/0_stateless/01657_test_toHour_mysql_compatibility.sql
@@ -0,0 +1 @@
+SELECT HOUR(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01658_test_base64Encode_mysql_compatibility.reference b/tests/queries/0_stateless/01658_test_base64Encode_mysql_compatibility.reference
new file mode 100644
index 00000000000..b861cf46b27
--- /dev/null
+++ b/tests/queries/0_stateless/01658_test_base64Encode_mysql_compatibility.reference
@@ -0,0 +1 @@
+dGVzdCBzdHJpbmc=
diff --git a/tests/queries/0_stateless/01658_test_base64Encode_mysql_compatibility.sql b/tests/queries/0_stateless/01658_test_base64Encode_mysql_compatibility.sql
new file mode 100644
index 00000000000..0d255e771b4
--- /dev/null
+++ b/tests/queries/0_stateless/01658_test_base64Encode_mysql_compatibility.sql
@@ -0,0 +1 @@
+SELECT TO_BASE64('test string');
diff --git a/tests/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.reference b/tests/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.reference
new file mode 100644
index 00000000000..71c19227544
--- /dev/null
+++ b/tests/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.reference
@@ -0,0 +1 @@
+test string
diff --git a/tests/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.sql b/tests/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.sql
new file mode 100644
index 00000000000..3e130716091
--- /dev/null
+++ b/tests/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.sql
@@ -0,0 +1 @@
+SELECT FROM_BASE64('dGVzdCBzdHJpbmc=');
diff --git a/tests/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.reference b/tests/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.reference
new file mode 100644
index 00000000000..f2c1eeebb3f
--- /dev/null
+++ b/tests/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.reference
@@ -0,0 +1 @@
+167
diff --git a/tests/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.sql b/tests/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.sql
new file mode 100644
index 00000000000..7de1d287d2d
--- /dev/null
+++ b/tests/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.sql
@@ -0,0 +1 @@
+SELECT DAYOFYEAR(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.reference b/tests/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.reference
new file mode 100644
index 00000000000..00750edc07d
--- /dev/null
+++ b/tests/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.reference
@@ -0,0 +1 @@
+3
diff --git a/tests/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.sql b/tests/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.sql
new file mode 100644
index 00000000000..cde47ea483e
--- /dev/null
+++ b/tests/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.sql
@@ -0,0 +1 @@
+SELECT DAYOFWEEK(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.reference b/tests/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.reference
new file mode 100644
index 00000000000..5e2287ad2ee
--- /dev/null
+++ b/tests/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.reference
@@ -0,0 +1,3 @@
+15
+---
+15
diff --git a/tests/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.sql b/tests/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.sql
new file mode 100644
index 00000000000..88b97613ff8
--- /dev/null
+++ b/tests/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.sql
@@ -0,0 +1,3 @@
+SELECT DAYOFMONTH(toDateTime('2016-06-15 23:00:00'));
+SELECT '---';
+SELECT DAY(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01663_test_toDate_mysql_compatibility.reference b/tests/queries/0_stateless/01663_test_toDate_mysql_compatibility.reference
new file mode 100644
index 00000000000..7ccd39db9c3
--- /dev/null
+++ b/tests/queries/0_stateless/01663_test_toDate_mysql_compatibility.reference
@@ -0,0 +1 @@
+2016-06-15
diff --git a/tests/queries/0_stateless/01663_test_toDate_mysql_compatibility.sql b/tests/queries/0_stateless/01663_test_toDate_mysql_compatibility.sql
new file mode 100644
index 00000000000..cefa672777c
--- /dev/null
+++ b/tests/queries/0_stateless/01663_test_toDate_mysql_compatibility.sql
@@ -0,0 +1 @@
+SELECT DATE(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01664_test_FunctionIPv6NumToString_mysql_compatibility.reference b/tests/queries/0_stateless/01664_test_FunctionIPv6NumToString_mysql_compatibility.reference
new file mode 100644
index 00000000000..18a9c3436e5
--- /dev/null
+++ b/tests/queries/0_stateless/01664_test_FunctionIPv6NumToString_mysql_compatibility.reference
@@ -0,0 +1 @@
+2a02:6b8::11
diff --git a/tests/queries/0_stateless/01664_test_FunctionIPv6NumToString_mysql_compatibility.sql b/tests/queries/0_stateless/01664_test_FunctionIPv6NumToString_mysql_compatibility.sql
new file mode 100644
index 00000000000..85bf1f8c7f9
--- /dev/null
+++ b/tests/queries/0_stateless/01664_test_FunctionIPv6NumToString_mysql_compatibility.sql
@@ -0,0 +1 @@
+SELECT INET6_NTOA(toFixedString(unhex('2A0206B8000000000000000000000011'), 16));
diff --git a/tests/queries/0_stateless/01665_test_FunctionIPv6StringToNum_mysql_compatibility.reference b/tests/queries/0_stateless/01665_test_FunctionIPv6StringToNum_mysql_compatibility.reference
new file mode 100644
index 00000000000..0b3192fc44c
--- /dev/null
+++ b/tests/queries/0_stateless/01665_test_FunctionIPv6StringToNum_mysql_compatibility.reference
@@ -0,0 +1 @@
+*�\0\0\0\0\0\0\0\0\0\0\0
diff --git a/tests/queries/0_stateless/01665_test_FunctionIPv6StringToNum_mysql_compatibility.sql b/tests/queries/0_stateless/01665_test_FunctionIPv6StringToNum_mysql_compatibility.sql
new file mode 100644
index 00000000000..2eff6cca793
--- /dev/null
+++ b/tests/queries/0_stateless/01665_test_FunctionIPv6StringToNum_mysql_compatibility.sql
@@ -0,0 +1 @@
+SELECT INET6_ATON('2a02:6b8::11');
diff --git a/tests/queries/0_stateless/01666_test_FunctionIPv4NumToString_mysql_compatibility.reference b/tests/queries/0_stateless/01666_test_FunctionIPv4NumToString_mysql_compatibility.reference
new file mode 100644
index 00000000000..08674e64f67
--- /dev/null
+++ b/tests/queries/0_stateless/01666_test_FunctionIPv4NumToString_mysql_compatibility.reference
@@ -0,0 +1 @@
+0.0.5.57
diff --git a/tests/queries/0_stateless/01666_test_FunctionIPv4NumToString_mysql_compatibility.sql b/tests/queries/0_stateless/01666_test_FunctionIPv4NumToString_mysql_compatibility.sql
new file mode 100644
index 00000000000..0c6608c6e74
--- /dev/null
+++ b/tests/queries/0_stateless/01666_test_FunctionIPv4NumToString_mysql_compatibility.sql
@@ -0,0 +1 @@
+SELECT INET_NTOA(toUInt32(1337));
diff --git a/tests/queries/0_stateless/01667_test_FunctionIPv4StringToNum_mysql_compatibility.reference b/tests/queries/0_stateless/01667_test_FunctionIPv4StringToNum_mysql_compatibility.reference
new file mode 100644
index 00000000000..c15798a747d
--- /dev/null
+++ b/tests/queries/0_stateless/01667_test_FunctionIPv4StringToNum_mysql_compatibility.reference
@@ -0,0 +1 @@
+3232235521
diff --git a/tests/queries/0_stateless/01667_test_FunctionIPv4StringToNum_mysql_compatibility.sql b/tests/queries/0_stateless/01667_test_FunctionIPv4StringToNum_mysql_compatibility.sql
new file mode 100644
index 00000000000..6a91900370c
--- /dev/null
+++ b/tests/queries/0_stateless/01667_test_FunctionIPv4StringToNum_mysql_compatibility.sql
@@ -0,0 +1 @@
+SELECT INET_ATON('192.168.0.1');

From 716594fc8d32593eeba63d9f34ca4595ae0e6049 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sun, 24 Jan 2021 19:42:37 +0300
Subject: [PATCH 419/611] Maybe better

---
 docker/test/fuzzer/run-fuzzer.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index a04943f157f..fc6df2ec2cf 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -102,7 +102,7 @@ thread apply all backtrace
 continue
 " > script.gdb
 
-    gdb -batch -command script.gdb -p $server_pid &
+    gdb -batch -command script.gdb -p $(pidof clickhouse-server) &
 
     fuzzer_exit_code=0
     # SC2012: Use find instead of ls to better handle non-alphanumeric filenames. They are all alphanumeric.

From cc11e7c2f2ea0c508c30748623d51c176a5ad21b Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Mon, 25 Jan 2021 00:22:59 +0300
Subject: [PATCH 420/611] Whitespace

---
 src/Compression/ICompressionCodec.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Compression/ICompressionCodec.cpp b/src/Compression/ICompressionCodec.cpp
index 3746753df8b..dec2b633046 100644
--- a/src/Compression/ICompressionCodec.cpp
+++ b/src/Compression/ICompressionCodec.cpp
@@ -63,7 +63,6 @@ ASTPtr ICompressionCodec::getFullCodecDesc() const
 
 ASTPtr ICompressionCodec::getCodecDesc() const
 {
-
     auto arguments = getFullCodecDesc()->as<ASTFunction>()->arguments;
     /// If it has exactly one argument, than it's single codec, return it
     if (arguments->children.size() == 1)

From dac6cceac1cf7e757d6f50725b432d8579f63195 Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Mon, 25 Jan 2021 00:35:49 +0300
Subject: [PATCH 421/611] Function multiIf constant result support

---
 src/Functions/multiIf.cpp                     | 22 +++++++++++++++----
 .../00326_long_function_multi_if.reference    |  4 ++++
 .../00326_long_function_multi_if.sql          | 11 ++++++++++
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/Functions/multiIf.cpp b/src/Functions/multiIf.cpp
index e3eb9fabcbe..4889c458f0d 100644
--- a/src/Functions/multiIf.cpp
+++ b/src/Functions/multiIf.cpp
@@ -134,7 +134,9 @@ public:
             Instruction instruction;
             size_t source_idx = i + 1;
 
-            if (source_idx == args.size())
+            bool last_else_branch = source_idx == args.size();
+
+            if (last_else_branch)
             {
                 /// The last, "else" branch can be treated as a branch with always true condition "else if (true)".
                 --source_idx;
@@ -150,13 +152,15 @@ public:
                 if (cond_col.column->onlyNull())
                     continue;
 
-                if (isColumnConst(*cond_col.column))
+                if (const auto * column_const = checkAndGetColumn<ColumnConst>(*cond_col.column))
                 {
-                    Field value = typeid_cast<const ColumnConst &>(*cond_col.column).getField();
+                    Field value = column_const->getField();
+
                     if (value.isNull())
                         continue;
                     if (value.get<UInt64>() == 0)
                         continue;
+
                     instruction.condition_always_true = true;
                 }
                 else
@@ -189,9 +193,19 @@ public:
                 break;
         }
 
-        size_t rows = input_rows_count;
         MutableColumnPtr res = return_type->createColumn();
 
+        /// Special case if first instruction condition is always true and source is constant
+        if (instructions.size() == 1 && instructions.front().source_is_constant 
+            && instructions.front().condition_always_true)
+        {
+            auto & instruction = instructions.front();
+            res->insertFrom(assert_cast<const ColumnConst &>(*instruction.source).getDataColumn(), 0);
+            return ColumnConst::create(std::move(res), instruction.source->size());
+        }
+
+        size_t rows = input_rows_count;
+
         for (size_t i = 0; i < rows; ++i)
         {
             for (const auto & instruction : instructions)
diff --git a/tests/queries/0_stateless/00326_long_function_multi_if.reference b/tests/queries/0_stateless/00326_long_function_multi_if.reference
index 3007a483c5b..3f59d41468f 100644
--- a/tests/queries/0_stateless/00326_long_function_multi_if.reference
+++ b/tests/queries/0_stateless/00326_long_function_multi_if.reference
@@ -18662,3 +18662,7 @@ Miscellaneous
 1	Москва
 65	Москва
 208	Москва
+Constant result
+Value	1
+Value	1
+ValueFirst	0
diff --git a/tests/queries/0_stateless/00326_long_function_multi_if.sql b/tests/queries/0_stateless/00326_long_function_multi_if.sql
index 3509a076e3c..a7966acf9aa 100644
--- a/tests/queries/0_stateless/00326_long_function_multi_if.sql
+++ b/tests/queries/0_stateless/00326_long_function_multi_if.sql
@@ -1938,3 +1938,14 @@ INSERT INTO multi_if_check(col1) VALUES (10418),(235),(25),(179),(26030),(28381)
 
 SELECT DISTINCT col1, multiIf(col1 != 213, 'Москва', 'Мир') AS k FROM multi_if_check LIMIT 10;
 DROP TABLE IF EXISTS multi_if_check;
+
+SELECT 'Constant result';
+
+CREATE TABLE multi_if_check(value String) ENGINE=TinyLog;
+INSERT INTO multi_if_check VALUES ('1');
+
+SELECT multiIf(2 > 1, 'Value', 'ElseValue') as a, isConstant(a) FROM multi_if_check;
+SELECT multiIf(2 > 1, 'Value', value) as a, isConstant(a) FROM multi_if_check;
+SELECT multiIf(value == '1', 'ValueFirst', 2 > 1, 'ValueSecond', 'ElseValue') as a, isConstant(a) FROM multi_if_check;
+
+DROP TABLE IF EXISTS multi_if_check;

From 9e34739b0e11aad5e3833e403259543ef3989833 Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Mon, 25 Jan 2021 05:45:58 +0300
Subject: [PATCH 422/611] Update run-fuzzer.sh

---
 docker/test/fuzzer/run-fuzzer.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index fc6df2ec2cf..20cdc5bf10c 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -102,7 +102,7 @@ thread apply all backtrace
 continue
 " > script.gdb
 
-    gdb -batch -command script.gdb -p $(pidof clickhouse-server) &
+    gdb -batch -command script.gdb -p "$(pidof clickhouse-server)" &
 
     fuzzer_exit_code=0
     # SC2012: Use find instead of ls to better handle non-alphanumeric filenames. They are all alphanumeric.

From 8ba8e8efd5a4095c0d49834c5ca09887ae20462b Mon Sep 17 00:00:00 2001
From: Vladimir Chebotarev <vladimir.chebotarev@gmail.com>
Date: Thu, 7 Jan 2021 06:42:39 +0300
Subject: [PATCH 423/611] Added prefix-based S3 endpoint settings.

---
 src/Storages/StorageS3.cpp                    |  3 +-
 src/Storages/StorageS3Settings.cpp            | 59 +++++++++++--------
 tests/integration/helpers/client.py           |  9 ++-
 .../test_storage_s3/configs/defaultS3.xml     |  3 +
 .../test_storage_s3/s3_mock/mock_s3.py        |  4 +-
 tests/integration/test_storage_s3/test.py     | 14 +++++
 6 files changed, 63 insertions(+), 29 deletions(-)

diff --git a/src/Storages/StorageS3.cpp b/src/Storages/StorageS3.cpp
index 1920a84e447..7524cb18f9f 100644
--- a/src/Storages/StorageS3.cpp
+++ b/src/Storages/StorageS3.cpp
@@ -216,7 +216,8 @@ StorageS3::StorageS3(
     storage_metadata.setConstraints(constraints_);
     setInMemoryMetadata(storage_metadata);
 
-    auto settings = context_.getStorageS3Settings().getSettings(uri.endpoint);
+    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));
diff --git a/src/Storages/StorageS3Settings.cpp b/src/Storages/StorageS3Settings.cpp
index 9c4dc5831dc..8c0c16c0bc9 100644
--- a/src/Storages/StorageS3Settings.cpp
+++ b/src/Storages/StorageS3Settings.cpp
@@ -3,6 +3,8 @@
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/Exception.h>
 
+#include <boost/algorithm/string/predicate.hpp>
+
 
 namespace DB
 {
@@ -23,39 +25,50 @@ void StorageS3Settings::loadFromConfig(const String & config_elem, const Poco::U
 
     for (const String & key : config_keys)
     {
-        auto endpoint = config.getString(config_elem + "." + key + ".endpoint");
-        auto access_key_id = config.getString(config_elem + "." + key + ".access_key_id", "");
-        auto secret_access_key = config.getString(config_elem + "." + key + ".secret_access_key", "");
-        std::optional<bool> use_environment_credentials;
-        if (config.has(config_elem + "." + key + ".use_environment_credentials"))
+        if (config.has(config_elem + "." + key + ".endpoint"))
         {
-            use_environment_credentials = config.getBool(config_elem + "." + key + ".use_environment_credentials");
-        }
-
-        HeaderCollection headers;
-        Poco::Util::AbstractConfiguration::Keys subconfig_keys;
-        config.keys(config_elem + "." + key, subconfig_keys);
-        for (const String & subkey : subconfig_keys)
-        {
-            if (subkey.starts_with("header"))
+            auto endpoint = config.getString(config_elem + "." + key + ".endpoint");
+            auto access_key_id = config.getString(config_elem + "." + key + ".access_key_id", "");
+            auto secret_access_key = config.getString(config_elem + "." + key + ".secret_access_key", "");
+            std::optional<bool> use_environment_credentials;
+            if (config.has(config_elem + "." + key + ".use_environment_credentials"))
             {
-                auto header_str = config.getString(config_elem + "." + key + "." + subkey);
-                auto delimiter = header_str.find(':');
-                if (delimiter == String::npos)
-                    throw Exception("Malformed s3 header value", ErrorCodes::INVALID_CONFIG_PARAMETER);
-                headers.emplace_back(HttpHeader{header_str.substr(0, delimiter), header_str.substr(delimiter + 1, String::npos)});
+                use_environment_credentials = config.getBool(config_elem + "." + key + ".use_environment_credentials");
             }
-        }
 
-        settings.emplace(endpoint, S3AuthSettings{std::move(access_key_id), std::move(secret_access_key), std::move(headers), use_environment_credentials});
+            HeaderCollection headers;
+            Poco::Util::AbstractConfiguration::Keys subconfig_keys;
+            config.keys(config_elem + "." + key, subconfig_keys);
+            for (const String & subkey : subconfig_keys)
+            {
+                if (subkey.starts_with("header"))
+                {
+                    auto header_str = config.getString(config_elem + "." + key + "." + subkey);
+                    auto delimiter = header_str.find(':');
+                    if (delimiter == String::npos)
+                        throw Exception("Malformed s3 header value", ErrorCodes::INVALID_CONFIG_PARAMETER);
+                    headers.emplace_back(HttpHeader{header_str.substr(0, delimiter), header_str.substr(delimiter + 1, String::npos)});
+                }
+            }
+
+            settings.emplace(endpoint, S3AuthSettings{std::move(access_key_id), std::move(secret_access_key), std::move(headers), use_environment_credentials});
+        }
     }
 }
 
 S3AuthSettings StorageS3Settings::getSettings(const String & endpoint) const
 {
     std::lock_guard lock(mutex);
-    if (auto setting = settings.find(endpoint); setting != settings.end())
-        return setting->second;
+    auto next_prefix_setting = settings.upper_bound(endpoint);
+
+    /// Linear time algorithm may be replaced with logarithmic with prefix tree map.
+    for (auto possible_prefix_setting = next_prefix_setting; possible_prefix_setting != settings.begin(); )
+    {
+        std::advance(possible_prefix_setting, -1);
+        if (boost::algorithm::starts_with(endpoint, possible_prefix_setting->first))
+            return possible_prefix_setting->second;
+    }
+
     return {};
 }
 
diff --git a/tests/integration/helpers/client.py b/tests/integration/helpers/client.py
index a43440e41f7..04b6082e95f 100644
--- a/tests/integration/helpers/client.py
+++ b/tests/integration/helpers/client.py
@@ -61,7 +61,10 @@ class QueryTimeoutExceedException(Exception):
 
 
 class QueryRuntimeException(Exception):
-    pass
+    def __init__(self, message, returncode, stderr):
+        super(QueryRuntimeException, self).__init__(message)
+        self.returncode = returncode
+        self.stderr = stderr
 
 
 class CommandRequest:
@@ -106,7 +109,7 @@ class CommandRequest:
 
         if (self.process.returncode != 0 or stderr) and not self.ignore_error:
             raise QueryRuntimeException(
-                'Client failed! Return code: {}, stderr: {}'.format(self.process.returncode, stderr))
+                'Client failed! Return code: {}, stderr: {}'.format(self.process.returncode, stderr), self.process.returncode, stderr)
 
         return stdout
 
@@ -122,7 +125,7 @@ class CommandRequest:
             raise QueryTimeoutExceedException('Client timed out!')
 
         if (self.process.returncode == 0):
-            raise QueryRuntimeException('Client expected to be failed but succeeded! stdout: {}'.format(stdout))
+            raise QueryRuntimeException('Client expected to be failed but succeeded! stdout: {}'.format(stdout), self.process.returncode, stderr)
 
         return stderr
 
diff --git a/tests/integration/test_storage_s3/configs/defaultS3.xml b/tests/integration/test_storage_s3/configs/defaultS3.xml
index 26dc52f9e8f..08fbc4ae131 100644
--- a/tests/integration/test_storage_s3/configs/defaultS3.xml
+++ b/tests/integration/test_storage_s3/configs/defaultS3.xml
@@ -4,5 +4,8 @@
             <endpoint>http://resolver:8080</endpoint>
             <header>Authorization: Bearer TOKEN</header>
         </s3_mock>
+        <s3_mock_restricted_directory>
+            <endpoint>http://resolver:8080/root-with-auth/restricteddirectory/</endpoint>
+        </s3_mock_restricted_directory>
     </s3>
 </yandex>
diff --git a/tests/integration/test_storage_s3/s3_mock/mock_s3.py b/tests/integration/test_storage_s3/s3_mock/mock_s3.py
index d76fe4ac36d..088cc883e57 100644
--- a/tests/integration/test_storage_s3/s3_mock/mock_s3.py
+++ b/tests/integration/test_storage_s3/s3_mock/mock_s3.py
@@ -1,14 +1,14 @@
 from bottle import abort, route, run, request, response
 
 
-@route('/redirected/<_path>')
+@route('/redirected/<_path:path>')
 def infinite_redirect(_path):
     response.set_header("Location", request.url)
     response.status = 307
     return 'Redirected'
 
 
-@route('/<_bucket>/<_path>')
+@route('/<_bucket>/<_path:path>')
 def server(_bucket, _path):
     for name in request.headers:
         if name == 'Authorization' and request.headers[name] == 'Bearer TOKEN':
diff --git a/tests/integration/test_storage_s3/test.py b/tests/integration/test_storage_s3/test.py
index 9e49c5ebf8f..a97493b5def 100644
--- a/tests/integration/test_storage_s3/test.py
+++ b/tests/integration/test_storage_s3/test.py
@@ -410,6 +410,20 @@ def test_custom_auth_headers(cluster):
     assert result == '1\t2\t3\n'
 
 
+def test_custom_auth_headers_exclusion(cluster):
+    table_format = "column1 UInt32, column2 UInt32, column3 UInt32"
+    filename = "test.csv"
+    get_query = f"SELECT * FROM s3('http://resolver:8080/{cluster.minio_restricted_bucket}/restricteddirectory/{filename}', 'CSV', '{table_format}')"
+
+    instance = cluster.instances["dummy"]  # type: ClickHouseInstance
+    with pytest.raises(helpers.client.QueryRuntimeException) as ei:
+        result = run_query(instance, get_query)
+        print(result)
+
+    assert ei.value.returncode == 243
+    assert '403 Forbidden' in ei.value.stderr
+
+
 def test_infinite_redirect(cluster):
     bucket = "redirected"
     table_format = "column1 UInt32, column2 UInt32, column3 UInt32"

From 7a675c996e862f0b32922421e799a37755ec4b46 Mon Sep 17 00:00:00 2001
From: Vladimir Chebotarev <vladimir.chebotarev@gmail.com>
Date: Mon, 25 Jan 2021 09:33:53 +0300
Subject: [PATCH 424/611] Added documentation for S3 endpoints.

---
 .../engines/table-engines/integrations/s3.md  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/docs/en/engines/table-engines/integrations/s3.md b/docs/en/engines/table-engines/integrations/s3.md
index c024d9e71b0..2af04025c75 100644
--- a/docs/en/engines/table-engines/integrations/s3.md
+++ b/docs/en/engines/table-engines/integrations/s3.md
@@ -124,6 +124,31 @@ The following settings can be set before query execution or placed into configur
 
 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 {#s3endpointsettings}
+
+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.
+
+This configuration also applies to S3 disks in `MergeTree` table engine family.
+
+Example:
+
+```
+<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> -->
+    </endpoint-name>
+</s3>
+
+
 **See Also**
 
 -   [Virtual columns](../../../engines/table-engines/index.md#table_engines-virtual_columns)

From 94f6a5533e197d090221bb62940555c66d0e3d85 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Mon, 25 Jan 2021 10:43:20 +0300
Subject: [PATCH 425/611] Fix 01459_manual_write_to_replicas flaky test

---
 .../queries/0_stateless/01459_manual_write_to_replicas.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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 0a437d689fa..467c29d3d33 100755
--- a/tests/queries/0_stateless/01459_manual_write_to_replicas.sh
+++ b/tests/queries/0_stateless/01459_manual_write_to_replicas.sh
@@ -32,7 +32,9 @@ wait
 for i in $(seq 1 $NUM_REPLICAS); do
     $CLICKHOUSE_CLIENT -n -q "
         SYSTEM SYNC REPLICA r$i;
-        SELECT count(), min(x), max(x), sum(x) FROM r$i;
-        DROP TABLE IF EXISTS r$i;
-"
+        SELECT count(), min(x), max(x), sum(x) FROM r$i;"
+done
+
+for i in $(seq 1 $NUM_REPLICAS); do
+    $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS r$i;"
 done

From ec5d541a6679530dd14058fb715f8a7c40749816 Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Mon, 25 Jan 2021 11:08:10 +0300
Subject: [PATCH 426/611] Fixed style issues

---
 src/Functions/multiIf.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Functions/multiIf.cpp b/src/Functions/multiIf.cpp
index 4889c458f0d..8ca92954873 100644
--- a/src/Functions/multiIf.cpp
+++ b/src/Functions/multiIf.cpp
@@ -196,7 +196,7 @@ public:
         MutableColumnPtr res = return_type->createColumn();
 
         /// Special case if first instruction condition is always true and source is constant
-        if (instructions.size() == 1 && instructions.front().source_is_constant 
+        if (instructions.size() == 1 && instructions.front().source_is_constant
             && instructions.front().condition_always_true)
         {
             auto & instruction = instructions.front();

From 18fb642e4540e6cc289d32359c0ed9f128f82086 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Mon, 25 Jan 2021 11:53:04 +0300
Subject: [PATCH 427/611] Check for hung queries in fast test

---
 docker/test/fasttest/run.sh |  4 ++--
 tests/clickhouse-test       | 32 +++++++++++++++++++++-----------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index 7211ce31a87..7555b5591d0 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -337,7 +337,7 @@ function run_tests
         01666_blns
     )
 
-    time clickhouse-test -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"
+    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"
 
     # substr is to remove semicolon after test name
     readarray -t FAILED_TESTS < <(awk '/\[ FAIL|TIMEOUT|ERROR \]/ { print substr($3, 1, length($3)-1) }' "$FASTTEST_OUTPUT/test_log.txt" | tee "$FASTTEST_OUTPUT/failed-parallel-tests.txt")
@@ -360,7 +360,7 @@ function run_tests
 
         echo "Going to run again: ${FAILED_TESTS[*]}"
 
-        clickhouse-test --order=random --no-long --testname --shard --zookeeper "${FAILED_TESTS[@]}" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee -a "$FASTTEST_OUTPUT/test_log.txt"
+        clickhouse-test --hung-check --order=random --no-long --testname --shard --zookeeper "${FAILED_TESTS[@]}" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee -a "$FASTTEST_OUTPUT/test_log.txt"
     else
         echo "No failed tests"
     fi
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index d5c6019d28f..91e9700e32c 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -197,11 +197,14 @@ def need_retry(stderr):
     return any(msg in stderr for msg in MESSAGES_TO_RETRY)
 
 
-def get_processlist(client_cmd):
+def get_processlist(args):
     try:
-        return subprocess.check_output("{} --query 'SHOW PROCESSLIST FORMAT Vertical'".format(client_cmd), shell=True).decode('utf-8')
-    except:
-        return "" #  server seems dead
+        clickhouse_proc = Popen(shlex.split(args.client), stdin=PIPE, stdout=PIPE, stderr=PIPE)
+        (stdout, _) = clickhouse_proc.communicate((b"SHOW PROCESSLIST FORMAT Vertical"), timeout=10)
+        return False, stdout.decode('utf-8')
+    except Exception as ex:
+        print("Exception", ex)
+        return True, ""
 
 
 # collect server stacktraces using gdb
@@ -334,9 +337,13 @@ def run_tests_array(all_tests_with_params):
 
                     if args.testname:
                         clickhouse_proc = Popen(shlex.split(args.client), stdin=PIPE, stdout=PIPE, stderr=PIPE, universal_newlines=True)
-                        clickhouse_proc.communicate(("SELECT 'Running test {suite}/{case} from pid={pid}';".format(pid = os.getpid(), case = case, suite = suite)), timeout=10)
+                        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)
+                        except:
+                            failed_to_check = True
 
-                        if clickhouse_proc.returncode != 0:
+                        if failed_to_check or clickhouse_proc.returncode != 0:
                             failures += 1
                             print("Server does not respond to health check")
                             SERVER_DIED = True
@@ -760,14 +767,17 @@ def main(args):
 
         # Some queries may execute in background for some time after test was finished. This is normal.
         for n in range(1, 60):
-            processlist = get_processlist(args.client)
-            if not processlist:
+            timeout, processlist = get_processlist(args)
+            if timeout or not processlist:
                 break
             sleep(1)
 
-        if processlist:
-            print(colored("\nFound hung queries in processlist:", args, "red", attrs=["bold"]))
-            print(processlist)
+        if timeout or processlist:
+            if processlist:
+                print(colored("\nFound hung queries in processlist:", args, "red", attrs=["bold"]))
+                print(processlist)
+            else:
+                print(colored("Seems like server hung and cannot respond to queries", "red", attrs=["bold"]))
 
             clickhouse_tcp_port = os.getenv("CLICKHOUSE_PORT_TCP", '9000')
             server_pid = get_server_pid(clickhouse_tcp_port)

From 9fc1eba0bc81af28d53cc894301b872a7c999970 Mon Sep 17 00:00:00 2001
From: tavplubix <avtokmakov@yandex-team.ru>
Date: Mon, 25 Jan 2021 12:40:49 +0300
Subject: [PATCH 428/611] Update DateLUTImpl.h

---
 base/common/DateLUTImpl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/common/DateLUTImpl.h b/base/common/DateLUTImpl.h
index 3e981558733..ab0b2f14fb2 100644
--- a/base/common/DateLUTImpl.h
+++ b/base/common/DateLUTImpl.h
@@ -863,7 +863,7 @@ public:
         return lut[result_day].date + time_offset;
     }
 
-    inline DayNum addYears(DayNum d, Int64 delta) const
+    inline NO_SANITIZE_UNDEFINED DayNum addYears(DayNum d, Int64 delta) const
     {
         const Values & values = lut[d];
 

From a88a564aae3b98a4d86d4ec7c8167132777933f2 Mon Sep 17 00:00:00 2001
From: tavplubix <avtokmakov@yandex-team.ru>
Date: Mon, 25 Jan 2021 12:51:06 +0300
Subject: [PATCH 429/611] Update ReplicatedMergeTreeQueue.cpp

---
 src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
index 71574b6ef9d..acd96c20f7b 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
@@ -302,6 +302,13 @@ void ReplicatedMergeTreeQueue::removeCoveredPartsFromMutations(const String & pa
 void ReplicatedMergeTreeQueue::addPartToMutations(const String & part_name)
 {
     auto part_info = MergeTreePartInfo::fromPartName(part_name, format_version);
+
+    /// Do not add special virtual parts to parts_to_do
+    auto max_level = MergeTreePartInfo::MAX_LEVEL;      /// DROP/DETACH PARTITION
+    auto another_max_level = std::numeric_limits<decltype(part_info.level)>::max();    /// REPLACE/MOVE PARTITION
+    if (part_info.level == max_level || part_info.level == another_max_level)
+        return;
+    
     auto in_partition = mutations_by_partition.find(part_info.partition_id);
     if (in_partition == mutations_by_partition.end())
         return;
@@ -310,11 +317,6 @@ void ReplicatedMergeTreeQueue::addPartToMutations(const String & part_name)
     for (auto it = from_it; it != in_partition->second.end(); ++it)
     {
         MutationStatus & status = *it->second;
-        /// Do not add special virtual parts to parts_to_do
-        auto max_level = MergeTreePartInfo::MAX_LEVEL;      /// DROP/DETACH PARTITION
-        auto another_max_level = std::numeric_limits<decltype(part_info.level)>::max();    /// REPLACE/MOVE PARTITION
-        if (part_info.level == max_level || part_info.level == another_max_level)
-            continue;
         status.parts_to_do.add(part_name);
     }
 }

From 586def7fa35175072fa444cb2ace91fa9f7fb450 Mon Sep 17 00:00:00 2001
From: taiyang-li <taiyang_li@163.com>
Date: Mon, 25 Jan 2021 18:31:39 +0800
Subject: [PATCH 430/611] enable empty/notEmpty for map data type

---
 src/Functions/FunctionStringOrArrayToT.h             |  6 ------
 tests/queries/0_stateless/01592_length_map.reference |  6 +++++-
 tests/queries/0_stateless/01592_length_map.sql       | 10 ++++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Functions/FunctionStringOrArrayToT.h b/src/Functions/FunctionStringOrArrayToT.h
index 2108fa7e8b6..efbfec2aba1 100644
--- a/src/Functions/FunctionStringOrArrayToT.h
+++ b/src/Functions/FunctionStringOrArrayToT.h
@@ -96,12 +96,6 @@ public:
         }
         else if (const ColumnMap* col_map = checkAndGetColumn<ColumnMap>(column.get()))
         {
-            // only function length is implemented for ColumnMap
-            // TODO implemented other functions which use FunctionStringOrArrayToT
-            if (getName() != "length")
-                throw Exception("Illegal column " + arguments[0].column->getName() + " of argument of function " + getName(),
-                    ErrorCodes::ILLEGAL_COLUMN);
-
             auto col_res = ColumnVector<ResultType>::create();
             typename ColumnVector<ResultType>::Container & vec_res = col_res->getData();
             vec_res.resize(col_map->size());
diff --git a/tests/queries/0_stateless/01592_length_map.reference b/tests/queries/0_stateless/01592_length_map.reference
index 51993f072d5..ae0a0551df9 100644
--- a/tests/queries/0_stateless/01592_length_map.reference
+++ b/tests/queries/0_stateless/01592_length_map.reference
@@ -1,2 +1,6 @@
 2
-2
+0
+0
+1
+1
+0
diff --git a/tests/queries/0_stateless/01592_length_map.sql b/tests/queries/0_stateless/01592_length_map.sql
index 4f2b0737d82..368029a5aac 100644
--- a/tests/queries/0_stateless/01592_length_map.sql
+++ b/tests/queries/0_stateless/01592_length_map.sql
@@ -1,6 +1,8 @@
 set allow_experimental_map_type = 1;
 
-drop table if exists table_map;
-create table table_map (a Map(String, String)) engine = Memory;
-insert into table_map values ({'name':'zhangsan', 'gender':'male'}), ({'name':'lisi', 'gender':'female'});
-select length(a) from table_map; 
+select length(map(1,2,3,4));
+select length(map());
+select empty(map(1,2,3,4));
+select empty(map());
+select notEmpty(map(1,2,3,4));
+select notEmpty(map());
\ No newline at end of file

From ab7f15c77e68d87fe132cfcc291bb5049d67b734 Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Mon, 25 Jan 2021 15:43:35 +0300
Subject: [PATCH 431/611] Query CREATE DICTIONARY id expression fix

---
 .../getDictionaryConfigurationFromAST.cpp     | 56 ++++++++++++-------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
index 5c8159be750..2d4f971ef58 100644
--- a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
+++ b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
@@ -180,6 +180,32 @@ Names getPrimaryKeyColumns(const ASTExpressionList * primary_key)
     return result;
 }
 
+void buildAttributeExpressionIfNeeded(
+    AutoPtr<Document> doc,
+    AutoPtr<Element> root,
+    const ASTDictionaryAttributeDeclaration * dict_attr)
+{
+    if (dict_attr->expression != nullptr)
+    {
+        AutoPtr<Element> expression_element(doc->createElement("expression"));
+
+        /// EXPRESSION PROPERTY should be expression or string
+        String expression_str;
+        if (const auto * literal = dict_attr->expression->as<ASTLiteral>();
+                literal && literal->value.getType() == Field::Types::String)
+        {
+            expression_str = getFieldAsString(literal->value);
+        }
+        else
+            expression_str = queryToString(dict_attr->expression);
+
+
+        AutoPtr<Text> expression(doc->createTextNode(expression_str));
+        expression_element->appendChild(expression);
+        root->appendChild(expression_element);
+    }
+}
+
 /**
   * Transofrms single dictionary attribute to configuration
   *  third_column UInt8 DEFAULT 2 EXPRESSION rand() % 100 * 77
@@ -217,25 +243,7 @@ void buildSingleAttribute(
     null_value_element->appendChild(null_value);
     attribute_element->appendChild(null_value_element);
 
-    if (dict_attr->expression != nullptr)
-    {
-        AutoPtr<Element> expression_element(doc->createElement("expression"));
-
-        /// EXPRESSION PROPERTY should be expression or string
-        String expression_str;
-        if (const auto * literal = dict_attr->expression->as<ASTLiteral>();
-                literal && literal->value.getType() == Field::Types::String)
-        {
-            expression_str = getFieldAsString(literal->value);
-        }
-        else
-            expression_str = queryToString(dict_attr->expression);
-
-
-        AutoPtr<Text> expression(doc->createTextNode(expression_str));
-        expression_element->appendChild(expression);
-        attribute_element->appendChild(expression_element);
-    }
+    buildAttributeExpressionIfNeeded(doc, attribute_element, dict_attr);
 
     if (dict_attr->hierarchical)
     {
@@ -286,6 +294,8 @@ void buildPrimaryKeyConfiguration(
     const Names & key_names,
     const ASTExpressionList * dictionary_attributes)
 {
+    const auto & children = dictionary_attributes->children;
+
     if (!complex)
     {
         if (key_names.size() != 1)
@@ -296,12 +306,16 @@ void buildPrimaryKeyConfiguration(
         root->appendChild(id_element);
         AutoPtr<Element> name_element(doc->createElement("name"));
         id_element->appendChild(name_element);
-        AutoPtr<Text> name(doc->createTextNode(*key_names.begin()));
+
+        const ASTDictionaryAttributeDeclaration * dict_attr = children.front()->as<const ASTDictionaryAttributeDeclaration>();
+
+        AutoPtr<Text> name(doc->createTextNode(dict_attr->name));
         name_element->appendChild(name);
+
+        buildAttributeExpressionIfNeeded(doc, id_element, dict_attr);
     }
     else
     {
-        const auto & children = dictionary_attributes->children;
         if (children.size() < key_names.size())
             throw Exception(
                 "Primary key fields count is more, than dictionary attributes count.", ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);

From 769257acf42768bbab4644cf220e9e7c684f5c69 Mon Sep 17 00:00:00 2001
From: Alexander Tokmakov <avtokmakov@yandex-team.ru>
Date: Mon, 25 Jan 2021 15:44:10 +0300
Subject: [PATCH 432/611] fix drop table on cluster hang

---
 src/Interpreters/DDLWorker.cpp                              | 6 ++++++
 .../0_stateless/01181_db_atomic_drop_on_cluster.reference   | 5 +++++
 .../queries/0_stateless/01181_db_atomic_drop_on_cluster.sql | 6 ++++++
 3 files changed, 17 insertions(+)
 create mode 100644 tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.reference
 create mode 100644 tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql

diff --git a/src/Interpreters/DDLWorker.cpp b/src/Interpreters/DDLWorker.cpp
index 6dab60f57d1..b1d9f872daa 100644
--- a/src/Interpreters/DDLWorker.cpp
+++ b/src/Interpreters/DDLWorker.cpp
@@ -727,9 +727,15 @@ void DDLWorker::processTask(DDLTask & task)
                 }
 
                 if (storage && taskShouldBeExecutedOnLeader(rewritten_ast, storage)  && !task.is_circular_replicated)
+                {
                     tryExecuteQueryOnLeaderReplica(task, storage, rewritten_query, task.entry_path, zookeeper);
+                }
                 else
+                {
+                    /// StoragePtr may cause DROP TABLE to hang
+                    storage.reset();
                     tryExecuteQuery(rewritten_query, task, task.execution_status);
+                }
             }
             else
                 tryExecuteQuery(rewritten_query, task, task.execution_status);
diff --git a/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.reference b/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.reference
new file mode 100644
index 00000000000..5e2366c8a41
--- /dev/null
+++ b/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.reference
@@ -0,0 +1,5 @@
+localhost	9000	0		0	0
+localhost	9000	0		0	0
+localhost	9000	0		0	0
+localhost	9000	0		0	0
+localhost	9000	0		0	0
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
new file mode 100644
index 00000000000..ca393c36617
--- /dev/null
+++ b/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql
@@ -0,0 +1,6 @@
+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;
+DROP TABLE test_repl ON CLUSTER test_shard_localhost SYNC;

From 8f115f2923c7d3f15af37dd55236cf637e285f2c Mon Sep 17 00:00:00 2001
From: dankondr <dankondr@icloud.com>
Date: Mon, 25 Jan 2021 15:59:49 +0300
Subject: [PATCH 433/611] Add toMonth MySQL compatibility alias

---
 src/Functions/toMonth.cpp                                       | 2 ++
 .../0_stateless/01668_test_toMonth_mysql_dialect.reference      | 1 +
 tests/queries/0_stateless/01668_test_toMonth_mysql_dialect.sql  | 1 +
 3 files changed, 4 insertions(+)
 create mode 100644 tests/queries/0_stateless/01668_test_toMonth_mysql_dialect.reference
 create mode 100644 tests/queries/0_stateless/01668_test_toMonth_mysql_dialect.sql

diff --git a/src/Functions/toMonth.cpp b/src/Functions/toMonth.cpp
index 91ac349d9a1..a61543a897b 100644
--- a/src/Functions/toMonth.cpp
+++ b/src/Functions/toMonth.cpp
@@ -12,6 +12,8 @@ using FunctionToMonth = FunctionDateOrDateTimeToSomething<DataTypeUInt8, ToMonth
 void registerFunctionToMonth(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionToMonth>();
+    /// MysQL compatibility alias.
+    factory.registerFunction<FunctionToMonth>("MONTH", FunctionFactory::CaseInsensitive);
 }
 
 }
diff --git a/tests/queries/0_stateless/01668_test_toMonth_mysql_dialect.reference b/tests/queries/0_stateless/01668_test_toMonth_mysql_dialect.reference
new file mode 100644
index 00000000000..1e8b3149621
--- /dev/null
+++ b/tests/queries/0_stateless/01668_test_toMonth_mysql_dialect.reference
@@ -0,0 +1 @@
+6
diff --git a/tests/queries/0_stateless/01668_test_toMonth_mysql_dialect.sql b/tests/queries/0_stateless/01668_test_toMonth_mysql_dialect.sql
new file mode 100644
index 00000000000..fa2e1e41555
--- /dev/null
+++ b/tests/queries/0_stateless/01668_test_toMonth_mysql_dialect.sql
@@ -0,0 +1 @@
+SELECT MONTH(toDateTime('2016-06-15 23:00:00'));
\ No newline at end of file

From d7c5dd3767b3acf6dde188123e2e17c75b060fbd Mon Sep 17 00:00:00 2001
From: dankondr <dankondr@icloud.com>
Date: Mon, 25 Jan 2021 16:00:11 +0300
Subject: [PATCH 434/611] Add toYear MySQL compatibility alias

---
 src/Functions/toYear.cpp                                        | 2 ++
 .../0_stateless/01669_test_toYear_mysql_dialect.reference       | 1 +
 tests/queries/0_stateless/01669_test_toYear_mysql_dialect.sql   | 1 +
 3 files changed, 4 insertions(+)
 create mode 100644 tests/queries/0_stateless/01669_test_toYear_mysql_dialect.reference
 create mode 100644 tests/queries/0_stateless/01669_test_toYear_mysql_dialect.sql

diff --git a/src/Functions/toYear.cpp b/src/Functions/toYear.cpp
index 870582e2ccd..8db857c132e 100644
--- a/src/Functions/toYear.cpp
+++ b/src/Functions/toYear.cpp
@@ -12,6 +12,8 @@ using FunctionToYear = FunctionDateOrDateTimeToSomething<DataTypeUInt16, ToYearI
 void registerFunctionToYear(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionToYear>();
+    /// MysQL compatibility alias.
+    factory.registerFunction<FunctionToYear>("YEAR", FunctionFactory::CaseInsensitive);
 }
 
 }
diff --git a/tests/queries/0_stateless/01669_test_toYear_mysql_dialect.reference b/tests/queries/0_stateless/01669_test_toYear_mysql_dialect.reference
new file mode 100644
index 00000000000..6f6d045ba55
--- /dev/null
+++ b/tests/queries/0_stateless/01669_test_toYear_mysql_dialect.reference
@@ -0,0 +1 @@
+2016
diff --git a/tests/queries/0_stateless/01669_test_toYear_mysql_dialect.sql b/tests/queries/0_stateless/01669_test_toYear_mysql_dialect.sql
new file mode 100644
index 00000000000..f7cd84314e2
--- /dev/null
+++ b/tests/queries/0_stateless/01669_test_toYear_mysql_dialect.sql
@@ -0,0 +1 @@
+SELECT YEAR(toDateTime('2016-06-15 23:00:00'));
\ No newline at end of file

From 5f07bfb9f8b6170808c17c8a942915c1ef3d1c37 Mon Sep 17 00:00:00 2001
From: tavplubix <avtokmakov@yandex-team.ru>
Date: Mon, 25 Jan 2021 16:15:47 +0300
Subject: [PATCH 435/611] Update ReplicatedMergeTreeQueue.cpp

---
 src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
index acd96c20f7b..ab1254acc5f 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
@@ -308,7 +308,7 @@ void ReplicatedMergeTreeQueue::addPartToMutations(const String & part_name)
     auto another_max_level = std::numeric_limits<decltype(part_info.level)>::max();    /// REPLACE/MOVE PARTITION
     if (part_info.level == max_level || part_info.level == another_max_level)
         return;
-    
+
     auto in_partition = mutations_by_partition.find(part_info.partition_id);
     if (in_partition == mutations_by_partition.end())
         return;

From f49c8779a8d8bb8c62d35efbb0c964a92cc7a62d Mon Sep 17 00:00:00 2001
From: dankondr <dankondr@icloud.com>
Date: Mon, 25 Jan 2021 16:20:01 +0300
Subject: [PATCH 436/611] Add repeat MySQL compatibility alias

---
 src/Functions/repeat.cpp                                        | 2 +-
 .../0_stateless/01670_test_repeat_mysql_dialect.reference       | 1 +
 tests/queries/0_stateless/01670_test_repeat_mysql_dialect.sql   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 tests/queries/0_stateless/01670_test_repeat_mysql_dialect.reference
 create mode 100644 tests/queries/0_stateless/01670_test_repeat_mysql_dialect.sql

diff --git a/src/Functions/repeat.cpp b/src/Functions/repeat.cpp
index e612ceb4945..29347d6a275 100644
--- a/src/Functions/repeat.cpp
+++ b/src/Functions/repeat.cpp
@@ -252,7 +252,7 @@ public:
 
 void registerFunctionRepeat(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionRepeat>();
+    factory.registerFunction<FunctionRepeat>(FunctionFactory::CaseInsensitive);
 }
 
 }
diff --git a/tests/queries/0_stateless/01670_test_repeat_mysql_dialect.reference b/tests/queries/0_stateless/01670_test_repeat_mysql_dialect.reference
new file mode 100644
index 00000000000..58ee46e8942
--- /dev/null
+++ b/tests/queries/0_stateless/01670_test_repeat_mysql_dialect.reference
@@ -0,0 +1 @@
+TestTestTest
diff --git a/tests/queries/0_stateless/01670_test_repeat_mysql_dialect.sql b/tests/queries/0_stateless/01670_test_repeat_mysql_dialect.sql
new file mode 100644
index 00000000000..29fe81012ec
--- /dev/null
+++ b/tests/queries/0_stateless/01670_test_repeat_mysql_dialect.sql
@@ -0,0 +1 @@
+SELECT REPEAT('Test', 3);
\ No newline at end of file

From 8ca52f9894aef4ccdef342812f7e9f2e55bacd40 Mon Sep 17 00:00:00 2001
From: dankondr <dankondr@icloud.com>
Date: Mon, 25 Jan 2021 16:24:06 +0300
Subject: [PATCH 437/611] Add toQuarter MySQL compatibility alias

---
 src/Functions/toQuarter.cpp                                     | 2 ++
 .../0_stateless/01671_test_toQuarter_mysql_dialect.reference    | 1 +
 .../queries/0_stateless/01671_test_toQuarter_mysql_dialect.sql  | 1 +
 3 files changed, 4 insertions(+)
 create mode 100644 tests/queries/0_stateless/01671_test_toQuarter_mysql_dialect.reference
 create mode 100644 tests/queries/0_stateless/01671_test_toQuarter_mysql_dialect.sql

diff --git a/src/Functions/toQuarter.cpp b/src/Functions/toQuarter.cpp
index f046c3abe46..55fc3e83b1b 100644
--- a/src/Functions/toQuarter.cpp
+++ b/src/Functions/toQuarter.cpp
@@ -12,6 +12,8 @@ using FunctionToQuarter = FunctionDateOrDateTimeToSomething<DataTypeUInt8, ToQua
 void registerFunctionToQuarter(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionToQuarter>();
+    /// MysQL compatibility alias.
+    factory.registerFunction<FunctionToQuarter>("QUARTER", FunctionFactory::CaseInsensitive);
 }
 
 }
diff --git a/tests/queries/0_stateless/01671_test_toQuarter_mysql_dialect.reference b/tests/queries/0_stateless/01671_test_toQuarter_mysql_dialect.reference
new file mode 100644
index 00000000000..0cfbf08886f
--- /dev/null
+++ b/tests/queries/0_stateless/01671_test_toQuarter_mysql_dialect.reference
@@ -0,0 +1 @@
+2
diff --git a/tests/queries/0_stateless/01671_test_toQuarter_mysql_dialect.sql b/tests/queries/0_stateless/01671_test_toQuarter_mysql_dialect.sql
new file mode 100644
index 00000000000..b6fa41f8b49
--- /dev/null
+++ b/tests/queries/0_stateless/01671_test_toQuarter_mysql_dialect.sql
@@ -0,0 +1 @@
+SELECT QUARTER(toDateTime('2016-06-15 23:00:00'));
\ No newline at end of file

From 23e86a57d816e391fd88834eb188863101515c19 Mon Sep 17 00:00:00 2001
From: dankondr <dankondr@icloud.com>
Date: Mon, 25 Jan 2021 16:26:38 +0300
Subject: [PATCH 438/611] Add toSecond MySQL compatibility alias

---
 src/Functions/toSecond.cpp                                      | 2 ++
 .../0_stateless/01672_test_toSecond_mysql_dialect.reference     | 1 +
 tests/queries/0_stateless/01672_test_toSecond_mysql_dialect.sql | 1 +
 3 files changed, 4 insertions(+)
 create mode 100644 tests/queries/0_stateless/01672_test_toSecond_mysql_dialect.reference
 create mode 100644 tests/queries/0_stateless/01672_test_toSecond_mysql_dialect.sql

diff --git a/src/Functions/toSecond.cpp b/src/Functions/toSecond.cpp
index 90196cc6722..a631a2646d6 100644
--- a/src/Functions/toSecond.cpp
+++ b/src/Functions/toSecond.cpp
@@ -12,6 +12,8 @@ using FunctionToSecond = FunctionDateOrDateTimeToSomething<DataTypeUInt8, ToSeco
 void registerFunctionToSecond(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionToSecond>();
+    /// MysQL compatibility alias.
+    factory.registerFunction<FunctionToSecond>("SECOND", FunctionFactory::CaseInsensitive);
 }
 
 }
diff --git a/tests/queries/0_stateless/01672_test_toSecond_mysql_dialect.reference b/tests/queries/0_stateless/01672_test_toSecond_mysql_dialect.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/01672_test_toSecond_mysql_dialect.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/01672_test_toSecond_mysql_dialect.sql b/tests/queries/0_stateless/01672_test_toSecond_mysql_dialect.sql
new file mode 100644
index 00000000000..adb72b9843c
--- /dev/null
+++ b/tests/queries/0_stateless/01672_test_toSecond_mysql_dialect.sql
@@ -0,0 +1 @@
+SELECT SECOND(toDateTime('2016-06-15 23:00:00'));
\ No newline at end of file

From fb268ec339aeb2cbab0df5137ead3efb8374cc32 Mon Sep 17 00:00:00 2001
From: dankondr <dankondr@icloud.com>
Date: Mon, 25 Jan 2021 16:35:58 +0300
Subject: [PATCH 439/611] Add toMinute MySQL compatibility alias

---
 src/Functions/toMinute.cpp                                      | 2 ++
 .../0_stateless/01673_test_toMinute_mysql_dialect.reference     | 1 +
 tests/queries/0_stateless/01673_test_toMinute_mysql_dialect.sql | 1 +
 3 files changed, 4 insertions(+)
 create mode 100644 tests/queries/0_stateless/01673_test_toMinute_mysql_dialect.reference
 create mode 100644 tests/queries/0_stateless/01673_test_toMinute_mysql_dialect.sql

diff --git a/src/Functions/toMinute.cpp b/src/Functions/toMinute.cpp
index a928925156e..27a79bb0e53 100644
--- a/src/Functions/toMinute.cpp
+++ b/src/Functions/toMinute.cpp
@@ -12,6 +12,8 @@ using FunctionToMinute = FunctionDateOrDateTimeToSomething<DataTypeUInt8, ToMinu
 void registerFunctionToMinute(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionToMinute>();
+    /// MysQL compatibility alias.
+    factory.registerFunction<FunctionToMinute>("MINUTE", FunctionFactory::CaseInsensitive);
 }
 
 }
diff --git a/tests/queries/0_stateless/01673_test_toMinute_mysql_dialect.reference b/tests/queries/0_stateless/01673_test_toMinute_mysql_dialect.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/01673_test_toMinute_mysql_dialect.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/01673_test_toMinute_mysql_dialect.sql b/tests/queries/0_stateless/01673_test_toMinute_mysql_dialect.sql
new file mode 100644
index 00000000000..4ac7106158a
--- /dev/null
+++ b/tests/queries/0_stateless/01673_test_toMinute_mysql_dialect.sql
@@ -0,0 +1 @@
+SELECT MINUTE(toDateTime('2016-06-15 23:00:00'));
\ No newline at end of file

From 522767f4f0a72c3c718f69df94ec6ceac6503044 Mon Sep 17 00:00:00 2001
From: Ivan Blinkov <github@blinkov.ru>
Date: Mon, 25 Jan 2021 16:59:42 +0300
Subject: [PATCH 440/611] Update LICENSE

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index f79538892b8..408a672a54d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2016-2020 Yandex LLC
+Copyright 2016-2021 Yandex LLC
 
                                  Apache License
                            Version 2.0, January 2004

From b54baebb9204333c320b5b62325ed574a87235b2 Mon Sep 17 00:00:00 2001
From: Ivan Blinkov <github@blinkov.ru>
Date: Mon, 25 Jan 2021 17:00:13 +0300
Subject: [PATCH 441/611] Update LICENSE

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 408a672a54d..9167b80e269 100644
--- a/LICENSE
+++ b/LICENSE
@@ -188,7 +188,7 @@ Copyright 2016-2021 Yandex LLC
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2016-2020 Yandex LLC
+   Copyright 2016-2021 Yandex LLC
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

From 39c99edfe5db0a65537eab183d1eb676f035f313 Mon Sep 17 00:00:00 2001
From: Daria Mozhaeva <dmozhaeva@yandex-team.ru>
Date: Mon, 25 Jan 2021 17:13:29 +0300
Subject: [PATCH 442/611] edit eng ver

---
 docs/en/engines/table-engines/integrations/embedded-rocksdb.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/engines/table-engines/integrations/embedded-rocksdb.md b/docs/en/engines/table-engines/integrations/embedded-rocksdb.md
index 95602fa313a..b1d21cc5f00 100644
--- a/docs/en/engines/table-engines/integrations/embedded-rocksdb.md
+++ b/docs/en/engines/table-engines/integrations/embedded-rocksdb.md
@@ -1,4 +1,4 @@
-.---
+---
 toc_priority: 6
 toc_title: EmbeddedRocksDB
 ---

From f70a704e2cd8ee4ecd5b7b13d064fb41e2d0ad10 Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Mon, 25 Jan 2021 21:22:27 +0300
Subject: [PATCH 443/611] Added test

---
 ...dictionary_create_key_expression.reference |  8 ++++
 ...01670_dictionary_create_key_expression.sql | 40 +++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 tests/queries/0_stateless/01670_dictionary_create_key_expression.reference
 create mode 100644 tests/queries/0_stateless/01670_dictionary_create_key_expression.sql

diff --git a/tests/queries/0_stateless/01670_dictionary_create_key_expression.reference b/tests/queries/0_stateless/01670_dictionary_create_key_expression.reference
new file mode 100644
index 00000000000..eb246761f9c
--- /dev/null
+++ b/tests/queries/0_stateless/01670_dictionary_create_key_expression.reference
@@ -0,0 +1,8 @@
+Simple
+5791441145865411458	Test2
+3450587330153346914	Test1
+3111929972906540512	Test3
+Complex
+3111929972906540512	5	Test3
+5791441145865411458	5	Test2
+3450587330153346914	5	Test1
diff --git a/tests/queries/0_stateless/01670_dictionary_create_key_expression.sql b/tests/queries/0_stateless/01670_dictionary_create_key_expression.sql
new file mode 100644
index 00000000000..2d75764c0fa
--- /dev/null
+++ b/tests/queries/0_stateless/01670_dictionary_create_key_expression.sql
@@ -0,0 +1,40 @@
+CREATE DATABASE database_dictionary_test_key_expression;
+
+CREATE TABLE database_dictionary_test_key_expression.test_for_dictionary (value String) ENGINE=TinyLog;
+INSERT INTO database_dictionary_test_key_expression.test_for_dictionary VALUES ('Test1'), ('Test2'), ('Test3');
+
+SELECT 'Simple';
+
+CREATE DICTIONARY database_dictionary_test_key_expression.test_query_log_dictionary_simple
+(
+    `value_id` UInt64 EXPRESSION cityHash64(value),
+    `value` String
+)
+PRIMARY KEY value_id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'test_for_dictionary' DB 'database_dictionary_test_key_expression'))
+LIFETIME(MIN 1 MAX 10)
+LAYOUT(HASHED());
+
+SELECT * FROM database_dictionary_test_key_expression.test_query_log_dictionary_simple;
+
+DROP DICTIONARY IF EXISTS database_dictionary_test_key_expression.test_query_log_dictionary_simple;
+
+SELECT 'Complex';
+
+CREATE DICTIONARY database_dictionary_test_key_expression.test_query_log_dictionary_complex
+(
+    `value_id` UInt64 EXPRESSION cityHash64(value),
+    `value_length` UInt64 EXPRESSION length(value),
+    `value` String
+)
+PRIMARY KEY value_id, value_length
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'test_for_dictionary' DB 'database_dictionary_test_key_expression'))
+LIFETIME(MIN 1 MAX 10)
+LAYOUT(COMPLEX_KEY_HASHED());
+
+SELECT * FROM database_dictionary_test_key_expression.test_query_log_dictionary_complex;
+
+DROP DICTIONARY IF EXISTS database_dictionary_test_key_expression.test_query_log_dictionary_complex;
+
+DROP TABLE IF EXISTS database_dictionary_test_key_expression.test_for_dictionary;
+DROP DATABASE IF EXISTS database_dictionary_test_key_expression;

From cec83bb76a3b5a57b45991713ac4deb2d2d053ab Mon Sep 17 00:00:00 2001
From: Anna <annaconda@bk.ru>
Date: Mon, 25 Jan 2021 21:49:13 +0300
Subject: [PATCH 444/611] Update

---
 docs/en/engines/database-engines/atomic.md    |  6 ++--
 docs/en/engines/database-engines/index.md     |  4 +--
 .../sql-reference/statements/create/table.md  | 32 +++++++------------
 3 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/docs/en/engines/database-engines/atomic.md b/docs/en/engines/database-engines/atomic.md
index 026f1ba04e4..f019b94a00b 100644
--- a/docs/en/engines/database-engines/atomic.md
+++ b/docs/en/engines/database-engines/atomic.md
@@ -6,10 +6,12 @@ toc_title: Atomic
 
 # Atomic {#atomic}
 
-It is an experimental database engine, it supports non-blocking `DROP` and `RENAME TABLE` queries and atomic `EXCHANGE TABLES t1 AND t2` queries.
+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}
 
-    CREATE DATABASE test ENGINE = Atomic;
+```sql
+CREATE DATABASE test ENGINE = Atomic;
+```
 
 [Original article](https://clickhouse.tech/docs/en/engines/database_engines/atomic/) <!--hide-->
diff --git a/docs/en/engines/database-engines/index.md b/docs/en/engines/database-engines/index.md
index 23d4ff4b951..2db11998483 100644
--- a/docs/en/engines/database-engines/index.md
+++ b/docs/en/engines/database-engines/index.md
@@ -8,7 +8,7 @@ toc_title: Introduction
 
 Database engines allow you to work with tables.
 
-By default, ClickHouse uses its native database engine, which provides configurable [table engines](../../engines/table-engines/index.md) and an [SQL dialect](../../sql-reference/syntax.md).
+By default, ClickHouse uses database engine [Atomic](../../engines/database-engines/atomic.md). It is provides configurable [table engines](../../engines/table-engines/index.md) and an [SQL dialect](../../sql-reference/syntax.md).
 
 You can also use the following database engines:
 
@@ -18,6 +18,4 @@ You can also use the following database engines:
 
 -   [Lazy](../../engines/database-engines/lazy.md)
 
--   [Atomic](../../engines/database-engines/atomic.md)
-
 [Original article](https://clickhouse.tech/docs/en/database_engines/) <!--hide-->
diff --git a/docs/en/sql-reference/statements/create/table.md b/docs/en/sql-reference/statements/create/table.md
index 177fe0010a7..162feed7023 100644
--- a/docs/en/sql-reference/statements/create/table.md
+++ b/docs/en/sql-reference/statements/create/table.md
@@ -14,7 +14,7 @@ By default, tables are created only on the current server. Distributed DDL queri
 ### With Explicit Schema {#with-explicit-schema}
 
 ``` sql
-CREATE [OR REPLACE] TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
+CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 (
     name1 [type1] [NULL|NOT NULL] [DEFAULT|MATERIALIZED|ALIAS expr1] [compression_codec] [TTL expr1],
     name2 [type2] [NULL|NOT NULL] [DEFAULT|MATERIALIZED|ALIAS expr2] [compression_codec] [TTL expr2],
@@ -34,7 +34,7 @@ If necessary, primary key can be specified, with one or more key expressions.
 ### With a Schema Similar to Other Table {#with-a-schema-similar-to-other-table}
 
 ``` sql
-CREATE [OR REPLACE]  TABLE [IF NOT EXISTS] [db.]table_name AS [db2.]name2 [ENGINE = engine]
+CREATE TABLE [IF NOT EXISTS] [db.]table_name AS [db2.]name2 [ENGINE = engine]
 ```
 
 Creates a table with the same structure as another table. You can specify a different engine for the table. If the engine is not specified, the same engine will be used as for the `db2.name2` table.
@@ -42,13 +42,13 @@ Creates a table with the same structure as another table. You can specify a diff
 ### From a Table Function {#from-a-table-function}
 
 ``` sql
-CREATE [OR REPLACE] TABLE [IF NOT EXISTS] [db.]table_name AS table_function()
+CREATE TABLE [IF NOT EXISTS] [db.]table_name AS table_function()
 ```
 
 Creates a table with the structure and data returned by a [table function](../../../sql-reference/table-functions/index.md#table-functions).
 
 ``` sql
-CREATE [OR REPLACE] TABLE [IF NOT EXISTS] [db.]table_name ENGINE = engine AS SELECT ...
+CREATE TABLE [IF NOT EXISTS] [db.]table_name 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.
@@ -268,21 +268,11 @@ It’s possible to use tables with [ENGINE = Memory](../../../engines/table-engi
 !!!note "Note"
     This query is supported only for [Atomic](../../../engines/database_engines/atomic.md) database engine.
 
-If you need to reject(delete) some data from a table, you can create a new table and fill it with a `SELECT` statement that doesn't retrieve unwanted data, then rename it to old table name:
+If you need to delete some data from a table, you can create a new table and fill it with a `SELECT` statement that doesn't retrieve unwanted data, then drop the old table and rename the new one:
 
 ```sql
 CREATE TABLE myNewTable AS myOldTable;
-```
-
-Then load data with:
-
-```sql
 INSERT INTO myNewTable SELECT * FROM myOldTable WHERE CounterID <12345;
-```
-
-Drop old table and rename:
-
-```sql
 DROP TABLE myOldTable;
 RENAME TABLE myNewTable TO myOldTable;
 ```
@@ -293,18 +283,18 @@ Instead of above, you can use the following:
 REPLACE TABLE myOldTable SELECT * FROM myOldTable WHERE CounterID <12345;
 ```
 
-**Examples:**
+### Syntax
 
-`REPLACE` for a non-existent table will cause an error.
+{CREATE [OR REPLACE]|REPLACE} TABLE [db.]table_name
 
-```sql
-CREATE DATABASE base ENGINE = Atomic;
-REPLACE TABLE base.t1 (n UInt64, s String) ENGINE = MergeTree ORDER BY n; -- { serverError 60 }
-```
+All syntax forms for `CREATE` query also work for this query. `REPLACE` for a non-existent table will cause an error.
+
+### Examples:
 
 Using `REPLACE` query to change data in columns.
 
 ```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;

From ce9a6d32eb6a93a214b5caaf7ef0e90aeab1a27f Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Mon, 25 Jan 2021 21:53:47 +0300
Subject: [PATCH 445/611] Updated tests with always false condition

---
 tests/queries/0_stateless/00326_long_function_multi_if.reference | 1 +
 tests/queries/0_stateless/00326_long_function_multi_if.sql       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/queries/0_stateless/00326_long_function_multi_if.reference b/tests/queries/0_stateless/00326_long_function_multi_if.reference
index 3f59d41468f..effb05eb2f5 100644
--- a/tests/queries/0_stateless/00326_long_function_multi_if.reference
+++ b/tests/queries/0_stateless/00326_long_function_multi_if.reference
@@ -18666,3 +18666,4 @@ Constant result
 Value	1
 Value	1
 ValueFirst	0
+ElseValue	1
diff --git a/tests/queries/0_stateless/00326_long_function_multi_if.sql b/tests/queries/0_stateless/00326_long_function_multi_if.sql
index a7966acf9aa..3e460511487 100644
--- a/tests/queries/0_stateless/00326_long_function_multi_if.sql
+++ b/tests/queries/0_stateless/00326_long_function_multi_if.sql
@@ -1947,5 +1947,6 @@ INSERT INTO multi_if_check VALUES ('1');
 SELECT multiIf(2 > 1, 'Value', 'ElseValue') as a, isConstant(a) FROM multi_if_check;
 SELECT multiIf(2 > 1, 'Value', value) as a, isConstant(a) FROM multi_if_check;
 SELECT multiIf(value == '1', 'ValueFirst', 2 > 1, 'ValueSecond', 'ElseValue') as a, isConstant(a) FROM multi_if_check;
+SELECT multiIf(1 > 2, 'Value', 'ElseValue') as a, isConstant(a);
 
 DROP TABLE IF EXISTS multi_if_check;

From 6137e5530f9eae5e0b2e3a9196d73b7acddd054e Mon Sep 17 00:00:00 2001
From: Anna <annaconda@bk.ru>
Date: Mon, 25 Jan 2021 22:17:46 +0300
Subject: [PATCH 446/611] Update examples

---
 .../sql-reference/statements/create/table.md  | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/docs/en/sql-reference/statements/create/table.md b/docs/en/sql-reference/statements/create/table.md
index 162feed7023..1bca5e079c6 100644
--- a/docs/en/sql-reference/statements/create/table.md
+++ b/docs/en/sql-reference/statements/create/table.md
@@ -291,27 +291,47 @@ All syntax forms for `CREATE` query also work for this query. `REPLACE` for a no
 
 ### Examples:
 
-Using `REPLACE` query to change data in columns.
+Consider the table:
 
 ```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 │
+└───┴──────┘
+```
+
+Using `REPLACE` query to clear all data:
+
+```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 │
+└───┴────┘
+```
+
+Using `REPLACE` query to change table structure:
+
+```sql
 REPLACE TABLE base.t1 (n UInt64) ENGINE = MergeTree ORDER BY n;
 INSERT INTO base.t1 VALUES (3);
 SELECT * FROM base.t1;
 ```
 
 ```text
-1   test
-2   \N
-3
+┌─n─┐
+│ 3 │
+└───┘
 ```
 
  [Original article](https://clickhouse.tech/docs/en/sql-reference/statements/create/table) <!--hide-->

From a47b0190fdf3b1eaf3f3f7c43dac92bd37bc57f2 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Mon, 25 Jan 2021 22:25:49 +0300
Subject: [PATCH 447/611] Add a test

---
 tests/queries/0_stateless/01670_log_comment.reference | 3 +++
 tests/queries/0_stateless/01670_log_comment.sql       | 5 +++++
 2 files changed, 8 insertions(+)
 create mode 100644 tests/queries/0_stateless/01670_log_comment.reference
 create mode 100644 tests/queries/0_stateless/01670_log_comment.sql

diff --git a/tests/queries/0_stateless/01670_log_comment.reference b/tests/queries/0_stateless/01670_log_comment.reference
new file mode 100644
index 00000000000..b6335f432cf
--- /dev/null
+++ b/tests/queries/0_stateless/01670_log_comment.reference
@@ -0,0 +1,3 @@
+1
+QueryStart	SELECT 1;
+QueryFinish	SELECT 1;
diff --git a/tests/queries/0_stateless/01670_log_comment.sql b/tests/queries/0_stateless/01670_log_comment.sql
new file mode 100644
index 00000000000..bbe7330cc74
--- /dev/null
+++ b/tests/queries/0_stateless/01670_log_comment.sql
@@ -0,0 +1,5 @@
+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() AND type = 1 ORDER BY event_time DESC LIMIT 1;
+SELECT type, query FROM system.query_log WHERE log_comment = 'log_comment test' AND event_date >= yesterday() AND type = 2 ORDER BY event_time DESC LIMIT 1;

From 9f8ab99dd12a6f60a20f5f84ab2f5d53874c6ae7 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Mon, 25 Jan 2021 22:29:29 +0300
Subject: [PATCH 448/611] Use log_comment in clickhouse-test

---
 tests/clickhouse-test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index 91e9700e32c..b1282ad5f41 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -151,7 +151,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} < " + pattern
+        pattern = "{client} --send_logs_level={logs_level} --testmode --multiquery {options} --log_comment='{test}' < " + pattern
 
     command = pattern.format(**params)
 

From 6634432253c20b542910a500c093010e6d2f6bf5 Mon Sep 17 00:00:00 2001
From: Anna <annaconda@bk.ru>
Date: Mon, 25 Jan 2021 23:17:08 +0300
Subject: [PATCH 449/611] Correction

---
 docs/en/sql-reference/statements/create/table.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/statements/create/table.md b/docs/en/sql-reference/statements/create/table.md
index 1bca5e079c6..5bce4231a31 100644
--- a/docs/en/sql-reference/statements/create/table.md
+++ b/docs/en/sql-reference/statements/create/table.md
@@ -263,7 +263,7 @@ It’s possible to use tables with [ENGINE = Memory](../../../engines/table-engi
 
 ## REPLACE TABLE {#replace-table-query}
 
-`REPLACE` query allows you to add, drop, and rename data in the tables.
+'REPLACE' query allows you to update the data in the table atomically.
 
 !!!note "Note"
     This query is supported only for [Atomic](../../../engines/database_engines/atomic.md) database engine.

From 2e317b22b70183f6ebca6f5792b18c650a779162 Mon Sep 17 00:00:00 2001
From: Anna <annaconda@bk.ru>
Date: Mon, 25 Jan 2021 23:22:34 +0300
Subject: [PATCH 450/611] add symlinks

---
 docs/es/engines/database-engines/atomic.md | 17 +++++++++++++++++
 docs/fr/engines/database-engines/atomic.md | 17 +++++++++++++++++
 docs/ja/engines/database-engines/atomic.md | 17 +++++++++++++++++
 docs/zh/engines/database-engines/atomic.md | 17 +++++++++++++++++
 4 files changed, 68 insertions(+)
 create mode 100644 docs/es/engines/database-engines/atomic.md
 create mode 100644 docs/fr/engines/database-engines/atomic.md
 create mode 100644 docs/ja/engines/database-engines/atomic.md
 create mode 100644 docs/zh/engines/database-engines/atomic.md

diff --git a/docs/es/engines/database-engines/atomic.md b/docs/es/engines/database-engines/atomic.md
new file mode 100644
index 00000000000..f019b94a00b
--- /dev/null
+++ b/docs/es/engines/database-engines/atomic.md
@@ -0,0 +1,17 @@
+---
+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/atomic.md b/docs/fr/engines/database-engines/atomic.md
new file mode 100644
index 00000000000..f019b94a00b
--- /dev/null
+++ b/docs/fr/engines/database-engines/atomic.md
@@ -0,0 +1,17 @@
+---
+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/ja/engines/database-engines/atomic.md b/docs/ja/engines/database-engines/atomic.md
new file mode 100644
index 00000000000..f019b94a00b
--- /dev/null
+++ b/docs/ja/engines/database-engines/atomic.md
@@ -0,0 +1,17 @@
+---
+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/zh/engines/database-engines/atomic.md b/docs/zh/engines/database-engines/atomic.md
new file mode 100644
index 00000000000..f019b94a00b
--- /dev/null
+++ b/docs/zh/engines/database-engines/atomic.md
@@ -0,0 +1,17 @@
+---
+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-->

From 9ee5c1535ef282889f4a6c361fcb27c66dc95f08 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Mon, 25 Jan 2021 23:29:04 +0300
Subject: [PATCH 451/611] Allow to disable checksums on read

---
 src/Core/Settings.h                                    | 1 +
 src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp | 3 ++-
 src/Storages/MergeTree/MergeTreeIOSettings.h           | 2 ++
 src/Storages/MergeTree/MergeTreeReaderCompact.cpp      | 6 ++++++
 src/Storages/MergeTree/MergeTreeReaderStream.cpp       | 3 +++
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index cc32417af09..11c10b6f5c6 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -139,6 +139,7 @@ class IColumn;
     \
     M(UInt64, min_bytes_to_use_direct_io, 0, "The minimum number of bytes for reading the data with O_DIRECT option during SELECT queries execution. 0 - disabled.", 0) \
     M(UInt64, min_bytes_to_use_mmap_io, 0, "The minimum number of bytes for reading the data with mmap option during SELECT queries execution. 0 - disabled.", 0) \
+    M(Bool, checksum_on_read, true, "Validate checksums on reading. It is enabled by default and should be always enabled in production. Please do not expect any benefits in disabling this setting. It may only be used for experiments and benchmarks. The setting only applicable for tables of MergeTree family. Checksums are always validated for other table engines and when receiving data over network.", 0) \
     \
     M(Bool, force_index_by_date, 0, "Throw an exception if there is a partition key in a table, and it is not used.", 0) \
     M(Bool, force_primary_key, 0, "Throw an exception if there is primary key in a table, and it is not used.", 0) \
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
index 6b2e3c5a8a4..c414e735c0a 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
@@ -547,7 +547,8 @@ 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,
         .max_read_buffer_size = settings.max_read_buffer_size,
-        .save_marks_in_cache = true
+        .checksum_on_read = settings.checksum_on_read,
+        .save_marks_in_cache = true,
     };
 
     /// PREWHERE
diff --git a/src/Storages/MergeTree/MergeTreeIOSettings.h b/src/Storages/MergeTree/MergeTreeIOSettings.h
index d82aa7dd7c2..f2469494792 100644
--- a/src/Storages/MergeTree/MergeTreeIOSettings.h
+++ b/src/Storages/MergeTree/MergeTreeIOSettings.h
@@ -16,6 +16,8 @@ struct MergeTreeReaderSettings
     bool save_marks_in_cache = false;
     /// Convert old-style nested (single arrays with same prefix, `n.a`, `n.b`...) to subcolumns of data type Nested.
     bool convert_nested_to_subcolumns = false;
+    /// Validate checksums on reading (should be always enabled in production).
+    bool checksum_on_read = true;
 };
 
 struct MergeTreeWriterSettings
diff --git a/src/Storages/MergeTree/MergeTreeReaderCompact.cpp b/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
index 635c59cf19a..67268e8afd8 100644
--- a/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
@@ -92,6 +92,9 @@ MergeTreeReaderCompact::MergeTreeReaderCompact(
             if (profile_callback_)
                 buffer->setProfileCallback(profile_callback_, clock_type_);
 
+            if (!settings.checksum_on_read)
+                buffer->disableChecksumming();
+
             cached_buffer = std::move(buffer);
             data_buffer = cached_buffer.get();
         }
@@ -106,6 +109,9 @@ MergeTreeReaderCompact::MergeTreeReaderCompact(
             if (profile_callback_)
                 buffer->setProfileCallback(profile_callback_, clock_type_);
 
+            if (!settings.checksum_on_read)
+                buffer->disableChecksumming();
+
             non_cached_buffer = std::move(buffer);
             data_buffer = non_cached_buffer.get();
         }
diff --git a/src/Storages/MergeTree/MergeTreeReaderStream.cpp b/src/Storages/MergeTree/MergeTreeReaderStream.cpp
index 1754fb201eb..08cb49445f0 100644
--- a/src/Storages/MergeTree/MergeTreeReaderStream.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderStream.cpp
@@ -96,6 +96,9 @@ MergeTreeReaderStream::MergeTreeReaderStream(
         if (profile_callback)
             buffer->setProfileCallback(profile_callback, clock_type);
 
+        if (!settings.checksum_on_read)
+            buffer->disableChecksumming();
+
         cached_buffer = std::move(buffer);
         data_buffer = cached_buffer.get();
     }

From d121eb478728a14e712ed8885ca13a280d46080a Mon Sep 17 00:00:00 2001
From: Dmitriy <sevirov@yandex-team.ru>
Date: Mon, 25 Jan 2021 23:31:06 +0300
Subject: [PATCH 452/611] Update the description of the SELECT queries with
 FINAL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Объяснил преимущество параллельности SELECT запросов с модификатором FINAL..
---
 docs/en/sql-reference/statements/select/from.md | 2 +-
 docs/ru/sql-reference/statements/select/from.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/sql-reference/statements/select/from.md b/docs/en/sql-reference/statements/select/from.md
index b2a330a45bf..3ecb5096ab8 100644
--- a/docs/en/sql-reference/statements/select/from.md
+++ b/docs/en/sql-reference/statements/select/from.md
@@ -25,7 +25,7 @@ It is applicable when selecting data from tables that use the [MergeTree](../../
 -   [Replicated](../../../engines/table-engines/mergetree-family/replication.md) versions of `MergeTree` engines.
 -   [View](../../../engines/table-engines/special/view.md), [Buffer](../../../engines/table-engines/special/buffer.md), [Distributed](../../../engines/table-engines/special/distributed.md), and [MaterializedView](../../../engines/table-engines/special/materializedview.md) engines that operate over other engines, provided they were created over `MergeTree`-engine tables.
 
-`SELECT` queries with `FINAL` are executed in parallel. The [max_final_threads](../../../operations/settings/settings.md#max-final-threads) setting limits the number of threads used.
+Now `SELECT` queries with `FINAL` are executed in parallel and slightly faster. But there are drawbacks (see below). The [max_final_threads](../../../operations/settings/settings.md#max-final-threads) setting limits the number of threads used.
 
 ### Drawbacks {#drawbacks}
 
diff --git a/docs/ru/sql-reference/statements/select/from.md b/docs/ru/sql-reference/statements/select/from.md
index 63a00ef1d09..b62b2fd51d4 100644
--- a/docs/ru/sql-reference/statements/select/from.md
+++ b/docs/ru/sql-reference/statements/select/from.md
@@ -25,7 +25,7 @@ toc_title: FROM
 -   [Replicated](../../../engines/table-engines/mergetree-family/replication.md) варианты исполнения `MergeTree` движков.
 -   [View](../../../engines/table-engines/special/view.md), [Buffer](../../../engines/table-engines/special/buffer.md), [Distributed](../../../engines/table-engines/special/distributed.md), и [MaterializedView](../../../engines/table-engines/special/materializedview.md), которые работают поверх других движков, если они созданы для таблиц с движками семейства `MergeTree`.
 
-`SELECT` запросы с `FINAL` выполняются параллельно. Настройка [max_final_threads](../../../operations/settings/settings.md#max-final-threads) устанавливает максимальное количество потоков.
+Теперь `SELECT` запросы с `FINAL` выполняются параллельно и, следовательно, немного быстрее. Но имеются серьезные недостатки при их использовании (смотрите ниже). Настройка [max_final_threads](../../../operations/settings/settings.md#max-final-threads) устанавливает максимальное количество потоков.
 
 ### Недостатки {#drawbacks}
 

From 7dedfba8003e198aaa6a27fbad177d1589ff9c4e Mon Sep 17 00:00:00 2001
From: Anna <annaconda@bk.ru>
Date: Mon, 25 Jan 2021 23:32:05 +0300
Subject: [PATCH 453/611] fix link

---
 docs/en/sql-reference/statements/create/table.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/statements/create/table.md b/docs/en/sql-reference/statements/create/table.md
index 5bce4231a31..9bf2cab8743 100644
--- a/docs/en/sql-reference/statements/create/table.md
+++ b/docs/en/sql-reference/statements/create/table.md
@@ -266,7 +266,7 @@ It’s possible to use tables with [ENGINE = Memory](../../../engines/table-engi
 'REPLACE' query allows you to update the data in the table atomically.
 
 !!!note "Note"
-    This query is supported only for [Atomic](../../../engines/database_engines/atomic.md) database engine.
+    This query is supported only for [Atomic](../../../engines/database-engines/atomic.md) database engine.
 
 If you need to delete some data from a table, you can create a new table and fill it with a `SELECT` statement that doesn't retrieve unwanted data, then drop the old table and rename the new one:
 

From 8dfa9330287981eea28f57ad168c999e46954ba7 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Mon, 25 Jan 2021 23:48:10 +0300
Subject: [PATCH 454/611] Amend

---
 src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
index c414e735c0a..b44e7197c12 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
@@ -547,8 +547,8 @@ 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,
         .max_read_buffer_size = settings.max_read_buffer_size,
-        .checksum_on_read = settings.checksum_on_read,
         .save_marks_in_cache = true,
+        .checksum_on_read = settings.checksum_on_read,
     };
 
     /// PREWHERE

From c8b6774a752489981123f09e0ba1e1a295b8b0d5 Mon Sep 17 00:00:00 2001
From: Anna <annaconda@bk.ru>
Date: Mon, 25 Jan 2021 23:48:54 +0300
Subject: [PATCH 455/611] correction

---
 docs/en/sql-reference/statements/create/table.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/statements/create/table.md b/docs/en/sql-reference/statements/create/table.md
index 9bf2cab8743..247eceb110f 100644
--- a/docs/en/sql-reference/statements/create/table.md
+++ b/docs/en/sql-reference/statements/create/table.md
@@ -263,7 +263,7 @@ It’s possible to use tables with [ENGINE = Memory](../../../engines/table-engi
 
 ## REPLACE TABLE {#replace-table-query}
 
-'REPLACE' query allows you to update the data in the table atomically.
+'REPLACE' query allows you to update the table atomically.
 
 !!!note "Note"
     This query is supported only for [Atomic](../../../engines/database-engines/atomic.md) database engine.

From b2607a358d43b094ec79699d52374be21a1f0ded Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Tue, 26 Jan 2021 00:27:26 +0300
Subject: [PATCH 456/611] Applied a patch from Alexei Fedotov @leshikus

---
 contrib/cassandra | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/cassandra b/contrib/cassandra
index 9cbc1a806df..b446d7eb68e 160000
--- a/contrib/cassandra
+++ b/contrib/cassandra
@@ -1 +1 @@
-Subproject commit 9cbc1a806df5d40fddbf84533b9873542c6513d8
+Subproject commit b446d7eb68e6962f431e2b3771313bfe9a2bbd93

From f4a4d33c2dfe3b9d9c1c182ca8e94e81ab9bf7de Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sun, 24 Jan 2021 21:23:07 +0300
Subject: [PATCH 457/611] Suppress UBsan reports in addYears()

https://clickhouse-test-reports.s3.yandex.net/19528/1c364b6ee3a44487529954cf2792e615f7de0f82/fuzzer_ubsan/report.html#fail1
---
 base/common/DateLUTImpl.h                            | 4 ++--
 tests/queries/0_stateless/01662_date_ubsan.reference | 6 ++++++
 tests/queries/0_stateless/01662_date_ubsan.sql       | 3 +++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/base/common/DateLUTImpl.h b/base/common/DateLUTImpl.h
index 3e981558733..b5d4be950b5 100644
--- a/base/common/DateLUTImpl.h
+++ b/base/common/DateLUTImpl.h
@@ -851,7 +851,7 @@ public:
     }
 
     /// Saturation can occur if 29 Feb is mapped to non-leap year.
-    inline time_t addYears(time_t t, Int64 delta) const
+    inline NO_SANITIZE_UNDEFINED time_t addYears(time_t t, Int64 delta) const
     {
         DayNum result_day = addYears(toDayNum(t), delta);
 
@@ -863,7 +863,7 @@ public:
         return lut[result_day].date + time_offset;
     }
 
-    inline DayNum addYears(DayNum d, Int64 delta) const
+    inline NO_SANITIZE_UNDEFINED DayNum addYears(DayNum d, Int64 delta) const
     {
         const Values & values = lut[d];
 
diff --git a/tests/queries/0_stateless/01662_date_ubsan.reference b/tests/queries/0_stateless/01662_date_ubsan.reference
index 44fe6b620d5..3c90ee8960e 100644
--- a/tests/queries/0_stateless/01662_date_ubsan.reference
+++ b/tests/queries/0_stateless/01662_date_ubsan.reference
@@ -8,6 +8,8 @@ SELECT addWeeks(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
 2021-01-01 00:00:00
 SELECT addDays(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
 2021-01-01 00:00:00
+SELECT addYears(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
+2021-01-01 00:00:00
 -- tests with INT64_MAX
 SELECT addMinutes(toDateTime('2020-01-01 00:00:00', 'GMT'), 9223372036854775807);
 2019-12-31 23:59:00
@@ -17,6 +19,8 @@ SELECT addWeeks(toDateTime('2020-01-01 00:00:00', 'GMT'), 9223372036854775807);
 2019-12-25 00:00:00
 SELECT addDays(toDateTime('2020-01-01 00:00:00', 'GMT'), 9223372036854775807);
 2019-12-31 00:00:00
+SELECT addYears(toDateTime('2020-01-01 00:00:00', 'GMT'), 9223372036854775807);
+2019-01-01 00:00:00
 -- tests with inf
 SELECT addMinutes(toDateTime('2021-01-01 00:00:00', 'GMT'), inf);
 2021-01-01 00:00:00
@@ -26,3 +30,5 @@ SELECT addWeeks(toDateTime('2021-01-01 00:00:00', 'GMT'), inf);
 2021-01-01 00:00:00
 SELECT addDays(toDateTime('2021-01-01 00:00:00', 'GMT'), inf);
 2021-01-01 00:00:00
+SELECT addYears(toDateTime('2021-01-01 00:00:00', 'GMT'), inf);
+2021-01-01 00:00:00
diff --git a/tests/queries/0_stateless/01662_date_ubsan.sql b/tests/queries/0_stateless/01662_date_ubsan.sql
index 07d068d9685..784853bef3d 100644
--- a/tests/queries/0_stateless/01662_date_ubsan.sql
+++ b/tests/queries/0_stateless/01662_date_ubsan.sql
@@ -4,13 +4,16 @@ SELECT addMinutes(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808)
 SELECT addHours(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
 SELECT addWeeks(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
 SELECT addDays(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
+SELECT addYears(toDateTime('2021-01-01 00:00:00', 'GMT'), 9223372036854775808);
 -- tests with INT64_MAX
 SELECT addMinutes(toDateTime('2020-01-01 00:00:00', 'GMT'), 9223372036854775807);
 SELECT addHours(toDateTime('2020-01-01 00:00:00', 'GMT'), 9223372036854775807);
 SELECT addWeeks(toDateTime('2020-01-01 00:00:00', 'GMT'), 9223372036854775807);
 SELECT addDays(toDateTime('2020-01-01 00:00:00', 'GMT'), 9223372036854775807);
+SELECT addYears(toDateTime('2020-01-01 00:00:00', 'GMT'), 9223372036854775807);
 -- tests with inf
 SELECT addMinutes(toDateTime('2021-01-01 00:00:00', 'GMT'), inf);
 SELECT addHours(toDateTime('2021-01-01 00:00:00', 'GMT'), inf);
 SELECT addWeeks(toDateTime('2021-01-01 00:00:00', 'GMT'), inf);
 SELECT addDays(toDateTime('2021-01-01 00:00:00', 'GMT'), inf);
+SELECT addYears(toDateTime('2021-01-01 00:00:00', 'GMT'), inf);

From 824aee4020b0f41a0e0c825e63566114572329e2 Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Sat, 2 Jan 2021 12:51:13 +0800
Subject: [PATCH 458/611] better cte and with global

---
 src/Interpreters/ApplyWithAliasVisitor.cpp    |  4 +---
 src/Interpreters/ApplyWithSubqueryVisitor.cpp | 11 ++++++++--
 .../DatabaseAndTableWithAlias.cpp             |  8 +++++++
 src/Interpreters/getTableExpressions.cpp      |  8 +++++--
 src/Parsers/ASTSubquery.cpp                   | 20 +++++++++++++++++
 src/Parsers/ASTSubquery.h                     |  4 ++++
 src/Parsers/ASTWithElement.cpp                |  5 +++--
 src/Parsers/ParserWithElement.cpp             |  1 +
 src/TableFunctions/TableFunctionView.cpp      |  3 ++-
 ...5_subqueries_in_with_statement_4.reference | 10 +++++++++
 .../01495_subqueries_in_with_statement_4.sql  |  2 ++
 ...with_global_and_with_propagation.reference | 19 ++++++++++++++++
 ...01515_with_global_and_with_propagation.sql | 22 ++++++++++---------
 13 files changed, 97 insertions(+), 20 deletions(-)
 create mode 100644 tests/queries/0_stateless/01495_subqueries_in_with_statement_4.reference
 create mode 100644 tests/queries/0_stateless/01495_subqueries_in_with_statement_4.sql

diff --git a/src/Interpreters/ApplyWithAliasVisitor.cpp b/src/Interpreters/ApplyWithAliasVisitor.cpp
index ab1656a5dde..93fe87d5db0 100644
--- a/src/Interpreters/ApplyWithAliasVisitor.cpp
+++ b/src/Interpreters/ApplyWithAliasVisitor.cpp
@@ -12,12 +12,10 @@ void ApplyWithAliasVisitor::visit(ASTPtr & ast, const Data & data)
         std::optional<Data> new_data;
         if (auto with = node_select->with())
         {
-            for (auto & child : with->children)
-                visit(child, data);
-
             std::set<String> current_names;
             for (auto & child : with->children)
             {
+                visit(child, new_data ? *new_data : data);
                 if (auto * ast_with_alias = dynamic_cast<ASTWithAlias *>(child.get()))
                 {
                     if (!new_data)
diff --git a/src/Interpreters/ApplyWithSubqueryVisitor.cpp b/src/Interpreters/ApplyWithSubqueryVisitor.cpp
index c360a9683c3..f3d0c82e5f1 100644
--- a/src/Interpreters/ApplyWithSubqueryVisitor.cpp
+++ b/src/Interpreters/ApplyWithSubqueryVisitor.cpp
@@ -4,6 +4,7 @@
 #include <Interpreters/misc.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/ASTWithElement.h>
 
@@ -55,10 +56,13 @@ void ApplyWithSubqueryVisitor::visit(ASTTableExpression & table, const Data & da
             auto subquery_it = data.subqueries.find(table_id.table_name);
             if (subquery_it != data.subqueries.end())
             {
+                auto old_alias = table.database_and_table_name->tryGetAlias();
                 table.children.clear();
                 table.database_and_table_name.reset();
                 table.subquery = subquery_it->second->clone();
-                dynamic_cast<ASTWithAlias &>(*table.subquery).alias = table_id.table_name;
+                table.subquery->as<ASTSubquery &>().cte_name = table_id.table_name;
+                if (!old_alias.empty())
+                    table.subquery->setAlias(old_alias);
                 table.children.emplace_back(table.subquery);
             }
         }
@@ -78,8 +82,11 @@ void ApplyWithSubqueryVisitor::visit(ASTFunction & func, const Data & data)
                 auto subquery_it = data.subqueries.find(table_id.table_name);
                 if (subquery_it != data.subqueries.end())
                 {
+                    auto old_alias = func.arguments->children[1]->tryGetAlias();
                     func.arguments->children[1] = subquery_it->second->clone();
-                    dynamic_cast<ASTWithAlias &>(*func.arguments->children[1]).alias = table_id.table_name;
+                    func.arguments->children[1]->as<ASTSubquery &>().cte_name = table_id.table_name;
+                    if (!old_alias.empty())
+                        func.arguments->children[1]->setAlias(old_alias);
                 }
             }
         }
diff --git a/src/Interpreters/DatabaseAndTableWithAlias.cpp b/src/Interpreters/DatabaseAndTableWithAlias.cpp
index e99c6b78086..916f497fcc8 100644
--- a/src/Interpreters/DatabaseAndTableWithAlias.cpp
+++ b/src/Interpreters/DatabaseAndTableWithAlias.cpp
@@ -44,7 +44,15 @@ DatabaseAndTableWithAlias::DatabaseAndTableWithAlias(const ASTTableExpression &
     else if (table_expression.table_function)
         alias = table_expression.table_function->tryGetAlias();
     else if (table_expression.subquery)
+    {
+        const auto & cte_name = table_expression.subquery->as<const ASTSubquery &>().cte_name;
+        if (!cte_name.empty())
+        {
+            database = current_database;
+            table = cte_name;
+        }
         alias = table_expression.subquery->tryGetAlias();
+    }
     else
         throw Exception("Logical error: no known elements in ASTTableExpression", ErrorCodes::LOGICAL_ERROR);
 }
diff --git a/src/Interpreters/getTableExpressions.cpp b/src/Interpreters/getTableExpressions.cpp
index 9234aaa831a..766ce257530 100644
--- a/src/Interpreters/getTableExpressions.cpp
+++ b/src/Interpreters/getTableExpressions.cpp
@@ -73,8 +73,12 @@ ASTPtr extractTableExpression(const ASTSelectQuery & select, size_t table_number
     return nullptr;
 }
 
-static NamesAndTypesList getColumnsFromTableExpression(const ASTTableExpression & table_expression, const Context & context,
-                                                NamesAndTypesList & materialized, NamesAndTypesList & aliases, NamesAndTypesList & virtuals)
+static NamesAndTypesList getColumnsFromTableExpression(
+    const ASTTableExpression & table_expression,
+    const Context & context,
+    NamesAndTypesList & materialized,
+    NamesAndTypesList & aliases,
+    NamesAndTypesList & virtuals)
 {
     NamesAndTypesList names_and_type_list;
     if (table_expression.subquery)
diff --git a/src/Parsers/ASTSubquery.cpp b/src/Parsers/ASTSubquery.cpp
index bfe413908b9..142072050a6 100644
--- a/src/Parsers/ASTSubquery.cpp
+++ b/src/Parsers/ASTSubquery.cpp
@@ -1,6 +1,7 @@
 #include <Parsers/ASTSubquery.h>
 #include <IO/WriteHelpers.h>
 #include <IO/Operators.h>
+#include <Common/SipHash.h>
 
 namespace DB
 {
@@ -12,6 +13,10 @@ void ASTSubquery::appendColumnNameImpl(WriteBuffer & ostr) const
     {
         writeString(alias, ostr);
     }
+    else if (!cte_name.empty())
+    {
+        writeString(cte_name, ostr);
+    }
     else
     {
         Hash hash = getTreeHash();
@@ -24,6 +29,14 @@ void ASTSubquery::appendColumnNameImpl(WriteBuffer & ostr) const
 
 void ASTSubquery::formatImplWithoutAlias(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
 {
+    if (!cte_name.empty())
+    {
+        settings.ostr << (settings.hilite ? hilite_identifier : "");
+        settings.writeIdentifier(cte_name);
+        settings.ostr << (settings.hilite ? hilite_none : "");
+        return;
+    }
+
     std::string indent_str = settings.one_line ? "" : std::string(4u * frame.indent, ' ');
     std::string nl_or_nothing = settings.one_line ? "" : "\n";
 
@@ -35,5 +48,12 @@ void ASTSubquery::formatImplWithoutAlias(const FormatSettings & settings, Format
     settings.ostr << nl_or_nothing << indent_str << ")";
 }
 
+void ASTSubquery::updateTreeHashImpl(SipHash & hash_state) const
+{
+    if (!cte_name.empty())
+        hash_state.update(cte_name);
+    IAST::updateTreeHashImpl(hash_state);
+}
+
 }
 
diff --git a/src/Parsers/ASTSubquery.h b/src/Parsers/ASTSubquery.h
index 8ca3291824b..c759e52c0d4 100644
--- a/src/Parsers/ASTSubquery.h
+++ b/src/Parsers/ASTSubquery.h
@@ -12,6 +12,8 @@ namespace DB
 class ASTSubquery : public ASTWithAlias
 {
 public:
+    std::string cte_name;
+
     /** Get the text that identifies this element. */
     String getID(char) const override { return "Subquery"; }
 
@@ -28,6 +30,8 @@ public:
         return ptr;
     }
 
+    void updateTreeHashImpl(SipHash & hash_state) const override;
+
 protected:
     void formatImplWithoutAlias(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override;
     void appendColumnNameImpl(WriteBuffer & ostr) const override;
diff --git a/src/Parsers/ASTWithElement.cpp b/src/Parsers/ASTWithElement.cpp
index 00a82b703af..3f67722a5c7 100644
--- a/src/Parsers/ASTWithElement.cpp
+++ b/src/Parsers/ASTWithElement.cpp
@@ -1,4 +1,5 @@
 #include <Parsers/ASTWithElement.h>
+#include <Parsers/ASTWithAlias.h>
 #include <IO/Operators.h>
 
 namespace DB
@@ -8,7 +9,6 @@ ASTPtr ASTWithElement::clone() const
 {
     const auto res = std::make_shared<ASTWithElement>(*this);
     res->children.clear();
-    res->name = name;
     res->subquery = subquery->clone();
     res->children.emplace_back(res->subquery);
     return res;
@@ -18,6 +18,7 @@ void ASTWithElement::formatImpl(const FormatSettings & settings, FormatState & s
 {
     settings.writeIdentifier(name);
     settings.ostr << (settings.hilite ? hilite_keyword : "") << " AS " << (settings.hilite ? hilite_none : "");
-    subquery->formatImpl(settings, state, frame);
+    dynamic_cast<const ASTWithAlias *>(subquery.get())->formatImplWithoutAlias(settings, state, frame);
 }
+
 }
diff --git a/src/Parsers/ParserWithElement.cpp b/src/Parsers/ParserWithElement.cpp
index 048e891f0df..b8d9fe28c5f 100644
--- a/src/Parsers/ParserWithElement.cpp
+++ b/src/Parsers/ParserWithElement.cpp
@@ -23,6 +23,7 @@ bool ParserWithElement::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
         auto with_element = std::make_shared<ASTWithElement>();
         tryGetIdentifierNameInto(name, with_element->name);
         with_element->subquery = subquery;
+        with_element->children.push_back(with_element->subquery);
         node = with_element;
     }
     else
diff --git a/src/TableFunctions/TableFunctionView.cpp b/src/TableFunctions/TableFunctionView.cpp
index 5ec06592103..62a833dabc4 100644
--- a/src/TableFunctions/TableFunctionView.cpp
+++ b/src/TableFunctions/TableFunctionView.cpp
@@ -38,7 +38,8 @@ ColumnsDescription TableFunctionView::getActualTableStructure(const Context & co
     return ColumnsDescription(sample.getNamesAndTypesList());
 }
 
-StoragePtr TableFunctionView::executeImpl(const ASTPtr & /*ast_function*/, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+StoragePtr TableFunctionView::executeImpl(
+    const ASTPtr & /*ast_function*/, const Context & 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/tests/queries/0_stateless/01495_subqueries_in_with_statement_4.reference b/tests/queries/0_stateless/01495_subqueries_in_with_statement_4.reference
new file mode 100644
index 00000000000..6a713b14181
--- /dev/null
+++ b/tests/queries/0_stateless/01495_subqueries_in_with_statement_4.reference
@@ -0,0 +1,10 @@
+0	0
+WITH it AS 
+    (
+        SELECT *
+        FROM numbers(1)
+    )
+SELECT
+    number,
+    number
+FROM it AS i
diff --git a/tests/queries/0_stateless/01495_subqueries_in_with_statement_4.sql b/tests/queries/0_stateless/01495_subqueries_in_with_statement_4.sql
new file mode 100644
index 00000000000..73bfcf32c75
--- /dev/null
+++ b/tests/queries/0_stateless/01495_subqueries_in_with_statement_4.sql
@@ -0,0 +1,2 @@
+with it as ( select * from numbers(1) ) select it.number, i.number from it as i;
+explain syntax with it as ( select * from numbers(1) ) select it.number, i.number from it as i;
diff --git a/tests/queries/0_stateless/01515_with_global_and_with_propagation.reference b/tests/queries/0_stateless/01515_with_global_and_with_propagation.reference
index 154e60cb31b..76c46dd798f 100644
--- a/tests/queries/0_stateless/01515_with_global_and_with_propagation.reference
+++ b/tests/queries/0_stateless/01515_with_global_and_with_propagation.reference
@@ -5,6 +5,10 @@
 1
 1
 2
+106	6
+107	7
+108	8
+109	9
 WITH 1 AS x
 SELECT x
 WITH 1 AS x
@@ -33,3 +37,18 @@ SELECT x
 UNION ALL
 WITH 2 AS x
 SELECT x
+WITH
+    5 AS q1,
+    x AS 
+    (
+        WITH 5 AS q1
+        SELECT
+            number + 100 AS b,
+            number AS a
+        FROM numbers(10)
+        WHERE number > q1
+    )
+SELECT
+    b,
+    a
+FROM x
diff --git a/tests/queries/0_stateless/01515_with_global_and_with_propagation.sql b/tests/queries/0_stateless/01515_with_global_and_with_propagation.sql
index 238bfa72071..cd62dfa993d 100644
--- a/tests/queries/0_stateless/01515_with_global_and_with_propagation.sql
+++ b/tests/queries/0_stateless/01515_with_global_and_with_propagation.sql
@@ -1,13 +1,15 @@
 SET enable_global_with_statement = 1;
 
-WITH 1 AS x SELECT x;
-WITH 1 AS x SELECT * FROM (SELECT x);
-WITH 1 AS x SELECT *, x FROM (WITH 2 AS x SELECT x AS y);
-WITH 1 AS x SELECT x UNION ALL SELECT x;
-select x from (WITH 1 AS x SELECT x UNION ALL WITH 2 AS x SELECT x) order by x;
+with 1 as x select x;
+with 1 as x select * from (select x);
+with 1 as x select *, x from (with 2 as x select x as y);
+with 1 as x select x union all select x;
+select x from (with 1 as x select x union all with 2 as x select x) order by x;
+with 5 as q1, x as (select number+100 as b, number as a from numbers(10) where number > q1) select * from x;
 
-EXPLAIN SYNTAX WITH 1 AS x SELECT x;
-EXPLAIN SYNTAX WITH 1 AS x SELECT * FROM (SELECT x);
-EXPLAIN SYNTAX WITH 1 AS x SELECT *, x FROM (WITH 2 AS x SELECT x AS y);
-EXPLAIN SYNTAX WITH 1 AS x SELECT x UNION ALL SELECT x;
-EXPLAIN SYNTAX WITH 1 AS x SELECT x UNION ALL WITH 2 AS x SELECT x;
+explain syntax with 1 as x select x;
+explain syntax with 1 as x select * from (select x);
+explain syntax with 1 as x select *, x from (with 2 as x select x as y);
+explain syntax with 1 as x select x union all select x;
+explain syntax with 1 as x select x union all with 2 as x select x;
+explain syntax with 5 as q1, x as (select number + 100 as b, number as a from numbers(10) where number > q1) select * from x;

From 3afcccaad248c213f09394990118d54951e8752c Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Mon, 4 Jan 2021 11:12:47 +0800
Subject: [PATCH 459/611] Fix global with after union refactoring

---
 src/Core/Settings.h                           |  2 +-
 src/Interpreters/ApplyWithGlobalVisitor.cpp   | 84 ++++++++++++-------
 src/Interpreters/ApplyWithGlobalVisitor.h     |  9 ++
 .../01556_explain_select_with_union_query.sql |  2 +
 4 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index cc32417af09..a97587478c6 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -404,7 +404,7 @@ class IColumn;
     M(MySQLDataTypesSupport, mysql_datatypes_support_level, 0, "Which MySQL types should be converted to corresponding ClickHouse types (rather than being represented as String). Can be empty or any combination of 'decimal' or 'datetime64'. When empty MySQL's DECIMAL and DATETIME/TIMESTAMP with non-zero precision are seen as String on ClickHouse's side.", 0) \
     M(Bool, optimize_trivial_insert_select, true, "Optimize trivial 'INSERT INTO table SELECT ... FROM TABLES' query", 0) \
     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, false, "Propagate WITH statements to UNION queries and all subqueries", 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, 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) \
diff --git a/src/Interpreters/ApplyWithGlobalVisitor.cpp b/src/Interpreters/ApplyWithGlobalVisitor.cpp
index 70256adaaa2..40d1f676db9 100644
--- a/src/Interpreters/ApplyWithGlobalVisitor.cpp
+++ b/src/Interpreters/ApplyWithGlobalVisitor.cpp
@@ -3,51 +3,71 @@
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTWithAlias.h>
 
-#include <map>
-
 namespace DB
 {
+
+void ApplyWithGlobalVisitor::visit(ASTSelectQuery & select, const std::map<String, ASTPtr> & exprs, const ASTPtr & with_expression_list)
+{
+    auto with = select.with();
+    if (with)
+    {
+        std::set<String> current_names;
+        for (auto & child : with->children)
+        {
+            if (auto * ast_with_alias = dynamic_cast<ASTWithAlias *>(child.get()))
+                current_names.insert(ast_with_alias->alias);
+        }
+        for (auto & with_alias : exprs)
+        {
+            if (!current_names.count(with_alias.first))
+                with->children.push_back(with_alias.second->clone());
+        }
+    }
+    else
+        select.setExpression(ASTSelectQuery::Expression::WITH, with_expression_list->clone());
+}
+
+void ApplyWithGlobalVisitor::visit(
+    ASTSelectWithUnionQuery & selects, const std::map<String, ASTPtr> & exprs, const ASTPtr & with_expression_list)
+{
+    for (auto & select : selects.list_of_selects->children)
+    {
+        if (ASTSelectWithUnionQuery * node_union = select->as<ASTSelectWithUnionQuery>())
+        {
+            visit(*node_union, exprs, with_expression_list);
+        }
+        else if (ASTSelectQuery * node_select = select->as<ASTSelectQuery>())
+        {
+            visit(*node_select, exprs, with_expression_list);
+        }
+    }
+}
+
 void ApplyWithGlobalVisitor::visit(ASTPtr & ast)
 {
     if (ASTSelectWithUnionQuery * node_union = ast->as<ASTSelectWithUnionQuery>())
     {
-        auto & first_select = node_union->list_of_selects->children[0]->as<ASTSelectQuery &>();
-        ASTPtr with_expression_list = first_select.with();
-
-        if (with_expression_list)
+        if (auto * first_select = node_union->list_of_selects->children[0]->as<ASTSelectQuery>())
         {
-            std::map<String, ASTPtr> exprs;
-            for (auto & child : with_expression_list->children)
+            ASTPtr with_expression_list = first_select->with();
+            if (with_expression_list)
             {
-                if (auto * ast_with_alias = dynamic_cast<ASTWithAlias *>(child.get()))
-                    exprs[ast_with_alias->alias] = child;
-            }
-            for (auto it = node_union->list_of_selects->children.begin() + 1; it != node_union->list_of_selects->children.end(); ++it)
-            {
-                auto & select = (*it)->as<ASTSelectQuery &>();
-                auto with = select.with();
-                if (with)
+                std::map<String, ASTPtr> exprs;
+                for (auto & child : with_expression_list->children)
                 {
-                    std::set<String> current_names;
-                    for (auto & child : with->children)
-                    {
-                        if (auto * ast_with_alias = dynamic_cast<ASTWithAlias *>(child.get()))
-                            current_names.insert(ast_with_alias->alias);
-                    }
-                    for (auto & with_alias : exprs)
-                    {
-                        if (!current_names.count(with_alias.first))
-                            with->children.push_back(with_alias.second->clone());
-                    }
+                    if (auto * ast_with_alias = dynamic_cast<ASTWithAlias *>(child.get()))
+                        exprs[ast_with_alias->alias] = child;
+                }
+                for (auto it = node_union->list_of_selects->children.begin() + 1; it != node_union->list_of_selects->children.end(); ++it)
+                {
+                    if (auto * union_child = (*it)->as<ASTSelectWithUnionQuery>())
+                        visit(*union_child, exprs, with_expression_list);
+                    else if (auto * select_child = (*it)->as<ASTSelectQuery>())
+                        visit(*select_child, exprs, with_expression_list);
                 }
-                else
-                    select.setExpression(ASTSelectQuery::Expression::WITH, with_expression_list->clone());
             }
         }
     }
-
-    for (auto & child : ast->children)
-        visit(child);
 }
 
 }
diff --git a/src/Interpreters/ApplyWithGlobalVisitor.h b/src/Interpreters/ApplyWithGlobalVisitor.h
index c4dd2affd20..a42203c68ef 100644
--- a/src/Interpreters/ApplyWithGlobalVisitor.h
+++ b/src/Interpreters/ApplyWithGlobalVisitor.h
@@ -1,14 +1,23 @@
 #pragma once
 
 #include <Parsers/IAST.h>
+#include <map>
 
 namespace DB
 {
+
+class ASTSelectWithUnionQuery;
+class ASTSelectQuery;
+
 /// Pull out the WITH statement from the first child of ASTSelectWithUnion query if any.
 class ApplyWithGlobalVisitor
 {
 public:
     static void visit(ASTPtr & ast);
+
+private:
+    static void visit(ASTSelectWithUnionQuery & selects, const std::map<String, ASTPtr> & exprs, const ASTPtr & with_expression_list);
+    static void visit(ASTSelectQuery & select, const std::map<String, ASTPtr> & exprs, const ASTPtr & with_expression_list);
 };
 
 }
diff --git a/tests/queries/0_stateless/01556_explain_select_with_union_query.sql b/tests/queries/0_stateless/01556_explain_select_with_union_query.sql
index 7abc8a36027..dcd9bbe7347 100644
--- a/tests/queries/0_stateless/01556_explain_select_with_union_query.sql
+++ b/tests/queries/0_stateless/01556_explain_select_with_union_query.sql
@@ -1,5 +1,7 @@
 SET union_default_mode = 'DISTINCT';
 
+set enable_global_with_statement = 1;
+
 EXPLAIN SELECT 1 UNION ALL SELECT 1 UNION ALL SELECT 1;
 EXPLAIN (SELECT 1 UNION ALL SELECT 1) UNION ALL SELECT 1;
 EXPLAIN SELECT 1 UNION (SELECT 1 UNION ALL SELECT 1);

From b6a5d2f8e95141a856a0e72e2de6815dc2c15538 Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Mon, 4 Jan 2021 13:01:19 +0800
Subject: [PATCH 460/611] Fix non-select queries

---
 src/Interpreters/ApplyWithGlobalVisitor.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Interpreters/ApplyWithGlobalVisitor.cpp b/src/Interpreters/ApplyWithGlobalVisitor.cpp
index 40d1f676db9..2cbae923be4 100644
--- a/src/Interpreters/ApplyWithGlobalVisitor.cpp
+++ b/src/Interpreters/ApplyWithGlobalVisitor.cpp
@@ -68,6 +68,12 @@ void ApplyWithGlobalVisitor::visit(ASTPtr & ast)
             }
         }
     }
+    else
+    {
+        // Other non-SELECT queries that contains SELECT children, such as EXPLAIN or INSERT
+        for (auto & child : ast->children)
+            visit(child);
+    }
 }
 
 }

From 9546e61bd482eca1b9aa1ba9369603d6e405de7e Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Wed, 6 Jan 2021 19:21:55 +0800
Subject: [PATCH 461/611] Normalize away WITH statement

---
 src/Interpreters/TreeRewriter.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Interpreters/TreeRewriter.cpp b/src/Interpreters/TreeRewriter.cpp
index 190d063f935..5d2f4ea541e 100644
--- a/src/Interpreters/TreeRewriter.cpp
+++ b/src/Interpreters/TreeRewriter.cpp
@@ -782,6 +782,9 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
 
     normalize(query, result.aliases, settings);
 
+    // After normalization, we don't need WITH statement anymore
+    select_query->setExpression(ASTSelectQuery::Expression::WITH, {});
+
     /// Remove unneeded columns according to 'required_result_columns'.
     /// Leave all selected columns in case of DISTINCT; columns that contain arrayJoin function inside.
     /// Must be after 'normalizeTree' (after expanding aliases, for aliases not get lost)

From 66d84957e2da56d6db488bcd6e0ddf305c986885 Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Wed, 6 Jan 2021 22:52:13 +0800
Subject: [PATCH 462/611] Get rid of useless with statement during analysis

---
 src/Interpreters/TreeRewriter.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Interpreters/TreeRewriter.cpp b/src/Interpreters/TreeRewriter.cpp
index 5d2f4ea541e..e9717178f7b 100644
--- a/src/Interpreters/TreeRewriter.cpp
+++ b/src/Interpreters/TreeRewriter.cpp
@@ -782,9 +782,6 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
 
     normalize(query, result.aliases, settings);
 
-    // After normalization, we don't need WITH statement anymore
-    select_query->setExpression(ASTSelectQuery::Expression::WITH, {});
-
     /// Remove unneeded columns according to 'required_result_columns'.
     /// Leave all selected columns in case of DISTINCT; columns that contain arrayJoin function inside.
     /// Must be after 'normalizeTree' (after expanding aliases, for aliases not get lost)
@@ -808,6 +805,9 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
     {
         replaceAliasColumnsInQuery(query, result.metadata_snapshot->getColumns(), result.getArrayJoinSourceNameSet(), context);
     }
+    // After normalization, we temporarily detach WITH statement to avoid further analysis
+    ASTPtr with = select_query->with();
+    select_query->setExpression(ASTSelectQuery::Expression::WITH, {});
 
     result.aggregates = getAggregates(query, *select_query);
     result.window_function_asts = getWindowFunctions(query, *select_query);
@@ -820,6 +820,8 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
             !select_query->sampleSize() && !select_query->sampleOffset() && !select_query->final() &&
             (tables_with_columns.size() < 2 || isLeft(result.analyzed_join->kind()));
 
+    // Reattach the WITH statement
+    select_query->setExpression(ASTSelectQuery::Expression::WITH, std::move(with));
     return std::make_shared<const TreeRewriterResult>(result);
 }
 

From 9e28fd4a8e63ffa853985f9bc7188f1b32c41575 Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Thu, 7 Jan 2021 17:04:59 +0800
Subject: [PATCH 463/611] make clang happy

---
 src/Interpreters/ApplyWithGlobalVisitor.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Interpreters/ApplyWithGlobalVisitor.cpp b/src/Interpreters/ApplyWithGlobalVisitor.cpp
index 2cbae923be4..df238e27abf 100644
--- a/src/Interpreters/ApplyWithGlobalVisitor.cpp
+++ b/src/Interpreters/ApplyWithGlobalVisitor.cpp
@@ -12,12 +12,12 @@ void ApplyWithGlobalVisitor::visit(ASTSelectQuery & select, const std::map<Strin
     if (with)
     {
         std::set<String> current_names;
-        for (auto & child : with->children)
+        for (const auto & child : with->children)
         {
-            if (auto * ast_with_alias = dynamic_cast<ASTWithAlias *>(child.get()))
+            if (const auto * ast_with_alias = dynamic_cast<const ASTWithAlias *>(child.get()))
                 current_names.insert(ast_with_alias->alias);
         }
-        for (auto & with_alias : exprs)
+        for (const auto & with_alias : exprs)
         {
             if (!current_names.count(with_alias.first))
                 with->children.push_back(with_alias.second->clone());

From a2ceca3fa18f1df125de02c7c09e3999f5df8fce Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Wed, 13 Jan 2021 22:28:36 +0800
Subject: [PATCH 464/611] Fix recursive propagation

---
 docker/test/performance-comparison/perf.py  |  2 +-
 src/Interpreters/InterpreterSelectQuery.cpp | 10 +++++++---
 src/Interpreters/TreeRewriter.cpp           |  7 ++++---
 src/Parsers/ASTSubquery.h                   |  2 ++
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/docker/test/performance-comparison/perf.py b/docker/test/performance-comparison/perf.py
index 7175d0e4143..48479161ef9 100755
--- a/docker/test/performance-comparison/perf.py
+++ b/docker/test/performance-comparison/perf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 import argparse
 import clickhouse_driver
diff --git a/src/Interpreters/InterpreterSelectQuery.cpp b/src/Interpreters/InterpreterSelectQuery.cpp
index 4f6b76e9b53..2ee1b3956e4 100644
--- a/src/Interpreters/InterpreterSelectQuery.cpp
+++ b/src/Interpreters/InterpreterSelectQuery.cpp
@@ -294,9 +294,13 @@ InterpreterSelectQuery::InterpreterSelectQuery(
         source_header = input_pipe->getHeader();
     }
 
-    if (context->getSettingsRef().enable_global_with_statement)
-        ApplyWithAliasVisitor().visit(query_ptr);
-    ApplyWithSubqueryVisitor().visit(query_ptr);
+    // Only propagate WITH elements to subqueries if we're not a subquery
+    if (options.subquery_depth == 0)
+    {
+        if (context->getSettingsRef().enable_global_with_statement)
+            ApplyWithAliasVisitor().visit(query_ptr);
+        ApplyWithSubqueryVisitor().visit(query_ptr);
+    }
 
     JoinedTables joined_tables(getSubqueryContext(*context), getSelectQuery());
 
diff --git a/src/Interpreters/TreeRewriter.cpp b/src/Interpreters/TreeRewriter.cpp
index e9717178f7b..6f831b45fff 100644
--- a/src/Interpreters/TreeRewriter.cpp
+++ b/src/Interpreters/TreeRewriter.cpp
@@ -782,6 +782,10 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
 
     normalize(query, result.aliases, settings);
 
+    // After normalization, we temporarily detach WITH statement to avoid further analysis
+    ASTPtr with = select_query->with();
+    select_query->setExpression(ASTSelectQuery::Expression::WITH, {});
+
     /// Remove unneeded columns according to 'required_result_columns'.
     /// Leave all selected columns in case of DISTINCT; columns that contain arrayJoin function inside.
     /// Must be after 'normalizeTree' (after expanding aliases, for aliases not get lost)
@@ -805,9 +809,6 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
     {
         replaceAliasColumnsInQuery(query, result.metadata_snapshot->getColumns(), result.getArrayJoinSourceNameSet(), context);
     }
-    // After normalization, we temporarily detach WITH statement to avoid further analysis
-    ASTPtr with = select_query->with();
-    select_query->setExpression(ASTSelectQuery::Expression::WITH, {});
 
     result.aggregates = getAggregates(query, *select_query);
     result.window_function_asts = getWindowFunctions(query, *select_query);
diff --git a/src/Parsers/ASTSubquery.h b/src/Parsers/ASTSubquery.h
index c759e52c0d4..f88b257ddf7 100644
--- a/src/Parsers/ASTSubquery.h
+++ b/src/Parsers/ASTSubquery.h
@@ -12,6 +12,8 @@ namespace DB
 class ASTSubquery : public ASTWithAlias
 {
 public:
+    // Stored the name when the subquery is defined in WITH clause. For example:
+    // WITH (SELECT 1) AS a SELECT * FROM a AS b; cte_name will be `a`.
     std::string cte_name;
 
     /** Get the text that identifies this element. */

From 3ca0bdc8484d2879e5c9e695a76e4129f4932297 Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Sun, 17 Jan 2021 23:31:25 +0800
Subject: [PATCH 465/611] Keep with statement

---
 src/Interpreters/TreeRewriter.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/Interpreters/TreeRewriter.cpp b/src/Interpreters/TreeRewriter.cpp
index 6f831b45fff..190d063f935 100644
--- a/src/Interpreters/TreeRewriter.cpp
+++ b/src/Interpreters/TreeRewriter.cpp
@@ -782,10 +782,6 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
 
     normalize(query, result.aliases, settings);
 
-    // After normalization, we temporarily detach WITH statement to avoid further analysis
-    ASTPtr with = select_query->with();
-    select_query->setExpression(ASTSelectQuery::Expression::WITH, {});
-
     /// Remove unneeded columns according to 'required_result_columns'.
     /// Leave all selected columns in case of DISTINCT; columns that contain arrayJoin function inside.
     /// Must be after 'normalizeTree' (after expanding aliases, for aliases not get lost)
@@ -821,8 +817,6 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
             !select_query->sampleSize() && !select_query->sampleOffset() && !select_query->final() &&
             (tables_with_columns.size() < 2 || isLeft(result.analyzed_join->kind()));
 
-    // Reattach the WITH statement
-    select_query->setExpression(ASTSelectQuery::Expression::WITH, std::move(with));
     return std::make_shared<const TreeRewriterResult>(result);
 }
 

From 0b74d146efd7c3db9c1eba423cf2497b86a63063 Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Tue, 19 Jan 2021 23:27:16 +0800
Subject: [PATCH 466/611] Fix unused with column

---
 src/Interpreters/RequiredSourceColumnsVisitor.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Interpreters/RequiredSourceColumnsVisitor.cpp b/src/Interpreters/RequiredSourceColumnsVisitor.cpp
index 5a265b59414..54883043d30 100644
--- a/src/Interpreters/RequiredSourceColumnsVisitor.cpp
+++ b/src/Interpreters/RequiredSourceColumnsVisitor.cpp
@@ -123,8 +123,12 @@ void RequiredSourceColumnsMatcher::visit(const ASTSelectQuery & select, const AS
 
     std::vector<ASTPtr *> out;
     for (const auto & node : select.children)
-        if (node != select.select())
+    {
+        // We should not go into WITH statement because all needed aliases are already expanded to
+        // the right place after normalization. And it might contain unused unknown columns.
+        if (node != select.select() && node != select.with())
             Visitor(data).visit(node);
+    }
 
     /// revisit select_expression_list (with children) when all the aliases are set
     Visitor(data).visit(select.select());

From 5998383a3b16a33c95dd71b3dd30614a0fbf5741 Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Wed, 20 Jan 2021 20:12:18 +0800
Subject: [PATCH 467/611] Fix with aggregates

---
 src/Interpreters/ExpressionAnalyzer.cpp | 1 +
 src/Interpreters/GetAggregatesVisitor.h | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/src/Interpreters/ExpressionAnalyzer.cpp b/src/Interpreters/ExpressionAnalyzer.cpp
index 13f23643c3a..77f3c9d7537 100644
--- a/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/src/Interpreters/ExpressionAnalyzer.cpp
@@ -55,6 +55,7 @@
 #include <IO/WriteBufferFromString.h>
 
 #include <Processors/Executors/PullingPipelineExecutor.h>
+#include <Parsers/formatAST.h>
 
 namespace DB
 {
diff --git a/src/Interpreters/GetAggregatesVisitor.h b/src/Interpreters/GetAggregatesVisitor.h
index 266187aaffb..0eeab8348fd 100644
--- a/src/Interpreters/GetAggregatesVisitor.h
+++ b/src/Interpreters/GetAggregatesVisitor.h
@@ -31,6 +31,12 @@ public:
     {
         if (child->as<ASTSubquery>() || child->as<ASTSelectQuery>())
             return false;
+        if (auto * select = node->as<ASTSelectQuery>())
+        {
+            // We don't analysis WITH statement because it might contain useless aggregates
+            if (child == select->with())
+                return false;
+        }
         if (auto * func = node->as<ASTFunction>())
         {
             if (isAggregateFunction(*func))

From 27a5794795944de75bc985b258b1d0460dc7437a Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sun, 24 Jan 2021 21:28:12 +0300
Subject: [PATCH 468/611] Fix UBsan report in lcm()/gcd()

Changelog:
- Check against INT64_MIN/INT64_MAX
- Check against std::numeric_limits<>::min/max
- Move common code into separate header - GCDLCMImpl.h
- Forbid floats

UBsan report [1].

  [1]: https://clickhouse-test-reports.s3.yandex.net/19466/cb30a02540a0f223df6668c5f88ff84aa666ff54/fuzzer_ubsan/report.html#fail1
---
 src/Functions/GCDLCMImpl.h                    | 67 +++++++++++++++++++
 src/Functions/gcd.cpp                         | 33 +++------
 src/Functions/lcm.cpp                         | 42 +++---------
 .../0_stateless/00515_gcd_lcm.reference       | 14 ----
 tests/queries/0_stateless/00515_gcd_lcm.sql   | 32 ++++-----
 .../0_stateless/01435_lcm_overflow.reference  |  1 -
 .../0_stateless/01435_lcm_overflow.sql        |  2 +-
 .../0_stateless/01666_gcd_ubsan.reference     | 13 ++++
 tests/queries/0_stateless/01666_gcd_ubsan.sql | 11 +++
 .../0_stateless/01666_lcm_ubsan.reference     | 13 ++++
 tests/queries/0_stateless/01666_lcm_ubsan.sql | 11 +++
 11 files changed, 149 insertions(+), 90 deletions(-)
 create mode 100644 src/Functions/GCDLCMImpl.h
 create mode 100644 tests/queries/0_stateless/01666_gcd_ubsan.reference
 create mode 100644 tests/queries/0_stateless/01666_gcd_ubsan.sql
 create mode 100644 tests/queries/0_stateless/01666_lcm_ubsan.reference
 create mode 100644 tests/queries/0_stateless/01666_lcm_ubsan.sql

diff --git a/src/Functions/GCDLCMImpl.h b/src/Functions/GCDLCMImpl.h
new file mode 100644
index 00000000000..dffd91f8d6a
--- /dev/null
+++ b/src/Functions/GCDLCMImpl.h
@@ -0,0 +1,67 @@
+#pragma once
+
+#include <DataTypes/NumberTraits.h>
+#include <Common/Exception.h>
+#include <numeric>
+#include <limits>
+#include <type_traits>
+
+#if !defined(ARCADIA_BUILD)
+#    include "config_core.h"
+#endif
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NOT_IMPLEMENTED;
+    extern const int DECIMAL_OVERFLOW;
+}
+
+template <class T>
+inline constexpr bool is_gcd_lcm_implemeted = !(is_big_int_v<T> || std::is_floating_point_v<T>);
+
+template <typename A, typename B, typename Impl, typename Name>
+struct GCDLCMImpl
+{
+    using ResultType = typename NumberTraits::ResultOfAdditionMultiplication<A, B>::Type;
+    static const constexpr bool allow_fixed_string = false;
+
+    template <typename Result = ResultType>
+    static inline std::enable_if_t<!is_gcd_lcm_implemeted<Result>, Result>
+    apply(A, B)
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "{} is not implemented for big integers and floats", Name::name);
+    }
+
+    template <typename Result = ResultType>
+    static inline std::enable_if_t<is_gcd_lcm_implemeted<Result>, Result>
+    apply(A a, B b)
+    {
+        throwIfDivisionLeadsToFPE(typename NumberTraits::ToInteger<A>::Type(a), typename NumberTraits::ToInteger<B>::Type(b));
+        throwIfDivisionLeadsToFPE(typename NumberTraits::ToInteger<B>::Type(b), typename NumberTraits::ToInteger<A>::Type(a));
+
+        using Int = typename NumberTraits::ToInteger<Result>::Type;
+
+        if constexpr (is_signed_v<Result>)
+        {
+            /// gcd() internally uses std::abs()
+            Int a_s = static_cast<Int>(a);
+            Int b_s = static_cast<Int>(b);
+            Int min = std::numeric_limits<Int>::min();
+            Int max = std::numeric_limits<Int>::max();
+            if (unlikely((a_s == min || a_s == max) || (b_s == min || b_s == max)))
+                throw Exception(ErrorCodes::DECIMAL_OVERFLOW, "Intermediate result overflow (signed a = {}, signed b = {}, min = {}, max = {})", a_s, b_s, min, max);
+        }
+
+        return Impl::applyImpl(a, b);
+    }
+
+#if USE_EMBEDDED_COMPILER
+    static constexpr bool compilable = false; /// exceptions (and a non-trivial algorithm)
+#endif
+};
+
+}
diff --git a/src/Functions/gcd.cpp b/src/Functions/gcd.cpp
index 7c8a28c83f6..9cb53212c7f 100644
--- a/src/Functions/gcd.cpp
+++ b/src/Functions/gcd.cpp
@@ -1,45 +1,28 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionBinaryArithmetic.h>
-#include <numeric>
+#include <Functions/GCDLCMImpl.h>
 
 
 namespace DB
 {
-namespace ErrorCodes
-{
-    extern const int NOT_IMPLEMENTED;
-}
 
 namespace
 {
 
+struct NameGCD { static constexpr auto name = "gcd"; };
+
 template <typename A, typename B>
-struct GCDImpl
+struct GCDImpl : public GCDLCMImpl<A, B, GCDImpl<A, B>, NameGCD>
 {
-    using ResultType = typename NumberTraits::ResultOfAdditionMultiplication<A, B>::Type;
-    static const constexpr bool allow_fixed_string = false;
+    using ResultType = typename GCDLCMImpl<A, B, GCDImpl, NameGCD>::ResultType;
 
-    template <typename Result = ResultType>
-    static inline Result apply([[maybe_unused]] A a, [[maybe_unused]] B b)
+    static ResultType applyImpl(A a, B b)
     {
-        if constexpr (is_big_int_v<A> || is_big_int_v<B> || is_big_int_v<Result>)
-            throw Exception("GCD is not implemented for big integers", ErrorCodes::NOT_IMPLEMENTED);
-        else
-        {
-            throwIfDivisionLeadsToFPE(typename NumberTraits::ToInteger<A>::Type(a), typename NumberTraits::ToInteger<B>::Type(b));
-            throwIfDivisionLeadsToFPE(typename NumberTraits::ToInteger<B>::Type(b), typename NumberTraits::ToInteger<A>::Type(a));
-            return std::gcd(
-                typename NumberTraits::ToInteger<Result>::Type(a),
-                typename NumberTraits::ToInteger<Result>::Type(b));
-        }
+        using Int = typename NumberTraits::ToInteger<ResultType>::Type;
+        return std::gcd(Int(a), Int(b));
     }
-
-#if USE_EMBEDDED_COMPILER
-    static constexpr bool compilable = false; /// exceptions (and a non-trivial algorithm)
-#endif
 };
 
-struct NameGCD { static constexpr auto name = "gcd"; };
 using FunctionGCD = BinaryArithmeticOverloadResolver<GCDImpl, NameGCD, false>;
 
 }
diff --git a/src/Functions/lcm.cpp b/src/Functions/lcm.cpp
index 81406861c52..5155a80e6cd 100644
--- a/src/Functions/lcm.cpp
+++ b/src/Functions/lcm.cpp
@@ -1,10 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionBinaryArithmetic.h>
-
-#include <numeric>
-#include <limits>
-#include <type_traits>
-
+#include <Functions/GCDLCMImpl.h>
 
 namespace
 {
@@ -27,33 +23,21 @@ constexpr T abs(T value) noexcept
 
 namespace DB
 {
-namespace ErrorCodes
-{
-    extern const int NOT_IMPLEMENTED;
-}
 
 namespace
 {
 
+struct NameLCM { static constexpr auto name = "lcm"; };
+
 template <typename A, typename B>
-struct LCMImpl
+struct LCMImpl : public GCDLCMImpl<A, B, LCMImpl<A, B>, NameLCM>
 {
-    using ResultType = typename NumberTraits::ResultOfAdditionMultiplication<A, B>::Type;
-    static const constexpr bool allow_fixed_string = false;
+    using ResultType = typename GCDLCMImpl<A, B, LCMImpl<A, B>, NameLCM>::ResultType;
 
-    template <typename Result = ResultType>
-    static inline std::enable_if_t<is_big_int_v<A> || is_big_int_v<B> || is_big_int_v<Result>, Result>
-    apply([[maybe_unused]] A a, [[maybe_unused]] B b)
+    static ResultType applyImpl(A a, B b)
     {
-        throw Exception("LCM is not implemented for big integers", ErrorCodes::NOT_IMPLEMENTED);
-    }
-
-    template <typename Result = ResultType>
-    static inline std::enable_if_t<!is_big_int_v<A> && !is_big_int_v<B> && !is_big_int_v<Result>, Result>
-    apply([[maybe_unused]] A a, [[maybe_unused]] B b)
-    {
-        throwIfDivisionLeadsToFPE(typename NumberTraits::ToInteger<A>::Type(a), typename NumberTraits::ToInteger<B>::Type(b));
-        throwIfDivisionLeadsToFPE(typename NumberTraits::ToInteger<B>::Type(b), typename NumberTraits::ToInteger<A>::Type(a));
+        using Int = typename NumberTraits::ToInteger<ResultType>::Type;
+        using Unsigned = make_unsigned_t<Int>;
 
         /** It's tempting to use std::lcm function.
           * But it has undefined behaviour on overflow.
@@ -62,22 +46,14 @@ struct LCMImpl
           * (example: throw an exception or overflow in implementation specific way).
           */
 
-        using Int = typename NumberTraits::ToInteger<Result>::Type;
-        using Unsigned = make_unsigned_t<Int>;
-
         Unsigned val1 = abs<Int>(a) / std::gcd(Int(a), Int(b));
         Unsigned val2 = abs<Int>(b);
 
         /// Overflow in implementation specific way.
-        return Result(val1 * val2);
+        return ResultType(val1 * val2);
     }
-
-#if USE_EMBEDDED_COMPILER
-    static constexpr bool compilable = false; /// exceptions (and a non-trivial algorithm)
-#endif
 };
 
-struct NameLCM { static constexpr auto name = "lcm"; };
 using FunctionLCM = BinaryArithmeticOverloadResolver<LCMImpl, NameLCM, false>;
 
 }
diff --git a/tests/queries/0_stateless/00515_gcd_lcm.reference b/tests/queries/0_stateless/00515_gcd_lcm.reference
index a24649ba97b..5289404dbf2 100644
--- a/tests/queries/0_stateless/00515_gcd_lcm.reference
+++ b/tests/queries/0_stateless/00515_gcd_lcm.reference
@@ -21,17 +21,3 @@
 4611686011984936962
 4611686011984936962
 2147483648
-256
-11
-64
-1
-2
-1
-1
-5120
-121
-256
-1
-4
-735
-64770
diff --git a/tests/queries/0_stateless/00515_gcd_lcm.sql b/tests/queries/0_stateless/00515_gcd_lcm.sql
index 51da49e9c40..c3bf3275bb8 100644
--- a/tests/queries/0_stateless/00515_gcd_lcm.sql
+++ b/tests/queries/0_stateless/00515_gcd_lcm.sql
@@ -23,19 +23,19 @@ select lcm(255, 254);
 select lcm(2147483647, 2147483646);
 select lcm(4611686011984936962, 2147483647);
 select lcm(-2147483648, 1);
--- test gcd float will cast to int
-select gcd(1280.1, 1024.1);
-select gcd(11.1, 121.1);
-select gcd(-256.1, 64.1);
-select gcd(1.1, 1.1);
-select gcd(4.1, 2.1);
-select gcd(15.1, 49.1);
-select gcd(255.1, 254.1);
--- test lcm float cast to int
-select lcm(1280.1, 1024.1);
-select lcm(11.1, 121.1);
-select lcm(-256.1, 64.1);
-select lcm(1.1, 1.1);
-select lcm(4.1, 2.1);
-select lcm(15.1, 49.1);
-select lcm(255.1, 254.1);
+-- test gcd float
+select gcd(1280.1, 1024.1); -- { serverError 48 }
+select gcd(11.1, 121.1); -- { serverError 48 }
+select gcd(-256.1, 64.1); -- { serverError 48 }
+select gcd(1.1, 1.1); -- { serverError 48 }
+select gcd(4.1, 2.1); -- { serverError 48 }
+select gcd(15.1, 49.1); -- { serverError 48 }
+select gcd(255.1, 254.1); -- { serverError 48 }
+-- test lcm float
+select lcm(1280.1, 1024.1); -- { serverError 48 }
+select lcm(11.1, 121.1); -- { serverError 48 }
+select lcm(-256.1, 64.1); -- { serverError 48 }
+select lcm(1.1, 1.1); -- { serverError 48 }
+select lcm(4.1, 2.1); -- { serverError 48 }
+select lcm(15.1, 49.1); -- { serverError 48 }
+select lcm(255.1, 254.1); -- { serverError 48 }
diff --git a/tests/queries/0_stateless/01435_lcm_overflow.reference b/tests/queries/0_stateless/01435_lcm_overflow.reference
index eebd14705df..cb1cdf296a9 100644
--- a/tests/queries/0_stateless/01435_lcm_overflow.reference
+++ b/tests/queries/0_stateless/01435_lcm_overflow.reference
@@ -5,4 +5,3 @@
 0
 0
 0
-0
diff --git a/tests/queries/0_stateless/01435_lcm_overflow.sql b/tests/queries/0_stateless/01435_lcm_overflow.sql
index f70200eb2d8..b069c0642bc 100644
--- a/tests/queries/0_stateless/01435_lcm_overflow.sql
+++ b/tests/queries/0_stateless/01435_lcm_overflow.sql
@@ -6,5 +6,5 @@ SELECT lcm(-15, -10);
 -- Implementation specific result on overflow:
 SELECT ignore(lcm(256, 9223372036854775807));
 SELECT ignore(lcm(256, -9223372036854775807));
-SELECT ignore(lcm(-256, 9223372036854775807));
+SELECT ignore(lcm(-256, 9223372036854775807)); -- { serverError 407 }
 SELECT ignore(lcm(-256, -9223372036854775807));
diff --git a/tests/queries/0_stateless/01666_gcd_ubsan.reference b/tests/queries/0_stateless/01666_gcd_ubsan.reference
new file mode 100644
index 00000000000..2500ef1deae
--- /dev/null
+++ b/tests/queries/0_stateless/01666_gcd_ubsan.reference
@@ -0,0 +1,13 @@
+-- { echo }
+SELECT gcd(9223372036854775807, -9223372036854775808); -- { serverError 407 }
+SELECT gcd(9223372036854775808, -9223372036854775807); -- { serverError 407 }
+SELECT gcd(-9223372036854775808, 9223372036854775807); -- { serverError 407 }
+SELECT gcd(-9223372036854775807, 9223372036854775808); -- { serverError 407 }
+SELECT gcd(9223372036854775808, -1); -- { serverError 407 }
+SELECT lcm(-170141183460469231731687303715884105728, -170141183460469231731687303715884105728); -- { serverError 48 }
+SELECT lcm(toInt128(-170141183460469231731687303715884105728), toInt128(-170141183460469231731687303715884105728)); -- { serverError 407 }
+SELECT lcm(toInt128(-170141183460469231731687303715884105720), toInt128(-170141183460469231731687303715884105720)); -- { serverError 407 }
+SELECT lcm(toInt128('-170141183460469231731687303715884105720'), toInt128('-170141183460469231731687303715884105720'));
+170141183460469231731687303715884105720
+SELECT gcd(-9223372036854775806, -9223372036854775806);
+9223372036854775806
diff --git a/tests/queries/0_stateless/01666_gcd_ubsan.sql b/tests/queries/0_stateless/01666_gcd_ubsan.sql
new file mode 100644
index 00000000000..bde2b624cc0
--- /dev/null
+++ b/tests/queries/0_stateless/01666_gcd_ubsan.sql
@@ -0,0 +1,11 @@
+-- { echo }
+SELECT gcd(9223372036854775807, -9223372036854775808); -- { serverError 407 }
+SELECT gcd(9223372036854775808, -9223372036854775807); -- { serverError 407 }
+SELECT gcd(-9223372036854775808, 9223372036854775807); -- { serverError 407 }
+SELECT gcd(-9223372036854775807, 9223372036854775808); -- { serverError 407 }
+SELECT gcd(9223372036854775808, -1); -- { serverError 407 }
+SELECT lcm(-170141183460469231731687303715884105728, -170141183460469231731687303715884105728); -- { serverError 48 }
+SELECT lcm(toInt128(-170141183460469231731687303715884105728), toInt128(-170141183460469231731687303715884105728)); -- { serverError 407 }
+SELECT lcm(toInt128(-170141183460469231731687303715884105720), toInt128(-170141183460469231731687303715884105720)); -- { serverError 407 }
+SELECT lcm(toInt128('-170141183460469231731687303715884105720'), toInt128('-170141183460469231731687303715884105720'));
+SELECT gcd(-9223372036854775806, -9223372036854775806);
diff --git a/tests/queries/0_stateless/01666_lcm_ubsan.reference b/tests/queries/0_stateless/01666_lcm_ubsan.reference
new file mode 100644
index 00000000000..ed9a6aed42b
--- /dev/null
+++ b/tests/queries/0_stateless/01666_lcm_ubsan.reference
@@ -0,0 +1,13 @@
+-- { echo }
+SELECT lcm(9223372036854775807, -9223372036854775808); -- { serverError 407 }
+SELECT lcm(9223372036854775808, -9223372036854775807); -- { serverError 407 }
+SELECT lcm(-9223372036854775808, 9223372036854775807); -- { serverError 407 }
+SELECT lcm(-9223372036854775807, 9223372036854775808); -- { serverError 407 }
+SELECT lcm(9223372036854775808, -1); -- { serverError 407 }
+SELECT lcm(-170141183460469231731687303715884105728, -170141183460469231731687303715884105728); -- { serverError 48 }
+SELECT lcm(toInt128(-170141183460469231731687303715884105728), toInt128(-170141183460469231731687303715884105728)); -- { serverError 407 }
+SELECT lcm(toInt128(-170141183460469231731687303715884105720), toInt128(-170141183460469231731687303715884105720)); -- { serverError 407 }
+SELECT lcm(toInt128('-170141183460469231731687303715884105720'), toInt128('-170141183460469231731687303715884105720'));
+170141183460469231731687303715884105720
+SELECT lcm(-9223372036854775806, -9223372036854775806);
+9223372036854775806
diff --git a/tests/queries/0_stateless/01666_lcm_ubsan.sql b/tests/queries/0_stateless/01666_lcm_ubsan.sql
new file mode 100644
index 00000000000..5cc3546e941
--- /dev/null
+++ b/tests/queries/0_stateless/01666_lcm_ubsan.sql
@@ -0,0 +1,11 @@
+-- { echo }
+SELECT lcm(9223372036854775807, -9223372036854775808); -- { serverError 407 }
+SELECT lcm(9223372036854775808, -9223372036854775807); -- { serverError 407 }
+SELECT lcm(-9223372036854775808, 9223372036854775807); -- { serverError 407 }
+SELECT lcm(-9223372036854775807, 9223372036854775808); -- { serverError 407 }
+SELECT lcm(9223372036854775808, -1); -- { serverError 407 }
+SELECT lcm(-170141183460469231731687303715884105728, -170141183460469231731687303715884105728); -- { serverError 48 }
+SELECT lcm(toInt128(-170141183460469231731687303715884105728), toInt128(-170141183460469231731687303715884105728)); -- { serverError 407 }
+SELECT lcm(toInt128(-170141183460469231731687303715884105720), toInt128(-170141183460469231731687303715884105720)); -- { serverError 407 }
+SELECT lcm(toInt128('-170141183460469231731687303715884105720'), toInt128('-170141183460469231731687303715884105720'));
+SELECT lcm(-9223372036854775806, -9223372036854775806);

From 368121cc0474b1f492e7469c61f468fd374dda00 Mon Sep 17 00:00:00 2001
From: BohuTANG <overred.shuttler@gmail.com>
Date: Tue, 26 Jan 2021 14:10:33 +0800
Subject: [PATCH 469/611] Remove unused include header

---
 src/Interpreters/Aggregator.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/Interpreters/Aggregator.cpp b/src/Interpreters/Aggregator.cpp
index 90af4352b42..d83fef72882 100644
--- a/src/Interpreters/Aggregator.cpp
+++ b/src/Interpreters/Aggregator.cpp
@@ -1,7 +1,4 @@
-#include <iomanip>
-#include <thread>
 #include <future>
-#include <Poco/Version.h>
 #include <Poco/Util/Application.h>
 #include <Common/Stopwatch.h>
 #include <Common/setThreadName.h>
@@ -9,24 +6,19 @@
 #include <DataTypes/DataTypeAggregateFunction.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeLowCardinality.h>
-#include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
-#include <Columns/ColumnLowCardinality.h>
 #include <DataStreams/NativeBlockOutputStream.h>
 #include <DataStreams/materializeBlock.h>
 #include <IO/WriteBufferFromFile.h>
 #include <Compression/CompressedWriteBuffer.h>
 #include <Interpreters/Aggregator.h>
-#include <Common/ClickHouseRevision.h>
 #include <Common/MemoryTracker.h>
 #include <Common/CurrentThread.h>
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
-#include <common/demangle.h>
 #include <AggregateFunctions/AggregateFunctionArray.h>
 #include <AggregateFunctions/AggregateFunctionState.h>
-#include <AggregateFunctions/AggregateFunctionResample.h>
 #include <Disks/StoragePolicy.h>
 #include <IO/Operators.h>
 

From aa88ac65dd35fa558641a2a0a9b391a4ca564fb6 Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Tue, 26 Jan 2021 10:09:22 +0300
Subject: [PATCH 470/611] DateTime functions zh documentation fix

---
 docs/zh/sql-reference/functions/date-time-functions.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/zh/sql-reference/functions/date-time-functions.md b/docs/zh/sql-reference/functions/date-time-functions.md
index df365ee9c1c..12024a11c3d 100644
--- a/docs/zh/sql-reference/functions/date-time-functions.md
+++ b/docs/zh/sql-reference/functions/date-time-functions.md
@@ -494,11 +494,11 @@ SELECT now('Europe/Moscow');
 将时间向前取整半小时。
 此功能用于Yandex.Metrica，因为如果跟踪标记显示单个用户的连续综合浏览量在时间上严格超过此数量，则半小时是将会话分成两个会话的最短时间。这意味着（tag id，user id，time slot）可用于搜索相应会话中包含的综合浏览量。
 
-## toYYYMM {#toyyyymm}
+## toYYYYMM {#toyyyymm}
 
 将Date或DateTime转换为包含年份和月份编号的UInt32类型的数字（YYYY \* 100 + MM）。
 
-## toYYYMMDD {#toyyyymmdd}
+## toYYYYMMDD {#toyyyymmdd}
 
 将Date或DateTime转换为包含年份和月份编号的UInt32类型的数字（YYYY \* 10000 + MM \* 100 + DD）。
 

From 16561753e89e79a8e24a414a2a470540a076b244 Mon Sep 17 00:00:00 2001
From: tavplubix <avtokmakov@yandex-team.ru>
Date: Tue, 26 Jan 2021 11:21:18 +0300
Subject: [PATCH 471/611] Update arcadia_skip_list.txt

---
 tests/queries/0_stateless/arcadia_skip_list.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/queries/0_stateless/arcadia_skip_list.txt b/tests/queries/0_stateless/arcadia_skip_list.txt
index f2bac038e38..98e33c21887 100644
--- a/tests/queries/0_stateless/arcadia_skip_list.txt
+++ b/tests/queries/0_stateless/arcadia_skip_list.txt
@@ -193,3 +193,4 @@
 01660_sum_ubsan
 01669_columns_declaration_serde
 01666_blns
+01181_db_atomic_drop_on_cluster

From 25037edfa684c5afef583890baecd75ac6785375 Mon Sep 17 00:00:00 2001
From: Vladimir Chebotarev <vladimir.chebotarev@gmail.com>
Date: Tue, 26 Jan 2021 11:28:47 +0300
Subject: [PATCH 472/611] Removed space in winking face smiley.

---
 src/Storages/StorageS3Settings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Storages/StorageS3Settings.cpp b/src/Storages/StorageS3Settings.cpp
index 8c0c16c0bc9..54384ac8253 100644
--- a/src/Storages/StorageS3Settings.cpp
+++ b/src/Storages/StorageS3Settings.cpp
@@ -62,7 +62,7 @@ S3AuthSettings StorageS3Settings::getSettings(const String & endpoint) const
     auto next_prefix_setting = settings.upper_bound(endpoint);
 
     /// Linear time algorithm may be replaced with logarithmic with prefix tree map.
-    for (auto possible_prefix_setting = next_prefix_setting; possible_prefix_setting != settings.begin(); )
+    for (auto possible_prefix_setting = next_prefix_setting; possible_prefix_setting != settings.begin();)
     {
         std::advance(possible_prefix_setting, -1);
         if (boost::algorithm::starts_with(endpoint, possible_prefix_setting->first))

From 68a671f009cc27d6d6cb6ed3d6e8715f62d89263 Mon Sep 17 00:00:00 2001
From: Vladimir Chebotarev <vladimir.chebotarev@gmail.com>
Date: Tue, 26 Jan 2021 11:33:21 +0300
Subject: [PATCH 473/611] Fixed documentation.

---
 docs/en/engines/table-engines/integrations/s3.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/en/engines/table-engines/integrations/s3.md b/docs/en/engines/table-engines/integrations/s3.md
index 2af04025c75..d8cceb4d511 100644
--- a/docs/en/engines/table-engines/integrations/s3.md
+++ b/docs/en/engines/table-engines/integrations/s3.md
@@ -114,6 +114,10 @@ CREATE TABLE big_table (name String, value UInt32) ENGINE = S3('https://storage.
 -   `_path` — Path to the file.
 -   `_file` — Name of the file.
 
+**See Also**
+
+-   [Virtual columns](../../../engines/table-engines/index.md#table_engines-virtual_columns)
+
 ## S3-related settings {#settings}
 
 The following settings can be set before query execution or placed into configuration file.
@@ -124,7 +128,7 @@ The following settings can be set before query execution or placed into configur
 
 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 {#s3endpointsettings}
+### Endpoint-based settings {#endpointsettings}
 
 The following settings can be specified in configuration file for given endpoint (which will be matched by exact prefix of a URL):
 
@@ -147,10 +151,6 @@ Example:
         <!-- <header>Authorization: Bearer SOME-TOKEN</header> -->
     </endpoint-name>
 </s3>
-
-
-**See Also**
-
--   [Virtual columns](../../../engines/table-engines/index.md#table_engines-virtual_columns)
+```
 
 [Original article](https://clickhouse.tech/docs/en/operations/table_engines/s3/) <!--hide-->

From d821cf11f8cb9237a23515e6f636194d11949079 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 26 Jan 2021 13:31:29 +0300
Subject: [PATCH 474/611] Fix function neighbor for LowCardinality argument.

---
 src/Functions/neighbor.cpp                    |  2 +
 .../01670_neighbor_lc_bug.reference           |  0
 .../0_stateless/01670_neighbor_lc_bug.sql     | 43 +++++++++++++++++++
 3 files changed, 45 insertions(+)
 create mode 100644 tests/queries/0_stateless/01670_neighbor_lc_bug.reference
 create mode 100644 tests/queries/0_stateless/01670_neighbor_lc_bug.sql

diff --git a/src/Functions/neighbor.cpp b/src/Functions/neighbor.cpp
index 942d23b31cc..413eeb39e45 100644
--- a/src/Functions/neighbor.cpp
+++ b/src/Functions/neighbor.cpp
@@ -50,6 +50,8 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return false; }
 
+    bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         size_t number_of_arguments = arguments.size();
diff --git a/tests/queries/0_stateless/01670_neighbor_lc_bug.reference b/tests/queries/0_stateless/01670_neighbor_lc_bug.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01670_neighbor_lc_bug.sql b/tests/queries/0_stateless/01670_neighbor_lc_bug.sql
new file mode 100644
index 00000000000..de9afcf1495
--- /dev/null
+++ b/tests/queries/0_stateless/01670_neighbor_lc_bug.sql
@@ -0,0 +1,43 @@
+SELECT
+    neighbor(n, -2) AS int,
+    neighbor(s, -2) AS str,
+    neighbor(lcs, -2) AS lowCstr
+FROM
+(
+    SELECT
+        number % 5 AS n,
+        toString(n) AS s,
+        CAST(s, 'LowCardinality(String)') AS lcs
+    FROM numbers(10)
+);
+
+drop table if exists neighbor_test;
+
+CREATE TABLE neighbor_test
+(
+    `rowNr` UInt8,
+    `val_string` String,
+    `val_low` LowCardinality(String)
+)
+ENGINE = MergeTree
+PARTITION BY tuple()
+ORDER BY rowNr;
+
+INSERT INTO neighbor_test VALUES (1, 'String 1', 'String 1'), (2, 'String 1', 'String 1'), (3, 'String 2', 'String 2');
+
+SELECT
+    rowNr,
+    val_string,
+    neighbor(val_string, -1) AS str_m1,
+    neighbor(val_string, 1) AS str_p1,
+    val_low,
+    neighbor(val_low, -1) AS low_m1,
+    neighbor(val_low, 1) AS low_p1
+FROM 
+(
+    SELECT *
+    FROM neighbor_test
+    ORDER BY val_string ASC
+) format PrettyCompact;
+
+drop table if exists neighbor_test;

From c2d079d40e1c9dc46c67e7cb3755f8900cc00aba Mon Sep 17 00:00:00 2001
From: bo zeng <mis98zb@hotmail.com>
Date: Tue, 26 Jan 2021 18:37:57 +0800
Subject: [PATCH 475/611] fix issue #18086 (#18124)

* fix issue #18086

* Update convertMySQLDataType.cpp

* add test case for type mapping for mysql

* remove type mapping test case from materialize_with_ddl.py, will add case in mysql engine.

* add test on types and values for mysql database engine.

* typo T_T

* add missing variables

* update the assert code to align with new test data.

* better code for testing, and remove null test since it is not supported.

* remove edge value from test since it always fail. should fix it in clickhouse-client.

* remove some testcases currently not support.

* correct test case

* correct test case. maybe I need to build up a test environment in my local pc...

* correct test data

* Update convertMySQLDataType.cpp

Co-authored-by: Ivan <5627721+abyss7@users.noreply.github.com>
---
 src/DataTypes/convertMySQLDataType.cpp        | 11 +++-
 .../test_mysql_database_engine/test.py        | 59 ++++++++++++++++---
 2 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/src/DataTypes/convertMySQLDataType.cpp b/src/DataTypes/convertMySQLDataType.cpp
index c67f90e6408..c53d9b19d1a 100644
--- a/src/DataTypes/convertMySQLDataType.cpp
+++ b/src/DataTypes/convertMySQLDataType.cpp
@@ -38,10 +38,15 @@ DataTypePtr convertMySQLDataType(MultiEnum<MySQLDataTypesSupport> type_support,
         size_t precision,
         size_t scale)
 {
-    // we expect mysql_data_type to be either "basic_type" or "type_with_params(param1, param2, ...)"
+    // Mysql returns mysql_data_type as below:
+    // 1. basic_type
+    // 2. basic_type options
+    // 3. type_with_params(param1, param2, ...)
+    // 4. type_with_params(param1, param2, ...) options
+    // The options can be unsigned, zerofill, or some other strings.
     auto data_type = std::string_view(mysql_data_type);
-    const auto param_start_pos = data_type.find('(');
-    const auto type_name = data_type.substr(0, param_start_pos);
+    const auto type_end_pos = data_type.find_first_of("(\x20"); // FIXME: fix style-check script instead
+    const auto type_name = data_type.substr(0, type_end_pos);
 
     DataTypePtr res;
 
diff --git a/tests/integration/test_mysql_database_engine/test.py b/tests/integration/test_mysql_database_engine/test.py
index 23424c550b2..4d10e2ea6f5 100644
--- a/tests/integration/test_mysql_database_engine/test.py
+++ b/tests/integration/test_mysql_database_engine/test.py
@@ -193,13 +193,59 @@ def test_data_types_support_level_for_mysql_database_engine(started_cluster):
         mysql_node.query("DROP DATABASE test")
 
 
-decimal_values = [0.123, 0.4, 5.67, 8.91011, 123456789.123, -0.123, -0.4, -5.67, -8.91011, -123456789.123]
-timestamp_values = ['2015-05-18 07:40:01.123', '2019-09-16 19:20:11.123']
-timestamp_values_no_subsecond = ['2015-05-18 07:40:01', '2019-09-16 19:20:11']
+# test tool cannot support null by now. TSV format returns \N for null, so cannot compare using == directly
+# float_values = ['NULL']
+# float_values = [0] mysql returns 0 while clickhouse returns 0.0, so cannot compare using == directly
+int32_values = [0, 1, -1, 2147483647, -2147483648]
+uint32_values = [0, 1] # [FIXME] seems client have issue with value 4294967295, it returns -1 for it
+mint_values = [0, 1, -1, 8388607, -8388608]
+umint_values = [0, 1, 16777215]
+int16_values = [0, 1, -1, 32767, -32768]
+uint16_values = [0, 1, 65535]
+int8_values = [0, 1, -1, 127, -128]
+uint8_values = [0, 1, 255]
+# string_values = ["'ClickHouse'", 'NULL']
+string_values = ["'ClickHouse'"] 
+
+
+decimal_values = [0, 0.123, 0.4, 5.67, 8.91011, 123456789.123, -0.123, -0.4, -5.67, -8.91011, -123456789.123]
+timestamp_values = ["'2015-05-18 07:40:01.123'", "'2019-09-16 19:20:11.123'"]
+timestamp_values_no_subsecond = ["'2015-05-18 07:40:01'", "'2019-09-16 19:20:11'"]
 
 
 @pytest.mark.parametrize("case_name, mysql_type, expected_ch_type, mysql_values, setting_mysql_datatypes_support_level",
                          [
+                             # test common type mapping
+                             # ("common_types", "FLOAT", "Nullable(Float32)", float_values, ""),
+                             # ("common_types", "FLOAT UNSIGNED", "Nullable(Float32)", float_values, ""),
+
+                             ("common_types", "INT", "Nullable(Int32)", int32_values, ""),
+                             ("common_types", "INT NOT NULL", "Int32", int32_values, ""),
+                             ("common_types", "INT UNSIGNED NOT NULL", "UInt32", uint32_values, ""),
+                             ("common_types", "INT UNSIGNED", "Nullable(UInt32)", uint32_values, ""),
+                             ("common_types", "INT UNSIGNED DEFAULT NULL", "Nullable(UInt32)", uint32_values, ""),
+                             ("common_types", "INT UNSIGNED DEFAULT '1'", "Nullable(UInt32)", uint32_values, ""),
+                             ("common_types", "INT(10)", "Nullable(Int32)", int32_values, ""),
+                             ("common_types", "INT(10) NOT NULL", "Int32", int32_values, ""),
+                             ("common_types", "INT(10) UNSIGNED NOT NULL", "UInt32", uint32_values, ""),
+                             ("common_types", "INT(10) UNSIGNED", "Nullable(UInt32)", uint32_values, ""),
+                             ("common_types", "INT(10) UNSIGNED DEFAULT NULL", "Nullable(UInt32)", uint32_values, ""),
+                             ("common_types", "INT(10) UNSIGNED DEFAULT '1'", "Nullable(UInt32)", uint32_values, ""),
+                             ("common_types", "INTEGER", "Nullable(Int32)", int32_values, ""),
+                             ("common_types", "INTEGER UNSIGNED", "Nullable(UInt32)", uint32_values, ""),
+
+                             ("common_types", "MEDIUMINT", "Nullable(Int32)", mint_values, ""),
+                             ("common_types", "MEDIUMINT UNSIGNED", "Nullable(UInt32)", umint_values, ""),
+
+                             ("common_types", "SMALLINT", "Nullable(Int16)", int16_values, ""),
+                             ("common_types", "SMALLINT UNSIGNED", "Nullable(UInt16)", uint16_values, ""),
+
+                             ("common_types", "TINYINT", "Nullable(Int8)", int8_values, ""),
+                             ("common_types", "TINYINT UNSIGNED", "Nullable(UInt8)", uint8_values, ""),
+
+                             ("common_types", "VARCHAR(10)", "Nullable(String)", string_values, ""),
+
+
                              ("decimal_default", "decimal NOT NULL", "Decimal(10, 0)", decimal_values,
                               "decimal,datetime64"),
                              ("decimal_default_nullable", "decimal", "Nullable(Decimal(10, 0))", decimal_values,
@@ -220,9 +266,8 @@ timestamp_values_no_subsecond = ['2015-05-18 07:40:01', '2019-09-16 19:20:11']
                               "decimal,datetime64"),
 
                              # right now precision bigger than 39 is not supported by ClickHouse's Decimal, hence fall back to String
-                             (
-                                     "decimal_40_6", "decimal(40, 6) NOT NULL", "String", decimal_values,
-                                     "decimal,datetime64"),
+                             ("decimal_40_6", "decimal(40, 6) NOT NULL", "String", decimal_values, 
+                              "decimal,datetime64"),
                              ("decimal_18_6", "decimal(18, 6) NOT NULL", "String", decimal_values, "datetime64"),
                              ("decimal_18_6", "decimal(18, 6) NOT NULL", "String", decimal_values, ""),
                              ("datetime_6", "DATETIME(6) NOT NULL", "DateTime", timestamp_values_no_subsecond,
@@ -240,7 +285,7 @@ def test_mysql_types(started_cluster, case_name, mysql_type, expected_ch_type, m
         mysql_db='decimal_support',
         table_name=case_name,
         mysql_type=mysql_type,
-        mysql_values=', '.join('({})'.format(repr(x)) for x in mysql_values),
+        mysql_values=', '.join('({})'.format(x) for x in mysql_values),
         ch_mysql_db='mysql_db',
         ch_mysql_table='mysql_table_engine_' + case_name,
         expected_ch_type=expected_ch_type,

From 35125c1b33f3f34d871394131a4910e7d9325032 Mon Sep 17 00:00:00 2001
From: feng lv <fenglv15@mails.ucas.ac.cn>
Date: Tue, 26 Jan 2021 11:26:15 +0000
Subject: [PATCH 476/611] rewrite

---
 src/Functions/FunctionUnaryArithmetic.h |  29 ++++--
 src/Functions/IsOperation.h             |   4 +
 src/Functions/sign.cpp                  | 117 +++++++-----------------
 3 files changed, 57 insertions(+), 93 deletions(-)

diff --git a/src/Functions/FunctionUnaryArithmetic.h b/src/Functions/FunctionUnaryArithmetic.h
index 389c171bfce..06469a83e3e 100644
--- a/src/Functions/FunctionUnaryArithmetic.h
+++ b/src/Functions/FunctionUnaryArithmetic.h
@@ -79,8 +79,9 @@ struct InvalidType;
 template <template <typename> class Op, typename Name, bool is_injective>
 class FunctionUnaryArithmetic : public IFunction
 {
-    static constexpr bool allow_decimal = IsUnaryOperation<Op>::negate || IsUnaryOperation<Op>::abs;
+    static constexpr bool allow_decimal = IsUnaryOperation<Op>::negate || IsUnaryOperation<Op>::abs || IsUnaryOperation<Op>::sign;
     static constexpr bool allow_fixed_string = Op<UInt8>::allow_fixed_string;
+    static constexpr bool is_sign_function = IsUnaryOperation<Op>::sign;
 
     template <typename F>
     static bool castType(const IDataType * type, F && f)
@@ -137,7 +138,7 @@ public:
             {
                 using T0 = typename DataType::FieldType;
 
-                if constexpr (IsDataTypeDecimal<DataType>)
+                if constexpr (IsDataTypeDecimal<DataType> && !is_sign_function)
                 {
                     if constexpr (!allow_decimal)
                         return false;
@@ -183,12 +184,24 @@ public:
                 {
                     if (auto col = checkAndGetColumn<ColumnDecimal<T0>>(arguments[0].column.get()))
                     {
-                        auto col_res = ColumnDecimal<typename Op<T0>::ResultType>::create(0, type.getScale());
-                        auto & vec_res = col_res->getData();
-                        vec_res.resize(col->getData().size());
-                        UnaryOperationImpl<T0, Op<T0>>::vector(col->getData(), vec_res);
-                        result_column = std::move(col_res);
-                        return true;
+                        if constexpr (is_sign_function)
+                        {
+                            auto col_res = ColumnVector<typename Op<T0>::ResultType>::create();
+                            auto & vec_res = col_res->getData();
+                            vec_res.resize(col->getData().size());
+                            UnaryOperationImpl<T0, Op<T0>>::vector(col->getData(), vec_res);
+                            result_column = std::move(col_res);
+                            return true;
+                        }
+                        else
+                        {
+                            auto col_res = ColumnDecimal<typename Op<T0>::ResultType>::create(0, type.getScale());
+                            auto & vec_res = col_res->getData();
+                            vec_res.resize(col->getData().size());
+                            UnaryOperationImpl<T0, Op<T0>>::vector(col->getData(), vec_res);
+                            result_column = std::move(col_res);
+                            return true;
+                        }
                     }
                 }
             }
diff --git a/src/Functions/IsOperation.h b/src/Functions/IsOperation.h
index b36490adf1e..5b03ae3d189 100644
--- a/src/Functions/IsOperation.h
+++ b/src/Functions/IsOperation.h
@@ -20,6 +20,9 @@ template <typename, typename> struct NotEqualsOp;
 template <typename, typename> struct LessOrEqualsOp;
 template <typename, typename> struct GreaterOrEqualsOp;
 
+template <typename>
+struct SignImpl;
+
 template <template <typename, typename> typename Op1, template <typename, typename> typename Op2>
 struct IsSameOperation
 {
@@ -31,6 +34,7 @@ struct IsUnaryOperation
 {
     static constexpr bool abs = std::is_same_v<Op<Int8>, AbsImpl<Int8>>;
     static constexpr bool negate = std::is_same_v<Op<Int8>, NegateImpl<Int8>>;
+    static constexpr bool sign = std::is_same_v<Op<Int8>, SignImpl<Int8>>;
 };
 
 template <template <typename, typename> typename Op>
diff --git a/src/Functions/sign.cpp b/src/Functions/sign.cpp
index bf0938ad6e4..3c03f4e1f2e 100644
--- a/src/Functions/sign.cpp
+++ b/src/Functions/sign.cpp
@@ -1,100 +1,47 @@
-#include <Columns/ColumnVector.h>
-#include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionFactory.h>
-#include <Functions/FunctionHelpers.h>
-#include <Functions/IFunction.h>
+#include <Functions/FunctionUnaryArithmetic.h>
+#include <DataTypes/NumberTraits.h>
+#include <Common/FieldVisitors.h>
 
 namespace DB
 {
-namespace ErrorCodes
+template <typename A>
+struct SignImpl
 {
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-}
+    using ResultType = Int8;
+    static const constexpr bool allow_fixed_string = false;
 
-class FunctionSign : public IFunction
+    static inline NO_SANITIZE_UNDEFINED ResultType apply(A a)
+    {
+        if constexpr (IsDecimalNumber<A> || std::is_floating_point_v<A>)
+            return a < A(0) ? -1 : a == A(0) ? 0 : 1;
+        else if constexpr (is_signed_v<A>)
+            return a < 0 ? -1 : a == 0 ? 0 : 1;
+        else if constexpr (is_unsigned_v<A>)
+            return a == 0 ? 0 : 1;
+    }
+
+#if USE_EMBEDDED_COMPILER
+    static constexpr bool compilable = false;
+#endif
+};
+
+struct NameSign
 {
-private:
-    const Context & context;
-
-public:
     static constexpr auto name = "sign";
+};
+using FunctionSign = FunctionUnaryArithmetic<SignImpl, NameSign, false>;
 
-    explicit FunctionSign(const Context & context_) : context(context_) { }
-    static FunctionPtr create(const Context & context) { return std::make_shared<FunctionSign>(context); }
-
-    String getName() const override { return name; }
-
-    size_t getNumberOfArguments() const override { return 1; }
-
-    bool useDefaultImplementationForConstants() const override { return true; }
-
-    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
-    {
-        if (!isNumber(arguments[0].type))
-            throw Exception(
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Argument of function {} should be a number, got {}",
-                getName(),
-                arguments[0].type->getName());
-
-        ColumnWithTypeAndName compare_elem{arguments[0].column, arguments[0].type, {}};
-
-        auto greater = FunctionFactory::instance().get("greater", context);
-        auto greater_compare = greater->build(ColumnsWithTypeAndName{compare_elem, compare_elem});
-
-        if (isUnsignedInteger(arguments[0].type.get()))
-        {
-            return greater_compare->getResultType();
-        }
-
-        auto compare_type = greater_compare->getResultType();
-
-        ColumnWithTypeAndName minus_elem = {compare_type, {}};
-
-        auto minus = FunctionFactory::instance().get("minus", context);
-        auto elem_minus = minus->build(ColumnsWithTypeAndName{minus_elem, minus_elem});
-
-        return elem_minus->getResultType();
-    }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
-    {
-        auto zero_column = arguments[0].type->createColumnConstWithDefaultValue(input_rows_count);
-
-        ColumnWithTypeAndName left{arguments[0].column, arguments[0].type, {}};
-        ColumnWithTypeAndName right{zero_column, arguments[0].type, {}};
-
-        auto func_arg = ColumnsWithTypeAndName{left, right};
-
-        auto greater = FunctionFactory::instance().get("greater", context);
-        auto greater_compare = greater->build(func_arg);
-
-        /// Unsigned number: sign(n) = greater(n, 0)
-        if (isUnsignedInteger(arguments[0].type.get()))
-        {
-            return greater_compare->execute(func_arg, greater_compare->getResultType(), input_rows_count);
-        }
-
-        /// Signed number: sign(n) = minus(greater(n, 0), less(n, 0))
-        auto less = FunctionFactory::instance().get("less", context);
-        auto less_compare = less->build(func_arg);
-
-        ColumnsWithTypeAndName columns(2);
-
-        columns[0].type = greater_compare->getResultType();
-        columns[0].column = greater_compare->execute(func_arg, greater_compare->getResultType(), input_rows_count);
-        columns[1].type = less_compare->getResultType();
-        columns[1].column = less_compare->execute(func_arg, less_compare->getResultType(), input_rows_count);
-
-        auto minus = FunctionFactory::instance().get("minus", context);
-        auto elem_minus = minus->build(columns);
-
-        return elem_minus->execute(columns, elem_minus->getResultType(), input_rows_count);
-    }
+template <>
+struct FunctionUnaryArithmeticMonotonicity<NameSign>
+{
+    static bool has() { return true; }
+    static IFunction::Monotonicity get(const Field &, const Field &) { return {true, true, false}; }
 };
 
 void registerFunctionSign(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionSign>();
+    factory.registerFunction<FunctionSign>(FunctionFactory::CaseInsensitive);
 }
+
 }

From e97c01c3ea41a51b1f9f16f7b78e19c21be80790 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Tue, 26 Jan 2021 14:27:58 +0300
Subject: [PATCH 477/611] Fix UAF of the CompressedWriteBuffer after
 Connection::disconnect (#19599)

ASan report [1]:

<details>

Stacktrace with stripped shared_ptr and vector stuff:

```
==86==ERROR: AddressSanitizer: heap-use-after-free on address 0x60d0002b4888 at pc 0x00000a997056 bp 0x7f9e2ad55c00 sp 0x7f9e2ad55bf8
READ of size 8 at 0x60d0002b4888 thread T3 (TCPHandler)
    0 0xa997055 in DB::BufferBase::Buffer::end() const obj-x86_64-linux-gnu/../src/IO/BufferBase.h:40:46
    1 0xa997055 in DB::BufferBase::available() const obj-x86_64-linux-gnu/../src/IO/BufferBase.h:81:68
    2 0xa997055 in DB::BufferBase::hasPendingData() const obj-x86_64-linux-gnu/../src/IO/BufferBase.h:94:56
    3 0xa997055 in DB::WriteBuffer::nextIfAtEnd() obj-x86_64-linux-gnu/../src/IO/WriteBuffer.h:67:14
    4 0xa997055 in DB::WriteBuffer::write(char const*, unsigned long) obj-x86_64-linux-gnu/../src/IO/WriteBuffer.h:78:13
    5 0x1dcff45e in DB::CompressedWriteBuffer::nextImpl() obj-x86_64-linux-gnu/../src/Compression/CompressedWriteBuffer.cpp:37:9
    6 0x1dcffb8a in DB::WriteBuffer::next() obj-x86_64-linux-gnu/../src/IO/WriteBuffer.h:46:13
    7 0x1dcffb8a in DB::CompressedWriteBuffer::~CompressedWriteBuffer() obj-x86_64-linux-gnu/../src/Compression/CompressedWriteBuffer.cpp:54:9
    11 0xab600cf in DB::Connection::~Connection() obj-x86_64-linux-gnu/../src/Client/Connection.h:114:28
    15 0xac4adb9 in PoolBase<DB::Connection>::PooledObject::~PooledObject() obj-x86_64-linux-gnu/../src/Common/PoolBase.h:35:12
    30 0xac485e4 in PoolBase<DB::Connection>::~PoolBase() obj-x86_64-linux-gnu/../src/Common/PoolBase.h:105:26
    44 0xad2722f in DB::Cluster::ShardInfo::~ShardInfo() obj-x86_64-linux-gnu/../src/Interpreters/Cluster.h:167:12
    52 0xad393b0 in DB::Cluster::~Cluster() obj-x86_64-linux-gnu/../src/Interpreters/Cluster.h:30:7
    56 0x1f99f269 in DB::StorageDistributed::~StorageDistributed() obj-x86_64-linux-gnu/../src/Storages/StorageDistributed.cpp:338:41
    69 0x1e231846 in DB::Context::~Context() obj-x86_64-linux-gnu/../src/Interpreters/Context.cpp:501:19
    71 0x2073ccd3 in DB::TCPHandler::runImpl() obj-x86_64-linux-gnu/../src/Server/TCPHandler.cpp:416:23
    72 0x2075db1c in DB::TCPHandler::run() obj-x86_64-linux-gnu/../src/Server/TCPHandler.cpp:1417:9

0x60d0002b4888 is located 56 bytes inside of 136-byte region [0x60d0002b4850,0x60d0002b48d8)
freed by thread T3 (TCPHandler) here:
    0 0xa93d682 in operator delete(void*, unsigned long) (/workspace/clickhouse+0xa93d682)
    1 0x2059d592 in std::__1::__shared_weak_count::__release_shared() obj-x86_64-linux-gnu/../contrib/libcxx/include/memory:2518:9
    2 0x2059d592 in std::__1::shared_ptr<DB::WriteBuffer>::~shared_ptr() obj-x86_64-linux-gnu/../contrib/libcxx/include/memory:3212:19
    3 0x2059d592 in std::__1::shared_ptr<DB::WriteBuffer>::operator=(std::__1::shared_ptr<DB::WriteBuffer>&&) obj-x86_64-linux-gnu/../contrib/libcxx/include/memory:3243:5
    4 0x2059d592 in DB::Connection::disconnect() obj-x86_64-linux-gnu/../src/Client/Connection.cpp:143:9
    5 0x205d6e6d in DB::MultiplexedConnections::disconnect() obj-x86_64-linux-gnu/../src/Client/MultiplexedConnections.cpp:159:25
    6 0x1de6ec19 in DB::RemoteQueryExecutor::~RemoteQueryExecutor() obj-x86_64-linux-gnu/../src/DataStreams/RemoteQueryExecutor.cpp:86:34
    10 0x20bf0e2c in DB::RemoteSource::~RemoteSource() obj-x86_64-linux-gnu/../src/Processors/Sources/RemoteSource.cpp:22:29
    21 0x20869680 in DB::Pipe::~Pipe() obj-x86_64-linux-gnu/../src/Processors/Pipe.h:25:7
    22 0x20869680 in DB::QueryPipeline::reset() obj-x86_64-linux-gnu/../src/Processors/QueryPipeline.cpp:79:1
    23 0x1de2d89d in DB::BlockIO::reset() obj-x86_64-linux-gnu/../src/DataStreams/BlockIO.cpp:45:14
    24 0x1de2d9f7 in DB::BlockIO::operator=(DB::BlockIO&&) obj-x86_64-linux-gnu/../src/DataStreams/BlockIO.cpp:57:5
    25 0x20762731 in DB::QueryState::operator=(DB::QueryState&&) obj-x86_64-linux-gnu/../src/Server/TCPHandler.h:31:8
    26 0x2073c70c in DB::QueryState::reset() obj-x86_64-linux-gnu/../src/Server/TCPHandler.h:85:15
    27 0x2073c70c in DB::TCPHandler::runImpl() obj-x86_64-linux-gnu/../src/Server/TCPHandler.cpp:399:19
    28 0x2075db1c in DB::TCPHandler::run() obj-x86_64-linux-gnu/../src/Server/TCPHandler.cpp:1417:9
    29 0x266eeebe in Poco::Net::TCPServerConnection::start() obj-x86_64-linux-gnu/../contrib/poco/Net/src/TCPServerConnection.cpp:43:3
    30 0x266ef9db in Poco::Net::TCPServerDispatcher::run() obj-x86_64-linux-gnu/../contrib/poco/Net/src/TCPServerDispatcher.cpp:112:19
    31 0x269b1204 in Poco::PooledThread::run() obj-x86_64-linux-gnu/../contrib/poco/Foundation/src/ThreadPool.cpp:199:14
    32 0x269ab756 in Poco::ThreadImpl::runnableEntry(void*) obj-x86_64-linux-gnu/../contrib/poco/Foundation/src/Thread_POSIX.cpp:345:27
    33 0x7f9f06ea8608 in start_thread /build/glibc-ZN95T4/glibc-2.31/nptl/pthread_create.c:477:8

previously allocated by thread T3 (TCPHandler) here:
    0 0xa93ca1d in operator new(unsigned long) (/workspace/clickhouse+0xa93ca1d)
    1 0x2059b8cd in void* std::__1::__libcpp_operator_new<unsigned long>(unsigned long) obj-x86_64-linux-gnu/../contrib/libcxx/include/new:235:10
    8 0x2059b8cd in DB::Connection::connect(DB::ConnectionTimeouts const&) obj-x86_64-linux-gnu/../src/Client/Connection.cpp:112:15
    9 0x205a0a1d in DB::Connection::getServerRevision(DB::ConnectionTimeouts const&) obj-x86_64-linux-gnu/../src/Client/Connection.cpp:289:9
    10 0x205bdafa in DB::ConnectionPoolWithFailover::tryGetEntry(DB::IConnectionPool&, DB::ConnectionTimeouts const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >&, DB::Settings const*, DB::QualifiedTableName const*) obj-x86_64-linux-gnu/../src/Client/ConnectionPoolWithFailover.cpp:251:45
    11 0x205c06cf in DB::ConnectionPoolWithFailover::getManyChecked()::$_8::operator()() const obj-x86_64-linux-gnu/../src/Client/ConnectionPoolWithFailover.cpp:169:16
    20 0x205bd61f in DB::ConnectionPoolWithFailover::getManyChecked(DB::ConnectionTimeouts const&, DB::Settings const*, DB::PoolMode, DB::QualifiedTableName const&) obj-x86_64-linux-gnu/../src/Client/ConnectionPoolWithFailover.cpp:172:12
    28 0x1de6f425 in DB::RemoteQueryExecutor::sendQuery() obj-x86_64-linux-gnu/../src/DataStreams/RemoteQueryExecutor.cpp:143:31
    29 0x1fdd1410 in DB::getStructureOfRemoteTableInShard(DB::Cluster const&, DB::Cluster::ShardInfo const&, DB::StorageID const&, DB::Context const&, std::__1::shared_ptr<DB::IAST> const&) obj-x86_64-linux-gnu/../src/Storages/getStructureOfRemoteTable.cpp:78:12
    30 0x1fdd74a8 in DB::getStructureOfRemoteTable(DB::Cluster const&, DB::StorageID const&, DB::Context const&, std::__1::shared_ptr<DB::IAST> const&) obj-x86_64-linux-gnu/../src/Storages/getStructureOfRemoteTable.cpp:131:32
    31 0x1d42cd79 in DB::TableFunctionRemote::getActualTableStructure(DB::Context const&) const obj-x86_64-linux-gnu/../src/TableFunctions/TableFunctionRemote.cpp:261:12
    32 0x1d42b4e2 in DB::TableFunctionRemote::executeImpl(std::__1::shared_ptr<DB::IAST> const&, DB::Context const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, DB::ColumnsDescription) const obj-x86_64-linux-gnu/../src/TableFunctions/TableFunctionRemote.cpp:222:26
    33 0x1e2c8b15 in DB::ITableFunction::execute(std::__1::shared_ptr<DB::IAST> const&, DB::Context const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, DB::ColumnsDescription) const obj-x86_64-linux-gnu/../src/TableFunctions/ITableFunction.cpp:24:16
    34 0x1e2417ff in DB::Context::executeTableFunction(std::__1::shared_ptr<DB::IAST> const&) obj-x86_64-linux-gnu/../src/Interpreters/Context.cpp:1007:35
    35 0x1f15bd67 in DB::JoinedTables::getLeftTableStorage() obj-x86_64-linux-gnu/../src/Interpreters/JoinedTables.cpp:162:42
    36 0x1ebf393f in DB::InterpreterSelectQuery::InterpreterSelectQuery() obj-x86_64-linux-gnu/../src/Interpreters/InterpreterSelectQuery.cpp:306:33
    42 0x1eb3bf90 in DB::InterpreterFactory::get(std::__1::shared_ptr<DB::IAST>&, DB::Context&, DB::SelectQueryOptions const&) obj-x86_64-linux-gnu/../src/Interpreters/InterpreterFactory.cpp:110:16
    43 0x1f4d9dee in DB::executeQueryImpl(char const*, char const*, DB::Context&, bool, DB::QueryProcessingStage::Enum, bool, DB::ReadBuffer*) obj-x86_64-linux-gnu/../src/Interpreters/executeQuery.cpp:520:28
    44 0x1f4d7067 in DB::executeQuery(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, DB::Context&, bool, DB::QueryProcessingStage::Enum, bool) obj-x86_64-linux-gnu/../src/Interpreters/executeQuery.cpp:900:30
    45 0x2073b0bc in DB::TCPHandler::runImpl() obj-x86_64-linux-gnu/../src/Server/TCPHandler.cpp:260:24
    46 0x2075db1c in DB::TCPHandler::run() obj-x86_64-linux-gnu/../src/Server/TCPHandler.cpp:1417:9
```

</details>

  [1]: https://clickhouse-test-reports.s3.yandex.net/19583/9f8ab99dd12a6f60a20f5f84ab2f5d53874c6ae7/fuzzer_asan/report.htmlfail1
---
 src/Client/Connection.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Client/Connection.cpp b/src/Client/Connection.cpp
index 7a216961df4..65b15a46955 100644
--- a/src/Client/Connection.cpp
+++ b/src/Client/Connection.cpp
@@ -138,6 +138,7 @@ void Connection::connect(const ConnectionTimeouts & timeouts)
 
 void Connection::disconnect()
 {
+    maybe_compressed_out = nullptr;
     in = nullptr;
     last_input_packet_type.reset();
     out = nullptr; // can write to socket

From 87246ea91b287426abcbc8a57998ac1cd218799e Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 26 Jan 2021 15:37:42 +0300
Subject: [PATCH 478/611] Fix header for MergeJoin with constants.

---
 src/Interpreters/MergeJoin.cpp                    |  3 ++-
 src/Interpreters/SortedBlocksWriter.cpp           |  3 ++-
 .../01671_merge_join_and_constants.reference      |  5 +++++
 .../01671_merge_join_and_constants.sql            | 15 +++++++++++++++
 4 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 tests/queries/0_stateless/01671_merge_join_and_constants.reference
 create mode 100644 tests/queries/0_stateless/01671_merge_join_and_constants.sql

diff --git a/src/Interpreters/MergeJoin.cpp b/src/Interpreters/MergeJoin.cpp
index 2cf1024648a..be1d1c295a3 100644
--- a/src/Interpreters/MergeJoin.cpp
+++ b/src/Interpreters/MergeJoin.cpp
@@ -501,6 +501,7 @@ void MergeJoin::joinTotals(Block & block) const
 
 void MergeJoin::mergeRightBlocks()
 {
+    std::cerr << "=========== Merging right blocks in_mem " << is_in_memory << std::endl;
     if (is_in_memory)
         mergeInMemoryRightBlocks();
     else
@@ -930,7 +931,7 @@ std::shared_ptr<Block> MergeJoin::loadRightBlock(size_t pos) const
     {
         auto load_func = [&]() -> std::shared_ptr<Block>
         {
-            TemporaryFileStream input(flushed_right_blocks[pos]->path(), right_sample_block);
+            TemporaryFileStream input(flushed_right_blocks[pos]->path(), materializeBlock(right_sample_block));
             return std::make_shared<Block>(input.block_in->read());
         };
 
diff --git a/src/Interpreters/SortedBlocksWriter.cpp b/src/Interpreters/SortedBlocksWriter.cpp
index 0dba09bc80f..35df9cd4516 100644
--- a/src/Interpreters/SortedBlocksWriter.cpp
+++ b/src/Interpreters/SortedBlocksWriter.cpp
@@ -3,6 +3,7 @@
 #include <DataStreams/MergingSortedBlockInputStream.h>
 #include <DataStreams/OneBlockInputStream.h>
 #include <DataStreams/TemporaryFileStream.h>
+#include <DataStreams/materializeBlock.h>
 #include <Disks/StoragePolicy.h>
 
 namespace DB
@@ -198,7 +199,7 @@ SortedBlocksWriter::SortedFiles SortedBlocksWriter::finishMerge(std::function<vo
 
 BlockInputStreamPtr SortedBlocksWriter::streamFromFile(const TmpFilePtr & file) const
 {
-    return std::make_shared<TemporaryFileLazyInputStream>(file->path(), sample_block);
+    return std::make_shared<TemporaryFileLazyInputStream>(file->path(), materializeBlock(sample_block));
 }
 
 String SortedBlocksWriter::getPath() const
diff --git a/tests/queries/0_stateless/01671_merge_join_and_constants.reference b/tests/queries/0_stateless/01671_merge_join_and_constants.reference
new file mode 100644
index 00000000000..114fc9ff91f
--- /dev/null
+++ b/tests/queries/0_stateless/01671_merge_join_and_constants.reference
@@ -0,0 +1,5 @@
+┌─a─┬──────────b─┬─c─┬──────────d─┬─t2.'0.10'─┐
+│ a │ 2018-01-01 │   │ 1970-01-01 │           │
+│ b │ 2018-01-01 │ B │ 2018-01-01 │ 0.10      │
+│ c │ 2018-01-01 │ C │ 2018-01-01 │ 0.10      │
+└───┴────────────┴───┴────────────┴───────────┘
diff --git a/tests/queries/0_stateless/01671_merge_join_and_constants.sql b/tests/queries/0_stateless/01671_merge_join_and_constants.sql
new file mode 100644
index 00000000000..8611a96a723
--- /dev/null
+++ b/tests/queries/0_stateless/01671_merge_join_and_constants.sql
@@ -0,0 +1,15 @@
+DROP TABLE IF EXISTS table1;
+DROP TABLE IF EXISTS table2;
+
+CREATE TABLE table1(a String, b Date) ENGINE MergeTree order by a;
+CREATE TABLE table2(c String, a String, d Date) ENGINE MergeTree order by c;
+
+INSERT INTO table1 VALUES ('a', '2018-01-01') ('b', '2018-01-01') ('c', '2018-01-01');
+INSERT INTO table2 VALUES ('D', 'd', '2018-01-01') ('B', 'b', '2018-01-01') ('C', 'c', '2018-01-01');
+
+set join_algorithm = 'partial_merge';
+
+SELECT * FROM table1 AS t1 ALL LEFT JOIN (SELECT *, '0.10', c, d AS b FROM table2) AS t2 USING (a, b) ORDER BY d ASC FORMAT PrettyCompact settings max_rows_in_join = 1;
+
+DROP TABLE IF EXISTS table1;
+DROP TABLE IF EXISTS table2;

From cea8ae162ffbf92e5ed29304ab010704c5d611c8 Mon Sep 17 00:00:00 2001
From: feng lv <fenglv15@mails.ucas.ac.cn>
Date: Tue, 26 Jan 2021 12:37:44 +0000
Subject: [PATCH 479/611] fix test

---
 tests/queries/0_stateless/01508_query_obfuscator.reference | 2 +-
 tests/queries/0_stateless/01508_query_obfuscator.sh        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/queries/0_stateless/01508_query_obfuscator.reference b/tests/queries/0_stateless/01508_query_obfuscator.reference
index 87d4a303277..7d910734dbd 100644
--- a/tests/queries/0_stateless/01508_query_obfuscator.reference
+++ b/tests/queries/0_stateless/01508_query_obfuscator.reference
@@ -12,5 +12,5 @@ WHERE
     AND MasonryID = 30750384
     AND intHash32(EyeballID) = 448362928 AND intHash64(EyeballID) = 12572659331310383983
     AND EarthquakeID IN (8195672321757027078, 7079643623150622129, 5057006826979676478, 7886875230160484653, 7494974311229040743)
-    AND Photography = 1
+    AND Aide = 1
 
diff --git a/tests/queries/0_stateless/01508_query_obfuscator.sh b/tests/queries/0_stateless/01508_query_obfuscator.sh
index b354f0953fd..4cea7f04a73 100755
--- a/tests/queries/0_stateless/01508_query_obfuscator.sh
+++ b/tests/queries/0_stateless/01508_query_obfuscator.sh
@@ -19,5 +19,5 @@ WHERE
     AND CounterID = 24226447
     AND intHash32(UserID) = 416638616 AND intHash64(UserID) = 13269091395366875299
     AND VisitID IN (5653048135597886819, 5556254872710352304, 5516214175671455313, 5476714937521999313, 5464051549483503043)
-    AND Sign = 1
+    AND Signature = 1
 "

From b0c324227d3335d0b6ccea4999260bf8f26268f3 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 26 Jan 2021 15:39:55 +0300
Subject: [PATCH 480/611] Remove comment.

---
 src/Interpreters/MergeJoin.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Interpreters/MergeJoin.cpp b/src/Interpreters/MergeJoin.cpp
index be1d1c295a3..e1e4cd9e8a3 100644
--- a/src/Interpreters/MergeJoin.cpp
+++ b/src/Interpreters/MergeJoin.cpp
@@ -501,7 +501,6 @@ void MergeJoin::joinTotals(Block & block) const
 
 void MergeJoin::mergeRightBlocks()
 {
-    std::cerr << "=========== Merging right blocks in_mem " << is_in_memory << std::endl;
     if (is_in_memory)
         mergeInMemoryRightBlocks();
     else

From a4643bcff20289c4c5d35e92743e7c85de7d4cc6 Mon Sep 17 00:00:00 2001
From: vdimir <vdimir@yandex-team.ru>
Date: Tue, 26 Jan 2021 16:19:13 +0300
Subject: [PATCH 481/611] Whitespace fixes

---
 src/Functions/FunctionStringOrArrayToT.h       | 2 +-
 tests/queries/0_stateless/01592_length_map.sql | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Functions/FunctionStringOrArrayToT.h b/src/Functions/FunctionStringOrArrayToT.h
index efbfec2aba1..e00acc006cf 100644
--- a/src/Functions/FunctionStringOrArrayToT.h
+++ b/src/Functions/FunctionStringOrArrayToT.h
@@ -94,7 +94,7 @@ public:
 
             return col_res;
         }
-        else if (const ColumnMap* col_map = checkAndGetColumn<ColumnMap>(column.get()))
+        else if (const ColumnMap * col_map = checkAndGetColumn<ColumnMap>(column.get()))
         {
             auto col_res = ColumnVector<ResultType>::create();
             typename ColumnVector<ResultType>::Container & vec_res = col_res->getData();
diff --git a/tests/queries/0_stateless/01592_length_map.sql b/tests/queries/0_stateless/01592_length_map.sql
index 368029a5aac..e4e2b3c927b 100644
--- a/tests/queries/0_stateless/01592_length_map.sql
+++ b/tests/queries/0_stateless/01592_length_map.sql
@@ -5,4 +5,4 @@ select length(map());
 select empty(map(1,2,3,4));
 select empty(map());
 select notEmpty(map(1,2,3,4));
-select notEmpty(map());
\ No newline at end of file
+select notEmpty(map());

From 0ff05d2403ba6ad24aa68c378e2841fa2cb4de2c Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Tue, 26 Jan 2021 17:30:29 +0300
Subject: [PATCH 482/611] Fix deadlock in testkeeper

---
 .../ZooKeeper/TestKeeperStorageDispatcher.cpp | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Common/ZooKeeper/TestKeeperStorageDispatcher.cpp b/src/Common/ZooKeeper/TestKeeperStorageDispatcher.cpp
index 35378e4ff09..434a6a2e747 100644
--- a/src/Common/ZooKeeper/TestKeeperStorageDispatcher.cpp
+++ b/src/Common/ZooKeeper/TestKeeperStorageDispatcher.cpp
@@ -18,30 +18,30 @@ namespace zkutil
 void TestKeeperStorageDispatcher::processingThread()
 {
     setThreadName("TestKeeperSProc");
-    try
+
+    while (!shutdown)
     {
-        while (!shutdown)
+        RequestInfo info;
+
+        UInt64 max_wait = UInt64(operation_timeout.totalMilliseconds());
+
+        if (requests_queue.tryPop(info, max_wait))
         {
-            RequestInfo info;
+            if (shutdown)
+                break;
 
-            UInt64 max_wait = UInt64(operation_timeout.totalMilliseconds());
-
-            if (requests_queue.tryPop(info, max_wait))
+            try
             {
-                if (shutdown)
-                    break;
-
                 auto responses = storage.processRequest(info.request, info.session_id);
                 for (const auto & response_for_session : responses)
                     setResponse(response_for_session.session_id, response_for_session.response);
             }
+            catch (...)
+            {
+                tryLogCurrentException(__PRETTY_FUNCTION__);
+            }
         }
     }
-    catch (...)
-    {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
-        finalize();
-    }
 }
 
 void TestKeeperStorageDispatcher::setResponse(int64_t session_id, const Coordination::ZooKeeperResponsePtr & response)

From c7070da85a6216e6f76fe197a2222742e57b1cef Mon Sep 17 00:00:00 2001
From: Anton Popov <pad11rus@gmail.com>
Date: Tue, 26 Jan 2021 16:29:45 +0300
Subject: [PATCH 483/611] better abstractions in disk interface

---
 src/Common/DirectorySyncGuard.cpp             | 41 ---------------
 src/Common/ya.make                            |  1 -
 src/Disks/DiskDecorator.cpp                   | 20 ++------
 src/Disks/DiskDecorator.h                     |  4 +-
 src/Disks/DiskLocal.cpp                       | 22 ++------
 src/Disks/DiskLocal.h                         |  6 +--
 src/Disks/DiskMemory.cpp                      | 15 ------
 src/Disks/DiskMemory.h                        |  4 --
 src/Disks/IDisk.cpp                           |  5 ++
 src/Disks/IDisk.h                             | 25 ++++++----
 src/Disks/LocalDirectorySyncGuard.cpp         | 50 +++++++++++++++++++
 .../LocalDirectorySyncGuard.h}                | 12 ++---
 src/Disks/S3/DiskS3.cpp                       | 15 ------
 src/Disks/S3/DiskS3.h                         |  4 --
 src/Disks/ya.make                             |  1 +
 src/Storages/Distributed/DirectoryMonitor.cpp | 40 ++++++---------
 .../DistributedBlockOutputStream.cpp          |  5 +-
 src/Storages/MergeTree/DataPartsExchange.cpp  |  5 +-
 src/Storages/MergeTree/IMergeTreeDataPart.cpp |  5 +-
 .../MergeTree/MergeTreeDataMergerMutator.cpp  |  9 ++--
 .../MergeTree/MergeTreeDataWriter.cpp         |  5 +-
 21 files changed, 114 insertions(+), 180 deletions(-)
 delete mode 100644 src/Common/DirectorySyncGuard.cpp
 create mode 100644 src/Disks/LocalDirectorySyncGuard.cpp
 rename src/{Common/DirectorySyncGuard.h => Disks/LocalDirectorySyncGuard.h} (70%)

diff --git a/src/Common/DirectorySyncGuard.cpp b/src/Common/DirectorySyncGuard.cpp
deleted file mode 100644
index f279a0d25d5..00000000000
--- a/src/Common/DirectorySyncGuard.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <Common/DirectorySyncGuard.h>
-#include <Common/Exception.h>
-#include <Disks/IDisk.h>
-#include <fcntl.h> // O_RDWR
-
-/// OSX does not have O_DIRECTORY
-#ifndef O_DIRECTORY
-#define O_DIRECTORY O_RDWR
-#endif
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int CANNOT_FSYNC;
-}
-
-DirectorySyncGuard::DirectorySyncGuard(const DiskPtr & disk_, const String & path)
-    : disk(disk_)
-    , fd(disk_->open(path, O_DIRECTORY))
-{}
-
-DirectorySyncGuard::~DirectorySyncGuard()
-{
-    try
-    {
-#if defined(OS_DARWIN)
-        if (fcntl(fd, F_FULLFSYNC, 0))
-            throwFromErrno("Cannot fcntl(F_FULLFSYNC)", ErrorCodes::CANNOT_FSYNC);
-#endif
-        disk->sync(fd);
-        disk->close(fd);
-    }
-    catch (...)
-    {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
-    }
-}
-
-}
diff --git a/src/Common/ya.make b/src/Common/ya.make
index 4f2f1892a88..a8cac313a76 100644
--- a/src/Common/ya.make
+++ b/src/Common/ya.make
@@ -37,7 +37,6 @@ SRCS(
     CurrentMetrics.cpp
     CurrentThread.cpp
     DNSResolver.cpp
-    DirectorySyncGuard.cpp
     Dwarf.cpp
     Elf.cpp
     ErrorCodes.cpp
diff --git a/src/Disks/DiskDecorator.cpp b/src/Disks/DiskDecorator.cpp
index 6e8a2798212..0c052ce8e91 100644
--- a/src/Disks/DiskDecorator.cpp
+++ b/src/Disks/DiskDecorator.cpp
@@ -175,24 +175,14 @@ void DiskDecorator::truncateFile(const String & path, size_t size)
     delegate->truncateFile(path, size);
 }
 
-int DiskDecorator::open(const String & path, int flags) const
-{
-    return delegate->open(path, flags);
-}
-
-void DiskDecorator::close(int fd) const
-{
-    delegate->close(fd);
-}
-
-void DiskDecorator::sync(int fd) const
-{
-    delegate->sync(fd);
-}
-
 Executor & DiskDecorator::getExecutor()
 {
     return delegate->getExecutor();
 }
 
+SyncGuardPtr DiskDecorator::getDirectorySyncGuard(const String & path) const
+{
+    return delegate->getDirectorySyncGuard(path);
+}
+
 }
diff --git a/src/Disks/DiskDecorator.h b/src/Disks/DiskDecorator.h
index 4414959cca3..b50252c2c97 100644
--- a/src/Disks/DiskDecorator.h
+++ b/src/Disks/DiskDecorator.h
@@ -48,11 +48,9 @@ public:
     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, int flags) const override;
-    void close(int fd) const override;
-    void sync(int fd) const override;
     const String getType() const override { return delegate->getType(); }
     Executor & getExecutor() override;
+    SyncGuardPtr getDirectorySyncGuard(const String & path) const override;
 
 protected:
     DiskPtr delegate;
diff --git a/src/Disks/DiskLocal.cpp b/src/Disks/DiskLocal.cpp
index ed6b82fa73d..10140c26ab2 100644
--- a/src/Disks/DiskLocal.cpp
+++ b/src/Disks/DiskLocal.cpp
@@ -5,6 +5,7 @@
 #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>
@@ -315,26 +316,9 @@ void DiskLocal::copy(const String & from_path, const std::shared_ptr<IDisk> & to
         IDisk::copy(from_path, to_disk, to_path); /// Copy files through buffers.
 }
 
-int DiskLocal::open(const String & path, int flags) const
+SyncGuardPtr DiskLocal::getDirectorySyncGuard(const String & path) const
 {
-    String full_path = disk_path + path;
-    int fd = ::open(full_path.c_str(), flags);
-    if (-1 == fd)
-        throwFromErrnoWithPath("Cannot open file " + full_path, full_path,
-                        errno == ENOENT ? ErrorCodes::FILE_DOESNT_EXIST : ErrorCodes::CANNOT_OPEN_FILE);
-    return fd;
-}
-
-void DiskLocal::close(int fd) const
-{
-    if (-1 == ::close(fd))
-        throw Exception("Cannot close file", ErrorCodes::CANNOT_CLOSE_FILE);
-}
-
-void DiskLocal::sync(int fd) const
-{
-    if (-1 == ::fsync(fd))
-        throw Exception("Cannot fsync", ErrorCodes::CANNOT_FSYNC);
+    return std::make_unique<LocalDirectorySyncGuard>(disk_path + path);
 }
 
 DiskPtr DiskLocalReservation::getDisk(size_t i) const
diff --git a/src/Disks/DiskLocal.h b/src/Disks/DiskLocal.h
index 09f08a01d27..d8d45290986 100644
--- a/src/Disks/DiskLocal.h
+++ b/src/Disks/DiskLocal.h
@@ -98,14 +98,12 @@ public:
 
     void createHardLink(const String & src_path, const String & dst_path) override;
 
-    int open(const String & path, int flags) const override;
-    void close(int fd) const override;
-    void sync(int fd) const override;
-
     void truncateFile(const String & path, size_t size) override;
 
     const String getType() const override { return "local"; }
 
+    SyncGuardPtr getDirectorySyncGuard(const String & path) const override;
+
 private:
     bool tryReserve(UInt64 bytes);
 
diff --git a/src/Disks/DiskMemory.cpp b/src/Disks/DiskMemory.cpp
index 7317d8a75be..d2ed91a8263 100644
--- a/src/Disks/DiskMemory.cpp
+++ b/src/Disks/DiskMemory.cpp
@@ -436,21 +436,6 @@ void DiskMemory::setReadOnly(const String &)
     throw Exception("Method setReadOnly is not implemented for memory disks", ErrorCodes::NOT_IMPLEMENTED);
 }
 
-int DiskMemory::open(const String & /*path*/, int /*flags*/) const
-{
-    throw Exception("Method open is not implemented for memory disks", ErrorCodes::NOT_IMPLEMENTED);
-}
-
-void DiskMemory::close(int /*fd*/) const
-{
-    throw Exception("Method close is not implemented for memory disks", ErrorCodes::NOT_IMPLEMENTED);
-}
-
-void DiskMemory::sync(int /*fd*/) const
-{
-    throw Exception("Method sync is not implemented for memory disks", ErrorCodes::NOT_IMPLEMENTED);
-}
-
 void DiskMemory::truncateFile(const String & path, size_t size)
 {
     std::lock_guard lock(mutex);
diff --git a/src/Disks/DiskMemory.h b/src/Disks/DiskMemory.h
index 10d1dc670af..3ebc76661d4 100644
--- a/src/Disks/DiskMemory.h
+++ b/src/Disks/DiskMemory.h
@@ -89,10 +89,6 @@ public:
 
     void createHardLink(const String & src_path, const String & dst_path) override;
 
-    int open(const String & path, int flags) const override;
-    void close(int fd) const override;
-    void sync(int fd) const override;
-
     void truncateFile(const String & path, size_t size) override;
 
     const String getType() const override { return "memory"; }
diff --git a/src/Disks/IDisk.cpp b/src/Disks/IDisk.cpp
index 8f11d6549e9..ee7f57af771 100644
--- a/src/Disks/IDisk.cpp
+++ b/src/Disks/IDisk.cpp
@@ -76,4 +76,9 @@ void IDisk::truncateFile(const String &, size_t)
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Truncate operation is not implemented for disk of type {}", getType());
 }
 
+SyncGuardPtr IDisk::getDirectorySyncGuard(const String & /* path */) const
+{
+    return nullptr;
+}
+
 }
diff --git a/src/Disks/IDisk.h b/src/Disks/IDisk.h
index b68bca07de1..16f082e3bec 100644
--- a/src/Disks/IDisk.h
+++ b/src/Disks/IDisk.h
@@ -57,6 +57,19 @@ public:
 
 using SpacePtr = std::shared_ptr<Space>;
 
+/**
+ * A guard, that should synchronize file's or directory's state 
+ * with storage device (e.g. fsync in POSIX) in its destructor.
+ */
+class ISyncGuard
+{
+public:
+    ISyncGuard() = default;
+    virtual ~ISyncGuard() = default;
+};
+
+using SyncGuardPtr = std::unique_ptr<ISyncGuard>;
+
 /**
  * A unit of storage persisting data and metadata.
  * Abstract underlying storage technology.
@@ -174,15 +187,6 @@ public:
     /// Create hardlink from `src_path` to `dst_path`.
     virtual void createHardLink(const String & src_path, const String & dst_path) = 0;
 
-    /// Wrapper for POSIX open
-    virtual int open(const String & path, int flags) const = 0;
-
-    /// Wrapper for POSIX close
-    virtual void close(int fd) const = 0;
-
-    /// Wrapper for POSIX fsync
-    virtual void sync(int fd) const = 0;
-
     /// Truncate file to specified size.
     virtual void truncateFile(const String & path, size_t size);
 
@@ -195,6 +199,9 @@ public:
     /// Returns executor to perform asynchronous operations.
     virtual Executor & getExecutor() { return *executor; }
 
+    /// Returns guard, that insures synchronization of directory metadata with storage device.
+    virtual SyncGuardPtr getDirectorySyncGuard(const String & path) const;
+
 private:
     std::unique_ptr<Executor> executor;
 };
diff --git a/src/Disks/LocalDirectorySyncGuard.cpp b/src/Disks/LocalDirectorySyncGuard.cpp
new file mode 100644
index 00000000000..ad66cdab682
--- /dev/null
+++ b/src/Disks/LocalDirectorySyncGuard.cpp
@@ -0,0 +1,50 @@
+#include <Disks/LocalDirectorySyncGuard.h>
+#include <Common/Exception.h>
+#include <Disks/IDisk.h>
+#include <fcntl.h> // O_RDWR
+
+/// OSX does not have O_DIRECTORY
+#ifndef O_DIRECTORY
+#define O_DIRECTORY O_RDWR
+#endif
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int CANNOT_FSYNC;
+    extern const int FILE_DOESNT_EXIST;
+    extern const int CANNOT_OPEN_FILE;
+    extern const int CANNOT_CLOSE_FILE;
+}
+
+LocalDirectorySyncGuard::LocalDirectorySyncGuard(const String & full_path)
+    : fd(::open(full_path.c_str(), O_DIRECTORY))
+{
+    if (-1 == fd)
+        throwFromErrnoWithPath("Cannot open file " + full_path, full_path,
+            errno == ENOENT ? ErrorCodes::FILE_DOESNT_EXIST : ErrorCodes::CANNOT_OPEN_FILE);
+}
+
+LocalDirectorySyncGuard::~LocalDirectorySyncGuard()
+{
+    try
+    {
+#if defined(OS_DARWIN)
+        if (fcntl(fd, F_FULLFSYNC, 0))
+            throwFromErrno("Cannot fcntl(F_FULLFSYNC)", ErrorCodes::CANNOT_FSYNC);
+#endif
+        if (-1 == ::fsync(fd))
+            throw Exception("Cannot fsync", ErrorCodes::CANNOT_FSYNC);
+
+        if (-1 == ::close(fd))
+            throw Exception("Cannot close file", ErrorCodes::CANNOT_CLOSE_FILE);
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+
+}
diff --git a/src/Common/DirectorySyncGuard.h b/src/Disks/LocalDirectorySyncGuard.h
similarity index 70%
rename from src/Common/DirectorySyncGuard.h
rename to src/Disks/LocalDirectorySyncGuard.h
index 062d20324ed..34e4cb9e657 100644
--- a/src/Common/DirectorySyncGuard.h
+++ b/src/Disks/LocalDirectorySyncGuard.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <string>
-#include <memory>
+#include <Disks/IDisk.h>
 
 namespace DB
 {
@@ -13,17 +12,16 @@ using DiskPtr = std::shared_ptr<IDisk>;
 /// It's used to keep descriptor open, while doing some operations with it, and do fsync at the end.
 /// Guaranties of sequence 'close-reopen-fsync' may depend on kernel version.
 /// Source: linux-fsdevel mailing-list https://marc.info/?l=linux-fsdevel&m=152535409207496
-class DirectorySyncGuard
+class LocalDirectorySyncGuard final : public ISyncGuard
 {
 public:
     /// NOTE: If you have already opened descriptor, it's preferred to use
     /// this constructor instead of constructor with path.
-    DirectorySyncGuard(const DiskPtr & disk_, int fd_) : disk(disk_), fd(fd_) {}
-    DirectorySyncGuard(const DiskPtr & disk_, const std::string & path);
-    ~DirectorySyncGuard();
+    LocalDirectorySyncGuard(int fd_) : fd(fd_) {}
+    LocalDirectorySyncGuard(const String & full_path);
+    ~LocalDirectorySyncGuard() override;
 
 private:
-    DiskPtr disk;
     int fd = -1;
 };
 
diff --git a/src/Disks/S3/DiskS3.cpp b/src/Disks/S3/DiskS3.cpp
index 081c62bd047..6674997e7b9 100644
--- a/src/Disks/S3/DiskS3.cpp
+++ b/src/Disks/S3/DiskS3.cpp
@@ -878,21 +878,6 @@ void DiskS3::setReadOnly(const String & path)
     metadata.save();
 }
 
-int DiskS3::open(const String & /*path*/, int /*flags*/) const
-{
-    throw Exception("Method open is not implemented for S3 disks", ErrorCodes::NOT_IMPLEMENTED);
-}
-
-void DiskS3::close(int /*fd*/) const
-{
-    throw Exception("Method close is not implemented for S3 disks", ErrorCodes::NOT_IMPLEMENTED);
-}
-
-void DiskS3::sync(int /*fd*/) const
-{
-    throw Exception("Method sync is not implemented for S3 disks", ErrorCodes::NOT_IMPLEMENTED);
-}
-
 void DiskS3::shutdown()
 {
     /// This call stops any next retry attempts for ongoing S3 requests.
diff --git a/src/Disks/S3/DiskS3.h b/src/Disks/S3/DiskS3.h
index 7f742368d19..3dbd9029fb2 100644
--- a/src/Disks/S3/DiskS3.h
+++ b/src/Disks/S3/DiskS3.h
@@ -105,10 +105,6 @@ public:
 
     void setReadOnly(const String & path) override;
 
-    int open(const String & path, int flags) const override;
-    void close(int fd) const override;
-    void sync(int fd) const override;
-
     const String getType() const override { return "s3"; }
 
     void shutdown() override;
diff --git a/src/Disks/ya.make b/src/Disks/ya.make
index 5b3e4f951dc..53dc9fd75c4 100644
--- a/src/Disks/ya.make
+++ b/src/Disks/ya.make
@@ -17,6 +17,7 @@ SRCS(
     DiskSelector.cpp
     IDisk.cpp
     IVolume.cpp
+    LocalDirectorySyncGuard.cpp
     SingleDiskVolume.cpp
     StoragePolicy.cpp
     VolumeJBOD.cpp
diff --git a/src/Storages/Distributed/DirectoryMonitor.cpp b/src/Storages/Distributed/DirectoryMonitor.cpp
index f54a19c4d15..8d1b9103357 100644
--- a/src/Storages/Distributed/DirectoryMonitor.cpp
+++ b/src/Storages/Distributed/DirectoryMonitor.cpp
@@ -7,7 +7,6 @@
 #include <Common/quoteString.h>
 #include <Common/hex.h>
 #include <Common/ActionBlocker.h>
-#include <Common/DirectorySyncGuard.h>
 #include <common/StringRef.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/Cluster.h>
@@ -178,6 +177,13 @@ namespace
             || code == ErrorCodes::CANNOT_DECOMPRESS
             || (!remote_error && code == ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF);
     }
+
+    SyncGuardPtr getDirectorySyncGuard(bool dir_fsync, const DiskPtr & disk, const String & path)
+    {
+        if (dir_fsync)
+            return disk->getDirectorySyncGuard(path);
+        return nullptr;
+    }
 }
 
 
@@ -244,10 +250,7 @@ void StorageDistributedDirectoryMonitor::shutdownAndDropAllData()
         task_handle->deactivate();
     }
 
-    std::optional<DirectorySyncGuard> dir_sync_guard;
-    if (dir_fsync)
-        dir_sync_guard.emplace(disk, relative_path);
-
+    auto dir_sync_guard = getDirectorySyncGuard(dir_fsync, disk, relative_path);
     Poco::File(path).remove(true);
 }
 
@@ -448,10 +451,7 @@ void StorageDistributedDirectoryMonitor::processFile(const std::string & file_pa
         throw;
     }
 
-    std::optional<DirectorySyncGuard> dir_sync_guard;
-    if (dir_fsync)
-        dir_sync_guard.emplace(disk, relative_path);
-
+    auto dir_sync_guard = getDirectorySyncGuard(dir_fsync, disk, relative_path);
     Poco::File{file_path}.remove();
     metric_pending_files.sub();
 
@@ -537,9 +537,7 @@ struct StorageDistributedDirectoryMonitor::Batch
             /// Temporary file is required for atomicity.
             String tmp_file{parent.current_batch_file_path + ".tmp"};
 
-            std::optional<DirectorySyncGuard> dir_sync_guard;
-            if (dir_fsync)
-                dir_sync_guard.emplace(parent.disk, parent.relative_path);
+            auto dir_sync_guard = getDirectorySyncGuard(dir_fsync, parent.disk, parent.relative_path);
 
             if (Poco::File{tmp_file}.exists())
                 LOG_ERROR(parent.log, "Temporary file {} exists. Unclean shutdown?", backQuote(tmp_file));
@@ -607,10 +605,7 @@ struct StorageDistributedDirectoryMonitor::Batch
         {
             LOG_TRACE(parent.log, "Sent a batch of {} files.", file_indices.size());
 
-            std::optional<DirectorySyncGuard> dir_sync_guard;
-            if (dir_fsync)
-                dir_sync_guard.emplace(parent.disk, parent.relative_path);
-
+            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();
         }
@@ -813,9 +808,7 @@ void StorageDistributedDirectoryMonitor::processFilesWithBatching(const std::map
     }
 
     {
-        std::optional<DirectorySyncGuard> dir_sync_guard;
-        if (dir_fsync)
-            dir_sync_guard.emplace(disk, relative_path);
+        auto dir_sync_guard = getDirectorySyncGuard(dir_fsync, disk, relative_path);
 
         /// current_batch.txt will not exist if there was no send
         /// (this is the case when all batches that was pending has been marked as pending)
@@ -834,13 +827,8 @@ void StorageDistributedDirectoryMonitor::markAsBroken(const std::string & file_p
 
     Poco::File{broken_path}.createDirectory();
 
-    std::optional<DirectorySyncGuard> dir_sync_guard;
-    std::optional<DirectorySyncGuard> broken_dir_sync_guard;
-    if (dir_fsync)
-    {
-        broken_dir_sync_guard.emplace(disk, relative_path + "/broken/");
-        dir_sync_guard.emplace(disk, relative_path);
-    }
+    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);
 
diff --git a/src/Storages/Distributed/DistributedBlockOutputStream.cpp b/src/Storages/Distributed/DistributedBlockOutputStream.cpp
index f4711399400..d21764bbb7d 100644
--- a/src/Storages/Distributed/DistributedBlockOutputStream.cpp
+++ b/src/Storages/Distributed/DistributedBlockOutputStream.cpp
@@ -29,7 +29,6 @@
 #include <Common/escapeForFileName.h>
 #include <Common/CurrentThread.h>
 #include <Common/createHardLink.h>
-#include <Common/DirectorySyncGuard.h>
 #include <common/logger_useful.h>
 #include <ext/range.h>
 #include <ext/scope_guard.h>
@@ -623,11 +622,11 @@ void DistributedBlockOutputStream::writeToShard(const Block & block, const std::
 
     auto make_directory_sync_guard = [&](const std::string & current_path)
     {
-        std::unique_ptr<DirectorySyncGuard> guard;
+        SyncGuardPtr guard;
         if (dir_fsync)
         {
             const std::string relative_path(data_path + current_path);
-            guard = std::make_unique<DirectorySyncGuard>(disk, relative_path);
+            guard = disk->getDirectorySyncGuard(relative_path);
         }
         return guard;
     };
diff --git a/src/Storages/MergeTree/DataPartsExchange.cpp b/src/Storages/MergeTree/DataPartsExchange.cpp
index 5d50f29756c..e01e7793dd3 100644
--- a/src/Storages/MergeTree/DataPartsExchange.cpp
+++ b/src/Storages/MergeTree/DataPartsExchange.cpp
@@ -5,7 +5,6 @@
 #include <Disks/SingleDiskVolume.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/NetException.h>
-#include <Common/DirectorySyncGuard.h>
 #include <DataStreams/NativeBlockOutputStream.h>
 #include <IO/HTTPCommon.h>
 #include <ext/scope_guard.h>
@@ -398,9 +397,9 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
 
     disk->createDirectories(part_download_path);
 
-    std::optional<DirectorySyncGuard> sync_guard;
+    SyncGuardPtr sync_guard;
     if (data.getSettings()->fsync_part_directory)
-        sync_guard.emplace(disk, part_download_path);
+        sync_guard = disk->getDirectorySyncGuard(part_download_path);
 
     MergeTreeData::DataPart::Checksums checksums;
     for (size_t i = 0; i < files; ++i)
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.cpp b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
index 0544f280e25..7c37a067360 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
@@ -11,7 +11,6 @@
 #include <Storages/MergeTree/checkDataPart.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/escapeForFileName.h>
-#include <Common/DirectorySyncGuard.h>
 #include <Common/CurrentMetrics.h>
 #include <common/JSON.h>
 #include <common/logger_useful.h>
@@ -1002,9 +1001,9 @@ void IMergeTreeDataPart::renameTo(const String & new_relative_path, bool remove_
     volume->getDisk()->moveFile(from, to);
     relative_path = new_relative_path;
 
-    std::optional<DirectorySyncGuard> sync_guard;
+    SyncGuardPtr sync_guard;
     if (storage.getSettings()->fsync_part_directory)
-        sync_guard.emplace(volume->getDisk(), to);
+        sync_guard = volume->getDisk()->getDirectorySyncGuard(to);
 }
 
 
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
index f999aa67bbe..f6581574ede 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
@@ -29,7 +29,6 @@
 #include <Common/interpolate.h>
 #include <Common/typeid_cast.h>
 #include <Common/escapeForFileName.h>
-#include <Common/DirectorySyncGuard.h>
 #include <Parsers/queryToString.h>
 
 #include <cmath>
@@ -780,9 +779,9 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTempor
         gathering_column_names.clear();
     }
 
-    std::optional<DirectorySyncGuard> sync_guard;
+    SyncGuardPtr sync_guard;
     if (data.getSettings()->fsync_part_directory)
-        sync_guard.emplace(disk, new_part_tmp_path);
+        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.
@@ -1182,9 +1181,9 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mutatePartToTempor
 
     disk->createDirectories(new_part_tmp_path);
 
-    std::optional<DirectorySyncGuard> sync_guard;
+    SyncGuardPtr sync_guard;
     if (data.getSettings()->fsync_part_directory)
-        sync_guard.emplace(disk, new_part_tmp_path);
+        sync_guard = disk->getDirectorySyncGuard(new_part_tmp_path);
 
     /// Don't change granularity type while mutating subset of columns
     auto mrk_extension = source_part->index_granularity_info.is_adaptive ? getAdaptiveMrkExtension(new_data_part->getType())
diff --git a/src/Storages/MergeTree/MergeTreeDataWriter.cpp b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
index de4d70d5e3e..b49c07bc918 100644
--- a/src/Storages/MergeTree/MergeTreeDataWriter.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
@@ -12,7 +12,6 @@
 #include <IO/WriteHelpers.h>
 #include <Poco/File.h>
 #include <Common/typeid_cast.h>
-#include <Common/DirectorySyncGuard.h>
 
 #include <Parsers/queryToString.h>
 
@@ -362,7 +361,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(BlockWithPa
     new_data_part->minmax_idx = std::move(minmax_idx);
     new_data_part->is_temp = true;
 
-    std::optional<DirectorySyncGuard> sync_guard;
+    SyncGuardPtr sync_guard;
     if (new_data_part->isStoredOnDisk())
     {
         /// The name could be non-unique in case of stale files from previous runs.
@@ -378,7 +377,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(BlockWithPa
         disk->createDirectories(full_path);
 
         if (data.getSettings()->fsync_part_directory)
-            sync_guard.emplace(disk, full_path);
+            sync_guard = disk->getDirectorySyncGuard(full_path);
     }
 
     if (metadata_snapshot->hasRowsTTL())

From d6c0479cf9edc22e7e290584f8ab34a79274bf4d Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Tue, 26 Jan 2021 22:51:30 +0800
Subject: [PATCH 484/611] add normalizeQueryKeepNames and
 normalizedQueryHashKeepNames (#18910)

---
 src/Functions/normalizeQuery.cpp              |  12 +-
 src/Functions/normalizedQueryHash.cpp         |  11 +-
 src/Interpreters/ProcessList.cpp              |   2 +-
 src/Interpreters/executeQuery.cpp             |   4 +-
 src/Parsers/queryNormalization.h              | 107 +++++++++++-------
 ...01648_normalize_query_keep_names.reference |   1 +
 .../01648_normalize_query_keep_names.sql      |   3 +
 7 files changed, 82 insertions(+), 58 deletions(-)
 create mode 100644 tests/queries/0_stateless/01648_normalize_query_keep_names.reference
 create mode 100644 tests/queries/0_stateless/01648_normalize_query_keep_names.sql

diff --git a/src/Functions/normalizeQuery.cpp b/src/Functions/normalizeQuery.cpp
index fdaadcb74ce..0635dd6b7ed 100644
--- a/src/Functions/normalizeQuery.cpp
+++ b/src/Functions/normalizeQuery.cpp
@@ -17,8 +17,10 @@ namespace ErrorCodes
 namespace
 {
 
+template <bool keep_names>
 struct Impl
 {
+    static constexpr auto name = keep_names ? "normalizeQueryKeepNames" : "normalizeQuery";
     static void vector(const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         ColumnString::Chars & res_data,
@@ -32,7 +34,7 @@ struct Impl
         for (size_t i = 0; i < size; ++i)
         {
             ColumnString::Offset curr_src_offset = offsets[i];
-            normalizeQueryToPODArray(
+            normalizeQueryToPODArray<keep_names>(
                 reinterpret_cast<const char *>(&data[prev_src_offset]),
                 reinterpret_cast<const char *>(&data[curr_src_offset - 1]),
                 res_data);
@@ -47,16 +49,12 @@ struct Impl
     }
 };
 
-struct Name
-{
-    static constexpr auto name = "normalizeQuery";
-};
-
 }
 
 void registerFunctionNormalizeQuery(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionStringToString<Impl, Name>>();
+    factory.registerFunction<FunctionStringToString<Impl<true>, Impl<true>>>();
+    factory.registerFunction<FunctionStringToString<Impl<false>, Impl<false>>>();
 }
 
 }
diff --git a/src/Functions/normalizedQueryHash.cpp b/src/Functions/normalizedQueryHash.cpp
index 9fe92027cbe..5704b5301ca 100644
--- a/src/Functions/normalizedQueryHash.cpp
+++ b/src/Functions/normalizedQueryHash.cpp
@@ -24,6 +24,7 @@ namespace ErrorCodes
 namespace
 {
 
+template <bool keep_names>
 struct Impl
 {
     static void vector(
@@ -38,17 +39,18 @@ struct Impl
         for (size_t i = 0; i < size; ++i)
         {
             ColumnString::Offset curr_src_offset = offsets[i];
-            res_data[i] = normalizedQueryHash(
+            res_data[i] = normalizedQueryHash<keep_names>(
                 reinterpret_cast<const char *>(&data[prev_src_offset]), reinterpret_cast<const char *>(&data[curr_src_offset - 1]));
             prev_src_offset = offsets[i];
         }
     }
 };
 
+template <bool keep_names>
 class FunctionNormalizedQueryHash : public IFunction
 {
 public:
-    static constexpr auto name = "normalizedQueryHash";
+    static constexpr auto name = keep_names ? "normalizedQueryHashKeepNames" : "normalizedQueryHash";
     static FunctionPtr create(const Context &)
     {
         return std::make_shared<FunctionNormalizedQueryHash>();
@@ -82,7 +84,7 @@ public:
             auto col_res = ColumnUInt64::create();
             typename ColumnUInt64::Container & vec_res = col_res->getData();
             vec_res.resize(col->size());
-            Impl::vector(col->getChars(), col->getOffsets(), vec_res);
+            Impl<keep_names>::vector(col->getChars(), col->getOffsets(), vec_res);
             return col_res;
         }
         else
@@ -95,7 +97,8 @@ public:
 
 void registerFunctionNormalizedQueryHash(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionNormalizedQueryHash>();
+    factory.registerFunction<FunctionNormalizedQueryHash<true>>();
+    factory.registerFunction<FunctionNormalizedQueryHash<false>>();
 }
 
 }
diff --git a/src/Interpreters/ProcessList.cpp b/src/Interpreters/ProcessList.cpp
index 9b0d69b6ac4..4e336a98787 100644
--- a/src/Interpreters/ProcessList.cpp
+++ b/src/Interpreters/ProcessList.cpp
@@ -196,7 +196,7 @@ ProcessList::EntryPtr ProcessList::insert(const String & query_, const IAST * as
             thread_group->performance_counters.setParent(&user_process_list.user_performance_counters);
             thread_group->memory_tracker.setParent(&user_process_list.user_memory_tracker);
             thread_group->query = process_it->query;
-            thread_group->normalized_query_hash = normalizedQueryHash(process_it->query);
+            thread_group->normalized_query_hash = normalizedQueryHash<false>(process_it->query);
 
             /// Set query-level memory trackers
             thread_group->memory_tracker.setOrRaiseHardLimit(settings.max_memory_usage);
diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index dff0f0bf6f5..020e5af365a 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -253,7 +253,7 @@ static void onExceptionBeforeStart(const String & query_for_logging, Context & c
 
     elem.current_database = context.getCurrentDatabase();
     elem.query = query_for_logging;
-    elem.normalized_query_hash = normalizedQueryHash(query_for_logging);
+    elem.normalized_query_hash = normalizedQueryHash<false>(query_for_logging);
 
     // We don't calculate query_kind, databases, tables and columns when the query isn't able to start
 
@@ -622,7 +622,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
 
             elem.current_database = context.getCurrentDatabase();
             elem.query = query_for_logging;
-            elem.normalized_query_hash = normalizedQueryHash(query_for_logging);
+            elem.normalized_query_hash = normalizedQueryHash<false>(query_for_logging);
 
             elem.client_info = context.getClientInfo();
 
diff --git a/src/Parsers/queryNormalization.h b/src/Parsers/queryNormalization.h
index 532be0aca7d..bea365c02e4 100644
--- a/src/Parsers/queryNormalization.h
+++ b/src/Parsers/queryNormalization.h
@@ -10,6 +10,7 @@
 
 namespace DB
 {
+template <bool keep_names>
 inline UInt64 ALWAYS_INLINE normalizedQueryHash(const char * begin, const char * end)
 {
     SipHash hash;
@@ -61,31 +62,39 @@ inline UInt64 ALWAYS_INLINE normalizedQueryHash(const char * begin, const char *
             /// By the way, there is padding in columns and pointer dereference is Ok.
             || (token.type == TokenType::BareWord && *token.end != '('))
         {
-            /// Identifier is complex if it contains whitespace or more than two digits
-            /// or it's at least 36 bytes long (UUID for example).
-            size_t num_digits = 0;
-
-            const char * pos = token.begin;
-            if (token.size() < 36)
+            /// Explicitly ask to keep identifier names
+            if constexpr (keep_names)
             {
-                for (; pos != token.end; ++pos)
-                {
-                    if (isWhitespaceASCII(*pos))
-                        break;
+                hash.update(token.begin, token.size());
+            }
+            else
+            {
+                /// Identifier is complex if it contains whitespace or more than two digits
+                /// or it's at least 36 bytes long (UUID for example).
+                size_t num_digits = 0;
 
-                    if (isNumericASCII(*pos))
+                const char * pos = token.begin;
+                if (token.size() < 36)
+                {
+                    for (; pos != token.end; ++pos)
                     {
-                        ++num_digits;
-                        if (num_digits > 2)
+                        if (isWhitespaceASCII(*pos))
                             break;
+
+                        if (isNumericASCII(*pos))
+                        {
+                            ++num_digits;
+                            if (num_digits > 2)
+                                break;
+                        }
                     }
                 }
-            }
 
-            if (pos == token.end)
-                hash.update(token.begin, token.size());
-            else
-                hash.update("\x01", 1);
+                if (pos == token.end)
+                    hash.update(token.begin, token.size());
+                else
+                    hash.update("\x01", 1);
+            }
 
             continue;
         }
@@ -99,12 +108,14 @@ inline UInt64 ALWAYS_INLINE normalizedQueryHash(const char * begin, const char *
     return hash.get64();
 }
 
+template <bool keep_names>
 inline UInt64 ALWAYS_INLINE normalizedQueryHash(const String & query)
 {
-    return normalizedQueryHash(query.data(), query.data() + query.size());
+    return normalizedQueryHash<keep_names>(query.data(), query.data() + query.size());
 }
 
 
+template <bool keep_names>
 inline void ALWAYS_INLINE normalizeQueryToPODArray(const char * begin, const char * end, PaddedPODArray<UInt8> & res_data)
 {
     Lexer lexer(begin, end);
@@ -187,36 +198,44 @@ inline void ALWAYS_INLINE normalizeQueryToPODArray(const char * begin, const cha
             /// By the way, there is padding in columns and pointer dereference is Ok.
             || (token.type == TokenType::BareWord && *token.end != '('))
         {
-            /// Identifier is complex if it contains whitespace or more than two digits
-            /// or it's at least 36 bytes long (UUID for example).
-            size_t num_digits = 0;
-
-            const char * pos = token.begin;
-            if (token.size() < 36)
-            {
-                for (; pos != token.end; ++pos)
-                {
-                    if (isWhitespaceASCII(*pos))
-                        break;
-
-                    if (isNumericASCII(*pos))
-                    {
-                        ++num_digits;
-                        if (num_digits > 2)
-                            break;
-                    }
-                }
-            }
-
-            if (pos == token.end)
+            /// Explicitly ask to normalize with identifier names
+            if constexpr (keep_names)
             {
                 res_data.insert(token.begin, token.end);
             }
             else
             {
-                res_data.push_back('`');
-                res_data.push_back('?');
-                res_data.push_back('`');
+                /// Identifier is complex if it contains whitespace or more than two digits
+                /// or it's at least 36 bytes long (UUID for example).
+                size_t num_digits = 0;
+
+                const char * pos = token.begin;
+                if (token.size() < 36)
+                {
+                    for (; pos != token.end; ++pos)
+                    {
+                        if (isWhitespaceASCII(*pos))
+                            break;
+
+                        if (isNumericASCII(*pos))
+                        {
+                            ++num_digits;
+                            if (num_digits > 2)
+                                break;
+                        }
+                    }
+                }
+
+                if (pos == token.end)
+                {
+                    res_data.insert(token.begin, token.end);
+                }
+                else
+                {
+                    res_data.push_back('`');
+                    res_data.push_back('?');
+                    res_data.push_back('`');
+                }
             }
 
             continue;
diff --git a/tests/queries/0_stateless/01648_normalize_query_keep_names.reference b/tests/queries/0_stateless/01648_normalize_query_keep_names.reference
new file mode 100644
index 00000000000..ce2e5ab7660
--- /dev/null
+++ b/tests/queries/0_stateless/01648_normalize_query_keep_names.reference
@@ -0,0 +1 @@
+SELECT ? AS `aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee`	0
diff --git a/tests/queries/0_stateless/01648_normalize_query_keep_names.sql b/tests/queries/0_stateless/01648_normalize_query_keep_names.sql
new file mode 100644
index 00000000000..7f82f21e67d
--- /dev/null
+++ b/tests/queries/0_stateless/01648_normalize_query_keep_names.sql
@@ -0,0 +1,3 @@
+SELECT normalizeQueryKeepNames('SELECT 1 AS `aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee`'),
+    normalizedQueryHashKeepNames('SELECT 1 AS `aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee`')
+  = normalizedQueryHashKeepNames('SELECT 2 AS `aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeef`');

From 403e74d941de3083cc8f4335cea3ccfb0613b879 Mon Sep 17 00:00:00 2001
From: Yatsishin Ilya <2159081+qoega@users.noreply.github.com>
Date: Tue, 26 Jan 2021 18:12:08 +0300
Subject: [PATCH 485/611] Add more debuginfo for test_concurrent_ttl_merges
 test

---
 tests/integration/helpers/test_tools.py       |  3 +++
 .../test_concurrent_ttl_merges/test.py        | 25 ++++++++++---------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/tests/integration/helpers/test_tools.py b/tests/integration/helpers/test_tools.py
index 75ae8f67f7a..bbab12e55d4 100644
--- a/tests/integration/helpers/test_tools.py
+++ b/tests/integration/helpers/test_tools.py
@@ -38,6 +38,9 @@ class TSV:
     def __str__(self):
         return '\n'.join(self.lines)
 
+    def __len__(self):
+        return len(self.lines)
+
     @staticmethod
     def toMat(contents):
         return [line.split("\t") for line in contents.split("\n") if line.strip()]
diff --git a/tests/integration/test_concurrent_ttl_merges/test.py b/tests/integration/test_concurrent_ttl_merges/test.py
index 65bc3828b38..68913329e6b 100644
--- a/tests/integration/test_concurrent_ttl_merges/test.py
+++ b/tests/integration/test_concurrent_ttl_merges/test.py
@@ -2,7 +2,7 @@ import time
 
 import pytest
 from helpers.cluster import ClickHouseCluster
-from helpers.test_tools import assert_eq_with_retry
+from helpers.test_tools import assert_eq_with_retry, TSV
 
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance('node1', main_configs=['configs/fast_background_pool.xml', 'configs/log_conf.xml'], with_zookeeper=True)
@@ -28,12 +28,13 @@ def count_ttl_merges_in_queue(node, table):
     return int(result.strip())
 
 
-def count_ttl_merges_in_background_pool(node, table):
-    result = node.query(
-        "SELECT count() FROM system.merges WHERE merge_type = 'TTL_DELETE' and table = '{}'".format(table))
-    if not result:
-        return 0
-    return int(result.strip())
+def count_ttl_merges_in_background_pool(node, table, level):
+    result = TSV(node.query(
+        "SELECT * FROM system.merges WHERE merge_type = 'TTL_DELETE' and table = '{}'".format(table)))
+    count = len(result)
+    if count >= level:
+        print("count_ttl_merges_in_background_pool: merges more than warn level:\n{}".format(result))
+    return count
 
 
 def count_regular_merges_in_background_pool(node, table):
@@ -67,7 +68,7 @@ def test_no_ttl_merges_in_busy_pool(started_cluster):
 
     while count_running_mutations(node1, "test_ttl") < 6:
         print("Mutations count", count_running_mutations(node1, "test_ttl"))
-        assert count_ttl_merges_in_background_pool(node1, "test_ttl") == 0
+        assert count_ttl_merges_in_background_pool(node1, "test_ttl", 1) == 0
         time.sleep(0.5)
 
     node1.query("SYSTEM START TTL MERGES")
@@ -100,7 +101,7 @@ def test_limited_ttl_merges_in_empty_pool(started_cluster):
 
     merges_with_ttl_count = set({})
     while True:
-        merges_with_ttl_count.add(count_ttl_merges_in_background_pool(node1, "test_ttl_v2"))
+        merges_with_ttl_count.add(count_ttl_merges_in_background_pool(node1, "test_ttl_v2", 3))
         time.sleep(0.01)
         if node1.query("SELECT COUNT() FROM test_ttl_v2") == "0\n":
             break
@@ -124,7 +125,7 @@ def test_limited_ttl_merges_in_empty_pool_replicated(started_cluster):
     merges_with_ttl_count = set({})
     entries_with_ttl_count = set({})
     while True:
-        merges_with_ttl_count.add(count_ttl_merges_in_background_pool(node1, "replicated_ttl"))
+        merges_with_ttl_count.add(count_ttl_merges_in_background_pool(node1, "replicated_ttl", 3))
         entries_with_ttl_count.add(count_ttl_merges_in_queue(node1, "replicated_ttl"))
         time.sleep(0.01)
         if node1.query("SELECT COUNT() FROM replicated_ttl") == "0\n":
@@ -159,8 +160,8 @@ def test_limited_ttl_merges_two_replicas(started_cluster):
     merges_with_ttl_count_node1 = set({})
     merges_with_ttl_count_node2 = set({})
     while True:
-        merges_with_ttl_count_node1.add(count_ttl_merges_in_background_pool(node1, "replicated_ttl_2"))
-        merges_with_ttl_count_node2.add(count_ttl_merges_in_background_pool(node2, "replicated_ttl_2"))
+        merges_with_ttl_count_node1.add(count_ttl_merges_in_background_pool(node1, "replicated_ttl_2"), 3)
+        merges_with_ttl_count_node2.add(count_ttl_merges_in_background_pool(node2, "replicated_ttl_2"), 3)
         if node1.query("SELECT COUNT() FROM replicated_ttl_2") == "0\n" and node2.query(
                 "SELECT COUNT() FROM replicated_ttl_2") == "0\n":
             break

From 2dd723e21411d87fe9ffc24a9e4a78bdfeca140f Mon Sep 17 00:00:00 2001
From: feng lv <fenglv15@mails.ucas.ac.cn>
Date: Tue, 26 Jan 2021 15:20:51 +0000
Subject: [PATCH 486/611] fix special build on clang11

---
 src/DataTypes/convertMySQLDataType.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DataTypes/convertMySQLDataType.cpp b/src/DataTypes/convertMySQLDataType.cpp
index c53d9b19d1a..b266a9f035f 100644
--- a/src/DataTypes/convertMySQLDataType.cpp
+++ b/src/DataTypes/convertMySQLDataType.cpp
@@ -45,7 +45,7 @@ DataTypePtr convertMySQLDataType(MultiEnum<MySQLDataTypesSupport> type_support,
     // 4. type_with_params(param1, param2, ...) options
     // The options can be unsigned, zerofill, or some other strings.
     auto data_type = std::string_view(mysql_data_type);
-    const auto type_end_pos = data_type.find_first_of("(\x20"); // FIXME: fix style-check script instead
+    const auto type_end_pos = data_type.find_first_of(R"(( )"); // FIXME: fix style-check script instead
     const auto type_name = data_type.substr(0, type_end_pos);
 
     DataTypePtr res;

From 6a99955610601c84adebe1109cd6c738e1b5fa13 Mon Sep 17 00:00:00 2001
From: Dmitriy <sevirov@yandex-team.ru>
Date: Tue, 26 Jan 2021 19:32:34 +0300
Subject: [PATCH 487/611] Update the description of the max_final_threads
 setting
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Поправил формулировку назначения настройки max_final_threads.
---
 docs/en/operations/settings/settings.md | 2 +-
 docs/ru/operations/settings/settings.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index d407430bc79..3db58602d1b 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -2557,7 +2557,7 @@ It can be useful when merges are CPU bounded not IO bounded (performing heavy da
 
 ## max_final_threads {#max-final-threads}
 
-Sets the maximum number of parallel threads to execute `SELECT` queries with the [FINAL](../../sql-reference/statements/select/from.md#select-from-final) modifier.
+Sets the maximum number of parallel threads for the `SELECT` query data read phase with the [FINAL](../../sql-reference/statements/select/from.md#select-from-final) modifier.
 
 Possible values:
 
diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index 0d5c1630045..05b9ff93488 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -2418,7 +2418,7 @@ WHERE 0
 
 ## max_final_threads {#max-final-threads}
 
-Устанавливает максимальное количество параллельных потоков для выполнения `SELECT` запросов с модификатором [FINAL](../../sql-reference/statements/select/from.md#select-from-final).
+Устанавливает максимальное количество параллельных потоков для фазы чтения данных запроса `SELECT` с модификатором [FINAL](../../sql-reference/statements/select/from.md#select-from-final).
 
 Возможные значения:
 

From 76adc85c7562af482c66d7740bb5ca2c8f87312f Mon Sep 17 00:00:00 2001
From: Yatsishin Ilya <2159081+qoega@users.noreply.github.com>
Date: Tue, 26 Jan 2021 19:33:37 +0300
Subject: [PATCH 488/611] fix

---
 tests/integration/test_concurrent_ttl_merges/test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/integration/test_concurrent_ttl_merges/test.py b/tests/integration/test_concurrent_ttl_merges/test.py
index 68913329e6b..ba5ed9f0758 100644
--- a/tests/integration/test_concurrent_ttl_merges/test.py
+++ b/tests/integration/test_concurrent_ttl_merges/test.py
@@ -160,8 +160,8 @@ def test_limited_ttl_merges_two_replicas(started_cluster):
     merges_with_ttl_count_node1 = set({})
     merges_with_ttl_count_node2 = set({})
     while True:
-        merges_with_ttl_count_node1.add(count_ttl_merges_in_background_pool(node1, "replicated_ttl_2"), 3)
-        merges_with_ttl_count_node2.add(count_ttl_merges_in_background_pool(node2, "replicated_ttl_2"), 3)
+        merges_with_ttl_count_node1.add(count_ttl_merges_in_background_pool(node1, "replicated_ttl_2", 3))
+        merges_with_ttl_count_node2.add(count_ttl_merges_in_background_pool(node2, "replicated_ttl_2", 3))
         if node1.query("SELECT COUNT() FROM replicated_ttl_2") == "0\n" and node2.query(
                 "SELECT COUNT() FROM replicated_ttl_2") == "0\n":
             break

From 3322cc812d15db63c5698ae9e180a7594a1a05e0 Mon Sep 17 00:00:00 2001
From: Vladimir Chebotarev <vladimir.chebotarev@gmail.com>
Date: Tue, 26 Jan 2021 10:49:16 +0300
Subject: [PATCH 489/611] Updated AWS C++ SDK.

---
 contrib/aws                       |  2 +-
 src/IO/S3/PocoHTTPClient.cpp      | 18 +++-----------
 src/IO/S3/PocoHTTPClient.h        | 41 +++++++++++++++++++++++++++----
 src/IO/S3/SessionAwareAwsStream.h | 27 --------------------
 src/IO/S3/SessionAwareIOStream.h  | 26 ++++++++++++++++++++
 src/IO/S3Common.cpp               | 23 +++++++++++++++--
 6 files changed, 87 insertions(+), 50 deletions(-)
 delete mode 100644 src/IO/S3/SessionAwareAwsStream.h
 create mode 100644 src/IO/S3/SessionAwareIOStream.h

diff --git a/contrib/aws b/contrib/aws
index a220591e335..7d48b2c8193 160000
--- a/contrib/aws
+++ b/contrib/aws
@@ -1 +1 @@
-Subproject commit a220591e335923ce1c19bbf9eb925787f7ab6c13
+Subproject commit 7d48b2c8193679cc4516e5bd68ae4a64b94dae7d
diff --git a/src/IO/S3/PocoHTTPClient.cpp b/src/IO/S3/PocoHTTPClient.cpp
index 2389f9a2192..cfd4593d80f 100644
--- a/src/IO/S3/PocoHTTPClient.cpp
+++ b/src/IO/S3/PocoHTTPClient.cpp
@@ -6,13 +6,11 @@
 
 #include <utility>
 #include <IO/HTTPCommon.h>
-#include <IO/S3/SessionAwareAwsStream.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 #include <Common/Stopwatch.h>
 #include <aws/core/http/HttpRequest.h>
 #include <aws/core/http/HttpResponse.h>
-#include <aws/core/http/standard/StandardHttpResponse.h>
 #include <aws/core/monitoring/HttpClientMetrics.h>
 #include <aws/core/utils/ratelimiter/RateLimiterInterface.h>
 #include "Poco/StreamCopier.h"
@@ -90,29 +88,19 @@ PocoHTTPClient::PocoHTTPClient(const PocoHTTPClientConfiguration & clientConfigu
 {
 }
 
-std::shared_ptr<Aws::Http::HttpResponse> PocoHTTPClient::MakeRequest(
-    Aws::Http::HttpRequest & request,
-    Aws::Utils::RateLimits::RateLimiterInterface * readLimiter,
-    Aws::Utils::RateLimits::RateLimiterInterface * writeLimiter) const
-{
-    auto response = Aws::MakeShared<Aws::Http::Standard::StandardHttpResponse>("PocoHTTPClient", request);
-    makeRequestInternal(request, response, readLimiter, writeLimiter);
-    return response;
-}
-
 std::shared_ptr<Aws::Http::HttpResponse> PocoHTTPClient::MakeRequest(
     const std::shared_ptr<Aws::Http::HttpRequest> & request,
     Aws::Utils::RateLimits::RateLimiterInterface * readLimiter,
     Aws::Utils::RateLimits::RateLimiterInterface * writeLimiter) const
 {
-    auto response = Aws::MakeShared<Aws::Http::Standard::StandardHttpResponse>("PocoHTTPClient", request);
+    auto response = Aws::MakeShared<PocoHTTPResponse>("PocoHTTPClient", request);
     makeRequestInternal(*request, response, readLimiter, writeLimiter);
     return response;
 }
 
 void PocoHTTPClient::makeRequestInternal(
     Aws::Http::HttpRequest & request,
-    std::shared_ptr<Aws::Http::Standard::StandardHttpResponse> & response,
+    std::shared_ptr<PocoHTTPResponse> & response,
     Aws::Utils::RateLimits::RateLimiterInterface *,
     Aws::Utils::RateLimits::RateLimiterInterface *) const
 {
@@ -278,7 +266,7 @@ void PocoHTTPClient::makeRequestInternal(
                 }
             }
             else
-                response->GetResponseStream().SetUnderlyingStream(std::make_shared<SessionAwareAwsStream<decltype(session)>>(session, response_body_stream));
+                response->SetResponseBody(response_body_stream, session);
 
             return;
         }
diff --git a/src/IO/S3/PocoHTTPClient.h b/src/IO/S3/PocoHTTPClient.h
index e4fc453f388..6631a209174 100644
--- a/src/IO/S3/PocoHTTPClient.h
+++ b/src/IO/S3/PocoHTTPClient.h
@@ -2,9 +2,12 @@
 
 #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>
 
 namespace Aws::Http::Standard
 {
@@ -30,15 +33,43 @@ struct PocoHTTPClientConfiguration : public Aws::Client::ClientConfiguration
     void updateSchemeAndRegion();
 };
 
+class PocoHTTPResponse : public Aws::Http::Standard::StandardHttpResponse
+{
+public:
+    using SessionPtr = PooledHTTPSessionPtr;
+
+    PocoHTTPResponse(const std::shared_ptr<const Aws::Http::HttpRequest> request)
+        : Aws::Http::Standard::StandardHttpResponse(request)
+        , body_stream(request->GetResponseStreamFactory())
+    {
+    }
+
+    void SetResponseBody(Aws::IStream & incoming_stream, SessionPtr & session_)
+    {
+        body_stream = Aws::Utils::Stream::ResponseStream(
+            Aws::New<SessionAwareIOStream<SessionPtr>>("http result streambuf", session_, incoming_stream.rdbuf())
+        );
+    }
+
+    Aws::IOStream & GetResponseBody() const override
+    {
+        return body_stream.GetUnderlyingStream();
+    }
+
+    Aws::Utils::Stream::ResponseStream && SwapResponseStreamOwnership() override
+    {
+        return std::move(body_stream);
+    }
+
+private:
+    Aws::Utils::Stream::ResponseStream body_stream;
+};
+
 class PocoHTTPClient : public Aws::Http::HttpClient
 {
 public:
     explicit PocoHTTPClient(const PocoHTTPClientConfiguration & clientConfiguration);
     ~PocoHTTPClient() override = default;
-    std::shared_ptr<Aws::Http::HttpResponse> MakeRequest(
-        Aws::Http::HttpRequest & request,
-        Aws::Utils::RateLimits::RateLimiterInterface * readLimiter,
-        Aws::Utils::RateLimits::RateLimiterInterface * writeLimiter) const override;
 
     std::shared_ptr<Aws::Http::HttpResponse> MakeRequest(
         const std::shared_ptr<Aws::Http::HttpRequest> & request,
@@ -48,7 +79,7 @@ public:
 private:
     void makeRequestInternal(
         Aws::Http::HttpRequest & request,
-        std::shared_ptr<Aws::Http::Standard::StandardHttpResponse> & response,
+        std::shared_ptr<PocoHTTPResponse> & response,
         Aws::Utils::RateLimits::RateLimiterInterface * readLimiter,
         Aws::Utils::RateLimits::RateLimiterInterface * writeLimiter) const;
 
diff --git a/src/IO/S3/SessionAwareAwsStream.h b/src/IO/S3/SessionAwareAwsStream.h
deleted file mode 100644
index f64be5dac16..00000000000
--- a/src/IO/S3/SessionAwareAwsStream.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-
-#include <IO/HTTPCommon.h>
-
-#include <aws/core/utils/stream/ResponseStream.h>
-
-
-namespace DB::S3
-{
-/**
- * Wrapper of IOStream to store response stream and corresponding HTTP session.
- */
-template <typename Session>
-class SessionAwareAwsStream : public Aws::IStream
-{
-public:
-    SessionAwareAwsStream(Session session_, std::istream & response_stream_)
-        : Aws::IStream(response_stream_.rdbuf()), session(std::move(session_))
-    {
-    }
-
-private:
-    /// Poco HTTP session is holder of response stream.
-    Session session;
-};
-
-}
diff --git a/src/IO/S3/SessionAwareIOStream.h b/src/IO/S3/SessionAwareIOStream.h
new file mode 100644
index 00000000000..1640accb6fa
--- /dev/null
+++ b/src/IO/S3/SessionAwareIOStream.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <iostream>
+
+
+namespace DB::S3
+{
+/**
+ * Wrapper of IOStream to store response stream and corresponding HTTP session.
+ */
+template <typename Session>
+class SessionAwareIOStream : public std::iostream
+{
+public:
+    SessionAwareIOStream(Session session_, std::streambuf * sb)
+        : std::iostream(sb)
+        , session(std::move(session_))
+    {
+    }
+
+private:
+    /// Poco HTTP session is holder of response stream.
+    Session session;
+};
+
+}
diff --git a/src/IO/S3Common.cpp b/src/IO/S3Common.cpp
index d4c4ba9bb02..125ba907629 100644
--- a/src/IO/S3Common.cpp
+++ b/src/IO/S3Common.cpp
@@ -207,13 +207,32 @@ public:
         return result;
     }
 
+    bool SignRequest(Aws::Http::HttpRequest & request, const char * region, const char * service_name, bool sign_body) const override
+    {
+        auto result = Aws::Client::AWSAuthV4Signer::SignRequest(request, region, service_name, sign_body);
+        for (const auto & header : headers)
+            request.SetHeaderValue(header.name, header.value);
+        return result;
+    }
+
     bool PresignRequest(
         Aws::Http::HttpRequest & request,
         const char * region,
-        const char * serviceName,
         long long expiration_time_sec) const override // NOLINT
     {
-        auto result = Aws::Client::AWSAuthV4Signer::PresignRequest(request, region, serviceName, expiration_time_sec);
+        auto result = Aws::Client::AWSAuthV4Signer::PresignRequest(request, region, expiration_time_sec);
+        for (const auto & header : headers)
+            request.SetHeaderValue(header.name, header.value);
+        return result;
+    }
+
+    bool PresignRequest(
+        Aws::Http::HttpRequest & request,
+        const char * region,
+        const char * service_name,
+        long long expiration_time_sec) const override // NOLINT
+    {
+        auto result = Aws::Client::AWSAuthV4Signer::PresignRequest(request, region, service_name, expiration_time_sec);
         for (const auto & header : headers)
             request.SetHeaderValue(header.name, header.value);
         return result;

From 5f13fdddc0ec9178f6097df3fd876d5d73218205 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Tue, 26 Jan 2021 21:22:40 +0300
Subject: [PATCH 490/611] Remove useless code from BigInt

---
 src/Columns/ColumnDecimal.cpp         |   1 -
 src/Columns/ColumnVector.cpp          | 141 ++++++++------------------
 src/Columns/ColumnVector.h            |  29 ++----
 src/Common/HashTable/Hash.h           |   1 -
 src/Common/SipHash.h                  |  32 +-----
 src/Compression/CompressionCodecT64.h |   2 +-
 src/Functions/FunctionsComparison.h   |   4 +-
 src/Functions/FunctionsHashing.h      |  22 +---
 8 files changed, 59 insertions(+), 173 deletions(-)

diff --git a/src/Columns/ColumnDecimal.cpp b/src/Columns/ColumnDecimal.cpp
index 885df0446df..f6261079287 100644
--- a/src/Columns/ColumnDecimal.cpp
+++ b/src/Columns/ColumnDecimal.cpp
@@ -4,7 +4,6 @@
 #include <Common/assert_cast.h>
 #include <Common/WeakHash.h>
 #include <Common/HashTable/Hash.h>
-#include <Core/BigInt.h>
 
 #include <common/unaligned.h>
 #include <common/sort.h>
diff --git a/src/Columns/ColumnVector.cpp b/src/Columns/ColumnVector.cpp
index d768757227b..fcbcc63731a 100644
--- a/src/Columns/ColumnVector.cpp
+++ b/src/Columns/ColumnVector.cpp
@@ -37,33 +37,16 @@ namespace ErrorCodes
 template <typename T>
 StringRef ColumnVector<T>::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
 {
-    if constexpr (is_big_int_v<T>)
-    {
-        static constexpr size_t bytesize = BigInt<T>::size;
-        char * pos = arena.allocContinue(bytesize, begin);
-        return BigInt<T>::serialize(data[n], pos);
-    }
-    else
-    {
-        auto * pos = arena.allocContinue(sizeof(T), begin);
-        unalignedStore<T>(pos, data[n]);
-        return StringRef(pos, sizeof(T));
-    }
+    auto * pos = arena.allocContinue(sizeof(T), begin);
+    unalignedStore<T>(pos, data[n]);
+    return StringRef(pos, sizeof(T));
 }
 
 template <typename T>
 const char * ColumnVector<T>::deserializeAndInsertFromArena(const char * pos)
 {
-    if constexpr (is_big_int_v<T>)
-    {
-        data.emplace_back(BigInt<T>::deserialize(pos));
-        return pos + BigInt<T>::size;
-    }
-    else
-    {
-        data.emplace_back(unalignedLoad<T>(pos));
-        return pos + sizeof(T);
-    }
+    data.emplace_back(unalignedLoad<T>(pos));
+    return pos + sizeof(T);
 }
 
 template <typename T>
@@ -299,18 +282,10 @@ MutableColumnPtr ColumnVector<T>::cloneResized(size_t size) const
         new_col.data.resize(size);
 
         size_t count = std::min(this->size(), size);
-        if constexpr (is_POD)
-        {
-            memcpy(new_col.data.data(), data.data(), count * sizeof(data[0]));
+        memcpy(new_col.data.data(), data.data(), count * sizeof(data[0]));
 
-            if (size > count)
-                memset(static_cast<void *>(&new_col.data[count]), static_cast<int>(ValueType()), (size - count) * sizeof(ValueType));
-        }
-        else
-        {
-            for (size_t i = 0; i < count; i++)
-                new_col.data[i] = data[i];
-        }
+        if (size > count)
+            memset(static_cast<void *>(&new_col.data[count]), static_cast<int>(ValueType()), (size - count) * sizeof(ValueType));
     }
 
     return res;
@@ -348,15 +323,7 @@ void ColumnVector<T>::insertRangeFrom(const IColumn & src, size_t start, size_t
 
     size_t old_size = data.size();
     data.resize(old_size + length);
-    if constexpr (is_POD)
-    {
-        memcpy(data.data() + old_size, &src_vec.data[start], length * sizeof(data[0]));
-    }
-    else
-    {
-        for (size_t i = 0; i < length; i++)
-            data[old_size + i] = src_vec.data[start + i];
-    }
+    memcpy(data.data() + old_size, &src_vec.data[start], length * sizeof(data[0]));
 }
 
 template <typename T>
@@ -372,70 +339,52 @@ ColumnPtr ColumnVector<T>::filter(const IColumn::Filter & filt, ssize_t result_s
     if (result_size_hint)
         res_data.reserve(result_size_hint > 0 ? result_size_hint : size);
 
-    if constexpr (is_POD)
-    {
-        const UInt8 * filt_pos = filt.data();
-        const UInt8 * filt_end = filt_pos + size;
-        const T * data_pos = data.data();
+    const UInt8 * filt_pos = filt.data();
+    const UInt8 * filt_end = filt_pos + size;
+    const T * data_pos = data.data();
 
 #ifdef __SSE2__
-        /** A slightly more optimized version.
-        * Based on the assumption that often pieces of consecutive values
-        *  completely pass or do not pass the filter.
-        * Therefore, we will optimistically check the parts of `SIMD_BYTES` values.
-        */
+    /** A slightly more optimized version.
+    * Based on the assumption that often pieces of consecutive values
+    *  completely pass or do not pass the filter.
+    * Therefore, we will optimistically check the parts of `SIMD_BYTES` values.
+    */
 
-        static constexpr size_t SIMD_BYTES = 16;
-        const __m128i zero16 = _mm_setzero_si128();
-        const UInt8 * filt_end_sse = filt_pos + size / SIMD_BYTES * SIMD_BYTES;
+    static constexpr size_t SIMD_BYTES = 16;
+    const __m128i zero16 = _mm_setzero_si128();
+    const UInt8 * filt_end_sse = filt_pos + size / SIMD_BYTES * SIMD_BYTES;
 
-        while (filt_pos < filt_end_sse)
+    while (filt_pos < filt_end_sse)
+    {
+        int mask = _mm_movemask_epi8(_mm_cmpgt_epi8(_mm_loadu_si128(reinterpret_cast<const __m128i *>(filt_pos)), zero16));
+
+        if (0 == mask)
         {
-            int mask = _mm_movemask_epi8(_mm_cmpgt_epi8(_mm_loadu_si128(reinterpret_cast<const __m128i *>(filt_pos)), zero16));
-
-            if (0 == mask)
-            {
-                /// Nothing is inserted.
-            }
-            else if (0xFFFF == mask)
-            {
-                res_data.insert(data_pos, data_pos + SIMD_BYTES);
-            }
-            else
-            {
-                for (size_t i = 0; i < SIMD_BYTES; ++i)
-                    if (filt_pos[i])
-                        res_data.push_back(data_pos[i]);
-            }
-
-            filt_pos += SIMD_BYTES;
-            data_pos += SIMD_BYTES;
+            /// Nothing is inserted.
         }
+        else if (0xFFFF == mask)
+        {
+            res_data.insert(data_pos, data_pos + SIMD_BYTES);
+        }
+        else
+        {
+            for (size_t i = 0; i < SIMD_BYTES; ++i)
+                if (filt_pos[i])
+                    res_data.push_back(data_pos[i]);
+        }
+
+        filt_pos += SIMD_BYTES;
+        data_pos += SIMD_BYTES;
+    }
 #endif
 
-        while (filt_pos < filt_end)
-        {
-            if (*filt_pos)
-                res_data.push_back(*data_pos);
-
-            ++filt_pos;
-            ++data_pos;
-        }
-    }
-    else
+    while (filt_pos < filt_end)
     {
-        const auto * filt_pos = filt.begin();
-        const auto * filt_end = filt.end();
-        auto data_pos = data.begin();
+        if (*filt_pos)
+            res_data.push_back(*data_pos);
 
-        while (filt_pos < filt_end)
-        {
-            if (*filt_pos)
-                res_data.push_back(*data_pos);
-
-            ++filt_pos;
-            ++data_pos;
-        }
+        ++filt_pos;
+        ++data_pos;
     }
 
     return res;
diff --git a/src/Columns/ColumnVector.h b/src/Columns/ColumnVector.h
index 59fe567fb9c..1b13859bdee 100644
--- a/src/Columns/ColumnVector.h
+++ b/src/Columns/ColumnVector.h
@@ -6,7 +6,6 @@
 #include <Columns/ColumnVectorHelper.h>
 #include <common/unaligned.h>
 #include <Core/Field.h>
-#include <Core/BigInt.h>
 #include <Common/assert_cast.h>
 
 
@@ -107,10 +106,7 @@ private:
 
 public:
     using ValueType = T;
-    static constexpr bool is_POD = !is_big_int_v<T>;
-    using Container = std::conditional_t<is_POD,
-                                         PaddedPODArray<ValueType>,
-                                         std::vector<ValueType>>;
+    using Container = PaddedPODArray<ValueType>;
 
 private:
     ColumnVector() {}
@@ -136,10 +132,7 @@ public:
 
     void insertData(const char * pos, size_t) override
     {
-        if constexpr (is_POD)
-            data.emplace_back(unalignedLoad<T>(pos));
-        else
-            data.emplace_back(BigInt<T>::deserialize(pos));
+        data.emplace_back(unalignedLoad<T>(pos));
     }
 
     void insertDefault() override
@@ -149,18 +142,12 @@ public:
 
     void insertManyDefaults(size_t length) override
     {
-        if constexpr (is_POD)
-            data.resize_fill(data.size() + length, T());
-        else
-            data.resize(data.size() + length, T());
+        data.resize_fill(data.size() + length, T());
     }
 
     void popBack(size_t n) override
     {
-        if constexpr (is_POD)
-            data.resize_assume_reserved(data.size() - n);
-        else
-            data.resize(data.size() - n);
+        data.resize_assume_reserved(data.size() - n);
     }
 
     StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
@@ -185,16 +172,12 @@ public:
 
     size_t allocatedBytes() const override
     {
-        if constexpr (is_POD)
-            return data.allocated_bytes();
-        else
-            return data.capacity() * sizeof(data[0]);
+        return data.allocated_bytes();
     }
 
     void protect() override
     {
-        if constexpr (is_POD)
-            data.protect();
+        data.protect();
     }
 
     void insertValue(const T value)
diff --git a/src/Common/HashTable/Hash.h b/src/Common/HashTable/Hash.h
index 3d9cec1bb23..ef20b70917d 100644
--- a/src/Common/HashTable/Hash.h
+++ b/src/Common/HashTable/Hash.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <common/types.h>
-#include <Core/BigInt.h>
 #include <Common/UInt128.h>
 #include <common/unaligned.h>
 
diff --git a/src/Common/SipHash.h b/src/Common/SipHash.h
index f4f86951652..ce7e80a7204 100644
--- a/src/Common/SipHash.h
+++ b/src/Common/SipHash.h
@@ -18,7 +18,7 @@
 #include <string>
 #include <type_traits>
 #include <Core/Defines.h>
-#include <Core/BigInt.h>
+
 
 #define ROTL(x, b) static_cast<UInt64>(((x) << (b)) | ((x) >> (64 - (b))))
 
@@ -136,23 +136,11 @@ public:
     }
 
     template <typename T>
-    std::enable_if_t<std::has_unique_object_representations_v<T>, void> update(const T & x)
+    void update(const T & x)
     {
         update(reinterpret_cast<const char *>(&x), sizeof(x));
     }
 
-    template <typename T>
-    std::enable_if_t<(std::is_floating_point_v<T> || std::is_same_v<T, CityHash_v1_0_2::uint128>), void> update(const T & x)
-    {
-        update(reinterpret_cast<const char *>(&x), sizeof(x));
-    }
-
-    template <typename T>
-    std::enable_if_t<is_big_int_v<T> && !std::has_unique_object_representations_v<T>, void> update(const T & x)
-    {
-        update(DB::BigInt<T>::serialize(x));
-    }
-
     void update(const std::string & x)
     {
         update(x.data(), x.length());
@@ -205,27 +193,13 @@ inline UInt64 sipHash64(const char * data, const size_t size)
 }
 
 template <typename T>
-std::enable_if_t<std::has_unique_object_representations_v<T>, UInt64> sipHash64(const T & x)
+UInt64 sipHash64(const T & x)
 {
     SipHash hash;
     hash.update(x);
     return hash.get64();
 }
 
-template <typename T>
-std::enable_if_t<(std::is_floating_point_v<T> || (is_big_int_v<T> && !std::has_unique_object_representations_v<T>)), UInt64> sipHash64(const T & x)
-{
-    SipHash hash;
-    hash.update(x);
-    return hash.get64();
-}
-
-template <typename T>
-std::enable_if_t<DB::IsDecimalNumber<T>, UInt64> sipHash64(const T & x)
-{
-    return sipHash64(x.value);
-}
-
 inline UInt64 sipHash64(const std::string & s)
 {
     return sipHash64(s.data(), s.size());
diff --git a/src/Compression/CompressionCodecT64.h b/src/Compression/CompressionCodecT64.h
index d930ea353c4..9f8ec7cc4d5 100644
--- a/src/Compression/CompressionCodecT64.h
+++ b/src/Compression/CompressionCodecT64.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <Core/Types.h>
 #include <Compression/ICompressionCodec.h>
 
 
diff --git a/src/Functions/FunctionsComparison.h b/src/Functions/FunctionsComparison.h
index 957c7e0ab3e..bbfa1ea20d8 100644
--- a/src/Functions/FunctionsComparison.h
+++ b/src/Functions/FunctionsComparison.h
@@ -81,8 +81,8 @@ namespace ErrorCodes
 template <typename A, typename B, typename Op>
 struct NumComparisonImpl
 {
-    using ContainerA = std::conditional_t<!is_big_int_v<A>, PaddedPODArray<A>, std::vector<A>>;
-    using ContainerB = std::conditional_t<!is_big_int_v<B>, PaddedPODArray<B>, std::vector<B>>;
+    using ContainerA = PaddedPODArray<A>;
+    using ContainerB = PaddedPODArray<B>;
 
     /// If you don't specify NO_INLINE, the compiler will inline this function, but we don't need this as this function contains tight loop inside.
     static void NO_INLINE vectorVector(const ContainerA & a, const ContainerB & b, PaddedPODArray<UInt8> & c)
diff --git a/src/Functions/FunctionsHashing.h b/src/Functions/FunctionsHashing.h
index fca27fe2f14..41152660e4f 100644
--- a/src/Functions/FunctionsHashing.h
+++ b/src/Functions/FunctionsHashing.h
@@ -806,16 +806,7 @@ private:
             size_t size = vec_from.size();
             for (size_t i = 0; i < size; ++i)
             {
-                ToType h;
-                if constexpr (OverBigInt<FromType>)
-                {
-                    using NativeT = typename NativeType<FromType>::Type;
-
-                    std::string buffer = BigInt<NativeT>::serialize(vec_from[i]);
-                    h = Impl::apply(buffer.data(), buffer.size());
-                }
-                else
-                    h = Impl::apply(reinterpret_cast<const char *>(&vec_from[i]), sizeof(vec_from[i]));
+                ToType h = Impl::apply(reinterpret_cast<const char *>(&vec_from[i]), sizeof(vec_from[i]));
 
                 if constexpr (first)
                     vec_to[i] = h;
@@ -827,16 +818,7 @@ private:
         {
             auto value = col_from_const->template getValue<FromType>();
 
-            ToType h;
-            if constexpr (OverBigInt<FromType>)
-            {
-                using NativeT = typename NativeType<FromType>::Type;
-
-                std::string buffer = BigInt<NativeT>::serialize(value);
-                h = Impl::apply(buffer.data(), buffer.size());
-            }
-            else
-                h = Impl::apply(reinterpret_cast<const char *>(&value), sizeof(value));
+            ToType h = Impl::apply(reinterpret_cast<const char *>(&value), sizeof(value));
 
             size_t size = vec_to.size();
             if constexpr (first)

From 877be1139899f06d9189432c7a9195bbb102cbf5 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Tue, 26 Jan 2021 21:32:46 +0300
Subject: [PATCH 491/611] Remove useless code, part 2

---
 src/Core/BigInt.h     | 36 ------------------------------------
 src/IO/ReadHelpers.h  | 18 +++---------------
 src/IO/WriteHelpers.h | 18 +++---------------
 3 files changed, 6 insertions(+), 66 deletions(-)
 delete mode 100644 src/Core/BigInt.h

diff --git a/src/Core/BigInt.h b/src/Core/BigInt.h
deleted file mode 100644
index 8ce765fbc20..00000000000
--- a/src/Core/BigInt.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-#include <common/StringRef.h>
-#include <common/unaligned.h>
-#include <Core/Types.h>
-
-
-namespace DB
-{
-
-template <typename T>
-struct BigInt
-{
-    static_assert(sizeof(T) == 32);
-    static constexpr size_t size = 32;
-
-    static StringRef serialize(const T & x, char * pos)
-    {
-        unalignedStore<T>(pos, x);
-        return StringRef(pos, size);
-    }
-
-    static String serialize(const T & x)
-    {
-        String str(size, '\0');
-        serialize(x, str.data());
-        return str;
-    }
-
-    static T deserialize(const char * pos)
-    {
-        return unalignedLoad<T>(pos);
-    }
-};
-
-}
diff --git a/src/IO/ReadHelpers.h b/src/IO/ReadHelpers.h
index de4e87440a2..4482667f447 100644
--- a/src/IO/ReadHelpers.h
+++ b/src/IO/ReadHelpers.h
@@ -17,7 +17,6 @@
 #include <Core/Types.h>
 #include <Core/DecimalFunctions.h>
 #include <Core/UUID.h>
-#include <Core/BigInt.h>
 
 #include <Common/Exception.h>
 #include <Common/StringUtils/StringUtils.h>
@@ -121,17 +120,6 @@ inline void readFloatBinary(T & x, ReadBuffer & buf)
     readPODBinary(x, buf);
 }
 
-template <typename T>
-void readBigIntBinary(T & x, ReadBuffer & buf)
-{
-    static const constexpr size_t bytesize = BigInt<T>::size;
-    char bytes[bytesize];
-
-    buf.readStrict(bytes, bytesize);
-
-    x = BigInt<T>::deserialize(bytes);
-}
-
 inline void readStringBinary(std::string & s, ReadBuffer & buf, size_t MAX_STRING_SIZE = DEFAULT_MAX_STRING_SIZE)
 {
     size_t size = 0;
@@ -849,11 +837,11 @@ inline void readBinary(DummyUInt256 & x, ReadBuffer & buf) { readPODBinary(x, bu
 inline void readBinary(Decimal32 & x, ReadBuffer & buf) { readPODBinary(x, buf); }
 inline void readBinary(Decimal64 & x, ReadBuffer & buf) { readPODBinary(x, buf); }
 inline void readBinary(Decimal128 & x, ReadBuffer & buf) { readPODBinary(x, buf); }
-inline void readBinary(Decimal256 & x, ReadBuffer & buf) { readBigIntBinary(x.value, buf); }
+inline void readBinary(Decimal256 & x, ReadBuffer & buf) { readPODBinary(x.value, buf); }
 inline void readBinary(LocalDate & x, ReadBuffer & buf) { readPODBinary(x, buf); }
 
-inline void readBinary(UInt256 & x, ReadBuffer & buf) { readBigIntBinary(x, buf); }
-inline void readBinary(Int256 & x, ReadBuffer & buf) { readBigIntBinary(x, buf); }
+inline void readBinary(UInt256 & x, ReadBuffer & buf) { readPODBinary(x, buf); }
+inline void readBinary(Int256 & x, ReadBuffer & buf) { readPODBinary(x, buf); }
 
 template <typename T>
 inline std::enable_if_t<is_arithmetic_v<T> && (sizeof(T) <= 8), void>
diff --git a/src/IO/WriteHelpers.h b/src/IO/WriteHelpers.h
index e6acd0b8880..9072f306bd9 100644
--- a/src/IO/WriteHelpers.h
+++ b/src/IO/WriteHelpers.h
@@ -16,7 +16,6 @@
 #include <Core/DecimalFunctions.h>
 #include <Core/Types.h>
 #include <Core/UUID.h>
-#include <Core/BigInt.h>
 
 #include <Common/Exception.h>
 #include <Common/StringUtils/StringUtils.h>
@@ -121,17 +120,6 @@ inline void writeStringBinary(const std::string_view & s, WriteBuffer & buf)
     writeStringBinary(StringRef{s}, buf);
 }
 
-template <typename T>
-void writeBigIntBinary(const T & x, WriteBuffer & buf)
-{
-    static const constexpr size_t bytesize = BigInt<T>::size;
-    char bytes[bytesize];
-
-    BigInt<T>::serialize(x, bytes);
-
-    buf.write(bytes, bytesize);
-}
-
 template <typename T>
 void writeVectorBinary(const std::vector<T> & v, WriteBuffer & buf)
 {
@@ -926,12 +914,12 @@ inline void writeBinary(const DummyUInt256 & x, WriteBuffer & buf) { writePODBin
 inline void writeBinary(const Decimal32 & x, WriteBuffer & buf) { writePODBinary(x, buf); }
 inline void writeBinary(const Decimal64 & x, WriteBuffer & buf) { writePODBinary(x, buf); }
 inline void writeBinary(const Decimal128 & x, WriteBuffer & buf) { writePODBinary(x, buf); }
-inline void writeBinary(const Decimal256 & x, WriteBuffer & buf) { writeBigIntBinary(x.value, buf); }
+inline void writeBinary(const Decimal256 & x, WriteBuffer & buf) { writePODBinary(x.value, buf); }
 inline void writeBinary(const LocalDate & x, WriteBuffer & buf) { writePODBinary(x, buf); }
 inline void writeBinary(const LocalDateTime & x, WriteBuffer & buf) { writePODBinary(x, buf); }
 
-inline void writeBinary(const UInt256 & x, WriteBuffer & buf) { writeBigIntBinary(x, buf); }
-inline void writeBinary(const Int256 & x, WriteBuffer & buf) { writeBigIntBinary(x, buf); }
+inline void writeBinary(const UInt256 & x, WriteBuffer & buf) { writePODBinary(x, buf); }
+inline void writeBinary(const Int256 & x, WriteBuffer & buf) { writePODBinary(x, buf); }
 
 /// Methods for outputting the value in text form for a tab-separated format.
 template <typename T>

From b51c74c3e89a517e85ddfc933bdd0ac18e7b0311 Mon Sep 17 00:00:00 2001
From: bharatnc <bharatnc@gmail.com>
Date: Tue, 26 Jan 2021 10:49:56 -0800
Subject: [PATCH 492/611] Fixes the docs for table function

---
 docs/en/sql-reference/statements/create/table.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/statements/create/table.md b/docs/en/sql-reference/statements/create/table.md
index 3b7506ae89a..e4a7d7cc010 100644
--- a/docs/en/sql-reference/statements/create/table.md
+++ b/docs/en/sql-reference/statements/create/table.md
@@ -45,7 +45,7 @@ Creates a table with the same structure as another table. You can specify a diff
 CREATE TABLE [IF NOT EXISTS] [db.]table_name AS table_function()
 ```
 
-Creates a table with the structure and data returned by a [table function](../../../sql-reference/table-functions/index.md#table-functions).
+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.
 
 ``` sql
 CREATE TABLE [IF NOT EXISTS] [db.]table_name ENGINE = engine AS SELECT ...

From f3929b151af7e75b58ebc5c1d47bfe1e140af6ab Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Tue, 26 Jan 2021 22:04:03 +0300
Subject: [PATCH 493/611] Remove even more code

---
 base/common/extended_types.h           |  5 -----
 src/Common/FieldVisitors.h             |  2 +-
 src/Core/AccurateComparison.h          | 20 ++++++++++----------
 src/Core/DecimalComparison.h           |  4 ++--
 src/Core/Types.h                       |  2 +-
 src/DataTypes/NumberTraits.h           |  2 +-
 src/Functions/DivisionUtils.h          | 14 +++++++-------
 src/Functions/GatherUtils/Algorithms.h |  4 ++--
 src/Functions/bitAnd.cpp               |  2 +-
 src/Functions/bitOr.cpp                |  2 +-
 src/Functions/bitShiftLeft.cpp         |  2 +-
 src/Functions/bitShiftRight.cpp        |  2 +-
 src/Functions/bitXor.cpp               |  2 +-
 src/Functions/greatest.cpp             |  4 ++--
 src/Functions/if.cpp                   |  8 ++++----
 src/Functions/least.cpp                |  2 +-
 src/Functions/minus.cpp                |  2 +-
 src/Functions/multiply.cpp             |  2 +-
 src/Functions/plus.cpp                 |  2 +-
 19 files changed, 39 insertions(+), 44 deletions(-)

diff --git a/base/common/extended_types.h b/base/common/extended_types.h
index ea475163f6a..2ae70c0f432 100644
--- a/base/common/extended_types.h
+++ b/base/common/extended_types.h
@@ -104,8 +104,3 @@ template <> struct is_big_int<wUInt256> { static constexpr bool value = true; };
 template <typename T>
 inline constexpr bool is_big_int_v = is_big_int<T>::value;
 
-template <typename To, typename From>
-inline To bigint_cast(const From & x [[maybe_unused]])
-{
-    return static_cast<To>(x);
-}
diff --git a/src/Common/FieldVisitors.h b/src/Common/FieldVisitors.h
index 314609ee1a0..954cd004e84 100644
--- a/src/Common/FieldVisitors.h
+++ b/src/Common/FieldVisitors.h
@@ -235,7 +235,7 @@ public:
         else if constexpr (std::is_same_v<T, UInt128>)
             throw Exception("No conversion to old UInt128 from " + demangle(typeid(U).name()), ErrorCodes::NOT_IMPLEMENTED);
         else
-            return bigint_cast<T>(x);
+            return static_cast<T>(x);
     }
 };
 
diff --git a/src/Core/AccurateComparison.h b/src/Core/AccurateComparison.h
index c533cf0c7fb..8b2f20f0af5 100644
--- a/src/Core/AccurateComparison.h
+++ b/src/Core/AccurateComparison.h
@@ -93,7 +93,7 @@ using bool_if_gt_int_vs_uint = std::enable_if_t<is_gt_int_vs_uint<TInt, TUInt>,
 template <typename TInt, typename TUInt>
 inline bool_if_gt_int_vs_uint<TInt, TUInt> greaterOpTmpl(TInt a, TUInt b)
 {
-    return bigint_cast<TInt>(a) > bigint_cast<TInt>(b);
+    return static_cast<TInt>(a) > static_cast<TInt>(b);
 }
 
 template <typename TInt, typename TUInt>
@@ -101,19 +101,19 @@ inline bool_if_gt_int_vs_uint<TInt, TUInt> greaterOpTmpl(TUInt a, TInt b)
 {
     using CastA = std::conditional_t<is_big_int_v<TInt> && std::is_same_v<TUInt, DB::UInt128>, DB::UInt256, TInt>;
 
-    return bigint_cast<CastA>(a) > b;
+    return static_cast<CastA>(a) > b;
 }
 
 template <typename TInt, typename TUInt>
 inline bool_if_gt_int_vs_uint<TInt, TUInt> equalsOpTmpl(TInt a, TUInt b)
 {
-    return bigint_cast<TInt>(a) == bigint_cast<TInt>(b);
+    return static_cast<TInt>(a) == static_cast<TInt>(b);
 }
 
 template <typename TInt, typename TUInt>
 inline bool_if_gt_int_vs_uint<TInt, TUInt> equalsOpTmpl(TUInt a, TInt b)
 {
-    return bigint_cast<TInt>(a) == bigint_cast<TInt>(b);
+    return static_cast<TInt>(a) == static_cast<TInt>(b);
 }
 
 
@@ -196,7 +196,7 @@ inline bool_if_safe_conversion<A, B> greaterOp(A a, B b)
     using CastB = std::conditional_t<is_big_int_v<A> && std::is_same_v<B, DB::UInt128>, A, CastB1>;
 
     if constexpr (is_big_int_v<A> || is_big_int_v<B>)
-        return bigint_cast<CastA>(a) > bigint_cast<CastB>(b);
+        return static_cast<CastA>(a) > static_cast<CastB>(b);
     else
         return a > b;
 }
@@ -306,7 +306,7 @@ inline bool_if_safe_conversion<A, B> equalsOp(A a, B b)
 {
     using LargestType = std::conditional_t<(sizeof(A) > sizeof(B)) || ((sizeof(A) == sizeof(B)) && !std::is_same_v<A, DB::UInt128>), A, B>;
 
-    return bigint_cast<LargestType>(a) == bigint_cast<LargestType>(b);
+    return static_cast<LargestType>(a) == static_cast<LargestType>(b);
 }
 
 template <>
@@ -429,7 +429,7 @@ inline bool_if_safe_conversion<A, B> notEqualsOp(A a, B b)
     using CastB = std::conditional_t<is_big_int_v<A> && std::is_same_v<B, DB::UInt128>, A, CastB1>;
 
     if constexpr (is_big_int_v<A> || is_big_int_v<B>)
-        return bigint_cast<CastA>(a) != bigint_cast<CastB>(b);
+        return static_cast<CastA>(a) != static_cast<CastB>(b);
     else
         return a != b;
 }
@@ -451,7 +451,7 @@ inline bool_if_safe_conversion<A, B> lessOp(A a, B b)
     using CastB = std::conditional_t<is_big_int_v<A> && std::is_same_v<B, DB::UInt128>, A, CastB1>;
 
     if constexpr (is_big_int_v<A> || is_big_int_v<B>)
-        return bigint_cast<CastA>(a) < bigint_cast<CastB>(b);
+        return static_cast<CastA>(a) < static_cast<CastB>(b);
     else
         return a < b;
 }
@@ -475,7 +475,7 @@ inline bool_if_safe_conversion<A, B> lessOrEqualsOp(A a, B b)
     using CastB = std::conditional_t<is_big_int_v<A> && std::is_same_v<B, DB::UInt128>, A, CastB1>;
 
     if constexpr (is_big_int_v<A> || is_big_int_v<B>)
-        return bigint_cast<CastA>(a) <= bigint_cast<CastB>(b);
+        return static_cast<CastA>(a) <= static_cast<CastB>(b);
     else
         return a <= b;
 }
@@ -499,7 +499,7 @@ inline bool_if_safe_conversion<A, B> greaterOrEqualsOp(A a, B b)
     using CastB = std::conditional_t<is_big_int_v<A> && std::is_same_v<B, DB::UInt128>, A, CastB1>;
 
     if constexpr (is_big_int_v<A> || is_big_int_v<B>)
-        return bigint_cast<CastA>(a) >= bigint_cast<CastB>(b);
+        return static_cast<CastA>(a) >= static_cast<CastB>(b);
     else
         return a >= b;
 }
diff --git a/src/Core/DecimalComparison.h b/src/Core/DecimalComparison.h
index d1537592e76..aaf471cefd8 100644
--- a/src/Core/DecimalComparison.h
+++ b/src/Core/DecimalComparison.h
@@ -233,9 +233,9 @@ private:
             bool overflow = false;
 
             if constexpr (sizeof(A) > sizeof(CompareInt))
-                overflow |= (bigint_cast<A>(x) != a);
+                overflow |= (static_cast<A>(x) != a);
             if constexpr (sizeof(B) > sizeof(CompareInt))
-                overflow |= (bigint_cast<B>(y) != b);
+                overflow |= (static_cast<B>(y) != b);
             if constexpr (is_unsigned_v<A>)
                 overflow |= (x < 0);
             if constexpr (is_unsigned_v<B>)
diff --git a/src/Core/Types.h b/src/Core/Types.h
index d96506f31cc..a463455cbe1 100644
--- a/src/Core/Types.h
+++ b/src/Core/Types.h
@@ -158,7 +158,7 @@ struct Decimal
             return convertTo<typename U::NativeType>();
         }
         else
-            return bigint_cast<U>(value);
+            return static_cast<U>(value);
     }
 
     const Decimal<T> & operator += (const T & x) { value += x; return *this; }
diff --git a/src/DataTypes/NumberTraits.h b/src/DataTypes/NumberTraits.h
index 77bd2101f05..3aa00c68274 100644
--- a/src/DataTypes/NumberTraits.h
+++ b/src/DataTypes/NumberTraits.h
@@ -218,7 +218,7 @@ using ResultOfGreatest = std::conditional_t<LeastGreatestSpecialCase<A, B>,
 template <typename T>
 static inline auto littleBits(const T & x)
 {
-    return bigint_cast<UInt8>(x);
+    return static_cast<UInt8>(x);
 }
 
 }
diff --git a/src/Functions/DivisionUtils.h b/src/Functions/DivisionUtils.h
index 7a816df70e5..9f9cfc1e72c 100644
--- a/src/Functions/DivisionUtils.h
+++ b/src/Functions/DivisionUtils.h
@@ -51,9 +51,9 @@ inline auto checkedDivision(A a, B b)
     throwIfDivisionLeadsToFPE(a, b);
 
     if constexpr (is_big_int_v<A> && std::is_floating_point_v<B>)
-        return bigint_cast<B>(a) / b;
+        return static_cast<B>(a) / b;
     else if constexpr (is_big_int_v<B> && std::is_floating_point_v<A>)
-        return a / bigint_cast<A>(b);
+        return a / static_cast<A>(b);
     else if constexpr (is_big_int_v<A> && is_big_int_v<B>)
         return static_cast<A>(a / b);
     else if constexpr (!is_big_int_v<A> && is_big_int_v<B>)
@@ -84,10 +84,10 @@ struct DivideIntegralImpl
             using SignedCastA = make_signed_t<CastA>;
             using SignedCastB = std::conditional_t<sizeof(A) <= sizeof(B), make_signed_t<CastB>, SignedCastA>;
 
-            return bigint_cast<Result>(checkedDivision(bigint_cast<SignedCastA>(a), bigint_cast<SignedCastB>(b)));
+            return static_cast<Result>(checkedDivision(static_cast<SignedCastA>(a), static_cast<SignedCastB>(b)));
         }
         else
-            return bigint_cast<Result>(checkedDivision(CastA(a), CastB(b)));
+            return static_cast<Result>(checkedDivision(CastA(a), CastB(b)));
     }
 
 #if USE_EMBEDDED_COMPILER
@@ -110,7 +110,7 @@ struct ModuloImpl
         if constexpr (std::is_floating_point_v<ResultType>)
         {
             /// This computation is similar to `fmod` but the latter is not inlined and has 40 times worse performance.
-            return bigint_cast<ResultType>(a) - trunc(bigint_cast<ResultType>(a) / bigint_cast<ResultType>(b)) * bigint_cast<ResultType>(b);
+            return static_cast<ResultType>(a) - trunc(static_cast<ResultType>(a) / static_cast<ResultType>(b)) * static_cast<ResultType>(b);
         }
         else
         {
@@ -125,9 +125,9 @@ struct ModuloImpl
                 CastB int_b(b);
 
                 if constexpr (is_big_int_v<IntegerBType> && sizeof(IntegerAType) <= sizeof(IntegerBType))
-                    return bigint_cast<Result>(bigint_cast<CastB>(int_a) % int_b);
+                    return static_cast<Result>(static_cast<CastB>(int_a) % int_b);
                 else
-                    return bigint_cast<Result>(int_a % bigint_cast<CastA>(int_b));
+                    return static_cast<Result>(int_a % static_cast<CastA>(int_b));
             }
             else
                 return IntegerAType(a) % IntegerBType(b);
diff --git a/src/Functions/GatherUtils/Algorithms.h b/src/Functions/GatherUtils/Algorithms.h
index e8679c4c400..616257493eb 100644
--- a/src/Functions/GatherUtils/Algorithms.h
+++ b/src/Functions/GatherUtils/Algorithms.h
@@ -50,9 +50,9 @@ void writeSlice(const NumericArraySlice<T> & slice, NumericArraySink<U> & sink)
                 throw Exception("No conversion between UInt128 and " + demangle(typeid(T).name()), ErrorCodes::NOT_IMPLEMENTED);
             }
             else if constexpr (IsDecimalNumber<T>)
-                dst = bigint_cast<NativeU>(src.value);
+                dst = static_cast<NativeU>(src.value);
             else
-                dst = bigint_cast<NativeU>(src);
+                dst = static_cast<NativeU>(src);
         }
         else
             dst = static_cast<NativeU>(src);
diff --git a/src/Functions/bitAnd.cpp b/src/Functions/bitAnd.cpp
index f02c8fbd4ee..08fc4699c36 100644
--- a/src/Functions/bitAnd.cpp
+++ b/src/Functions/bitAnd.cpp
@@ -21,7 +21,7 @@ struct BitAndImpl
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
     {
-        return bigint_cast<Result>(a) & bigint_cast<Result>(b);
+        return static_cast<Result>(a) & static_cast<Result>(b);
     }
 
 #if USE_EMBEDDED_COMPILER
diff --git a/src/Functions/bitOr.cpp b/src/Functions/bitOr.cpp
index b3559e13e0e..400c478fcbf 100644
--- a/src/Functions/bitOr.cpp
+++ b/src/Functions/bitOr.cpp
@@ -20,7 +20,7 @@ struct BitOrImpl
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
     {
-        return bigint_cast<Result>(a) | bigint_cast<Result>(b);
+        return static_cast<Result>(a) | static_cast<Result>(b);
     }
 
 #if USE_EMBEDDED_COMPILER
diff --git a/src/Functions/bitShiftLeft.cpp b/src/Functions/bitShiftLeft.cpp
index 3df3165a8e6..9f8adf39741 100644
--- a/src/Functions/bitShiftLeft.cpp
+++ b/src/Functions/bitShiftLeft.cpp
@@ -24,7 +24,7 @@ struct BitShiftLeftImpl
         if constexpr (is_big_int_v<B>)
             throw Exception("BitShiftLeft is not implemented for big integers as second argument", ErrorCodes::NOT_IMPLEMENTED);
         else if constexpr (is_big_int_v<A>)
-            return bigint_cast<Result>(a) << bigint_cast<UInt32>(b);
+            return static_cast<Result>(a) << static_cast<UInt32>(b);
         else
             return static_cast<Result>(a) << static_cast<Result>(b);
     }
diff --git a/src/Functions/bitShiftRight.cpp b/src/Functions/bitShiftRight.cpp
index da3bd16c4c4..bc54d3c8b5d 100644
--- a/src/Functions/bitShiftRight.cpp
+++ b/src/Functions/bitShiftRight.cpp
@@ -24,7 +24,7 @@ struct BitShiftRightImpl
         if constexpr (is_big_int_v<B>)
             throw Exception("BitShiftRight is not implemented for big integers as second argument", ErrorCodes::NOT_IMPLEMENTED);
         else if constexpr (is_big_int_v<A>)
-            return bigint_cast<Result>(a) >> bigint_cast<UInt32>(b);
+            return static_cast<Result>(a) >> static_cast<UInt32>(b);
         else
             return static_cast<Result>(a) >> static_cast<Result>(b);
     }
diff --git a/src/Functions/bitXor.cpp b/src/Functions/bitXor.cpp
index 9237cb76e59..c5867c8d2ca 100644
--- a/src/Functions/bitXor.cpp
+++ b/src/Functions/bitXor.cpp
@@ -20,7 +20,7 @@ struct BitXorImpl
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
     {
-        return bigint_cast<Result>(a) ^ bigint_cast<Result>(b);
+        return static_cast<Result>(a) ^ static_cast<Result>(b);
     }
 
 #if USE_EMBEDDED_COMPILER
diff --git a/src/Functions/greatest.cpp b/src/Functions/greatest.cpp
index 39021935111..56b5630b6bc 100644
--- a/src/Functions/greatest.cpp
+++ b/src/Functions/greatest.cpp
@@ -16,8 +16,8 @@ struct GreatestBaseImpl
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
     {
-        return bigint_cast<Result>(a) > bigint_cast<Result>(b) ?
-               bigint_cast<Result>(a) : bigint_cast<Result>(b);
+        return static_cast<Result>(a) > static_cast<Result>(b) ?
+               static_cast<Result>(a) : static_cast<Result>(b);
     }
 
 #if USE_EMBEDDED_COMPILER
diff --git a/src/Functions/if.cpp b/src/Functions/if.cpp
index 8b19016f3f7..3be4848f1ff 100644
--- a/src/Functions/if.cpp
+++ b/src/Functions/if.cpp
@@ -60,7 +60,7 @@ struct NumIfImpl
         typename ColVecResult::Container & res = col_res->getData();
 
         for (size_t i = 0; i < size; ++i)
-            res[i] = cond[i] ? bigint_cast<ResultType>(a[i]) : bigint_cast<ResultType>(b[i]);
+            res[i] = cond[i] ? static_cast<ResultType>(a[i]) : static_cast<ResultType>(b[i]);
         return col_res;
     }
 
@@ -71,7 +71,7 @@ struct NumIfImpl
         typename ColVecResult::Container & res = col_res->getData();
 
         for (size_t i = 0; i < size; ++i)
-            res[i] = cond[i] ? bigint_cast<ResultType>(a[i]) : bigint_cast<ResultType>(b);
+            res[i] = cond[i] ? static_cast<ResultType>(a[i]) : static_cast<ResultType>(b);
         return col_res;
     }
 
@@ -82,7 +82,7 @@ struct NumIfImpl
         typename ColVecResult::Container & res = col_res->getData();
 
         for (size_t i = 0; i < size; ++i)
-            res[i] = cond[i] ? bigint_cast<ResultType>(a) : bigint_cast<ResultType>(b[i]);
+            res[i] = cond[i] ? static_cast<ResultType>(a) : static_cast<ResultType>(b[i]);
         return col_res;
     }
 
@@ -93,7 +93,7 @@ struct NumIfImpl
         typename ColVecResult::Container & res = col_res->getData();
 
         for (size_t i = 0; i < size; ++i)
-            res[i] = cond[i] ? bigint_cast<ResultType>(a) : bigint_cast<ResultType>(b);
+            res[i] = cond[i] ? static_cast<ResultType>(a) : static_cast<ResultType>(b);
         return col_res;
     }
 };
diff --git a/src/Functions/least.cpp b/src/Functions/least.cpp
index e84d9bd9e24..ba87e4bd7e4 100644
--- a/src/Functions/least.cpp
+++ b/src/Functions/least.cpp
@@ -17,7 +17,7 @@ struct LeastBaseImpl
     static inline Result apply(A a, B b)
     {
         /** gcc 4.9.2 successfully vectorizes a loop from this function. */
-        return bigint_cast<Result>(a) < bigint_cast<Result>(b) ? bigint_cast<Result>(a) : bigint_cast<Result>(b);
+        return static_cast<Result>(a) < static_cast<Result>(b) ? static_cast<Result>(a) : static_cast<Result>(b);
     }
 
 #if USE_EMBEDDED_COMPILER
diff --git a/src/Functions/minus.cpp b/src/Functions/minus.cpp
index edee792a55a..0ce90f3544d 100644
--- a/src/Functions/minus.cpp
+++ b/src/Functions/minus.cpp
@@ -19,7 +19,7 @@ struct MinusImpl
             using CastA = std::conditional_t<std::is_floating_point_v<B>, B, A>;
             using CastB = std::conditional_t<std::is_floating_point_v<A>, A, B>;
 
-            return bigint_cast<Result>(bigint_cast<CastA>(a)) - bigint_cast<Result>(bigint_cast<CastB>(b));
+            return static_cast<Result>(static_cast<CastA>(a)) - static_cast<Result>(static_cast<CastB>(b));
         }
         else
             return static_cast<Result>(a) - b;
diff --git a/src/Functions/multiply.cpp b/src/Functions/multiply.cpp
index 54695a1087d..52ab8decbf7 100644
--- a/src/Functions/multiply.cpp
+++ b/src/Functions/multiply.cpp
@@ -20,7 +20,7 @@ struct MultiplyImpl
             using CastA = std::conditional_t<std::is_floating_point_v<B>, B, A>;
             using CastB = std::conditional_t<std::is_floating_point_v<A>, A, B>;
 
-            return bigint_cast<Result>(bigint_cast<CastA>(a)) * bigint_cast<Result>(bigint_cast<CastB>(b));
+            return static_cast<Result>(static_cast<CastA>(a)) * static_cast<Result>(static_cast<CastB>(b));
         }
         else
             return static_cast<Result>(a) * b;
diff --git a/src/Functions/plus.cpp b/src/Functions/plus.cpp
index 68b364a7abe..0a63741ea3b 100644
--- a/src/Functions/plus.cpp
+++ b/src/Functions/plus.cpp
@@ -21,7 +21,7 @@ struct PlusImpl
             using CastA = std::conditional_t<std::is_floating_point_v<B>, B, A>;
             using CastB = std::conditional_t<std::is_floating_point_v<A>, A, B>;
 
-            return bigint_cast<Result>(bigint_cast<CastA>(a)) + bigint_cast<Result>(bigint_cast<CastB>(b));
+            return static_cast<Result>(static_cast<CastA>(a)) + static_cast<Result>(static_cast<CastB>(b));
         }
         else
             return static_cast<Result>(a) + b;

From f4448ef01e468018d64feabd4fcbcd5041d6528a Mon Sep 17 00:00:00 2001
From: Daria Mozhaeva <dmozhaeva@yandex-team.ru>
Date: Tue, 26 Jan 2021 22:24:06 +0300
Subject: [PATCH 494/611] links

---
 .../table-engines/integrations/embedded-rocksdb.md |  4 +++-
 docs/en/operations/settings/settings.md            |  2 +-
 .../table-engines/integrations/embedded-rocksdb.md | 14 +++++++++-----
 docs/ru/operations/settings/settings.md            |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/docs/en/engines/table-engines/integrations/embedded-rocksdb.md b/docs/en/engines/table-engines/integrations/embedded-rocksdb.md
index b1d21cc5f00..6e864751cc3 100644
--- a/docs/en/engines/table-engines/integrations/embedded-rocksdb.md
+++ b/docs/en/engines/table-engines/integrations/embedded-rocksdb.md
@@ -37,4 +37,6 @@ CREATE TABLE test
 )
 ENGINE = EmbeddedRocksDB
 PRIMARY KEY key
-```
\ No newline at end of file
+```
+
+[Original article](https://clickhouse.tech/docs/en/operations/table_engines/embedded-rocksdb/) <!--hide-->
diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index 03c3f4397ac..27a566dad44 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -428,7 +428,7 @@ Possible values:
 
 -   `'basic'` — Use basic parser.
 
-    ClickHouse can parse only the basic `YYYY-MM-DD HH:MM:SS` or `YYYY-MM-DD` format. For example, `'2019-08-20 10:18:56'` or `2019-08-20`.
+    ClickHouse can parse only the basic `YYYY-MM-DD HH:MM:SS` or `YYYY-MM-DD` format. For example, `2019-08-20 10:18:56` or `2019-08-20`.
 
 Default value: `'basic'`.
 
diff --git a/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md b/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md
index cb59cc9b568..9b68bcfc770 100644
--- a/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md
+++ b/docs/ru/engines/table-engines/integrations/embedded-rocksdb.md
@@ -3,7 +3,7 @@ toc_priority: 6
 toc_title: EmbeddedRocksDB
 ---
 
-# EmbeddedRocksDB Engine {#EmbeddedRocksDB-engine}
+# Движок EmbeddedRocksDB {#EmbeddedRocksDB-engine}
 
 Этот движок позволяет интегрировать ClickHouse с [rocksdb](http://rocksdb.org/).
 
@@ -21,9 +21,11 @@ PRIMARY KEY(primary_key_name);
 
 Обязательные параметры:
 
-`primary_key_name` может быть любое имя столбца из списка столбцов.
-Указание первичного ключа `primary key` является обязательным. Он будет сериализован в двоичном формате как ключ `rocksdb`. Поддерживается только один столбец в первичном ключе.
-Столбцы, которые отличаются от первичного ключа, будут сериализованы в двоичном формате как значение `rockdb` в соответствующем порядке. Запросы с фильтрацией по ключу `equals` или `in` оптимизируются для поиска по нескольким ключам из `rocksdb`.
+- `primary_key_name` может быть любое имя столбца из списка столбцов.
+- Указание первичного ключа `primary key` является обязательным. Он будет сериализован в двоичном формате как ключ `rocksdb`. 
+- Поддерживается только один столбец в первичном ключе.
+- Столбцы, которые отличаются от первичного ключа, будут сериализованы в двоичном формате как значение `rockdb` в соответствующем порядке. 
+- Запросы с фильтрацией по ключу `equals` или `in` оптимизируются для поиска по нескольким ключам из `rocksdb`.
 
 Пример:
 
@@ -37,4 +39,6 @@ CREATE TABLE test
 )
 ENGINE = EmbeddedRocksDB
 PRIMARY KEY key;
-```
\ No newline at end of file
+```
+
+[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/table_engines/embedded-rocksdb/) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index 2b4164f49ea..662a597ba0d 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -412,7 +412,7 @@ ClickHouse может парсить базовый формат `YYYY-MM-DD HH:
 
 -   `basic` — используется базовый парсер.
 
-ClickHouse может парсить только базовый формат `YYYY-MM-DD HH:MM:SS` или `YYYY-MM-DD`. Например, `'2019-08-20 10:18:56'` или `2019-08-20`.
+ClickHouse может парсить только базовый формат `YYYY-MM-DD HH:MM:SS` или `YYYY-MM-DD`. Например, `2019-08-20 10:18:56` или `2019-08-20`.
 
 Значение по умолчанию: `basic`.
 

From edd4ca8c727ac69c59e721decaca5621db2cd2e5 Mon Sep 17 00:00:00 2001
From: Vitaliy Zakaznikov <vzakaznikov@protonmail.com>
Date: Tue, 26 Jan 2021 14:54:26 -0500
Subject: [PATCH 495/611] Starting to update AES encryption tests to support
 changes to the supported data types by the encrypt plaintext parameter.

---
 .../testflows/aes_encryption/tests/common.py  |  51 ++--
 .../testflows/aes_encryption/tests/decrypt.py |  11 +-
 .../aes_encryption/tests/decrypt_mysql.py     |  11 +-
 .../snapshots/encrypt.py.encrypt.snapshot     | 264 ++++++++++++++++++
 .../encrypt_mysql.py.encrypt_mysql.snapshot   | 264 ++++++++++++++++++
 5 files changed, 559 insertions(+), 42 deletions(-)

diff --git a/tests/testflows/aes_encryption/tests/common.py b/tests/testflows/aes_encryption/tests/common.py
index 9a2391e0733..10e98dd1065 100644
--- a/tests/testflows/aes_encryption/tests/common.py
+++ b/tests/testflows/aes_encryption/tests/common.py
@@ -88,32 +88,35 @@ plaintexts = [
     ("utf8fixedstring", "toFixedString('Gãńdåłf_Thê_Gręât', 24)"),
     ("String", "'1'"),
     ("FixedString", "toFixedString('1', 1)"),
-    ("UInt8", "toUInt8('1')"),
-    ("UInt16", "toUInt16('1')"),
-    ("UInt32", "toUInt32('1')"),
-    ("UInt64", "toUInt64('1')"),
-    ("Int8", "toInt8('1')"),
-    ("Int16", "toInt16('1')"),
-    ("Int32", "toInt32('1')"),
-    ("Int64", "toInt64('1')"),
-    ("Float32", "toFloat32('1')"),
-    ("Float64", "toFloat64('1')"),
-    ("Decimal32", "toDecimal32(2, 4)"),
-    ("Decimal64", "toDecimal64(2, 4)"),
-    ("Decimal128", "toDecimal128(2, 4)"),
-    ("UUID", "toUUID('61f0c404-5cb3-11e7-907b-a6006ad3dba0')"),
-    ("Date", "toDate('2020-01-01')"),
-    ("DateTime", "toDateTime('2020-01-01 20:01:02')"),
-    ("DateTime64", "toDateTime64('2020-01-01 20:01:02.123', 3)"),
+    ("UInt8", "reinterpretAsFixedString(toUInt8('1'))"),
+    ("UInt16", "reinterpretAsFixedString(toUInt16('1'))"),
+    ("UInt32", "reinterpretAsFixedString(toUInt32('1'))"),
+    ("UInt64", "reinterpretAsFixedString(toUInt64('1'))"),
+    ("Int8", "reinterpretAsFixedString(toInt8('1'))"),
+    ("Int16", "reinterpretAsFixedString(toInt16('1'))"),
+    ("Int32", "reinterpretAsFixedString(toInt32('1'))"),
+    ("Int64", "reinterpretAsFixedString(toInt64('1'))"),
+    ("Float32", "reinterpretAsFixedString(toFloat32('1'))"),
+    ("Float64", "reinterpretAsFixedString(toFloat64('1'))"),
+    ("Decimal32", "reinterpretAsFixedString(toDecimal32(2, 4))"),
+    ("Decimal64", "reinterpretAsFixedString(toDecimal64(2, 4))"),
+    ("Decimal128", "reinterpretAsFixedString(toDecimal128(2, 4))"),
+    ("UUID", "reinterpretAsFixedString(toUUID('61f0c404-5cb3-11e7-907b-a6006ad3dba0'))"),
+    ("Date", "reinterpretAsFixedString(toDate('2020-01-01'))"),
+    ("DateTime", "reinterpretAsFixedString(toDateTime('2020-01-01 20:01:02'))"),
+    ("DateTime64", "reinterpretAsFixedString(toDateTime64('2020-01-01 20:01:02.123', 3))"),
     ("LowCardinality", "toLowCardinality('1')"),
-    ("Array", "[1,2]"),
+    #("Array", "[1,2]"), - not supported
     #("Tuple", "(1,'a')") - not supported
-    #("Nullable, "Nullable(X)") - not supported
-    ("NULL", "toDateOrNull('foo')"),
-    ("IPv4", "toIPv4('171.225.130.45')"),
-    ("IPv6", "toIPv6('2001:0db8:0000:85a3:0000:0000:ac1f:8001')"),
-    ("Enum8", r"CAST('a', 'Enum8(\'a\' = 1, \'b\' = 2)')"),
-    ("Enum16", r"CAST('a', 'Enum16(\'a\' = 1, \'b\' = 2)')"),
+    ("NULL", "reinterpretAsFixedString(toDateOrNull('foo'))"),
+    ("NullableString", "toNullable('1')"),
+    ("NullableStringNull", "toNullable(NULL)"),
+    ("NullableFixedString", "toNullable(toFixedString('1',2))"),
+    ("NullableFixedStringNull", "toNullable(toFixedString(NULL,2))"),
+    ("IPv4", "reinterpretAsFixedString(toIPv4('171.225.130.45'))"),
+    ("IPv6", "reinterpretAsFixedString(toIPv6('2001:0db8:0000:85a3:0000:0000:ac1f:8001'))"),
+    ("Enum8", r"reinterpretAsFixedString(CAST('a', 'Enum8(\'a\' = 1, \'b\' = 2)'))"),
+    ("Enum16", r"reinterpretAsFixedString(CAST('a', 'Enum16(\'a\' = 1, \'b\' = 2)'))"),
 ]
 
 _hex = hex
diff --git a/tests/testflows/aes_encryption/tests/decrypt.py b/tests/testflows/aes_encryption/tests/decrypt.py
index f29e72109a9..6c99c4d9d41 100644
--- a/tests/testflows/aes_encryption/tests/decrypt.py
+++ b/tests/testflows/aes_encryption/tests/decrypt.py
@@ -54,7 +54,7 @@ def invalid_ciphertext(self):
             d_aad = None if not aad_len else f"'{aad}'"
 
             for datatype, ciphertext in invalid_ciphertexts:
-                if datatype in ["NULL"]:
+                if datatype == "NULL" or datatype.endswith("Null"):
                     continue
                 with When(f"invalid ciphertext={ciphertext}"):
                     if "cfb" in mode or "ofb" in mode or "ctr" in mode:
@@ -431,17 +431,10 @@ def decryption(self):
                 ciphertext = f"unhex({ciphertext})"
                 compare = plaintext
 
-                if datatype == "IPv4":
-                    cast = "toIPv4(IPv4NumToString(reinterpretAsUInt32"
-                    endcast = "))"
-                elif datatype in ["DateTime64", "UUID", "IPv6", "LowCardinality", "Enum8", "Enum16", "Decimal32", "Decimal64", "Decimal128", "Array"]:
-                    xfail(reason="no conversion")
-                elif datatype == "NULL":
+                if datatype == "NULL" or datatype.endswith("Null"):
                     ciphertext = "NULL"
                     cast = "isNull"
                     compare = None
-                elif datatype in ["Float32", "Float64", "Date", "DateTime"] or "Int" in datatype:
-                    cast = f"reinterpretAs{datatype}"
 
                 decrypt(ciphertext=ciphertext, key=f"'{key[:key_len]}'", mode=mode,
                     iv=(None if not iv_len else f"'{iv[:iv_len]}'"),
diff --git a/tests/testflows/aes_encryption/tests/decrypt_mysql.py b/tests/testflows/aes_encryption/tests/decrypt_mysql.py
index 608435698d5..52236ae0910 100644
--- a/tests/testflows/aes_encryption/tests/decrypt_mysql.py
+++ b/tests/testflows/aes_encryption/tests/decrypt_mysql.py
@@ -53,7 +53,7 @@ def invalid_ciphertext(self):
             d_iv = None if not iv_len else f"'{iv[:iv_len]}'"
 
             for datatype, ciphertext in invalid_ciphertexts:
-                if datatype in ["NULL"]:
+                if datatype == "NULL" or datatype.endswith("Null"):
                     continue
                 with When(f"invalid ciphertext={ciphertext}"):
                     if "cfb" in mode or "ofb" in mode or "ctr" in mode:
@@ -364,17 +364,10 @@ def decryption(self):
                 ciphertext = f"unhex({ciphertext})"
                 compare = plaintext
 
-                if datatype == "IPv4":
-                    cast = "toIPv4(IPv4NumToString(reinterpretAsUInt32"
-                    endcast = "))"
-                elif datatype in ["DateTime64", "UUID", "IPv6", "LowCardinality", "Enum8", "Enum16", "Decimal32", "Decimal64", "Decimal128", "Array"]:
-                    xfail(reason="no conversion")
-                elif datatype == "NULL":
+                if datatype == "NULL" or datatype.endswith("Null"):
                     ciphertext = "NULL"
                     cast = "isNull"
                     compare = None
-                elif datatype in ["Float32", "Float64", "Date", "DateTime"] or "Int" in datatype:
-                    cast = f"reinterpretAs{datatype}"
 
                 aes_decrypt_mysql(ciphertext=ciphertext, key=f"'{key[:key_len]}'", mode=mode,
                     iv=(None if not iv_len else f"'{iv[:iv_len]}'"),
diff --git a/tests/testflows/aes_encryption/tests/snapshots/encrypt.py.encrypt.snapshot b/tests/testflows/aes_encryption/tests/snapshots/encrypt.py.encrypt.snapshot
index 7b6f6e45556..953c46f50a4 100644
--- a/tests/testflows/aes_encryption/tests/snapshots/encrypt.py.encrypt.snapshot
+++ b/tests/testflows/aes_encryption/tests/snapshots/encrypt.py.encrypt.snapshot
@@ -2074,3 +2074,267 @@ example_mode_aes_256_ctr_datatype_utf8string_iv_16_aad_None = r"""'2E9B2BD2B8BA8
 
 example_mode_aes_256_ctr_datatype_utf8fixedstring_iv_16_aad_None = r"""'2E9B2BD2B8BA872DB56225F82754048C944F1E670DF94BAA'"""
 
+example_mode_aes_128_ecb_datatype_NullableString_iv_None_aad_None = r"""'7C51909F95C1E9B886A3487CD3EBED69'"""
+
+example_mode_aes_128_ecb_datatype_NullableStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_192_ecb_datatype_NullableString_iv_None_aad_None = r"""'1AE38A541D466EDFED572EE839B0907F'"""
+
+example_mode_aes_192_ecb_datatype_NullableStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_256_ecb_datatype_NullableString_iv_None_aad_None = r"""'C91184ED1E67F0CDED89B097D5D3B130'"""
+
+example_mode_aes_256_ecb_datatype_NullableStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_128_cbc_datatype_NullableString_iv_None_aad_None = r"""'7C51909F95C1E9B886A3487CD3EBED69'"""
+
+example_mode_aes_128_cbc_datatype_NullableStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_192_cbc_datatype_NullableString_iv_None_aad_None = r"""'1AE38A541D466EDFED572EE839B0907F'"""
+
+example_mode_aes_192_cbc_datatype_NullableStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_256_cbc_datatype_NullableString_iv_None_aad_None = r"""'C91184ED1E67F0CDED89B097D5D3B130'"""
+
+example_mode_aes_256_cbc_datatype_NullableStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_128_cbc_datatype_NullableString_iv_16_aad_None = r"""'D017D171B3865D6EA347E14167261F41'"""
+
+example_mode_aes_128_cbc_datatype_NullableStringNull_iv_16_aad_None = r"""'\\N'"""
+
+example_mode_aes_192_cbc_datatype_NullableString_iv_16_aad_None = r"""'A3DB45D129A5C9FDB5ED66E782B28BD2'"""
+
+example_mode_aes_192_cbc_datatype_NullableStringNull_iv_16_aad_None = r"""'\\N'"""
+
+example_mode_aes_256_cbc_datatype_NullableString_iv_16_aad_None = r"""'5E22454D9AC4F1A47B04E2FD98A76140'"""
+
+example_mode_aes_256_cbc_datatype_NullableStringNull_iv_16_aad_None = r"""'\\N'"""
+
+example_mode_aes_128_cfb128_datatype_NullableString_iv_None_aad_None = r"""'21'"""
+
+example_mode_aes_128_cfb128_datatype_NullableStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_192_cfb128_datatype_NullableString_iv_None_aad_None = r"""'36'"""
+
+example_mode_aes_192_cfb128_datatype_NullableStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_256_cfb128_datatype_NullableString_iv_None_aad_None = r"""'81'"""
+
+example_mode_aes_256_cfb128_datatype_NullableStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_128_cfb128_datatype_NullableString_iv_16_aad_None = r"""'03'"""
+
+example_mode_aes_128_cfb128_datatype_NullableStringNull_iv_16_aad_None = r"""'\\N'"""
+
+example_mode_aes_192_cfb128_datatype_NullableString_iv_16_aad_None = r"""'59'"""
+
+example_mode_aes_192_cfb128_datatype_NullableStringNull_iv_16_aad_None = r"""'\\N'"""
+
+example_mode_aes_256_cfb128_datatype_NullableString_iv_16_aad_None = r"""'58'"""
+
+example_mode_aes_256_cfb128_datatype_NullableStringNull_iv_16_aad_None = r"""'\\N'"""
+
+example_mode_aes_128_ofb_datatype_NullableString_iv_None_aad_None = r"""'21'"""
+
+example_mode_aes_128_ofb_datatype_NullableStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_192_ofb_datatype_NullableString_iv_None_aad_None = r"""'36'"""
+
+example_mode_aes_192_ofb_datatype_NullableStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_256_ofb_datatype_NullableString_iv_None_aad_None = r"""'81'"""
+
+example_mode_aes_256_ofb_datatype_NullableStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_128_ofb_datatype_NullableString_iv_16_aad_None = r"""'03'"""
+
+example_mode_aes_128_ofb_datatype_NullableStringNull_iv_16_aad_None = r"""'\\N'"""
+
+example_mode_aes_192_ofb_datatype_NullableString_iv_16_aad_None = r"""'59'"""
+
+example_mode_aes_192_ofb_datatype_NullableStringNull_iv_16_aad_None = r"""'\\N'"""
+
+example_mode_aes_256_ofb_datatype_NullableString_iv_16_aad_None = r"""'58'"""
+
+example_mode_aes_256_ofb_datatype_NullableStringNull_iv_16_aad_None = r"""'\\N'"""
+
+example_mode_aes_128_gcm_datatype_NullableString_iv_12_aad_None = r"""'DC48B85D412AEF42C46DA18E25139D5D9D'"""
+
+example_mode_aes_128_gcm_datatype_NullableStringNull_iv_12_aad_None = r"""'\\N'"""
+
+example_mode_aes_192_gcm_datatype_NullableString_iv_12_aad_None = r"""'7B34E3F4BAFCD2F3D493F843FFEBF9A415'"""
+
+example_mode_aes_192_gcm_datatype_NullableStringNull_iv_12_aad_None = r"""'\\N'"""
+
+example_mode_aes_256_gcm_datatype_NullableString_iv_12_aad_None = r"""'67B83EFC31C169D7613D6881E954F624C2'"""
+
+example_mode_aes_256_gcm_datatype_NullableStringNull_iv_12_aad_None = r"""'\\N'"""
+
+example_mode_aes_128_gcm_datatype_NullableString_iv_12_aad_True = r"""'DCFAF1088D33EF99F1D06E3D14F265FD41'"""
+
+example_mode_aes_128_gcm_datatype_NullableStringNull_iv_12_aad_True = r"""'\\N'"""
+
+example_mode_aes_192_gcm_datatype_NullableString_iv_12_aad_True = r"""'7BB72D91D66E3C93B34FBAFF92526E1A0E'"""
+
+example_mode_aes_192_gcm_datatype_NullableStringNull_iv_12_aad_True = r"""'\\N'"""
+
+example_mode_aes_256_gcm_datatype_NullableString_iv_12_aad_True = r"""'672AAAA73DCD5DEBC924C34E8F6E2678F8'"""
+
+example_mode_aes_256_gcm_datatype_NullableStringNull_iv_12_aad_True = r"""'\\N'"""
+
+example_mode_aes_128_ctr_datatype_NullableString_iv_None_aad_None = r"""'21'"""
+
+example_mode_aes_128_ctr_datatype_NullableStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_192_ctr_datatype_NullableString_iv_None_aad_None = r"""'36'"""
+
+example_mode_aes_192_ctr_datatype_NullableStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_256_ctr_datatype_NullableString_iv_None_aad_None = r"""'81'"""
+
+example_mode_aes_256_ctr_datatype_NullableStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_128_ctr_datatype_NullableString_iv_16_aad_None = r"""'03'"""
+
+example_mode_aes_128_ctr_datatype_NullableStringNull_iv_16_aad_None = r"""'\\N'"""
+
+example_mode_aes_192_ctr_datatype_NullableString_iv_16_aad_None = r"""'59'"""
+
+example_mode_aes_192_ctr_datatype_NullableStringNull_iv_16_aad_None = r"""'\\N'"""
+
+example_mode_aes_256_ctr_datatype_NullableString_iv_16_aad_None = r"""'58'"""
+
+example_mode_aes_256_ctr_datatype_NullableStringNull_iv_16_aad_None = r"""'\\N'"""
+
+example_mode_aes_128_ecb_datatype_NullableFixedString_iv_None_aad_None = r"""'2320D8B0C3FF2AF0C808CE333688FEE4'"""
+
+example_mode_aes_128_ecb_datatype_NullableFixedStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_192_ecb_datatype_NullableFixedString_iv_None_aad_None = r"""'145EF1DA49622900B742743B4114C3F8'"""
+
+example_mode_aes_192_ecb_datatype_NullableFixedStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_256_ecb_datatype_NullableFixedString_iv_None_aad_None = r"""'BB44E0A5A23B06C6F78D05CF12E4A304'"""
+
+example_mode_aes_256_ecb_datatype_NullableFixedStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_128_cbc_datatype_NullableFixedString_iv_None_aad_None = r"""'2320D8B0C3FF2AF0C808CE333688FEE4'"""
+
+example_mode_aes_128_cbc_datatype_NullableFixedStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_192_cbc_datatype_NullableFixedString_iv_None_aad_None = r"""'145EF1DA49622900B742743B4114C3F8'"""
+
+example_mode_aes_192_cbc_datatype_NullableFixedStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_256_cbc_datatype_NullableFixedString_iv_None_aad_None = r"""'BB44E0A5A23B06C6F78D05CF12E4A304'"""
+
+example_mode_aes_256_cbc_datatype_NullableFixedStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_128_cbc_datatype_NullableFixedString_iv_16_aad_None = r"""'ECE42AF0000893B1D1A43993506376A4'"""
+
+example_mode_aes_128_cbc_datatype_NullableFixedStringNull_iv_16_aad_None = r"""'\\N'"""
+
+example_mode_aes_192_cbc_datatype_NullableFixedString_iv_16_aad_None = r"""'0A8E8BA80EB490740B91937D4A5FF84C'"""
+
+example_mode_aes_192_cbc_datatype_NullableFixedStringNull_iv_16_aad_None = r"""'\\N'"""
+
+example_mode_aes_256_cbc_datatype_NullableFixedString_iv_16_aad_None = r"""'4A3A13D0807C29D4FA9CAEE6B9A67E7D'"""
+
+example_mode_aes_256_cbc_datatype_NullableFixedStringNull_iv_16_aad_None = r"""'\\N'"""
+
+example_mode_aes_128_cfb128_datatype_NullableFixedString_iv_None_aad_None = r"""'21DF'"""
+
+example_mode_aes_128_cfb128_datatype_NullableFixedStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_192_cfb128_datatype_NullableFixedString_iv_None_aad_None = r"""'36B7'"""
+
+example_mode_aes_192_cfb128_datatype_NullableFixedStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_256_cfb128_datatype_NullableFixedString_iv_None_aad_None = r"""'818E'"""
+
+example_mode_aes_256_cfb128_datatype_NullableFixedStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_128_cfb128_datatype_NullableFixedString_iv_16_aad_None = r"""'0388'"""
+
+example_mode_aes_128_cfb128_datatype_NullableFixedStringNull_iv_16_aad_None = r"""'\\N'"""
+
+example_mode_aes_192_cfb128_datatype_NullableFixedString_iv_16_aad_None = r"""'59C7'"""
+
+example_mode_aes_192_cfb128_datatype_NullableFixedStringNull_iv_16_aad_None = r"""'\\N'"""
+
+example_mode_aes_256_cfb128_datatype_NullableFixedString_iv_16_aad_None = r"""'5858'"""
+
+example_mode_aes_256_cfb128_datatype_NullableFixedStringNull_iv_16_aad_None = r"""'\\N'"""
+
+example_mode_aes_128_ofb_datatype_NullableFixedString_iv_None_aad_None = r"""'21DF'"""
+
+example_mode_aes_128_ofb_datatype_NullableFixedStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_192_ofb_datatype_NullableFixedString_iv_None_aad_None = r"""'36B7'"""
+
+example_mode_aes_192_ofb_datatype_NullableFixedStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_256_ofb_datatype_NullableFixedString_iv_None_aad_None = r"""'818E'"""
+
+example_mode_aes_256_ofb_datatype_NullableFixedStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_128_ofb_datatype_NullableFixedString_iv_16_aad_None = r"""'0388'"""
+
+example_mode_aes_128_ofb_datatype_NullableFixedStringNull_iv_16_aad_None = r"""'\\N'"""
+
+example_mode_aes_192_ofb_datatype_NullableFixedString_iv_16_aad_None = r"""'59C7'"""
+
+example_mode_aes_192_ofb_datatype_NullableFixedStringNull_iv_16_aad_None = r"""'\\N'"""
+
+example_mode_aes_256_ofb_datatype_NullableFixedString_iv_16_aad_None = r"""'5858'"""
+
+example_mode_aes_256_ofb_datatype_NullableFixedStringNull_iv_16_aad_None = r"""'\\N'"""
+
+example_mode_aes_128_gcm_datatype_NullableFixedString_iv_12_aad_None = r"""'DC9659BBB6F4D4C40DCD095F1FD69A4E5B9C'"""
+
+example_mode_aes_128_gcm_datatype_NullableFixedStringNull_iv_12_aad_None = r"""'\\N'"""
+
+example_mode_aes_192_gcm_datatype_NullableFixedString_iv_12_aad_None = r"""'7BFA19E7769CC955EDD39D806A13BF6AF8E3'"""
+
+example_mode_aes_192_gcm_datatype_NullableFixedStringNull_iv_12_aad_None = r"""'\\N'"""
+
+example_mode_aes_256_gcm_datatype_NullableFixedString_iv_12_aad_None = r"""'67CB36E371A5C5F544B1EFEC353A84FE0B2F'"""
+
+example_mode_aes_256_gcm_datatype_NullableFixedStringNull_iv_12_aad_None = r"""'\\N'"""
+
+example_mode_aes_128_gcm_datatype_NullableFixedString_iv_12_aad_True = r"""'DC96EBF2E338CDC4D6F8B490ACE77BB6FB40'"""
+
+example_mode_aes_128_gcm_datatype_NullableFixedStringNull_iv_12_aad_True = r"""'\\N'"""
+
+example_mode_aes_192_gcm_datatype_NullableFixedString_iv_12_aad_True = r"""'7BFA9A2913F05BBB8DB441C2D67E06FD46F8'"""
+
+example_mode_aes_192_gcm_datatype_NullableFixedStringNull_iv_12_aad_True = r"""'\\N'"""
+
+example_mode_aes_256_gcm_datatype_NullableFixedString_iv_12_aad_True = r"""'67CBA4772AA9C9C17819F647FA5CBE2E5715'"""
+
+example_mode_aes_256_gcm_datatype_NullableFixedStringNull_iv_12_aad_True = r"""'\\N'"""
+
+example_mode_aes_128_ctr_datatype_NullableFixedString_iv_None_aad_None = r"""'21DF'"""
+
+example_mode_aes_128_ctr_datatype_NullableFixedStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_192_ctr_datatype_NullableFixedString_iv_None_aad_None = r"""'36B7'"""
+
+example_mode_aes_192_ctr_datatype_NullableFixedStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_256_ctr_datatype_NullableFixedString_iv_None_aad_None = r"""'818E'"""
+
+example_mode_aes_256_ctr_datatype_NullableFixedStringNull_iv_None_aad_None = r"""'\\N'"""
+
+example_mode_aes_128_ctr_datatype_NullableFixedString_iv_16_aad_None = r"""'0388'"""
+
+example_mode_aes_128_ctr_datatype_NullableFixedStringNull_iv_16_aad_None = r"""'\\N'"""
+
+example_mode_aes_192_ctr_datatype_NullableFixedString_iv_16_aad_None = r"""'59C7'"""
+
+example_mode_aes_192_ctr_datatype_NullableFixedStringNull_iv_16_aad_None = r"""'\\N'"""
+
+example_mode_aes_256_ctr_datatype_NullableFixedString_iv_16_aad_None = r"""'5858'"""
+
+example_mode_aes_256_ctr_datatype_NullableFixedStringNull_iv_16_aad_None = r"""'\\N'"""
+
diff --git a/tests/testflows/aes_encryption/tests/snapshots/encrypt_mysql.py.encrypt_mysql.snapshot b/tests/testflows/aes_encryption/tests/snapshots/encrypt_mysql.py.encrypt_mysql.snapshot
index 8d49719796a..9dee5d818d6 100644
--- a/tests/testflows/aes_encryption/tests/snapshots/encrypt_mysql.py.encrypt_mysql.snapshot
+++ b/tests/testflows/aes_encryption/tests/snapshots/encrypt_mysql.py.encrypt_mysql.snapshot
@@ -1978,3 +1978,267 @@ example_mode_aes_256_ofb_datatype_Enum8_key_64_iv_64 = r"""'D2'"""
 
 example_mode_aes_256_ofb_datatype_Enum16_key_64_iv_64 = r"""'D2EE'"""
 
+example_mode_aes_128_ecb_datatype_NullableString_key_16_iv_None = r"""'7C51909F95C1E9B886A3487CD3EBED69'"""
+
+example_mode_aes_128_ecb_datatype_NullableStringNull_key_16_iv_None = r"""'\\N'"""
+
+example_mode_aes_128_ecb_datatype_NullableFixedString_key_16_iv_None = r"""'2320D8B0C3FF2AF0C808CE333688FEE4'"""
+
+example_mode_aes_128_ecb_datatype_NullableFixedStringNull_key_16_iv_None = r"""'\\N'"""
+
+example_mode_aes_128_ecb_datatype_NullableString_key_24_iv_None = r"""'697175286BC73A26C572DBD9480738F3'"""
+
+example_mode_aes_128_ecb_datatype_NullableStringNull_key_24_iv_None = r"""'\\N'"""
+
+example_mode_aes_128_ecb_datatype_NullableFixedString_key_24_iv_None = r"""'824777897B48FB42AE19EBF2835AE5BA'"""
+
+example_mode_aes_128_ecb_datatype_NullableFixedStringNull_key_24_iv_None = r"""'\\N'"""
+
+example_mode_aes_192_ecb_datatype_NullableString_key_24_iv_None = r"""'1AE38A541D466EDFED572EE839B0907F'"""
+
+example_mode_aes_192_ecb_datatype_NullableStringNull_key_24_iv_None = r"""'\\N'"""
+
+example_mode_aes_192_ecb_datatype_NullableFixedString_key_24_iv_None = r"""'145EF1DA49622900B742743B4114C3F8'"""
+
+example_mode_aes_192_ecb_datatype_NullableFixedStringNull_key_24_iv_None = r"""'\\N'"""
+
+example_mode_aes_192_ecb_datatype_NullableString_key_32_iv_None = r"""'851106E40808E28682DAC1AD840A7E92'"""
+
+example_mode_aes_192_ecb_datatype_NullableStringNull_key_32_iv_None = r"""'\\N'"""
+
+example_mode_aes_192_ecb_datatype_NullableFixedString_key_32_iv_None = r"""'24268978B72821002456FF2204B0F9B9'"""
+
+example_mode_aes_192_ecb_datatype_NullableFixedStringNull_key_32_iv_None = r"""'\\N'"""
+
+example_mode_aes_256_ecb_datatype_NullableString_key_32_iv_None = r"""'C91184ED1E67F0CDED89B097D5D3B130'"""
+
+example_mode_aes_256_ecb_datatype_NullableStringNull_key_32_iv_None = r"""'\\N'"""
+
+example_mode_aes_256_ecb_datatype_NullableFixedString_key_32_iv_None = r"""'BB44E0A5A23B06C6F78D05CF12E4A304'"""
+
+example_mode_aes_256_ecb_datatype_NullableFixedStringNull_key_32_iv_None = r"""'\\N'"""
+
+example_mode_aes_256_ecb_datatype_NullableString_key_64_iv_None = r"""'7492B9A2D0E86DAF1DBCAEDBAD9E3D7E'"""
+
+example_mode_aes_256_ecb_datatype_NullableStringNull_key_64_iv_None = r"""'\\N'"""
+
+example_mode_aes_256_ecb_datatype_NullableFixedString_key_64_iv_None = r"""'F2FACC4703F559D74555D10CA4850F40'"""
+
+example_mode_aes_256_ecb_datatype_NullableFixedStringNull_key_64_iv_None = r"""'\\N'"""
+
+example_mode_aes_128_cbc_datatype_NullableString_key_16_iv_None = r"""'7C51909F95C1E9B886A3487CD3EBED69'"""
+
+example_mode_aes_128_cbc_datatype_NullableStringNull_key_16_iv_None = r"""'\\N'"""
+
+example_mode_aes_128_cbc_datatype_NullableFixedString_key_16_iv_None = r"""'2320D8B0C3FF2AF0C808CE333688FEE4'"""
+
+example_mode_aes_128_cbc_datatype_NullableFixedStringNull_key_16_iv_None = r"""'\\N'"""
+
+example_mode_aes_192_cbc_datatype_NullableString_key_24_iv_None = r"""'1AE38A541D466EDFED572EE839B0907F'"""
+
+example_mode_aes_192_cbc_datatype_NullableStringNull_key_24_iv_None = r"""'\\N'"""
+
+example_mode_aes_192_cbc_datatype_NullableFixedString_key_24_iv_None = r"""'145EF1DA49622900B742743B4114C3F8'"""
+
+example_mode_aes_192_cbc_datatype_NullableFixedStringNull_key_24_iv_None = r"""'\\N'"""
+
+example_mode_aes_256_cbc_datatype_NullableString_key_32_iv_None = r"""'C91184ED1E67F0CDED89B097D5D3B130'"""
+
+example_mode_aes_256_cbc_datatype_NullableStringNull_key_32_iv_None = r"""'\\N'"""
+
+example_mode_aes_256_cbc_datatype_NullableFixedString_key_32_iv_None = r"""'BB44E0A5A23B06C6F78D05CF12E4A304'"""
+
+example_mode_aes_256_cbc_datatype_NullableFixedStringNull_key_32_iv_None = r"""'\\N'"""
+
+example_mode_aes_128_cbc_datatype_NullableString_key_16_iv_16 = r"""'D017D171B3865D6EA347E14167261F41'"""
+
+example_mode_aes_128_cbc_datatype_NullableStringNull_key_16_iv_16 = r"""'\\N'"""
+
+example_mode_aes_128_cbc_datatype_NullableFixedString_key_16_iv_16 = r"""'ECE42AF0000893B1D1A43993506376A4'"""
+
+example_mode_aes_128_cbc_datatype_NullableFixedStringNull_key_16_iv_16 = r"""'\\N'"""
+
+example_mode_aes_128_cbc_datatype_NullableString_key_24_iv_24 = r"""'73C9874744984892250CCCEC8541D690'"""
+
+example_mode_aes_128_cbc_datatype_NullableStringNull_key_24_iv_24 = r"""'\\N'"""
+
+example_mode_aes_128_cbc_datatype_NullableFixedString_key_24_iv_24 = r"""'C55AC3DA9276DBF066AC408BFCF011DD'"""
+
+example_mode_aes_128_cbc_datatype_NullableFixedStringNull_key_24_iv_24 = r"""'\\N'"""
+
+example_mode_aes_192_cbc_datatype_NullableString_key_24_iv_16 = r"""'A3DB45D129A5C9FDB5ED66E782B28BD2'"""
+
+example_mode_aes_192_cbc_datatype_NullableStringNull_key_24_iv_16 = r"""'\\N'"""
+
+example_mode_aes_192_cbc_datatype_NullableFixedString_key_24_iv_16 = r"""'0A8E8BA80EB490740B91937D4A5FF84C'"""
+
+example_mode_aes_192_cbc_datatype_NullableFixedStringNull_key_24_iv_16 = r"""'\\N'"""
+
+example_mode_aes_192_cbc_datatype_NullableString_key_32_iv_32 = r"""'508551DA505F6538F90DC607423CFAD4'"""
+
+example_mode_aes_192_cbc_datatype_NullableStringNull_key_32_iv_32 = r"""'\\N'"""
+
+example_mode_aes_192_cbc_datatype_NullableFixedString_key_32_iv_32 = r"""'723C4EB7399AE6F019109651B376A111'"""
+
+example_mode_aes_192_cbc_datatype_NullableFixedStringNull_key_32_iv_32 = r"""'\\N'"""
+
+example_mode_aes_256_cbc_datatype_NullableString_key_32_iv_16 = r"""'5E22454D9AC4F1A47B04E2FD98A76140'"""
+
+example_mode_aes_256_cbc_datatype_NullableStringNull_key_32_iv_16 = r"""'\\N'"""
+
+example_mode_aes_256_cbc_datatype_NullableFixedString_key_32_iv_16 = r"""'4A3A13D0807C29D4FA9CAEE6B9A67E7D'"""
+
+example_mode_aes_256_cbc_datatype_NullableFixedStringNull_key_32_iv_16 = r"""'\\N'"""
+
+example_mode_aes_256_cbc_datatype_NullableString_key_64_iv_64 = r"""'4CE9C9AFDC1E1E1EF2D1F4C141CE1874'"""
+
+example_mode_aes_256_cbc_datatype_NullableStringNull_key_64_iv_64 = r"""'\\N'"""
+
+example_mode_aes_256_cbc_datatype_NullableFixedString_key_64_iv_64 = r"""'5547B945A6810130CFC689C22530FA26'"""
+
+example_mode_aes_256_cbc_datatype_NullableFixedStringNull_key_64_iv_64 = r"""'\\N'"""
+
+example_mode_aes_128_cfb128_datatype_NullableString_key_16_iv_None = r"""'21'"""
+
+example_mode_aes_128_cfb128_datatype_NullableStringNull_key_16_iv_None = r"""'\\N'"""
+
+example_mode_aes_128_cfb128_datatype_NullableFixedString_key_16_iv_None = r"""'21DF'"""
+
+example_mode_aes_128_cfb128_datatype_NullableFixedStringNull_key_16_iv_None = r"""'\\N'"""
+
+example_mode_aes_192_cfb128_datatype_NullableString_key_24_iv_None = r"""'36'"""
+
+example_mode_aes_192_cfb128_datatype_NullableStringNull_key_24_iv_None = r"""'\\N'"""
+
+example_mode_aes_192_cfb128_datatype_NullableFixedString_key_24_iv_None = r"""'36B7'"""
+
+example_mode_aes_192_cfb128_datatype_NullableFixedStringNull_key_24_iv_None = r"""'\\N'"""
+
+example_mode_aes_256_cfb128_datatype_NullableString_key_32_iv_None = r"""'81'"""
+
+example_mode_aes_256_cfb128_datatype_NullableStringNull_key_32_iv_None = r"""'\\N'"""
+
+example_mode_aes_256_cfb128_datatype_NullableFixedString_key_32_iv_None = r"""'818E'"""
+
+example_mode_aes_256_cfb128_datatype_NullableFixedStringNull_key_32_iv_None = r"""'\\N'"""
+
+example_mode_aes_128_cfb128_datatype_NullableString_key_16_iv_16 = r"""'03'"""
+
+example_mode_aes_128_cfb128_datatype_NullableStringNull_key_16_iv_16 = r"""'\\N'"""
+
+example_mode_aes_128_cfb128_datatype_NullableFixedString_key_16_iv_16 = r"""'0388'"""
+
+example_mode_aes_128_cfb128_datatype_NullableFixedStringNull_key_16_iv_16 = r"""'\\N'"""
+
+example_mode_aes_128_cfb128_datatype_NullableString_key_24_iv_24 = r"""'6A'"""
+
+example_mode_aes_128_cfb128_datatype_NullableStringNull_key_24_iv_24 = r"""'\\N'"""
+
+example_mode_aes_128_cfb128_datatype_NullableFixedString_key_24_iv_24 = r"""'6A77'"""
+
+example_mode_aes_128_cfb128_datatype_NullableFixedStringNull_key_24_iv_24 = r"""'\\N'"""
+
+example_mode_aes_192_cfb128_datatype_NullableString_key_24_iv_16 = r"""'59'"""
+
+example_mode_aes_192_cfb128_datatype_NullableStringNull_key_24_iv_16 = r"""'\\N'"""
+
+example_mode_aes_192_cfb128_datatype_NullableFixedString_key_24_iv_16 = r"""'59C7'"""
+
+example_mode_aes_192_cfb128_datatype_NullableFixedStringNull_key_24_iv_16 = r"""'\\N'"""
+
+example_mode_aes_192_cfb128_datatype_NullableString_key_32_iv_32 = r"""'00'"""
+
+example_mode_aes_192_cfb128_datatype_NullableStringNull_key_32_iv_32 = r"""'\\N'"""
+
+example_mode_aes_192_cfb128_datatype_NullableFixedString_key_32_iv_32 = r"""'00A0'"""
+
+example_mode_aes_192_cfb128_datatype_NullableFixedStringNull_key_32_iv_32 = r"""'\\N'"""
+
+example_mode_aes_256_cfb128_datatype_NullableString_key_32_iv_16 = r"""'58'"""
+
+example_mode_aes_256_cfb128_datatype_NullableStringNull_key_32_iv_16 = r"""'\\N'"""
+
+example_mode_aes_256_cfb128_datatype_NullableFixedString_key_32_iv_16 = r"""'5858'"""
+
+example_mode_aes_256_cfb128_datatype_NullableFixedStringNull_key_32_iv_16 = r"""'\\N'"""
+
+example_mode_aes_256_cfb128_datatype_NullableString_key_64_iv_64 = r"""'E2'"""
+
+example_mode_aes_256_cfb128_datatype_NullableStringNull_key_64_iv_64 = r"""'\\N'"""
+
+example_mode_aes_256_cfb128_datatype_NullableFixedString_key_64_iv_64 = r"""'E2EE'"""
+
+example_mode_aes_256_cfb128_datatype_NullableFixedStringNull_key_64_iv_64 = r"""'\\N'"""
+
+example_mode_aes_128_ofb_datatype_NullableString_key_16_iv_None = r"""'21'"""
+
+example_mode_aes_128_ofb_datatype_NullableStringNull_key_16_iv_None = r"""'\\N'"""
+
+example_mode_aes_128_ofb_datatype_NullableFixedString_key_16_iv_None = r"""'21DF'"""
+
+example_mode_aes_128_ofb_datatype_NullableFixedStringNull_key_16_iv_None = r"""'\\N'"""
+
+example_mode_aes_192_ofb_datatype_NullableString_key_24_iv_None = r"""'36'"""
+
+example_mode_aes_192_ofb_datatype_NullableStringNull_key_24_iv_None = r"""'\\N'"""
+
+example_mode_aes_192_ofb_datatype_NullableFixedString_key_24_iv_None = r"""'36B7'"""
+
+example_mode_aes_192_ofb_datatype_NullableFixedStringNull_key_24_iv_None = r"""'\\N'"""
+
+example_mode_aes_256_ofb_datatype_NullableString_key_32_iv_None = r"""'81'"""
+
+example_mode_aes_256_ofb_datatype_NullableStringNull_key_32_iv_None = r"""'\\N'"""
+
+example_mode_aes_256_ofb_datatype_NullableFixedString_key_32_iv_None = r"""'818E'"""
+
+example_mode_aes_256_ofb_datatype_NullableFixedStringNull_key_32_iv_None = r"""'\\N'"""
+
+example_mode_aes_128_ofb_datatype_NullableString_key_16_iv_16 = r"""'03'"""
+
+example_mode_aes_128_ofb_datatype_NullableStringNull_key_16_iv_16 = r"""'\\N'"""
+
+example_mode_aes_128_ofb_datatype_NullableFixedString_key_16_iv_16 = r"""'0388'"""
+
+example_mode_aes_128_ofb_datatype_NullableFixedStringNull_key_16_iv_16 = r"""'\\N'"""
+
+example_mode_aes_128_ofb_datatype_NullableString_key_24_iv_24 = r"""'6A'"""
+
+example_mode_aes_128_ofb_datatype_NullableStringNull_key_24_iv_24 = r"""'\\N'"""
+
+example_mode_aes_128_ofb_datatype_NullableFixedString_key_24_iv_24 = r"""'6A77'"""
+
+example_mode_aes_128_ofb_datatype_NullableFixedStringNull_key_24_iv_24 = r"""'\\N'"""
+
+example_mode_aes_192_ofb_datatype_NullableString_key_24_iv_16 = r"""'59'"""
+
+example_mode_aes_192_ofb_datatype_NullableStringNull_key_24_iv_16 = r"""'\\N'"""
+
+example_mode_aes_192_ofb_datatype_NullableFixedString_key_24_iv_16 = r"""'59C7'"""
+
+example_mode_aes_192_ofb_datatype_NullableFixedStringNull_key_24_iv_16 = r"""'\\N'"""
+
+example_mode_aes_192_ofb_datatype_NullableString_key_32_iv_32 = r"""'00'"""
+
+example_mode_aes_192_ofb_datatype_NullableStringNull_key_32_iv_32 = r"""'\\N'"""
+
+example_mode_aes_192_ofb_datatype_NullableFixedString_key_32_iv_32 = r"""'00A0'"""
+
+example_mode_aes_192_ofb_datatype_NullableFixedStringNull_key_32_iv_32 = r"""'\\N'"""
+
+example_mode_aes_256_ofb_datatype_NullableString_key_32_iv_16 = r"""'58'"""
+
+example_mode_aes_256_ofb_datatype_NullableStringNull_key_32_iv_16 = r"""'\\N'"""
+
+example_mode_aes_256_ofb_datatype_NullableFixedString_key_32_iv_16 = r"""'5858'"""
+
+example_mode_aes_256_ofb_datatype_NullableFixedStringNull_key_32_iv_16 = r"""'\\N'"""
+
+example_mode_aes_256_ofb_datatype_NullableString_key_64_iv_64 = r"""'E2'"""
+
+example_mode_aes_256_ofb_datatype_NullableStringNull_key_64_iv_64 = r"""'\\N'"""
+
+example_mode_aes_256_ofb_datatype_NullableFixedString_key_64_iv_64 = r"""'E2EE'"""
+
+example_mode_aes_256_ofb_datatype_NullableFixedStringNull_key_64_iv_64 = r"""'\\N'"""
+

From c4454ab095e006172f6ca826bad3ecc0614b4064 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Tue, 26 Jan 2021 23:23:00 +0300
Subject: [PATCH 496/611] Fix colored() usage in clickhouse-test

---
 tests/clickhouse-test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index b1282ad5f41..d77c41fbf25 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -777,7 +777,7 @@ def main(args):
                 print(colored("\nFound hung queries in processlist:", args, "red", attrs=["bold"]))
                 print(processlist)
             else:
-                print(colored("Seems like server hung and cannot respond to queries", "red", attrs=["bold"]))
+                print(colored("Seems like server hung and cannot respond to queries", args, "red", attrs=["bold"]))
 
             clickhouse_tcp_port = os.getenv("CLICKHOUSE_PORT_TCP", '9000')
             server_pid = get_server_pid(clickhouse_tcp_port)

From 3e8d76da3854fda5d7205e50d9798c15ecc14538 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Tue, 26 Jan 2021 23:24:39 +0300
Subject: [PATCH 497/611] Add pylintrc config

---
 .pylintrc | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 .pylintrc

diff --git a/.pylintrc b/.pylintrc
new file mode 100644
index 00000000000..add9a2aa94b
--- /dev/null
+++ b/.pylintrc
@@ -0,0 +1,45 @@
+# vim: ft=config
+
+[BASIC]
+max-module-lines=2000
+# due to SQL
+max-line-length=200
+# Drop/decrease them one day:
+max-branches=50
+max-nested-blocks=10
+max-statements=200
+
+[FORMAT]
+ignore-long-lines = (# )?<?https?://\S+>?$
+
+[MESSAGES CONTROL]
+disable = bad-continuation,
+          missing-docstring,
+          bad-whitespace,
+          too-few-public-methods,
+          invalid-name,
+          too-many-arguments,
+          keyword-arg-before-vararg,
+          too-many-locals,
+          too-many-instance-attributes,
+          cell-var-from-loop,
+          fixme,
+          too-many-public-methods,
+          wildcard-import,
+          unused-wildcard-import,
+          singleton-comparison,
+          # pytest.mark.parametrize is not callable (not-callable)
+          not-callable,
+          # https://github.com/PyCQA/pylint/issues/3882
+          # [Python 3.9] Value 'Optional' is unsubscriptable (unsubscriptable-object) (also Union)
+          unsubscriptable-object,
+          # Drop them one day:
+          redefined-outer-name,
+          broad-except,
+          bare-except,
+          no-else-return,
+          global-statement
+
+[SIMILARITIES]
+# due to SQL
+min-similarity-lines=1000

From 1ef38148accb59ff41de89f9cf00409aa1854117 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Tue, 26 Jan 2021 23:36:04 +0300
Subject: [PATCH 498/611] Fix all pylint warnings in clickhouse-test

---
 tests/clickhouse-test | 89 +++++++++++++++++++++----------------------
 1 file changed, 43 insertions(+), 46 deletions(-)

diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index d77c41fbf25..e168f9372de 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -5,13 +5,11 @@ import os
 import os.path
 import re
 import json
+import traceback
 
 from argparse import ArgumentParser
-from argparse import FileType
-from pprint import pprint
 import shlex
 import subprocess
-from subprocess import check_call
 from subprocess import Popen
 from subprocess import PIPE
 from subprocess import CalledProcessError
@@ -23,8 +21,8 @@ try:
     import termcolor
 except ImportError:
     termcolor = None
-from random import random
-import subprocess
+import random
+import string
 import multiprocessing
 from contextlib import closing
 
@@ -43,7 +41,7 @@ def json_minify(string):
     The code taken from https://github.com/getify/JSON.minify/tree/python under the MIT license.
     """
 
-    tokenizer = re.compile('"|(/\*)|(\*/)|(//)|\n|\r')
+    tokenizer = re.compile(r'"|(/\*)|(\*/)|(//)|\n|\r')
     end_slashes_re = re.compile(r'(\\)*$')
 
     in_string = False
@@ -124,8 +122,6 @@ def run_single_test(args, ext, server_logs_level, client_options, case_file, std
         # If --database is not specified, we will create temporary database with unique name
         # And we will recreate and drop it for each test
         def random_str(length=6):
-            import random
-            import string
             alphabet = string.ascii_lowercase + string.digits
             return ''.join(random.choice(alphabet) for _ in range(length))
         database = 'test_{suffix}'.format(suffix=random_str())
@@ -236,15 +232,15 @@ def get_server_pid(server_tcp_port):
             return int(output)
         else:
             return None # server dead
-    except Exception as ex:
+    except Exception:
         return None
 
 
 def colored(text, args, color=None, on_color=None, attrs=None):
-       if termcolor and (sys.stdout.isatty() or args.force_color):
-           return termcolor.colored(text, color, on_color, attrs)
-       else:
-           return text
+    if termcolor and (sys.stdout.isatty() or args.force_color):
+        return termcolor.colored(text, color, on_color, attrs)
+    else:
+        return text
 
 
 SERVER_DIED = False
@@ -281,7 +277,7 @@ def run_tests_array(all_tests_with_params):
         else:
             return ''
 
-    if len(all_tests):
+    if all_tests:
         print("\nRunning {} {} tests.".format(len(all_tests), suite) + "\n")
 
     for case in all_tests:
@@ -297,7 +293,7 @@ def run_tests_array(all_tests_with_params):
 
         try:
             status = ''
-            is_concurrent = multiprocessing.current_process().name != "MainProcess";
+            is_concurrent = multiprocessing.current_process().name != "MainProcess"
             if not is_concurrent:
                 sys.stdout.flush()
                 sys.stdout.write("{0:72}".format(name + ": "))
@@ -306,7 +302,7 @@ def run_tests_array(all_tests_with_params):
                 # mode, so that the lines don't mix.
                 sys.stdout.flush()
             else:
-                status = "{0:72}".format(name + ": ");
+                status = "{0:72}".format(name + ": ")
 
             if args.skip and any(s in name for s in args.skip):
                 status += MSG_SKIPPED + " - skip\n"
@@ -398,7 +394,7 @@ def run_tests_array(all_tests_with_params):
                                 status += ", result:\n\n"
                                 status += '\n'.join(
                                     open(stdout_file).read().split('\n')[:100])
-                                status += '\n';
+                                status += '\n'
 
                         elif stderr:
                             failures += 1
@@ -444,7 +440,6 @@ def run_tests_array(all_tests_with_params):
             print(colored("Break tests execution", args, "red"))
             raise e
         except:
-            import traceback
             exc_type, exc_value, tb = sys.exc_info()
             failures += 1
             print("{0} - Test internal error: {1}\n{2}\n{3}".format(MSG_FAIL, exc_type.__name__, exc_value, "\n".join(traceback.format_tb(tb, 10))))
@@ -455,10 +450,12 @@ 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("\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"]))
         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("\n{passed_total} tests passed. {skipped_total} tests skipped.".format(
+            passed_total = passed_total, skipped_total = skipped_total), args, "green", attrs=["bold"]))
 
 
 server_logs_level = "warning"
@@ -504,7 +501,7 @@ def check_server_started(client, retry_count):
     return False
 
 
-class BuildFlags(object):
+class BuildFlags():
     THREAD = 'thread-sanitizer'
     ADDRESS = 'address-sanitizer'
     UNDEFINED = 'ub-sanitizer'
@@ -630,7 +627,7 @@ def main(args):
         stop_time = time() + args.global_time_limit
 
     if args.zookeeper is None:
-        code, out = subprocess.getstatusoutput(args.extract_from_config + " --try --config " + args.configserver + ' --key zookeeper | grep . | wc -l')
+        _, out = subprocess.getstatusoutput(args.extract_from_config + " --try --config " + args.configserver + ' --key zookeeper | grep . | wc -l')
         try:
             if int(out) > 0:
                 args.zookeeper = True
@@ -640,7 +637,7 @@ def main(args):
             args.zookeeper = False
 
     if args.shard is None:
-        code, out = subprocess.getstatusoutput(args.extract_from_config + " --try --config " + args.configserver + ' --key listen_host | grep -E "127.0.0.2|::"')
+        _, out = subprocess.getstatusoutput(args.extract_from_config + " --try --config " + args.configserver + ' --key listen_host | grep -E "127.0.0.2|::"')
         if out:
             args.shard = True
         else:
@@ -655,25 +652,25 @@ def main(args):
 
     def is_test_from_dir(suite_dir, case):
         case_file = os.path.join(suite_dir, case)
-        (name, ext) = os.path.splitext(case)
+        (_, ext) = os.path.splitext(case)
         # We could also test for executable files (os.access(case_file, os.X_OK),
         # but it interferes with 01610_client_spawn_editor.editor, which is invoked
         # as a query editor in the test, and must be marked as executable.
-        return os.path.isfile(case_file) and (ext == '.sql' or ext == '.sh' or ext == '.py' or ext == '.expect')
+        return os.path.isfile(case_file) and (ext in ['.sql', '.sh', '.py', '.expect'])
 
     def sute_key_func(item):
-       if args.order == 'random':
-             return random()
+        if args.order == 'random':
+            return random.random()
 
-       if -1 == item.find('_'):
-           return 99998, ''
+        if -1 == item.find('_'):
+            return 99998, ''
 
-       prefix, suffix = item.split('_', 1)
+        prefix, suffix = item.split('_', 1)
 
-       try:
-           return int(prefix), suffix
-       except ValueError:
-           return 99997, ''
+        try:
+            return int(prefix), suffix
+        except ValueError:
+            return 99997, ''
 
     total_tests_run = 0
     for suite in sorted(os.listdir(base_dir), key=sute_key_func):
@@ -706,14 +703,14 @@ def main(args):
             # And not reverse subtests
             def key_func(item):
                 if args.order == 'random':
-                    return random()
+                    return random.random()
 
                 reverse = 1 if args.order == 'asc' else -1
 
                 if -1 == item.find('_'):
                     return 99998
 
-                prefix, suffix = item.split('_', 1)
+                prefix, _ = item.split('_', 1)
 
                 try:
                     return reverse * int(prefix)
@@ -766,7 +763,7 @@ def main(args):
     if args.hung_check:
 
         # Some queries may execute in background for some time after test was finished. This is normal.
-        for n in range(1, 60):
+        for _ in range(1, 60):
             timeout, processlist = get_processlist(args)
             if timeout or not processlist:
                 break
@@ -921,7 +918,7 @@ if __name__ == '__main__':
 
     if args.queries and not os.path.isdir(args.queries):
         print("Cannot access the specified directory with queries (" + args.queries + ")", file=sys.stderr)
-        exit(1)
+        sys.exit(1)
 
     # Autodetect the directory with queries if not specified
     if args.queries is None:
@@ -943,7 +940,7 @@ if __name__ == '__main__':
 
     if not os.path.isdir(args.queries):
         print("Failed to detect path to the queries directory. Please specify it with '--queries' option.", file=sys.stderr)
-        exit(1)
+        sys.exit(1)
 
     print("Using queries from '" + args.queries + "' directory")
 
@@ -967,7 +964,7 @@ if __name__ == '__main__':
         else:
             print("No 'clickhouse' or 'clickhouse-client' client binary found", file=sys.stderr)
             parser.print_help()
-            exit(1)
+            sys.exit(1)
 
         if args.configclient:
             args.client += ' --config-file=' + args.configclient
@@ -981,25 +978,25 @@ if __name__ == '__main__':
     if args.client_option:
         # Set options for client
         if 'CLICKHOUSE_CLIENT_OPT' in os.environ:
-           os.environ['CLICKHOUSE_CLIENT_OPT'] += ' '
+            os.environ['CLICKHOUSE_CLIENT_OPT'] += ' '
         else:
-           os.environ['CLICKHOUSE_CLIENT_OPT'] = ''
+            os.environ['CLICKHOUSE_CLIENT_OPT'] = ''
 
         os.environ['CLICKHOUSE_CLIENT_OPT'] += get_additional_client_options(args)
 
         # Set options for curl
         if 'CLICKHOUSE_URL_PARAMS' in os.environ:
-           os.environ['CLICKHOUSE_URL_PARAMS'] += '&'
+            os.environ['CLICKHOUSE_URL_PARAMS'] += '&'
         else:
-           os.environ['CLICKHOUSE_URL_PARAMS'] = ''
+            os.environ['CLICKHOUSE_URL_PARAMS'] = ''
 
         os.environ['CLICKHOUSE_URL_PARAMS'] += get_additional_client_options_url(args)
 
     if args.antlr:
         if 'CLICKHOUSE_CLIENT_OPT' in os.environ:
-           os.environ['CLICKHOUSE_CLIENT_OPT'] += ' --use_antlr_parser=1'
+            os.environ['CLICKHOUSE_CLIENT_OPT'] += ' --use_antlr_parser=1'
         else:
-           os.environ['CLICKHOUSE_CLIENT_OPT'] = '--use_antlr_parser=1'
+            os.environ['CLICKHOUSE_CLIENT_OPT'] = '--use_antlr_parser=1'
 
     if args.extract_from_config is None:
         if os.access(args.binary + '-extract-from-config', os.X_OK):

From 3a6a1b6437cee93105dc7e0dd5ebe386c62923cf Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Wed, 27 Jan 2021 00:09:10 +0300
Subject: [PATCH 499/611] One word added

---
 docs/en/operations/access-rights.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/operations/access-rights.md b/docs/en/operations/access-rights.md
index be2b3692584..32f8fdcb642 100644
--- a/docs/en/operations/access-rights.md
+++ b/docs/en/operations/access-rights.md
@@ -27,7 +27,7 @@ We recommend using SQL-driven workflow. Both of the configuration methods work s
 !!! note "Warning"
     You can’t manage the same access entity by both configuration methods simultaneously.
 
-To see all users, roles, profiles, etc. and all their grants use [SHOW ACCESS](../sql-reference/statements/show.md#show-access-statement).
+To see all users, roles, profiles, etc. and all their grants use [SHOW ACCESS](../sql-reference/statements/show.md#show-access-statement) statement.
 
 ## Usage {#access-control-usage}
 

From 93d375f67a6f3ba1c21c7fee070dd2ac6d19a5e2 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Wed, 27 Jan 2021 00:14:23 +0300
Subject: [PATCH 500/611] Check clickhouse-test with pylint during style check

---
 docker/test/style/Dockerfile  | 2 +-
 utils/check-style/check-style | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docker/test/style/Dockerfile b/docker/test/style/Dockerfile
index f7555231ffb..7047007d2fc 100644
--- a/docker/test/style/Dockerfile
+++ b/docker/test/style/Dockerfile
@@ -1,7 +1,7 @@
 # docker build -t yandex/clickhouse-style-test .
 FROM ubuntu:20.04
 
-RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install --yes shellcheck libxml2-utils git python3-pip && pip3 install codespell
+RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install --yes shellcheck libxml2-utils git python3-pip python3-pytest && pip3 install codespell
 
 
 CMD cd /ClickHouse/utils/check-style && \
diff --git a/utils/check-style/check-style b/utils/check-style/check-style
index f1f7b3fab16..23d7eaa7a7b 100755
--- a/utils/check-style/check-style
+++ b/utils/check-style/check-style
@@ -69,6 +69,9 @@ find $ROOT_PATH/{src,base,programs,utils} -name '*.xml' |
     grep -vP $EXCLUDE_DIRS |
     xargs xmllint --noout --nonet
 
+# FIXME: for now only clickhouse-test
+pylint --score=n $ROOT_PATH/tests/clickhouse-test
+
 # Machine translation to Russian is strictly prohibited
 find $ROOT_PATH/docs/ru -name '*.md' |
     grep -vP $EXCLUDE_DIRS |

From 9c5d83d6bc5bc162f517c46c0872b28e9c92dbab Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Tue, 26 Jan 2021 22:55:06 +0300
Subject: [PATCH 501/611] Check that tests with query_log/query_thread_log
 includes current_database filter

---
 utils/check-style/check-style | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/utils/check-style/check-style b/utils/check-style/check-style
index f1f7b3fab16..78caca4b559 100755
--- a/utils/check-style/check-style
+++ b/utils/check-style/check-style
@@ -79,6 +79,17 @@ find $ROOT_PATH/tests/queries -iname '*fail*' |
     grep -vP $EXCLUDE_DIRS |
     grep . && echo 'Tests should not be named with "fail" in their names. It makes looking at the results less convenient when you search for "fail" substring in browser.'
 
+# Queries to system.query_log/system.query_thread_log should have current_database = currentDatabase() condition
+# NOTE: it is not that accuate, but at least something.
+tests_with_query_log=( $(
+    find $ROOT_PATH/tests/queries -iname '*.sql' -or -iname '*.sh' -or -iname '*.py' |
+        grep -vP $EXCLUDE_DIRS |
+        xargs grep --with-filename -e system.query_log -e system.query_thread_log | cut -d: -f1 | sort -u
+) )
+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
+
 # 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
 

From 924e5c6ad3571d4fcde5a66e3648cbe75e24bc15 Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Wed, 27 Jan 2021 00:20:49 +0300
Subject: [PATCH 502/611] Old syntax deleted

---
 docs/en/sql-reference/statements/alter/quota.md |  5 +----
 .../en/sql-reference/statements/create/quota.md | 17 +----------------
 docs/ru/sql-reference/statements/alter/quota.md |  5 +----
 .../ru/sql-reference/statements/create/quota.md |  6 +-----
 4 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/docs/en/sql-reference/statements/alter/quota.md b/docs/en/sql-reference/statements/alter/quota.md
index 08a36e8598c..18083e4a523 100644
--- a/docs/en/sql-reference/statements/alter/quota.md
+++ b/docs/en/sql-reference/statements/alter/quota.md
@@ -12,15 +12,12 @@ 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, USER_NAME | CLIENT_KEY, IP_ADDRESS} | NOT KEYED]
+    [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 } [,...] |
         NO LIMITS | TRACKING ONLY} [,...]]
     [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
 ```
-Multiword key types may be written either with underscores (`CLIENT_KEY`), or with spaces and in simple quotes (`'client key'`). You may also use `'client key or user name'` instead of `CLIENT_KEY, USER_NAME`, and `'client key or ip address'` instead of `CLIENT_KEY, IP_ADDRESS`.
-
-Multiword resource types may be written either with underscores (`RESULT_ROWS`) or without them (`RESULT ROWS`). 
 
 **Examples**
 
diff --git a/docs/en/sql-reference/statements/create/quota.md b/docs/en/sql-reference/statements/create/quota.md
index 8ae49e4e1a8..d284dfa0ded 100644
--- a/docs/en/sql-reference/statements/create/quota.md
+++ b/docs/en/sql-reference/statements/create/quota.md
@@ -11,7 +11,7 @@ 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, USER_NAME | CLIENT_KEY, IP_ADDRESS} | NOT KEYED]
+    [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 } [,...] |
          NO LIMITS | TRACKING ONLY} [,...]]
@@ -19,21 +19,6 @@ CREATE QUOTA [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
 ```
 
 `ON CLUSTER` clause allows creating quotas on a cluster, see [Distributed DDL](../../../sql-reference/distributed-ddl.md).
-
-Multiword key types may be written either with underscores (`CLIENT_KEY`), or with spaces and in simple quotes (`'client key'`). You may also use `'client key or user name'` instead of `CLIENT_KEY, USER_NAME`, and `'client key or ip address'` instead of `CLIENT_KEY, IP_ADDRESS`.
-
-Multiword resource types may be written either with underscores (`RESULT_ROWS`) or without them (`RESULT ROWS`). 
-## Example {#create-quota-example}
-
-Limit the maximum number of queries for the current user with 123 queries in 15 months constraint:
-
-``` sql
-CREATE QUOTA qA FOR INTERVAL 15 MONTH MAX QUERIES 123 TO CURRENT_USER
-```
-Multiword key types may be written either with underscores (`CLIENT_KEY`), or with spaces and in simple quotes (`'client key'`). You can also use `'client key or user name'` instead of `CLIENT_KEY, USER_NAME`, and `'client key or ip address'` instead of `CLIENT_KEY, IP_ADDRESS`.
-
-Multiword resource types may be written either with underscores (`RESULT_ROWS`) or without them (`RESULT ROWS`). 
-
 ## Examples {#create-quota-example}
 
 Limit the maximum number of queries for the current user with 123 queries in 15 months constraint:
diff --git a/docs/ru/sql-reference/statements/alter/quota.md b/docs/ru/sql-reference/statements/alter/quota.md
index 4f524db2a6d..1abb6336321 100644
--- a/docs/ru/sql-reference/statements/alter/quota.md
+++ b/docs/ru/sql-reference/statements/alter/quota.md
@@ -12,15 +12,12 @@ toc_title: QUOTA
 ``` 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, USER_NAME | CLIENT_KEY, IP_ADDRESS} | NOT KEYED]
+    [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 } [,...] |
         NO LIMITS | TRACKING ONLY} [,...]]
     [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
 ```
-Поддерживаются два варианта написания составных типов ключей: с подчеркиванием (`CLIENT_KEY`) или через пробел и в одинарных кавычках (`'client key'`). Также можно использовать ключ `'client key or user name'` вместо `CLIENT_KEY, USER_NAME`, и ключ `'client key or ip address'` вместо `CLIENT_KEY, IP_ADDRESS`.
-
-Поддерживаются также два варианта написания составных типов ресурсов: с подчеркиванием (`RESULT_ROWS`) или без подчеркивания, через пробел (`RESULT ROWS`). 
 
 **Примеры**
 
diff --git a/docs/ru/sql-reference/statements/create/quota.md b/docs/ru/sql-reference/statements/create/quota.md
index 073c4eda85c..8ae3cc45ee1 100644
--- a/docs/ru/sql-reference/statements/create/quota.md
+++ b/docs/ru/sql-reference/statements/create/quota.md
@@ -11,7 +11,7 @@ toc_title: "\u041a\u0432\u043e\u0442\u0430"
 
 ``` sql
 CREATE QUOTA [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
-    [KEYED BY {NONE | USER_NAME | IP_ADDRESS | CLIENT_KEY | CLIENT_KEY, USER_NAME | CLIENT_KEY, IP_ADDRESS} | NOT KEYED]
+    [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 } [,...] |
          NO LIMITS | TRACKING ONLY} [,...]]
@@ -20,10 +20,6 @@ CREATE QUOTA [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
 
 В секции `ON CLUSTER` можно указать кластеры, на которых создается квота, см. [Распределенные DDL запросы](../../../sql-reference/distributed-ddl.md).
 
-Поддерживаются два варианта написания составных типов ключей: с подчеркиванием (`CLIENT_KEY`) или через пробел и в одинарных кавычках (`'client key'`). Также можно использовать ключ `'client key or user name'` вместо `CLIENT_KEY, USER_NAME`, и ключ `'client key or ip address'` вместо `CLIENT_KEY, IP_ADDRESS`.
-
-Поддерживаются также два варианта написания составных типов ресурсов: с подчеркиванием (`RESULT_ROWS`) или без подчеркивания, через пробел (`RESULT ROWS`). 
-
 **Примеры**
 
 Ограничить максимальное количество запросов для текущего пользователя — не более 123 запросов за каждые 15 месяцев:

From a767eb5b51079ac210e54a1029060ed29b1cae0d Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Wed, 27 Jan 2021 00:25:34 +0300
Subject: [PATCH 503/611] Syntax (headings) unified

---
 docs/en/sql-reference/statements/create/quota.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/statements/create/quota.md b/docs/en/sql-reference/statements/create/quota.md
index d284dfa0ded..8f3b89790e4 100644
--- a/docs/en/sql-reference/statements/create/quota.md
+++ b/docs/en/sql-reference/statements/create/quota.md
@@ -19,7 +19,8 @@ CREATE QUOTA [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
 ```
 
 `ON CLUSTER` clause allows creating quotas on a cluster, see [Distributed DDL](../../../sql-reference/distributed-ddl.md).
-## Examples {#create-quota-example}
+
+**Examples** 
 
 Limit the maximum number of queries for the current user with 123 queries in 15 months constraint:
 

From e0dc6f94172d80b69c75dab905aa6b3483e3dae3 Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Wed, 27 Jan 2021 00:50:23 +0300
Subject: [PATCH 504/611] Dictionary better error message during attribute
 parsing

---
 src/Dictionaries/DictionaryStructure.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Dictionaries/DictionaryStructure.cpp b/src/Dictionaries/DictionaryStructure.cpp
index 44924b69363..07b746d8365 100644
--- a/src/Dictionaries/DictionaryStructure.cpp
+++ b/src/Dictionaries/DictionaryStructure.cpp
@@ -344,7 +344,9 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
             }
             catch (Exception & e)
             {
-                e.addMessage("error parsing null_value");
+                String dictionary_name = config.getString(".dictionary.name", "");
+                e.addMessage("While parsing null_value for attribute with name " + name
+                    + " in dictionary " + dictionary_name);
                 throw;
             }
         }

From 22a0354d2a82c18b5dadbbc866fcf1d6df924fc4 Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Wed, 27 Jan 2021 01:40:14 +0300
Subject: [PATCH 505/611] Wrong syntax fixed

---
 .../en/sql-reference/statements/alter/role.md |  2 +-
 .../statements/alter/row-policy.md            |  2 +-
 .../statements/alter/settings-profile.md      |  2 +-
 .../en/sql-reference/statements/alter/user.md |  2 +-
 .../sql-reference/statements/create/role.md   |  4 ++--
 .../statements/create/row-policy.md           |  4 ++--
 .../statements/create/settings-profile.md     |  4 ++--
 .../sql-reference/statements/create/user.md   |  8 ++++----
 docs/en/sql-reference/statements/show.md      | 20 +++++++++----------
 .../ru/sql-reference/statements/alter/role.md | 10 +++++-----
 .../statements/alter/row-policy.md            |  8 ++++----
 .../statements/alter/settings-profile.md      |  8 ++++----
 .../ru/sql-reference/statements/alter/user.md | 10 ++++------
 .../sql-reference/statements/create/role.md   | 12 +++++------
 .../statements/create/row-policy.md           | 20 +++++++++++--------
 .../statements/create/settings-profile.md     | 11 ++++++----
 .../sql-reference/statements/create/user.md   | 17 ++++++++--------
 docs/ru/sql-reference/statements/show.md      | 17 +++++-----------
 18 files changed, 79 insertions(+), 82 deletions(-)

diff --git a/docs/en/sql-reference/statements/alter/role.md b/docs/en/sql-reference/statements/alter/role.md
index 5f781d7f8e6..1253b72542d 100644
--- a/docs/en/sql-reference/statements/alter/role.md
+++ b/docs/en/sql-reference/statements/alter/role.md
@@ -10,7 +10,7 @@ Changes roles.
 Syntax:
 
 ``` sql
-ALTER {ROLE | ROLES} [IF EXISTS] name1 [ON CLUSTER cluster_name1] [RENAME TO new_name1] 
+ALTER ROLE [IF EXISTS] name1 [ON CLUSTER cluster_name1] [RENAME TO new_name1] 
         [, name2 [ON CLUSTER cluster_name2] [RENAME TO new_name2] ...]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
 ```
diff --git a/docs/en/sql-reference/statements/alter/row-policy.md b/docs/en/sql-reference/statements/alter/row-policy.md
index fe9a91be665..56967f11605 100644
--- a/docs/en/sql-reference/statements/alter/row-policy.md
+++ b/docs/en/sql-reference/statements/alter/row-policy.md
@@ -10,7 +10,7 @@ Changes row policy.
 Syntax:
 
 ``` sql
-ALTER [ROW] {POLICY | POLICIES} [IF EXISTS] name1 [ON CLUSTER cluster_name1] ON [database1.]table1 [RENAME TO new_name1] 
+ALTER [ROW] POLICY [IF EXISTS] name1 [ON CLUSTER cluster_name1] ON [database1.]table1 [RENAME TO new_name1] 
         [, name2 [ON CLUSTER cluster_name2] ON [database2.]table2 [RENAME TO new_name2] ...]
     [AS {PERMISSIVE | RESTRICTIVE}]
     [FOR SELECT]
diff --git a/docs/en/sql-reference/statements/alter/settings-profile.md b/docs/en/sql-reference/statements/alter/settings-profile.md
index ead7fa9a960..57d12142c48 100644
--- a/docs/en/sql-reference/statements/alter/settings-profile.md
+++ b/docs/en/sql-reference/statements/alter/settings-profile.md
@@ -10,7 +10,7 @@ Changes settings profiles.
 Syntax:
 
 ``` sql
-ALTER SETTINGS {PROFILE | PROFILES} [IF EXISTS] TO name1 [ON CLUSTER cluster_name1] [RENAME TO new_name1]
+ALTER SETTINGS PROFILE [IF EXISTS] TO name1 [ON CLUSTER cluster_name1] [RENAME TO new_name1]
         [, name2 [ON CLUSTER cluster_name2] [RENAME TO new_name2] ...]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | INHERIT 'profile_name'] [,...]
 ```
diff --git a/docs/en/sql-reference/statements/alter/user.md b/docs/en/sql-reference/statements/alter/user.md
index e69be2430b5..efad6561439 100644
--- a/docs/en/sql-reference/statements/alter/user.md
+++ b/docs/en/sql-reference/statements/alter/user.md
@@ -10,7 +10,7 @@ Changes ClickHouse user accounts.
 Syntax:
 
 ``` sql
-ALTER {USER | USERS} [IF EXISTS] name1 [ON CLUSTER cluster_name1] [RENAME TO new_name1] 
+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]
diff --git a/docs/en/sql-reference/statements/create/role.md b/docs/en/sql-reference/statements/create/role.md
index f9d26d33c6d..4723613aeef 100644
--- a/docs/en/sql-reference/statements/create/role.md
+++ b/docs/en/sql-reference/statements/create/role.md
@@ -5,12 +5,12 @@ toc_title: ROLE
 
 # CREATE ROLE {#create-role-statement}
 
-Creates a new [role](../../../operations/access-rights.md#role-management). Role is a set of [privileges](../../../sql-reference/statements/grant.md#grant-privileges). A [user](../../../sql-reference/statements/create/user.md) assigned a role gets all the privileges of this role.
+Creates new [roles](../../../operations/access-rights.md#role-management). Role is a set of [privileges](../../../sql-reference/statements/grant.md#grant-privileges). A [user](../../../sql-reference/statements/create/user.md) assigned a role gets all the privileges of this role.
 
 Syntax:
 
 ``` sql
-CREATE {ROLE | ROLES} [IF NOT EXISTS | OR REPLACE] name1 [, name2 ...]
+CREATE ROLE [IF NOT EXISTS | OR REPLACE] name1 [, name2 ...]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
 ```
 
diff --git a/docs/en/sql-reference/statements/create/row-policy.md b/docs/en/sql-reference/statements/create/row-policy.md
index 7dc6974127a..cbe639c6fc5 100644
--- a/docs/en/sql-reference/statements/create/row-policy.md
+++ b/docs/en/sql-reference/statements/create/row-policy.md
@@ -5,12 +5,12 @@ toc_title: ROW POLICY
 
 # CREATE ROW POLICY {#create-row-policy-statement}
 
-Creates a [filter for rows](../../../operations/access-rights.md#row-policy-management), which a user can read from a table.
+Creates [filters for rows](../../../operations/access-rights.md#row-policy-management), which a user can read from a table.
 
 Syntax:
 
 ``` sql
-CREATE [ROW] {POLICY | POLICIES} [IF NOT EXISTS | OR REPLACE] policy_name1 [ON CLUSTER cluster_name1] ON [db1.]table1 
+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]
diff --git a/docs/en/sql-reference/statements/create/settings-profile.md b/docs/en/sql-reference/statements/create/settings-profile.md
index 000c057e42e..0dab6a8512c 100644
--- a/docs/en/sql-reference/statements/create/settings-profile.md
+++ b/docs/en/sql-reference/statements/create/settings-profile.md
@@ -5,12 +5,12 @@ toc_title: SETTINGS PROFILE
 
 # CREATE SETTINGS PROFILE {#create-settings-profile-statement}
 
-Creates a [settings profile](../../../operations/access-rights.md#settings-profiles-management) that can be assigned to a user or a role.
+Creates [settings profiles](../../../operations/access-rights.md#settings-profiles-management) that can be assigned to a user or a role.
 
 Syntax:
 
 ``` sql
-CREATE SETTINGS {PROFILE | PROFILES} [IF NOT EXISTS | OR REPLACE] TO name1 [ON CLUSTER cluster_name1] 
+CREATE SETTINGS PROFILE [IF NOT EXISTS | OR REPLACE] TO name1 [ON CLUSTER cluster_name1] 
         [, name2 [ON CLUSTER cluster_name2] ...]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | INHERIT 'profile_name'] [,...]
 ```
diff --git a/docs/en/sql-reference/statements/create/user.md b/docs/en/sql-reference/statements/create/user.md
index ec87fc739fc..d5343cce7be 100644
--- a/docs/en/sql-reference/statements/create/user.md
+++ b/docs/en/sql-reference/statements/create/user.md
@@ -5,12 +5,12 @@ toc_title: USER
 
 # CREATE USER {#create-user-statement}
 
-Creates one [user account](../../../operations/access-rights.md#user-account-management).
+Creates [user accounts](../../../operations/access-rights.md#user-account-management).
 
 Syntax:
 
 ``` sql
-CREATE {USER | USERS} [IF NOT EXISTS | OR REPLACE] name1 [ON CLUSTER cluster_name1] 
+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'}]
     [HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
@@ -70,7 +70,7 @@ CREATE USER john DEFAULT ROLE role1, role2
 Create the user account `john` and make all his future roles default:
 
 ``` sql
-ALTER USER user DEFAULT ROLE ALL
+CREATE USER user DEFAULT ROLE ALL
 ```
 
 When some role is assigned to `john` in the future, it will become default automatically.
@@ -78,5 +78,5 @@ When some role is assigned to `john` in the future, it will become default autom
 Create the user account `john` and make all his future roles default excepting `role1` and `role2`:
 
 ``` sql
-ALTER USER john DEFAULT ROLE ALL EXCEPT role1, role2
+CREATE USER john DEFAULT ROLE ALL EXCEPT role1, role2
 ```
diff --git a/docs/en/sql-reference/statements/show.md b/docs/en/sql-reference/statements/show.md
index 750f45d3cff..b877e9d506f 100644
--- a/docs/en/sql-reference/statements/show.md
+++ b/docs/en/sql-reference/statements/show.md
@@ -236,7 +236,7 @@ SHOW GRANTS [FOR user1 [, user2 ...]]
 
 If user is not specified, the query returns privileges for the current user.
 
-## SHOW CREATE USER, SHOW CREATE USERS {#show-create-user-statement}
+## SHOW CREATE USER {#show-create-user-statement}
 
 Shows parameters that were used at a [user creation](../../sql-reference/statements/create/user.md).
 
@@ -245,47 +245,47 @@ Shows parameters that were used at a [user creation](../../sql-reference/stateme
 ### Syntax {#show-create-user-syntax}
 
 ``` sql
-SHOW CREATE {USER | USERS} [name1 [, name2 ...] | CURRENT_USER]
+SHOW CREATE USER [name1 [, name2 ...] | CURRENT_USER]
 ```
 
-## SHOW CREATE ROLE, SHOW CREATE ROLES {#show-create-role-statement}
+## SHOW CREATE ROLE {#show-create-role-statement}
 
 Shows parameters that were used at a [role creation](../../sql-reference/statements/create/role.md).
 
 ### Syntax {#show-create-role-syntax}
 
 ``` sql
-SHOW CREATE {ROLE | ROLES} name1 [, name2 ...]
+SHOW CREATE ROLE name1 [, name2 ...]
 ```
 
-## SHOW CREATE ROW POLICY, SHOW CREATE ROW POLICIES {#show-create-row-policy-statement}
+## SHOW CREATE ROW POLICY {#show-create-row-policy-statement}
 
 Shows parameters that were used at a [row policy creation](../../sql-reference/statements/create/row-policy.md).
 
 ### Syntax {#show-create-row-policy-syntax}
 
 ``` sql
-SHOW CREATE [ROW] {POLICY | POLICIES} name ON [database1.]table1 [, [database2.]table2 ...]
+SHOW CREATE [ROW] POLICY name ON [database1.]table1 [, [database2.]table2 ...]
 ```
 
-## SHOW CREATE QUOTA, SHOW CREATE QUOTAS {#show-create-quota-statement}
+## SHOW CREATE QUOTA {#show-create-quota-statement}
 
 Shows parameters that were used at a [quota creation](../../sql-reference/statements/create/quota.md).
 
 ### Syntax {#show-create-quota-syntax}
 
 ``` sql
-SHOW CREATE {QUOTA | QUOTAS} [name1 [, name2 ...] | CURRENT]
+SHOW CREATE QUOTA [name1 [, name2 ...] | CURRENT]
 ```
 
-## SHOW CREATE SETTINGS PROFILE, SHOW CREATE SETTINGS PROFILES {#show-create-settings-profile-statement}
+## SHOW CREATE SETTINGS PROFILE {#show-create-settings-profile-statement}
 
 Shows parameters that were used at a [settings profile creation](../../sql-reference/statements/create/settings-profile.md).
 
 ### Syntax {#show-create-settings-profile-syntax}
 
 ``` sql
-SHOW CREATE [SETTINGS] {PROFILE | PROFILES} name1 [, name2 ...]
+SHOW CREATE [SETTINGS] PROFILE name1 [, name2 ...]
 ```
 
 ## SHOW USERS {#show-users-statement}
diff --git a/docs/ru/sql-reference/statements/alter/role.md b/docs/ru/sql-reference/statements/alter/role.md
index c56f34e016f..69f7c5828c5 100644
--- a/docs/ru/sql-reference/statements/alter/role.md
+++ b/docs/ru/sql-reference/statements/alter/role.md
@@ -5,14 +5,14 @@ toc_title: ROLE
 
 # ALTER ROLE {#alter-role-statement}
 
-Изменяет роль.
+Изменяет роли.
 
-## Синтаксис {#alter-role-syntax}
+Синтаксис:
 
 ``` sql
-ALTER ROLE [IF EXISTS] name [ON CLUSTER cluster_name]
-    [RENAME TO new_name]
+ALTER ROLE [IF EXISTS] name1 [ON CLUSTER cluster_name1] [RENAME TO new_name1] 
+        [, name2 [ON CLUSTER cluster_name2] [RENAME TO new_name2] ...]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/alter/role/) <!--hide-->
+[Оригинальная статья](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 0a7931d23de..e2d23cda3ff 100644
--- a/docs/ru/sql-reference/statements/alter/row-policy.md
+++ b/docs/ru/sql-reference/statements/alter/row-policy.md
@@ -7,15 +7,15 @@ toc_title: ROW POLICY
 
 Изменяет политику доступа к строкам.
 
-## Синтаксис {#alter-row-policy-syntax}
+Синтаксис:
 
 ``` sql
-ALTER [ROW] POLICY [IF EXISTS] name [ON CLUSTER cluster_name] ON [database.]table
-    [RENAME TO new_name]
+ALTER [ROW] POLICY [IF EXISTS] name1 [ON CLUSTER cluster_name1] ON [database1.]table1 [RENAME TO new_name1] 
+        [, name2 [ON CLUSTER cluster_name2] ON [database2.]table2 [RENAME TO new_name2] ...]
     [AS {PERMISSIVE | RESTRICTIVE}]
     [FOR SELECT]
     [USING {condition | NONE}][,...]
     [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/alter/row-policy/) <!--hide-->
\ No newline at end of file
+[Оригинальная статья](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 7a39a0efae2..54502901837 100644
--- a/docs/ru/sql-reference/statements/alter/settings-profile.md
+++ b/docs/ru/sql-reference/statements/alter/settings-profile.md
@@ -7,12 +7,12 @@ toc_title: SETTINGS PROFILE
 
 Изменяет профили настроек.
 
-## Синтаксис {#alter-settings-profile-syntax}
+Синтаксис:
 
 ``` sql
-ALTER SETTINGS PROFILE [IF EXISTS] name [ON CLUSTER cluster_name]
-    [RENAME TO new_name]
+ALTER SETTINGS PROFILE [IF EXISTS] TO name1 [ON CLUSTER cluster_name1] [RENAME TO new_name1]
+        [, name2 [ON CLUSTER cluster_name2] [RENAME TO new_name2] ...]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | INHERIT 'profile_name'] [,...]
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/query_language/alter/settings-profile) <!--hide-->
\ No newline at end of file
+[Оригинальная статья](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/user.md b/docs/ru/sql-reference/statements/alter/user.md
index 0e8fda23380..41574f74200 100644
--- a/docs/ru/sql-reference/statements/alter/user.md
+++ b/docs/ru/sql-reference/statements/alter/user.md
@@ -5,21 +5,19 @@ toc_title: USER
 
 # ALTER USER {#alter-user-statement}
 
-Изменяет аккаунт пользователя ClickHouse.
+Изменяет аккаунты пользователей ClickHouse.
 
-## Синтаксис {#alter-user-syntax}
+Синтаксис:
 
 ``` sql
-ALTER USER [IF EXISTS] name [ON CLUSTER cluster_name]
-    [RENAME TO new_name]
+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]
     [DEFAULT ROLE role [,...] | ALL | ALL EXCEPT role [,...] ]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
 ```  
 
-## Описание {#alter-user-dscr}
-
 Для выполнения `ALTER USER` необходима привилегия [ALTER USER](../grant.md#grant-access-management).
 
 ## Примеры {#alter-user-examples}
diff --git a/docs/ru/sql-reference/statements/create/role.md b/docs/ru/sql-reference/statements/create/role.md
index b9e529fb213..521117c0e89 100644
--- a/docs/ru/sql-reference/statements/create/role.md
+++ b/docs/ru/sql-reference/statements/create/role.md
@@ -5,18 +5,16 @@ toc_title: "\u0420\u043e\u043b\u044c"
 
 # CREATE ROLE {#create-role-statement}
 
-Создает [роль](../../../operations/access-rights.md#role-management).
+Создает [роли](../../../operations/access-rights.md#role-management). Роль — это набор [привилегий](../grant.md#grant-privileges). Пользователь, которому назначена роль, получает все привилегии этой роли.
 
-### Синтаксис {#create-role-syntax}
+Синтаксис:
 
 ```sql
-CREATE ROLE [IF NOT EXISTS | OR REPLACE] name
+CREATE ROLE [IF NOT EXISTS | OR REPLACE] name1 [, name2 ...]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
 ```
 
-### Описание {#create-role-description}
-
-Роль — это набор [привилегий](../grant.md#grant-privileges). Пользователь, которому назначена роль, получает все привилегии этой роли.
+## Управление ролями {#managing-roles}
 
 Одному пользователю можно назначить несколько ролей. Пользователи могут применять назначенные роли в произвольных комбинациях с помощью выражения [SET ROLE](../misc.md#set-role-statement). Конечный объем привилегий — это комбинация всех привилегий всех примененных ролей. Если у пользователя имеются привилегии, присвоенные его аккаунту напрямую, они также прибавляются к привилегиям, присвоенным через роли.
 
@@ -26,7 +24,7 @@ CREATE ROLE [IF NOT EXISTS | OR REPLACE] name
 
 Для удаления роли используется выражение [DROP ROLE](../misc.md#drop-role-statement). Удаленная роль автоматически отзывается у всех пользователей, которым была назначена.
 
-### Примеры {#create-role-examples}
+## Примеры {#create-role-examples}
 
 ```sql
 CREATE ROLE accountant;
diff --git a/docs/ru/sql-reference/statements/create/row-policy.md b/docs/ru/sql-reference/statements/create/row-policy.md
index a62e275a046..e79a19d4cbe 100644
--- a/docs/ru/sql-reference/statements/create/row-policy.md
+++ b/docs/ru/sql-reference/statements/create/row-policy.md
@@ -5,19 +5,22 @@ toc_title: "\u041f\u043e\u043b\u0438\u0442\u0438\u043a\u0430\u0020\u0434\u043e\u
 
 # CREATE ROW POLICY {#create-row-policy-statement}
 
-Создает [фильтр для строк](../../../operations/access-rights.md#row-policy-management), которые пользователь может прочесть из таблицы.
+Создает [фильтры для строк](../../../operations/access-rights.md#row-policy-management), которые пользователь может прочесть из таблицы.
 
-### Синтаксис {#create-row-policy-syntax}
+Синтаксис:
 
 ``` sql
-CREATE [ROW] POLICY [IF NOT EXISTS | OR REPLACE] policy_name [ON CLUSTER cluster_name] ON [db.]table
+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]
     [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
 ```
 
-#### Секция AS {#create-row-policy-as}
+Секция `ON CLUSTER` позволяет создавать фильтры для строк на кластере, см. [Распределенные DDL запросы](../../../sql-reference/distributed-ddl.md).
+
+## Секция AS {#create-row-policy-as}
 
 С помощью данной секции можно создать политику разрешения или ограничения.
 
@@ -27,16 +30,17 @@ CREATE [ROW] POLICY [IF NOT EXISTS | OR REPLACE] policy_name [ON CLUSTER cluster
 
 Ограничительные политики применяются к строкам, прошедшим фильтр разрешительной политики. Если вы не зададите разрешительные политики, пользователь не сможет обращаться ни к каким строкам из таблицы.
 
-#### Секция TO {#create-row-policy-to}
+## Секция TO {#create-row-policy-to}
 
 В секции `TO` вы можете перечислить как роли, так и пользователей. Например, `CREATE ROW POLICY ... TO accountant, john@localhost`.
 
 Ключевым словом `ALL` обозначаются все пользователи, включая текущего. Ключевые слова `ALL EXCEPT` позволяют исключить пользователей из списка всех пользователей. Например, `CREATE ROW POLICY ... TO ALL EXCEPT accountant, john@localhost`
 
-### Примеры
+## Примеры
 
-- `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 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`
 
 [Оригинальная статья](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 9d525023af2..643f9d92eac 100644
--- a/docs/ru/sql-reference/statements/create/settings-profile.md
+++ b/docs/ru/sql-reference/statements/create/settings-profile.md
@@ -5,16 +5,19 @@ toc_title: "\u041f\u0440\u043e\u0444\u0438\u043b\u044c\u0020\u043d\u0430\u0441\u
 
 # CREATE SETTINGS PROFILE {#create-settings-profile-statement}
 
-Создает [профиль настроек](../../../operations/access-rights.md#settings-profiles-management), который может быть присвоен пользователю или роли.
+Создает [профили настроек](../../../operations/access-rights.md#settings-profiles-management), которые могут быть присвоены пользователю или роли.
 
-### Синтаксис {#create-settings-profile-syntax}
+Синтаксис:
 
 ``` sql
-CREATE SETTINGS PROFILE [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
+CREATE SETTINGS PROFILE [IF NOT EXISTS | OR REPLACE] TO name1 [ON CLUSTER cluster_name1] 
+        [, name2 [ON CLUSTER cluster_name2] ...]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | INHERIT 'profile_name'] [,...]
 ```
 
-### Пример {#create-settings-profile-syntax}
+Секция `ON CLUSTER` позволяет создавать профили на кластере, см. [Распределенные DDL запросы](../../../sql-reference/distributed-ddl.md).
+
+## Пример {#create-settings-profile-syntax}
 
 Создать профиль настроек `max_memory_usage_profile`, который содержит значение и ограничения для настройки `max_memory_usage`. Присвоить профиль пользователю `robin`:
 
diff --git a/docs/ru/sql-reference/statements/create/user.md b/docs/ru/sql-reference/statements/create/user.md
index e7af1659a1b..bcc9768eb43 100644
--- a/docs/ru/sql-reference/statements/create/user.md
+++ b/docs/ru/sql-reference/statements/create/user.md
@@ -5,19 +5,20 @@ toc_title: "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u
 
 # CREATE USER {#create-user-statement}
 
-Создает [аккаунт пользователя](../../../operations/access-rights.md#user-account-management).
+Создает [аккаунты пользователей](../../../operations/access-rights.md#user-account-management).
 
-### Синтаксис {#create-user-syntax}
+Синтаксис:
 
 ```sql
-CREATE USER [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
+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'}]
     [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'] [,...]
 ```
 
-#### Идентификация
+## Идентификация
 
 Существует несколько способов идентификации пользователя:
 
@@ -28,7 +29,7 @@ CREATE USER [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
 - `IDENTIFIED WITH double_sha1_password BY 'qwerty'`
 - `IDENTIFIED WITH double_sha1_hash BY 'hash'`
 
-#### Пользовательский хост
+## Пользовательский хост
 
 Пользовательский хост — это хост, с которого можно установить соединение с сервером ClickHouse. Хост задается в секции `HOST` следующими способами:
 
@@ -49,7 +50,7 @@ CREATE USER [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
     ClickHouse трактует конструкцию `user_name@'address'` как имя пользователя целиком. То есть технически вы можете создать несколько пользователей с одинаковыми `user_name`, но разными частями конструкции после `@`, но лучше так не делать.
 
 
-### Примеры {#create-user-examples}
+## Примеры {#create-user-examples}
 
 
 Создать аккаунт `mira`, защищенный паролем `qwerty`:
@@ -69,7 +70,7 @@ CREATE USER john DEFAULT ROLE role1, role2
 Создать аккаунт `john` и установить ролями по умолчанию все его будущие роли:
 
 ``` sql
-ALTER USER user DEFAULT ROLE ALL
+CREATE USER user DEFAULT ROLE ALL
 ```
 
 Когда роль будет назначена аккаунту `john`, она автоматически станет ролью по умолчанию.
@@ -77,7 +78,7 @@ ALTER USER user DEFAULT ROLE ALL
 Создать аккаунт `john` и установить ролями по умолчанию все его будущие роли, кроме `role1` и `role2`:
 
 ``` sql
-ALTER USER john DEFAULT ROLE ALL EXCEPT role1, role2
+CREATE USER john DEFAULT ROLE ALL EXCEPT role1, role2
 ```
 
 [Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/create/user) 
diff --git a/docs/ru/sql-reference/statements/show.md b/docs/ru/sql-reference/statements/show.md
index 4516a401de9..4468d74c71c 100644
--- a/docs/ru/sql-reference/statements/show.md
+++ b/docs/ru/sql-reference/statements/show.md
@@ -249,11 +249,9 @@ SHOW GRANTS [FOR user]
 ### Синтаксис {#show-create-user-syntax}
 
 ``` sql
-SHOW CREATE USER [name | CURRENT_USER]
+SHOW CREATE USER [name1 [, name2 ...] | CURRENT_USER]
 ```
 
-
-
 ## SHOW CREATE ROLE {#show-create-role-statement}
 
 Выводит параметры, использованные при [создании роли](create/role.md#create-role-statement).
@@ -261,11 +259,9 @@ SHOW CREATE USER [name | CURRENT_USER]
 ### Синтаксис {#show-create-role-syntax}
 
 ``` sql
-SHOW CREATE ROLE name
+SHOW CREATE ROLE name1 [, name2 ...]
 ```
 
-
-
 ## SHOW CREATE ROW POLICY {#show-create-row-policy-statement}
 
 Выводит параметры, использованные при [создании политики доступа к строкам](create/row-policy.md#create-row-policy-statement).
@@ -273,10 +269,9 @@ SHOW CREATE ROLE name
 ### Синтаксис {#show-create-row-policy-syntax}
 
 ```sql
-SHOW CREATE [ROW] POLICY name ON [database.]table
+SHOW CREATE [ROW] POLICY name ON [database1.]table1 [, [database2.]table2 ...]
 ```
 
-
 ## SHOW CREATE QUOTA {#show-create-quota-statement}
 
 Выводит параметры, использованные при [создании квоты](create/quota.md#create-quota-statement).
@@ -284,10 +279,9 @@ SHOW CREATE [ROW] POLICY name ON [database.]table
 ### Синтаксис {#show-create-row-policy-syntax}
 
 ```sql
-SHOW CREATE QUOTA [name | CURRENT]
+SHOW CREATE QUOTA [name1 [, name2 ...] | CURRENT]
 ```
 
-
 ## SHOW CREATE SETTINGS PROFILE {#show-create-settings-profile-statement}
 
 Выводит параметры, использованные при [создании профиля настроек](create/settings-profile.md#create-settings-profile-statement).
@@ -295,10 +289,9 @@ SHOW CREATE QUOTA [name | CURRENT]
 ### Синтаксис {#show-create-row-policy-syntax}
 
 ```sql
-SHOW CREATE [SETTINGS] PROFILE name
+SHOW CREATE [SETTINGS] PROFILE name1 [, name2 ...]
 ```
 
-
 ## SHOW USERS {#show-users-statement}
 
 Выводит список [пользовательских аккаунтов](../../operations/access-rights.md#user-account-management). Для просмотра параметров пользовательских аккаунтов, см. системную таблицу [system.users](../../operations/system-tables/users.md#system_tables-users).

From b15848e2f0b80a7a2ce45de14260379ba98f04f3 Mon Sep 17 00:00:00 2001
From: Anton Popov <pad11rus@gmail.com>
Date: Wed, 27 Jan 2021 03:32:18 +0300
Subject: [PATCH 506/611] Update IDisk.h

---
 src/Disks/IDisk.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Disks/IDisk.h b/src/Disks/IDisk.h
index 16f082e3bec..f41490a0807 100644
--- a/src/Disks/IDisk.h
+++ b/src/Disks/IDisk.h
@@ -58,7 +58,7 @@ public:
 using SpacePtr = std::shared_ptr<Space>;
 
 /**
- * A guard, that should synchronize file's or directory's state 
+ * A guard, that should synchronize file's or directory's state
  * with storage device (e.g. fsync in POSIX) in its destructor.
  */
 class ISyncGuard

From 09e5bdd1efa453dfee6a529ccc42461df101611c Mon Sep 17 00:00:00 2001
From: Anton Popov <pad11rus@gmail.com>
Date: Wed, 27 Jan 2021 03:57:28 +0300
Subject: [PATCH 507/611] fix style check

---
 src/Disks/DiskLocal.cpp | 4 ----
 src/Disks/S3/DiskS3.cpp | 1 -
 2 files changed, 5 deletions(-)

diff --git a/src/Disks/DiskLocal.cpp b/src/Disks/DiskLocal.cpp
index 10140c26ab2..8787f613bf7 100644
--- a/src/Disks/DiskLocal.cpp
+++ b/src/Disks/DiskLocal.cpp
@@ -21,10 +21,6 @@ namespace ErrorCodes
     extern const int EXCESSIVE_ELEMENT_IN_CONFIG;
     extern const int PATH_ACCESS_DENIED;
     extern const int INCORRECT_DISK_INDEX;
-    extern const int FILE_DOESNT_EXIST;
-    extern const int CANNOT_OPEN_FILE;
-    extern const int CANNOT_FSYNC;
-    extern const int CANNOT_CLOSE_FILE;
     extern const int CANNOT_TRUNCATE_FILE;
     extern const int CANNOT_UNLINK;
     extern const int CANNOT_RMDIR;
diff --git a/src/Disks/S3/DiskS3.cpp b/src/Disks/S3/DiskS3.cpp
index 6674997e7b9..238db98c9cc 100644
--- a/src/Disks/S3/DiskS3.cpp
+++ b/src/Disks/S3/DiskS3.cpp
@@ -36,7 +36,6 @@ namespace ErrorCodes
     extern const int CANNOT_SEEK_THROUGH_FILE;
     extern const int UNKNOWN_FORMAT;
     extern const int INCORRECT_DISK_INDEX;
-    extern const int NOT_IMPLEMENTED;
     extern const int PATH_ACCESS_DENIED;
     extern const int CANNOT_DELETE_DIRECTORY;
 }

From 35622505945b56ab5be3240a3a2555bc299a1cc9 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Wed, 27 Jan 2021 03:58:48 +0300
Subject: [PATCH 508/611] Remove outdated index_granularity from docs

---
 docs/en/getting-started/tutorial.md             | 2 --
 docs/en/sql-reference/statements/insert-into.md | 5 ++---
 docs/es/getting-started/tutorial.md             | 2 --
 docs/fr/getting-started/tutorial.md             | 2 --
 docs/ja/getting-started/tutorial.md             | 2 --
 docs/ru/getting-started/tutorial.md             | 2 --
 docs/ru/sql-reference/statements/insert-into.md | 7 +++----
 docs/zh/getting-started/tutorial.md             | 2 --
 docs/zh/sql-reference/statements/insert-into.md | 1 -
 9 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/docs/en/getting-started/tutorial.md b/docs/en/getting-started/tutorial.md
index 254fa37d47d..64363c963c5 100644
--- a/docs/en/getting-started/tutorial.md
+++ b/docs/en/getting-started/tutorial.md
@@ -254,7 +254,6 @@ ENGINE = MergeTree()
 PARTITION BY toYYYYMM(EventDate)
 ORDER BY (CounterID, EventDate, intHash32(UserID))
 SAMPLE BY intHash32(UserID)
-SETTINGS index_granularity = 8192
 ```
 
 ``` sql
@@ -450,7 +449,6 @@ ENGINE = CollapsingMergeTree(Sign)
 PARTITION BY toYYYYMM(StartDate)
 ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID)
 SAMPLE BY intHash32(UserID)
-SETTINGS index_granularity = 8192
 ```
 
 You can execute those queries using the interactive mode of `clickhouse-client` (just launch it in a terminal without specifying a query in advance) or try some [alternative interface](../interfaces/index.md) if you want.
diff --git a/docs/en/sql-reference/statements/insert-into.md b/docs/en/sql-reference/statements/insert-into.md
index 7acf4018812..2928e50224d 100644
--- a/docs/en/sql-reference/statements/insert-into.md
+++ b/docs/en/sql-reference/statements/insert-into.md
@@ -13,7 +13,7 @@ Basic query format:
 INSERT INTO [db.]table [(c1, c2, c3)] VALUES (v11, v12, v13), (v21, v22, v23), ...
 ```
 
-You can specify a list of columns to insert using  the `(c1, c2, c3)`. You can also use an expression with column [matcher](../../sql-reference/statements/select/index.md#asterisk) such as `*` and/or [modifiers](../../sql-reference/statements/select/index.md#select-modifiers) such as [APPLY](../../sql-reference/statements/select/index.md#apply-modifier), [EXCEPT](../../sql-reference/statements/select/index.md#apply-modifier), [REPLACE](../../sql-reference/statements/select/index.md#replace-modifier). 
+You can specify a list of columns to insert using  the `(c1, c2, c3)`. You can also use an expression with column [matcher](../../sql-reference/statements/select/index.md#asterisk) such as `*` and/or [modifiers](../../sql-reference/statements/select/index.md#select-modifiers) such as [APPLY](../../sql-reference/statements/select/index.md#apply-modifier), [EXCEPT](../../sql-reference/statements/select/index.md#apply-modifier), [REPLACE](../../sql-reference/statements/select/index.md#replace-modifier).
 
 For example, consider the table:
 
@@ -30,7 +30,6 @@ CREATE TABLE insert_select_testtable
 )
 ENGINE = MergeTree()
 ORDER BY a
-SETTINGS index_granularity = 8192 
 ```
 
 ``` sql
@@ -55,7 +54,7 @@ SELECT * FROM insert_select_testtable;
 │ 1 │ a │ 1 │
 └───┴───┴───┘
 ```
- 
+
 In this example, we see that the second inserted row has `a` and `c` columns filled by the passed values, and `b` filled with value by default.
 
 If a list of columns doesn't include all existing columns, the rest of the columns are filled with:
diff --git a/docs/es/getting-started/tutorial.md b/docs/es/getting-started/tutorial.md
index 52699190b4d..2cc9339f954 100644
--- a/docs/es/getting-started/tutorial.md
+++ b/docs/es/getting-started/tutorial.md
@@ -256,7 +256,6 @@ ENGINE = MergeTree()
 PARTITION BY toYYYYMM(EventDate)
 ORDER BY (CounterID, EventDate, intHash32(UserID))
 SAMPLE BY intHash32(UserID)
-SETTINGS index_granularity = 8192
 ```
 
 ``` sql
@@ -452,7 +451,6 @@ ENGINE = CollapsingMergeTree(Sign)
 PARTITION BY toYYYYMM(StartDate)
 ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID)
 SAMPLE BY intHash32(UserID)
-SETTINGS index_granularity = 8192
 ```
 
 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.
diff --git a/docs/fr/getting-started/tutorial.md b/docs/fr/getting-started/tutorial.md
index b600456b484..839af7aeb84 100644
--- a/docs/fr/getting-started/tutorial.md
+++ b/docs/fr/getting-started/tutorial.md
@@ -256,7 +256,6 @@ ENGINE = MergeTree()
 PARTITION BY toYYYYMM(EventDate)
 ORDER BY (CounterID, EventDate, intHash32(UserID))
 SAMPLE BY intHash32(UserID)
-SETTINGS index_granularity = 8192
 ```
 
 ``` sql
@@ -452,7 +451,6 @@ ENGINE = CollapsingMergeTree(Sign)
 PARTITION BY toYYYYMM(StartDate)
 ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID)
 SAMPLE BY intHash32(UserID)
-SETTINGS index_granularity = 8192
 ```
 
 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.
diff --git a/docs/ja/getting-started/tutorial.md b/docs/ja/getting-started/tutorial.md
index d63954684f1..82459944015 100644
--- a/docs/ja/getting-started/tutorial.md
+++ b/docs/ja/getting-started/tutorial.md
@@ -262,7 +262,6 @@ ENGINE = MergeTree()
 PARTITION BY toYYYYMM(EventDate)
 ORDER BY (CounterID, EventDate, intHash32(UserID))
 SAMPLE BY intHash32(UserID)
-SETTINGS index_granularity = 8192
 ```
 
 ``` sql
@@ -458,7 +457,6 @@ ENGINE = CollapsingMergeTree(Sign)
 PARTITION BY toYYYYMM(StartDate)
 ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID)
 SAMPLE BY intHash32(UserID)
-SETTINGS index_granularity = 8192
 ```
 
 これらのクエリは、`clickhouse-client` の対話型モード(事前にクエリを指定せずにターミナルで起動するだけです)を使って実行するか、[代替インターフェイス](../interfaces/index.md) で実行できます。
diff --git a/docs/ru/getting-started/tutorial.md b/docs/ru/getting-started/tutorial.md
index bd987520dff..f5455ba2b9a 100644
--- a/docs/ru/getting-started/tutorial.md
+++ b/docs/ru/getting-started/tutorial.md
@@ -254,7 +254,6 @@ ENGINE = MergeTree()
 PARTITION BY toYYYYMM(EventDate)
 ORDER BY (CounterID, EventDate, intHash32(UserID))
 SAMPLE BY intHash32(UserID)
-SETTINGS index_granularity = 8192
 ```
 
 ``` sql
@@ -450,7 +449,6 @@ ENGINE = CollapsingMergeTree(Sign)
 PARTITION BY toYYYYMM(StartDate)
 ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID)
 SAMPLE BY intHash32(UserID)
-SETTINGS index_granularity = 8192
 ```
 
 You can execute those queries using the interactive mode of `clickhouse-client` (just launch it in a terminal without specifying a query in advance) or try some [alternative interface](../interfaces/index.md) if you want.
diff --git a/docs/ru/sql-reference/statements/insert-into.md b/docs/ru/sql-reference/statements/insert-into.md
index e3cea4aecc5..d83f6691f6b 100644
--- a/docs/ru/sql-reference/statements/insert-into.md
+++ b/docs/ru/sql-reference/statements/insert-into.md
@@ -13,7 +13,7 @@ toc_title: INSERT INTO
 INSERT INTO [db.]table [(c1, c2, c3)] VALUES (v11, v12, v13), (v21, v22, v23), ...
 ```
 
-Вы можете указать список столбцов для вставки, используя синтаксис `(c1, c2, c3)`. Также можно использовать выражение cо [звездочкой](../../sql-reference/statements/select/index.md#asterisk) и/или модификаторами, такими как `APPLY`, `EXCEPT`, `REPLACE`. 
+Вы можете указать список столбцов для вставки, используя синтаксис `(c1, c2, c3)`. Также можно использовать выражение cо [звездочкой](../../sql-reference/statements/select/index.md#asterisk) и/или модификаторами, такими как `APPLY`, `EXCEPT`, `REPLACE`.
 
 В качестве примера рассмотрим таблицу:
 
@@ -30,13 +30,12 @@ SHOW CREATE insert_select_testtable
     `c` Int8
 )
 ENGINE = MergeTree()
-ORDER BY a
-SETTINGS index_granularity = 8192 │
+ORDER BY a │
 └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
 ```
 
 ``` sql
-INSERT INTO insert_select_testtable (*) VALUES (1, 'a', 1) 
+INSERT INTO insert_select_testtable (*) VALUES (1, 'a', 1)
 ```
 
 Если вы хотите вставить данные во все столбцы, кроме 'b', вам нужно передать столько значений, сколько столбцов вы указали в скобках:
diff --git a/docs/zh/getting-started/tutorial.md b/docs/zh/getting-started/tutorial.md
index 5e34729a9c5..4b1427cad2a 100644
--- a/docs/zh/getting-started/tutorial.md
+++ b/docs/zh/getting-started/tutorial.md
@@ -254,7 +254,6 @@ ENGINE = MergeTree()
 PARTITION BY toYYYYMM(EventDate)
 ORDER BY (CounterID, EventDate, intHash32(UserID))
 SAMPLE BY intHash32(UserID)
-SETTINGS index_granularity = 8192
 ```
 
 ``` sql
@@ -450,7 +449,6 @@ ENGINE = CollapsingMergeTree(Sign)
 PARTITION BY toYYYYMM(StartDate)
 ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID)
 SAMPLE BY intHash32(UserID)
-SETTINGS index_granularity = 8192
 ```
 
 您可以使用`clickhouse-client`的交互模式执行这些查询（只需在终端中启动它，而不需要提前指定查询）。或者如果你愿意，可以尝试一些[替代接口](../interfaces/index.md)。
diff --git a/docs/zh/sql-reference/statements/insert-into.md b/docs/zh/sql-reference/statements/insert-into.md
index 92b24c74493..3e378c6a589 100644
--- a/docs/zh/sql-reference/statements/insert-into.md
+++ b/docs/zh/sql-reference/statements/insert-into.md
@@ -25,7 +25,6 @@ CREATE TABLE insert_select_testtable
 )
 ENGINE = MergeTree()
 ORDER BY a
-SETTINGS index_granularity = 8192 
 ```
 
 ``` sql

From 48b4d98b2136c5c7f25b0d96e15c04be9c6204ad Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Wed, 27 Jan 2021 04:48:41 +0300
Subject: [PATCH 509/611] Amend

---
 src/Storages/MergeTree/MergeTreeReadPool.h       | 3 ++-
 src/Storages/MergeTree/MergeTreeReaderStream.cpp | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Storages/MergeTree/MergeTreeReadPool.h b/src/Storages/MergeTree/MergeTreeReadPool.h
index aa6811661e6..366e9a2381a 100644
--- a/src/Storages/MergeTree/MergeTreeReadPool.h
+++ b/src/Storages/MergeTree/MergeTreeReadPool.h
@@ -71,7 +71,8 @@ private:
 public:
     MergeTreeReadPool(
         const size_t threads_, const size_t sum_marks_, const size_t min_marks_for_concurrent_read_,
-        RangesInDataParts && parts_, const MergeTreeData & data_, const StorageMetadataPtr & metadata_snapshot_, const PrewhereInfoPtr & prewhere_info_,
+        RangesInDataParts && parts_, const MergeTreeData & data_, const StorageMetadataPtr & metadata_snapshot_,
+        const PrewhereInfoPtr & prewhere_info_,
         const bool check_columns_, const Names & column_names_,
         const BackoffSettings & backoff_settings_, size_t preferred_block_size_bytes_,
         const bool do_not_steal_tasks_ = false);
diff --git a/src/Storages/MergeTree/MergeTreeReaderStream.cpp b/src/Storages/MergeTree/MergeTreeReaderStream.cpp
index 08cb49445f0..fd251497d7c 100644
--- a/src/Storages/MergeTree/MergeTreeReaderStream.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderStream.cpp
@@ -112,6 +112,9 @@ MergeTreeReaderStream::MergeTreeReaderStream(
         if (profile_callback)
             buffer->setProfileCallback(profile_callback, clock_type);
 
+        if (!settings.checksum_on_read)
+            buffer->disableChecksumming();
+
         non_cached_buffer = std::move(buffer);
         data_buffer = non_cached_buffer.get();
     }

From fe2e38bf8c09d823757ae0beec5b90d5c7cdfd60 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Wed, 27 Jan 2021 05:09:30 +0300
Subject: [PATCH 510/611] Skip two tests in Arcadia because it builds without
 base64

---
 tests/queries/0_stateless/arcadia_skip_list.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/queries/0_stateless/arcadia_skip_list.txt b/tests/queries/0_stateless/arcadia_skip_list.txt
index 98e33c21887..1b42e38a8e9 100644
--- a/tests/queries/0_stateless/arcadia_skip_list.txt
+++ b/tests/queries/0_stateless/arcadia_skip_list.txt
@@ -194,3 +194,5 @@
 01669_columns_declaration_serde
 01666_blns
 01181_db_atomic_drop_on_cluster
+01658_test_base64Encode_mysql_compatibility
+01659_test_base64Decode_mysql_compatibility

From 0a1fd29ee670aaaa0e011f07028a6502efb63f63 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Tue, 26 Jan 2021 22:56:11 +0300
Subject: [PATCH 511/611] Add current_database = currentDatabase() filter for
 tests with query_log/query_thread_log

---
 .../00634_performance_introspection_and_logging.sh |  2 +-
 .../00731_long_merge_tree_select_opened_files.sh   |  2 +-
 ...0933_test_fix_extra_seek_on_compressed_cache.sh |  2 +-
 .../0_stateless/00956_sensitive_data_masking.sh    |  2 +-
 tests/queries/0_stateless/00974_query_profiler.sql |  4 ++--
 .../01070_exception_code_in_query_log_table.sql    |  2 +-
 .../01076_array_join_prewhere_const_folding.sql    |  2 +-
 .../0_stateless/01088_benchmark_query_id.sh        |  2 +-
 tests/queries/0_stateless/01091_num_threads.sql    |  6 +++---
 .../queries/0_stateless/01092_memory_profiler.sql  |  2 +-
 .../queries/0_stateless/01193_metadata_loading.sh  |  2 +-
 tests/queries/0_stateless/01194_http_query_id.sh   |  2 +-
 .../queries/0_stateless/01198_client_quota_key.sh  |  2 +-
 .../0_stateless/01231_log_queries_min_type.sql     |  7 ++++---
 ...01283_max_threads_simple_query_optimization.sql |  2 +-
 .../01290_max_execution_speed_distributed.sql      |  1 +
 .../0_stateless/01323_too_many_threads_bug.sql     |  4 ++--
 .../0_stateless/01343_min_bytes_to_use_mmap_io.sql |  2 +-
 .../01344_min_bytes_to_use_mmap_io_index.sql       |  2 +-
 tests/queries/0_stateless/01356_view_threads.sql   |  2 +-
 tests/queries/0_stateless/01357_result_rows.sql    |  2 +-
 .../0_stateless/01358_union_threads_bug.sql        |  2 +-
 ...60_materialized_view_with_join_on_query_log.sql |  4 +++-
 tests/queries/0_stateless/01413_rows_events.sql    | 12 ++++++------
 .../01415_overlimiting_threads_for_repica_bug.sql  |  2 +-
 .../0_stateless/01455_opentelemetry_distributed.sh |  6 ++++--
 .../01461_query_start_time_microseconds.sql        |  6 +++++-
 .../0_stateless/01473_event_time_microseconds.sql  |  3 +++
 .../queries/0_stateless/01526_initial_query_id.sh  |  2 +-
 .../0_stateless/01526_max_untracked_memory.sh      |  2 +-
 .../01560_crash_in_agg_empty_arglist.sql           |  2 +-
 .../01600_log_queries_with_extensive_info.sh       |  2 +-
 .../queries/0_stateless/01651_bugs_from_15889.sql  |  8 ++++++--
 .../01656_test_query_log_factories_info.sql        | 14 +++++++-------
 tests/queries/0_stateless/01661_referer.sh         |  2 +-
 tests/queries/0_stateless/01670_log_comment.sql    |  4 ++--
 36 files changed, 71 insertions(+), 54 deletions(-)

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 c645bea23b3..e51e4fea5db 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 type=2 ORDER BY event_time DESC LIMIT 1)
+        (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)
     ARRAY JOIN ProfileEvents.Names AS PN, ProfileEvents.Values AS PV"
 
 # Clean
diff --git a/tests/queries/0_stateless/00731_long_merge_tree_select_opened_files.sh b/tests/queries/0_stateless/00731_long_merge_tree_select_opened_files.sh
index 25a742a481a..c2274c53399 100755
--- a/tests/queries/0_stateless/00731_long_merge_tree_select_opened_files.sh
+++ b/tests/queries/0_stateless/00731_long_merge_tree_select_opened_files.sh
@@ -28,6 +28,6 @@ $CLICKHOUSE_CLIENT $settings -q "$touching_many_parts_query" &> /dev/null
 
 $CLICKHOUSE_CLIENT $settings -q "SYSTEM FLUSH LOGS"
 
-$CLICKHOUSE_CLIENT $settings -q "SELECT pi.Values FROM system.query_log ARRAY JOIN ProfileEvents as pi WHERE query='$touching_many_parts_query' and pi.Names = 'FileOpen' ORDER BY event_time DESC LIMIT 1;"
+$CLICKHOUSE_CLIENT $settings -q "SELECT pi.Values FROM system.query_log ARRAY JOIN ProfileEvents as pi WHERE query='$touching_many_parts_query' and current_database = currentDatabase() and pi.Names = 'FileOpen' ORDER BY event_time DESC LIMIT 1;"
 
 $CLICKHOUSE_CLIENT $settings -q "DROP TABLE IF EXISTS merge_tree_table;"
diff --git a/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.sh b/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.sh
index 2b9a69d19d4..9865baaa1b9 100755
--- a/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.sh
+++ b/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.sh
@@ -20,7 +20,7 @@ $CLICKHOUSE_CLIENT --use_uncompressed_cache=1 --query_id="test-query-uncompresse
 
 $CLICKHOUSE_CLIENT --query="SYSTEM FLUSH LOGS"
 
-$CLICKHOUSE_CLIENT --query="SELECT ProfileEvents.Values[indexOf(ProfileEvents.Names, 'Seek')], ProfileEvents.Values[indexOf(ProfileEvents.Names, 'ReadCompressedBytes')], ProfileEvents.Values[indexOf(ProfileEvents.Names, 'UncompressedCacheHits')] AS hit FROM system.query_log WHERE (query_id = 'test-query-uncompressed-cache') AND (type = 2) AND event_date >= yesterday() ORDER BY event_time DESC LIMIT 1"
+$CLICKHOUSE_CLIENT --query="SELECT ProfileEvents.Values[indexOf(ProfileEvents.Names, 'Seek')], ProfileEvents.Values[indexOf(ProfileEvents.Names, 'ReadCompressedBytes')], ProfileEvents.Values[indexOf(ProfileEvents.Names, 'UncompressedCacheHits')] AS hit FROM system.query_log WHERE (query_id = 'test-query-uncompressed-cache') AND current_database = currentDatabase() AND (type = 2) AND event_date >= yesterday() ORDER BY event_time DESC LIMIT 1"
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS small_table"
 
diff --git a/tests/queries/0_stateless/00956_sensitive_data_masking.sh b/tests/queries/0_stateless/00956_sensitive_data_masking.sh
index 799941e94bf..764cb6a713e 100755
--- a/tests/queries/0_stateless/00956_sensitive_data_masking.sh
+++ b/tests/queries/0_stateless/00956_sensitive_data_masking.sh
@@ -97,7 +97,7 @@ echo 7
 # and finally querylog
 $CLICKHOUSE_CLIENT \
   --server_logs_file=/dev/null \
-  --query="select * from system.query_log where event_time > now() - 10 and query like '%TOPSECRET%';"
+  --query="select * from system.query_log where current_database = currentDatabase() AND event_time > now() - 10 and query like '%TOPSECRET%';"
 
 
 rm -f "$tmp_file" >/dev/null 2>&1
diff --git a/tests/queries/0_stateless/00974_query_profiler.sql b/tests/queries/0_stateless/00974_query_profiler.sql
index c5c073abfa9..9bfd44628c9 100644
--- a/tests/queries/0_stateless/00974_query_profiler.sql
+++ b/tests/queries/0_stateless/00974_query_profiler.sql
@@ -7,7 +7,7 @@ SET log_queries = 0;
 SYSTEM FLUSH LOGS;
 
 WITH addressToLine(arrayJoin(trace) AS addr) || '#' || demangle(addressToSymbol(addr)) AS symbol
-SELECT count() > 0 FROM system.trace_log t WHERE query_id = (SELECT query_id FROM system.query_log WHERE query LIKE '%test real time query profiler%' AND query NOT LIKE '%system%' ORDER BY event_time DESC LIMIT 1) AND symbol LIKE '%FunctionSleep%';
+SELECT count() > 0 FROM system.trace_log t WHERE query_id = (SELECT query_id FROM system.query_log WHERE current_database = currentDatabase() AND query LIKE '%test real time query profiler%' AND query NOT LIKE '%system%' ORDER BY event_time DESC LIMIT 1) AND symbol LIKE '%FunctionSleep%';
 
 SET query_profiler_real_time_period_ns = 0;
 SET query_profiler_cpu_time_period_ns = 1000000;
@@ -17,4 +17,4 @@ SET log_queries = 0;
 SYSTEM FLUSH LOGS;
 
 WITH addressToLine(arrayJoin(trace) AS addr) || '#' || demangle(addressToSymbol(addr)) AS symbol
-SELECT count() > 0 FROM system.trace_log t WHERE query_id = (SELECT query_id FROM system.query_log WHERE query LIKE '%test cpu time query profiler%' AND query NOT LIKE '%system%' ORDER BY event_time DESC LIMIT 1) AND symbol LIKE '%Source%';
+SELECT count() > 0 FROM system.trace_log t WHERE query_id = (SELECT query_id FROM system.query_log WHERE current_database = currentDatabase() AND query LIKE '%test cpu time query profiler%' AND query NOT LIKE '%system%' ORDER BY event_time DESC LIMIT 1) AND symbol LIKE '%Source%';
diff --git a/tests/queries/0_stateless/01070_exception_code_in_query_log_table.sql b/tests/queries/0_stateless/01070_exception_code_in_query_log_table.sql
index b9627a0f8a8..eae7f653d3e 100644
--- a/tests/queries/0_stateless/01070_exception_code_in_query_log_table.sql
+++ b/tests/queries/0_stateless/01070_exception_code_in_query_log_table.sql
@@ -3,5 +3,5 @@ SELECT * FROM test_table_for_01070_exception_code_in_query_log_table; -- { serve
 CREATE TABLE test_table_for_01070_exception_code_in_query_log_table (value UInt64) ENGINE=Memory();
 SELECT * FROM test_table_for_01070_exception_code_in_query_log_table;
 SYSTEM FLUSH LOGS;
-SELECT exception_code FROM system.query_log WHERE lower(query) LIKE lower('SELECT * FROM test_table_for_01070_exception_code_in_query_log_table%') AND event_date >= yesterday() AND event_time > now() - INTERVAL 5 MINUTE ORDER BY exception_code;
+SELECT exception_code FROM system.query_log WHERE current_database = currentDatabase() AND lower(query) LIKE lower('SELECT * FROM test_table_for_01070_exception_code_in_query_log_table%') AND event_date >= yesterday() AND event_time > now() - INTERVAL 5 MINUTE ORDER BY exception_code;
 DROP TABLE IF EXISTS test_table_for_01070_exception_code_in_query_log_table;
diff --git a/tests/queries/0_stateless/01076_array_join_prewhere_const_folding.sql b/tests/queries/0_stateless/01076_array_join_prewhere_const_folding.sql
index 7b80004864d..2ab87fa883a 100644
--- a/tests/queries/0_stateless/01076_array_join_prewhere_const_folding.sql
+++ b/tests/queries/0_stateless/01076_array_join_prewhere_const_folding.sql
@@ -5,6 +5,6 @@ SYSTEM FLUSH LOGS;
 SELECT arrayJoin AS kv_key
 FROM system.query_log
 ARRAY JOIN ProfileEvents.Names AS arrayJoin
-PREWHERE has(arrayMap(key -> key, ProfileEvents.Names), 'Query')
+PREWHERE current_database = currentDatabase() AND has(arrayMap(key -> key, ProfileEvents.Names), 'Query')
 WHERE arrayJoin = 'Query'
 LIMIT 0;
diff --git a/tests/queries/0_stateless/01088_benchmark_query_id.sh b/tests/queries/0_stateless/01088_benchmark_query_id.sh
index cc3531282dd..2f44c36eccc 100755
--- a/tests/queries/0_stateless/01088_benchmark_query_id.sh
+++ b/tests/queries/0_stateless/01088_benchmark_query_id.sh
@@ -7,4 +7,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 QUERY_ID=$RANDOM
 $CLICKHOUSE_BENCHMARK <<< "SELECT 1" --query_id $QUERY_ID -i 10 2>/dev/null
 $CLICKHOUSE_CLIENT -q "SYSTEM FLUSH LOGS"
-$CLICKHOUSE_CLIENT -q "SELECT count() FROM system.query_log WHERE query_id='$QUERY_ID'"
+$CLICKHOUSE_CLIENT -q "SELECT count() FROM system.query_log WHERE current_database = currentDatabase() AND query_id='$QUERY_ID'"
diff --git a/tests/queries/0_stateless/01091_num_threads.sql b/tests/queries/0_stateless/01091_num_threads.sql
index b51b8561c21..e32d663880f 100644
--- a/tests/queries/0_stateless/01091_num_threads.sql
+++ b/tests/queries/0_stateless/01091_num_threads.sql
@@ -8,7 +8,7 @@ WITH
     (
         SELECT query_id
         FROM system.query_log
-        WHERE (normalizeQuery(query) like normalizeQuery('WITH 01091 AS id SELECT 1;')) AND (event_date >= (today() - 1))
+        WHERE current_database = currentDatabase() AND (normalizeQuery(query) like normalizeQuery('WITH 01091 AS id SELECT 1;')) AND (event_date >= (today() - 1))
         ORDER BY event_time DESC
         LIMIT 1
     ) AS id
@@ -23,7 +23,7 @@ WITH
     (
         SELECT query_id
         FROM system.query_log
-        WHERE (normalizeQuery(query) = normalizeQuery('with 01091 as id select sum(number) from numbers(1000000);')) AND (event_date >= (today() - 1))
+        WHERE current_database = currentDatabase() AND (normalizeQuery(query) = normalizeQuery('with 01091 as id select sum(number) from numbers(1000000);')) AND (event_date >= (today() - 1))
         ORDER BY event_time DESC
         LIMIT 1
     ) AS id
@@ -38,7 +38,7 @@ WITH
     (
         SELECT query_id
         FROM system.query_log
-        WHERE (normalizeQuery(query) = normalizeQuery('with 01091 as id select sum(number) from numbers_mt(1000000);')) AND (event_date >= (today() - 1))
+        WHERE current_database = currentDatabase() AND (normalizeQuery(query) = normalizeQuery('with 01091 as id select sum(number) from numbers_mt(1000000);')) AND (event_date >= (today() - 1))
         ORDER BY event_time DESC
         LIMIT 1
     ) AS id
diff --git a/tests/queries/0_stateless/01092_memory_profiler.sql b/tests/queries/0_stateless/01092_memory_profiler.sql
index c20b5c79cdb..b0bfca8e494 100644
--- a/tests/queries/0_stateless/01092_memory_profiler.sql
+++ b/tests/queries/0_stateless/01092_memory_profiler.sql
@@ -3,4 +3,4 @@ SET allow_introspection_functions = 1;
 SET memory_profiler_step = 1000000;
 SELECT ignore(groupArray(number), 'test memory profiler') FROM numbers(10000000);
 SYSTEM FLUSH LOGS;
-WITH addressToSymbol(arrayJoin(trace)) AS symbol SELECT count() > 0 FROM system.trace_log t WHERE event_date >= yesterday() AND trace_type = 'Memory' AND query_id = (SELECT query_id FROM system.query_log WHERE event_date >= yesterday() AND query LIKE '%test memory profiler%' ORDER BY event_time DESC LIMIT 1);
+WITH addressToSymbol(arrayJoin(trace)) AS symbol SELECT count() > 0 FROM system.trace_log t WHERE event_date >= yesterday() AND trace_type = 'Memory' AND query_id = (SELECT query_id FROM system.query_log WHERE current_database = currentDatabase() AND event_date >= yesterday() AND query LIKE '%test memory profiler%' ORDER BY event_time DESC LIMIT 1);
diff --git a/tests/queries/0_stateless/01193_metadata_loading.sh b/tests/queries/0_stateless/01193_metadata_loading.sh
index 143af3679a5..a3154a0784d 100755
--- a/tests/queries/0_stateless/01193_metadata_loading.sh
+++ b/tests/queries/0_stateless/01193_metadata_loading.sh
@@ -46,7 +46,7 @@ for i in {1..5}; do
 done
 
 $CLICKHOUSE_CLIENT -q "SYSTEM FLUSH LOGS"
-$CLICKHOUSE_CLIENT -q "SELECT if(quantile(0.5)(query_duration_ms) < $max_time_ms, 'ok', toString(groupArray(query_duration_ms))) FROM system.query_log WHERE query_id LIKE '$db-%' AND type=2"
+$CLICKHOUSE_CLIENT -q "SELECT if(quantile(0.5)(query_duration_ms) < $max_time_ms, 'ok', toString(groupArray(query_duration_ms))) FROM system.query_log WHERE current_database = currentDatabase() AND query_id LIKE '$db-%' AND type=2"
 
 $CLICKHOUSE_CLIENT -q "SELECT count() * $count_multiplier, i, d, s, n.i, n.f FROM $db.table_merge GROUP BY i, d, s, n.i, n.f ORDER BY i"
 
diff --git a/tests/queries/0_stateless/01194_http_query_id.sh b/tests/queries/0_stateless/01194_http_query_id.sh
index b1ab9eed9db..5aebdc10dfc 100755
--- a/tests/queries/0_stateless/01194_http_query_id.sh
+++ b/tests/queries/0_stateless/01194_http_query_id.sh
@@ -14,4 +14,4 @@ ${CLICKHOUSE_CURL} -sS "$url" --data "SELECT 'test_01194',$rnd,4" > /dev/null
 
 ${CLICKHOUSE_CURL} -sS "$url" --data "SYSTEM FLUSH LOGS"
 
-${CLICKHOUSE_CURL} -sS "$url&query=SELECT+count(DISTINCT+query_id)+FROM+system.query_log+WHERE+query+LIKE+'SELECT+''test_01194'',$rnd%25'"
+${CLICKHOUSE_CURL} -sS "$url&query=SELECT+count(DISTINCT+query_id)+FROM+system.query_log+WHERE+current_database+LIKE+currentDatabase()+AND+query+LIKE+'SELECT+''test_01194'',$rnd%25'"
diff --git a/tests/queries/0_stateless/01198_client_quota_key.sh b/tests/queries/0_stateless/01198_client_quota_key.sh
index 1a08b33e336..d9f062f6589 100755
--- a/tests/queries/0_stateless/01198_client_quota_key.sh
+++ b/tests/queries/0_stateless/01198_client_quota_key.sh
@@ -4,4 +4,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --quota_key Hello --query_id test_quota_key --log_queries 1 --multiquery --query "SELECT 1; SYSTEM FLUSH LOGS; SELECT DISTINCT quota_key FROM system.query_log WHERE event_date >= yesterday() AND event_time >= now() - 300 AND query_id = 'test_quota_key'"
+$CLICKHOUSE_CLIENT --quota_key Hello --query_id test_quota_key --log_queries 1 --multiquery --query "SELECT 1; SYSTEM FLUSH LOGS; SELECT DISTINCT quota_key FROM system.query_log WHERE current_database = currentDatabase() AND event_date >= yesterday() AND event_time >= now() - 300 AND query_id = 'test_quota_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 bfeeca96d4b..9659739b61d 100644
--- a/tests/queries/0_stateless/01231_log_queries_min_type.sql
+++ b/tests/queries/0_stateless/01231_log_queries_min_type.sql
@@ -2,22 +2,23 @@ set log_queries=1;
 
 select '01231_log_queries_min_type/QUERY_START';
 system flush logs;
-select count() from system.query_log where 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 '%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;
 
 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 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 '%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;
 
 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; }
 system flush logs;
-select count() from system.query_log where 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 '%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 '01231_log_queries_min_type w/ Settings/EXCEPTION_WHILE_PROCESSING', max(number) from system.numbers limit 1e6; -- { serverError 158; }
 system flush logs;
 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
diff --git a/tests/queries/0_stateless/01283_max_threads_simple_query_optimization.sql b/tests/queries/0_stateless/01283_max_threads_simple_query_optimization.sql
index a7e51047eba..61db4376c91 100644
--- a/tests/queries/0_stateless/01283_max_threads_simple_query_optimization.sql
+++ b/tests/queries/0_stateless/01283_max_threads_simple_query_optimization.sql
@@ -16,7 +16,7 @@ SELECT
     throwIf(count() != 1, 'no query was logged'),
     throwIf(length(thread_ids) != 2, 'too many threads used')
 FROM system.query_log
-WHERE type = 'QueryFinish' AND query LIKE '%data_01283 LIMIT 1%'
+WHERE current_database = currentDatabase() AND type = 'QueryFinish' AND query LIKE '%data_01283 LIMIT 1%'
 GROUP BY thread_ids
 FORMAT Null;
 
diff --git a/tests/queries/0_stateless/01290_max_execution_speed_distributed.sql b/tests/queries/0_stateless/01290_max_execution_speed_distributed.sql
index b0f545838e6..d6617bec5ce 100644
--- a/tests/queries/0_stateless/01290_max_execution_speed_distributed.sql
+++ b/tests/queries/0_stateless/01290_max_execution_speed_distributed.sql
@@ -17,6 +17,7 @@ SYSTEM FLUSH LOGS;
 SELECT DISTINCT query_duration_ms >= 500
 FROM system.query_log
 WHERE
+    current_database = currentDatabase() AND
     event_date >= yesterday() AND
     query LIKE '%special query for 01290_max_execution_speed_distributed%' AND
     query NOT LIKE '%system.query_log%' AND
diff --git a/tests/queries/0_stateless/01323_too_many_threads_bug.sql b/tests/queries/0_stateless/01323_too_many_threads_bug.sql
index 1c70831c293..6033fe66cd3 100644
--- a/tests/queries/0_stateless/01323_too_many_threads_bug.sql
+++ b/tests/queries/0_stateless/01323_too_many_threads_bug.sql
@@ -9,11 +9,11 @@ set log_queries = 1;
 select x from table_01323_many_parts limit 10 format Null;
 
 system flush logs;
-select arrayUniq(thread_ids) <= 4 from system.query_log where event_date >= today() - 1 and query ilike '%select x from table_01323_many_parts%' and query not like '%system.query_log%' and type = 'QueryFinish' order by query_start_time desc limit 1;
+select arrayUniq(thread_ids) <= 4 from system.query_log where current_database = currentDatabase() AND event_date >= today() - 1 and query ilike '%select x from table_01323_many_parts%' and query not like '%system.query_log%' and type = 'QueryFinish' order by query_start_time desc limit 1;
 
 select x from table_01323_many_parts order by x limit 10 format Null;
 
 system flush logs;
-select arrayUniq(thread_ids) <= 36 from system.query_log where event_date >= today() - 1 and query ilike '%select x from table_01323_many_parts order by x%' and query not like '%system.query_log%' and type = 'QueryFinish' order by query_start_time desc limit 1;
+select arrayUniq(thread_ids) <= 36 from system.query_log where current_database = currentDatabase() AND event_date >= today() - 1 and query ilike '%select x from table_01323_many_parts order by x%' and query not like '%system.query_log%' and type = 'QueryFinish' order by query_start_time desc limit 1;
 
 drop table if exists table_01323_many_parts;
diff --git a/tests/queries/0_stateless/01343_min_bytes_to_use_mmap_io.sql b/tests/queries/0_stateless/01343_min_bytes_to_use_mmap_io.sql
index 62c5d20d714..ef39605f4d2 100644
--- a/tests/queries/0_stateless/01343_min_bytes_to_use_mmap_io.sql
+++ b/tests/queries/0_stateless/01343_min_bytes_to_use_mmap_io.sql
@@ -6,6 +6,6 @@ SET min_bytes_to_use_mmap_io = 1;
 SELECT * FROM test_01343;
 
 SYSTEM FLUSH LOGS;
-SELECT PE.Values FROM system.query_log ARRAY JOIN ProfileEvents AS PE WHERE event_date >= yesterday() AND event_time >= now() - 300 AND query LIKE 'SELECT * FROM test_01343%' 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 event_time >= now() - 300 AND query LIKE 'SELECT * FROM test_01343%' AND PE.Names = 'CreatedReadBufferMMap' AND type = 2 ORDER BY event_time DESC LIMIT 1;
 
 DROP TABLE test_01343;
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 544c0af7925..9044ee08f8d 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 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 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;
 
 DROP TABLE test_01344;
diff --git a/tests/queries/0_stateless/01356_view_threads.sql b/tests/queries/0_stateless/01356_view_threads.sql
index 5290ec555af..17b95324a00 100644
--- a/tests/queries/0_stateless/01356_view_threads.sql
+++ b/tests/queries/0_stateless/01356_view_threads.sql
@@ -7,6 +7,6 @@ set max_threads = 16;
 select g % 2 as gg, sum(s) from table_01356_view_threads group by gg order by gg;
 
 system flush logs;
-select length(thread_ids) >= 16 from system.query_log where event_date >= today() - 1 and lower(query) like '%select g % 2 as gg, sum(s) from table_01356_view_threads group by gg order by gg%' and type = 'QueryFinish' order by query_start_time desc limit 1;
+select length(thread_ids) >= 16 from system.query_log where current_database = currentDatabase() AND event_date >= today() - 1 and lower(query) like '%select g % 2 as gg, sum(s) from table_01356_view_threads group by gg order by gg%' and type = 'QueryFinish' order by query_start_time desc limit 1;
 
 drop table if exists table_01356_view_threads;
diff --git a/tests/queries/0_stateless/01357_result_rows.sql b/tests/queries/0_stateless/01357_result_rows.sql
index 17c2d15979a..b236c8bf0a8 100644
--- a/tests/queries/0_stateless/01357_result_rows.sql
+++ b/tests/queries/0_stateless/01357_result_rows.sql
@@ -2,4 +2,4 @@ set log_queries = 1;
 select count() > 0 from system.settings;
 
 system flush logs;
-select result_rows, result_bytes >= 8 from system.query_log where event_date >= today() - 1 and lower(query) like '%select count() > 0 from system.settings%' and type = 'QueryFinish' order by query_start_time desc limit 1;
+select result_rows, result_bytes >= 8 from system.query_log where current_database = currentDatabase() AND event_date >= today() - 1 and lower(query) like '%select count() > 0 from system.settings%' and type = 'QueryFinish' order by query_start_time desc limit 1;
diff --git a/tests/queries/0_stateless/01358_union_threads_bug.sql b/tests/queries/0_stateless/01358_union_threads_bug.sql
index 0c07364f41c..8366d3f12a0 100644
--- a/tests/queries/0_stateless/01358_union_threads_bug.sql
+++ b/tests/queries/0_stateless/01358_union_threads_bug.sql
@@ -4,4 +4,4 @@ set max_threads = 16;
 SELECT count() FROM (SELECT number FROM numbers_mt(1000000) ORDER BY number DESC LIMIT 100 UNION ALL SELECT number FROM numbers_mt(1000000) ORDER BY number DESC LIMIT 100 UNION ALL SELECT number FROM numbers_mt(1000000) ORDER BY number DESC LIMIT 100);
 
 system flush logs;
-select length(thread_ids) >= 16 from system.query_log where event_date >= today() - 1 and query like '%SELECT count() FROM (SELECT number FROM numbers_mt(1000000) ORDER BY number DESC LIMIT 100 UNION ALL SELECT number FROM numbers_mt(1000000) ORDER BY number DESC LIMIT 100 UNION ALL SELECT number FROM numbers_mt(1000000) ORDER BY number DESC LIMIT 100)%' and type = 'QueryFinish' order by query_start_time desc limit 1;
+select length(thread_ids) >= 16 from system.query_log where current_database = currentDatabase() AND event_date >= today() - 1 and query like '%SELECT count() FROM (SELECT number FROM numbers_mt(1000000) ORDER BY number DESC LIMIT 100 UNION ALL SELECT number FROM numbers_mt(1000000) ORDER BY number DESC LIMIT 100 UNION ALL SELECT number FROM numbers_mt(1000000) ORDER BY number DESC LIMIT 100)%' and type = 'QueryFinish' order by query_start_time desc limit 1;
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 57e8e6f4c74..950d4fe097f 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
@@ -8,6 +8,7 @@ SET log_queries=1;
 SELECT 1;
 SYSTEM FLUSH LOGS;
 
+-- NOTE: can be rewritten using log_queries_min_query_duration_ms
 CREATE MATERIALIZED VIEW slow_log Engine=Memory AS
 (
         SELECT * FROM
@@ -37,7 +38,7 @@ SELECT
     extract(query,'/\\*\\s*QUERY_GROUP_ID:(.*?)\\s*\\*/') as QUERY_GROUP_ID,
     count()
 FROM system.query_log
-WHERE 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 event_time > now() - 20 and QUERY_GROUP_ID<>''
 GROUP BY QUERY_GROUP_ID
 ORDER BY QUERY_GROUP_ID;
 
@@ -47,6 +48,7 @@ SELECT
     QUERY_GROUP_ID,
     count()
 FROM slow_log
+WHERE current_database = currentDatabase()
 GROUP BY QUERY_GROUP_ID
 ORDER BY QUERY_GROUP_ID;
 
diff --git a/tests/queries/0_stateless/01413_rows_events.sql b/tests/queries/0_stateless/01413_rows_events.sql
index 9063f5de8d4..9e77d3fced9 100644
--- a/tests/queries/0_stateless/01413_rows_events.sql
+++ b/tests/queries/0_stateless/01413_rows_events.sql
@@ -4,25 +4,25 @@ CREATE TABLE rows_events_test (k UInt32, v UInt32) ENGINE = MergeTree ORDER BY k
 INSERT INTO /* test 01413, query 1 */ rows_events_test VALUES (1,1);
 SYSTEM FLUSH LOGS;
 
-SELECT written_rows FROM system.query_log WHERE query LIKE 'INSERT INTO /* test 01413, query 1 */ rows_events_test%' AND type = 2 AND event_date >= yesterday() ORDER BY event_time DESC LIMIT 1;
+SELECT written_rows FROM system.query_log WHERE current_database = currentDatabase() AND query LIKE 'INSERT INTO /* test 01413, query 1 */ rows_events_test%' AND type = 2 AND event_date >= yesterday() ORDER BY event_time DESC LIMIT 1;
 
 SELECT ProfileEvents.Values as value FROM system.query_log ARRAY JOIN ProfileEvents
-    WHERE ProfileEvents.Names = 'InsertedRows' AND query LIKE 'INSERT INTO /* test 01413, query 1 */ rows_events_test%' AND type = 2 AND event_date >= yesterday() ORDER BY event_time DESC LIMIT 1;
+    WHERE current_database = currentDatabase() AND ProfileEvents.Names = 'InsertedRows' AND query LIKE 'INSERT INTO /* test 01413, query 1 */ rows_events_test%' AND type = 2 AND event_date >= yesterday() ORDER BY event_time DESC LIMIT 1;
 
 INSERT INTO /* test 01413, query 2 */ rows_events_test VALUES (2,2), (3,3);
 SYSTEM FLUSH LOGS;
 
-SELECT written_rows FROM system.query_log WHERE query LIKE 'INSERT INTO /* test 01413, query 2 */ rows_events_test%' AND type = 2 AND event_date >= yesterday() ORDER BY event_time DESC LIMIT 1;
+SELECT written_rows FROM system.query_log WHERE current_database = currentDatabase() AND query LIKE 'INSERT INTO /* test 01413, query 2 */ rows_events_test%' AND type = 2 AND event_date >= yesterday() ORDER BY event_time DESC LIMIT 1;
 
 SELECT ProfileEvents.Values as value FROM system.query_log ARRAY JOIN ProfileEvents
-    WHERE ProfileEvents.Names = 'InsertedRows' AND query LIKE 'INSERT INTO /* test 01413, query 2 */ rows_events_test%' AND type = 2 AND event_date >= yesterday() ORDER BY event_time DESC LIMIT 1;
+    WHERE current_database = currentDatabase() AND ProfileEvents.Names = 'InsertedRows' AND query LIKE 'INSERT INTO /* test 01413, query 2 */ rows_events_test%' AND type = 2 AND event_date >= yesterday() ORDER BY event_time DESC LIMIT 1;
 
 SELECT * FROM /* test 01413, query 3 */ rows_events_test WHERE v = 2;
 SYSTEM FLUSH LOGS;
 
-SELECT read_rows FROM system.query_log WHERE query LIKE 'SELECT * FROM /* test 01413, query 3 */ rows_events_test%' AND type = 2 AND event_date >= yesterday() ORDER BY event_time DESC LIMIT 1;
+SELECT read_rows FROM system.query_log WHERE current_database = currentDatabase() AND query LIKE 'SELECT * FROM /* test 01413, query 3 */ rows_events_test%' AND type = 2 AND event_date >= yesterday() ORDER BY event_time DESC LIMIT 1;
 
 SELECT ProfileEvents.Values as value FROM system.query_log ARRAY JOIN ProfileEvents
-    WHERE ProfileEvents.Names = 'SelectedRows' AND query LIKE 'SELECT * FROM /* test 01413, query 3 */ rows_events_test%' AND type = 2 AND event_date >= yesterday() ORDER BY event_time DESC LIMIT 1;
+    WHERE current_database = currentDatabase() AND ProfileEvents.Names = 'SelectedRows' AND query LIKE 'SELECT * FROM /* test 01413, query 3 */ rows_events_test%' AND type = 2 AND event_date >= yesterday() ORDER BY event_time DESC LIMIT 1;
 
 DROP TABLE rows_events_test;
diff --git a/tests/queries/0_stateless/01415_overlimiting_threads_for_repica_bug.sql b/tests/queries/0_stateless/01415_overlimiting_threads_for_repica_bug.sql
index 6e092cc2a8a..306d94387a4 100644
--- a/tests/queries/0_stateless/01415_overlimiting_threads_for_repica_bug.sql
+++ b/tests/queries/0_stateless/01415_overlimiting_threads_for_repica_bug.sql
@@ -4,4 +4,4 @@ set max_threads = 16;
 select sum(number) from remote('127.0.0.{1|2}', numbers_mt(1000000)) group by number % 2 order by number % 2;
 
 system flush logs;
-select length(thread_ids) >= 16 from system.query_log where event_date >= today() - 1 and lower(query) like '%select sum(number) from remote(_127.0.0.{1|2}_, numbers_mt(1000000)) group by number %' and type = 'QueryFinish' order by query_start_time desc limit 1;
+select length(thread_ids) >= 16 from system.query_log where current_database = currentDatabase() and event_date >= today() - 1 and lower(query) like '%select sum(number) from remote(_127.0.0.{1|2}_, numbers_mt(1000000)) group by number %' and type = 'QueryFinish' order by query_start_time desc limit 1;
diff --git a/tests/queries/0_stateless/01455_opentelemetry_distributed.sh b/tests/queries/0_stateless/01455_opentelemetry_distributed.sh
index d8a8dde966e..24667f26363 100755
--- a/tests/queries/0_stateless/01455_opentelemetry_distributed.sh
+++ b/tests/queries/0_stateless/01455_opentelemetry_distributed.sh
@@ -29,7 +29,9 @@ select count(*) "'"'"initial query spans with proper parent"'"'"
                 array join attribute.names as attribute_name,
                     attribute.values as attribute_value) o
         join system.query_log on query_id = o.attribute_value
-    where trace_id = reinterpretAsUUID(reverse(unhex('$trace_id')))
+    where
+        trace_id = reinterpretAsUUID(reverse(unhex('$trace_id')))
+        and current_database = currentDatabase()
         and operation_name = 'query'
         and parent_span_id = reinterpretAsUInt64(unhex('73'))
         and o.attribute_name = 'clickhouse.query_id'
@@ -61,7 +63,7 @@ trace_id=$(${CLICKHOUSE_CLIENT} -q "select lower(hex(reverse(reinterpretAsString
 # https://github.com/ClickHouse/ClickHouse/issues/14228
 ${CLICKHOUSE_CURL} \
     --header "traceparent: 00-$trace_id-0000000000000073-01" \
-    --header "tracestate: some custom state" "http://127.0.0.2:8123/" \
+    --header "tracestate: some custom state" "$CLICKHOUSE_URL" \
     --get \
     --data-urlencode "query=select 1 from remote('127.0.0.2', system, one) format Null"
 
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 bf56fefd841..678b9b3d85e 100644
--- a/tests/queries/0_stateless/01461_query_start_time_microseconds.sql
+++ b/tests/queries/0_stateless/01461_query_start_time_microseconds.sql
@@ -6,12 +6,14 @@ WITH (
       (
           SELECT query_start_time_microseconds
           FROM system.query_log
+          WHERE current_database = currentDatabase()
           ORDER BY query_start_time DESC
           LIMIT 1
       ) AS time_with_microseconds,
       (
           SELECT query_start_time
           FROM system.query_log
+          WHERE current_database = currentDatabase()
           ORDER BY query_start_time DESC
           LIMIT 1
       ) AS t)
@@ -24,13 +26,15 @@ WITH (
       (
           SELECT query_start_time_microseconds
           FROM system.query_thread_log
+          WHERE current_database = currentDatabase()
           ORDER BY query_start_time DESC
           LIMIT 1
       ) AS time_with_microseconds,
       (
           SELECT query_start_time
           FROM system.query_thread_log
+          WHERE current_database = currentDatabase()
           ORDER BY query_start_time DESC
           LIMIT 1
       ) AS t)
-SELECT if(dateDiff('second', toDateTime(time_with_microseconds), toDateTime(t)) = 0, 'ok', 'fail'); --
\ No newline at end of file
+SELECT if(dateDiff('second', toDateTime(time_with_microseconds), toDateTime(t)) = 0, 'ok', 'fail'); --
diff --git a/tests/queries/0_stateless/01473_event_time_microseconds.sql b/tests/queries/0_stateless/01473_event_time_microseconds.sql
index 2e536bba7ac..488ee37e6d8 100644
--- a/tests/queries/0_stateless/01473_event_time_microseconds.sql
+++ b/tests/queries/0_stateless/01473_event_time_microseconds.sql
@@ -33,6 +33,7 @@ SELECT '01473_query_log_table_event_start_time_microseconds_test';
 WITH (
         SELECT event_time_microseconds, event_time
         FROM system.query_log
+        WHERE current_database = currentDatabase()
         ORDER BY event_time DESC
         LIMIT 1
     ) AS time
@@ -42,6 +43,7 @@ SELECT '01473_query_thread_log_table_event_start_time_microseconds_test';
 WITH (
         SELECT event_time_microseconds, event_time
         FROM system.query_thread_log
+        WHERE current_database = currentDatabase()
         ORDER BY event_time DESC
         LIMIT 1
     ) AS time
@@ -51,6 +53,7 @@ SELECT '01473_text_log_table_event_start_time_microseconds_test';
 WITH (
           SELECT event_time_microseconds, event_time
           FROM system.query_thread_log
+          WHERE current_database = currentDatabase()
           ORDER BY event_time DESC
           LIMIT 1
       ) AS time
diff --git a/tests/queries/0_stateless/01526_initial_query_id.sh b/tests/queries/0_stateless/01526_initial_query_id.sh
index 0cc09f733d0..e77764ee34e 100755
--- a/tests/queries/0_stateless/01526_initial_query_id.sh
+++ b/tests/queries/0_stateless/01526_initial_query_id.sh
@@ -19,7 +19,7 @@ ${CLICKHOUSE_CLIENT} -n -q "
 system flush logs;
 select interface, initial_query_id = query_id
     from system.query_log
-    where query_id = '$query_id' and type = 'QueryFinish'
+    where current_database = currentDatabase() AND query_id = '$query_id' and type = 'QueryFinish'
     order by interface
     ;
 "
diff --git a/tests/queries/0_stateless/01526_max_untracked_memory.sh b/tests/queries/0_stateless/01526_max_untracked_memory.sh
index b11f40b44f4..df5dbae35a9 100755
--- a/tests/queries/0_stateless/01526_max_untracked_memory.sh
+++ b/tests/queries/0_stateless/01526_max_untracked_memory.sh
@@ -15,7 +15,7 @@ min_trace_entries=2
 query_id_tcp_prefix="01526-tcp-memory-tracking-$RANDOM-$$"
 ${CLICKHOUSE_CLIENT} --log_queries=1 --max_threads=1 --max_untracked_memory=0 --memory_profiler_sample_probability=1 -q "with '$query_id_tcp_prefix' as __id $query FORMAT Null"
 ${CLICKHOUSE_CLIENT} -q "SYSTEM FLUSH LOGS"
-query_id_tcp="$(${CLICKHOUSE_CLIENT} -q "SELECT DISTINCT query_id FROM system.query_log WHERE query LIKE '%$query_id_tcp_prefix%'")"
+query_id_tcp="$(${CLICKHOUSE_CLIENT} -q "SELECT DISTINCT query_id FROM system.query_log WHERE current_database = currentDatabase() AND query LIKE '%$query_id_tcp_prefix%'")"
 ${CLICKHOUSE_CLIENT} -q "SELECT count()>=$min_trace_entries FROM system.trace_log WHERE query_id = '$query_id_tcp' AND abs(size) < 4e6 AND event_time >= now() - interval 1 hour"
 
 # HTTP
diff --git a/tests/queries/0_stateless/01560_crash_in_agg_empty_arglist.sql b/tests/queries/0_stateless/01560_crash_in_agg_empty_arglist.sql
index 57dec2253d6..a66ae5a7024 100644
--- a/tests/queries/0_stateless/01560_crash_in_agg_empty_arglist.sql
+++ b/tests/queries/0_stateless/01560_crash_in_agg_empty_arglist.sql
@@ -2,4 +2,4 @@
 SELECT 1;
 SYSTEM FLUSH LOGS;
 
-SELECT any() as t, substring(query, 1, 70) AS query, avg(memory_usage) usage, count() count FROM system.query_log WHERE event_date >= toDate(1604295323) AND event_time >= toDateTime(1604295323) AND type in (1,2,3,4) and initial_user in ('') and('all' = 'all' or(positionCaseInsensitive(query, 'all') = 1)) GROUP BY query ORDER BY usage desc LIMIT 5; -- { serverError 42 }
+SELECT any() as t, substring(query, 1, 70) AS query, avg(memory_usage) usage, count() count FROM system.query_log WHERE current_database = currentDatabase() AND event_date >= toDate(1604295323) AND event_time >= toDateTime(1604295323) AND type in (1,2,3,4) and initial_user in ('') and('all' = 'all' or(positionCaseInsensitive(query, 'all') = 1)) GROUP BY query ORDER BY usage desc LIMIT 5; -- { serverError 42 }
diff --git a/tests/queries/0_stateless/01600_log_queries_with_extensive_info.sh b/tests/queries/0_stateless/01600_log_queries_with_extensive_info.sh
index 039a68a76f3..a6a8f221084 100755
--- a/tests/queries/0_stateless/01600_log_queries_with_extensive_info.sh
+++ b/tests/queries/0_stateless/01600_log_queries_with_extensive_info.sh
@@ -26,4 +26,4 @@ ${CLICKHOUSE_CLIENT} -q "drop table if exists test_log_queries.logtable3" "--que
 ${CLICKHOUSE_CLIENT} -q "drop database if exists test_log_queries" "--query_id=01600_log_queries_with_extensive_info_018"
 
 ${CLICKHOUSE_CLIENT} -q "system flush logs"
-${CLICKHOUSE_CLIENT} -q "select columns(query, normalized_query_hash, query_kind, databases, tables, columns) apply (any) from system.query_log where type = 'QueryFinish' and query_id like '01600_log_queries_with_extensive_info%' group by query_id order by query_id"
+${CLICKHOUSE_CLIENT} -q "select columns(query, normalized_query_hash, query_kind, databases, tables, columns) apply (any) from system.query_log where current_database = currentDatabase() AND type = 'QueryFinish' and query_id like '01600_log_queries_with_extensive_info%' group by query_id order by query_id"
diff --git a/tests/queries/0_stateless/01651_bugs_from_15889.sql b/tests/queries/0_stateless/01651_bugs_from_15889.sql
index 34fcfc64114..1fbf669a1b8 100644
--- a/tests/queries/0_stateless/01651_bugs_from_15889.sql
+++ b/tests/queries/0_stateless/01651_bugs_from_15889.sql
@@ -51,7 +51,7 @@ WHERE (query_id =
         [NULL, NULL, NULL, NULL, 0.00009999999747378752, NULL, NULL, NULL, NULL, NULL],
         query_id
     FROM system.query_log
-    WHERE (query LIKE '%test cpu time query profiler%') AND (query NOT LIKE '%system%')
+    WHERE current_database = currentDatabase() AND (query LIKE '%test cpu time query profiler%') AND (query NOT LIKE '%system%')
     ORDER BY event_time DESC
     LIMIT 1
 )) AND (symbol LIKE '%Source%');
@@ -66,7 +66,7 @@ WHERE greaterOrEquals(event_date, ignore(ignore(ignore(NULL, '')), 256), yesterd
         ignore(ignore(ignore(ignore(65536)), ignore(65537), ignore(2)), ''),
         query_id
     FROM system.query_log
-    WHERE (event_date >= yesterday()) AND (query LIKE '%test memory profiler%')
+    WHERE current_database = currentDatabase() AND (event_date >= yesterday()) AND (query LIKE '%test memory profiler%')
     ORDER BY event_time DESC
     LIMIT 1
 )); -- { serverError 42 }
@@ -79,6 +79,7 @@ WITH (
     (
         SELECT query_start_time_microseconds
         FROM system.query_log
+        WHERE current_database = currentDatabase()
         ORDER BY query_start_time DESC
         LIMIT 1
     ) AS time_with_microseconds, 
@@ -87,6 +88,7 @@ WITH (
             inf,
             query_start_time
         FROM system.query_log
+        WHERE current_database = currentDatabase()
         ORDER BY query_start_time DESC
         LIMIT 1
     ) AS t)
@@ -96,12 +98,14 @@ WITH (
     (
         SELECT query_start_time_microseconds
         FROM system.query_log
+        WHERE current_database = currentDatabase()
         ORDER BY query_start_time DESC
         LIMIT 1
     ) AS time_with_microseconds, 
     (
         SELECT query_start_time
         FROM system.query_log
+        WHERE current_database = currentDatabase()
         ORDER BY query_start_time DESC
         LIMIT 1
     ) AS t)
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 3ac71d03ec1..aa9bdd42a71 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
@@ -13,27 +13,27 @@ SELECT '';
 
 SYSTEM FLUSH LOGS;
 SELECT arraySort(used_aggregate_functions)
-FROM system.query_log WHERE type = 'QueryFinish' AND (query LIKE '%toDate(\'2000-12-05\')%')
+FROM system.query_log WHERE current_database = currentDatabase() AND type = 'QueryFinish' AND (query LIKE '%toDate(\'2000-12-05\')%')
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
 SELECT '';
 
 SELECT arraySort(used_aggregate_function_combinators)
-FROM system.query_log WHERE type = 'QueryFinish' AND (query LIKE '%toDate(\'2000-12-05\')%')
+FROM system.query_log WHERE current_database = currentDatabase() AND type = 'QueryFinish' AND (query LIKE '%toDate(\'2000-12-05\')%')
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
 SELECT '';
 
 SELECT arraySort(used_table_functions)
-FROM system.query_log WHERE type = 'QueryFinish' AND (query LIKE '%toDate(\'2000-12-05\')%')
+FROM system.query_log WHERE current_database = currentDatabase() AND type = 'QueryFinish' AND (query LIKE '%toDate(\'2000-12-05\')%')
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
 SELECT '';
 
 SELECT arraySort(used_functions)
-FROM system.query_log WHERE type = 'QueryFinish' AND (query LIKE '%toDate(\'2000-12-05\')%')
+FROM system.query_log WHERE current_database = currentDatabase() AND type = 'QueryFinish' AND (query LIKE '%toDate(\'2000-12-05\')%')
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
 SELECT '';
 
 SELECT arraySort(used_data_type_families)
-FROM system.query_log WHERE type = 'QueryFinish' AND (query LIKE '%toDate(\'2000-12-05\')%')
+FROM system.query_log WHERE current_database = currentDatabase() AND type = 'QueryFinish' AND (query LIKE '%toDate(\'2000-12-05\')%')
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
 SELECT '';
 
@@ -43,7 +43,7 @@ CREATE database test_query_log_factories_info1 ENGINE=Atomic;
 SYSTEM FLUSH LOGS;
 SELECT used_database_engines
 FROM system.query_log
-WHERE type == 'QueryFinish' AND (query LIKE '%database test_query_log_factories_info%')
+WHERE current_database = currentDatabase() AND type == 'QueryFinish' AND (query LIKE '%database test_query_log_factories_info%')
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
 SELECT '';
 
@@ -52,7 +52,7 @@ CREATE OR REPLACE TABLE test_query_log_factories_info1.memory_table (id BIGINT,
 SYSTEM FLUSH LOGS;
 SELECT arraySort(used_data_type_families), used_storages
 FROM system.query_log
-WHERE type == 'QueryFinish' AND (query LIKE '%TABLE test%')
+WHERE current_database = currentDatabase() AND type == 'QueryFinish' AND (query LIKE '%TABLE test%')
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
 SELECT '';
 
diff --git a/tests/queries/0_stateless/01661_referer.sh b/tests/queries/0_stateless/01661_referer.sh
index 159f5e9036f..8123c925454 100755
--- a/tests/queries/0_stateless/01661_referer.sh
+++ b/tests/queries/0_stateless/01661_referer.sh
@@ -6,4 +6,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -d 'SELECT 1' --referer 'https://yandex.ru/'
 ${CLICKHOUSE_CLIENT} --query "SYSTEM FLUSH LOGS"
-${CLICKHOUSE_CLIENT} --query "SELECT http_referer FROM system.query_log WHERE http_referer LIKE '%yandex%' LIMIT 1"
+${CLICKHOUSE_CLIENT} --query "SELECT http_referer FROM system.query_log WHERE current_database = currentDatabase() AND http_referer LIKE '%yandex%' LIMIT 1"
diff --git a/tests/queries/0_stateless/01670_log_comment.sql b/tests/queries/0_stateless/01670_log_comment.sql
index bbe7330cc74..c1496273784 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 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 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 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;

From afdea5eff04ff50feffce33a8eb72c209c410d72 Mon Sep 17 00:00:00 2001
From: Vladimir Chebotarev <vladimir.chebotarev@gmail.com>
Date: Wed, 27 Jan 2021 09:38:35 +0300
Subject: [PATCH 512/611] Changed handling of `PocoHTTPClientConfiguration` in
 order to ensure AWS SDK is initialized.

---
 src/Disks/S3/registerDiskS3.cpp | 23 +++++++++---------
 src/IO/S3/PocoHTTPClient.cpp    |  4 +---
 src/IO/S3/PocoHTTPClient.h      | 10 +++++---
 src/IO/S3Common.cpp             | 42 ++++++++++++++++-----------------
 src/IO/S3Common.h               | 14 +++++------
 src/Storages/StorageS3.cpp      | 10 ++++----
 6 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/src/Disks/S3/registerDiskS3.cpp b/src/Disks/S3/registerDiskS3.cpp
index 1b6086d0019..f9eddebdf88 100644
--- a/src/Disks/S3/registerDiskS3.cpp
+++ b/src/Disks/S3/registerDiskS3.cpp
@@ -112,32 +112,33 @@ void registerDiskS3(DiskFactory & factory)
         Poco::File disk{context.getPath() + "disks/" + name};
         disk.createDirectories();
 
-        Aws::Client::ClientConfiguration cfg;
+        S3::PocoHTTPClientConfiguration client_configuration = S3::ClientFactory::instance().createClientConfiguration(
+            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);
 
-        cfg.connectTimeoutMs = config.getUInt(config_prefix + ".connect_timeout_ms", 10000);
-        cfg.httpRequestTimeoutMs = config.getUInt(config_prefix + ".request_timeout_ms", 5000);
-        cfg.maxConnections = config.getUInt(config_prefix + ".max_connections", 100);
-        cfg.endpointOverride = uri.endpoint;
+        client_configuration.connectTimeoutMs = config.getUInt(config_prefix + ".connect_timeout_ms", 10000);
+        client_configuration.httpRequestTimeoutMs = config.getUInt(config_prefix + ".request_timeout_ms", 5000);
+        client_configuration.maxConnections = config.getUInt(config_prefix + ".max_connections", 100);
+        client_configuration.endpointOverride = uri.endpoint;
 
         auto proxy_config = getProxyConfiguration(config_prefix, config);
         if (proxy_config)
-            cfg.perRequestConfiguration = [proxy_config](const auto & request) { return proxy_config->getConfiguration(request); };
+            client_configuration.perRequestConfiguration = [proxy_config](const auto & request) { return proxy_config->getConfiguration(request); };
 
-        cfg.retryStrategy = std::make_shared<Aws::Client::DefaultRetryStrategy>(
+        client_configuration.retryStrategy = std::make_shared<Aws::Client::DefaultRetryStrategy>(
             config.getUInt(config_prefix + ".retry_attempts", 10));
 
         auto client = S3::ClientFactory::instance().create(
-            cfg,
+            client_configuration,
             uri.is_virtual_hosted_style,
             config.getString(config_prefix + ".access_key_id", ""),
             config.getString(config_prefix + ".secret_access_key", ""),
-            config.getBool(config_prefix + ".use_environment_credentials", config.getBool("s3.use_environment_credentials", false)),
-            context.getRemoteHostFilter(),
-            context.getGlobalContext().getSettingsRef().s3_max_redirects);
+            config.getBool(config_prefix + ".use_environment_credentials", config.getBool("s3.use_environment_credentials", false))
+        );
 
         String metadata_path = config.getString(config_prefix + ".metadata_path", context.getPath() + "disks/" + name + "/");
 
diff --git a/src/IO/S3/PocoHTTPClient.cpp b/src/IO/S3/PocoHTTPClient.cpp
index cfd4593d80f..bf6d30986a9 100644
--- a/src/IO/S3/PocoHTTPClient.cpp
+++ b/src/IO/S3/PocoHTTPClient.cpp
@@ -47,11 +47,9 @@ namespace DB::S3
 {
 
 PocoHTTPClientConfiguration::PocoHTTPClientConfiguration(
-        const Aws::Client::ClientConfiguration & cfg,
         const RemoteHostFilter & remote_host_filter_,
         unsigned int s3_max_redirects_)
-    : Aws::Client::ClientConfiguration(cfg)
-    , remote_host_filter(remote_host_filter_)
+    : remote_host_filter(remote_host_filter_)
     , s3_max_redirects(s3_max_redirects_)
 {
 }
diff --git a/src/IO/S3/PocoHTTPClient.h b/src/IO/S3/PocoHTTPClient.h
index 6631a209174..918943a413c 100644
--- a/src/IO/S3/PocoHTTPClient.h
+++ b/src/IO/S3/PocoHTTPClient.h
@@ -21,16 +21,20 @@ class Context;
 
 namespace DB::S3
 {
+class ClientFactory;
 
 struct PocoHTTPClientConfiguration : public Aws::Client::ClientConfiguration
 {
     const RemoteHostFilter & remote_host_filter;
     unsigned int s3_max_redirects;
 
-    PocoHTTPClientConfiguration(const Aws::Client::ClientConfiguration & cfg, const RemoteHostFilter & remote_host_filter_,
-        unsigned int s3_max_redirects_);
-
     void updateSchemeAndRegion();
+
+private:
+    PocoHTTPClientConfiguration(const RemoteHostFilter & remote_host_filter_, unsigned int s3_max_redirects_);
+
+    /// Constructor of Aws::Client::ClientConfiguration must be called after AWS SDK initialization.
+    friend ClientFactory;
 };
 
 class PocoHTTPResponse : public Aws::Http::Standard::StandardHttpResponse
diff --git a/src/IO/S3Common.cpp b/src/IO/S3Common.cpp
index 125ba907629..69b7a3088fb 100644
--- a/src/IO/S3Common.cpp
+++ b/src/IO/S3Common.cpp
@@ -144,7 +144,7 @@ public:
             }
             else if (Aws::Utils::StringUtils::ToLower(ec2_metadata_disabled.c_str()) != "true")
             {
-                Aws::Client::ClientConfiguration aws_client_configuration;
+                DB::S3::PocoHTTPClientConfiguration aws_client_configuration = DB::S3::ClientFactory::instance().createClientConfiguration(remote_host_filter, s3_max_redirects);
 
                 /// See MakeDefaultHttpResourceClientConfiguration().
                 /// This is part of EC2 metadata client, but unfortunately it can't be accessed from outside
@@ -165,8 +165,7 @@ public:
                 aws_client_configuration.requestTimeoutMs = 1000;
                 aws_client_configuration.retryStrategy = std::make_shared<Aws::Client::DefaultRetryStrategy>(1, 1000);
 
-                DB::S3::PocoHTTPClientConfiguration client_configuration(aws_client_configuration, remote_host_filter, s3_max_redirects);
-                auto ec2_metadata_client = std::make_shared<Aws::Internal::EC2MetadataClient>(client_configuration);
+                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);
 
                 AddProvider(std::make_shared<Aws::Auth::InstanceProfileCredentialsProvider>(config_loader));
@@ -284,33 +283,28 @@ namespace S3
         const RemoteHostFilter & remote_host_filter,
         unsigned int s3_max_redirects)
     {
-        Aws::Client::ClientConfiguration cfg;
+        PocoHTTPClientConfiguration client_configuration(remote_host_filter, s3_max_redirects);
 
         if (!endpoint.empty())
-            cfg.endpointOverride = endpoint;
+            client_configuration.endpointOverride = endpoint;
 
-        return create(cfg,
+        return create(client_configuration,
             is_virtual_hosted_style,
             access_key_id,
             secret_access_key,
-            use_environment_credentials,
-            remote_host_filter,
-            s3_max_redirects);
+            use_environment_credentials);
     }
 
     std::shared_ptr<Aws::S3::S3Client> ClientFactory::create( // NOLINT
-        const Aws::Client::ClientConfiguration & cfg,
+        const PocoHTTPClientConfiguration & cfg_,
         bool is_virtual_hosted_style,
         const String & access_key_id,
         const String & secret_access_key,
-        bool use_environment_credentials,
-        const RemoteHostFilter & remote_host_filter,
-        unsigned int s3_max_redirects)
+        bool use_environment_credentials)
     {
         Aws::Auth::AWSCredentials credentials(access_key_id, secret_access_key);
 
-        PocoHTTPClientConfiguration client_configuration(cfg, remote_host_filter, s3_max_redirects);
-
+        PocoHTTPClientConfiguration client_configuration = cfg_;
         client_configuration.updateSchemeAndRegion();
 
         return std::make_shared<Aws::S3::S3Client>(
@@ -320,22 +314,19 @@ namespace S3
                 use_environment_credentials), // AWS credentials provider.
             std::move(client_configuration), // Client configuration.
             Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy::Never, // Sign policy.
-            is_virtual_hosted_style || cfg.endpointOverride.empty() // Use virtual addressing if endpoint is not specified.
+            is_virtual_hosted_style || client_configuration.endpointOverride.empty() // Use virtual addressing if endpoint is not specified.
         );
     }
 
     std::shared_ptr<Aws::S3::S3Client> ClientFactory::create( // NOLINT
-        const Aws::Client::ClientConfiguration & cfg,
+        const PocoHTTPClientConfiguration & cfg_,
         bool is_virtual_hosted_style,
         const String & access_key_id,
         const String & secret_access_key,
         HeaderCollection headers,
-        bool use_environment_credentials,
-        const RemoteHostFilter & remote_host_filter,
-        unsigned int s3_max_redirects)
+        bool use_environment_credentials)
     {
-        PocoHTTPClientConfiguration client_configuration(cfg, remote_host_filter, s3_max_redirects);
-
+        PocoHTTPClientConfiguration client_configuration = cfg_;
         client_configuration.updateSchemeAndRegion();
 
         Aws::Auth::AWSCredentials credentials(access_key_id, secret_access_key);
@@ -348,6 +339,13 @@ namespace S3
         );
     }
 
+    PocoHTTPClientConfiguration ClientFactory::createClientConfiguration(
+        const RemoteHostFilter & remote_host_filter,
+        unsigned int s3_max_redirects)
+    {
+        return PocoHTTPClientConfiguration(remote_host_filter, s3_max_redirects);
+    }
+
     URI::URI(const Poco::URI & uri_)
     {
         /// Case when bucket name represented in domain name of S3 URL.
diff --git a/src/IO/S3Common.h b/src/IO/S3Common.h
index e2ec0785811..c367444395d 100644
--- a/src/IO/S3Common.h
+++ b/src/IO/S3Common.h
@@ -7,6 +7,7 @@
 #include <common/types.h>
 #include <aws/core/Aws.h>
 #include <aws/core/client/ClientConfiguration.h>
+#include <IO/S3/PocoHTTPClient.h>
 #include <Poco/URI.h>
 
 namespace Aws::S3
@@ -23,7 +24,6 @@ namespace DB
 
 namespace DB::S3
 {
-
 class ClientFactory
 {
 public:
@@ -41,21 +41,21 @@ public:
         unsigned int s3_max_redirects);
 
     std::shared_ptr<Aws::S3::S3Client> create(
-        const Aws::Client::ClientConfiguration & cfg,
+        const PocoHTTPClientConfiguration & cfg,
         bool is_virtual_hosted_style,
         const String & access_key_id,
         const String & secret_access_key,
-        bool use_environment_credentials,
-        const RemoteHostFilter & remote_host_filter,
-        unsigned int s3_max_redirects);
+        bool use_environment_credentials);
 
     std::shared_ptr<Aws::S3::S3Client> create(
-        const Aws::Client::ClientConfiguration & cfg,
+        const PocoHTTPClientConfiguration & cfg,
         bool is_virtual_hosted_style,
         const String & access_key_id,
         const String & secret_access_key,
         HeaderCollection headers,
-        bool use_environment_credentials,
+        bool use_environment_credentials);
+
+    PocoHTTPClientConfiguration createClientConfiguration(
         const RemoteHostFilter & remote_host_filter,
         unsigned int s3_max_redirects);
 
diff --git a/src/Storages/StorageS3.cpp b/src/Storages/StorageS3.cpp
index 1920a84e447..279a8bf2ce7 100644
--- a/src/Storages/StorageS3.cpp
+++ b/src/Storages/StorageS3.cpp
@@ -221,7 +221,10 @@ StorageS3::StorageS3(
     if (access_key_id_.empty())
         credentials = Aws::Auth::AWSCredentials(std::move(settings.access_key_id), std::move(settings.secret_access_key));
 
-    Aws::Client::ClientConfiguration client_configuration;
+    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_;
 
@@ -231,9 +234,8 @@ StorageS3::StorageS3(
         credentials.GetAWSAccessKeyId(),
         credentials.GetAWSSecretKey(),
         std::move(settings.headers),
-        settings.use_environment_credentials.value_or(global_context.getConfigRef().getBool("s3.use_environment_credentials", false)),
-        context_.getRemoteHostFilter(),
-        context_.getGlobalContext().getSettingsRef().s3_max_redirects);
+        settings.use_environment_credentials.value_or(global_context.getConfigRef().getBool("s3.use_environment_credentials", false))
+    );
 }
 
 

From bfbb2c59436c040c6a240df5b82fdac2c374405d Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Wed, 27 Jan 2021 10:22:58 +0300
Subject: [PATCH 513/611] Add missing argument (clickhouse-test)

---
 tests/clickhouse-test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index b1282ad5f41..d77c41fbf25 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -777,7 +777,7 @@ def main(args):
                 print(colored("\nFound hung queries in processlist:", args, "red", attrs=["bold"]))
                 print(processlist)
             else:
-                print(colored("Seems like server hung and cannot respond to queries", "red", attrs=["bold"]))
+                print(colored("Seems like server hung and cannot respond to queries", args, "red", attrs=["bold"]))
 
             clickhouse_tcp_port = os.getenv("CLICKHOUSE_PORT_TCP", '9000')
             server_pid = get_server_pid(clickhouse_tcp_port)

From d21d838604abcedc38dfa779f2fe89e33944cbf8 Mon Sep 17 00:00:00 2001
From: Yatsishin Ilya <2159081+qoega@users.noreply.github.com>
Date: Wed, 27 Jan 2021 12:50:11 +0300
Subject: [PATCH 514/611] No more dicttoxml with excessive logs

---
 docker/test/integration/runner/Dockerfile | 2 +-
 tests/integration/helpers/cluster.py      | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/docker/test/integration/runner/Dockerfile b/docker/test/integration/runner/Dockerfile
index 9b51891ccf5..56abf1122b2 100644
--- a/docker/test/integration/runner/Dockerfile
+++ b/docker/test/integration/runner/Dockerfile
@@ -62,7 +62,7 @@ RUN python3 -m pip install \
     avro \
     cassandra-driver \
     confluent-kafka \
-    dicttoxml \
+    dict2xml \
     docker \
     docker-compose==1.22.0 \
     grpcio \
diff --git a/tests/integration/helpers/cluster.py b/tests/integration/helpers/cluster.py
index 4d8f3c68025..ee4ea8c94d5 100644
--- a/tests/integration/helpers/cluster.py
+++ b/tests/integration/helpers/cluster.py
@@ -20,9 +20,8 @@ import psycopg2
 import pymongo
 import pymysql
 import requests
-import xml.dom.minidom
+from dict2xml import dict2xml
 from confluent_kafka.avro.cached_schema_registry_client import CachedSchemaRegistryClient
-from dicttoxml import dicttoxml
 from kazoo.client import KazooClient
 from kazoo.exceptions import KazooException
 from minio import Minio
@@ -1192,8 +1191,8 @@ class ClickHouseInstance:
 
     @staticmethod
     def dict_to_xml(dictionary):
-        xml_str = dicttoxml(dictionary, custom_root="yandex", attr_type=False)
-        return xml.dom.minidom.parseString(xml_str).toprettyxml()
+        xml_str = dict2xml(dictionary, wrap="yandex", indent="  ", newlines=True)
+        return xml_str
 
     @property
     def odbc_drivers(self):

From d13ec0d90970934b9e1666ac145fee69af1aa395 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Wed, 27 Jan 2021 14:10:09 +0300
Subject: [PATCH 515/611] Fix crash after mergine ActionsDAG.

---
 src/Interpreters/ActionsDAG.cpp               |    7 +
 .../01672_actions_dag_merge_crash.reference   | 1024 +++++++++++++++++
 .../01672_actions_dag_merge_crash.sql         |    1 +
 3 files changed, 1032 insertions(+)
 create mode 100644 tests/queries/0_stateless/01672_actions_dag_merge_crash.reference
 create mode 100644 tests/queries/0_stateless/01672_actions_dag_merge_crash.sql

diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index 4c3a4cbe0fa..e71c60bb540 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -821,6 +821,13 @@ ActionsDAGPtr ActionsDAG::merge(ActionsDAG && first, ActionsDAG && second)
 
     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;
diff --git a/tests/queries/0_stateless/01672_actions_dag_merge_crash.reference b/tests/queries/0_stateless/01672_actions_dag_merge_crash.reference
new file mode 100644
index 00000000000..68014807b73
--- /dev/null
+++ b/tests/queries/0_stateless/01672_actions_dag_merge_crash.reference
@@ -0,0 +1,1024 @@
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
+[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
diff --git a/tests/queries/0_stateless/01672_actions_dag_merge_crash.sql b/tests/queries/0_stateless/01672_actions_dag_merge_crash.sql
new file mode 100644
index 00000000000..129dfd30b2b
--- /dev/null
+++ b/tests/queries/0_stateless/01672_actions_dag_merge_crash.sql
@@ -0,0 +1 @@
+SELECT [NULL, '25.6', '-0.02', NULL], [NULL], 1024, [NULL, '10485.76', NULL, NULL], [NULL, '-922337203.6854775808', toNullable(NULL)], [NULL] FROM (SELECT [multiIf((number % 1023) = -inf, toString(number), NULL)], NULL, '-1', multiIf((number % NULL) = NULL, toString(number), ''), [NULL, NULL], multiIf((number % NULL) = 65536, toString(number), '') AS s FROM system.numbers) LIMIT 1024

From 2e2f4066b34a6a4863a089727836cee68372b143 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Wed, 27 Jan 2021 14:12:21 +0300
Subject: [PATCH 516/611] Update test.

---
 .../01672_actions_dag_merge_crash.reference   | 1024 -----------------
 .../01672_actions_dag_merge_crash.sql         |    2 +-
 2 files changed, 1 insertion(+), 1025 deletions(-)

diff --git a/tests/queries/0_stateless/01672_actions_dag_merge_crash.reference b/tests/queries/0_stateless/01672_actions_dag_merge_crash.reference
index 68014807b73..e69de29bb2d 100644
--- a/tests/queries/0_stateless/01672_actions_dag_merge_crash.reference
+++ b/tests/queries/0_stateless/01672_actions_dag_merge_crash.reference
@@ -1,1024 +0,0 @@
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
-[NULL,'25.6','-0.02',NULL]	[NULL]	1024	[NULL,'10485.76',NULL,NULL]	[NULL,'-922337203.6854775808',NULL]	[NULL]
diff --git a/tests/queries/0_stateless/01672_actions_dag_merge_crash.sql b/tests/queries/0_stateless/01672_actions_dag_merge_crash.sql
index 129dfd30b2b..b3b5b3bcd91 100644
--- a/tests/queries/0_stateless/01672_actions_dag_merge_crash.sql
+++ b/tests/queries/0_stateless/01672_actions_dag_merge_crash.sql
@@ -1 +1 @@
-SELECT [NULL, '25.6', '-0.02', NULL], [NULL], 1024, [NULL, '10485.76', NULL, NULL], [NULL, '-922337203.6854775808', toNullable(NULL)], [NULL] FROM (SELECT [multiIf((number % 1023) = -inf, toString(number), NULL)], NULL, '-1', multiIf((number % NULL) = NULL, toString(number), ''), [NULL, NULL], multiIf((number % NULL) = 65536, toString(number), '') AS s FROM system.numbers) LIMIT 1024
+SELECT [NULL, '25.6', '-0.02', NULL], [NULL], 1024, [NULL, '10485.76', NULL, NULL], [NULL, '-922337203.6854775808', toNullable(NULL)], [NULL] FROM (SELECT [multiIf((number % 1023) = -inf, toString(number), NULL)], NULL, '-1', multiIf((number % NULL) = NULL, toString(number), ''), [NULL, NULL], multiIf((number % NULL) = 65536, toString(number), '') AS s FROM system.numbers) LIMIT 1024 format Null

From 2a626f63e65ee458424713604b20c1f91e61d0a0 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Wed, 27 Jan 2021 14:24:46 +0300
Subject: [PATCH 517/611] Fix reference file

---
 .../0_stateless/01670_neighbor_lc_bug.reference   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tests/queries/0_stateless/01670_neighbor_lc_bug.reference b/tests/queries/0_stateless/01670_neighbor_lc_bug.reference
index e69de29bb2d..fd1bc1a154c 100644
--- a/tests/queries/0_stateless/01670_neighbor_lc_bug.reference
+++ b/tests/queries/0_stateless/01670_neighbor_lc_bug.reference
@@ -0,0 +1,15 @@
+0		
+0		
+0	0	0
+1	1	1
+2	2	2
+3	3	3
+4	4	4
+0	0	0
+1	1	1
+2	2	2
+┌─rowNr─┬─val_string─┬─str_m1───┬─str_p1───┬─val_low──┬─low_m1───┬─low_p1───┐
+│     1 │ String 1   │          │ String 1 │ String 1 │          │ String 1 │
+│     2 │ String 1   │ String 1 │ String 2 │ String 1 │ String 1 │ String 2 │
+│     3 │ String 2   │ String 1 │          │ String 2 │ String 1 │          │
+└───────┴────────────┴──────────┴──────────┴──────────┴──────────┴──────────┘

From 5622e6daa6bf27e651a46e4482ffc9decd924ede Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Wed, 27 Jan 2021 14:56:12 +0300
Subject: [PATCH 518/611] Fix rare max_number_of_merges_with_ttl_in_pool limit
 overrun for non-replicated MergeTree

---
 src/Storages/MergeTree/MergeList.h          | 21 ++++++++++++++-------
 src/Storages/MergeTree/MergeTreeData.cpp    |  2 +-
 src/Storages/StorageMergeTree.cpp           |  4 ++++
 src/Storages/StorageReplicatedMergeTree.cpp |  5 +++++
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/Storages/MergeTree/MergeList.h b/src/Storages/MergeTree/MergeList.h
index 65e873ed102..6b2af414835 100644
--- a/src/Storages/MergeTree/MergeList.h
+++ b/src/Storages/MergeTree/MergeList.h
@@ -116,12 +116,6 @@ public:
         : Parent(CurrentMetrics::Merge)
     {}
 
-    void onEntryCreate(const Parent::Entry & entry) override
-    {
-        if (isTTLMergeType(entry->merge_type))
-            ++merges_with_ttl_counter;
-    }
-
     void onEntryDestroy(const Parent::Entry & entry) override
     {
         if (isTTLMergeType(entry->merge_type))
@@ -140,7 +134,20 @@ public:
         }
     }
 
-    size_t getExecutingMergesWithTTLCount() const
+    /// Merge consists of two parts: assignment and execution. We add merge to
+    /// merge list on execution, but checking merge list during merge
+    /// assignment. This lead to the logical race condition (we can assign more
+    /// merges with TTL than allowed). So we "book" merge with ttl during
+    /// assignment, and remove from list after merge execution.
+    ///
+    /// NOTE: Not important for replicated merge tree, we check count of merges twice:
+    /// in assignment and in queue before execution.
+    void bookMergeWithTTL()
+    {
+        ++merges_with_ttl_counter;
+    }
+
+    size_t getMergesWithTTLCount() const
     {
         return merges_with_ttl_counter;
     }
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index 276ac10aeaf..d1a2f85eceb 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -3955,7 +3955,7 @@ NamesAndTypesList MergeTreeData::getVirtuals() const
 
 size_t MergeTreeData::getTotalMergesWithTTLInMergeList() const
 {
-    return global_context.getMergeList().getExecutingMergesWithTTLCount();
+    return global_context.getMergeList().getMergesWithTTLCount();
 }
 
 void MergeTreeData::addPartContributionToDataVolume(const DataPartPtr & part)
diff --git a/src/Storages/StorageMergeTree.cpp b/src/Storages/StorageMergeTree.cpp
index 070e6eb0483..9fca8c49e81 100644
--- a/src/Storages/StorageMergeTree.cpp
+++ b/src/Storages/StorageMergeTree.cpp
@@ -732,6 +732,10 @@ std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::se
         return {};
     }
 
+    /// 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();
+
     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{});
 }
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index 70e90e9706a..4eb7d7ebccd 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -1490,7 +1490,12 @@ bool StorageReplicatedMergeTree::tryExecuteMerge(const LogEntry & entry)
     future_merged_part.updatePath(*this, reserved_space);
     future_merged_part.merge_type = entry.merge_type;
 
+    /// Account TTL merge
+    if (isTTLMergeType(future_merged_part.merge_type))
+        global_context.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);
 
     Transaction transaction(*this);

From 79cc2e4c1c747197732e6177a2cd52965d4f5534 Mon Sep 17 00:00:00 2001
From: Vitaliy Zakaznikov <vzakaznikov@protonmail.com>
Date: Wed, 27 Jan 2021 08:20:44 -0500
Subject: [PATCH 519/611] Updating AES encryption SRS. Adding test for
 LowCardinality(FixedString(N)) data type for plaintext.

---
 .../requirements/requirements.md              | 280 ++++---
 .../requirements/requirements.py              | 734 ++++++++++--------
 .../testflows/aes_encryption/tests/common.py  |   1 +
 .../testflows/aes_encryption/tests/encrypt.py |   2 +-
 .../aes_encryption/tests/encrypt_mysql.py     |   2 +-
 .../snapshots/encrypt.py.encrypt.snapshot     |  66 ++
 .../encrypt_mysql.py.encrypt_mysql.snapshot   |  66 ++
 7 files changed, 687 insertions(+), 464 deletions(-)

diff --git a/tests/testflows/aes_encryption/requirements/requirements.md b/tests/testflows/aes_encryption/requirements/requirements.md
index e5052357469..4621a15af9d 100644
--- a/tests/testflows/aes_encryption/requirements/requirements.md
+++ b/tests/testflows/aes_encryption/requirements/requirements.md
@@ -6,102 +6,113 @@
 * 1 [Revision History](#revision-history)
 * 2 [Introduction](#introduction)
 * 3 [Terminology](#terminology)
+  * 3.1 [AES](#aes)
+  * 3.2 [AEAD](#aead)
 * 4 [Requirements](#requirements)
   * 4.1 [Generic](#generic)
     * 4.1.1 [RQ.SRS008.AES.Functions](#rqsrs008aesfunctions)
-    * 4.1.2 [RQ.SRS008.AES.Functions.Compatability.MySQL](#rqsrs008aesfunctionscompatabilitymysql)
-    * 4.1.3 [RQ.SRS008.AES.Functions.Compatability.Dictionaries](#rqsrs008aesfunctionscompatabilitydictionaries)
-    * 4.1.4 [RQ.SRS008.AES.Functions.Compatability.Engine.Database.MySQL](#rqsrs008aesfunctionscompatabilityenginedatabasemysql)
-    * 4.1.5 [RQ.SRS008.AES.Functions.Compatability.Engine.Table.MySQL](#rqsrs008aesfunctionscompatabilityenginetablemysql)
-    * 4.1.6 [RQ.SRS008.AES.Functions.Compatability.TableFunction.MySQL](#rqsrs008aesfunctionscompatabilitytablefunctionmysql)
-    * 4.1.7 [RQ.SRS008.AES.Functions.DifferentModes](#rqsrs008aesfunctionsdifferentmodes)
-    * 4.1.8 [RQ.SRS008.AES.Functions.DataFromMultipleSources](#rqsrs008aesfunctionsdatafrommultiplesources)
-    * 4.1.9 [RQ.SRS008.AES.Functions.SuppressOutputOfSensitiveValues](#rqsrs008aesfunctionssuppressoutputofsensitivevalues)
-    * 4.1.10 [RQ.SRS008.AES.Functions.InvalidParameters](#rqsrs008aesfunctionsinvalidparameters)
-    * 4.1.11 [RQ.SRS008.AES.Functions.Mismatched.Key](#rqsrs008aesfunctionsmismatchedkey)
-    * 4.1.12 [RQ.SRS008.AES.Functions.Mismatched.IV](#rqsrs008aesfunctionsmismatchediv)
-    * 4.1.13 [RQ.SRS008.AES.Functions.Mismatched.AAD](#rqsrs008aesfunctionsmismatchedaad)
-    * 4.1.14 [RQ.SRS008.AES.Functions.Mismatched.Mode](#rqsrs008aesfunctionsmismatchedmode)
-    * 4.1.15 [RQ.SRS008.AES.Functions.Check.Performance](#rqsrs008aesfunctionscheckperformance)
-    * 4.1.16 [RQ.SRS008.AES.Function.Check.Performance.BestCase](#rqsrs008aesfunctioncheckperformancebestcase)
-    * 4.1.17 [RQ.SRS008.AES.Function.Check.Performance.WorstCase](#rqsrs008aesfunctioncheckperformanceworstcase)
-    * 4.1.18 [RQ.SRS008.AES.Functions.Check.Compression](#rqsrs008aesfunctionscheckcompression)
-    * 4.1.19 [RQ.SRS008.AES.Functions.Check.Compression.LowCardinality](#rqsrs008aesfunctionscheckcompressionlowcardinality)
-  * 4.2 [Specific](#specific)
-    * 4.2.1 [RQ.SRS008.AES.Encrypt.Function](#rqsrs008aesencryptfunction)
-    * 4.2.2 [RQ.SRS008.AES.Encrypt.Function.Syntax](#rqsrs008aesencryptfunctionsyntax)
-    * 4.2.3 [RQ.SRS008.AES.Encrypt.Function.NIST.TestVectors](#rqsrs008aesencryptfunctionnisttestvectors)
-    * 4.2.4 [RQ.SRS008.AES.Encrypt.Function.Parameters.PlainText](#rqsrs008aesencryptfunctionparametersplaintext)
-    * 4.2.5 [RQ.SRS008.AES.Encrypt.Function.Parameters.Key](#rqsrs008aesencryptfunctionparameterskey)
-    * 4.2.6 [RQ.SRS008.AES.Encrypt.Function.Parameters.Mode](#rqsrs008aesencryptfunctionparametersmode)
-    * 4.2.7 [RQ.SRS008.AES.Encrypt.Function.Parameters.Mode.ValuesFormat](#rqsrs008aesencryptfunctionparametersmodevaluesformat)
-    * 4.2.8 [RQ.SRS008.AES.Encrypt.Function.Parameters.Mode.Value.Invalid](#rqsrs008aesencryptfunctionparametersmodevalueinvalid)
-    * 4.2.9 [RQ.SRS008.AES.Encrypt.Function.Parameters.Mode.Values](#rqsrs008aesencryptfunctionparametersmodevalues)
-    * 4.2.10 [RQ.SRS008.AES.Encrypt.Function.Parameters.InitializationVector](#rqsrs008aesencryptfunctionparametersinitializationvector)
-    * 4.2.11 [RQ.SRS008.AES.Encrypt.Function.Parameters.AdditionalAuthenticatedData](#rqsrs008aesencryptfunctionparametersadditionalauthenticateddata)
-    * 4.2.12 [RQ.SRS008.AES.Encrypt.Function.Parameters.ReturnValue](#rqsrs008aesencryptfunctionparametersreturnvalue)
-    * 4.2.13 [RQ.SRS008.AES.Encrypt.Function.Key.Length.InvalidLengthError](#rqsrs008aesencryptfunctionkeylengthinvalidlengtherror)
-    * 4.2.14 [RQ.SRS008.AES.Encrypt.Function.InitializationVector.Length.InvalidLengthError](#rqsrs008aesencryptfunctioninitializationvectorlengthinvalidlengtherror)
-    * 4.2.15 [RQ.SRS008.AES.Encrypt.Function.InitializationVector.NotValidForMode](#rqsrs008aesencryptfunctioninitializationvectornotvalidformode)
-    * 4.2.16 [RQ.SRS008.AES.Encrypt.Function.AdditionalAuthenticationData.NotValidForMode](#rqsrs008aesencryptfunctionadditionalauthenticationdatanotvalidformode)
-    * 4.2.17 [RQ.SRS008.AES.Encrypt.Function.AdditionalAuthenticationData.Length](#rqsrs008aesencryptfunctionadditionalauthenticationdatalength)
-    * 4.2.18 [RQ.SRS008.AES.Encrypt.Function.NonGCMMode.KeyAndInitializationVector.Length](#rqsrs008aesencryptfunctionnongcmmodekeyandinitializationvectorlength)
-    * 4.2.19 [RQ.SRS008.AES.Encrypt.Function.GCMMode.KeyAndInitializationVector.Length](#rqsrs008aesencryptfunctiongcmmodekeyandinitializationvectorlength)
-    * 4.2.20 [RQ.SRS008.AES.Decrypt.Function](#rqsrs008aesdecryptfunction)
-    * 4.2.21 [RQ.SRS008.AES.Decrypt.Function.Syntax](#rqsrs008aesdecryptfunctionsyntax)
-    * 4.2.22 [RQ.SRS008.AES.Decrypt.Function.Parameters.CipherText](#rqsrs008aesdecryptfunctionparametersciphertext)
-    * 4.2.23 [RQ.SRS008.AES.Decrypt.Function.Parameters.Key](#rqsrs008aesdecryptfunctionparameterskey)
-    * 4.2.24 [RQ.SRS008.AES.Decrypt.Function.Parameters.Mode](#rqsrs008aesdecryptfunctionparametersmode)
-    * 4.2.25 [RQ.SRS008.AES.Decrypt.Function.Parameters.Mode.ValuesFormat](#rqsrs008aesdecryptfunctionparametersmodevaluesformat)
-    * 4.2.26 [RQ.SRS008.AES.Decrypt.Function.Parameters.Mode.Value.Invalid](#rqsrs008aesdecryptfunctionparametersmodevalueinvalid)
-    * 4.2.27 [RQ.SRS008.AES.Decrypt.Function.Parameters.Mode.Values](#rqsrs008aesdecryptfunctionparametersmodevalues)
-    * 4.2.28 [RQ.SRS008.AES.Decrypt.Function.Parameters.InitializationVector](#rqsrs008aesdecryptfunctionparametersinitializationvector)
-    * 4.2.29 [RQ.SRS008.AES.Decrypt.Function.Parameters.AdditionalAuthenticatedData](#rqsrs008aesdecryptfunctionparametersadditionalauthenticateddata)
-    * 4.2.30 [RQ.SRS008.AES.Decrypt.Function.Parameters.ReturnValue](#rqsrs008aesdecryptfunctionparametersreturnvalue)
-    * 4.2.31 [RQ.SRS008.AES.Decrypt.Function.Key.Length.InvalidLengthError](#rqsrs008aesdecryptfunctionkeylengthinvalidlengtherror)
-    * 4.2.32 [RQ.SRS008.AES.Decrypt.Function.InitializationVector.Length.InvalidLengthError](#rqsrs008aesdecryptfunctioninitializationvectorlengthinvalidlengtherror)
-    * 4.2.33 [RQ.SRS008.AES.Decrypt.Function.InitializationVector.NotValidForMode](#rqsrs008aesdecryptfunctioninitializationvectornotvalidformode)
-    * 4.2.34 [RQ.SRS008.AES.Decrypt.Function.AdditionalAuthenticationData.NotValidForMode](#rqsrs008aesdecryptfunctionadditionalauthenticationdatanotvalidformode)
-    * 4.2.35 [RQ.SRS008.AES.Decrypt.Function.AdditionalAuthenticationData.Length](#rqsrs008aesdecryptfunctionadditionalauthenticationdatalength)
-    * 4.2.36 [RQ.SRS008.AES.Decrypt.Function.NonGCMMode.KeyAndInitializationVector.Length](#rqsrs008aesdecryptfunctionnongcmmodekeyandinitializationvectorlength)
-    * 4.2.37 [RQ.SRS008.AES.Decrypt.Function.GCMMode.KeyAndInitializationVector.Length](#rqsrs008aesdecryptfunctiongcmmodekeyandinitializationvectorlength)
-  * 4.3 [MySQL Specific Functions](#mysql-specific-functions)
-    * 4.3.1 [RQ.SRS008.AES.MySQL.Encrypt.Function](#rqsrs008aesmysqlencryptfunction)
-    * 4.3.2 [RQ.SRS008.AES.MySQL.Encrypt.Function.Syntax](#rqsrs008aesmysqlencryptfunctionsyntax)
-    * 4.3.3 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.PlainText](#rqsrs008aesmysqlencryptfunctionparametersplaintext)
-    * 4.3.4 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Key](#rqsrs008aesmysqlencryptfunctionparameterskey)
-    * 4.3.5 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode](#rqsrs008aesmysqlencryptfunctionparametersmode)
-    * 4.3.6 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.ValuesFormat](#rqsrs008aesmysqlencryptfunctionparametersmodevaluesformat)
-    * 4.3.7 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Value.Invalid](#rqsrs008aesmysqlencryptfunctionparametersmodevalueinvalid)
-    * 4.3.8 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Values](#rqsrs008aesmysqlencryptfunctionparametersmodevalues)
-    * 4.3.9 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Values.GCM.Error](#rqsrs008aesmysqlencryptfunctionparametersmodevaluesgcmerror)
-    * 4.3.10 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Values.CTR.Error](#rqsrs008aesmysqlencryptfunctionparametersmodevaluesctrerror)
-    * 4.3.11 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.InitializationVector](#rqsrs008aesmysqlencryptfunctionparametersinitializationvector)
-    * 4.3.12 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.ReturnValue](#rqsrs008aesmysqlencryptfunctionparametersreturnvalue)
-    * 4.3.13 [RQ.SRS008.AES.MySQL.Encrypt.Function.Key.Length.TooShortError](#rqsrs008aesmysqlencryptfunctionkeylengthtooshorterror)
-    * 4.3.14 [RQ.SRS008.AES.MySQL.Encrypt.Function.Key.Length.TooLong](#rqsrs008aesmysqlencryptfunctionkeylengthtoolong)
-    * 4.3.15 [RQ.SRS008.AES.MySQL.Encrypt.Function.InitializationVector.Length.TooShortError](#rqsrs008aesmysqlencryptfunctioninitializationvectorlengthtooshorterror)
-    * 4.3.16 [RQ.SRS008.AES.MySQL.Encrypt.Function.InitializationVector.Length.TooLong](#rqsrs008aesmysqlencryptfunctioninitializationvectorlengthtoolong)
-    * 4.3.17 [RQ.SRS008.AES.MySQL.Encrypt.Function.InitializationVector.NotValidForMode](#rqsrs008aesmysqlencryptfunctioninitializationvectornotvalidformode)
-    * 4.3.18 [RQ.SRS008.AES.MySQL.Encrypt.Function.Mode.KeyAndInitializationVector.Length](#rqsrs008aesmysqlencryptfunctionmodekeyandinitializationvectorlength)
-    * 4.3.19 [RQ.SRS008.AES.MySQL.Decrypt.Function](#rqsrs008aesmysqldecryptfunction)
-    * 4.3.20 [RQ.SRS008.AES.MySQL.Decrypt.Function.Syntax](#rqsrs008aesmysqldecryptfunctionsyntax)
-    * 4.3.21 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.CipherText](#rqsrs008aesmysqldecryptfunctionparametersciphertext)
-    * 4.3.22 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Key](#rqsrs008aesmysqldecryptfunctionparameterskey)
-    * 4.3.23 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode](#rqsrs008aesmysqldecryptfunctionparametersmode)
-    * 4.3.24 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.ValuesFormat](#rqsrs008aesmysqldecryptfunctionparametersmodevaluesformat)
-    * 4.3.25 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Value.Invalid](#rqsrs008aesmysqldecryptfunctionparametersmodevalueinvalid)
-    * 4.3.26 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Values](#rqsrs008aesmysqldecryptfunctionparametersmodevalues)
-    * 4.3.27 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Values.GCM.Error](#rqsrs008aesmysqldecryptfunctionparametersmodevaluesgcmerror)
-    * 4.3.28 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Values.CTR.Error](#rqsrs008aesmysqldecryptfunctionparametersmodevaluesctrerror)
-    * 4.3.29 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.InitializationVector](#rqsrs008aesmysqldecryptfunctionparametersinitializationvector)
-    * 4.3.30 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.ReturnValue](#rqsrs008aesmysqldecryptfunctionparametersreturnvalue)
-    * 4.3.31 [RQ.SRS008.AES.MySQL.Decrypt.Function.Key.Length.TooShortError](#rqsrs008aesmysqldecryptfunctionkeylengthtooshorterror)
-    * 4.3.32 [RQ.SRS008.AES.MySQL.Decrypt.Function.Key.Length.TooLong](#rqsrs008aesmysqldecryptfunctionkeylengthtoolong)
-    * 4.3.33 [RQ.SRS008.AES.MySQL.Decrypt.Function.InitializationVector.Length.TooShortError](#rqsrs008aesmysqldecryptfunctioninitializationvectorlengthtooshorterror)
-    * 4.3.34 [RQ.SRS008.AES.MySQL.Decrypt.Function.InitializationVector.Length.TooLong](#rqsrs008aesmysqldecryptfunctioninitializationvectorlengthtoolong)
-    * 4.3.35 [RQ.SRS008.AES.MySQL.Decrypt.Function.InitializationVector.NotValidForMode](#rqsrs008aesmysqldecryptfunctioninitializationvectornotvalidformode)
-    * 4.3.36 [RQ.SRS008.AES.MySQL.Decrypt.Function.Mode.KeyAndInitializationVector.Length](#rqsrs008aesmysqldecryptfunctionmodekeyandinitializationvectorlength)
+  * 4.2 [Compatibility](#compatibility)
+    * 4.2.1 [RQ.SRS008.AES.Functions.Compatibility.MySQL](#rqsrs008aesfunctionscompatibilitymysql)
+    * 4.2.2 [RQ.SRS008.AES.Functions.Compatibility.Dictionaries](#rqsrs008aesfunctionscompatibilitydictionaries)
+    * 4.2.3 [RQ.SRS008.AES.Functions.Compatibility.Engine.Database.MySQL](#rqsrs008aesfunctionscompatibilityenginedatabasemysql)
+    * 4.2.4 [RQ.SRS008.AES.Functions.Compatibility.Engine.Table.MySQL](#rqsrs008aesfunctionscompatibilityenginetablemysql)
+    * 4.2.5 [RQ.SRS008.AES.Functions.Compatibility.TableFunction.MySQL](#rqsrs008aesfunctionscompatibilitytablefunctionmysql)
+  * 4.3 [Different Modes](#different-modes)
+    * 4.3.1 [RQ.SRS008.AES.Functions.DifferentModes](#rqsrs008aesfunctionsdifferentmodes)
+  * 4.4 [Multiple Sources](#multiple-sources)
+    * 4.4.1 [RQ.SRS008.AES.Functions.DataFromMultipleSources](#rqsrs008aesfunctionsdatafrommultiplesources)
+  * 4.5 [Suppressing Sensitive Values](#suppressing-sensitive-values)
+    * 4.5.1 [RQ.SRS008.AES.Functions.SuppressOutputOfSensitiveValues](#rqsrs008aesfunctionssuppressoutputofsensitivevalues)
+  * 4.6 [Invalid Parameters](#invalid-parameters)
+    * 4.6.1 [RQ.SRS008.AES.Functions.InvalidParameters](#rqsrs008aesfunctionsinvalidparameters)
+  * 4.7 [Mismatched Values](#mismatched-values)
+    * 4.7.1 [RQ.SRS008.AES.Functions.Mismatched.Key](#rqsrs008aesfunctionsmismatchedkey)
+    * 4.7.2 [RQ.SRS008.AES.Functions.Mismatched.IV](#rqsrs008aesfunctionsmismatchediv)
+    * 4.7.3 [RQ.SRS008.AES.Functions.Mismatched.AAD](#rqsrs008aesfunctionsmismatchedaad)
+    * 4.7.4 [RQ.SRS008.AES.Functions.Mismatched.Mode](#rqsrs008aesfunctionsmismatchedmode)
+  * 4.8 [Performance](#performance)
+    * 4.8.1 [RQ.SRS008.AES.Functions.Check.Performance](#rqsrs008aesfunctionscheckperformance)
+    * 4.8.2 [RQ.SRS008.AES.Function.Check.Performance.BestCase](#rqsrs008aesfunctioncheckperformancebestcase)
+    * 4.8.3 [RQ.SRS008.AES.Function.Check.Performance.WorstCase](#rqsrs008aesfunctioncheckperformanceworstcase)
+    * 4.8.4 [RQ.SRS008.AES.Functions.Check.Compression](#rqsrs008aesfunctionscheckcompression)
+    * 4.8.5 [RQ.SRS008.AES.Functions.Check.Compression.LowCardinality](#rqsrs008aesfunctionscheckcompressionlowcardinality)
+  * 4.9 [Encrypt Function](#encrypt-function)
+    * 4.9.1 [RQ.SRS008.AES.Encrypt.Function](#rqsrs008aesencryptfunction)
+    * 4.9.2 [RQ.SRS008.AES.Encrypt.Function.Syntax](#rqsrs008aesencryptfunctionsyntax)
+    * 4.9.3 [RQ.SRS008.AES.Encrypt.Function.NIST.TestVectors](#rqsrs008aesencryptfunctionnisttestvectors)
+    * 4.9.4 [RQ.SRS008.AES.Encrypt.Function.Parameters.PlainText](#rqsrs008aesencryptfunctionparametersplaintext)
+    * 4.9.5 [RQ.SRS008.AES.Encrypt.Function.Parameters.Key](#rqsrs008aesencryptfunctionparameterskey)
+    * 4.9.6 [RQ.SRS008.AES.Encrypt.Function.Parameters.Mode](#rqsrs008aesencryptfunctionparametersmode)
+    * 4.9.7 [RQ.SRS008.AES.Encrypt.Function.Parameters.Mode.ValuesFormat](#rqsrs008aesencryptfunctionparametersmodevaluesformat)
+    * 4.9.8 [RQ.SRS008.AES.Encrypt.Function.Parameters.Mode.Value.Invalid](#rqsrs008aesencryptfunctionparametersmodevalueinvalid)
+    * 4.9.9 [RQ.SRS008.AES.Encrypt.Function.Parameters.Mode.Values](#rqsrs008aesencryptfunctionparametersmodevalues)
+    * 4.9.10 [RQ.SRS008.AES.Encrypt.Function.Parameters.InitializationVector](#rqsrs008aesencryptfunctionparametersinitializationvector)
+    * 4.9.11 [RQ.SRS008.AES.Encrypt.Function.Parameters.AdditionalAuthenticatedData](#rqsrs008aesencryptfunctionparametersadditionalauthenticateddata)
+    * 4.9.12 [RQ.SRS008.AES.Encrypt.Function.Parameters.ReturnValue](#rqsrs008aesencryptfunctionparametersreturnvalue)
+    * 4.9.13 [RQ.SRS008.AES.Encrypt.Function.Key.Length.InvalidLengthError](#rqsrs008aesencryptfunctionkeylengthinvalidlengtherror)
+    * 4.9.14 [RQ.SRS008.AES.Encrypt.Function.InitializationVector.Length.InvalidLengthError](#rqsrs008aesencryptfunctioninitializationvectorlengthinvalidlengtherror)
+    * 4.9.15 [RQ.SRS008.AES.Encrypt.Function.InitializationVector.NotValidForMode](#rqsrs008aesencryptfunctioninitializationvectornotvalidformode)
+    * 4.9.16 [RQ.SRS008.AES.Encrypt.Function.AdditionalAuthenticationData.NotValidForMode](#rqsrs008aesencryptfunctionadditionalauthenticationdatanotvalidformode)
+    * 4.9.17 [RQ.SRS008.AES.Encrypt.Function.AdditionalAuthenticationData.Length](#rqsrs008aesencryptfunctionadditionalauthenticationdatalength)
+    * 4.9.18 [RQ.SRS008.AES.Encrypt.Function.NonGCMMode.KeyAndInitializationVector.Length](#rqsrs008aesencryptfunctionnongcmmodekeyandinitializationvectorlength)
+    * 4.9.19 [RQ.SRS008.AES.Encrypt.Function.GCMMode.KeyAndInitializationVector.Length](#rqsrs008aesencryptfunctiongcmmodekeyandinitializationvectorlength)
+  * 4.10 [Decrypt Function](#decrypt-function)
+    * 4.10.1 [RQ.SRS008.AES.Decrypt.Function](#rqsrs008aesdecryptfunction)
+    * 4.10.2 [RQ.SRS008.AES.Decrypt.Function.Syntax](#rqsrs008aesdecryptfunctionsyntax)
+    * 4.10.3 [RQ.SRS008.AES.Decrypt.Function.Parameters.CipherText](#rqsrs008aesdecryptfunctionparametersciphertext)
+    * 4.10.4 [RQ.SRS008.AES.Decrypt.Function.Parameters.Key](#rqsrs008aesdecryptfunctionparameterskey)
+    * 4.10.5 [RQ.SRS008.AES.Decrypt.Function.Parameters.Mode](#rqsrs008aesdecryptfunctionparametersmode)
+    * 4.10.6 [RQ.SRS008.AES.Decrypt.Function.Parameters.Mode.ValuesFormat](#rqsrs008aesdecryptfunctionparametersmodevaluesformat)
+    * 4.10.7 [RQ.SRS008.AES.Decrypt.Function.Parameters.Mode.Value.Invalid](#rqsrs008aesdecryptfunctionparametersmodevalueinvalid)
+    * 4.10.8 [RQ.SRS008.AES.Decrypt.Function.Parameters.Mode.Values](#rqsrs008aesdecryptfunctionparametersmodevalues)
+    * 4.10.9 [RQ.SRS008.AES.Decrypt.Function.Parameters.InitializationVector](#rqsrs008aesdecryptfunctionparametersinitializationvector)
+    * 4.10.10 [RQ.SRS008.AES.Decrypt.Function.Parameters.AdditionalAuthenticatedData](#rqsrs008aesdecryptfunctionparametersadditionalauthenticateddata)
+    * 4.10.11 [RQ.SRS008.AES.Decrypt.Function.Parameters.ReturnValue](#rqsrs008aesdecryptfunctionparametersreturnvalue)
+    * 4.10.12 [RQ.SRS008.AES.Decrypt.Function.Key.Length.InvalidLengthError](#rqsrs008aesdecryptfunctionkeylengthinvalidlengtherror)
+    * 4.10.13 [RQ.SRS008.AES.Decrypt.Function.InitializationVector.Length.InvalidLengthError](#rqsrs008aesdecryptfunctioninitializationvectorlengthinvalidlengtherror)
+    * 4.10.14 [RQ.SRS008.AES.Decrypt.Function.InitializationVector.NotValidForMode](#rqsrs008aesdecryptfunctioninitializationvectornotvalidformode)
+    * 4.10.15 [RQ.SRS008.AES.Decrypt.Function.AdditionalAuthenticationData.NotValidForMode](#rqsrs008aesdecryptfunctionadditionalauthenticationdatanotvalidformode)
+    * 4.10.16 [RQ.SRS008.AES.Decrypt.Function.AdditionalAuthenticationData.Length](#rqsrs008aesdecryptfunctionadditionalauthenticationdatalength)
+    * 4.10.17 [RQ.SRS008.AES.Decrypt.Function.NonGCMMode.KeyAndInitializationVector.Length](#rqsrs008aesdecryptfunctionnongcmmodekeyandinitializationvectorlength)
+    * 4.10.18 [RQ.SRS008.AES.Decrypt.Function.GCMMode.KeyAndInitializationVector.Length](#rqsrs008aesdecryptfunctiongcmmodekeyandinitializationvectorlength)
+  * 4.11 [MySQL Encrypt Function](#mysql-encrypt-function)
+    * 4.11.1 [RQ.SRS008.AES.MySQL.Encrypt.Function](#rqsrs008aesmysqlencryptfunction)
+    * 4.11.2 [RQ.SRS008.AES.MySQL.Encrypt.Function.Syntax](#rqsrs008aesmysqlencryptfunctionsyntax)
+    * 4.11.3 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.PlainText](#rqsrs008aesmysqlencryptfunctionparametersplaintext)
+    * 4.11.4 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Key](#rqsrs008aesmysqlencryptfunctionparameterskey)
+    * 4.11.5 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode](#rqsrs008aesmysqlencryptfunctionparametersmode)
+    * 4.11.6 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.ValuesFormat](#rqsrs008aesmysqlencryptfunctionparametersmodevaluesformat)
+    * 4.11.7 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Value.Invalid](#rqsrs008aesmysqlencryptfunctionparametersmodevalueinvalid)
+    * 4.11.8 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Values](#rqsrs008aesmysqlencryptfunctionparametersmodevalues)
+    * 4.11.9 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Values.GCM.Error](#rqsrs008aesmysqlencryptfunctionparametersmodevaluesgcmerror)
+    * 4.11.10 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Values.CTR.Error](#rqsrs008aesmysqlencryptfunctionparametersmodevaluesctrerror)
+    * 4.11.11 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.InitializationVector](#rqsrs008aesmysqlencryptfunctionparametersinitializationvector)
+    * 4.11.12 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.ReturnValue](#rqsrs008aesmysqlencryptfunctionparametersreturnvalue)
+    * 4.11.13 [RQ.SRS008.AES.MySQL.Encrypt.Function.Key.Length.TooShortError](#rqsrs008aesmysqlencryptfunctionkeylengthtooshorterror)
+    * 4.11.14 [RQ.SRS008.AES.MySQL.Encrypt.Function.Key.Length.TooLong](#rqsrs008aesmysqlencryptfunctionkeylengthtoolong)
+    * 4.11.15 [RQ.SRS008.AES.MySQL.Encrypt.Function.InitializationVector.Length.TooShortError](#rqsrs008aesmysqlencryptfunctioninitializationvectorlengthtooshorterror)
+    * 4.11.16 [RQ.SRS008.AES.MySQL.Encrypt.Function.InitializationVector.Length.TooLong](#rqsrs008aesmysqlencryptfunctioninitializationvectorlengthtoolong)
+    * 4.11.17 [RQ.SRS008.AES.MySQL.Encrypt.Function.InitializationVector.NotValidForMode](#rqsrs008aesmysqlencryptfunctioninitializationvectornotvalidformode)
+    * 4.11.18 [RQ.SRS008.AES.MySQL.Encrypt.Function.Mode.KeyAndInitializationVector.Length](#rqsrs008aesmysqlencryptfunctionmodekeyandinitializationvectorlength)
+  * 4.12 [MySQL Decrypt Function](#mysql-decrypt-function)
+    * 4.12.1 [RQ.SRS008.AES.MySQL.Decrypt.Function](#rqsrs008aesmysqldecryptfunction)
+    * 4.12.2 [RQ.SRS008.AES.MySQL.Decrypt.Function.Syntax](#rqsrs008aesmysqldecryptfunctionsyntax)
+    * 4.12.3 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.CipherText](#rqsrs008aesmysqldecryptfunctionparametersciphertext)
+    * 4.12.4 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Key](#rqsrs008aesmysqldecryptfunctionparameterskey)
+    * 4.12.5 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode](#rqsrs008aesmysqldecryptfunctionparametersmode)
+    * 4.12.6 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.ValuesFormat](#rqsrs008aesmysqldecryptfunctionparametersmodevaluesformat)
+    * 4.12.7 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Value.Invalid](#rqsrs008aesmysqldecryptfunctionparametersmodevalueinvalid)
+    * 4.12.8 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Values](#rqsrs008aesmysqldecryptfunctionparametersmodevalues)
+    * 4.12.9 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Values.GCM.Error](#rqsrs008aesmysqldecryptfunctionparametersmodevaluesgcmerror)
+    * 4.12.10 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Values.CTR.Error](#rqsrs008aesmysqldecryptfunctionparametersmodevaluesctrerror)
+    * 4.12.11 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.InitializationVector](#rqsrs008aesmysqldecryptfunctionparametersinitializationvector)
+    * 4.12.12 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.ReturnValue](#rqsrs008aesmysqldecryptfunctionparametersreturnvalue)
+    * 4.12.13 [RQ.SRS008.AES.MySQL.Decrypt.Function.Key.Length.TooShortError](#rqsrs008aesmysqldecryptfunctionkeylengthtooshorterror)
+    * 4.12.14 [RQ.SRS008.AES.MySQL.Decrypt.Function.Key.Length.TooLong](#rqsrs008aesmysqldecryptfunctionkeylengthtoolong)
+    * 4.12.15 [RQ.SRS008.AES.MySQL.Decrypt.Function.InitializationVector.Length.TooShortError](#rqsrs008aesmysqldecryptfunctioninitializationvectorlengthtooshorterror)
+    * 4.12.16 [RQ.SRS008.AES.MySQL.Decrypt.Function.InitializationVector.Length.TooLong](#rqsrs008aesmysqldecryptfunctioninitializationvectorlengthtoolong)
+    * 4.12.17 [RQ.SRS008.AES.MySQL.Decrypt.Function.InitializationVector.NotValidForMode](#rqsrs008aesmysqldecryptfunctioninitializationvectornotvalidformode)
+    * 4.12.18 [RQ.SRS008.AES.MySQL.Decrypt.Function.Mode.KeyAndInitializationVector.Length](#rqsrs008aesmysqldecryptfunctionmodekeyandinitializationvectorlength)
 * 5 [References](#references)
 
 ## Revision History
@@ -122,9 +133,14 @@ accessed on remote [MySQL] servers via [MySQL Dictionary] or [MySQL Database Eng
 
 ## Terminology
 
-* **AES** -
+### AES
+
   Advanced Encryption Standard ([AES])
 
+### AEAD
+
+  Authenticated Encryption with Associated Data
+
 ## Requirements
 
 ### Generic
@@ -134,38 +150,44 @@ version: 1.0
 
 [ClickHouse] SHALL support [AES] encryption functions to encrypt and decrypt data.
 
-#### RQ.SRS008.AES.Functions.Compatability.MySQL
+### Compatibility
+
+#### RQ.SRS008.AES.Functions.Compatibility.MySQL
 version: 1.0
 
 [ClickHouse] SHALL support [AES] encryption functions compatible with [MySQL 5.7].
 
-#### RQ.SRS008.AES.Functions.Compatability.Dictionaries
+#### RQ.SRS008.AES.Functions.Compatibility.Dictionaries
 version: 1.0
 
 [ClickHouse] SHALL support encryption and decryption of data accessed on remote
 [MySQL] servers using [MySQL Dictionary].
 
-#### RQ.SRS008.AES.Functions.Compatability.Engine.Database.MySQL
+#### RQ.SRS008.AES.Functions.Compatibility.Engine.Database.MySQL
 version: 1.0
 
 [ClickHouse] SHALL support encryption and decryption of data accessed using [MySQL Database Engine],
 
-#### RQ.SRS008.AES.Functions.Compatability.Engine.Table.MySQL
+#### RQ.SRS008.AES.Functions.Compatibility.Engine.Table.MySQL
 version: 1.0
 
 [ClickHouse] SHALL support encryption and decryption of data accessed using [MySQL Table Engine].
 
-#### RQ.SRS008.AES.Functions.Compatability.TableFunction.MySQL
+#### RQ.SRS008.AES.Functions.Compatibility.TableFunction.MySQL
 version: 1.0
 
 [ClickHouse] SHALL support encryption and decryption of data accessed using [MySQL Table Function].
 
+### Different Modes
+
 #### RQ.SRS008.AES.Functions.DifferentModes
 version: 1.0
 
 [ClickHouse] SHALL allow different modes to be supported in a single SQL statement
 using explicit function parameters.
 
+### Multiple Sources
+
 #### RQ.SRS008.AES.Functions.DataFromMultipleSources
 version: 1.0
 
@@ -174,17 +196,23 @@ in the `SELECT` statement, including [ClickHouse] [MergeTree] table as well as [
 [MySQL Database Engine], [MySQL Table Engine], and [MySQL Table Function]
 with possibly different encryption schemes.
 
+### Suppressing Sensitive Values
+
 #### RQ.SRS008.AES.Functions.SuppressOutputOfSensitiveValues
 version: 1.0
 
 [ClickHouse] SHALL suppress output of [AES] `string` and `key` parameters to the system log,
 error log, and `query_log` table to prevent leakage of sensitive values.
 
+### Invalid Parameters
+
 #### RQ.SRS008.AES.Functions.InvalidParameters
 version: 1.0
 
 [ClickHouse] SHALL return an error when parameters are invalid.
 
+### Mismatched Values
+
 #### RQ.SRS008.AES.Functions.Mismatched.Key
 version: 1.0
 
@@ -205,6 +233,8 @@ version: 1.0
 
 [ClickHouse] SHALL return an error or garbage for mismatched mode.
 
+### Performance
+
 #### RQ.SRS008.AES.Functions.Check.Performance
 version: 1.0
 
@@ -233,7 +263,7 @@ version: 1.0
 Effect of [AES] encryption on the compression of a column with [LowCardinality] data type
 SHALL be measured.
 
-### Specific
+### Encrypt Function
 
 #### RQ.SRS008.AES.Encrypt.Function
 version: 1.0
@@ -255,21 +285,23 @@ version: 1.0
 [ClickHouse] `encrypt` function output SHALL produce output that matches [NIST test vectors].
 
 #### RQ.SRS008.AES.Encrypt.Function.Parameters.PlainText
-version: 1.0
+version: 2.0
+
+[ClickHouse] SHALL support `plaintext` with `String`, `FixedString`, `Nullable(String)`,
+`Nullable(FixedString)`, `LowCardinality(String)`, or `LowCardinality(FixedString(N))` data types as
+the second parameter to the `encrypt` function that SHALL specify the data to be encrypted.
 
-[ClickHouse] SHALL support `plaintext` accepting any data type as
-the first parameter to the `encrypt` function that SHALL specify the data to be encrypted.
 
 #### RQ.SRS008.AES.Encrypt.Function.Parameters.Key
 version: 1.0
 
 [ClickHouse] SHALL support `key` with `String` or `FixedString` data types
-as the second parameter to the `encrypt` function that SHALL specify the encryption key.
+as the  parameter to the `encrypt` function that SHALL specify the encryption key.
 
 #### RQ.SRS008.AES.Encrypt.Function.Parameters.Mode
 version: 1.0
 
-[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the third parameter
+[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the first parameter
 to the `encrypt` function that SHALL specify encryption key length and block encryption mode.
 
 #### RQ.SRS008.AES.Encrypt.Function.Parameters.Mode.ValuesFormat
@@ -308,13 +340,13 @@ of the `encrypt` function:
 * `aes-192-ofb` that SHALL use [OFB] block mode encryption with 192 bit key
 * `aes-256-ofb` that SHALL use [OFB] block mode encryption with 256 bit key
 * `aes-128-gcm` that SHALL use [GCM] block mode encryption with 128 bit key
-   and `AEAD` 16-byte tag is appended to the resulting ciphertext according to
+   and [AEAD] 16-byte tag is appended to the resulting ciphertext according to
    the [RFC5116]
 * `aes-192-gcm` that SHALL use [GCM] block mode encryption with 192 bit key
-   and `AEAD` 16-byte tag is appended to the resulting ciphertext according to
+   and [AEAD] 16-byte tag is appended to the resulting ciphertext according to
    the [RFC5116]
 * `aes-256-gcm` that SHALL use [GCM] block mode encryption with 256 bit key
-   and `AEAD` 16-byte tag is appended to the resulting ciphertext according to
+   and [AEAD] 16-byte tag is appended to the resulting ciphertext according to
    the [RFC5116]
 *  `aes-128-ctr` that SHALL use [CTR] block mode encryption with 128 bit key
 *  `aes-192-ctr` that SHALL use [CTR] block mode encryption with 192 bit key
@@ -403,6 +435,8 @@ when using GCM modes
 * `aes-192-gcm` mode and `key` is not 24 bytes or `iv` is not specified
 * `aes-256-gcm` mode and `key` is not 32 bytes or `iv` is not specified
 
+### Decrypt Function
+
 #### RQ.SRS008.AES.Decrypt.Function
 version: 1.0
 
@@ -421,18 +455,18 @@ decrypt(mode, ciphertext, key, [iv, aad])
 version: 1.0
 
 [ClickHouse] SHALL support `ciphertext` accepting `FixedString` or `String` data types as
-the first parameter to the `decrypt` function that SHALL specify the data to be decrypted.
+the second parameter to the `decrypt` function that SHALL specify the data to be decrypted.
 
 #### RQ.SRS008.AES.Decrypt.Function.Parameters.Key
 version: 1.0
 
 [ClickHouse] SHALL support `key` with `String` or `FixedString` data types
-as the second parameter to the `decrypt` function that SHALL specify the encryption key.
+as the third parameter to the `decrypt` function that SHALL specify the encryption key.
 
 #### RQ.SRS008.AES.Decrypt.Function.Parameters.Mode
 version: 1.0
 
-[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the third parameter
+[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the first parameter
 to the `decrypt` function that SHALL specify encryption key length and block encryption mode.
 
 #### RQ.SRS008.AES.Decrypt.Function.Parameters.Mode.ValuesFormat
@@ -511,7 +545,7 @@ version: 1.0
 #### RQ.SRS008.AES.Decrypt.Function.InitializationVector.Length.InvalidLengthError
 version: 1.0
 
-[ClickHouse] SHALL return an error if the `iv` is speficified and the length is not exact for the `decrypt` function for a given block mode.
+[ClickHouse] SHALL return an error if the `iv` is specified and the length is not exact for the `decrypt` function for a given block mode.
 
 #### RQ.SRS008.AES.Decrypt.Function.InitializationVector.NotValidForMode
 version: 1.0
@@ -568,7 +602,7 @@ when using GCM modes
 * `aes-192-gcm` mode and `key` is not 24 bytes or `iv` is not specified
 * `aes-256-gcm` mode and `key` is not 32 bytes or `iv` is not specified
 
-### MySQL Specific Functions
+### MySQL Encrypt Function
 
 #### RQ.SRS008.AES.MySQL.Encrypt.Function
 version: 1.0
@@ -585,21 +619,22 @@ aes_encrypt_mysql(mode, plaintext, key, [iv])
 ```
 
 #### RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.PlainText
-version: 1.0
+version: 2.0
 
-[ClickHouse] SHALL support `plaintext` accepting any data type as
-the first parameter to the `aes_encrypt_mysql` function that SHALL specify the data to be encrypted.
+[ClickHouse] SHALL support `plaintext` with `String`, `FixedString`, `Nullable(String)`,
+`Nullable(FixedString)`, `LowCardinality(String)`, or `LowCardinality(FixedString(N))` data types as
+the second parameter to the `aes_encrypt_mysql` function that SHALL specify the data to be encrypted.
 
 #### RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Key
 version: 1.0
 
 [ClickHouse] SHALL support `key` with `String` or `FixedString` data types
-as the second parameter to the `aes_encrypt_mysql` function that SHALL specify the encryption key.
+as the third parameter to the `aes_encrypt_mysql` function that SHALL specify the encryption key.
 
 #### RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode
 version: 1.0
 
-[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the third parameter
+[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the first parameter
 to the `aes_encrypt_mysql` function that SHALL specify encryption key length and block encryption mode.
 
 #### RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.ValuesFormat
@@ -734,6 +769,8 @@ version: 1.0
 * `aes-192-ofb` mode and `key` is less than 24 bytes or if specified `iv` is less than 16 bytes
 * `aes-256-ofb` mode and `key` is less than 32 bytes or if specified `iv` is less than 16 bytes
 
+### MySQL Decrypt Function
+
 #### RQ.SRS008.AES.MySQL.Decrypt.Function
 version: 1.0
 
@@ -752,18 +789,18 @@ aes_decrypt_mysql(mode, ciphertext, key, [iv])
 version: 1.0
 
 [ClickHouse] SHALL support `ciphertext` accepting any data type as
-the first parameter to the `aes_decrypt_mysql` function that SHALL specify the data to be decrypted.
+the second parameter to the `aes_decrypt_mysql` function that SHALL specify the data to be decrypted.
 
 #### RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Key
 version: 1.0
 
 [ClickHouse] SHALL support `key` with `String` or `FixedString` data types
-as the second parameter to the `aes_decrypt_mysql` function that SHALL specify the encryption key.
+as the third parameter to the `aes_decrypt_mysql` function that SHALL specify the encryption key.
 
 #### RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode
 version: 1.0
 
-[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the third parameter
+[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the first parameter
 to the `aes_decrypt_mysql` function that SHALL specify encryption key length and block encryption mode.
 
 #### RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.ValuesFormat
@@ -906,6 +943,7 @@ version: 1.0
 * **ClickHouse:** https://clickhouse.tech
 * **Git:** https://git-scm.com/
 
+[AEAD]: #aead
 [OpenSSL]: https://www.openssl.org/
 [LowCardinality]: https://clickhouse.tech/docs/en/sql-reference/data-types/lowcardinality/
 [MergeTree]: https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/mergetree/
diff --git a/tests/testflows/aes_encryption/requirements/requirements.py b/tests/testflows/aes_encryption/requirements/requirements.py
index 47e8d46f446..cf8613ceff6 100644
--- a/tests/testflows/aes_encryption/requirements/requirements.py
+++ b/tests/testflows/aes_encryption/requirements/requirements.py
@@ -1,6 +1,6 @@
 # These requirements were auto generated
 # from software requirements specification (SRS)
-# document by TestFlows v1.6.201216.1172002.
+# document by TestFlows v1.6.210101.1235930.
 # Do not edit by hand but re-generate instead
 # using 'tfs requirements generate' command.
 from testflows.core import Specification
@@ -23,8 +23,8 @@ RQ_SRS008_AES_Functions = Requirement(
     level=3,
     num='4.1.1')
 
-RQ_SRS008_AES_Functions_Compatability_MySQL = Requirement(
-    name='RQ.SRS008.AES.Functions.Compatability.MySQL',
+RQ_SRS008_AES_Functions_Compatibility_MySQL = Requirement(
+    name='RQ.SRS008.AES.Functions.Compatibility.MySQL',
     version='1.0',
     priority=None,
     group=None,
@@ -36,10 +36,10 @@ RQ_SRS008_AES_Functions_Compatability_MySQL = Requirement(
         ),
     link=None,
     level=3,
-    num='4.1.2')
+    num='4.2.1')
 
-RQ_SRS008_AES_Functions_Compatability_Dictionaries = Requirement(
-    name='RQ.SRS008.AES.Functions.Compatability.Dictionaries',
+RQ_SRS008_AES_Functions_Compatibility_Dictionaries = Requirement(
+    name='RQ.SRS008.AES.Functions.Compatibility.Dictionaries',
     version='1.0',
     priority=None,
     group=None,
@@ -52,10 +52,10 @@ RQ_SRS008_AES_Functions_Compatability_Dictionaries = Requirement(
         ),
     link=None,
     level=3,
-    num='4.1.3')
+    num='4.2.2')
 
-RQ_SRS008_AES_Functions_Compatability_Engine_Database_MySQL = Requirement(
-    name='RQ.SRS008.AES.Functions.Compatability.Engine.Database.MySQL',
+RQ_SRS008_AES_Functions_Compatibility_Engine_Database_MySQL = Requirement(
+    name='RQ.SRS008.AES.Functions.Compatibility.Engine.Database.MySQL',
     version='1.0',
     priority=None,
     group=None,
@@ -67,10 +67,10 @@ RQ_SRS008_AES_Functions_Compatability_Engine_Database_MySQL = Requirement(
         ),
     link=None,
     level=3,
-    num='4.1.4')
+    num='4.2.3')
 
-RQ_SRS008_AES_Functions_Compatability_Engine_Table_MySQL = Requirement(
-    name='RQ.SRS008.AES.Functions.Compatability.Engine.Table.MySQL',
+RQ_SRS008_AES_Functions_Compatibility_Engine_Table_MySQL = Requirement(
+    name='RQ.SRS008.AES.Functions.Compatibility.Engine.Table.MySQL',
     version='1.0',
     priority=None,
     group=None,
@@ -82,10 +82,10 @@ RQ_SRS008_AES_Functions_Compatability_Engine_Table_MySQL = Requirement(
         ),
     link=None,
     level=3,
-    num='4.1.5')
+    num='4.2.4')
 
-RQ_SRS008_AES_Functions_Compatability_TableFunction_MySQL = Requirement(
-    name='RQ.SRS008.AES.Functions.Compatability.TableFunction.MySQL',
+RQ_SRS008_AES_Functions_Compatibility_TableFunction_MySQL = Requirement(
+    name='RQ.SRS008.AES.Functions.Compatibility.TableFunction.MySQL',
     version='1.0',
     priority=None,
     group=None,
@@ -97,7 +97,7 @@ RQ_SRS008_AES_Functions_Compatability_TableFunction_MySQL = Requirement(
         ),
     link=None,
     level=3,
-    num='4.1.6')
+    num='4.2.5')
 
 RQ_SRS008_AES_Functions_DifferentModes = Requirement(
     name='RQ.SRS008.AES.Functions.DifferentModes',
@@ -113,7 +113,7 @@ RQ_SRS008_AES_Functions_DifferentModes = Requirement(
         ),
     link=None,
     level=3,
-    num='4.1.7')
+    num='4.3.1')
 
 RQ_SRS008_AES_Functions_DataFromMultipleSources = Requirement(
     name='RQ.SRS008.AES.Functions.DataFromMultipleSources',
@@ -131,7 +131,7 @@ RQ_SRS008_AES_Functions_DataFromMultipleSources = Requirement(
         ),
     link=None,
     level=3,
-    num='4.1.8')
+    num='4.4.1')
 
 RQ_SRS008_AES_Functions_SuppressOutputOfSensitiveValues = Requirement(
     name='RQ.SRS008.AES.Functions.SuppressOutputOfSensitiveValues',
@@ -147,7 +147,7 @@ RQ_SRS008_AES_Functions_SuppressOutputOfSensitiveValues = Requirement(
         ),
     link=None,
     level=3,
-    num='4.1.9')
+    num='4.5.1')
 
 RQ_SRS008_AES_Functions_InvalidParameters = Requirement(
     name='RQ.SRS008.AES.Functions.InvalidParameters',
@@ -162,7 +162,7 @@ RQ_SRS008_AES_Functions_InvalidParameters = Requirement(
         ),
     link=None,
     level=3,
-    num='4.1.10')
+    num='4.6.1')
 
 RQ_SRS008_AES_Functions_Mismatched_Key = Requirement(
     name='RQ.SRS008.AES.Functions.Mismatched.Key',
@@ -177,7 +177,7 @@ RQ_SRS008_AES_Functions_Mismatched_Key = Requirement(
         ),
     link=None,
     level=3,
-    num='4.1.11')
+    num='4.7.1')
 
 RQ_SRS008_AES_Functions_Mismatched_IV = Requirement(
     name='RQ.SRS008.AES.Functions.Mismatched.IV',
@@ -192,7 +192,7 @@ RQ_SRS008_AES_Functions_Mismatched_IV = Requirement(
         ),
     link=None,
     level=3,
-    num='4.1.12')
+    num='4.7.2')
 
 RQ_SRS008_AES_Functions_Mismatched_AAD = Requirement(
     name='RQ.SRS008.AES.Functions.Mismatched.AAD',
@@ -207,7 +207,7 @@ RQ_SRS008_AES_Functions_Mismatched_AAD = Requirement(
         ),
     link=None,
     level=3,
-    num='4.1.13')
+    num='4.7.3')
 
 RQ_SRS008_AES_Functions_Mismatched_Mode = Requirement(
     name='RQ.SRS008.AES.Functions.Mismatched.Mode',
@@ -222,7 +222,7 @@ RQ_SRS008_AES_Functions_Mismatched_Mode = Requirement(
         ),
     link=None,
     level=3,
-    num='4.1.14')
+    num='4.7.4')
 
 RQ_SRS008_AES_Functions_Check_Performance = Requirement(
     name='RQ.SRS008.AES.Functions.Check.Performance',
@@ -237,7 +237,7 @@ RQ_SRS008_AES_Functions_Check_Performance = Requirement(
         ),
     link=None,
     level=3,
-    num='4.1.15')
+    num='4.8.1')
 
 RQ_SRS008_AES_Function_Check_Performance_BestCase = Requirement(
     name='RQ.SRS008.AES.Function.Check.Performance.BestCase',
@@ -253,7 +253,7 @@ RQ_SRS008_AES_Function_Check_Performance_BestCase = Requirement(
         ),
     link=None,
     level=3,
-    num='4.1.16')
+    num='4.8.2')
 
 RQ_SRS008_AES_Function_Check_Performance_WorstCase = Requirement(
     name='RQ.SRS008.AES.Function.Check.Performance.WorstCase',
@@ -269,7 +269,7 @@ RQ_SRS008_AES_Function_Check_Performance_WorstCase = Requirement(
         ),
     link=None,
     level=3,
-    num='4.1.17')
+    num='4.8.3')
 
 RQ_SRS008_AES_Functions_Check_Compression = Requirement(
     name='RQ.SRS008.AES.Functions.Check.Compression',
@@ -284,7 +284,7 @@ RQ_SRS008_AES_Functions_Check_Compression = Requirement(
         ),
     link=None,
     level=3,
-    num='4.1.18')
+    num='4.8.4')
 
 RQ_SRS008_AES_Functions_Check_Compression_LowCardinality = Requirement(
     name='RQ.SRS008.AES.Functions.Check.Compression.LowCardinality',
@@ -300,7 +300,7 @@ RQ_SRS008_AES_Functions_Check_Compression_LowCardinality = Requirement(
         ),
     link=None,
     level=3,
-    num='4.1.19')
+    num='4.8.5')
 
 RQ_SRS008_AES_Encrypt_Function = Requirement(
     name='RQ.SRS008.AES.Encrypt.Function',
@@ -315,7 +315,7 @@ RQ_SRS008_AES_Encrypt_Function = Requirement(
         ),
     link=None,
     level=3,
-    num='4.2.1')
+    num='4.9.1')
 
 RQ_SRS008_AES_Encrypt_Function_Syntax = Requirement(
     name='RQ.SRS008.AES.Encrypt.Function.Syntax',
@@ -334,7 +334,7 @@ RQ_SRS008_AES_Encrypt_Function_Syntax = Requirement(
         ),
     link=None,
     level=3,
-    num='4.2.2')
+    num='4.9.2')
 
 RQ_SRS008_AES_Encrypt_Function_NIST_TestVectors = Requirement(
     name='RQ.SRS008.AES.Encrypt.Function.NIST.TestVectors',
@@ -349,23 +349,25 @@ RQ_SRS008_AES_Encrypt_Function_NIST_TestVectors = Requirement(
         ),
     link=None,
     level=3,
-    num='4.2.3')
+    num='4.9.3')
 
 RQ_SRS008_AES_Encrypt_Function_Parameters_PlainText = Requirement(
     name='RQ.SRS008.AES.Encrypt.Function.Parameters.PlainText',
-    version='1.0',
+    version='2.0',
     priority=None,
     group=None,
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support `plaintext` accepting any data type as\n'
-        'the first parameter to the `encrypt` function that SHALL specify the data to be encrypted.\n'
+        '[ClickHouse] SHALL support `plaintext` with `String`, `FixedString`, `Nullable(String)`,\n'
+        '`Nullable(FixedString)`, `LowCardinality(String)`, or `LowCardinality(FixedString(N))` data types as\n'
+        'the second parameter to the `encrypt` function that SHALL specify the data to be encrypted.\n'
+        '\n'
         '\n'
         ),
     link=None,
     level=3,
-    num='4.2.4')
+    num='4.9.4')
 
 RQ_SRS008_AES_Encrypt_Function_Parameters_Key = Requirement(
     name='RQ.SRS008.AES.Encrypt.Function.Parameters.Key',
@@ -376,12 +378,12 @@ RQ_SRS008_AES_Encrypt_Function_Parameters_Key = Requirement(
     uid=None,
     description=(
         '[ClickHouse] SHALL support `key` with `String` or `FixedString` data types\n'
-        'as the second parameter to the `encrypt` function that SHALL specify the encryption key.\n'
+        'as the  parameter to the `encrypt` function that SHALL specify the encryption key.\n'
         '\n'
         ),
     link=None,
     level=3,
-    num='4.2.5')
+    num='4.9.5')
 
 RQ_SRS008_AES_Encrypt_Function_Parameters_Mode = Requirement(
     name='RQ.SRS008.AES.Encrypt.Function.Parameters.Mode',
@@ -391,13 +393,13 @@ RQ_SRS008_AES_Encrypt_Function_Parameters_Mode = Requirement(
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the third parameter\n'
+        '[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the first parameter\n'
         'to the `encrypt` function that SHALL specify encryption key length and block encryption mode.\n'
         '\n'
         ),
     link=None,
     level=3,
-    num='4.2.6')
+    num='4.9.6')
 
 RQ_SRS008_AES_Encrypt_Function_Parameters_Mode_ValuesFormat = Requirement(
     name='RQ.SRS008.AES.Encrypt.Function.Parameters.Mode.ValuesFormat',
@@ -417,7 +419,7 @@ RQ_SRS008_AES_Encrypt_Function_Parameters_Mode_ValuesFormat = Requirement(
         ),
     link=None,
     level=3,
-    num='4.2.7')
+    num='4.9.7')
 
 RQ_SRS008_AES_Encrypt_Function_Parameters_Mode_Value_Invalid = Requirement(
     name='RQ.SRS008.AES.Encrypt.Function.Parameters.Mode.Value.Invalid',
@@ -434,7 +436,7 @@ RQ_SRS008_AES_Encrypt_Function_Parameters_Mode_Value_Invalid = Requirement(
         ),
     link=None,
     level=3,
-    num='4.2.8')
+    num='4.9.8')
 
 RQ_SRS008_AES_Encrypt_Function_Parameters_Mode_Values = Requirement(
     name='RQ.SRS008.AES.Encrypt.Function.Parameters.Mode.Values',
@@ -460,13 +462,13 @@ RQ_SRS008_AES_Encrypt_Function_Parameters_Mode_Values = Requirement(
         '* `aes-192-ofb` that SHALL use [OFB] block mode encryption with 192 bit key\n'
         '* `aes-256-ofb` that SHALL use [OFB] block mode encryption with 256 bit key\n'
         '* `aes-128-gcm` that SHALL use [GCM] block mode encryption with 128 bit key\n'
-        '   and `AEAD` 16-byte tag is appended to the resulting ciphertext according to\n'
+        '   and [AEAD] 16-byte tag is appended to the resulting ciphertext according to\n'
         '   the [RFC5116]\n'
         '* `aes-192-gcm` that SHALL use [GCM] block mode encryption with 192 bit key\n'
-        '   and `AEAD` 16-byte tag is appended to the resulting ciphertext according to\n'
+        '   and [AEAD] 16-byte tag is appended to the resulting ciphertext according to\n'
         '   the [RFC5116]\n'
         '* `aes-256-gcm` that SHALL use [GCM] block mode encryption with 256 bit key\n'
-        '   and `AEAD` 16-byte tag is appended to the resulting ciphertext according to\n'
+        '   and [AEAD] 16-byte tag is appended to the resulting ciphertext according to\n'
         '   the [RFC5116]\n'
         '*  `aes-128-ctr` that SHALL use [CTR] block mode encryption with 128 bit key\n'
         '*  `aes-192-ctr` that SHALL use [CTR] block mode encryption with 192 bit key\n'
@@ -475,7 +477,7 @@ RQ_SRS008_AES_Encrypt_Function_Parameters_Mode_Values = Requirement(
         ),
     link=None,
     level=3,
-    num='4.2.9')
+    num='4.9.9')
 
 RQ_SRS008_AES_Encrypt_Function_Parameters_InitializationVector = Requirement(
     name='RQ.SRS008.AES.Encrypt.Function.Parameters.InitializationVector',
@@ -492,7 +494,7 @@ RQ_SRS008_AES_Encrypt_Function_Parameters_InitializationVector = Requirement(
         ),
     link=None,
     level=3,
-    num='4.2.10')
+    num='4.9.10')
 
 RQ_SRS008_AES_Encrypt_Function_Parameters_AdditionalAuthenticatedData = Requirement(
     name='RQ.SRS008.AES.Encrypt.Function.Parameters.AdditionalAuthenticatedData',
@@ -509,7 +511,7 @@ RQ_SRS008_AES_Encrypt_Function_Parameters_AdditionalAuthenticatedData = Requirem
         ),
     link=None,
     level=3,
-    num='4.2.11')
+    num='4.9.11')
 
 RQ_SRS008_AES_Encrypt_Function_Parameters_ReturnValue = Requirement(
     name='RQ.SRS008.AES.Encrypt.Function.Parameters.ReturnValue',
@@ -525,7 +527,7 @@ RQ_SRS008_AES_Encrypt_Function_Parameters_ReturnValue = Requirement(
         ),
     link=None,
     level=3,
-    num='4.2.12')
+    num='4.9.12')
 
 RQ_SRS008_AES_Encrypt_Function_Key_Length_InvalidLengthError = Requirement(
     name='RQ.SRS008.AES.Encrypt.Function.Key.Length.InvalidLengthError',
@@ -540,7 +542,7 @@ RQ_SRS008_AES_Encrypt_Function_Key_Length_InvalidLengthError = Requirement(
         ),
     link=None,
     level=3,
-    num='4.2.13')
+    num='4.9.13')
 
 RQ_SRS008_AES_Encrypt_Function_InitializationVector_Length_InvalidLengthError = Requirement(
     name='RQ.SRS008.AES.Encrypt.Function.InitializationVector.Length.InvalidLengthError',
@@ -555,7 +557,7 @@ RQ_SRS008_AES_Encrypt_Function_InitializationVector_Length_InvalidLengthError =
         ),
     link=None,
     level=3,
-    num='4.2.14')
+    num='4.9.14')
 
 RQ_SRS008_AES_Encrypt_Function_InitializationVector_NotValidForMode = Requirement(
     name='RQ.SRS008.AES.Encrypt.Function.InitializationVector.NotValidForMode',
@@ -570,7 +572,7 @@ RQ_SRS008_AES_Encrypt_Function_InitializationVector_NotValidForMode = Requiremen
         ),
     link=None,
     level=3,
-    num='4.2.15')
+    num='4.9.15')
 
 RQ_SRS008_AES_Encrypt_Function_AdditionalAuthenticationData_NotValidForMode = Requirement(
     name='RQ.SRS008.AES.Encrypt.Function.AdditionalAuthenticationData.NotValidForMode',
@@ -585,7 +587,7 @@ RQ_SRS008_AES_Encrypt_Function_AdditionalAuthenticationData_NotValidForMode = Re
         ),
     link=None,
     level=3,
-    num='4.2.16')
+    num='4.9.16')
 
 RQ_SRS008_AES_Encrypt_Function_AdditionalAuthenticationData_Length = Requirement(
     name='RQ.SRS008.AES.Encrypt.Function.AdditionalAuthenticationData.Length',
@@ -600,7 +602,7 @@ RQ_SRS008_AES_Encrypt_Function_AdditionalAuthenticationData_Length = Requirement
         ),
     link=None,
     level=3,
-    num='4.2.17')
+    num='4.9.17')
 
 RQ_SRS008_AES_Encrypt_Function_NonGCMMode_KeyAndInitializationVector_Length = Requirement(
     name='RQ.SRS008.AES.Encrypt.Function.NonGCMMode.KeyAndInitializationVector.Length',
@@ -638,7 +640,7 @@ RQ_SRS008_AES_Encrypt_Function_NonGCMMode_KeyAndInitializationVector_Length = Re
         ),
     link=None,
     level=3,
-    num='4.2.18')
+    num='4.9.18')
 
 RQ_SRS008_AES_Encrypt_Function_GCMMode_KeyAndInitializationVector_Length = Requirement(
     name='RQ.SRS008.AES.Encrypt.Function.GCMMode.KeyAndInitializationVector.Length',
@@ -658,7 +660,7 @@ RQ_SRS008_AES_Encrypt_Function_GCMMode_KeyAndInitializationVector_Length = Requi
         ),
     link=None,
     level=3,
-    num='4.2.19')
+    num='4.9.19')
 
 RQ_SRS008_AES_Decrypt_Function = Requirement(
     name='RQ.SRS008.AES.Decrypt.Function',
@@ -673,7 +675,7 @@ RQ_SRS008_AES_Decrypt_Function = Requirement(
         ),
     link=None,
     level=3,
-    num='4.2.20')
+    num='4.10.1')
 
 RQ_SRS008_AES_Decrypt_Function_Syntax = Requirement(
     name='RQ.SRS008.AES.Decrypt.Function.Syntax',
@@ -692,7 +694,7 @@ RQ_SRS008_AES_Decrypt_Function_Syntax = Requirement(
         ),
     link=None,
     level=3,
-    num='4.2.21')
+    num='4.10.2')
 
 RQ_SRS008_AES_Decrypt_Function_Parameters_CipherText = Requirement(
     name='RQ.SRS008.AES.Decrypt.Function.Parameters.CipherText',
@@ -703,12 +705,12 @@ RQ_SRS008_AES_Decrypt_Function_Parameters_CipherText = Requirement(
     uid=None,
     description=(
         '[ClickHouse] SHALL support `ciphertext` accepting `FixedString` or `String` data types as\n'
-        'the first parameter to the `decrypt` function that SHALL specify the data to be decrypted.\n'
+        'the second parameter to the `decrypt` function that SHALL specify the data to be decrypted.\n'
         '\n'
         ),
     link=None,
     level=3,
-    num='4.2.22')
+    num='4.10.3')
 
 RQ_SRS008_AES_Decrypt_Function_Parameters_Key = Requirement(
     name='RQ.SRS008.AES.Decrypt.Function.Parameters.Key',
@@ -719,12 +721,12 @@ RQ_SRS008_AES_Decrypt_Function_Parameters_Key = Requirement(
     uid=None,
     description=(
         '[ClickHouse] SHALL support `key` with `String` or `FixedString` data types\n'
-        'as the second parameter to the `decrypt` function that SHALL specify the encryption key.\n'
+        'as the third parameter to the `decrypt` function that SHALL specify the encryption key.\n'
         '\n'
         ),
     link=None,
     level=3,
-    num='4.2.23')
+    num='4.10.4')
 
 RQ_SRS008_AES_Decrypt_Function_Parameters_Mode = Requirement(
     name='RQ.SRS008.AES.Decrypt.Function.Parameters.Mode',
@@ -734,13 +736,13 @@ RQ_SRS008_AES_Decrypt_Function_Parameters_Mode = Requirement(
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the third parameter\n'
+        '[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the first parameter\n'
         'to the `decrypt` function that SHALL specify encryption key length and block encryption mode.\n'
         '\n'
         ),
     link=None,
     level=3,
-    num='4.2.24')
+    num='4.10.5')
 
 RQ_SRS008_AES_Decrypt_Function_Parameters_Mode_ValuesFormat = Requirement(
     name='RQ.SRS008.AES.Decrypt.Function.Parameters.Mode.ValuesFormat',
@@ -760,7 +762,7 @@ RQ_SRS008_AES_Decrypt_Function_Parameters_Mode_ValuesFormat = Requirement(
         ),
     link=None,
     level=3,
-    num='4.2.25')
+    num='4.10.6')
 
 RQ_SRS008_AES_Decrypt_Function_Parameters_Mode_Value_Invalid = Requirement(
     name='RQ.SRS008.AES.Decrypt.Function.Parameters.Mode.Value.Invalid',
@@ -777,7 +779,7 @@ RQ_SRS008_AES_Decrypt_Function_Parameters_Mode_Value_Invalid = Requirement(
         ),
     link=None,
     level=3,
-    num='4.2.26')
+    num='4.10.7')
 
 RQ_SRS008_AES_Decrypt_Function_Parameters_Mode_Values = Requirement(
     name='RQ.SRS008.AES.Decrypt.Function.Parameters.Mode.Values',
@@ -818,7 +820,7 @@ RQ_SRS008_AES_Decrypt_Function_Parameters_Mode_Values = Requirement(
         ),
     link=None,
     level=3,
-    num='4.2.27')
+    num='4.10.8')
 
 RQ_SRS008_AES_Decrypt_Function_Parameters_InitializationVector = Requirement(
     name='RQ.SRS008.AES.Decrypt.Function.Parameters.InitializationVector',
@@ -835,7 +837,7 @@ RQ_SRS008_AES_Decrypt_Function_Parameters_InitializationVector = Requirement(
         ),
     link=None,
     level=3,
-    num='4.2.28')
+    num='4.10.9')
 
 RQ_SRS008_AES_Decrypt_Function_Parameters_AdditionalAuthenticatedData = Requirement(
     name='RQ.SRS008.AES.Decrypt.Function.Parameters.AdditionalAuthenticatedData',
@@ -852,7 +854,7 @@ RQ_SRS008_AES_Decrypt_Function_Parameters_AdditionalAuthenticatedData = Requirem
         ),
     link=None,
     level=3,
-    num='4.2.29')
+    num='4.10.10')
 
 RQ_SRS008_AES_Decrypt_Function_Parameters_ReturnValue = Requirement(
     name='RQ.SRS008.AES.Decrypt.Function.Parameters.ReturnValue',
@@ -868,7 +870,7 @@ RQ_SRS008_AES_Decrypt_Function_Parameters_ReturnValue = Requirement(
         ),
     link=None,
     level=3,
-    num='4.2.30')
+    num='4.10.11')
 
 RQ_SRS008_AES_Decrypt_Function_Key_Length_InvalidLengthError = Requirement(
     name='RQ.SRS008.AES.Decrypt.Function.Key.Length.InvalidLengthError',
@@ -883,7 +885,7 @@ RQ_SRS008_AES_Decrypt_Function_Key_Length_InvalidLengthError = Requirement(
         ),
     link=None,
     level=3,
-    num='4.2.31')
+    num='4.10.12')
 
 RQ_SRS008_AES_Decrypt_Function_InitializationVector_Length_InvalidLengthError = Requirement(
     name='RQ.SRS008.AES.Decrypt.Function.InitializationVector.Length.InvalidLengthError',
@@ -893,12 +895,12 @@ RQ_SRS008_AES_Decrypt_Function_InitializationVector_Length_InvalidLengthError =
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL return an error if the `iv` is speficified and the length is not exact for the `decrypt` function for a given block mode.\n'
+        '[ClickHouse] SHALL return an error if the `iv` is specified and the length is not exact for the `decrypt` function for a given block mode.\n'
         '\n'
         ),
     link=None,
     level=3,
-    num='4.2.32')
+    num='4.10.13')
 
 RQ_SRS008_AES_Decrypt_Function_InitializationVector_NotValidForMode = Requirement(
     name='RQ.SRS008.AES.Decrypt.Function.InitializationVector.NotValidForMode',
@@ -914,7 +916,7 @@ RQ_SRS008_AES_Decrypt_Function_InitializationVector_NotValidForMode = Requiremen
         ),
     link=None,
     level=3,
-    num='4.2.33')
+    num='4.10.14')
 
 RQ_SRS008_AES_Decrypt_Function_AdditionalAuthenticationData_NotValidForMode = Requirement(
     name='RQ.SRS008.AES.Decrypt.Function.AdditionalAuthenticationData.NotValidForMode',
@@ -930,7 +932,7 @@ RQ_SRS008_AES_Decrypt_Function_AdditionalAuthenticationData_NotValidForMode = Re
         ),
     link=None,
     level=3,
-    num='4.2.34')
+    num='4.10.15')
 
 RQ_SRS008_AES_Decrypt_Function_AdditionalAuthenticationData_Length = Requirement(
     name='RQ.SRS008.AES.Decrypt.Function.AdditionalAuthenticationData.Length',
@@ -945,7 +947,7 @@ RQ_SRS008_AES_Decrypt_Function_AdditionalAuthenticationData_Length = Requirement
         ),
     link=None,
     level=3,
-    num='4.2.35')
+    num='4.10.16')
 
 RQ_SRS008_AES_Decrypt_Function_NonGCMMode_KeyAndInitializationVector_Length = Requirement(
     name='RQ.SRS008.AES.Decrypt.Function.NonGCMMode.KeyAndInitializationVector.Length',
@@ -983,7 +985,7 @@ RQ_SRS008_AES_Decrypt_Function_NonGCMMode_KeyAndInitializationVector_Length = Re
         ),
     link=None,
     level=3,
-    num='4.2.36')
+    num='4.10.17')
 
 RQ_SRS008_AES_Decrypt_Function_GCMMode_KeyAndInitializationVector_Length = Requirement(
     name='RQ.SRS008.AES.Decrypt.Function.GCMMode.KeyAndInitializationVector.Length',
@@ -1003,7 +1005,7 @@ RQ_SRS008_AES_Decrypt_Function_GCMMode_KeyAndInitializationVector_Length = Requi
         ),
     link=None,
     level=3,
-    num='4.2.37')
+    num='4.10.18')
 
 RQ_SRS008_AES_MySQL_Encrypt_Function = Requirement(
     name='RQ.SRS008.AES.MySQL.Encrypt.Function',
@@ -1018,7 +1020,7 @@ RQ_SRS008_AES_MySQL_Encrypt_Function = Requirement(
         ),
     link=None,
     level=3,
-    num='4.3.1')
+    num='4.11.1')
 
 RQ_SRS008_AES_MySQL_Encrypt_Function_Syntax = Requirement(
     name='RQ.SRS008.AES.MySQL.Encrypt.Function.Syntax',
@@ -1037,23 +1039,24 @@ RQ_SRS008_AES_MySQL_Encrypt_Function_Syntax = Requirement(
         ),
     link=None,
     level=3,
-    num='4.3.2')
+    num='4.11.2')
 
 RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_PlainText = Requirement(
     name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.PlainText',
-    version='1.0',
+    version='2.0',
     priority=None,
     group=None,
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support `plaintext` accepting any data type as\n'
-        'the first parameter to the `aes_encrypt_mysql` function that SHALL specify the data to be encrypted.\n'
+        '[ClickHouse] SHALL support `plaintext` with `String`, `FixedString`, `Nullable(String)`,\n'
+        '`Nullable(FixedString)`, `LowCardinality(String)`, or `LowCardinality(FixedString(N))` data types as\n'
+        'the second parameter to the `aes_encrypt_mysql` function that SHALL specify the data to be encrypted.\n'
         '\n'
         ),
     link=None,
     level=3,
-    num='4.3.3')
+    num='4.11.3')
 
 RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_Key = Requirement(
     name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Key',
@@ -1064,12 +1067,12 @@ RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_Key = Requirement(
     uid=None,
     description=(
         '[ClickHouse] SHALL support `key` with `String` or `FixedString` data types\n'
-        'as the second parameter to the `aes_encrypt_mysql` function that SHALL specify the encryption key.\n'
+        'as the third parameter to the `aes_encrypt_mysql` function that SHALL specify the encryption key.\n'
         '\n'
         ),
     link=None,
     level=3,
-    num='4.3.4')
+    num='4.11.4')
 
 RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_Mode = Requirement(
     name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode',
@@ -1079,13 +1082,13 @@ RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_Mode = Requirement(
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the third parameter\n'
+        '[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the first parameter\n'
         'to the `aes_encrypt_mysql` function that SHALL specify encryption key length and block encryption mode.\n'
         '\n'
         ),
     link=None,
     level=3,
-    num='4.3.5')
+    num='4.11.5')
 
 RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_Mode_ValuesFormat = Requirement(
     name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.ValuesFormat',
@@ -1104,7 +1107,7 @@ RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_Mode_ValuesFormat = Requirement(
         ),
     link=None,
     level=3,
-    num='4.3.6')
+    num='4.11.6')
 
 RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_Mode_Value_Invalid = Requirement(
     name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Value.Invalid',
@@ -1121,7 +1124,7 @@ RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_Mode_Value_Invalid = Requirement
         ),
     link=None,
     level=3,
-    num='4.3.7')
+    num='4.11.7')
 
 RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_Mode_Values = Requirement(
     name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Values',
@@ -1150,7 +1153,7 @@ RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_Mode_Values = Requirement(
         ),
     link=None,
     level=3,
-    num='4.3.8')
+    num='4.11.8')
 
 RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_Mode_Values_GCM_Error = Requirement(
     name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Values.GCM.Error',
@@ -1170,7 +1173,7 @@ RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_Mode_Values_GCM_Error = Requirem
         ),
     link=None,
     level=3,
-    num='4.3.9')
+    num='4.11.9')
 
 RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_Mode_Values_CTR_Error = Requirement(
     name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Values.CTR.Error',
@@ -1190,7 +1193,7 @@ RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_Mode_Values_CTR_Error = Requirem
         ),
     link=None,
     level=3,
-    num='4.3.10')
+    num='4.11.10')
 
 RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_InitializationVector = Requirement(
     name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.InitializationVector',
@@ -1207,7 +1210,7 @@ RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_InitializationVector = Requireme
         ),
     link=None,
     level=3,
-    num='4.3.11')
+    num='4.11.11')
 
 RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_ReturnValue = Requirement(
     name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.ReturnValue',
@@ -1223,7 +1226,7 @@ RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_ReturnValue = Requirement(
         ),
     link=None,
     level=3,
-    num='4.3.12')
+    num='4.11.12')
 
 RQ_SRS008_AES_MySQL_Encrypt_Function_Key_Length_TooShortError = Requirement(
     name='RQ.SRS008.AES.MySQL.Encrypt.Function.Key.Length.TooShortError',
@@ -1239,7 +1242,7 @@ RQ_SRS008_AES_MySQL_Encrypt_Function_Key_Length_TooShortError = Requirement(
         ),
     link=None,
     level=3,
-    num='4.3.13')
+    num='4.11.13')
 
 RQ_SRS008_AES_MySQL_Encrypt_Function_Key_Length_TooLong = Requirement(
     name='RQ.SRS008.AES.MySQL.Encrypt.Function.Key.Length.TooLong',
@@ -1265,7 +1268,7 @@ RQ_SRS008_AES_MySQL_Encrypt_Function_Key_Length_TooLong = Requirement(
         ),
     link=None,
     level=3,
-    num='4.3.14')
+    num='4.11.14')
 
 RQ_SRS008_AES_MySQL_Encrypt_Function_InitializationVector_Length_TooShortError = Requirement(
     name='RQ.SRS008.AES.MySQL.Encrypt.Function.InitializationVector.Length.TooShortError',
@@ -1281,7 +1284,7 @@ RQ_SRS008_AES_MySQL_Encrypt_Function_InitializationVector_Length_TooShortError =
         ),
     link=None,
     level=3,
-    num='4.3.15')
+    num='4.11.15')
 
 RQ_SRS008_AES_MySQL_Encrypt_Function_InitializationVector_Length_TooLong = Requirement(
     name='RQ.SRS008.AES.MySQL.Encrypt.Function.InitializationVector.Length.TooLong',
@@ -1297,7 +1300,7 @@ RQ_SRS008_AES_MySQL_Encrypt_Function_InitializationVector_Length_TooLong = Requi
         ),
     link=None,
     level=3,
-    num='4.3.16')
+    num='4.11.16')
 
 RQ_SRS008_AES_MySQL_Encrypt_Function_InitializationVector_NotValidForMode = Requirement(
     name='RQ.SRS008.AES.MySQL.Encrypt.Function.InitializationVector.NotValidForMode',
@@ -1313,7 +1316,7 @@ RQ_SRS008_AES_MySQL_Encrypt_Function_InitializationVector_NotValidForMode = Requ
         ),
     link=None,
     level=3,
-    num='4.3.17')
+    num='4.11.17')
 
 RQ_SRS008_AES_MySQL_Encrypt_Function_Mode_KeyAndInitializationVector_Length = Requirement(
     name='RQ.SRS008.AES.MySQL.Encrypt.Function.Mode.KeyAndInitializationVector.Length',
@@ -1347,7 +1350,7 @@ RQ_SRS008_AES_MySQL_Encrypt_Function_Mode_KeyAndInitializationVector_Length = Re
         ),
     link=None,
     level=3,
-    num='4.3.18')
+    num='4.11.18')
 
 RQ_SRS008_AES_MySQL_Decrypt_Function = Requirement(
     name='RQ.SRS008.AES.MySQL.Decrypt.Function',
@@ -1362,7 +1365,7 @@ RQ_SRS008_AES_MySQL_Decrypt_Function = Requirement(
         ),
     link=None,
     level=3,
-    num='4.3.19')
+    num='4.12.1')
 
 RQ_SRS008_AES_MySQL_Decrypt_Function_Syntax = Requirement(
     name='RQ.SRS008.AES.MySQL.Decrypt.Function.Syntax',
@@ -1381,7 +1384,7 @@ RQ_SRS008_AES_MySQL_Decrypt_Function_Syntax = Requirement(
         ),
     link=None,
     level=3,
-    num='4.3.20')
+    num='4.12.2')
 
 RQ_SRS008_AES_MySQL_Decrypt_Function_Parameters_CipherText = Requirement(
     name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.CipherText',
@@ -1392,12 +1395,12 @@ RQ_SRS008_AES_MySQL_Decrypt_Function_Parameters_CipherText = Requirement(
     uid=None,
     description=(
         '[ClickHouse] SHALL support `ciphertext` accepting any data type as\n'
-        'the first parameter to the `aes_decrypt_mysql` function that SHALL specify the data to be decrypted.\n'
+        'the second parameter to the `aes_decrypt_mysql` function that SHALL specify the data to be decrypted.\n'
         '\n'
         ),
     link=None,
     level=3,
-    num='4.3.21')
+    num='4.12.3')
 
 RQ_SRS008_AES_MySQL_Decrypt_Function_Parameters_Key = Requirement(
     name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Key',
@@ -1408,12 +1411,12 @@ RQ_SRS008_AES_MySQL_Decrypt_Function_Parameters_Key = Requirement(
     uid=None,
     description=(
         '[ClickHouse] SHALL support `key` with `String` or `FixedString` data types\n'
-        'as the second parameter to the `aes_decrypt_mysql` function that SHALL specify the encryption key.\n'
+        'as the third parameter to the `aes_decrypt_mysql` function that SHALL specify the encryption key.\n'
         '\n'
         ),
     link=None,
     level=3,
-    num='4.3.22')
+    num='4.12.4')
 
 RQ_SRS008_AES_MySQL_Decrypt_Function_Parameters_Mode = Requirement(
     name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode',
@@ -1423,13 +1426,13 @@ RQ_SRS008_AES_MySQL_Decrypt_Function_Parameters_Mode = Requirement(
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the third parameter\n'
+        '[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the first parameter\n'
         'to the `aes_decrypt_mysql` function that SHALL specify encryption key length and block encryption mode.\n'
         '\n'
         ),
     link=None,
     level=3,
-    num='4.3.23')
+    num='4.12.5')
 
 RQ_SRS008_AES_MySQL_Decrypt_Function_Parameters_Mode_ValuesFormat = Requirement(
     name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.ValuesFormat',
@@ -1448,7 +1451,7 @@ RQ_SRS008_AES_MySQL_Decrypt_Function_Parameters_Mode_ValuesFormat = Requirement(
         ),
     link=None,
     level=3,
-    num='4.3.24')
+    num='4.12.6')
 
 RQ_SRS008_AES_MySQL_Decrypt_Function_Parameters_Mode_Value_Invalid = Requirement(
     name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Value.Invalid',
@@ -1465,7 +1468,7 @@ RQ_SRS008_AES_MySQL_Decrypt_Function_Parameters_Mode_Value_Invalid = Requirement
         ),
     link=None,
     level=3,
-    num='4.3.25')
+    num='4.12.7')
 
 RQ_SRS008_AES_MySQL_Decrypt_Function_Parameters_Mode_Values = Requirement(
     name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Values',
@@ -1494,7 +1497,7 @@ RQ_SRS008_AES_MySQL_Decrypt_Function_Parameters_Mode_Values = Requirement(
         ),
     link=None,
     level=3,
-    num='4.3.26')
+    num='4.12.8')
 
 RQ_SRS008_AES_MySQL_Decrypt_Function_Parameters_Mode_Values_GCM_Error = Requirement(
     name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Values.GCM.Error',
@@ -1514,7 +1517,7 @@ RQ_SRS008_AES_MySQL_Decrypt_Function_Parameters_Mode_Values_GCM_Error = Requirem
         ),
     link=None,
     level=3,
-    num='4.3.27')
+    num='4.12.9')
 
 RQ_SRS008_AES_MySQL_Decrypt_Function_Parameters_Mode_Values_CTR_Error = Requirement(
     name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Values.CTR.Error',
@@ -1534,7 +1537,7 @@ RQ_SRS008_AES_MySQL_Decrypt_Function_Parameters_Mode_Values_CTR_Error = Requirem
         ),
     link=None,
     level=3,
-    num='4.3.28')
+    num='4.12.10')
 
 RQ_SRS008_AES_MySQL_Decrypt_Function_Parameters_InitializationVector = Requirement(
     name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.InitializationVector',
@@ -1551,7 +1554,7 @@ RQ_SRS008_AES_MySQL_Decrypt_Function_Parameters_InitializationVector = Requireme
         ),
     link=None,
     level=3,
-    num='4.3.29')
+    num='4.12.11')
 
 RQ_SRS008_AES_MySQL_Decrypt_Function_Parameters_ReturnValue = Requirement(
     name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.ReturnValue',
@@ -1567,7 +1570,7 @@ RQ_SRS008_AES_MySQL_Decrypt_Function_Parameters_ReturnValue = Requirement(
         ),
     link=None,
     level=3,
-    num='4.3.30')
+    num='4.12.12')
 
 RQ_SRS008_AES_MySQL_Decrypt_Function_Key_Length_TooShortError = Requirement(
     name='RQ.SRS008.AES.MySQL.Decrypt.Function.Key.Length.TooShortError',
@@ -1583,7 +1586,7 @@ RQ_SRS008_AES_MySQL_Decrypt_Function_Key_Length_TooShortError = Requirement(
         ),
     link=None,
     level=3,
-    num='4.3.31')
+    num='4.12.13')
 
 RQ_SRS008_AES_MySQL_Decrypt_Function_Key_Length_TooLong = Requirement(
     name='RQ.SRS008.AES.MySQL.Decrypt.Function.Key.Length.TooLong',
@@ -1609,7 +1612,7 @@ RQ_SRS008_AES_MySQL_Decrypt_Function_Key_Length_TooLong = Requirement(
         ),
     link=None,
     level=3,
-    num='4.3.32')
+    num='4.12.14')
 
 RQ_SRS008_AES_MySQL_Decrypt_Function_InitializationVector_Length_TooShortError = Requirement(
     name='RQ.SRS008.AES.MySQL.Decrypt.Function.InitializationVector.Length.TooShortError',
@@ -1625,7 +1628,7 @@ RQ_SRS008_AES_MySQL_Decrypt_Function_InitializationVector_Length_TooShortError =
         ),
     link=None,
     level=3,
-    num='4.3.33')
+    num='4.12.15')
 
 RQ_SRS008_AES_MySQL_Decrypt_Function_InitializationVector_Length_TooLong = Requirement(
     name='RQ.SRS008.AES.MySQL.Decrypt.Function.InitializationVector.Length.TooLong',
@@ -1641,7 +1644,7 @@ RQ_SRS008_AES_MySQL_Decrypt_Function_InitializationVector_Length_TooLong = Requi
         ),
     link=None,
     level=3,
-    num='4.3.34')
+    num='4.12.16')
 
 RQ_SRS008_AES_MySQL_Decrypt_Function_InitializationVector_NotValidForMode = Requirement(
     name='RQ.SRS008.AES.MySQL.Decrypt.Function.InitializationVector.NotValidForMode',
@@ -1657,7 +1660,7 @@ RQ_SRS008_AES_MySQL_Decrypt_Function_InitializationVector_NotValidForMode = Requ
         ),
     link=None,
     level=3,
-    num='4.3.35')
+    num='4.12.17')
 
 RQ_SRS008_AES_MySQL_Decrypt_Function_Mode_KeyAndInitializationVector_Length = Requirement(
     name='RQ.SRS008.AES.MySQL.Decrypt.Function.Mode.KeyAndInitializationVector.Length',
@@ -1691,7 +1694,7 @@ RQ_SRS008_AES_MySQL_Decrypt_Function_Mode_KeyAndInitializationVector_Length = Re
         ),
     link=None,
     level=3,
-    num='4.3.36')
+    num='4.12.18')
 
 SRS_008_ClickHouse_AES_Encryption_Functions = Specification(
     name='SRS-008 ClickHouse AES Encryption Functions', 
@@ -1713,111 +1716,122 @@ SRS_008_ClickHouse_AES_Encryption_Functions = Specification(
         Heading(name='Revision History', level=1, num='1'),
         Heading(name='Introduction', level=1, num='2'),
         Heading(name='Terminology', level=1, num='3'),
+        Heading(name='AES', level=2, num='3.1'),
+        Heading(name='AEAD', level=2, num='3.2'),
         Heading(name='Requirements', level=1, num='4'),
         Heading(name='Generic', level=2, num='4.1'),
         Heading(name='RQ.SRS008.AES.Functions', level=3, num='4.1.1'),
-        Heading(name='RQ.SRS008.AES.Functions.Compatability.MySQL', level=3, num='4.1.2'),
-        Heading(name='RQ.SRS008.AES.Functions.Compatability.Dictionaries', level=3, num='4.1.3'),
-        Heading(name='RQ.SRS008.AES.Functions.Compatability.Engine.Database.MySQL', level=3, num='4.1.4'),
-        Heading(name='RQ.SRS008.AES.Functions.Compatability.Engine.Table.MySQL', level=3, num='4.1.5'),
-        Heading(name='RQ.SRS008.AES.Functions.Compatability.TableFunction.MySQL', level=3, num='4.1.6'),
-        Heading(name='RQ.SRS008.AES.Functions.DifferentModes', level=3, num='4.1.7'),
-        Heading(name='RQ.SRS008.AES.Functions.DataFromMultipleSources', level=3, num='4.1.8'),
-        Heading(name='RQ.SRS008.AES.Functions.SuppressOutputOfSensitiveValues', level=3, num='4.1.9'),
-        Heading(name='RQ.SRS008.AES.Functions.InvalidParameters', level=3, num='4.1.10'),
-        Heading(name='RQ.SRS008.AES.Functions.Mismatched.Key', level=3, num='4.1.11'),
-        Heading(name='RQ.SRS008.AES.Functions.Mismatched.IV', level=3, num='4.1.12'),
-        Heading(name='RQ.SRS008.AES.Functions.Mismatched.AAD', level=3, num='4.1.13'),
-        Heading(name='RQ.SRS008.AES.Functions.Mismatched.Mode', level=3, num='4.1.14'),
-        Heading(name='RQ.SRS008.AES.Functions.Check.Performance', level=3, num='4.1.15'),
-        Heading(name='RQ.SRS008.AES.Function.Check.Performance.BestCase', level=3, num='4.1.16'),
-        Heading(name='RQ.SRS008.AES.Function.Check.Performance.WorstCase', level=3, num='4.1.17'),
-        Heading(name='RQ.SRS008.AES.Functions.Check.Compression', level=3, num='4.1.18'),
-        Heading(name='RQ.SRS008.AES.Functions.Check.Compression.LowCardinality', level=3, num='4.1.19'),
-        Heading(name='Specific', level=2, num='4.2'),
-        Heading(name='RQ.SRS008.AES.Encrypt.Function', level=3, num='4.2.1'),
-        Heading(name='RQ.SRS008.AES.Encrypt.Function.Syntax', level=3, num='4.2.2'),
-        Heading(name='RQ.SRS008.AES.Encrypt.Function.NIST.TestVectors', level=3, num='4.2.3'),
-        Heading(name='RQ.SRS008.AES.Encrypt.Function.Parameters.PlainText', level=3, num='4.2.4'),
-        Heading(name='RQ.SRS008.AES.Encrypt.Function.Parameters.Key', level=3, num='4.2.5'),
-        Heading(name='RQ.SRS008.AES.Encrypt.Function.Parameters.Mode', level=3, num='4.2.6'),
-        Heading(name='RQ.SRS008.AES.Encrypt.Function.Parameters.Mode.ValuesFormat', level=3, num='4.2.7'),
-        Heading(name='RQ.SRS008.AES.Encrypt.Function.Parameters.Mode.Value.Invalid', level=3, num='4.2.8'),
-        Heading(name='RQ.SRS008.AES.Encrypt.Function.Parameters.Mode.Values', level=3, num='4.2.9'),
-        Heading(name='RQ.SRS008.AES.Encrypt.Function.Parameters.InitializationVector', level=3, num='4.2.10'),
-        Heading(name='RQ.SRS008.AES.Encrypt.Function.Parameters.AdditionalAuthenticatedData', level=3, num='4.2.11'),
-        Heading(name='RQ.SRS008.AES.Encrypt.Function.Parameters.ReturnValue', level=3, num='4.2.12'),
-        Heading(name='RQ.SRS008.AES.Encrypt.Function.Key.Length.InvalidLengthError', level=3, num='4.2.13'),
-        Heading(name='RQ.SRS008.AES.Encrypt.Function.InitializationVector.Length.InvalidLengthError', level=3, num='4.2.14'),
-        Heading(name='RQ.SRS008.AES.Encrypt.Function.InitializationVector.NotValidForMode', level=3, num='4.2.15'),
-        Heading(name='RQ.SRS008.AES.Encrypt.Function.AdditionalAuthenticationData.NotValidForMode', level=3, num='4.2.16'),
-        Heading(name='RQ.SRS008.AES.Encrypt.Function.AdditionalAuthenticationData.Length', level=3, num='4.2.17'),
-        Heading(name='RQ.SRS008.AES.Encrypt.Function.NonGCMMode.KeyAndInitializationVector.Length', level=3, num='4.2.18'),
-        Heading(name='RQ.SRS008.AES.Encrypt.Function.GCMMode.KeyAndInitializationVector.Length', level=3, num='4.2.19'),
-        Heading(name='RQ.SRS008.AES.Decrypt.Function', level=3, num='4.2.20'),
-        Heading(name='RQ.SRS008.AES.Decrypt.Function.Syntax', level=3, num='4.2.21'),
-        Heading(name='RQ.SRS008.AES.Decrypt.Function.Parameters.CipherText', level=3, num='4.2.22'),
-        Heading(name='RQ.SRS008.AES.Decrypt.Function.Parameters.Key', level=3, num='4.2.23'),
-        Heading(name='RQ.SRS008.AES.Decrypt.Function.Parameters.Mode', level=3, num='4.2.24'),
-        Heading(name='RQ.SRS008.AES.Decrypt.Function.Parameters.Mode.ValuesFormat', level=3, num='4.2.25'),
-        Heading(name='RQ.SRS008.AES.Decrypt.Function.Parameters.Mode.Value.Invalid', level=3, num='4.2.26'),
-        Heading(name='RQ.SRS008.AES.Decrypt.Function.Parameters.Mode.Values', level=3, num='4.2.27'),
-        Heading(name='RQ.SRS008.AES.Decrypt.Function.Parameters.InitializationVector', level=3, num='4.2.28'),
-        Heading(name='RQ.SRS008.AES.Decrypt.Function.Parameters.AdditionalAuthenticatedData', level=3, num='4.2.29'),
-        Heading(name='RQ.SRS008.AES.Decrypt.Function.Parameters.ReturnValue', level=3, num='4.2.30'),
-        Heading(name='RQ.SRS008.AES.Decrypt.Function.Key.Length.InvalidLengthError', level=3, num='4.2.31'),
-        Heading(name='RQ.SRS008.AES.Decrypt.Function.InitializationVector.Length.InvalidLengthError', level=3, num='4.2.32'),
-        Heading(name='RQ.SRS008.AES.Decrypt.Function.InitializationVector.NotValidForMode', level=3, num='4.2.33'),
-        Heading(name='RQ.SRS008.AES.Decrypt.Function.AdditionalAuthenticationData.NotValidForMode', level=3, num='4.2.34'),
-        Heading(name='RQ.SRS008.AES.Decrypt.Function.AdditionalAuthenticationData.Length', level=3, num='4.2.35'),
-        Heading(name='RQ.SRS008.AES.Decrypt.Function.NonGCMMode.KeyAndInitializationVector.Length', level=3, num='4.2.36'),
-        Heading(name='RQ.SRS008.AES.Decrypt.Function.GCMMode.KeyAndInitializationVector.Length', level=3, num='4.2.37'),
-        Heading(name='MySQL Specific Functions', level=2, num='4.3'),
-        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function', level=3, num='4.3.1'),
-        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Syntax', level=3, num='4.3.2'),
-        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.PlainText', level=3, num='4.3.3'),
-        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Key', level=3, num='4.3.4'),
-        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode', level=3, num='4.3.5'),
-        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.ValuesFormat', level=3, num='4.3.6'),
-        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Value.Invalid', level=3, num='4.3.7'),
-        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Values', level=3, num='4.3.8'),
-        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Values.GCM.Error', level=3, num='4.3.9'),
-        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Values.CTR.Error', level=3, num='4.3.10'),
-        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.InitializationVector', level=3, num='4.3.11'),
-        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.ReturnValue', level=3, num='4.3.12'),
-        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Key.Length.TooShortError', level=3, num='4.3.13'),
-        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Key.Length.TooLong', level=3, num='4.3.14'),
-        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.InitializationVector.Length.TooShortError', level=3, num='4.3.15'),
-        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.InitializationVector.Length.TooLong', level=3, num='4.3.16'),
-        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.InitializationVector.NotValidForMode', level=3, num='4.3.17'),
-        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Mode.KeyAndInitializationVector.Length', level=3, num='4.3.18'),
-        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function', level=3, num='4.3.19'),
-        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Syntax', level=3, num='4.3.20'),
-        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.CipherText', level=3, num='4.3.21'),
-        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Key', level=3, num='4.3.22'),
-        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode', level=3, num='4.3.23'),
-        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.ValuesFormat', level=3, num='4.3.24'),
-        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Value.Invalid', level=3, num='4.3.25'),
-        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Values', level=3, num='4.3.26'),
-        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Values.GCM.Error', level=3, num='4.3.27'),
-        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Values.CTR.Error', level=3, num='4.3.28'),
-        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.InitializationVector', level=3, num='4.3.29'),
-        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.ReturnValue', level=3, num='4.3.30'),
-        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Key.Length.TooShortError', level=3, num='4.3.31'),
-        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Key.Length.TooLong', level=3, num='4.3.32'),
-        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.InitializationVector.Length.TooShortError', level=3, num='4.3.33'),
-        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.InitializationVector.Length.TooLong', level=3, num='4.3.34'),
-        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.InitializationVector.NotValidForMode', level=3, num='4.3.35'),
-        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Mode.KeyAndInitializationVector.Length', level=3, num='4.3.36'),
+        Heading(name='Compatibility', level=2, num='4.2'),
+        Heading(name='RQ.SRS008.AES.Functions.Compatibility.MySQL', level=3, num='4.2.1'),
+        Heading(name='RQ.SRS008.AES.Functions.Compatibility.Dictionaries', level=3, num='4.2.2'),
+        Heading(name='RQ.SRS008.AES.Functions.Compatibility.Engine.Database.MySQL', level=3, num='4.2.3'),
+        Heading(name='RQ.SRS008.AES.Functions.Compatibility.Engine.Table.MySQL', level=3, num='4.2.4'),
+        Heading(name='RQ.SRS008.AES.Functions.Compatibility.TableFunction.MySQL', level=3, num='4.2.5'),
+        Heading(name='Different Modes', level=2, num='4.3'),
+        Heading(name='RQ.SRS008.AES.Functions.DifferentModes', level=3, num='4.3.1'),
+        Heading(name='Multiple Sources', level=2, num='4.4'),
+        Heading(name='RQ.SRS008.AES.Functions.DataFromMultipleSources', level=3, num='4.4.1'),
+        Heading(name='Suppressing Sensitive Values', level=2, num='4.5'),
+        Heading(name='RQ.SRS008.AES.Functions.SuppressOutputOfSensitiveValues', level=3, num='4.5.1'),
+        Heading(name='Invalid Parameters', level=2, num='4.6'),
+        Heading(name='RQ.SRS008.AES.Functions.InvalidParameters', level=3, num='4.6.1'),
+        Heading(name='Mismatched Values', level=2, num='4.7'),
+        Heading(name='RQ.SRS008.AES.Functions.Mismatched.Key', level=3, num='4.7.1'),
+        Heading(name='RQ.SRS008.AES.Functions.Mismatched.IV', level=3, num='4.7.2'),
+        Heading(name='RQ.SRS008.AES.Functions.Mismatched.AAD', level=3, num='4.7.3'),
+        Heading(name='RQ.SRS008.AES.Functions.Mismatched.Mode', level=3, num='4.7.4'),
+        Heading(name='Performance', level=2, num='4.8'),
+        Heading(name='RQ.SRS008.AES.Functions.Check.Performance', level=3, num='4.8.1'),
+        Heading(name='RQ.SRS008.AES.Function.Check.Performance.BestCase', level=3, num='4.8.2'),
+        Heading(name='RQ.SRS008.AES.Function.Check.Performance.WorstCase', level=3, num='4.8.3'),
+        Heading(name='RQ.SRS008.AES.Functions.Check.Compression', level=3, num='4.8.4'),
+        Heading(name='RQ.SRS008.AES.Functions.Check.Compression.LowCardinality', level=3, num='4.8.5'),
+        Heading(name='Encrypt Function', level=2, num='4.9'),
+        Heading(name='RQ.SRS008.AES.Encrypt.Function', level=3, num='4.9.1'),
+        Heading(name='RQ.SRS008.AES.Encrypt.Function.Syntax', level=3, num='4.9.2'),
+        Heading(name='RQ.SRS008.AES.Encrypt.Function.NIST.TestVectors', level=3, num='4.9.3'),
+        Heading(name='RQ.SRS008.AES.Encrypt.Function.Parameters.PlainText', level=3, num='4.9.4'),
+        Heading(name='RQ.SRS008.AES.Encrypt.Function.Parameters.Key', level=3, num='4.9.5'),
+        Heading(name='RQ.SRS008.AES.Encrypt.Function.Parameters.Mode', level=3, num='4.9.6'),
+        Heading(name='RQ.SRS008.AES.Encrypt.Function.Parameters.Mode.ValuesFormat', level=3, num='4.9.7'),
+        Heading(name='RQ.SRS008.AES.Encrypt.Function.Parameters.Mode.Value.Invalid', level=3, num='4.9.8'),
+        Heading(name='RQ.SRS008.AES.Encrypt.Function.Parameters.Mode.Values', level=3, num='4.9.9'),
+        Heading(name='RQ.SRS008.AES.Encrypt.Function.Parameters.InitializationVector', level=3, num='4.9.10'),
+        Heading(name='RQ.SRS008.AES.Encrypt.Function.Parameters.AdditionalAuthenticatedData', level=3, num='4.9.11'),
+        Heading(name='RQ.SRS008.AES.Encrypt.Function.Parameters.ReturnValue', level=3, num='4.9.12'),
+        Heading(name='RQ.SRS008.AES.Encrypt.Function.Key.Length.InvalidLengthError', level=3, num='4.9.13'),
+        Heading(name='RQ.SRS008.AES.Encrypt.Function.InitializationVector.Length.InvalidLengthError', level=3, num='4.9.14'),
+        Heading(name='RQ.SRS008.AES.Encrypt.Function.InitializationVector.NotValidForMode', level=3, num='4.9.15'),
+        Heading(name='RQ.SRS008.AES.Encrypt.Function.AdditionalAuthenticationData.NotValidForMode', level=3, num='4.9.16'),
+        Heading(name='RQ.SRS008.AES.Encrypt.Function.AdditionalAuthenticationData.Length', level=3, num='4.9.17'),
+        Heading(name='RQ.SRS008.AES.Encrypt.Function.NonGCMMode.KeyAndInitializationVector.Length', level=3, num='4.9.18'),
+        Heading(name='RQ.SRS008.AES.Encrypt.Function.GCMMode.KeyAndInitializationVector.Length', level=3, num='4.9.19'),
+        Heading(name='Decrypt Function', level=2, num='4.10'),
+        Heading(name='RQ.SRS008.AES.Decrypt.Function', level=3, num='4.10.1'),
+        Heading(name='RQ.SRS008.AES.Decrypt.Function.Syntax', level=3, num='4.10.2'),
+        Heading(name='RQ.SRS008.AES.Decrypt.Function.Parameters.CipherText', level=3, num='4.10.3'),
+        Heading(name='RQ.SRS008.AES.Decrypt.Function.Parameters.Key', level=3, num='4.10.4'),
+        Heading(name='RQ.SRS008.AES.Decrypt.Function.Parameters.Mode', level=3, num='4.10.5'),
+        Heading(name='RQ.SRS008.AES.Decrypt.Function.Parameters.Mode.ValuesFormat', level=3, num='4.10.6'),
+        Heading(name='RQ.SRS008.AES.Decrypt.Function.Parameters.Mode.Value.Invalid', level=3, num='4.10.7'),
+        Heading(name='RQ.SRS008.AES.Decrypt.Function.Parameters.Mode.Values', level=3, num='4.10.8'),
+        Heading(name='RQ.SRS008.AES.Decrypt.Function.Parameters.InitializationVector', level=3, num='4.10.9'),
+        Heading(name='RQ.SRS008.AES.Decrypt.Function.Parameters.AdditionalAuthenticatedData', level=3, num='4.10.10'),
+        Heading(name='RQ.SRS008.AES.Decrypt.Function.Parameters.ReturnValue', level=3, num='4.10.11'),
+        Heading(name='RQ.SRS008.AES.Decrypt.Function.Key.Length.InvalidLengthError', level=3, num='4.10.12'),
+        Heading(name='RQ.SRS008.AES.Decrypt.Function.InitializationVector.Length.InvalidLengthError', level=3, num='4.10.13'),
+        Heading(name='RQ.SRS008.AES.Decrypt.Function.InitializationVector.NotValidForMode', level=3, num='4.10.14'),
+        Heading(name='RQ.SRS008.AES.Decrypt.Function.AdditionalAuthenticationData.NotValidForMode', level=3, num='4.10.15'),
+        Heading(name='RQ.SRS008.AES.Decrypt.Function.AdditionalAuthenticationData.Length', level=3, num='4.10.16'),
+        Heading(name='RQ.SRS008.AES.Decrypt.Function.NonGCMMode.KeyAndInitializationVector.Length', level=3, num='4.10.17'),
+        Heading(name='RQ.SRS008.AES.Decrypt.Function.GCMMode.KeyAndInitializationVector.Length', level=3, num='4.10.18'),
+        Heading(name='MySQL Encrypt Function', level=2, num='4.11'),
+        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function', level=3, num='4.11.1'),
+        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Syntax', level=3, num='4.11.2'),
+        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.PlainText', level=3, num='4.11.3'),
+        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Key', level=3, num='4.11.4'),
+        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode', level=3, num='4.11.5'),
+        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.ValuesFormat', level=3, num='4.11.6'),
+        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Value.Invalid', level=3, num='4.11.7'),
+        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Values', level=3, num='4.11.8'),
+        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Values.GCM.Error', level=3, num='4.11.9'),
+        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Values.CTR.Error', level=3, num='4.11.10'),
+        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.InitializationVector', level=3, num='4.11.11'),
+        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.ReturnValue', level=3, num='4.11.12'),
+        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Key.Length.TooShortError', level=3, num='4.11.13'),
+        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Key.Length.TooLong', level=3, num='4.11.14'),
+        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.InitializationVector.Length.TooShortError', level=3, num='4.11.15'),
+        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.InitializationVector.Length.TooLong', level=3, num='4.11.16'),
+        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.InitializationVector.NotValidForMode', level=3, num='4.11.17'),
+        Heading(name='RQ.SRS008.AES.MySQL.Encrypt.Function.Mode.KeyAndInitializationVector.Length', level=3, num='4.11.18'),
+        Heading(name='MySQL Decrypt Function', level=2, num='4.12'),
+        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function', level=3, num='4.12.1'),
+        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Syntax', level=3, num='4.12.2'),
+        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.CipherText', level=3, num='4.12.3'),
+        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Key', level=3, num='4.12.4'),
+        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode', level=3, num='4.12.5'),
+        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.ValuesFormat', level=3, num='4.12.6'),
+        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Value.Invalid', level=3, num='4.12.7'),
+        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Values', level=3, num='4.12.8'),
+        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Values.GCM.Error', level=3, num='4.12.9'),
+        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Values.CTR.Error', level=3, num='4.12.10'),
+        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.InitializationVector', level=3, num='4.12.11'),
+        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.ReturnValue', level=3, num='4.12.12'),
+        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Key.Length.TooShortError', level=3, num='4.12.13'),
+        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Key.Length.TooLong', level=3, num='4.12.14'),
+        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.InitializationVector.Length.TooShortError', level=3, num='4.12.15'),
+        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.InitializationVector.Length.TooLong', level=3, num='4.12.16'),
+        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.InitializationVector.NotValidForMode', level=3, num='4.12.17'),
+        Heading(name='RQ.SRS008.AES.MySQL.Decrypt.Function.Mode.KeyAndInitializationVector.Length', level=3, num='4.12.18'),
         Heading(name='References', level=1, num='5'),
         ),
     requirements=(
         RQ_SRS008_AES_Functions,
-        RQ_SRS008_AES_Functions_Compatability_MySQL,
-        RQ_SRS008_AES_Functions_Compatability_Dictionaries,
-        RQ_SRS008_AES_Functions_Compatability_Engine_Database_MySQL,
-        RQ_SRS008_AES_Functions_Compatability_Engine_Table_MySQL,
-        RQ_SRS008_AES_Functions_Compatability_TableFunction_MySQL,
+        RQ_SRS008_AES_Functions_Compatibility_MySQL,
+        RQ_SRS008_AES_Functions_Compatibility_Dictionaries,
+        RQ_SRS008_AES_Functions_Compatibility_Engine_Database_MySQL,
+        RQ_SRS008_AES_Functions_Compatibility_Engine_Table_MySQL,
+        RQ_SRS008_AES_Functions_Compatibility_TableFunction_MySQL,
         RQ_SRS008_AES_Functions_DifferentModes,
         RQ_SRS008_AES_Functions_DataFromMultipleSources,
         RQ_SRS008_AES_Functions_SuppressOutputOfSensitiveValues,
@@ -1914,102 +1928,113 @@ SRS_008_ClickHouse_AES_Encryption_Functions = Specification(
 * 1 [Revision History](#revision-history)
 * 2 [Introduction](#introduction)
 * 3 [Terminology](#terminology)
+  * 3.1 [AES](#aes)
+  * 3.2 [AEAD](#aead)
 * 4 [Requirements](#requirements)
   * 4.1 [Generic](#generic)
     * 4.1.1 [RQ.SRS008.AES.Functions](#rqsrs008aesfunctions)
-    * 4.1.2 [RQ.SRS008.AES.Functions.Compatability.MySQL](#rqsrs008aesfunctionscompatabilitymysql)
-    * 4.1.3 [RQ.SRS008.AES.Functions.Compatability.Dictionaries](#rqsrs008aesfunctionscompatabilitydictionaries)
-    * 4.1.4 [RQ.SRS008.AES.Functions.Compatability.Engine.Database.MySQL](#rqsrs008aesfunctionscompatabilityenginedatabasemysql)
-    * 4.1.5 [RQ.SRS008.AES.Functions.Compatability.Engine.Table.MySQL](#rqsrs008aesfunctionscompatabilityenginetablemysql)
-    * 4.1.6 [RQ.SRS008.AES.Functions.Compatability.TableFunction.MySQL](#rqsrs008aesfunctionscompatabilitytablefunctionmysql)
-    * 4.1.7 [RQ.SRS008.AES.Functions.DifferentModes](#rqsrs008aesfunctionsdifferentmodes)
-    * 4.1.8 [RQ.SRS008.AES.Functions.DataFromMultipleSources](#rqsrs008aesfunctionsdatafrommultiplesources)
-    * 4.1.9 [RQ.SRS008.AES.Functions.SuppressOutputOfSensitiveValues](#rqsrs008aesfunctionssuppressoutputofsensitivevalues)
-    * 4.1.10 [RQ.SRS008.AES.Functions.InvalidParameters](#rqsrs008aesfunctionsinvalidparameters)
-    * 4.1.11 [RQ.SRS008.AES.Functions.Mismatched.Key](#rqsrs008aesfunctionsmismatchedkey)
-    * 4.1.12 [RQ.SRS008.AES.Functions.Mismatched.IV](#rqsrs008aesfunctionsmismatchediv)
-    * 4.1.13 [RQ.SRS008.AES.Functions.Mismatched.AAD](#rqsrs008aesfunctionsmismatchedaad)
-    * 4.1.14 [RQ.SRS008.AES.Functions.Mismatched.Mode](#rqsrs008aesfunctionsmismatchedmode)
-    * 4.1.15 [RQ.SRS008.AES.Functions.Check.Performance](#rqsrs008aesfunctionscheckperformance)
-    * 4.1.16 [RQ.SRS008.AES.Function.Check.Performance.BestCase](#rqsrs008aesfunctioncheckperformancebestcase)
-    * 4.1.17 [RQ.SRS008.AES.Function.Check.Performance.WorstCase](#rqsrs008aesfunctioncheckperformanceworstcase)
-    * 4.1.18 [RQ.SRS008.AES.Functions.Check.Compression](#rqsrs008aesfunctionscheckcompression)
-    * 4.1.19 [RQ.SRS008.AES.Functions.Check.Compression.LowCardinality](#rqsrs008aesfunctionscheckcompressionlowcardinality)
-  * 4.2 [Specific](#specific)
-    * 4.2.1 [RQ.SRS008.AES.Encrypt.Function](#rqsrs008aesencryptfunction)
-    * 4.2.2 [RQ.SRS008.AES.Encrypt.Function.Syntax](#rqsrs008aesencryptfunctionsyntax)
-    * 4.2.3 [RQ.SRS008.AES.Encrypt.Function.NIST.TestVectors](#rqsrs008aesencryptfunctionnisttestvectors)
-    * 4.2.4 [RQ.SRS008.AES.Encrypt.Function.Parameters.PlainText](#rqsrs008aesencryptfunctionparametersplaintext)
-    * 4.2.5 [RQ.SRS008.AES.Encrypt.Function.Parameters.Key](#rqsrs008aesencryptfunctionparameterskey)
-    * 4.2.6 [RQ.SRS008.AES.Encrypt.Function.Parameters.Mode](#rqsrs008aesencryptfunctionparametersmode)
-    * 4.2.7 [RQ.SRS008.AES.Encrypt.Function.Parameters.Mode.ValuesFormat](#rqsrs008aesencryptfunctionparametersmodevaluesformat)
-    * 4.2.8 [RQ.SRS008.AES.Encrypt.Function.Parameters.Mode.Value.Invalid](#rqsrs008aesencryptfunctionparametersmodevalueinvalid)
-    * 4.2.9 [RQ.SRS008.AES.Encrypt.Function.Parameters.Mode.Values](#rqsrs008aesencryptfunctionparametersmodevalues)
-    * 4.2.10 [RQ.SRS008.AES.Encrypt.Function.Parameters.InitializationVector](#rqsrs008aesencryptfunctionparametersinitializationvector)
-    * 4.2.11 [RQ.SRS008.AES.Encrypt.Function.Parameters.AdditionalAuthenticatedData](#rqsrs008aesencryptfunctionparametersadditionalauthenticateddata)
-    * 4.2.12 [RQ.SRS008.AES.Encrypt.Function.Parameters.ReturnValue](#rqsrs008aesencryptfunctionparametersreturnvalue)
-    * 4.2.13 [RQ.SRS008.AES.Encrypt.Function.Key.Length.InvalidLengthError](#rqsrs008aesencryptfunctionkeylengthinvalidlengtherror)
-    * 4.2.14 [RQ.SRS008.AES.Encrypt.Function.InitializationVector.Length.InvalidLengthError](#rqsrs008aesencryptfunctioninitializationvectorlengthinvalidlengtherror)
-    * 4.2.15 [RQ.SRS008.AES.Encrypt.Function.InitializationVector.NotValidForMode](#rqsrs008aesencryptfunctioninitializationvectornotvalidformode)
-    * 4.2.16 [RQ.SRS008.AES.Encrypt.Function.AdditionalAuthenticationData.NotValidForMode](#rqsrs008aesencryptfunctionadditionalauthenticationdatanotvalidformode)
-    * 4.2.17 [RQ.SRS008.AES.Encrypt.Function.AdditionalAuthenticationData.Length](#rqsrs008aesencryptfunctionadditionalauthenticationdatalength)
-    * 4.2.18 [RQ.SRS008.AES.Encrypt.Function.NonGCMMode.KeyAndInitializationVector.Length](#rqsrs008aesencryptfunctionnongcmmodekeyandinitializationvectorlength)
-    * 4.2.19 [RQ.SRS008.AES.Encrypt.Function.GCMMode.KeyAndInitializationVector.Length](#rqsrs008aesencryptfunctiongcmmodekeyandinitializationvectorlength)
-    * 4.2.20 [RQ.SRS008.AES.Decrypt.Function](#rqsrs008aesdecryptfunction)
-    * 4.2.21 [RQ.SRS008.AES.Decrypt.Function.Syntax](#rqsrs008aesdecryptfunctionsyntax)
-    * 4.2.22 [RQ.SRS008.AES.Decrypt.Function.Parameters.CipherText](#rqsrs008aesdecryptfunctionparametersciphertext)
-    * 4.2.23 [RQ.SRS008.AES.Decrypt.Function.Parameters.Key](#rqsrs008aesdecryptfunctionparameterskey)
-    * 4.2.24 [RQ.SRS008.AES.Decrypt.Function.Parameters.Mode](#rqsrs008aesdecryptfunctionparametersmode)
-    * 4.2.25 [RQ.SRS008.AES.Decrypt.Function.Parameters.Mode.ValuesFormat](#rqsrs008aesdecryptfunctionparametersmodevaluesformat)
-    * 4.2.26 [RQ.SRS008.AES.Decrypt.Function.Parameters.Mode.Value.Invalid](#rqsrs008aesdecryptfunctionparametersmodevalueinvalid)
-    * 4.2.27 [RQ.SRS008.AES.Decrypt.Function.Parameters.Mode.Values](#rqsrs008aesdecryptfunctionparametersmodevalues)
-    * 4.2.28 [RQ.SRS008.AES.Decrypt.Function.Parameters.InitializationVector](#rqsrs008aesdecryptfunctionparametersinitializationvector)
-    * 4.2.29 [RQ.SRS008.AES.Decrypt.Function.Parameters.AdditionalAuthenticatedData](#rqsrs008aesdecryptfunctionparametersadditionalauthenticateddata)
-    * 4.2.30 [RQ.SRS008.AES.Decrypt.Function.Parameters.ReturnValue](#rqsrs008aesdecryptfunctionparametersreturnvalue)
-    * 4.2.31 [RQ.SRS008.AES.Decrypt.Function.Key.Length.InvalidLengthError](#rqsrs008aesdecryptfunctionkeylengthinvalidlengtherror)
-    * 4.2.32 [RQ.SRS008.AES.Decrypt.Function.InitializationVector.Length.InvalidLengthError](#rqsrs008aesdecryptfunctioninitializationvectorlengthinvalidlengtherror)
-    * 4.2.33 [RQ.SRS008.AES.Decrypt.Function.InitializationVector.NotValidForMode](#rqsrs008aesdecryptfunctioninitializationvectornotvalidformode)
-    * 4.2.34 [RQ.SRS008.AES.Decrypt.Function.AdditionalAuthenticationData.NotValidForMode](#rqsrs008aesdecryptfunctionadditionalauthenticationdatanotvalidformode)
-    * 4.2.35 [RQ.SRS008.AES.Decrypt.Function.AdditionalAuthenticationData.Length](#rqsrs008aesdecryptfunctionadditionalauthenticationdatalength)
-    * 4.2.36 [RQ.SRS008.AES.Decrypt.Function.NonGCMMode.KeyAndInitializationVector.Length](#rqsrs008aesdecryptfunctionnongcmmodekeyandinitializationvectorlength)
-    * 4.2.37 [RQ.SRS008.AES.Decrypt.Function.GCMMode.KeyAndInitializationVector.Length](#rqsrs008aesdecryptfunctiongcmmodekeyandinitializationvectorlength)
-  * 4.3 [MySQL Specific Functions](#mysql-specific-functions)
-    * 4.3.1 [RQ.SRS008.AES.MySQL.Encrypt.Function](#rqsrs008aesmysqlencryptfunction)
-    * 4.3.2 [RQ.SRS008.AES.MySQL.Encrypt.Function.Syntax](#rqsrs008aesmysqlencryptfunctionsyntax)
-    * 4.3.3 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.PlainText](#rqsrs008aesmysqlencryptfunctionparametersplaintext)
-    * 4.3.4 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Key](#rqsrs008aesmysqlencryptfunctionparameterskey)
-    * 4.3.5 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode](#rqsrs008aesmysqlencryptfunctionparametersmode)
-    * 4.3.6 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.ValuesFormat](#rqsrs008aesmysqlencryptfunctionparametersmodevaluesformat)
-    * 4.3.7 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Value.Invalid](#rqsrs008aesmysqlencryptfunctionparametersmodevalueinvalid)
-    * 4.3.8 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Values](#rqsrs008aesmysqlencryptfunctionparametersmodevalues)
-    * 4.3.9 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Values.GCM.Error](#rqsrs008aesmysqlencryptfunctionparametersmodevaluesgcmerror)
-    * 4.3.10 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Values.CTR.Error](#rqsrs008aesmysqlencryptfunctionparametersmodevaluesctrerror)
-    * 4.3.11 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.InitializationVector](#rqsrs008aesmysqlencryptfunctionparametersinitializationvector)
-    * 4.3.12 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.ReturnValue](#rqsrs008aesmysqlencryptfunctionparametersreturnvalue)
-    * 4.3.13 [RQ.SRS008.AES.MySQL.Encrypt.Function.Key.Length.TooShortError](#rqsrs008aesmysqlencryptfunctionkeylengthtooshorterror)
-    * 4.3.14 [RQ.SRS008.AES.MySQL.Encrypt.Function.Key.Length.TooLong](#rqsrs008aesmysqlencryptfunctionkeylengthtoolong)
-    * 4.3.15 [RQ.SRS008.AES.MySQL.Encrypt.Function.InitializationVector.Length.TooShortError](#rqsrs008aesmysqlencryptfunctioninitializationvectorlengthtooshorterror)
-    * 4.3.16 [RQ.SRS008.AES.MySQL.Encrypt.Function.InitializationVector.Length.TooLong](#rqsrs008aesmysqlencryptfunctioninitializationvectorlengthtoolong)
-    * 4.3.17 [RQ.SRS008.AES.MySQL.Encrypt.Function.InitializationVector.NotValidForMode](#rqsrs008aesmysqlencryptfunctioninitializationvectornotvalidformode)
-    * 4.3.18 [RQ.SRS008.AES.MySQL.Encrypt.Function.Mode.KeyAndInitializationVector.Length](#rqsrs008aesmysqlencryptfunctionmodekeyandinitializationvectorlength)
-    * 4.3.19 [RQ.SRS008.AES.MySQL.Decrypt.Function](#rqsrs008aesmysqldecryptfunction)
-    * 4.3.20 [RQ.SRS008.AES.MySQL.Decrypt.Function.Syntax](#rqsrs008aesmysqldecryptfunctionsyntax)
-    * 4.3.21 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.CipherText](#rqsrs008aesmysqldecryptfunctionparametersciphertext)
-    * 4.3.22 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Key](#rqsrs008aesmysqldecryptfunctionparameterskey)
-    * 4.3.23 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode](#rqsrs008aesmysqldecryptfunctionparametersmode)
-    * 4.3.24 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.ValuesFormat](#rqsrs008aesmysqldecryptfunctionparametersmodevaluesformat)
-    * 4.3.25 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Value.Invalid](#rqsrs008aesmysqldecryptfunctionparametersmodevalueinvalid)
-    * 4.3.26 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Values](#rqsrs008aesmysqldecryptfunctionparametersmodevalues)
-    * 4.3.27 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Values.GCM.Error](#rqsrs008aesmysqldecryptfunctionparametersmodevaluesgcmerror)
-    * 4.3.28 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Values.CTR.Error](#rqsrs008aesmysqldecryptfunctionparametersmodevaluesctrerror)
-    * 4.3.29 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.InitializationVector](#rqsrs008aesmysqldecryptfunctionparametersinitializationvector)
-    * 4.3.30 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.ReturnValue](#rqsrs008aesmysqldecryptfunctionparametersreturnvalue)
-    * 4.3.31 [RQ.SRS008.AES.MySQL.Decrypt.Function.Key.Length.TooShortError](#rqsrs008aesmysqldecryptfunctionkeylengthtooshorterror)
-    * 4.3.32 [RQ.SRS008.AES.MySQL.Decrypt.Function.Key.Length.TooLong](#rqsrs008aesmysqldecryptfunctionkeylengthtoolong)
-    * 4.3.33 [RQ.SRS008.AES.MySQL.Decrypt.Function.InitializationVector.Length.TooShortError](#rqsrs008aesmysqldecryptfunctioninitializationvectorlengthtooshorterror)
-    * 4.3.34 [RQ.SRS008.AES.MySQL.Decrypt.Function.InitializationVector.Length.TooLong](#rqsrs008aesmysqldecryptfunctioninitializationvectorlengthtoolong)
-    * 4.3.35 [RQ.SRS008.AES.MySQL.Decrypt.Function.InitializationVector.NotValidForMode](#rqsrs008aesmysqldecryptfunctioninitializationvectornotvalidformode)
-    * 4.3.36 [RQ.SRS008.AES.MySQL.Decrypt.Function.Mode.KeyAndInitializationVector.Length](#rqsrs008aesmysqldecryptfunctionmodekeyandinitializationvectorlength)
+  * 4.2 [Compatibility](#compatibility)
+    * 4.2.1 [RQ.SRS008.AES.Functions.Compatibility.MySQL](#rqsrs008aesfunctionscompatibilitymysql)
+    * 4.2.2 [RQ.SRS008.AES.Functions.Compatibility.Dictionaries](#rqsrs008aesfunctionscompatibilitydictionaries)
+    * 4.2.3 [RQ.SRS008.AES.Functions.Compatibility.Engine.Database.MySQL](#rqsrs008aesfunctionscompatibilityenginedatabasemysql)
+    * 4.2.4 [RQ.SRS008.AES.Functions.Compatibility.Engine.Table.MySQL](#rqsrs008aesfunctionscompatibilityenginetablemysql)
+    * 4.2.5 [RQ.SRS008.AES.Functions.Compatibility.TableFunction.MySQL](#rqsrs008aesfunctionscompatibilitytablefunctionmysql)
+  * 4.3 [Different Modes](#different-modes)
+    * 4.3.1 [RQ.SRS008.AES.Functions.DifferentModes](#rqsrs008aesfunctionsdifferentmodes)
+  * 4.4 [Multiple Sources](#multiple-sources)
+    * 4.4.1 [RQ.SRS008.AES.Functions.DataFromMultipleSources](#rqsrs008aesfunctionsdatafrommultiplesources)
+  * 4.5 [Suppressing Sensitive Values](#suppressing-sensitive-values)
+    * 4.5.1 [RQ.SRS008.AES.Functions.SuppressOutputOfSensitiveValues](#rqsrs008aesfunctionssuppressoutputofsensitivevalues)
+  * 4.6 [Invalid Parameters](#invalid-parameters)
+    * 4.6.1 [RQ.SRS008.AES.Functions.InvalidParameters](#rqsrs008aesfunctionsinvalidparameters)
+  * 4.7 [Mismatched Values](#mismatched-values)
+    * 4.7.1 [RQ.SRS008.AES.Functions.Mismatched.Key](#rqsrs008aesfunctionsmismatchedkey)
+    * 4.7.2 [RQ.SRS008.AES.Functions.Mismatched.IV](#rqsrs008aesfunctionsmismatchediv)
+    * 4.7.3 [RQ.SRS008.AES.Functions.Mismatched.AAD](#rqsrs008aesfunctionsmismatchedaad)
+    * 4.7.4 [RQ.SRS008.AES.Functions.Mismatched.Mode](#rqsrs008aesfunctionsmismatchedmode)
+  * 4.8 [Performance](#performance)
+    * 4.8.1 [RQ.SRS008.AES.Functions.Check.Performance](#rqsrs008aesfunctionscheckperformance)
+    * 4.8.2 [RQ.SRS008.AES.Function.Check.Performance.BestCase](#rqsrs008aesfunctioncheckperformancebestcase)
+    * 4.8.3 [RQ.SRS008.AES.Function.Check.Performance.WorstCase](#rqsrs008aesfunctioncheckperformanceworstcase)
+    * 4.8.4 [RQ.SRS008.AES.Functions.Check.Compression](#rqsrs008aesfunctionscheckcompression)
+    * 4.8.5 [RQ.SRS008.AES.Functions.Check.Compression.LowCardinality](#rqsrs008aesfunctionscheckcompressionlowcardinality)
+  * 4.9 [Encrypt Function](#encrypt-function)
+    * 4.9.1 [RQ.SRS008.AES.Encrypt.Function](#rqsrs008aesencryptfunction)
+    * 4.9.2 [RQ.SRS008.AES.Encrypt.Function.Syntax](#rqsrs008aesencryptfunctionsyntax)
+    * 4.9.3 [RQ.SRS008.AES.Encrypt.Function.NIST.TestVectors](#rqsrs008aesencryptfunctionnisttestvectors)
+    * 4.9.4 [RQ.SRS008.AES.Encrypt.Function.Parameters.PlainText](#rqsrs008aesencryptfunctionparametersplaintext)
+    * 4.9.5 [RQ.SRS008.AES.Encrypt.Function.Parameters.Key](#rqsrs008aesencryptfunctionparameterskey)
+    * 4.9.6 [RQ.SRS008.AES.Encrypt.Function.Parameters.Mode](#rqsrs008aesencryptfunctionparametersmode)
+    * 4.9.7 [RQ.SRS008.AES.Encrypt.Function.Parameters.Mode.ValuesFormat](#rqsrs008aesencryptfunctionparametersmodevaluesformat)
+    * 4.9.8 [RQ.SRS008.AES.Encrypt.Function.Parameters.Mode.Value.Invalid](#rqsrs008aesencryptfunctionparametersmodevalueinvalid)
+    * 4.9.9 [RQ.SRS008.AES.Encrypt.Function.Parameters.Mode.Values](#rqsrs008aesencryptfunctionparametersmodevalues)
+    * 4.9.10 [RQ.SRS008.AES.Encrypt.Function.Parameters.InitializationVector](#rqsrs008aesencryptfunctionparametersinitializationvector)
+    * 4.9.11 [RQ.SRS008.AES.Encrypt.Function.Parameters.AdditionalAuthenticatedData](#rqsrs008aesencryptfunctionparametersadditionalauthenticateddata)
+    * 4.9.12 [RQ.SRS008.AES.Encrypt.Function.Parameters.ReturnValue](#rqsrs008aesencryptfunctionparametersreturnvalue)
+    * 4.9.13 [RQ.SRS008.AES.Encrypt.Function.Key.Length.InvalidLengthError](#rqsrs008aesencryptfunctionkeylengthinvalidlengtherror)
+    * 4.9.14 [RQ.SRS008.AES.Encrypt.Function.InitializationVector.Length.InvalidLengthError](#rqsrs008aesencryptfunctioninitializationvectorlengthinvalidlengtherror)
+    * 4.9.15 [RQ.SRS008.AES.Encrypt.Function.InitializationVector.NotValidForMode](#rqsrs008aesencryptfunctioninitializationvectornotvalidformode)
+    * 4.9.16 [RQ.SRS008.AES.Encrypt.Function.AdditionalAuthenticationData.NotValidForMode](#rqsrs008aesencryptfunctionadditionalauthenticationdatanotvalidformode)
+    * 4.9.17 [RQ.SRS008.AES.Encrypt.Function.AdditionalAuthenticationData.Length](#rqsrs008aesencryptfunctionadditionalauthenticationdatalength)
+    * 4.9.18 [RQ.SRS008.AES.Encrypt.Function.NonGCMMode.KeyAndInitializationVector.Length](#rqsrs008aesencryptfunctionnongcmmodekeyandinitializationvectorlength)
+    * 4.9.19 [RQ.SRS008.AES.Encrypt.Function.GCMMode.KeyAndInitializationVector.Length](#rqsrs008aesencryptfunctiongcmmodekeyandinitializationvectorlength)
+  * 4.10 [Decrypt Function](#decrypt-function)
+    * 4.10.1 [RQ.SRS008.AES.Decrypt.Function](#rqsrs008aesdecryptfunction)
+    * 4.10.2 [RQ.SRS008.AES.Decrypt.Function.Syntax](#rqsrs008aesdecryptfunctionsyntax)
+    * 4.10.3 [RQ.SRS008.AES.Decrypt.Function.Parameters.CipherText](#rqsrs008aesdecryptfunctionparametersciphertext)
+    * 4.10.4 [RQ.SRS008.AES.Decrypt.Function.Parameters.Key](#rqsrs008aesdecryptfunctionparameterskey)
+    * 4.10.5 [RQ.SRS008.AES.Decrypt.Function.Parameters.Mode](#rqsrs008aesdecryptfunctionparametersmode)
+    * 4.10.6 [RQ.SRS008.AES.Decrypt.Function.Parameters.Mode.ValuesFormat](#rqsrs008aesdecryptfunctionparametersmodevaluesformat)
+    * 4.10.7 [RQ.SRS008.AES.Decrypt.Function.Parameters.Mode.Value.Invalid](#rqsrs008aesdecryptfunctionparametersmodevalueinvalid)
+    * 4.10.8 [RQ.SRS008.AES.Decrypt.Function.Parameters.Mode.Values](#rqsrs008aesdecryptfunctionparametersmodevalues)
+    * 4.10.9 [RQ.SRS008.AES.Decrypt.Function.Parameters.InitializationVector](#rqsrs008aesdecryptfunctionparametersinitializationvector)
+    * 4.10.10 [RQ.SRS008.AES.Decrypt.Function.Parameters.AdditionalAuthenticatedData](#rqsrs008aesdecryptfunctionparametersadditionalauthenticateddata)
+    * 4.10.11 [RQ.SRS008.AES.Decrypt.Function.Parameters.ReturnValue](#rqsrs008aesdecryptfunctionparametersreturnvalue)
+    * 4.10.12 [RQ.SRS008.AES.Decrypt.Function.Key.Length.InvalidLengthError](#rqsrs008aesdecryptfunctionkeylengthinvalidlengtherror)
+    * 4.10.13 [RQ.SRS008.AES.Decrypt.Function.InitializationVector.Length.InvalidLengthError](#rqsrs008aesdecryptfunctioninitializationvectorlengthinvalidlengtherror)
+    * 4.10.14 [RQ.SRS008.AES.Decrypt.Function.InitializationVector.NotValidForMode](#rqsrs008aesdecryptfunctioninitializationvectornotvalidformode)
+    * 4.10.15 [RQ.SRS008.AES.Decrypt.Function.AdditionalAuthenticationData.NotValidForMode](#rqsrs008aesdecryptfunctionadditionalauthenticationdatanotvalidformode)
+    * 4.10.16 [RQ.SRS008.AES.Decrypt.Function.AdditionalAuthenticationData.Length](#rqsrs008aesdecryptfunctionadditionalauthenticationdatalength)
+    * 4.10.17 [RQ.SRS008.AES.Decrypt.Function.NonGCMMode.KeyAndInitializationVector.Length](#rqsrs008aesdecryptfunctionnongcmmodekeyandinitializationvectorlength)
+    * 4.10.18 [RQ.SRS008.AES.Decrypt.Function.GCMMode.KeyAndInitializationVector.Length](#rqsrs008aesdecryptfunctiongcmmodekeyandinitializationvectorlength)
+  * 4.11 [MySQL Encrypt Function](#mysql-encrypt-function)
+    * 4.11.1 [RQ.SRS008.AES.MySQL.Encrypt.Function](#rqsrs008aesmysqlencryptfunction)
+    * 4.11.2 [RQ.SRS008.AES.MySQL.Encrypt.Function.Syntax](#rqsrs008aesmysqlencryptfunctionsyntax)
+    * 4.11.3 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.PlainText](#rqsrs008aesmysqlencryptfunctionparametersplaintext)
+    * 4.11.4 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Key](#rqsrs008aesmysqlencryptfunctionparameterskey)
+    * 4.11.5 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode](#rqsrs008aesmysqlencryptfunctionparametersmode)
+    * 4.11.6 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.ValuesFormat](#rqsrs008aesmysqlencryptfunctionparametersmodevaluesformat)
+    * 4.11.7 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Value.Invalid](#rqsrs008aesmysqlencryptfunctionparametersmodevalueinvalid)
+    * 4.11.8 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Values](#rqsrs008aesmysqlencryptfunctionparametersmodevalues)
+    * 4.11.9 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Values.GCM.Error](#rqsrs008aesmysqlencryptfunctionparametersmodevaluesgcmerror)
+    * 4.11.10 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.Values.CTR.Error](#rqsrs008aesmysqlencryptfunctionparametersmodevaluesctrerror)
+    * 4.11.11 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.InitializationVector](#rqsrs008aesmysqlencryptfunctionparametersinitializationvector)
+    * 4.11.12 [RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.ReturnValue](#rqsrs008aesmysqlencryptfunctionparametersreturnvalue)
+    * 4.11.13 [RQ.SRS008.AES.MySQL.Encrypt.Function.Key.Length.TooShortError](#rqsrs008aesmysqlencryptfunctionkeylengthtooshorterror)
+    * 4.11.14 [RQ.SRS008.AES.MySQL.Encrypt.Function.Key.Length.TooLong](#rqsrs008aesmysqlencryptfunctionkeylengthtoolong)
+    * 4.11.15 [RQ.SRS008.AES.MySQL.Encrypt.Function.InitializationVector.Length.TooShortError](#rqsrs008aesmysqlencryptfunctioninitializationvectorlengthtooshorterror)
+    * 4.11.16 [RQ.SRS008.AES.MySQL.Encrypt.Function.InitializationVector.Length.TooLong](#rqsrs008aesmysqlencryptfunctioninitializationvectorlengthtoolong)
+    * 4.11.17 [RQ.SRS008.AES.MySQL.Encrypt.Function.InitializationVector.NotValidForMode](#rqsrs008aesmysqlencryptfunctioninitializationvectornotvalidformode)
+    * 4.11.18 [RQ.SRS008.AES.MySQL.Encrypt.Function.Mode.KeyAndInitializationVector.Length](#rqsrs008aesmysqlencryptfunctionmodekeyandinitializationvectorlength)
+  * 4.12 [MySQL Decrypt Function](#mysql-decrypt-function)
+    * 4.12.1 [RQ.SRS008.AES.MySQL.Decrypt.Function](#rqsrs008aesmysqldecryptfunction)
+    * 4.12.2 [RQ.SRS008.AES.MySQL.Decrypt.Function.Syntax](#rqsrs008aesmysqldecryptfunctionsyntax)
+    * 4.12.3 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.CipherText](#rqsrs008aesmysqldecryptfunctionparametersciphertext)
+    * 4.12.4 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Key](#rqsrs008aesmysqldecryptfunctionparameterskey)
+    * 4.12.5 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode](#rqsrs008aesmysqldecryptfunctionparametersmode)
+    * 4.12.6 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.ValuesFormat](#rqsrs008aesmysqldecryptfunctionparametersmodevaluesformat)
+    * 4.12.7 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Value.Invalid](#rqsrs008aesmysqldecryptfunctionparametersmodevalueinvalid)
+    * 4.12.8 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Values](#rqsrs008aesmysqldecryptfunctionparametersmodevalues)
+    * 4.12.9 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Values.GCM.Error](#rqsrs008aesmysqldecryptfunctionparametersmodevaluesgcmerror)
+    * 4.12.10 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.Values.CTR.Error](#rqsrs008aesmysqldecryptfunctionparametersmodevaluesctrerror)
+    * 4.12.11 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.InitializationVector](#rqsrs008aesmysqldecryptfunctionparametersinitializationvector)
+    * 4.12.12 [RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.ReturnValue](#rqsrs008aesmysqldecryptfunctionparametersreturnvalue)
+    * 4.12.13 [RQ.SRS008.AES.MySQL.Decrypt.Function.Key.Length.TooShortError](#rqsrs008aesmysqldecryptfunctionkeylengthtooshorterror)
+    * 4.12.14 [RQ.SRS008.AES.MySQL.Decrypt.Function.Key.Length.TooLong](#rqsrs008aesmysqldecryptfunctionkeylengthtoolong)
+    * 4.12.15 [RQ.SRS008.AES.MySQL.Decrypt.Function.InitializationVector.Length.TooShortError](#rqsrs008aesmysqldecryptfunctioninitializationvectorlengthtooshorterror)
+    * 4.12.16 [RQ.SRS008.AES.MySQL.Decrypt.Function.InitializationVector.Length.TooLong](#rqsrs008aesmysqldecryptfunctioninitializationvectorlengthtoolong)
+    * 4.12.17 [RQ.SRS008.AES.MySQL.Decrypt.Function.InitializationVector.NotValidForMode](#rqsrs008aesmysqldecryptfunctioninitializationvectornotvalidformode)
+    * 4.12.18 [RQ.SRS008.AES.MySQL.Decrypt.Function.Mode.KeyAndInitializationVector.Length](#rqsrs008aesmysqldecryptfunctionmodekeyandinitializationvectorlength)
 * 5 [References](#references)
 
 ## Revision History
@@ -2030,9 +2055,14 @@ accessed on remote [MySQL] servers via [MySQL Dictionary] or [MySQL Database Eng
 
 ## Terminology
 
-* **AES** -
+### AES
+
   Advanced Encryption Standard ([AES])
 
+### AEAD
+
+  Authenticated Encryption with Associated Data
+
 ## Requirements
 
 ### Generic
@@ -2042,38 +2072,44 @@ version: 1.0
 
 [ClickHouse] SHALL support [AES] encryption functions to encrypt and decrypt data.
 
-#### RQ.SRS008.AES.Functions.Compatability.MySQL
+### Compatibility
+
+#### RQ.SRS008.AES.Functions.Compatibility.MySQL
 version: 1.0
 
 [ClickHouse] SHALL support [AES] encryption functions compatible with [MySQL 5.7].
 
-#### RQ.SRS008.AES.Functions.Compatability.Dictionaries
+#### RQ.SRS008.AES.Functions.Compatibility.Dictionaries
 version: 1.0
 
 [ClickHouse] SHALL support encryption and decryption of data accessed on remote
 [MySQL] servers using [MySQL Dictionary].
 
-#### RQ.SRS008.AES.Functions.Compatability.Engine.Database.MySQL
+#### RQ.SRS008.AES.Functions.Compatibility.Engine.Database.MySQL
 version: 1.0
 
 [ClickHouse] SHALL support encryption and decryption of data accessed using [MySQL Database Engine],
 
-#### RQ.SRS008.AES.Functions.Compatability.Engine.Table.MySQL
+#### RQ.SRS008.AES.Functions.Compatibility.Engine.Table.MySQL
 version: 1.0
 
 [ClickHouse] SHALL support encryption and decryption of data accessed using [MySQL Table Engine].
 
-#### RQ.SRS008.AES.Functions.Compatability.TableFunction.MySQL
+#### RQ.SRS008.AES.Functions.Compatibility.TableFunction.MySQL
 version: 1.0
 
 [ClickHouse] SHALL support encryption and decryption of data accessed using [MySQL Table Function].
 
+### Different Modes
+
 #### RQ.SRS008.AES.Functions.DifferentModes
 version: 1.0
 
 [ClickHouse] SHALL allow different modes to be supported in a single SQL statement
 using explicit function parameters.
 
+### Multiple Sources
+
 #### RQ.SRS008.AES.Functions.DataFromMultipleSources
 version: 1.0
 
@@ -2082,17 +2118,23 @@ in the `SELECT` statement, including [ClickHouse] [MergeTree] table as well as [
 [MySQL Database Engine], [MySQL Table Engine], and [MySQL Table Function]
 with possibly different encryption schemes.
 
+### Suppressing Sensitive Values
+
 #### RQ.SRS008.AES.Functions.SuppressOutputOfSensitiveValues
 version: 1.0
 
 [ClickHouse] SHALL suppress output of [AES] `string` and `key` parameters to the system log,
 error log, and `query_log` table to prevent leakage of sensitive values.
 
+### Invalid Parameters
+
 #### RQ.SRS008.AES.Functions.InvalidParameters
 version: 1.0
 
 [ClickHouse] SHALL return an error when parameters are invalid.
 
+### Mismatched Values
+
 #### RQ.SRS008.AES.Functions.Mismatched.Key
 version: 1.0
 
@@ -2113,6 +2155,8 @@ version: 1.0
 
 [ClickHouse] SHALL return an error or garbage for mismatched mode.
 
+### Performance
+
 #### RQ.SRS008.AES.Functions.Check.Performance
 version: 1.0
 
@@ -2141,7 +2185,7 @@ version: 1.0
 Effect of [AES] encryption on the compression of a column with [LowCardinality] data type
 SHALL be measured.
 
-### Specific
+### Encrypt Function
 
 #### RQ.SRS008.AES.Encrypt.Function
 version: 1.0
@@ -2163,21 +2207,23 @@ version: 1.0
 [ClickHouse] `encrypt` function output SHALL produce output that matches [NIST test vectors].
 
 #### RQ.SRS008.AES.Encrypt.Function.Parameters.PlainText
-version: 1.0
+version: 2.0
+
+[ClickHouse] SHALL support `plaintext` with `String`, `FixedString`, `Nullable(String)`,
+`Nullable(FixedString)`, `LowCardinality(String)`, or `LowCardinality(FixedString(N))` data types as
+the second parameter to the `encrypt` function that SHALL specify the data to be encrypted.
 
-[ClickHouse] SHALL support `plaintext` accepting any data type as
-the first parameter to the `encrypt` function that SHALL specify the data to be encrypted.
 
 #### RQ.SRS008.AES.Encrypt.Function.Parameters.Key
 version: 1.0
 
 [ClickHouse] SHALL support `key` with `String` or `FixedString` data types
-as the second parameter to the `encrypt` function that SHALL specify the encryption key.
+as the  parameter to the `encrypt` function that SHALL specify the encryption key.
 
 #### RQ.SRS008.AES.Encrypt.Function.Parameters.Mode
 version: 1.0
 
-[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the third parameter
+[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the first parameter
 to the `encrypt` function that SHALL specify encryption key length and block encryption mode.
 
 #### RQ.SRS008.AES.Encrypt.Function.Parameters.Mode.ValuesFormat
@@ -2216,13 +2262,13 @@ of the `encrypt` function:
 * `aes-192-ofb` that SHALL use [OFB] block mode encryption with 192 bit key
 * `aes-256-ofb` that SHALL use [OFB] block mode encryption with 256 bit key
 * `aes-128-gcm` that SHALL use [GCM] block mode encryption with 128 bit key
-   and `AEAD` 16-byte tag is appended to the resulting ciphertext according to
+   and [AEAD] 16-byte tag is appended to the resulting ciphertext according to
    the [RFC5116]
 * `aes-192-gcm` that SHALL use [GCM] block mode encryption with 192 bit key
-   and `AEAD` 16-byte tag is appended to the resulting ciphertext according to
+   and [AEAD] 16-byte tag is appended to the resulting ciphertext according to
    the [RFC5116]
 * `aes-256-gcm` that SHALL use [GCM] block mode encryption with 256 bit key
-   and `AEAD` 16-byte tag is appended to the resulting ciphertext according to
+   and [AEAD] 16-byte tag is appended to the resulting ciphertext according to
    the [RFC5116]
 *  `aes-128-ctr` that SHALL use [CTR] block mode encryption with 128 bit key
 *  `aes-192-ctr` that SHALL use [CTR] block mode encryption with 192 bit key
@@ -2311,6 +2357,8 @@ when using GCM modes
 * `aes-192-gcm` mode and `key` is not 24 bytes or `iv` is not specified
 * `aes-256-gcm` mode and `key` is not 32 bytes or `iv` is not specified
 
+### Decrypt Function
+
 #### RQ.SRS008.AES.Decrypt.Function
 version: 1.0
 
@@ -2329,18 +2377,18 @@ decrypt(mode, ciphertext, key, [iv, aad])
 version: 1.0
 
 [ClickHouse] SHALL support `ciphertext` accepting `FixedString` or `String` data types as
-the first parameter to the `decrypt` function that SHALL specify the data to be decrypted.
+the second parameter to the `decrypt` function that SHALL specify the data to be decrypted.
 
 #### RQ.SRS008.AES.Decrypt.Function.Parameters.Key
 version: 1.0
 
 [ClickHouse] SHALL support `key` with `String` or `FixedString` data types
-as the second parameter to the `decrypt` function that SHALL specify the encryption key.
+as the third parameter to the `decrypt` function that SHALL specify the encryption key.
 
 #### RQ.SRS008.AES.Decrypt.Function.Parameters.Mode
 version: 1.0
 
-[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the third parameter
+[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the first parameter
 to the `decrypt` function that SHALL specify encryption key length and block encryption mode.
 
 #### RQ.SRS008.AES.Decrypt.Function.Parameters.Mode.ValuesFormat
@@ -2419,7 +2467,7 @@ version: 1.0
 #### RQ.SRS008.AES.Decrypt.Function.InitializationVector.Length.InvalidLengthError
 version: 1.0
 
-[ClickHouse] SHALL return an error if the `iv` is speficified and the length is not exact for the `decrypt` function for a given block mode.
+[ClickHouse] SHALL return an error if the `iv` is specified and the length is not exact for the `decrypt` function for a given block mode.
 
 #### RQ.SRS008.AES.Decrypt.Function.InitializationVector.NotValidForMode
 version: 1.0
@@ -2476,7 +2524,7 @@ when using GCM modes
 * `aes-192-gcm` mode and `key` is not 24 bytes or `iv` is not specified
 * `aes-256-gcm` mode and `key` is not 32 bytes or `iv` is not specified
 
-### MySQL Specific Functions
+### MySQL Encrypt Function
 
 #### RQ.SRS008.AES.MySQL.Encrypt.Function
 version: 1.0
@@ -2493,21 +2541,22 @@ aes_encrypt_mysql(mode, plaintext, key, [iv])
 ```
 
 #### RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.PlainText
-version: 1.0
+version: 2.0
 
-[ClickHouse] SHALL support `plaintext` accepting any data type as
-the first parameter to the `aes_encrypt_mysql` function that SHALL specify the data to be encrypted.
+[ClickHouse] SHALL support `plaintext` with `String`, `FixedString`, `Nullable(String)`,
+`Nullable(FixedString)`, `LowCardinality(String)`, or `LowCardinality(FixedString(N))` data types as
+the second parameter to the `aes_encrypt_mysql` function that SHALL specify the data to be encrypted.
 
 #### RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Key
 version: 1.0
 
 [ClickHouse] SHALL support `key` with `String` or `FixedString` data types
-as the second parameter to the `aes_encrypt_mysql` function that SHALL specify the encryption key.
+as the third parameter to the `aes_encrypt_mysql` function that SHALL specify the encryption key.
 
 #### RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode
 version: 1.0
 
-[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the third parameter
+[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the first parameter
 to the `aes_encrypt_mysql` function that SHALL specify encryption key length and block encryption mode.
 
 #### RQ.SRS008.AES.MySQL.Encrypt.Function.Parameters.Mode.ValuesFormat
@@ -2642,6 +2691,8 @@ version: 1.0
 * `aes-192-ofb` mode and `key` is less than 24 bytes or if specified `iv` is less than 16 bytes
 * `aes-256-ofb` mode and `key` is less than 32 bytes or if specified `iv` is less than 16 bytes
 
+### MySQL Decrypt Function
+
 #### RQ.SRS008.AES.MySQL.Decrypt.Function
 version: 1.0
 
@@ -2660,18 +2711,18 @@ aes_decrypt_mysql(mode, ciphertext, key, [iv])
 version: 1.0
 
 [ClickHouse] SHALL support `ciphertext` accepting any data type as
-the first parameter to the `aes_decrypt_mysql` function that SHALL specify the data to be decrypted.
+the second parameter to the `aes_decrypt_mysql` function that SHALL specify the data to be decrypted.
 
 #### RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Key
 version: 1.0
 
 [ClickHouse] SHALL support `key` with `String` or `FixedString` data types
-as the second parameter to the `aes_decrypt_mysql` function that SHALL specify the encryption key.
+as the third parameter to the `aes_decrypt_mysql` function that SHALL specify the encryption key.
 
 #### RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode
 version: 1.0
 
-[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the third parameter
+[ClickHouse] SHALL support `mode` with `String` or `FixedString` data types as the first parameter
 to the `aes_decrypt_mysql` function that SHALL specify encryption key length and block encryption mode.
 
 #### RQ.SRS008.AES.MySQL.Decrypt.Function.Parameters.Mode.ValuesFormat
@@ -2814,6 +2865,7 @@ version: 1.0
 * **ClickHouse:** https://clickhouse.tech
 * **Git:** https://git-scm.com/
 
+[AEAD]: #aead
 [OpenSSL]: https://www.openssl.org/
 [LowCardinality]: https://clickhouse.tech/docs/en/sql-reference/data-types/lowcardinality/
 [MergeTree]: https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/mergetree/
diff --git a/tests/testflows/aes_encryption/tests/common.py b/tests/testflows/aes_encryption/tests/common.py
index 10e98dd1065..5a6e34f59fd 100644
--- a/tests/testflows/aes_encryption/tests/common.py
+++ b/tests/testflows/aes_encryption/tests/common.py
@@ -106,6 +106,7 @@ plaintexts = [
     ("DateTime", "reinterpretAsFixedString(toDateTime('2020-01-01 20:01:02'))"),
     ("DateTime64", "reinterpretAsFixedString(toDateTime64('2020-01-01 20:01:02.123', 3))"),
     ("LowCardinality", "toLowCardinality('1')"),
+    ("LowCardinalityFixedString", "toLowCardinality(toFixedString('1',2))"),
     #("Array", "[1,2]"), - not supported
     #("Tuple", "(1,'a')") - not supported
     ("NULL", "reinterpretAsFixedString(toDateOrNull('foo'))"),
diff --git a/tests/testflows/aes_encryption/tests/encrypt.py b/tests/testflows/aes_encryption/tests/encrypt.py
index 8f88712b44d..e6562dc51f5 100644
--- a/tests/testflows/aes_encryption/tests/encrypt.py
+++ b/tests/testflows/aes_encryption/tests/encrypt.py
@@ -309,7 +309,7 @@ def mode_parameter_types(self):
 
 @TestScenario
 @Requirements(
-    RQ_SRS008_AES_Encrypt_Function_Parameters_PlainText("1.0"),
+    RQ_SRS008_AES_Encrypt_Function_Parameters_PlainText("2.0"),
     RQ_SRS008_AES_Encrypt_Function_Parameters_Mode("1.0"),
     RQ_SRS008_AES_Encrypt_Function_Parameters_Mode_ValuesFormat("1.0"),
     RQ_SRS008_AES_Encrypt_Function_Parameters_Mode_Values("1.0")
diff --git a/tests/testflows/aes_encryption/tests/encrypt_mysql.py b/tests/testflows/aes_encryption/tests/encrypt_mysql.py
index f44ae7d108f..89d000d83be 100644
--- a/tests/testflows/aes_encryption/tests/encrypt_mysql.py
+++ b/tests/testflows/aes_encryption/tests/encrypt_mysql.py
@@ -265,7 +265,7 @@ def syntax(self):
 
 @TestScenario
 @Requirements(
-    RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_PlainText("1.0"),
+    RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_PlainText("2.0"),
     RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_Mode("1.0"),
     RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_Mode_ValuesFormat("1.0"),
     RQ_SRS008_AES_MySQL_Encrypt_Function_Parameters_Mode_Values("1.0")
diff --git a/tests/testflows/aes_encryption/tests/snapshots/encrypt.py.encrypt.snapshot b/tests/testflows/aes_encryption/tests/snapshots/encrypt.py.encrypt.snapshot
index 953c46f50a4..a46ab3c3cb5 100644
--- a/tests/testflows/aes_encryption/tests/snapshots/encrypt.py.encrypt.snapshot
+++ b/tests/testflows/aes_encryption/tests/snapshots/encrypt.py.encrypt.snapshot
@@ -2338,3 +2338,69 @@ example_mode_aes_256_ctr_datatype_NullableFixedString_iv_16_aad_None = r"""'5858
 
 example_mode_aes_256_ctr_datatype_NullableFixedStringNull_iv_16_aad_None = r"""'\\N'"""
 
+example_mode_aes_128_ecb_datatype_LowCardinalityFixedString_iv_None_aad_None = r"""'2320D8B0C3FF2AF0C808CE333688FEE4'"""
+
+example_mode_aes_192_ecb_datatype_LowCardinalityFixedString_iv_None_aad_None = r"""'145EF1DA49622900B742743B4114C3F8'"""
+
+example_mode_aes_256_ecb_datatype_LowCardinalityFixedString_iv_None_aad_None = r"""'BB44E0A5A23B06C6F78D05CF12E4A304'"""
+
+example_mode_aes_128_cbc_datatype_LowCardinalityFixedString_iv_None_aad_None = r"""'2320D8B0C3FF2AF0C808CE333688FEE4'"""
+
+example_mode_aes_192_cbc_datatype_LowCardinalityFixedString_iv_None_aad_None = r"""'145EF1DA49622900B742743B4114C3F8'"""
+
+example_mode_aes_256_cbc_datatype_LowCardinalityFixedString_iv_None_aad_None = r"""'BB44E0A5A23B06C6F78D05CF12E4A304'"""
+
+example_mode_aes_128_cbc_datatype_LowCardinalityFixedString_iv_16_aad_None = r"""'ECE42AF0000893B1D1A43993506376A4'"""
+
+example_mode_aes_192_cbc_datatype_LowCardinalityFixedString_iv_16_aad_None = r"""'0A8E8BA80EB490740B91937D4A5FF84C'"""
+
+example_mode_aes_256_cbc_datatype_LowCardinalityFixedString_iv_16_aad_None = r"""'4A3A13D0807C29D4FA9CAEE6B9A67E7D'"""
+
+example_mode_aes_128_cfb128_datatype_LowCardinalityFixedString_iv_None_aad_None = r"""'21DF'"""
+
+example_mode_aes_192_cfb128_datatype_LowCardinalityFixedString_iv_None_aad_None = r"""'36B7'"""
+
+example_mode_aes_256_cfb128_datatype_LowCardinalityFixedString_iv_None_aad_None = r"""'818E'"""
+
+example_mode_aes_128_cfb128_datatype_LowCardinalityFixedString_iv_16_aad_None = r"""'0388'"""
+
+example_mode_aes_192_cfb128_datatype_LowCardinalityFixedString_iv_16_aad_None = r"""'59C7'"""
+
+example_mode_aes_256_cfb128_datatype_LowCardinalityFixedString_iv_16_aad_None = r"""'5858'"""
+
+example_mode_aes_128_ofb_datatype_LowCardinalityFixedString_iv_None_aad_None = r"""'21DF'"""
+
+example_mode_aes_192_ofb_datatype_LowCardinalityFixedString_iv_None_aad_None = r"""'36B7'"""
+
+example_mode_aes_256_ofb_datatype_LowCardinalityFixedString_iv_None_aad_None = r"""'818E'"""
+
+example_mode_aes_128_ofb_datatype_LowCardinalityFixedString_iv_16_aad_None = r"""'0388'"""
+
+example_mode_aes_192_ofb_datatype_LowCardinalityFixedString_iv_16_aad_None = r"""'59C7'"""
+
+example_mode_aes_256_ofb_datatype_LowCardinalityFixedString_iv_16_aad_None = r"""'5858'"""
+
+example_mode_aes_128_gcm_datatype_LowCardinalityFixedString_iv_12_aad_None = r"""'DC9659BBB6F4D4C40DCD095F1FD69A4E5B9C'"""
+
+example_mode_aes_192_gcm_datatype_LowCardinalityFixedString_iv_12_aad_None = r"""'7BFA19E7769CC955EDD39D806A13BF6AF8E3'"""
+
+example_mode_aes_256_gcm_datatype_LowCardinalityFixedString_iv_12_aad_None = r"""'67CB36E371A5C5F544B1EFEC353A84FE0B2F'"""
+
+example_mode_aes_128_gcm_datatype_LowCardinalityFixedString_iv_12_aad_True = r"""'DC96EBF2E338CDC4D6F8B490ACE77BB6FB40'"""
+
+example_mode_aes_192_gcm_datatype_LowCardinalityFixedString_iv_12_aad_True = r"""'7BFA9A2913F05BBB8DB441C2D67E06FD46F8'"""
+
+example_mode_aes_256_gcm_datatype_LowCardinalityFixedString_iv_12_aad_True = r"""'67CBA4772AA9C9C17819F647FA5CBE2E5715'"""
+
+example_mode_aes_128_ctr_datatype_LowCardinalityFixedString_iv_None_aad_None = r"""'21DF'"""
+
+example_mode_aes_192_ctr_datatype_LowCardinalityFixedString_iv_None_aad_None = r"""'36B7'"""
+
+example_mode_aes_256_ctr_datatype_LowCardinalityFixedString_iv_None_aad_None = r"""'818E'"""
+
+example_mode_aes_128_ctr_datatype_LowCardinalityFixedString_iv_16_aad_None = r"""'0388'"""
+
+example_mode_aes_192_ctr_datatype_LowCardinalityFixedString_iv_16_aad_None = r"""'59C7'"""
+
+example_mode_aes_256_ctr_datatype_LowCardinalityFixedString_iv_16_aad_None = r"""'5858'"""
+
diff --git a/tests/testflows/aes_encryption/tests/snapshots/encrypt_mysql.py.encrypt_mysql.snapshot b/tests/testflows/aes_encryption/tests/snapshots/encrypt_mysql.py.encrypt_mysql.snapshot
index 9dee5d818d6..32ab15386a1 100644
--- a/tests/testflows/aes_encryption/tests/snapshots/encrypt_mysql.py.encrypt_mysql.snapshot
+++ b/tests/testflows/aes_encryption/tests/snapshots/encrypt_mysql.py.encrypt_mysql.snapshot
@@ -2242,3 +2242,69 @@ example_mode_aes_256_ofb_datatype_NullableFixedString_key_64_iv_64 = r"""'E2EE'"
 
 example_mode_aes_256_ofb_datatype_NullableFixedStringNull_key_64_iv_64 = r"""'\\N'"""
 
+example_mode_aes_128_ecb_datatype_LowCardinalityFixedString_key_16_iv_None = r"""'2320D8B0C3FF2AF0C808CE333688FEE4'"""
+
+example_mode_aes_128_ecb_datatype_LowCardinalityFixedString_key_24_iv_None = r"""'824777897B48FB42AE19EBF2835AE5BA'"""
+
+example_mode_aes_192_ecb_datatype_LowCardinalityFixedString_key_24_iv_None = r"""'145EF1DA49622900B742743B4114C3F8'"""
+
+example_mode_aes_192_ecb_datatype_LowCardinalityFixedString_key_32_iv_None = r"""'24268978B72821002456FF2204B0F9B9'"""
+
+example_mode_aes_256_ecb_datatype_LowCardinalityFixedString_key_32_iv_None = r"""'BB44E0A5A23B06C6F78D05CF12E4A304'"""
+
+example_mode_aes_256_ecb_datatype_LowCardinalityFixedString_key_64_iv_None = r"""'F2FACC4703F559D74555D10CA4850F40'"""
+
+example_mode_aes_128_cbc_datatype_LowCardinalityFixedString_key_16_iv_None = r"""'2320D8B0C3FF2AF0C808CE333688FEE4'"""
+
+example_mode_aes_192_cbc_datatype_LowCardinalityFixedString_key_24_iv_None = r"""'145EF1DA49622900B742743B4114C3F8'"""
+
+example_mode_aes_256_cbc_datatype_LowCardinalityFixedString_key_32_iv_None = r"""'BB44E0A5A23B06C6F78D05CF12E4A304'"""
+
+example_mode_aes_128_cbc_datatype_LowCardinalityFixedString_key_16_iv_16 = r"""'ECE42AF0000893B1D1A43993506376A4'"""
+
+example_mode_aes_128_cbc_datatype_LowCardinalityFixedString_key_24_iv_24 = r"""'C55AC3DA9276DBF066AC408BFCF011DD'"""
+
+example_mode_aes_192_cbc_datatype_LowCardinalityFixedString_key_24_iv_16 = r"""'0A8E8BA80EB490740B91937D4A5FF84C'"""
+
+example_mode_aes_192_cbc_datatype_LowCardinalityFixedString_key_32_iv_32 = r"""'723C4EB7399AE6F019109651B376A111'"""
+
+example_mode_aes_256_cbc_datatype_LowCardinalityFixedString_key_32_iv_16 = r"""'4A3A13D0807C29D4FA9CAEE6B9A67E7D'"""
+
+example_mode_aes_256_cbc_datatype_LowCardinalityFixedString_key_64_iv_64 = r"""'5547B945A6810130CFC689C22530FA26'"""
+
+example_mode_aes_128_cfb128_datatype_LowCardinalityFixedString_key_16_iv_None = r"""'21DF'"""
+
+example_mode_aes_192_cfb128_datatype_LowCardinalityFixedString_key_24_iv_None = r"""'36B7'"""
+
+example_mode_aes_256_cfb128_datatype_LowCardinalityFixedString_key_32_iv_None = r"""'818E'"""
+
+example_mode_aes_128_cfb128_datatype_LowCardinalityFixedString_key_16_iv_16 = r"""'0388'"""
+
+example_mode_aes_128_cfb128_datatype_LowCardinalityFixedString_key_24_iv_24 = r"""'6A77'"""
+
+example_mode_aes_192_cfb128_datatype_LowCardinalityFixedString_key_24_iv_16 = r"""'59C7'"""
+
+example_mode_aes_192_cfb128_datatype_LowCardinalityFixedString_key_32_iv_32 = r"""'00A0'"""
+
+example_mode_aes_256_cfb128_datatype_LowCardinalityFixedString_key_32_iv_16 = r"""'5858'"""
+
+example_mode_aes_256_cfb128_datatype_LowCardinalityFixedString_key_64_iv_64 = r"""'E2EE'"""
+
+example_mode_aes_128_ofb_datatype_LowCardinalityFixedString_key_16_iv_None = r"""'21DF'"""
+
+example_mode_aes_192_ofb_datatype_LowCardinalityFixedString_key_24_iv_None = r"""'36B7'"""
+
+example_mode_aes_256_ofb_datatype_LowCardinalityFixedString_key_32_iv_None = r"""'818E'"""
+
+example_mode_aes_128_ofb_datatype_LowCardinalityFixedString_key_16_iv_16 = r"""'0388'"""
+
+example_mode_aes_128_ofb_datatype_LowCardinalityFixedString_key_24_iv_24 = r"""'6A77'"""
+
+example_mode_aes_192_ofb_datatype_LowCardinalityFixedString_key_24_iv_16 = r"""'59C7'"""
+
+example_mode_aes_192_ofb_datatype_LowCardinalityFixedString_key_32_iv_32 = r"""'00A0'"""
+
+example_mode_aes_256_ofb_datatype_LowCardinalityFixedString_key_32_iv_16 = r"""'5858'"""
+
+example_mode_aes_256_ofb_datatype_LowCardinalityFixedString_key_64_iv_64 = r"""'E2EE'"""
+

From 7a2f6cd5b979d1d1f9fc80a873f0bc6393ad0a96 Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Sat, 19 Dec 2020 00:43:08 +0300
Subject: [PATCH 520/611] Dictionaries refactoring to new interface

---
 src/Dictionaries/CacheDictionary.h            |   2 +
 src/Dictionaries/ComplexKeyCacheDictionary.h  |   2 +
 src/Dictionaries/ComplexKeyDirectDictionary.h |   2 +
 src/Dictionaries/ComplexKeyHashedDictionary.h |   2 +
 src/Dictionaries/DictionaryBlockInputStream.h | 342 +-----
 src/Dictionaries/DictionaryStructure.cpp      |  32 +-
 src/Dictionaries/DictionaryStructure.h        |  66 ++
 src/Dictionaries/DirectDictionary.h           |   2 +
 src/Dictionaries/FlatDictionary.cpp           | 514 ++++-----
 src/Dictionaries/FlatDictionary.h             |  76 +-
 src/Dictionaries/HashedDictionary.h           |   2 +
 src/Dictionaries/IPAddressDictionary.h        |   2 +
 src/Dictionaries/PolygonDictionary.h          |   2 +
 src/Dictionaries/RangeHashedDictionary.h      |   2 +
 src/Dictionaries/SSDCacheDictionary.h         |   2 +
 .../SSDComplexKeyCacheDictionary.h            |   2 +
 src/Functions/FunctionsExternalDictionaries.h | 986 ++----------------
 17 files changed, 411 insertions(+), 1627 deletions(-)

diff --git a/src/Dictionaries/CacheDictionary.h b/src/Dictionaries/CacheDictionary.h
index b9bd0b7623b..f2f364af9da 100644
--- a/src/Dictionaries/CacheDictionary.h
+++ b/src/Dictionaries/CacheDictionary.h
@@ -119,6 +119,8 @@ public:
 
     std::exception_ptr getLastException() const override;
 
+    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::unsupported;
+
     template <typename T>
     using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
 
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary.h b/src/Dictionaries/ComplexKeyCacheDictionary.h
index 2663fee266d..36a1457570c 100644
--- a/src/Dictionaries/ComplexKeyCacheDictionary.h
+++ b/src/Dictionaries/ComplexKeyCacheDictionary.h
@@ -89,6 +89,8 @@ public:
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
     }
 
+    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::unsupported;
+
     template <typename T>
     using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
 
diff --git a/src/Dictionaries/ComplexKeyDirectDictionary.h b/src/Dictionaries/ComplexKeyDirectDictionary.h
index dc602be103f..670f2ac0a85 100644
--- a/src/Dictionaries/ComplexKeyDirectDictionary.h
+++ b/src/Dictionaries/ComplexKeyDirectDictionary.h
@@ -60,6 +60,8 @@ public:
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
     }
 
+    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::unsupported;
+
     template <typename T>
     using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
 
diff --git a/src/Dictionaries/ComplexKeyHashedDictionary.h b/src/Dictionaries/ComplexKeyHashedDictionary.h
index baf6628eebd..82677458298 100644
--- a/src/Dictionaries/ComplexKeyHashedDictionary.h
+++ b/src/Dictionaries/ComplexKeyHashedDictionary.h
@@ -60,6 +60,8 @@ public:
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
     }
 
+    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::unsupported;
+
     template <typename T>
     using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
 
diff --git a/src/Dictionaries/DictionaryBlockInputStream.h b/src/Dictionaries/DictionaryBlockInputStream.h
index c683ef0e9cc..96d5fac966f 100644
--- a/src/Dictionaries/DictionaryBlockInputStream.h
+++ b/src/Dictionaries/DictionaryBlockInputStream.h
@@ -60,111 +60,9 @@ protected:
     Block getBlock(size_t start, size_t size) const override;
 
 private:
-    // pointer types to getXXX functions
-    // for single key dictionaries
-    template <typename Type>
-    using DictionaryGetter = void (DictionaryType::*)(const std::string &, const PaddedPODArray<Key> &, PaddedPODArray<Type> &) const;
-
-    template <typename Type>
-    using DictionaryDecimalGetter
-        = void (DictionaryType::*)(const std::string &, const PaddedPODArray<Key> &, DecimalPaddedPODArray<Type> &) const;
-
-    using DictionaryStringGetter = void (DictionaryType::*)(const std::string &, const PaddedPODArray<Key> &, ColumnString *) const;
-
-    // for complex complex key dictionaries
-    template <typename Type>
-    using GetterByKey = void (DictionaryType::*)(const std::string &, const Columns &, const DataTypes &, PaddedPODArray<Type> & out) const;
-
-    template <typename Type>
-    using DecimalGetterByKey
-        = void (DictionaryType::*)(const std::string &, const Columns &, const DataTypes &, DecimalPaddedPODArray<Type> & out) const;
-
-    using StringGetterByKey = void (DictionaryType::*)(const std::string &, const Columns &, const DataTypes &, ColumnString * out) const;
-
-    // call getXXX
-    // for single key dictionaries
-    template <typename Type, typename Container>
-    void callGetter(
-        DictionaryGetter<Type> getter,
-        const PaddedPODArray<Key> & ids_to_fill,
-        const Columns & keys,
-        const DataTypes & data_types,
-        Container & container,
-        const DictionaryAttribute & attribute,
-        const DictionaryType & dictionary) const;
-
-    template <typename Type, typename Container>
-    void callGetter(
-        DictionaryDecimalGetter<Type> getter,
-        const PaddedPODArray<Key> & ids_to_fill,
-        const Columns & keys,
-        const DataTypes & data_types,
-        Container & container,
-        const DictionaryAttribute & attribute,
-        const DictionaryType & dictionary) const;
-
-    template <typename Container>
-    void callGetter(
-        DictionaryStringGetter getter,
-        const PaddedPODArray<Key> & ids_to_fill,
-        const Columns & keys,
-        const DataTypes & data_types,
-        Container & container,
-        const DictionaryAttribute & attribute,
-        const DictionaryType & dictionary) const;
-
-    // for complex complex key dictionaries
-    template <typename Type, typename Container>
-    void callGetter(
-        GetterByKey<Type> getter,
-        const PaddedPODArray<Key> & ids_to_fill,
-        const Columns & keys,
-        const DataTypes & data_types,
-        Container & container,
-        const DictionaryAttribute & attribute,
-        const DictionaryType & dictionary) const;
-
-    template <typename Type, typename Container>
-    void callGetter(
-        DecimalGetterByKey<Type> getter,
-        const PaddedPODArray<Key> & ids_to_fill,
-        const Columns & keys,
-        const DataTypes & data_types,
-        Container & container,
-        const DictionaryAttribute & attribute,
-        const DictionaryType & dictionary) const;
-
-    template <typename Container>
-    void callGetter(
-        StringGetterByKey getter,
-        const PaddedPODArray<Key> & ids_to_fill,
-        const Columns & keys,
-        const DataTypes & data_types,
-        Container & container,
-        const DictionaryAttribute & attribute,
-        const DictionaryType & dictionary) const;
-
-    template <template <typename> class Getter, template <typename> class DecimalGetter, typename StringGetter>
     Block
     fillBlock(const PaddedPODArray<Key> & ids_to_fill, const Columns & keys, const DataTypes & types, ColumnsWithTypeAndName && view) const;
 
-
-    template <typename AttributeType, typename Getter>
-    ColumnPtr getColumnFromAttribute(
-        Getter getter,
-        const PaddedPODArray<Key> & ids_to_fill,
-        const Columns & keys,
-        const DataTypes & data_types,
-        const DictionaryAttribute & attribute,
-        const DictionaryType & dictionary) const;
-    template <typename Getter>
-    ColumnPtr getColumnFromStringAttribute(
-        Getter getter,
-        const PaddedPODArray<Key> & ids_to_fill,
-        const Columns & keys,
-        const DataTypes & data_types,
-        const DictionaryAttribute & attribute,
-        const DictionaryType & dictionary) const;
     ColumnPtr getColumnFromIds(const PaddedPODArray<Key> & ids_to_fill) const;
 
     void fillKeyColumns(
@@ -178,12 +76,6 @@ private:
     Names column_names;
     PaddedPODArray<Key> ids;
     ColumnsWithTypeAndName key_columns;
-    Poco::Logger * logger;
-
-    using FillBlockFunction = Block (DictionaryBlockInputStream<DictionaryType, Key>::*)(
-        const PaddedPODArray<Key> & ids_to_fill, const Columns & keys, const DataTypes & types, ColumnsWithTypeAndName && view) const;
-
-    FillBlockFunction fill_block_function;
 
     Columns data_columns;
     GetColumnsFunction get_key_columns_function;
@@ -207,9 +99,6 @@ DictionaryBlockInputStream<DictionaryType, Key>::DictionaryBlockInputStream(
     , dictionary(std::static_pointer_cast<const DictionaryType>(dictionary_))
     , column_names(column_names_)
     , ids(std::move(ids_))
-    , logger(&Poco::Logger::get("DictionaryBlockInputStream"))
-    , fill_block_function(
-          &DictionaryBlockInputStream<DictionaryType, Key>::fillBlock<DictionaryGetter, DictionaryDecimalGetter, DictionaryStringGetter>)
     , key_type(DictionaryKeyType::Id)
 {
 }
@@ -223,12 +112,10 @@ DictionaryBlockInputStream<DictionaryType, Key>::DictionaryBlockInputStream(
     : DictionaryBlockInputStreamBase(keys.size(), max_block_size_)
     , dictionary(std::static_pointer_cast<const DictionaryType>(dictionary_))
     , column_names(column_names_)
-    , logger(&Poco::Logger::get("DictionaryBlockInputStream"))
-    , fill_block_function(&DictionaryBlockInputStream<DictionaryType, Key>::fillBlock<GetterByKey, DecimalGetterByKey, StringGetterByKey>)
     , key_type(DictionaryKeyType::ComplexKey)
 {
-    const DictionaryStructure & dictionaty_structure = dictionary->getStructure();
-    fillKeyColumns(keys, 0, keys.size(), dictionaty_structure, key_columns);
+    const DictionaryStructure & dictionary_structure = dictionary->getStructure();
+    fillKeyColumns(keys, 0, keys.size(), dictionary_structure, key_columns);
 }
 
 template <typename DictionaryType, typename Key>
@@ -242,8 +129,6 @@ DictionaryBlockInputStream<DictionaryType, Key>::DictionaryBlockInputStream(
     : DictionaryBlockInputStreamBase(data_columns_.front()->size(), max_block_size_)
     , dictionary(std::static_pointer_cast<const DictionaryType>(dictionary_))
     , column_names(column_names_)
-    , logger(&Poco::Logger::get("DictionaryBlockInputStream"))
-    , fill_block_function(&DictionaryBlockInputStream<DictionaryType, Key>::fillBlock<GetterByKey, DecimalGetterByKey, StringGetterByKey>)
     , data_columns(data_columns_)
     , get_key_columns_function(get_key_columns_function_)
     , get_view_columns_function(get_view_columns_function_)
@@ -268,13 +153,13 @@ Block DictionaryBlockInputStream<DictionaryType, Key>::getBlock(size_t start, si
                 columns.emplace_back(column);
                 view_columns.emplace_back(column, key_column.type, key_column.name);
             }
-            return (this->*fill_block_function)({}, columns, {}, std::move(view_columns));
+            return fillBlock({}, columns, {}, std::move(view_columns));
         }
 
         case DictionaryKeyType::Id:
         {
             PaddedPODArray<Key> ids_to_fill(ids.begin() + start, ids.begin() + start + length);
-            return (this->*fill_block_function)(ids_to_fill, {}, {}, {});
+            return fillBlock(ids_to_fill, {}, {}, {});
         }
 
         case DictionaryKeyType::Callback:
@@ -294,104 +179,18 @@ Block DictionaryBlockInputStream<DictionaryType, Key>::getBlock(size_t start, si
                 columns.push_back(key_column.column);
                 types.push_back(key_column.type);
             }
-            return (this->*fill_block_function)({}, columns, types, std::move(view_with_type_and_name));
+            return fillBlock({}, columns, types, std::move(view_with_type_and_name));
         }
     }
 
     throw Exception("Unexpected DictionaryKeyType.", ErrorCodes::LOGICAL_ERROR);
 }
 
-
 template <typename DictionaryType, typename Key>
-template <typename Type, typename Container>
-void DictionaryBlockInputStream<DictionaryType, Key>::callGetter(
-    DictionaryGetter<Type> getter,
-    const PaddedPODArray<Key> & ids_to_fill,
-    const Columns & /*keys*/,
-    const DataTypes & /*data_types*/,
-    Container & container,
-    const DictionaryAttribute & attribute,
-    const DictionaryType & dict) const
-{
-    (dict.*getter)(attribute.name, ids_to_fill, container);
-}
-
-template <typename DictionaryType, typename Key>
-template <typename Type, typename Container>
-void DictionaryBlockInputStream<DictionaryType, Key>::callGetter(
-    DictionaryDecimalGetter<Type> getter,
-    const PaddedPODArray<Key> & ids_to_fill,
-    const Columns & /*keys*/,
-    const DataTypes & /*data_types*/,
-    Container & container,
-    const DictionaryAttribute & attribute,
-    const DictionaryType & dict) const
-{
-    (dict.*getter)(attribute.name, ids_to_fill, container);
-}
-
-template <typename DictionaryType, typename Key>
-template <typename Container>
-void DictionaryBlockInputStream<DictionaryType, Key>::callGetter(
-    DictionaryStringGetter getter,
-    const PaddedPODArray<Key> & ids_to_fill,
-    const Columns & /*keys*/,
-    const DataTypes & /*data_types*/,
-    Container & container,
-    const DictionaryAttribute & attribute,
-    const DictionaryType & dict) const
-{
-    (dict.*getter)(attribute.name, ids_to_fill, container);
-}
-
-template <typename DictionaryType, typename Key>
-template <typename Type, typename Container>
-void DictionaryBlockInputStream<DictionaryType, Key>::callGetter(
-    GetterByKey<Type> getter,
-    const PaddedPODArray<Key> & /*ids_to_fill*/,
-    const Columns & keys,
-    const DataTypes & data_types,
-    Container & container,
-    const DictionaryAttribute & attribute,
-    const DictionaryType & dict) const
-{
-    (dict.*getter)(attribute.name, keys, data_types, container);
-}
-
-template <typename DictionaryType, typename Key>
-template <typename Type, typename Container>
-void DictionaryBlockInputStream<DictionaryType, Key>::callGetter(
-    DecimalGetterByKey<Type> getter,
-    const PaddedPODArray<Key> & /*ids_to_fill*/,
-    const Columns & keys,
-    const DataTypes & data_types,
-    Container & container,
-    const DictionaryAttribute & attribute,
-    const DictionaryType & dict) const
-{
-    (dict.*getter)(attribute.name, keys, data_types, container);
-}
-
-template <typename DictionaryType, typename Key>
-template <typename Container>
-void DictionaryBlockInputStream<DictionaryType, Key>::callGetter(
-    StringGetterByKey getter,
-    const PaddedPODArray<Key> & /*ids_to_fill*/,
-    const Columns & keys,
-    const DataTypes & data_types,
-    Container & container,
-    const DictionaryAttribute & attribute,
-    const DictionaryType & dict) const
-{
-    (dict.*getter)(attribute.name, keys, data_types, container);
-}
-
-
-template <typename DictionaryType, typename Key>
-template <template <typename> class Getter, template <typename> class DecimalGetter, typename StringGetter>
 Block DictionaryBlockInputStream<DictionaryType, Key>::fillBlock(
     const PaddedPODArray<Key> & ids_to_fill, const Columns & keys, const DataTypes & types, ColumnsWithTypeAndName && view) const
 {
+    constexpr auto dictionary_get_by_type = DictionaryType::get_by_type;
     std::unordered_set<std::string> names(column_names.begin(), column_names.end());
 
     DataTypes data_types = types;
@@ -408,9 +207,13 @@ Block DictionaryBlockInputStream<DictionaryType, Key>::fillBlock(
             block_columns.push_back(column);
 
     const DictionaryStructure & structure = dictionary->getStructure();
+    ColumnPtr ids_column;
 
     if (structure.id && names.find(structure.id->name) != names.end())
-        block_columns.emplace_back(getColumnFromIds(ids_to_fill), std::make_shared<DataTypeUInt64>(), structure.id->name);
+    {
+        ids_column = getColumnFromIds(ids_to_fill);
+        block_columns.emplace_back(ids_column, std::make_shared<DataTypeUInt64>(), structure.id->name);
+    }
 
     for (const auto idx : ext::range(0, structure.attributes.size()))
     {
@@ -418,124 +221,27 @@ Block DictionaryBlockInputStream<DictionaryType, Key>::fillBlock(
         if (names.find(attribute.name) != names.end())
         {
             ColumnPtr column;
-#define GET_COLUMN_FORM_ATTRIBUTE(TYPE) \
-    column = getColumnFromAttribute<TYPE, Getter<TYPE>>(&DictionaryType::get##TYPE, ids_to_fill, keys, data_types, attribute, *dictionary)
-            switch (attribute.underlying_type)
+
+            if constexpr (dictionary_get_by_type == DictionaryGetByType::getByIdentifiers)
             {
-                case AttributeUnderlyingType::utUInt8:
-                    GET_COLUMN_FORM_ATTRIBUTE(UInt8);
-                    break;
-                case AttributeUnderlyingType::utUInt16:
-                    GET_COLUMN_FORM_ATTRIBUTE(UInt16);
-                    break;
-                case AttributeUnderlyingType::utUInt32:
-                    GET_COLUMN_FORM_ATTRIBUTE(UInt32);
-                    break;
-                case AttributeUnderlyingType::utUInt64:
-                    GET_COLUMN_FORM_ATTRIBUTE(UInt64);
-                    break;
-                case AttributeUnderlyingType::utUInt128:
-                    GET_COLUMN_FORM_ATTRIBUTE(UInt128);
-                    break;
-                case AttributeUnderlyingType::utInt8:
-                    GET_COLUMN_FORM_ATTRIBUTE(Int8);
-                    break;
-                case AttributeUnderlyingType::utInt16:
-                    GET_COLUMN_FORM_ATTRIBUTE(Int16);
-                    break;
-                case AttributeUnderlyingType::utInt32:
-                    GET_COLUMN_FORM_ATTRIBUTE(Int32);
-                    break;
-                case AttributeUnderlyingType::utInt64:
-                    GET_COLUMN_FORM_ATTRIBUTE(Int64);
-                    break;
-                case AttributeUnderlyingType::utFloat32:
-                    GET_COLUMN_FORM_ATTRIBUTE(Float32);
-                    break;
-                case AttributeUnderlyingType::utFloat64:
-                    GET_COLUMN_FORM_ATTRIBUTE(Float64);
-                    break;
-                case AttributeUnderlyingType::utDecimal32:
-                {
-                    column = getColumnFromAttribute<Decimal32, DecimalGetter<Decimal32>>(
-                        &DictionaryType::getDecimal32, ids_to_fill, keys, data_types, attribute, *dictionary);
-                    break;
-                }
-                case AttributeUnderlyingType::utDecimal64:
-                {
-                    column = getColumnFromAttribute<Decimal64, DecimalGetter<Decimal64>>(
-                        &DictionaryType::getDecimal64, ids_to_fill, keys, data_types, attribute, *dictionary);
-                    break;
-                }
-                case AttributeUnderlyingType::utDecimal128:
-                {
-                    column = getColumnFromAttribute<Decimal128, DecimalGetter<Decimal128>>(
-                        &DictionaryType::getDecimal128, ids_to_fill, keys, data_types, attribute, *dictionary);
-                    break;
-                }
-                case AttributeUnderlyingType::utString:
-                {
-                    column = getColumnFromStringAttribute<StringGetter>(
-                        &DictionaryType::getString, ids_to_fill, keys, data_types, attribute, *dictionary);
-                    break;
-                }
+                column = dictionary->get(attribute.name, attribute.type, ids_column, nullptr /* default_untyped */);
             }
-#undef GET_COLUMN_FORM_ATTRIBUTE
+            else if constexpr (dictionary_get_by_type == DictionaryGetByType::getByComplexKeys)
+            {
+                column = nullptr;
+            }
+            else
+            {
+                column = nullptr;
+            }
+
             block_columns.emplace_back(column, attribute.type, attribute.name);
         }
     }
+
     return Block(block_columns);
 }
 
-
-template <typename DictionaryType, typename Key>
-template <typename AttributeType, typename Getter>
-ColumnPtr DictionaryBlockInputStream<DictionaryType, Key>::getColumnFromAttribute(
-    Getter getter,
-    const PaddedPODArray<Key> & ids_to_fill,
-    const Columns & keys,
-    const DataTypes & data_types,
-    const DictionaryAttribute & attribute,
-    const DictionaryType & dict) const
-{
-    if constexpr (IsDecimalNumber<AttributeType>)
-    {
-        auto size = ids_to_fill.size();
-        if (!keys.empty())
-            size = keys.front()->size();
-        auto column = ColumnDecimal<AttributeType>::create(size, 0); /// NOTE: There's wrong scale here, but it's unused.
-        callGetter(getter, ids_to_fill, keys, data_types, column->getData(), attribute, dict);
-        return column;
-    }
-    else
-    {
-        auto size = ids_to_fill.size();
-        if (!keys.empty())
-            size = keys.front()->size();
-        auto column_vector = ColumnVector<AttributeType>::create(size);
-        callGetter(getter, ids_to_fill, keys, data_types, column_vector->getData(), attribute, dict);
-        return column_vector;
-    }
-}
-
-
-template <typename DictionaryType, typename Key>
-template <typename Getter>
-ColumnPtr DictionaryBlockInputStream<DictionaryType, Key>::getColumnFromStringAttribute(
-    Getter getter,
-    const PaddedPODArray<Key> & ids_to_fill,
-    const Columns & keys,
-    const DataTypes & data_types,
-    const DictionaryAttribute & attribute,
-    const DictionaryType & dict) const
-{
-    auto column_string = ColumnString::create();
-    auto ptr = column_string.get();
-    callGetter(getter, ids_to_fill, keys, data_types, ptr, attribute, dict);
-    return column_string;
-}
-
-
 template <typename DictionaryType, typename Key>
 ColumnPtr DictionaryBlockInputStream<DictionaryType, Key>::getColumnFromIds(const PaddedPODArray<Key> & ids_to_fill) const
 {
diff --git a/src/Dictionaries/DictionaryStructure.cpp b/src/Dictionaries/DictionaryStructure.cpp
index 07b746d8365..68be50daa2f 100644
--- a/src/Dictionaries/DictionaryStructure.cpp
+++ b/src/Dictionaries/DictionaryStructure.cpp
@@ -2,6 +2,8 @@
 #include <Columns/IColumn.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeArray.h>
+#include <Functions/FunctionHelpers.h>
 #include <Formats/FormatSettings.h>
 #include <IO/WriteHelpers.h>
 #include <IO/Operators.h>
@@ -12,6 +14,7 @@
 #include <unordered_set>
 #include <ext/range.h>
 
+#include <iostream>
 
 namespace DB
 {
@@ -83,11 +86,6 @@ AttributeUnderlyingType getAttributeUnderlyingType(const std::string & type)
             return AttributeUnderlyingType::utDecimal128;
     }
 
-    // Temporary hack to allow arrays in keys, since they are never retrieved for polygon dictionaries.
-    // TODO: This should be fixed by fully supporting arrays in dictionaries.
-    if (type.find("Array") == 0)
-        return AttributeUnderlyingType::utString;
-
     throw Exception{"Unknown type " + type, ErrorCodes::UNKNOWN_TYPE};
 }
 
@@ -319,8 +317,26 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
             continue;
 
         const auto type_string = config.getString(prefix + "type");
-        const auto type = DataTypeFactory::instance().get(type_string);
-        const auto underlying_type = getAttributeUnderlyingType(type_string);
+        const auto initial_type = DataTypeFactory::instance().get(type_string);
+        auto type = initial_type;
+        bool is_array = false;
+        bool is_nullable = false;
+
+        const DataTypeArray * array_type = checkAndGetDataType<DataTypeArray>(type.get());
+        if (array_type)
+        {
+            is_array = true;
+            type = array_type->getNestedType();
+        }
+        
+        if (type->isNullable())
+        {
+            is_nullable = true;
+            type = removeNullable(type);
+        }
+
+        /// TODO: Fix for decimal
+        const auto underlying_type = getAttributeUnderlyingType(type->getName());
 
         const auto expression = config.getString(prefix + "expression", "");
         if (!expression.empty())
@@ -366,7 +382,7 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
         has_hierarchy = has_hierarchy || hierarchical;
 
         res_attributes.emplace_back(
-            DictionaryAttribute{name, underlying_type, type, expression, null_value, hierarchical, injective, is_object_id});
+            DictionaryAttribute{name, underlying_type, initial_type, expression, null_value, hierarchical, injective, is_object_id, is_nullable, is_array});
     }
 
     return res_attributes;
diff --git a/src/Dictionaries/DictionaryStructure.h b/src/Dictionaries/DictionaryStructure.h
index 08885bc4d1b..5656815e375 100644
--- a/src/Dictionaries/DictionaryStructure.h
+++ b/src/Dictionaries/DictionaryStructure.h
@@ -42,6 +42,12 @@ std::string toString(const AttributeUnderlyingType type);
 /// Min and max lifetimes for a dictionary or it's entry
 using DictionaryLifetime = ExternalLoadableLifetime;
 
+enum class DictionaryGetByType {
+    getByIdentifiers,
+    getByComplexKeys,
+    getByRange,
+    unsupported /* will be removed after migration to new interface */
+};
 
 /** Holds the description of a single dictionary attribute:
 *    - name, used for lookup into dictionary and source;
@@ -62,8 +68,68 @@ struct DictionaryAttribute final
     const bool hierarchical;
     const bool injective;
     const bool is_object_id;
+    const bool is_nullable;
+    const bool is_array;
 };
 
+template <typename Type>
+struct DictionaryAttributeType
+{
+    using AttributeType = Type;
+};
+
+template <typename F>
+void callOnDictionaryAttributeType(AttributeUnderlyingType type, F&& func)
+{
+    switch (type)
+    {
+        case AttributeUnderlyingType::utUInt8:
+            func(DictionaryAttributeType<UInt8>());
+            break;
+        case AttributeUnderlyingType::utUInt16:
+            func(DictionaryAttributeType<UInt16>());
+            break;
+        case AttributeUnderlyingType::utUInt32:
+            func(DictionaryAttributeType<UInt32>());
+            break;
+        case AttributeUnderlyingType::utUInt64:
+            func(DictionaryAttributeType<UInt64>());
+            break;
+        case AttributeUnderlyingType::utUInt128:
+            func(DictionaryAttributeType<UInt128>());
+            break;
+        case AttributeUnderlyingType::utInt8:
+            func(DictionaryAttributeType<Int8>());
+            break;
+        case AttributeUnderlyingType::utInt16:
+            func(DictionaryAttributeType<Int16>());
+            break;
+        case AttributeUnderlyingType::utInt32:
+            func(DictionaryAttributeType<Int32>());
+            break;
+        case AttributeUnderlyingType::utInt64:
+            func(DictionaryAttributeType<Int64>());
+            break;
+        case AttributeUnderlyingType::utFloat32:
+            func(DictionaryAttributeType<Float32>());
+            break;
+        case AttributeUnderlyingType::utFloat64:
+            func(DictionaryAttributeType<Float64>());
+            break;
+        case AttributeUnderlyingType::utString:
+            func(DictionaryAttributeType<String>());
+            break;
+        case AttributeUnderlyingType::utDecimal32:
+            func(DictionaryAttributeType<Decimal32>());
+            break;
+        case AttributeUnderlyingType::utDecimal64:
+            func(DictionaryAttributeType<Decimal64>());
+            break;
+        case AttributeUnderlyingType::utDecimal128:
+            func(DictionaryAttributeType<Decimal128>());
+            break;
+    }
+};
 
 struct DictionarySpecialAttribute final
 {
diff --git a/src/Dictionaries/DirectDictionary.h b/src/Dictionaries/DirectDictionary.h
index 18ef5224a8a..31e2994febb 100644
--- a/src/Dictionaries/DirectDictionary.h
+++ b/src/Dictionaries/DirectDictionary.h
@@ -65,6 +65,8 @@ public:
     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;
 
+    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::unsupported; 
+
     template <typename T>
     using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
 
diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index 47ffdaeb5bd..aa03179491e 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -1,5 +1,7 @@
 #include "FlatDictionary.h"
 #include <IO/WriteHelpers.h>
+#include <Columns/ColumnsNumber.h>
+#include <Functions/FunctionHelpers.h>
 #include "DictionaryBlockInputStream.h"
 #include "DictionaryFactory.h"
 #include <Core/Defines.h>
@@ -14,6 +16,7 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
     extern const int DICTIONARY_IS_EMPTY;
     extern const int UNSUPPORTED_METHOD;
+    extern const int ILLEGAL_COLUMN;
 }
 
 static const auto initial_array_size = 1024;
@@ -102,183 +105,184 @@ void FlatDictionary::isInConstantVector(const Key child_id, const PaddedPODArray
     isInImpl(child_id, ancestor_ids, out);
 }
 
-
-#define DECLARE(TYPE) \
-    void FlatDictionary::get##TYPE(const std::string & attribute_name, const PaddedPODArray<Key> & ids, ResultArrayType<TYPE> & out) const \
-    { \
-        const auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-\
-        const auto null_value = std::get<TYPE>(attribute.null_values); \
-\
-        getItemsImpl<TYPE, TYPE>( \
-            attribute, ids, [&](const size_t row, const auto value) { out[row] = value; }, [&](const size_t) { return null_value; }); \
-    }
-DECLARE(UInt8)
-DECLARE(UInt16)
-DECLARE(UInt32)
-DECLARE(UInt64)
-DECLARE(UInt128)
-DECLARE(Int8)
-DECLARE(Int16)
-DECLARE(Int32)
-DECLARE(Int64)
-DECLARE(Float32)
-DECLARE(Float64)
-DECLARE(Decimal32)
-DECLARE(Decimal64)
-DECLARE(Decimal128)
-#undef DECLARE
-
-void FlatDictionary::getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, ColumnString * out) const
+ColumnPtr FlatDictionary::get(const std::string& attribute_name, const DataTypePtr &, const ColumnPtr id_column, const ColumnPtr default_untyped) const
 {
-    const auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
+    ColumnPtr result;
 
-    const auto & null_value = std::get<StringRef>(attribute.null_values);
+    const auto *id_col = checkAndGetColumn<ColumnUInt64>(id_column.get());
+    const auto *id_col_const = checkAndGetColumnConst<ColumnUInt64>(id_column.get()); 
 
-    getItemsImpl<StringRef, StringRef>(
-        attribute,
-        ids,
-        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-        [&](const size_t) { return null_value; });
-}
-
-#define DECLARE(TYPE) \
-    void FlatDictionary::get##TYPE( \
-        const std::string & attribute_name, \
-        const PaddedPODArray<Key> & ids, \
-        const PaddedPODArray<TYPE> & def, \
-        ResultArrayType<TYPE> & out) const \
-    { \
-        const auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-\
-        getItemsImpl<TYPE, TYPE>( \
-            attribute, ids, [&](const size_t row, const auto value) { out[row] = value; }, [&](const size_t row) { return def[row]; }); \
+    if (id_col == nullptr && id_col_const == nullptr)
+    {
+        throw Exception{"Identifiers column must be UInt64", ErrorCodes::ILLEGAL_COLUMN};
     }
-DECLARE(UInt8)
-DECLARE(UInt16)
-DECLARE(UInt32)
-DECLARE(UInt64)
-DECLARE(UInt128)
-DECLARE(Int8)
-DECLARE(Int16)
-DECLARE(Int32)
-DECLARE(Int64)
-DECLARE(Float32)
-DECLARE(Float64)
-DECLARE(Decimal32)
-DECLARE(Decimal64)
-DECLARE(Decimal128)
-#undef DECLARE
 
-void FlatDictionary::getString(
-    const std::string & attribute_name, const PaddedPODArray<Key> & ids, const ColumnString * const def, ColumnString * const out) const
-{
-    const auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
-
-    getItemsImpl<StringRef, StringRef>(
-        attribute,
-        ids,
-        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-        [&](const size_t row) { return def->getDataAt(row); });
-}
-
-#define DECLARE(TYPE) \
-    void FlatDictionary::get##TYPE( \
-        const std::string & attribute_name, const PaddedPODArray<Key> & ids, const TYPE def, ResultArrayType<TYPE> & out) const \
-    { \
-        const auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-\
-        getItemsImpl<TYPE, TYPE>( \
-            attribute, ids, [&](const size_t row, const auto value) { out[row] = value; }, [&](const size_t) { return def; }); \
+    PaddedPODArray<UInt64> ids_const(1);
+    
+    if (id_col_const != nullptr) {
+        ids_const[0] = id_col_const->getValue<UInt64>();     
     }
-DECLARE(UInt8)
-DECLARE(UInt16)
-DECLARE(UInt32)
-DECLARE(UInt64)
-DECLARE(UInt128)
-DECLARE(Int8)
-DECLARE(Int16)
-DECLARE(Int32)
-DECLARE(Int64)
-DECLARE(Float32)
-DECLARE(Float64)
-DECLARE(Decimal32)
-DECLARE(Decimal64)
-DECLARE(Decimal128)
-#undef DECLARE
 
-void FlatDictionary::getString(
-    const std::string & attribute_name, const PaddedPODArray<Key> & ids, const String & def, ColumnString * const out) const
-{
+    const auto& ids = id_col != nullptr ? id_col->getData() : ids_const;
+    bool is_const = id_col_const != nullptr;
+
     const auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
 
-    FlatDictionary::getItemsImpl<StringRef, StringRef>(
-        attribute,
-        ids,
-        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-        [&](const size_t) { return StringRef{def}; });
+    /// TODO: Check that attribute type is same as result type
+
+    auto type_call = [&](const auto &dictionary_attribute_type)
+    {
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
+
+        auto size = ids.size();
+
+        if constexpr (std::is_same_v<AttributeType, String>)
+        {
+            auto column_string = ColumnString::create();
+            auto out = column_string.get();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                {
+                    getItemsImpl<StringRef, StringRef>(
+                        attribute,
+                        ids,
+                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                        [&](const size_t row) { return default_col->getDataAt(row); });
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<String>();
+
+                    getItemsImpl<StringRef, StringRef>(
+                        attribute,
+                        ids,
+                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                        [&](const size_t) { return def; });
+                }
+            }
+            else
+            {
+                const auto & null_value = std::get<StringRef>(attribute.null_values);
+
+                getItemsImpl<StringRef, StringRef>(
+                    attribute,
+                    ids,
+                    [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                    [&](const size_t) { return null_value; });
+            }
+
+            result = std::move(column_string);
+        }
+        else if constexpr (IsNumber<AttributeType>)
+        {
+            auto column = ColumnVector<AttributeType>::create(size);
+            auto& out = column->getData();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnVector<AttributeType>>(*default_untyped))
+                {
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        ids,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row) { return default_col->getData()[row]; }
+                    );
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnVector<AttributeType>>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<AttributeType>();
+
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        ids,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t) { return def; }
+                    );
+                }
+            }
+            else
+            {
+                const auto null_value = std::get<AttributeType>(attribute.null_values);
+
+                getItemsImpl<AttributeType, AttributeType>(
+                    attribute,
+                    ids,
+                    [&](const size_t row, const auto value) { return out[row] = value; },
+                    [&](const size_t) { return null_value; });
+            }
+
+            result = std::move(column);
+        }
+        else if constexpr (IsDecimalNumber<AttributeType>)
+        {
+            // auto scale = getDecimalScale(*attribute.type);
+            auto column = ColumnDecimal<AttributeType>::create(size, 0);
+            auto& out = column->getData();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnDecimal<AttributeType>>(*default_untyped))
+                {
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        ids,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row) { return default_col->getData()[row]; }
+                    );
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnDecimal<AttributeType>>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<AttributeType>();
+
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        ids,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t) { return def; }
+                    );
+                }
+            }
+            else
+            {
+                const auto null_value = std::get<AttributeType>(attribute.null_values);
+
+                getItemsImpl<AttributeType, AttributeType>(
+                    attribute,
+                    ids,
+                    [&](const size_t row, const auto value) { return out[row] = value; },
+                    [&](const size_t) { return null_value; }
+                );
+            }
+
+            result = std::move(column);
+        }
+    };
+
+    callOnDictionaryAttributeType(attribute.type, type_call);
+    
+    if (is_const)
+    {
+        result = ColumnConst::create(std::move(result), 1);
+    }
+
+    return result;
 }
 
-
 void FlatDictionary::has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const
 {
-    const auto & attribute = attributes.front();
+    const auto ids_count = ext::size(ids);
 
-    switch (attribute.type)
+    for (const auto i : ext::range(0, ids_count))
     {
-        case AttributeUnderlyingType::utUInt8:
-            has<UInt8>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utUInt16:
-            has<UInt16>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utUInt32:
-            has<UInt32>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utUInt64:
-            has<UInt64>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utUInt128:
-            has<UInt128>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utInt8:
-            has<Int8>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utInt16:
-            has<Int16>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utInt32:
-            has<Int32>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utInt64:
-            has<Int64>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utFloat32:
-            has<Float32>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utFloat64:
-            has<Float64>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utString:
-            has<String>(attribute, ids, out);
-            break;
-
-        case AttributeUnderlyingType::utDecimal32:
-            has<Decimal32>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utDecimal64:
-            has<Decimal64>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utDecimal128:
-            has<Decimal128>(attribute, ids, out);
-            break;
+        const auto id = ids[i];
+        out[i] = id < loaded_ids.size() && loaded_ids[id];
     }
+
+    query_count.fetch_add(ids_count, std::memory_order_relaxed);
 }
 
 
@@ -416,6 +420,14 @@ void FlatDictionary::addAttributeSize(const Attribute & attribute)
     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();
+}
 
 void FlatDictionary::calculateBytesAllocated()
 {
@@ -423,60 +435,15 @@ void FlatDictionary::calculateBytesAllocated()
 
     for (const auto & attribute : attributes)
     {
-        switch (attribute.type)
+        auto type_call = [&](const auto & dictionary_attribute_type)
         {
-            case AttributeUnderlyingType::utUInt8:
-                addAttributeSize<UInt8>(attribute);
-                break;
-            case AttributeUnderlyingType::utUInt16:
-                addAttributeSize<UInt16>(attribute);
-                break;
-            case AttributeUnderlyingType::utUInt32:
-                addAttributeSize<UInt32>(attribute);
-                break;
-            case AttributeUnderlyingType::utUInt64:
-                addAttributeSize<UInt64>(attribute);
-                break;
-            case AttributeUnderlyingType::utUInt128:
-                addAttributeSize<UInt128>(attribute);
-                break;
-            case AttributeUnderlyingType::utInt8:
-                addAttributeSize<Int8>(attribute);
-                break;
-            case AttributeUnderlyingType::utInt16:
-                addAttributeSize<Int16>(attribute);
-                break;
-            case AttributeUnderlyingType::utInt32:
-                addAttributeSize<Int32>(attribute);
-                break;
-            case AttributeUnderlyingType::utInt64:
-                addAttributeSize<Int64>(attribute);
-                break;
-            case AttributeUnderlyingType::utFloat32:
-                addAttributeSize<Float32>(attribute);
-                break;
-            case AttributeUnderlyingType::utFloat64:
-                addAttributeSize<Float64>(attribute);
-                break;
+            using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+            using AttributeType = typename Type::AttributeType;
 
-            case AttributeUnderlyingType::utDecimal32:
-                addAttributeSize<Decimal32>(attribute);
-                break;
-            case AttributeUnderlyingType::utDecimal64:
-                addAttributeSize<Decimal64>(attribute);
-                break;
-            case AttributeUnderlyingType::utDecimal128:
-                addAttributeSize<Decimal128>(attribute);
-                break;
+            addAttributeSize<AttributeType>(attribute);
+        };
 
-            case AttributeUnderlyingType::utString:
-            {
-                addAttributeSize<StringRef>(attribute);
-                bytes_allocated += sizeof(Arena) + attribute.string_arena->size();
-
-                break;
-            }
-        }
+        callOnDictionaryAttributeType(attribute.type, type_call);
     }
 }
 
@@ -502,57 +469,16 @@ void FlatDictionary::createAttributeImpl<String>(Attribute & attribute, const Fi
 
 FlatDictionary::Attribute FlatDictionary::createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value)
 {
-    Attribute attr{type, {}, {}, {}};
+    Attribute attr{type, {}, {}, {}, {}};
 
-    switch (type)
+    auto type_call = [&](const auto &dictionary_attribute_type)
     {
-        case AttributeUnderlyingType::utUInt8:
-            createAttributeImpl<UInt8>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt16:
-            createAttributeImpl<UInt16>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt32:
-            createAttributeImpl<UInt32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt64:
-            createAttributeImpl<UInt64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt128:
-            createAttributeImpl<UInt128>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt8:
-            createAttributeImpl<Int8>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt16:
-            createAttributeImpl<Int16>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt32:
-            createAttributeImpl<Int32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt64:
-            createAttributeImpl<Int64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utFloat32:
-            createAttributeImpl<Float32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utFloat64:
-            createAttributeImpl<Float64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utString:
-            createAttributeImpl<String>(attr, null_value);
-            break;
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributType = typename Type::AttributeType;
+        createAttributeImpl<AttributType>(attr, null_value);
+    };
 
-        case AttributeUnderlyingType::utDecimal32:
-            createAttributeImpl<Decimal32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utDecimal64:
-            createAttributeImpl<Decimal64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utDecimal128:
-            createAttributeImpl<Decimal128>(attr, null_value);
-            break;
-    }
+    callOnDictionaryAttributeType(type, type_call);
 
     return attr;
 }
@@ -610,55 +536,14 @@ void FlatDictionary::setAttributeValueImpl<String>(Attribute & attribute, const
 
 void FlatDictionary::setAttributeValue(Attribute & attribute, const Key id, const Field & value)
 {
-    switch (attribute.type)
+    auto type_call = [&](const auto &dictionary_attribute_type)
     {
-        case AttributeUnderlyingType::utUInt8:
-            setAttributeValueImpl<UInt8>(attribute, id, value.get<UInt64>());
-            break;
-        case AttributeUnderlyingType::utUInt16:
-            setAttributeValueImpl<UInt16>(attribute, id, value.get<UInt64>());
-            break;
-        case AttributeUnderlyingType::utUInt32:
-            setAttributeValueImpl<UInt32>(attribute, id, value.get<UInt64>());
-            break;
-        case AttributeUnderlyingType::utUInt64:
-            setAttributeValueImpl<UInt64>(attribute, id, value.get<UInt64>());
-            break;
-        case AttributeUnderlyingType::utUInt128:
-            setAttributeValueImpl<UInt128>(attribute, id, value.get<UInt128>());
-            break;
-        case AttributeUnderlyingType::utInt8:
-            setAttributeValueImpl<Int8>(attribute, id, value.get<Int64>());
-            break;
-        case AttributeUnderlyingType::utInt16:
-            setAttributeValueImpl<Int16>(attribute, id, value.get<Int64>());
-            break;
-        case AttributeUnderlyingType::utInt32:
-            setAttributeValueImpl<Int32>(attribute, id, value.get<Int64>());
-            break;
-        case AttributeUnderlyingType::utInt64:
-            setAttributeValueImpl<Int64>(attribute, id, value.get<Int64>());
-            break;
-        case AttributeUnderlyingType::utFloat32:
-            setAttributeValueImpl<Float32>(attribute, id, value.get<Float64>());
-            break;
-        case AttributeUnderlyingType::utFloat64:
-            setAttributeValueImpl<Float64>(attribute, id, value.get<Float64>());
-            break;
-        case AttributeUnderlyingType::utString:
-            setAttributeValueImpl<String>(attribute, id, value.get<String>());
-            break;
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
+        setAttributeValueImpl<AttributeType>(attribute, id, value.get<AttributeType>());
+    };
 
-        case AttributeUnderlyingType::utDecimal32:
-            setAttributeValueImpl<Decimal32>(attribute, id, value.get<Decimal32>());
-            break;
-        case AttributeUnderlyingType::utDecimal64:
-            setAttributeValueImpl<Decimal64>(attribute, id, value.get<Decimal64>());
-            break;
-        case AttributeUnderlyingType::utDecimal128:
-            setAttributeValueImpl<Decimal128>(attribute, id, value.get<Decimal128>());
-            break;
-    }
+    callOnDictionaryAttributeType(attribute.type, type_call);
 }
 
 
@@ -672,21 +557,6 @@ const FlatDictionary::Attribute & FlatDictionary::getAttribute(const std::string
 }
 
 
-template <typename T>
-void FlatDictionary::has(const Attribute &, const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const
-{
-    const auto ids_count = ext::size(ids);
-
-    for (const auto i : ext::range(0, ids_count))
-    {
-        const auto id = ids[i];
-        out[i] = id < loaded_ids.size() && loaded_ids[id];
-    }
-
-    query_count.fetch_add(ids_count, std::memory_order_relaxed);
-}
-
-
 PaddedPODArray<FlatDictionary::Key> FlatDictionary::getIds() const
 {
     const auto ids_count = ext::size(loaded_ids);
diff --git a/src/Dictionaries/FlatDictionary.h b/src/Dictionaries/FlatDictionary.h
index 2f51c1f5c1b..6a6fafe5903 100644
--- a/src/Dictionaries/FlatDictionary.h
+++ b/src/Dictionaries/FlatDictionary.h
@@ -3,8 +3,11 @@
 #include <atomic>
 #include <variant>
 #include <vector>
+#include <optional>
 #include <Columns/ColumnDecimal.h>
 #include <Columns/ColumnString.h>
+#include <Columns/ColumnArray.h>
+#include <DataTypes/IDataType.h>
 #include <Common/Arena.h>
 #include <Core/Block.h>
 #include <ext/range.h>
@@ -69,71 +72,9 @@ public:
     template <typename T>
     using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
 
-#define DECLARE(TYPE) \
-    void get##TYPE(const std::string & attribute_name, const PaddedPODArray<Key> & ids, ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
+    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::getByIdentifiers;
 
-    void getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, ColumnString * out) const;
-
-#define DECLARE(TYPE) \
-    void get##TYPE( \
-        const std::string & attribute_name, \
-        const PaddedPODArray<Key> & ids, \
-        const PaddedPODArray<TYPE> & def, \
-        ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void
-    getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, const ColumnString * const def, ColumnString * const out)
-        const;
-
-#define DECLARE(TYPE) \
-    void get##TYPE(const std::string & attribute_name, const PaddedPODArray<Key> & ids, const TYPE def, ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, const String & def, ColumnString * const out) const;
+    ColumnPtr get(const std::string& attribute_name, const DataTypePtr & result_type, const ColumnPtr id_column, const ColumnPtr default_untyped) const;
 
     void has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const override;
 
@@ -146,6 +87,8 @@ private:
     struct Attribute final
     {
         AttributeUnderlyingType type;
+        // bool is_array;
+
         std::variant<
             UInt8,
             UInt16,
@@ -180,6 +123,8 @@ private:
             ContainerType<Float64>,
             ContainerType<StringRef>>
             arrays;
+
+        std::optional<ContainerType<size_t>> array_offsets;
         std::unique_ptr<Arena> string_arena;
     };
 
@@ -212,9 +157,6 @@ private:
 
     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 ChildType, typename AncestorType>
     void isInImpl(const ChildType & child_ids, const AncestorType & ancestor_ids, PaddedPODArray<UInt8> & out) const;
 
diff --git a/src/Dictionaries/HashedDictionary.h b/src/Dictionaries/HashedDictionary.h
index b9c4ab138b8..497d18f93e0 100644
--- a/src/Dictionaries/HashedDictionary.h
+++ b/src/Dictionaries/HashedDictionary.h
@@ -66,6 +66,8 @@ public:
 
     void toParent(const PaddedPODArray<Key> & ids, PaddedPODArray<Key> & out) const override;
 
+    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::unsupported;  
+
     template <typename T>
     using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
 
diff --git a/src/Dictionaries/IPAddressDictionary.h b/src/Dictionaries/IPAddressDictionary.h
index 2009141ebcc..3040579134c 100644
--- a/src/Dictionaries/IPAddressDictionary.h
+++ b/src/Dictionaries/IPAddressDictionary.h
@@ -61,6 +61,8 @@ public:
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
     }
 
+    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::unsupported;
+
     template <typename T>
     using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
 
diff --git a/src/Dictionaries/PolygonDictionary.h b/src/Dictionaries/PolygonDictionary.h
index 75114cff435..f22052b59b5 100644
--- a/src/Dictionaries/PolygonDictionary.h
+++ b/src/Dictionaries/PolygonDictionary.h
@@ -80,6 +80,8 @@ public:
 
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
 
+    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::unsupported;
+
     template <typename T>
     using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
 
diff --git a/src/Dictionaries/RangeHashedDictionary.h b/src/Dictionaries/RangeHashedDictionary.h
index 46ae0390b6a..22037fa4718 100644
--- a/src/Dictionaries/RangeHashedDictionary.h
+++ b/src/Dictionaries/RangeHashedDictionary.h
@@ -54,6 +54,8 @@ public:
 
     typedef Int64 RangeStorageType;
 
+    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::unsupported;
+
     template <typename T>
     using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
 
diff --git a/src/Dictionaries/SSDCacheDictionary.h b/src/Dictionaries/SSDCacheDictionary.h
index 59df778e1f2..0fa344adc6c 100644
--- a/src/Dictionaries/SSDCacheDictionary.h
+++ b/src/Dictionaries/SSDCacheDictionary.h
@@ -354,6 +354,8 @@ public:
     template <typename T>
     using ResultArrayType = SSDCacheStorage::ResultArrayType<T>;
 
+    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::unsupported;
+
 #define DECLARE(TYPE) \
     void get##TYPE(const std::string & attribute_name, const PaddedPODArray<Key> & ids, ResultArrayType<TYPE> & out) const;
     DECLARE(UInt8)
diff --git a/src/Dictionaries/SSDComplexKeyCacheDictionary.h b/src/Dictionaries/SSDComplexKeyCacheDictionary.h
index 4758d62f1df..b7ef53af054 100644
--- a/src/Dictionaries/SSDComplexKeyCacheDictionary.h
+++ b/src/Dictionaries/SSDComplexKeyCacheDictionary.h
@@ -569,6 +569,8 @@ public:
 
     std::exception_ptr getLastException() const override { return storage.getLastException(); }
 
+    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::unsupported;
+
     template <typename T>
     using ResultArrayType = SSDComplexKeyCacheStorage::ResultArrayType<T>;
 
diff --git a/src/Functions/FunctionsExternalDictionaries.h b/src/Functions/FunctionsExternalDictionaries.h
index 2cbcca734e4..d77d432bbf8 100644
--- a/src/Functions/FunctionsExternalDictionaries.h
+++ b/src/Functions/FunctionsExternalDictionaries.h
@@ -259,532 +259,26 @@ private:
 template <typename T>
 static const PaddedPODArray<T> & getColumnDataAsPaddedPODArray(const IColumn & column, PaddedPODArray<T> & backup_storage);
 
-
-class FunctionDictGetString final : public IFunction
+enum class DictionaryGetFunctionType
 {
-public:
-    static constexpr auto name = "dictGetString";
-
-    static FunctionPtr create(const Context & context)
-    {
-        return std::make_shared<FunctionDictGetString>(context);
-    }
-
-    explicit FunctionDictGetString(const Context & context_) : helper(context_) {}
-
-    String getName() const override { return name; }
-
-private:
-    bool isVariadic() const override { return true; }
-    size_t getNumberOfArguments() const override { return 0; }
-
-    bool useDefaultImplementationForConstants() const final { return true; }
-    ColumnNumbers getArgumentsThatAreAlwaysConstant() const final { return {0, 1}; }
-
-    bool isInjective(const ColumnsWithTypeAndName & sample_columns) const override
-    {
-        return helper.isDictGetFunctionInjective(sample_columns);
-    }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
-    {
-        if (arguments.size() != 3 && arguments.size() != 4)
-            throw Exception{"Number of arguments for function " + getName() + " doesn't match: passed "
-                + toString(arguments.size()) + ", should be 3 or 4.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
-
-        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};
-        }
-
-        if (!isString(arguments[1]))
-        {
-            throw Exception{"Illegal type " + arguments[1]->getName() + " of second argument of function " + getName()
-                + ", expected a string.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
-        }
-
-        if (!WhichDataType(arguments[2]).isUInt64() &&
-            !isTuple(arguments[2]))
-        {
-            throw Exception{"Illegal type " + arguments[2]->getName() + " of third argument of function " + getName()
-                + ", must be UInt64 or tuple(...).", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
-        }
-
-        /// This is for the case of range dictionaries_loader.
-        if (arguments.size() == 4 && !arguments[3]->isValueRepresentedByInteger())
-        {
-            throw Exception{"Illegal type " + arguments[3]->getName() +
-                            " of fourth argument of function " + getName() +
-                            " must be convertible to Int64.", ErrorCodes::ILLEGAL_COLUMN};
-        }
-
-        return std::make_shared<DataTypeString>();
-    }
-
-    bool isDeterministic() const override { return false; }
-
-    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 dict = helper.getDictionary(arguments[0]);
-        ColumnPtr res;
-
-        if (!((res = executeDispatch<FlatDictionary>(arguments, dict))
-            || (res = executeDispatch<HashedDictionary>(arguments, dict))
-            || (res = executeDispatch<DirectDictionary>(arguments, dict))
-            || (res = executeDispatch<CacheDictionary>(arguments, dict))
-#if defined(OS_LINUX) || defined(__FreeBSD__)
-            || (res = executeDispatch<SSDCacheDictionary>(arguments, dict))
-#endif
-            || (res = executeDispatchComplex<ComplexKeyHashedDictionary>(arguments, dict))
-            || (res = executeDispatchComplex<ComplexKeyDirectDictionary>(arguments, dict))
-            || (res = executeDispatchComplex<ComplexKeyCacheDictionary>(arguments, dict))
-#if defined(OS_LINUX) || defined(__FreeBSD__)
-            || (res = executeDispatchComplex<SSDComplexKeyCacheDictionary>(arguments, dict))
-#endif
-#if !defined(ARCADIA_BUILD)
-            || (res = executeDispatchComplex<IPAddressDictionary>(arguments, dict))
-#endif
-            || (res = executeDispatchComplex<PolygonDictionarySimple>(arguments, dict))
-            || (res = executeDispatchComplex<PolygonDictionaryIndexEach>(arguments, dict))
-            || (res = executeDispatchComplex<PolygonDictionaryIndexCell>(arguments, dict))
-            || (res = executeDispatchRange<RangeHashedDictionary>(arguments, dict))))
-            throw Exception{"Unsupported dictionary type " + dict->getTypeName(), ErrorCodes::UNKNOWN_TYPE};
-
-        return res;
-    }
-
-    template <typename DictionaryType>
-    ColumnPtr executeDispatch(
-            const ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
-    {
-        const auto * dict = typeid_cast<const DictionaryType *>(dict_ptr.get());
-        if (!dict)
-            return nullptr;
-
-        if (arguments.size() != 3)
-            throw Exception{"Function " + getName() + " for dictionary of type " + dict->getTypeName() +
-                " requires exactly 3 arguments", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
-
-        const auto * attr_name_col = checkAndGetColumnConst<ColumnString>(arguments[1].column.get());
-        if (!attr_name_col)
-            throw Exception{"Second argument of function " + getName() + " must be a constant string", ErrorCodes::ILLEGAL_COLUMN};
-
-        String attr_name = attr_name_col->getValue<String>();
-
-        const auto * id_col_untyped = arguments[2].column.get();
-        if (const auto * id_col = checkAndGetColumn<ColumnUInt64>(id_col_untyped))
-        {
-            auto out = ColumnString::create();
-            dict->getString(attr_name, id_col->getData(), out.get());
-            return out;
-        }
-        else
-            throw Exception{"Third argument of function " + getName() + " must be UInt64", ErrorCodes::ILLEGAL_COLUMN};
-    }
-
-    template <typename DictionaryType>
-    ColumnPtr executeDispatchComplex(
-            const ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
-    {
-        const auto * dict = typeid_cast<const DictionaryType *>(dict_ptr.get());
-        if (!dict)
-            return nullptr;
-
-        if (arguments.size() != 3)
-            throw Exception{"Function " + getName() + " for dictionary of type " + dict->getTypeName() +
-                " requires exactly 3 arguments", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
-
-        const auto * attr_name_col = checkAndGetColumnConst<ColumnString>(arguments[1].column.get());
-        if (!attr_name_col)
-            throw Exception{"Second argument of function " + getName() + " must be a constant string", ErrorCodes::ILLEGAL_COLUMN};
-
-        String attr_name = attr_name_col->getValue<String>();
-
-        const ColumnWithTypeAndName & key_col_with_type = arguments[2];
-        /// Functions in external dictionaries_loader only support full-value (not constant) columns with keys.
-        ColumnPtr key_col = key_col_with_type.column->convertToFullColumnIfConst();
-
-        if (checkColumn<ColumnTuple>(key_col.get()))
-        {
-            const auto & key_columns = assert_cast<const ColumnTuple &>(*key_col).getColumnsCopy();
-            const auto & key_types = static_cast<const DataTypeTuple &>(*key_col_with_type.type).getElements();
-
-            auto out = ColumnString::create();
-            dict->getString(attr_name, key_columns, key_types, out.get());
-            return out;
-        }
-        else
-            throw Exception{"Third argument of function " + getName() + " must be " + dict->getKeyDescription(), ErrorCodes::TYPE_MISMATCH};
-    }
-
-    template <typename DictionaryType>
-    ColumnPtr executeDispatchRange(
-            const ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
-    {
-        const auto * dict = typeid_cast<const DictionaryType *>(dict_ptr.get());
-        if (!dict)
-            return nullptr;
-
-        if (arguments.size() != 4)
-            throw Exception{"Function " + getName() + " for dictionary of type " + dict->getTypeName() +
-                " requires exactly 4 arguments", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
-
-        const auto * attr_name_col = checkAndGetColumnConst<ColumnString>(arguments[1].column.get());
-        if (!attr_name_col)
-            throw Exception{"Second argument of function " + getName() + " must be a constant string", ErrorCodes::ILLEGAL_COLUMN};
-
-        String attr_name = attr_name_col->getValue<String>();
-
-        const auto & id_col_untyped = arguments[2].column;
-        const auto & range_col_untyped = arguments[3].column;
-
-        PaddedPODArray<UInt64> id_col_values_storage;
-        PaddedPODArray<Int64> range_col_values_storage;
-        const auto & id_col_values = getColumnDataAsPaddedPODArray(*id_col_untyped, id_col_values_storage);
-        const auto & range_col_values = getColumnDataAsPaddedPODArray(*range_col_untyped, range_col_values_storage);
-
-        auto out = ColumnString::create();
-        dict->getString(attr_name, id_col_values, range_col_values, out.get());
-        return out;
-    }
-
-    mutable FunctionDictHelper helper;
+    withoutDefault,
+    withDefault
 };
 
-
-class FunctionDictGetStringOrDefault final : public IFunction
-{
-public:
-    static constexpr auto name = "dictGetStringOrDefault";
-
-    static FunctionPtr create(const Context & context)
-    {
-        return std::make_shared<FunctionDictGetStringOrDefault>(context);
-    }
-
-    explicit FunctionDictGetStringOrDefault(const Context & context_) : helper(context_) {}
-
-    String getName() const override { return name; }
-
-private:
-    size_t getNumberOfArguments() const override { return 4; }
-
-    bool useDefaultImplementationForConstants() const final { return true; }
-    ColumnNumbers getArgumentsThatAreAlwaysConstant() const final { return {0, 1}; }
-
-    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};
-
-        if (!isString(arguments[1]))
-            throw Exception{"Illegal type " + arguments[1]->getName() + " of second argument of function " + getName() +
-                ", expected a string.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
-
-        if (!WhichDataType(arguments[2]).isUInt64() &&
-            !isTuple(arguments[2]))
-        {
-            throw Exception{"Illegal type " + arguments[2]->getName() + " of third argument of function " + getName()
-                + ", must be UInt64 or tuple(...).", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
-        }
-
-        if (!isString(arguments[3]))
-            throw Exception{"Illegal type " + arguments[3]->getName() + " of fourth argument of function " + getName() +
-                ", must be String.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
-
-        return std::make_shared<DataTypeString>();
-    }
-
-    bool isDeterministic() const override { return false; }
-
-    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 dict = helper.getDictionary(arguments[0]);
-
-        ColumnPtr res;
-        if (!((res = executeDispatch<FlatDictionary>(arguments, dict))
-            || (res = executeDispatch<HashedDictionary>(arguments, dict))
-            || (res = executeDispatch<DirectDictionary>(arguments, dict))
-            || (res = executeDispatch<CacheDictionary>(arguments, dict))
-#if defined(OS_LINUX) || defined(__FreeBSD__)
-            || (res = executeDispatch<SSDCacheDictionary>(arguments, dict))
-#endif
-            || (res = executeDispatchComplex<ComplexKeyHashedDictionary>(arguments, dict))
-            || (res = executeDispatchComplex<ComplexKeyDirectDictionary>(arguments, dict))
-            || (res = executeDispatchComplex<ComplexKeyCacheDictionary>(arguments, dict))
-#if defined(OS_LINUX) || defined(__FreeBSD__)
-            || (res = executeDispatchComplex<SSDComplexKeyCacheDictionary>(arguments, dict))
-#endif
-#if !defined(ARCADIA_BUILD)
-            || (res = executeDispatchComplex<IPAddressDictionary>(arguments, dict))
-#endif
-            || (res = executeDispatchComplex<PolygonDictionarySimple>(arguments, dict))
-            || (res = executeDispatchComplex<PolygonDictionaryIndexEach>(arguments, dict))
-            || (res = executeDispatchComplex<PolygonDictionaryIndexCell>(arguments, dict))))
-            throw Exception{"Unsupported dictionary type " + dict->getTypeName(), ErrorCodes::UNKNOWN_TYPE};
-
-        return res;
-    }
-
-    template <typename DictionaryType>
-    ColumnPtr executeDispatch(const ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
-    {
-        const auto * dict = typeid_cast<const DictionaryType *>(dict_ptr.get());
-        if (!dict)
-            return nullptr;
-
-        const auto * attr_name_col = checkAndGetColumnConst<ColumnString>(arguments[1].column.get());
-        if (!attr_name_col)
-            throw Exception{"Second argument of function " + getName() + " must be a constant string", ErrorCodes::ILLEGAL_COLUMN};
-
-        String attr_name = attr_name_col->getValue<String>();
-
-        const auto * id_col_untyped = arguments[2].column.get();
-        if (const auto * id_col = checkAndGetColumn<ColumnUInt64>(id_col_untyped))
-            return executeDispatch(arguments, dict, attr_name, id_col);
-        else if (const auto * id_col_const = checkAndGetColumnConst<ColumnVector<UInt64>>(id_col_untyped))
-            return executeDispatch(arguments, dict, attr_name, id_col_const);
-        else
-            throw Exception{"Third argument of function " + getName() + " must be UInt64", ErrorCodes::ILLEGAL_COLUMN};
-    }
-
-    template <typename DictionaryType>
-    ColumnPtr executeDispatch(
-            const ColumnsWithTypeAndName & arguments, const DictionaryType * dict,
-            const std::string & attr_name, const ColumnUInt64 * id_col) const
-    {
-        const auto * default_col_untyped = arguments[3].column.get();
-
-        if (const auto * default_col = checkAndGetColumn<ColumnString>(default_col_untyped))
-        {
-            /// vector ids, vector defaults
-            auto out = ColumnString::create();
-            const auto & ids = id_col->getData();
-            dict->getString(attr_name, ids, default_col, out.get());
-            return out;
-        }
-        else if (const auto * default_col_const = checkAndGetColumnConstStringOrFixedString(default_col_untyped))
-        {
-            /// vector ids, const defaults
-            auto out = ColumnString::create();
-            const auto & ids = id_col->getData();
-            String def = default_col_const->getValue<String>();
-            dict->getString(attr_name, ids, def, out.get());
-            return out;
-        }
-        else
-            throw Exception{"Fourth argument of function " + getName() + " must be String", ErrorCodes::ILLEGAL_COLUMN};
-    }
-
-    template <typename DictionaryType>
-    ColumnPtr executeDispatch(
-            const ColumnsWithTypeAndName & arguments, const DictionaryType * dict,
-            const std::string & attr_name, const ColumnConst * id_col) const
-    {
-        const auto * default_col_untyped = arguments[3].column.get();
-
-        if (const auto * default_col = checkAndGetColumn<ColumnString>(default_col_untyped))
-        {
-            /// const ids, vector defaults
-            const PaddedPODArray<UInt64> ids(1, id_col->getValue<UInt64>());
-            PaddedPODArray<UInt8> flags(1);
-            dict->has(ids, flags);
-            if (flags.front())
-            {
-                auto out = ColumnString::create();
-                dict->getString(attr_name, ids, String(), out.get());
-                return DataTypeString().createColumnConst(id_col->size(), out->getDataAt(0).toString());
-            }
-            else
-                return arguments[3].column; // reuse the default column
-        }
-        else if (const auto * default_col_const = checkAndGetColumnConstStringOrFixedString(default_col_untyped))
-        {
-            /// const ids, const defaults
-            const PaddedPODArray<UInt64> ids(1, id_col->getValue<UInt64>());
-            auto out = ColumnString::create();
-            String def = default_col_const->getValue<String>();
-            dict->getString(attr_name, ids, def, out.get());
-            return DataTypeString().createColumnConst(id_col->size(), out->getDataAt(0).toString());
-        }
-        else
-            throw Exception{"Fourth argument of function " + getName() + " must be String", ErrorCodes::ILLEGAL_COLUMN};
-    }
-
-    template <typename DictionaryType>
-    ColumnPtr executeDispatchComplex(
-            const ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
-    {
-        const auto * dict = typeid_cast<const DictionaryType *>(dict_ptr.get());
-        if (!dict)
-            return nullptr;
-
-        const auto * attr_name_col = checkAndGetColumnConst<ColumnString>(arguments[1].column.get());
-        if (!attr_name_col)
-            throw Exception{"Second argument of function " + getName() + " must be a constant string", ErrorCodes::ILLEGAL_COLUMN};
-
-        String attr_name = attr_name_col->getValue<String>();
-
-        const ColumnWithTypeAndName & key_col_with_type = arguments[2];
-        /// Functions in external dictionaries_loader only support full-value (not constant) columns with keys.
-        ColumnPtr key_col = key_col_with_type.column->convertToFullColumnIfConst();
-
-        const auto & key_columns = typeid_cast<const ColumnTuple &>(*key_col).getColumnsCopy();
-        const auto & key_types = static_cast<const DataTypeTuple &>(*key_col_with_type.type).getElements();
-
-        auto out = ColumnString::create();
-
-        const auto * default_col_untyped = arguments[3].column.get();
-        if (const auto * default_col = checkAndGetColumn<ColumnString>(default_col_untyped))
-        {
-            dict->getString(attr_name, key_columns, key_types, default_col, out.get());
-        }
-        else if (const auto * default_col_const = checkAndGetColumnConstStringOrFixedString(default_col_untyped))
-        {
-            String def = default_col_const->getValue<String>();
-            dict->getString(attr_name, key_columns, key_types, def, out.get());
-        }
-        else
-            throw Exception{"Fourth argument of function " + getName() + " must be String", ErrorCodes::ILLEGAL_COLUMN};
-
-        return out;
-    }
-
-    mutable FunctionDictHelper helper;
-};
-
-
-template <typename DataType> struct DictGetTraits;
-#define DECLARE_DICT_GET_TRAITS(TYPE, DATA_TYPE) \
-template <> struct DictGetTraits<DATA_TYPE>\
-{\
-    template <typename DictionaryType>\
-    static void get(\
-        const DictionaryType * dict, const std::string & name, const PaddedPODArray<UInt64> & ids,\
-        PaddedPODArray<TYPE> & out)\
-    {\
-        dict->get##TYPE(name, ids, out);\
-    }\
-    template <typename DictionaryType>\
-    static void get(\
-        const DictionaryType * dict, const std::string & name, const Columns & key_columns,\
-        const DataTypes & key_types, PaddedPODArray<TYPE> & out)\
-    {\
-        dict->get##TYPE(name, key_columns, key_types, out);\
-    }\
-    template <typename DictionaryType>\
-    static void get(\
-        const DictionaryType * dict, const std::string & name, const PaddedPODArray<UInt64> & ids,\
-        const PaddedPODArray<Int64> & dates, PaddedPODArray<TYPE> & out)\
-    {\
-        dict->get##TYPE(name, ids, dates, out);\
-    }\
-    template <typename DictionaryType, typename DefaultsType>\
-    static void getOrDefault(\
-        const DictionaryType * dict, const std::string & name, const PaddedPODArray<UInt64> & ids,\
-        const DefaultsType & def, PaddedPODArray<TYPE> & out)\
-    {\
-        dict->get##TYPE(name, ids, def, out);\
-    }\
-    template <typename DictionaryType, typename DefaultsType>\
-    static void getOrDefault(\
-        const DictionaryType * dict, const std::string & name, const Columns & key_columns,\
-        const DataTypes & key_types, const DefaultsType & def, PaddedPODArray<TYPE> & out)\
-    {\
-        dict->get##TYPE(name, key_columns, key_types, def, out);\
-    }\
-};
-DECLARE_DICT_GET_TRAITS(UInt8, DataTypeUInt8)
-DECLARE_DICT_GET_TRAITS(UInt16, DataTypeUInt16)
-DECLARE_DICT_GET_TRAITS(UInt32, DataTypeUInt32)
-DECLARE_DICT_GET_TRAITS(UInt64, DataTypeUInt64)
-DECLARE_DICT_GET_TRAITS(Int8, DataTypeInt8)
-DECLARE_DICT_GET_TRAITS(Int16, DataTypeInt16)
-DECLARE_DICT_GET_TRAITS(Int32, DataTypeInt32)
-DECLARE_DICT_GET_TRAITS(Int64, DataTypeInt64)
-DECLARE_DICT_GET_TRAITS(Float32, DataTypeFloat32)
-DECLARE_DICT_GET_TRAITS(Float64, DataTypeFloat64)
-DECLARE_DICT_GET_TRAITS(UInt16, DataTypeDate)
-DECLARE_DICT_GET_TRAITS(UInt32, DataTypeDateTime)
-DECLARE_DICT_GET_TRAITS(UInt128, DataTypeUUID)
-#undef DECLARE_DICT_GET_TRAITS
-
-template <typename T> struct DictGetTraits<DataTypeDecimal<T>>
-{
-    static constexpr bool is_dec32 = std::is_same_v<T, Decimal32>;
-    static constexpr bool is_dec64 = std::is_same_v<T, Decimal64>;
-    static constexpr bool is_dec128 = std::is_same_v<T, Decimal128>;
-
-    template <typename DictionaryType>
-    static void get(const DictionaryType * dict, const std::string & name, const PaddedPODArray<UInt64> & ids,
-                    DecimalPaddedPODArray<T> & out)
-    {
-        if constexpr (is_dec32) dict->getDecimal32(name, ids, out);
-        if constexpr (is_dec64) dict->getDecimal64(name, ids, out);
-        if constexpr (is_dec128) dict->getDecimal128(name, ids, out);
-    }
-
-    template <typename DictionaryType>
-    static void get(const DictionaryType * dict, const std::string & name, const Columns & key_columns, const DataTypes & key_types,
-                    DecimalPaddedPODArray<T> & out)
-    {
-        if constexpr (is_dec32) dict->getDecimal32(name, key_columns, key_types, out);
-        if constexpr (is_dec64) dict->getDecimal64(name, key_columns, key_types, out);
-        if constexpr (is_dec128) dict->getDecimal128(name, key_columns, key_types, out);
-    }
-
-    template <typename DictionaryType>
-    static void get(const DictionaryType * dict, const std::string & name, const PaddedPODArray<UInt64> & ids,
-                    const PaddedPODArray<Int64> & dates, DecimalPaddedPODArray<T> & out)
-    {
-        if constexpr (is_dec32) dict->getDecimal32(name, ids, dates, out);
-        if constexpr (is_dec64) dict->getDecimal64(name, ids, dates, out);
-        if constexpr (is_dec128) dict->getDecimal128(name, ids, dates, out);
-    }
-
-    template <typename DictionaryType, typename DefaultsType>
-    static void getOrDefault(const DictionaryType * dict, const std::string & name, const PaddedPODArray<UInt64> & ids,
-                    const DefaultsType & def, DecimalPaddedPODArray<T> & out)
-    {
-        if constexpr (is_dec32) dict->getDecimal32(name, ids, def, out);
-        if constexpr (is_dec64) dict->getDecimal64(name, ids, def, out);
-        if constexpr (is_dec128) dict->getDecimal128(name, ids, def, out);
-    }
-
-    template <typename DictionaryType, typename DefaultsType>
-    static void getOrDefault(const DictionaryType * dict, const std::string & name, const Columns & key_columns,
-                    const DataTypes & key_types, const DefaultsType & def, DecimalPaddedPODArray<T> & out)
-    {
-        if constexpr (is_dec32) dict->getDecimal32(name, key_columns, key_types, def, out);
-        if constexpr (is_dec64) dict->getDecimal64(name, key_columns, key_types, def, out);
-        if constexpr (is_dec128) dict->getDecimal128(name, key_columns, key_types, def, out);
-    }
-};
-
-
-template <typename DataType, typename Name>
-class FunctionDictGet final : public IFunction
+template <typename DataType, typename Name, DictionaryGetFunctionType dictionary_get_function_type>
+class FunctionDictGetImpl final : public IFunction
 {
     using Type = typename DataType::FieldType;
-    using ColVec = std::conditional_t<IsDecimalNumber<Type>, ColumnDecimal<Type>, ColumnVector<Type>>;
 
 public:
     static constexpr auto name = Name::name;
 
     static FunctionPtr create(const Context & context, UInt32 dec_scale = 0)
     {
-        return std::make_shared<FunctionDictGet>(context, dec_scale);
+        return std::make_shared<FunctionDictGetImpl>(context, dec_scale);
     }
 
-    explicit FunctionDictGet(const Context & context_, UInt32 dec_scale = 0)
+    explicit FunctionDictGetImpl(const Context & context_, UInt32 dec_scale = 0)
         : helper(context_)
         , decimal_scale(dec_scale)
     {}
@@ -792,22 +286,21 @@ public:
     String getName() const override { return name; }
 
 private:
-    bool isVariadic() const override { return true; }
-    size_t getNumberOfArguments() const override { return 0; }
+    size_t getNumberOfArguments() const override {
+        /// TODO: Check if ranged dictionary is working
+        return dictionary_get_function_type == DictionaryGetFunctionType::withoutDefault ? 0 : 4; 
+    }
+
+    bool isVariadic() const override { return dictionary_get_function_type == DictionaryGetFunctionType::withoutDefault; }
 
     bool useDefaultImplementationForConstants() const final { return true; }
-    ColumnNumbers getArgumentsThatAreAlwaysConstant() const final { return {0, 1}; }
 
-    bool isInjective(const ColumnsWithTypeAndName & sample_columns) const override
-    {
-        return helper.isDictGetFunctionInjective(sample_columns);
-    }
+    bool isDeterministic() const override { return false; }
+
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const final { return {0, 1}; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
-        if (arguments.size() != 3 && arguments.size() != 4)
-            throw Exception{"Function " + getName() + " takes 3 or 4 arguments", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
-
         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};
@@ -821,14 +314,21 @@ private:
             throw Exception{"Illegal type " + arguments[2]->getName() + " of third argument of function " + getName()
                 + ", must be UInt64 or tuple(...).", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
 
-        if (arguments.size() == 4)
+        if constexpr (dictionary_get_function_type == DictionaryGetFunctionType::withDefault)
         {
-            const auto * range_argument = arguments[3].get();
-            if (!(range_argument->isValueRepresentedByInteger() &&
-                   range_argument->getSizeOfValueInMemory() <= sizeof(Int64)))
-                throw Exception{"Illegal type " + range_argument->getName() + " of fourth argument of function " + getName()
-                    + ", must be convertible to " + TypeName<Int64>::get() + ".",
-                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+            if (!checkAndGetDataType<DataType>(arguments[3].get()))
+                throw Exception{"Illegal type " + arguments[3]->getName() + " of fourth argument of function " + getName()
+                    + ", must be " + TypeName<Type>::get() + ".", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+        }
+        else
+        {
+            /// This is for the case of range dictionaries_loader.
+            if (arguments.size() == 4 && !arguments[3]->isValueRepresentedByInteger())
+            {
+                throw Exception{"Illegal type " + arguments[3]->getName() +
+                                " of fourth argument of function " + getName() +
+                                " must be convertible to Int64.", ErrorCodes::ILLEGAL_COLUMN};
+            }
         }
 
         if constexpr (IsDataTypeDecimal<DataType>)
@@ -837,174 +337,88 @@ private:
             return std::make_shared<DataType>();
     }
 
-    bool isDeterministic() const override { return false; }
-
     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 dict = helper.getDictionary(arguments[0]);
-
         ColumnPtr res;
-        if (!((res = executeDispatch<FlatDictionary>(arguments, dict))
-            || (res = executeDispatch<HashedDictionary>(arguments, dict))
-            || (res = executeDispatch<DirectDictionary>(arguments, dict))
-            || (res = executeDispatch<CacheDictionary>(arguments, dict))
+
+        if (!((res = executeDispatch<FlatDictionary>(arguments, result_type, dict))
+            || (res = executeDispatch<HashedDictionary>(arguments, result_type, dict))
+            || (res = executeDispatch<DirectDictionary>(arguments, result_type, dict))
+            || (res = executeDispatch<CacheDictionary>(arguments, result_type, dict))
 #if defined(OS_LINUX) || defined(__FreeBSD__)
-            || (res = executeDispatch<SSDCacheDictionary>(arguments, dict))
+            || (res = executeDispatch<SSDCacheDictionary>(arguments, result_type, dict))
 #endif
-            || (res = executeDispatchComplex<ComplexKeyHashedDictionary>(arguments, dict))
-            || (res = executeDispatchComplex<ComplexKeyDirectDictionary>(arguments, dict))
-            || (res = executeDispatchComplex<ComplexKeyCacheDictionary>(arguments, dict))
+            || (res = executeDispatch<ComplexKeyHashedDictionary>(arguments, result_type, dict))
+            || (res = executeDispatch<ComplexKeyDirectDictionary>(arguments, result_type, dict))
+            || (res = executeDispatch<ComplexKeyCacheDictionary>(arguments, result_type, dict))
 #if defined(OS_LINUX) || defined(__FreeBSD__)
-            || (res = executeDispatchComplex<SSDComplexKeyCacheDictionary>(arguments, dict))
+            || (res = executeDispatch<SSDComplexKeyCacheDictionary>(arguments, result_type, dict))
 #endif
 #if !defined(ARCADIA_BUILD)
-            || (res = executeDispatchComplex<IPAddressDictionary>(arguments, dict))
+            || (res = executeDispatch<IPAddressDictionary>(arguments, result_type, dict))
 #endif
-            || (res = executeDispatchComplex<PolygonDictionarySimple>(arguments, dict))
-            || (res = executeDispatchComplex<PolygonDictionaryIndexEach>(arguments, dict))
-            || (res = executeDispatchComplex<PolygonDictionaryIndexCell>(arguments, dict))
-            || (res = executeDispatchRange<RangeHashedDictionary>(arguments, dict))))
+            || (res = executeDispatch<PolygonDictionarySimple>(arguments, result_type, dict))
+            || (res = executeDispatch<PolygonDictionaryIndexEach>(arguments, result_type, dict))
+            || (res = executeDispatch<PolygonDictionaryIndexCell>(arguments, result_type, dict))
+            || (res = executeDispatch<RangeHashedDictionary>(arguments, result_type, dict))))
             throw Exception{"Unsupported dictionary type " + dict->getTypeName(), ErrorCodes::UNKNOWN_TYPE};
 
         return res;
     }
 
     template <typename DictionaryType>
-    ColumnPtr executeDispatch(const ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
+    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)
+        const auto * dictionary = typeid_cast<const DictionaryType *>(dict_ptr.get());
+        if (!dictionary)
             return nullptr;
 
-        if (arguments.size() != 3)
-            throw Exception{"Function " + getName() + " for dictionary of type " + dict->getTypeName() +
-                " requires exactly 3 arguments.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
-
         const auto * attr_name_col = checkAndGetColumnConst<ColumnString>(arguments[1].column.get());
         if (!attr_name_col)
             throw Exception{"Second argument of function " + getName() + " must be a constant string", ErrorCodes::ILLEGAL_COLUMN};
 
         String attr_name = attr_name_col->getValue<String>();
 
-        const auto * id_col_untyped = arguments[2].column.get();
-        if (const auto * id_col = checkAndGetColumn<ColumnUInt64>(id_col_untyped))
-        {
-            typename ColVec::MutablePtr out;
-            if constexpr (IsDataTypeDecimal<DataType>)
-                out = ColVec::create(id_col->size(), decimal_scale);
-            else
-                out = ColVec::create(id_col->size());
-            const auto & ids = id_col->getData();
-            auto & data = out->getData();
-            DictGetTraits<DataType>::get(dict, attr_name, ids, data);
-            return out;
-        }
-        else if (const auto * id_col_const = checkAndGetColumnConst<ColumnVector<UInt64>>(id_col_untyped))
-        {
-            const PaddedPODArray<UInt64> ids(1, id_col_const->getValue<UInt64>());
+        const auto id_col_untyped = arguments[2].column;
 
-            if constexpr (IsDataTypeDecimal<DataType>)
+        constexpr auto dictionary_get_by_type = DictionaryType::get_by_type;
+
+        if constexpr (dictionary_get_by_type == DictionaryGetByType::getByIdentifiers)
+        {
+            if (dictionary_get_function_type == DictionaryGetFunctionType::withDefault)
             {
-                DecimalPaddedPODArray<Type> data(1, decimal_scale);
-                DictGetTraits<DataType>::get(dict, attr_name, ids, data);
-                return DataType(DataType::maxPrecision(), decimal_scale).createColumnConst(
-                        id_col_const->size(), toField(data.front(), decimal_scale));
+                const auto default_col_untyped = arguments[3].column;
+                return dictionary->get(attr_name, result_type, id_col_untyped, default_col_untyped);
             }
             else
             {
-                PaddedPODArray<Type> data(1);
-                DictGetTraits<DataType>::get(dict, attr_name, ids, data);
-                return DataTypeNumber<Type>().createColumnConst(id_col_const->size(), toField(data.front()));
+                return dictionary->get(attr_name, result_type, id_col_untyped, nullptr);
             }
         }
-        else
-            throw Exception{"Third argument of function " + getName() + " must be UInt64", ErrorCodes::ILLEGAL_COLUMN};
-    }
-
-    template <typename DictionaryType>
-    ColumnPtr executeDispatchComplex(
-            const ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
-    {
-        const auto * dict = typeid_cast<const DictionaryType *>(dict_ptr.get());
-        if (!dict)
-            return nullptr;
-
-        if (arguments.size() != 3)
-            throw Exception{"Function " + getName() + " for dictionary of type " + dict->getTypeName() +
-                " requires exactly 3 arguments", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
-
-        const auto * attr_name_col = checkAndGetColumnConst<ColumnString>(arguments[1].column.get());
-        if (!attr_name_col)
-            throw Exception{"Second argument of function " + getName() + " must be a constant string", ErrorCodes::ILLEGAL_COLUMN};
-
-        String attr_name = attr_name_col->getValue<String>();
-
-        const ColumnWithTypeAndName & key_col_with_type = arguments[2];
-
-        /// Functions in external dictionaries_loader only support full-value (not constant) columns with keys.
-        ColumnPtr key_col = key_col_with_type.column->convertToFullColumnIfConst();
-
-        if (checkColumn<ColumnTuple>(key_col.get()))
+        else if constexpr (dictionary_get_by_type == DictionaryGetByType::getByComplexKeys)
         {
-            const auto & key_columns = assert_cast<const ColumnTuple &>(*key_col).getColumnsCopy();
-            const auto & key_types = static_cast<const DataTypeTuple &>(*key_col_with_type.type).getElements();
-
-            typename ColVec::MutablePtr out;
-            if constexpr (IsDataTypeDecimal<DataType>)
-                out = ColVec::create(key_columns.front()->size(), decimal_scale);
-            else
-                out = ColVec::create(key_columns.front()->size());
-            auto & data = out->getData();
-            DictGetTraits<DataType>::get(dict, attr_name, key_columns, key_types, data);
-            return out;
+            return nullptr;
         }
         else
-            throw Exception{"Third argument of function " + getName() + " must be " + dict->getKeyDescription(), ErrorCodes::TYPE_MISMATCH};
-    }
-
-    template <typename DictionaryType>
-    ColumnPtr executeDispatchRange(
-            const ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
-    {
-        const auto * dict = typeid_cast<const DictionaryType *>(dict_ptr.get());
-        if (!dict)
+        {
             return nullptr;
-
-        if (arguments.size() != 4)
-            throw Exception{"Function " + getName() + " for dictionary of type " + dict->getTypeName() +
-                " requires exactly 4 arguments", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
-
-        const auto * attr_name_col = checkAndGetColumnConst<ColumnString>(arguments[1].column.get());
-        if (!attr_name_col)
-            throw Exception{"Second argument of function " + getName() + " must be a constant string", ErrorCodes::ILLEGAL_COLUMN};
-
-        String attr_name = attr_name_col->getValue<String>();
-
-        const auto & id_col_untyped = arguments[2].column;
-        const auto & range_col_untyped = arguments[3].column;
-
-        PaddedPODArray<UInt64> id_col_values_storage;
-        PaddedPODArray<Int64> range_col_values_storage;
-        const auto & id_col_values = getColumnDataAsPaddedPODArray(*id_col_untyped, id_col_values_storage);
-        const auto & range_col_values = getColumnDataAsPaddedPODArray(*range_col_untyped, range_col_values_storage);
-
-        typename ColVec::MutablePtr out;
-        if constexpr (IsDataTypeDecimal<DataType>)
-            out = ColVec::create(id_col_untyped->size(), decimal_scale);
-        else
-            out = ColVec::create(id_col_untyped->size());
-        auto & data = out->getData();
-        DictGetTraits<DataType>::get(dict, attr_name, id_col_values, range_col_values, data);
-        return out;
+        }
     }
 
     mutable FunctionDictHelper helper;
     UInt32 decimal_scale;
 };
 
+template<typename DataType, typename Name>
+using FunctionDictGet = FunctionDictGetImpl<DataType, Name, DictionaryGetFunctionType::withoutDefault>;
+
 struct NameDictGetUInt8 { static constexpr auto name = "dictGetUInt8"; };
 struct NameDictGetUInt16 { static constexpr auto name = "dictGetUInt16"; };
 struct NameDictGetUInt32 { static constexpr auto name = "dictGetUInt32"; };
@@ -1021,6 +435,7 @@ struct NameDictGetUUID { static constexpr auto name = "dictGetUUID"; };
 struct NameDictGetDecimal32 { static constexpr auto name = "dictGetDecimal32"; };
 struct NameDictGetDecimal64 { static constexpr auto name = "dictGetDecimal64"; };
 struct NameDictGetDecimal128 { static constexpr auto name = "dictGetDecimal128"; };
+struct NameDictGetString { static constexpr auto name = "dictGetString"; };
 
 using FunctionDictGetUInt8 = FunctionDictGet<DataTypeUInt8, NameDictGetUInt8>;
 using FunctionDictGetUInt16 = FunctionDictGet<DataTypeUInt16, NameDictGetUInt16>;
@@ -1038,266 +453,10 @@ using FunctionDictGetUUID = FunctionDictGet<DataTypeUUID, NameDictGetUUID>;
 using FunctionDictGetDecimal32 = FunctionDictGet<DataTypeDecimal<Decimal32>, NameDictGetDecimal32>;
 using FunctionDictGetDecimal64 = FunctionDictGet<DataTypeDecimal<Decimal64>, NameDictGetDecimal64>;
 using FunctionDictGetDecimal128 = FunctionDictGet<DataTypeDecimal<Decimal128>, NameDictGetDecimal128>;
+using FunctionDictGetString = FunctionDictGet<DataTypeString, NameDictGetString>;
 
-
-template <typename DataType, typename Name>
-class FunctionDictGetOrDefault final : public IFunction
-{
-    using Type = typename DataType::FieldType;
-    using ColVec = std::conditional_t<IsDecimalNumber<Type>, ColumnDecimal<Type>, ColumnVector<Type>>;
-
-public:
-    static constexpr auto name = Name::name;
-
-    static FunctionPtr create(const Context & context, UInt32 dec_scale = 0)
-    {
-        return std::make_shared<FunctionDictGetOrDefault>(context, dec_scale);
-    }
-
-    explicit FunctionDictGetOrDefault(const Context & context_, UInt32 dec_scale = 0)
-        : helper(context_)
-        , decimal_scale(dec_scale)
-    {}
-
-    String getName() const override { return name; }
-
-private:
-    size_t getNumberOfArguments() const override { return 4; }
-
-    bool useDefaultImplementationForConstants() const final { return true; }
-    ColumnNumbers getArgumentsThatAreAlwaysConstant() const final { return {0, 1}; }
-
-    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};
-
-        if (!isString(arguments[1]))
-            throw Exception{"Illegal type " + arguments[1]->getName() + " of second argument of function " + getName()
-                + ", expected a string.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
-
-        if (!WhichDataType(arguments[2]).isUInt64() &&
-            !isTuple(arguments[2]))
-            throw Exception{"Illegal type " + arguments[2]->getName() + " of third argument of function " + getName()
-                + ", must be UInt64 or tuple(...).", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
-
-        if (!checkAndGetDataType<DataType>(arguments[3].get()))
-            throw Exception{"Illegal type " + arguments[3]->getName() + " of fourth argument of function " + getName()
-                + ", must be " + TypeName<Type>::get() + ".", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
-
-        if constexpr (IsDataTypeDecimal<DataType>)
-            return std::make_shared<DataType>(DataType::maxPrecision(), decimal_scale);
-        else
-            return std::make_shared<DataType>();
-    }
-
-    bool isDeterministic() const override { return false; }
-
-    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 dict = helper.getDictionary(arguments[0]);
-        ColumnPtr res;
-
-        if (!((res = executeDispatch<FlatDictionary>(arguments, dict))
-            || (res = executeDispatch<HashedDictionary>(arguments, dict))
-            || (res = executeDispatch<DirectDictionary>(arguments, dict))
-            || (res = executeDispatch<CacheDictionary>(arguments, dict))
-#if defined(OS_LINUX) || defined(__FreeBSD__)
-            || (res = executeDispatch<SSDCacheDictionary>(arguments, dict))
-#endif
-            || (res = executeDispatchComplex<ComplexKeyHashedDictionary>(arguments, dict))
-            || (res = executeDispatchComplex<ComplexKeyDirectDictionary>(arguments, dict))
-            || (res = executeDispatchComplex<ComplexKeyCacheDictionary>(arguments, dict))
-#if defined(OS_LINUX) || defined(__FreeBSD__)
-            || (res = executeDispatchComplex<SSDComplexKeyCacheDictionary>(arguments, dict))
-#endif
-#if !defined(ARCADIA_BUILD)
-            || (res = executeDispatchComplex<IPAddressDictionary>(arguments, dict))
-#endif
-            || (res = executeDispatchComplex<PolygonDictionarySimple>(arguments, dict))
-            || (res = executeDispatchComplex<PolygonDictionaryIndexEach>(arguments, dict))
-            || (res = executeDispatchComplex<PolygonDictionaryIndexCell>(arguments, dict))))
-            throw Exception{"Unsupported dictionary type " + dict->getTypeName(), ErrorCodes::UNKNOWN_TYPE};
-
-        return res;
-    }
-
-    template <typename DictionaryType>
-    ColumnPtr executeDispatch(const ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
-    {
-        const auto * dict = typeid_cast<const DictionaryType *>(dict_ptr.get());
-        if (!dict)
-            return nullptr;
-
-        const auto * attr_name_col = checkAndGetColumnConst<ColumnString>(arguments[1].column.get());
-        if (!attr_name_col)
-            throw Exception{"Second argument of function " + getName() + " must be a constant string", ErrorCodes::ILLEGAL_COLUMN};
-
-        String attr_name = attr_name_col->getValue<String>();
-
-        const auto * id_col_untyped = arguments[2].column.get();
-        if (const auto * id_col = checkAndGetColumn<ColumnUInt64>(id_col_untyped))
-            return executeDispatch(arguments, dict, attr_name, id_col);
-        else if (const auto * id_col_const = checkAndGetColumnConst<ColumnVector<UInt64>>(id_col_untyped))
-            return executeDispatch(arguments, dict, attr_name, id_col_const);
-        else
-            throw Exception{"Third argument of function " + getName() + " must be UInt64", ErrorCodes::ILLEGAL_COLUMN};
-    }
-
-    template <typename DictionaryType>
-    ColumnPtr executeDispatch(
-            const ColumnsWithTypeAndName & arguments, const DictionaryType * dict,
-            const std::string & attr_name, const ColumnUInt64 * id_col) const
-    {
-        const auto * default_col_untyped = arguments[3].column.get();
-
-        if (const auto default_col = checkAndGetColumn<ColVec>(default_col_untyped))
-        {
-            /// vector ids, vector defaults
-            typename ColVec::MutablePtr out;
-            if constexpr (IsDataTypeDecimal<DataType>)
-                out = ColVec::create(id_col->size(), decimal_scale);
-            else
-                out = ColVec::create(id_col->size());
-            const auto & ids = id_col->getData();
-            auto & data = out->getData();
-            const auto & defs = default_col->getData();
-            DictGetTraits<DataType>::getOrDefault(dict, attr_name, ids, defs, data);
-            return out;
-        }
-        else if (const auto default_col_const = checkAndGetColumnConst<ColVec>(default_col_untyped))
-        {
-            /// vector ids, const defaults
-            typename ColVec::MutablePtr out;
-            if constexpr (IsDataTypeDecimal<DataType>)
-                out = ColVec::create(id_col->size(), decimal_scale);
-            else
-                out = ColVec::create(id_col->size());
-            const auto & ids = id_col->getData();
-            auto & data = out->getData();
-            const auto def = default_col_const->template getValue<Type>();
-            DictGetTraits<DataType>::getOrDefault(dict, attr_name, ids, def, data);
-            return out;
-        }
-        else
-            throw Exception{"Fourth argument of function " + getName() + " must be " + TypeName<Type>::get(), ErrorCodes::ILLEGAL_COLUMN};
-    }
-
-    template <typename DictionaryType>
-    ColumnPtr executeDispatch(
-            const ColumnsWithTypeAndName & arguments, const DictionaryType * dict,
-            const std::string & attr_name, const ColumnConst * id_col) const
-    {
-        const auto * default_col_untyped = arguments[3].column.get();
-
-        if (const auto default_col = checkAndGetColumn<ColVec>(default_col_untyped))
-        {
-            /// const ids, vector defaults
-            const PaddedPODArray<UInt64> ids(1, id_col->getValue<UInt64>());
-            PaddedPODArray<UInt8> flags(1);
-            dict->has(ids, flags);
-            if (flags.front())
-            {
-                if constexpr (IsDataTypeDecimal<DataType>)
-                {
-                    DecimalPaddedPODArray<Type> data(1, decimal_scale);
-                    DictGetTraits<DataType>::getOrDefault(dict, attr_name, ids, Type(), data);
-                    return DataType(DataType::maxPrecision(), decimal_scale).createColumnConst(
-                            id_col->size(), toField(data.front(), decimal_scale));
-                }
-                else
-                {
-                    PaddedPODArray<Type> data(1);
-                    DictGetTraits<DataType>::getOrDefault(dict, attr_name, ids, Type(), data);
-                    return DataType().createColumnConst(id_col->size(), toField(data.front()));
-                }
-            }
-            else
-                return arguments[3].column; // reuse the default column
-        }
-        else if (const auto default_col_const = checkAndGetColumnConst<ColVec>(default_col_untyped))
-        {
-            /// const ids, const defaults
-            const PaddedPODArray<UInt64> ids(1, id_col->getValue<UInt64>());
-
-            if constexpr (IsDataTypeDecimal<DataType>)
-            {
-                DecimalPaddedPODArray<Type> data(1, decimal_scale);
-                const auto & def = default_col_const->template getValue<Type>();
-                DictGetTraits<DataType>::getOrDefault(dict, attr_name, ids, def, data);
-                return DataType(DataType::maxPrecision(), decimal_scale).createColumnConst(
-                        id_col->size(), toField(data.front(), decimal_scale));
-            }
-            else
-            {
-                PaddedPODArray<Type> data(1);
-                const auto & def = default_col_const->template getValue<Type>();
-                DictGetTraits<DataType>::getOrDefault(dict, attr_name, ids, def, data);
-                return DataType().createColumnConst(id_col->size(), toField(data.front()));
-            }
-        }
-        else
-            throw Exception{"Fourth argument of function " + getName() + " must be " + TypeName<Type>::get(), ErrorCodes::ILLEGAL_COLUMN};
-    }
-
-    template <typename DictionaryType>
-    ColumnPtr executeDispatchComplex(
-            const ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
-    {
-        const auto * dict = typeid_cast<const DictionaryType *>(dict_ptr.get());
-        if (!dict)
-            return nullptr;
-
-        const auto * attr_name_col = checkAndGetColumnConst<ColumnString>(arguments[1].column.get());
-        if (!attr_name_col)
-            throw Exception{"Second argument of function " + getName() + " must be a constant string", ErrorCodes::ILLEGAL_COLUMN};
-
-        String attr_name = attr_name_col->getValue<String>();
-
-        const ColumnWithTypeAndName & key_col_with_type = arguments[2];
-
-        /// Functions in external dictionaries_loader only support full-value (not constant) columns with keys.
-        ColumnPtr key_col = key_col_with_type.column->convertToFullColumnIfConst();
-
-        const auto & key_columns = typeid_cast<const ColumnTuple &>(*key_col).getColumnsCopy();
-        const auto & key_types = static_cast<const DataTypeTuple &>(*key_col_with_type.type).getElements();
-
-        /// @todo detect when all key columns are constant
-        const auto rows = key_col->size();
-        typename ColVec::MutablePtr out;
-        if constexpr (IsDataTypeDecimal<DataType>)
-            out = ColVec::create(rows, decimal_scale);
-        else
-            out = ColVec::create(rows);
-        auto & data = out->getData();
-
-        const auto * default_col_untyped = arguments[3].column.get();
-        if (const auto default_col = checkAndGetColumn<ColVec>(default_col_untyped))
-        {
-            /// const defaults
-            const auto & defs = default_col->getData();
-
-            DictGetTraits<DataType>::getOrDefault(dict, attr_name, key_columns, key_types, defs, data);
-        }
-        else if (const auto default_col_const = checkAndGetColumnConst<ColVec>(default_col_untyped))
-        {
-            const auto def = default_col_const->template getValue<Type>();
-
-            DictGetTraits<DataType>::getOrDefault(dict, attr_name, key_columns, key_types, def, data);
-        }
-        else
-            throw Exception{"Fourth argument of function " + getName() + " must be " + TypeName<Type>::get(), ErrorCodes::ILLEGAL_COLUMN};
-
-        return out;
-    }
-
-    mutable FunctionDictHelper helper;
-    UInt32 decimal_scale;
-};
+template<typename DataType, typename Name>
+using FunctionDictGetOrDefault = FunctionDictGetImpl<DataType, Name, DictionaryGetFunctionType::withDefault>;
 
 struct NameDictGetUInt8OrDefault { static constexpr auto name = "dictGetUInt8OrDefault"; };
 struct NameDictGetUInt16OrDefault { static constexpr auto name = "dictGetUInt16OrDefault"; };
@@ -1315,6 +474,7 @@ struct NameDictGetUUIDOrDefault { static constexpr auto name = "dictGetUUIDOrDef
 struct NameDictGetDecimal32OrDefault { static constexpr auto name = "dictGetDecimal32OrDefault"; };
 struct NameDictGetDecimal64OrDefault { static constexpr auto name = "dictGetDecimal64OrDefault"; };
 struct NameDictGetDecimal128OrDefault { static constexpr auto name = "dictGetDecimal128OrDefault"; };
+struct NameDictGetStringOrDefault { static constexpr auto name = "dictGetStringOrDefault"; };
 
 using FunctionDictGetUInt8OrDefault = FunctionDictGetOrDefault<DataTypeUInt8, NameDictGetUInt8OrDefault>;
 using FunctionDictGetUInt16OrDefault = FunctionDictGetOrDefault<DataTypeUInt16, NameDictGetUInt16OrDefault>;
@@ -1332,8 +492,10 @@ using FunctionDictGetUUIDOrDefault = FunctionDictGetOrDefault<DataTypeUUID, Name
 using FunctionDictGetDecimal32OrDefault = FunctionDictGetOrDefault<DataTypeDecimal<Decimal32>, NameDictGetDecimal32OrDefault>;
 using FunctionDictGetDecimal64OrDefault = FunctionDictGetOrDefault<DataTypeDecimal<Decimal64>, NameDictGetDecimal64OrDefault>;
 using FunctionDictGetDecimal128OrDefault = FunctionDictGetOrDefault<DataTypeDecimal<Decimal128>, NameDictGetDecimal128OrDefault>;
+using FunctionDictGetStringOrDefault = FunctionDictGetOrDefault<DataTypeString, NameDictGetStringOrDefault>;
 
 
+/// TODO: Use new API
 /// This variant of function derives the result type automatically.
 class FunctionDictGetNoType final : public IFunction
 {

From d16a572eeecfa383fc736a49900c7c63fb7015d6 Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Sat, 19 Dec 2020 16:24:51 +0300
Subject: [PATCH 521/611] Updated IDictionaryBase interface

---
 src/Dictionaries/CacheDictionary.cpp          |   2 +-
 src/Dictionaries/CacheDictionary.h            |   4 +-
 .../ComplexKeyCacheDictionary.cpp             |   2 +-
 src/Dictionaries/ComplexKeyCacheDictionary.h  |   2 -
 src/Dictionaries/ComplexKeyDirectDictionary.h |   2 -
 .../ComplexKeyHashedDictionary.cpp            |   2 +-
 src/Dictionaries/ComplexKeyHashedDictionary.h |   2 -
 src/Dictionaries/DictionaryBlockInputStream.h |  56 ++++----
 src/Dictionaries/DirectDictionary.h           |   4 +-
 src/Dictionaries/FlatDictionary.cpp           |  64 ++++++---
 src/Dictionaries/FlatDictionary.h             |  15 +-
 src/Dictionaries/HashedDictionary.cpp         |   2 +-
 src/Dictionaries/HashedDictionary.h           |   4 +-
 src/Dictionaries/IDictionary.h                |  35 ++++-
 src/Dictionaries/IPAddressDictionary.cpp      |   2 +-
 src/Dictionaries/IPAddressDictionary.h        |   2 -
 src/Dictionaries/PolygonDictionary.h          |   2 -
 src/Dictionaries/RangeHashedDictionary.h      |   2 -
 src/Dictionaries/SSDCacheDictionary.cpp       |   2 +-
 src/Dictionaries/SSDCacheDictionary.h         |   4 +-
 .../SSDComplexKeyCacheDictionary.h            |   2 -
 src/Functions/FunctionsExternalDictionaries.h | 129 +++---------------
 22 files changed, 147 insertions(+), 194 deletions(-)

diff --git a/src/Dictionaries/CacheDictionary.cpp b/src/Dictionaries/CacheDictionary.cpp
index 4beb2caa1f1..1a0d7e28fea 100644
--- a/src/Dictionaries/CacheDictionary.cpp
+++ b/src/Dictionaries/CacheDictionary.cpp
@@ -707,7 +707,7 @@ PaddedPODArray<CacheDictionary::Key> CacheDictionary::getCachedIds() const
 
 BlockInputStreamPtr CacheDictionary::getBlockInputStream(const Names & column_names, size_t max_block_size) const
 {
-    using BlockInputStreamType = DictionaryBlockInputStream<CacheDictionary, Key>;
+    using BlockInputStreamType = DictionaryBlockInputStream<Key>;
     return std::make_shared<BlockInputStreamType>(shared_from_this(), max_block_size, getCachedIds(), column_names);
 }
 
diff --git a/src/Dictionaries/CacheDictionary.h b/src/Dictionaries/CacheDictionary.h
index f2f364af9da..d242c6bc3eb 100644
--- a/src/Dictionaries/CacheDictionary.h
+++ b/src/Dictionaries/CacheDictionary.h
@@ -119,8 +119,6 @@ public:
 
     std::exception_ptr getLastException() const override;
 
-    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::unsupported;
-
     template <typename T>
     using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
 
@@ -190,7 +188,7 @@ public:
 
     void getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, const String & def, ColumnString * const out) const;
 
-    void has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const override;
+    void has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const;
 
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
 
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary.cpp b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
index 0c517699272..fefa2a44aaf 100644
--- a/src/Dictionaries/ComplexKeyCacheDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
@@ -388,7 +388,7 @@ BlockInputStreamPtr ComplexKeyCacheDictionary::getBlockInputStream(const Names &
                 keys.push_back(cells[idx].key);
     }
 
-    using BlockInputStreamType = DictionaryBlockInputStream<ComplexKeyCacheDictionary, UInt64>;
+    using BlockInputStreamType = DictionaryBlockInputStream<UInt64>;
     return std::make_shared<BlockInputStreamType>(shared_from_this(), max_block_size, keys, column_names);
 }
 
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary.h b/src/Dictionaries/ComplexKeyCacheDictionary.h
index 36a1457570c..2663fee266d 100644
--- a/src/Dictionaries/ComplexKeyCacheDictionary.h
+++ b/src/Dictionaries/ComplexKeyCacheDictionary.h
@@ -89,8 +89,6 @@ public:
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
     }
 
-    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::unsupported;
-
     template <typename T>
     using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
 
diff --git a/src/Dictionaries/ComplexKeyDirectDictionary.h b/src/Dictionaries/ComplexKeyDirectDictionary.h
index 670f2ac0a85..dc602be103f 100644
--- a/src/Dictionaries/ComplexKeyDirectDictionary.h
+++ b/src/Dictionaries/ComplexKeyDirectDictionary.h
@@ -60,8 +60,6 @@ public:
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
     }
 
-    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::unsupported;
-
     template <typename T>
     using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
 
diff --git a/src/Dictionaries/ComplexKeyHashedDictionary.cpp b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
index 676196fabd2..e5a9aa13f08 100644
--- a/src/Dictionaries/ComplexKeyHashedDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
@@ -735,7 +735,7 @@ std::vector<StringRef> ComplexKeyHashedDictionary::getKeys(const Attribute & att
 
 BlockInputStreamPtr ComplexKeyHashedDictionary::getBlockInputStream(const Names & column_names, size_t max_block_size) const
 {
-    using BlockInputStreamType = DictionaryBlockInputStream<ComplexKeyHashedDictionary, UInt64>;
+    using BlockInputStreamType = DictionaryBlockInputStream<UInt64>;
     return std::make_shared<BlockInputStreamType>(shared_from_this(), max_block_size, getKeys(), column_names);
 }
 
diff --git a/src/Dictionaries/ComplexKeyHashedDictionary.h b/src/Dictionaries/ComplexKeyHashedDictionary.h
index 82677458298..baf6628eebd 100644
--- a/src/Dictionaries/ComplexKeyHashedDictionary.h
+++ b/src/Dictionaries/ComplexKeyHashedDictionary.h
@@ -60,8 +60,6 @@ public:
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
     }
 
-    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::unsupported;
-
     template <typename T>
     using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
 
diff --git a/src/Dictionaries/DictionaryBlockInputStream.h b/src/Dictionaries/DictionaryBlockInputStream.h
index 96d5fac966f..53b513b5d33 100644
--- a/src/Dictionaries/DictionaryBlockInputStream.h
+++ b/src/Dictionaries/DictionaryBlockInputStream.h
@@ -25,12 +25,10 @@ namespace ErrorCodes
 /* BlockInputStream implementation for external dictionaries
  * read() returns blocks consisting of the in-memory contents of the dictionaries
  */
-template <typename DictionaryType, typename Key>
+template <typename Key>
 class DictionaryBlockInputStream : public DictionaryBlockInputStreamBase
 {
 public:
-    using DictionaryPtr = std::shared_ptr<DictionaryType const>;
-
     DictionaryBlockInputStream(
         std::shared_ptr<const IDictionaryBase> dictionary, UInt64 max_block_size, PaddedPODArray<Key> && ids, const Names & column_names);
 
@@ -72,7 +70,7 @@ private:
         const DictionaryStructure & dictionary_structure,
         ColumnsWithTypeAndName & columns) const;
 
-    DictionaryPtr dictionary;
+    std::shared_ptr<const IDictionaryBase> dictionary;
     Names column_names;
     PaddedPODArray<Key> ids;
     ColumnsWithTypeAndName key_columns;
@@ -92,25 +90,25 @@ private:
 };
 
 
-template <typename DictionaryType, typename Key>
-DictionaryBlockInputStream<DictionaryType, Key>::DictionaryBlockInputStream(
+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(std::static_pointer_cast<const DictionaryType>(dictionary_))
+    , dictionary(dictionary_)
     , column_names(column_names_)
     , ids(std::move(ids_))
     , key_type(DictionaryKeyType::Id)
 {
 }
 
-template <typename DictionaryType, typename Key>
-DictionaryBlockInputStream<DictionaryType, Key>::DictionaryBlockInputStream(
+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(std::static_pointer_cast<const DictionaryType>(dictionary_))
+    , dictionary(dictionary_)
     , column_names(column_names_)
     , key_type(DictionaryKeyType::ComplexKey)
 {
@@ -118,8 +116,8 @@ DictionaryBlockInputStream<DictionaryType, Key>::DictionaryBlockInputStream(
     fillKeyColumns(keys, 0, keys.size(), dictionary_structure, key_columns);
 }
 
-template <typename DictionaryType, typename Key>
-DictionaryBlockInputStream<DictionaryType, Key>::DictionaryBlockInputStream(
+template <typename Key>
+DictionaryBlockInputStream<Key>::DictionaryBlockInputStream(
     std::shared_ptr<const IDictionaryBase> dictionary_,
     UInt64 max_block_size_,
     const Columns & data_columns_,
@@ -127,19 +125,20 @@ DictionaryBlockInputStream<DictionaryType, Key>::DictionaryBlockInputStream(
     GetColumnsFunction && get_key_columns_function_,
     GetColumnsFunction && get_view_columns_function_)
     : DictionaryBlockInputStreamBase(data_columns_.front()->size(), max_block_size_)
-    , dictionary(std::static_pointer_cast<const DictionaryType>(dictionary_))
+    , dictionary(dictionary_)
     , column_names(column_names_)
     , data_columns(data_columns_)
-    , get_key_columns_function(get_key_columns_function_)
-    , get_view_columns_function(get_view_columns_function_)
+    , get_key_columns_function(std::move(get_key_columns_function_))
+    , get_view_columns_function(std::move(get_view_columns_function_))
     , key_type(DictionaryKeyType::Callback)
 {
 }
 
 
-template <typename DictionaryType, typename Key>
-Block DictionaryBlockInputStream<DictionaryType, Key>::getBlock(size_t start, size_t length) const
+template <typename Key>
+Block DictionaryBlockInputStream<Key>::getBlock(size_t start, size_t length) const
 {
+    /// TODO: Rewrite
     switch (key_type)
     {
         case DictionaryKeyType::ComplexKey:
@@ -186,11 +185,10 @@ Block DictionaryBlockInputStream<DictionaryType, Key>::getBlock(size_t start, si
     throw Exception("Unexpected DictionaryKeyType.", ErrorCodes::LOGICAL_ERROR);
 }
 
-template <typename DictionaryType, typename Key>
-Block DictionaryBlockInputStream<DictionaryType, Key>::fillBlock(
+template <typename Key>
+Block DictionaryBlockInputStream<Key>::fillBlock(
     const PaddedPODArray<Key> & ids_to_fill, const Columns & keys, const DataTypes & types, ColumnsWithTypeAndName && view) const
 {
-    constexpr auto dictionary_get_by_type = DictionaryType::get_by_type;
     std::unordered_set<std::string> names(column_names.begin(), column_names.end());
 
     DataTypes data_types = types;
@@ -215,6 +213,9 @@ Block DictionaryBlockInputStream<DictionaryType, Key>::fillBlock(
         block_columns.emplace_back(ids_column, std::make_shared<DataTypeUInt64>(), structure.id->name);
     }
 
+    /// TODO: This can be optimized
+    auto dictionary_identifier_type = dictionary->getIdentifierType();
+
     for (const auto idx : ext::range(0, structure.attributes.size()))
     {
         const DictionaryAttribute & attribute = structure.attributes[idx];
@@ -222,11 +223,12 @@ Block DictionaryBlockInputStream<DictionaryType, Key>::fillBlock(
         {
             ColumnPtr column;
 
-            if constexpr (dictionary_get_by_type == DictionaryGetByType::getByIdentifiers)
+            if (dictionary_identifier_type == DictionaryIdentifierType::simple)
             {
-                column = dictionary->get(attribute.name, attribute.type, ids_column, nullptr /* default_untyped */);
+                column = dictionary->getColumn(
+                    attribute.name, attribute.type, {ids_column}, {std::make_shared<DataTypeUInt64>()}, nullptr /* default_untyped*/);
             }
-            else if constexpr (dictionary_get_by_type == DictionaryGetByType::getByComplexKeys)
+            else if (dictionary_identifier_type == DictionaryIdentifierType::complex)
             {
                 column = nullptr;
             }
@@ -242,8 +244,8 @@ Block DictionaryBlockInputStream<DictionaryType, Key>::fillBlock(
     return Block(block_columns);
 }
 
-template <typename DictionaryType, typename Key>
-ColumnPtr DictionaryBlockInputStream<DictionaryType, Key>::getColumnFromIds(const PaddedPODArray<Key> & ids_to_fill) const
+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());
@@ -253,8 +255,8 @@ ColumnPtr DictionaryBlockInputStream<DictionaryType, Key>::getColumnFromIds(cons
 }
 
 
-template <typename DictionaryType, typename Key>
-void DictionaryBlockInputStream<DictionaryType, Key>::fillKeyColumns(
+template <typename Key>
+void DictionaryBlockInputStream<Key>::fillKeyColumns(
     const std::vector<StringRef> & keys,
     size_t start,
     size_t size,
diff --git a/src/Dictionaries/DirectDictionary.h b/src/Dictionaries/DirectDictionary.h
index 31e2994febb..8b59fe16c69 100644
--- a/src/Dictionaries/DirectDictionary.h
+++ b/src/Dictionaries/DirectDictionary.h
@@ -65,8 +65,6 @@ public:
     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;
 
-    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::unsupported; 
-
     template <typename T>
     using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
 
@@ -136,7 +134,7 @@ public:
 
     void getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, const String & def, ColumnString * const out) const;
 
-    void has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const override;
+    void has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const;
 
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
 
diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index aa03179491e..fde46be7656 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -105,26 +105,20 @@ void FlatDictionary::isInConstantVector(const Key child_id, const PaddedPODArray
     isInImpl(child_id, ancestor_ids, out);
 }
 
-ColumnPtr FlatDictionary::get(const std::string& attribute_name, const DataTypePtr &, const ColumnPtr id_column, const ColumnPtr default_untyped) const
+ColumnPtr FlatDictionary::getColumn(
+        const std::string& attribute_name,
+        const DataTypePtr &,
+        const Columns & key_columns,
+        const DataTypes &,
+        const ColumnPtr default_untyped) const
 {
+    assert(!key_columns.empty());
     ColumnPtr result;
 
-    const auto *id_col = checkAndGetColumn<ColumnUInt64>(id_column.get());
-    const auto *id_col_const = checkAndGetColumnConst<ColumnUInt64>(id_column.get()); 
+    PaddedPODArray<Key> backup_storage;
 
-    if (id_col == nullptr && id_col_const == nullptr)
-    {
-        throw Exception{"Identifiers column must be UInt64", ErrorCodes::ILLEGAL_COLUMN};
-    }
-
-    PaddedPODArray<UInt64> ids_const(1);
-    
-    if (id_col_const != nullptr) {
-        ids_const[0] = id_col_const->getValue<UInt64>();     
-    }
-
-    const auto& ids = id_col != nullptr ? id_col->getData() : ids_const;
-    bool is_const = id_col_const != nullptr;
+    const auto& ids = getColumnDataAsIdendifiers(*key_columns.front(), backup_storage);
+    bool is_const = isColumnConst(*key_columns.front());
 
     const auto & attribute = getAttribute(attribute_name);
 
@@ -272,8 +266,17 @@ ColumnPtr FlatDictionary::get(const std::string& attribute_name, const DataTypeP
     return result;
 }
 
-void FlatDictionary::has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const
+
+ColumnUInt8::Ptr FlatDictionary::has(const Columns & key_columns, const DataTypes &) const
 {
+    assert(!key_columns.empty());
+
+    PaddedPODArray<Key> backup_storage;
+    const auto& ids = getColumnDataAsIdendifiers(*key_columns.front(), backup_storage);
+
+    auto result = ColumnUInt8::create(ext::size(ids));
+    auto& out = result->getData();
+
     const auto ids_count = ext::size(ids);
 
     for (const auto i : ext::range(0, ids_count))
@@ -283,8 +286,9 @@ void FlatDictionary::has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8>
     }
 
     query_count.fetch_add(ids_count, std::memory_order_relaxed);
-}
 
+    return result;
+}
 
 void FlatDictionary::createAttributes()
 {
@@ -556,6 +560,28 @@ const FlatDictionary::Attribute & FlatDictionary::getAttribute(const std::string
     return attributes[it->second];
 }
 
+const PaddedPODArray<FlatDictionary::Key> & FlatDictionary::getColumnDataAsIdendifiers(const IColumn & column, PaddedPODArray<Key> & backup_storage) const
+{
+
+    if (const auto *id_col = checkAndGetColumn<ColumnUInt64>(&column))
+    {
+        return id_col->getData();
+    }
+    else if (const auto *id_col_const = checkAndGetColumnConst<ColumnUInt64>(&column))
+    {
+        const auto full_column = id_col_const->convertToFullColumnIfConst();
+        const auto size = full_column->size();
+        backup_storage.resize(size);
+        for (size_t i = 0; i < size; ++i)
+            backup_storage[i] = full_column->getUInt(i);
+
+        return backup_storage;
+    }
+    else 
+        throw Exception{"Identifier column must be UInt64", ErrorCodes::ILLEGAL_COLUMN};
+
+    return backup_storage;
+}
 
 PaddedPODArray<FlatDictionary::Key> FlatDictionary::getIds() const
 {
@@ -570,7 +596,7 @@ PaddedPODArray<FlatDictionary::Key> FlatDictionary::getIds() const
 
 BlockInputStreamPtr FlatDictionary::getBlockInputStream(const Names & column_names, size_t max_block_size) const
 {
-    using BlockInputStreamType = DictionaryBlockInputStream<FlatDictionary, Key>;
+    using BlockInputStreamType = DictionaryBlockInputStream<Key>;
     return std::make_shared<BlockInputStreamType>(shared_from_this(), max_block_size, getIds(), column_names);
 }
 
diff --git a/src/Dictionaries/FlatDictionary.h b/src/Dictionaries/FlatDictionary.h
index 6a6fafe5903..af211f2edda 100644
--- a/src/Dictionaries/FlatDictionary.h
+++ b/src/Dictionaries/FlatDictionary.h
@@ -69,14 +69,17 @@ public:
     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;
 
-    template <typename T>
-    using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
+    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::simple; }
 
-    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::getByIdentifiers;
+    ColumnPtr getColumn(
+        const std::string& attribute_name,
+        const DataTypePtr & result_type,
+        const Columns & key_columns,
+        const DataTypes & key_types,
+        const ColumnPtr default_untyped) const override;
 
-    ColumnPtr get(const std::string& attribute_name, const DataTypePtr & result_type, const ColumnPtr id_column, const ColumnPtr default_untyped) const;
 
-    void has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const override;
+    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) const override;
 
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
 
@@ -160,6 +163,8 @@ private:
     template <typename ChildType, typename AncestorType>
     void isInImpl(const ChildType & child_ids, const AncestorType & ancestor_ids, PaddedPODArray<UInt8> & out) const;
 
+    const PaddedPODArray<Key> & getColumnDataAsIdendifiers(const IColumn & column, PaddedPODArray<Key> & backup_storage) const;
+
     PaddedPODArray<Key> getIds() const;
 
     const DictionaryStructure dict_struct;
diff --git a/src/Dictionaries/HashedDictionary.cpp b/src/Dictionaries/HashedDictionary.cpp
index 1439036bf8d..34fa227e546 100644
--- a/src/Dictionaries/HashedDictionary.cpp
+++ b/src/Dictionaries/HashedDictionary.cpp
@@ -876,7 +876,7 @@ PaddedPODArray<HashedDictionary::Key> HashedDictionary::getIds() const
 
 BlockInputStreamPtr HashedDictionary::getBlockInputStream(const Names & column_names, size_t max_block_size) const
 {
-    using BlockInputStreamType = DictionaryBlockInputStream<HashedDictionary, Key>;
+    using BlockInputStreamType = DictionaryBlockInputStream<Key>;
     return std::make_shared<BlockInputStreamType>(shared_from_this(), max_block_size, getIds(), column_names);
 }
 
diff --git a/src/Dictionaries/HashedDictionary.h b/src/Dictionaries/HashedDictionary.h
index 497d18f93e0..b3d1c16ed26 100644
--- a/src/Dictionaries/HashedDictionary.h
+++ b/src/Dictionaries/HashedDictionary.h
@@ -66,8 +66,6 @@ public:
 
     void toParent(const PaddedPODArray<Key> & ids, PaddedPODArray<Key> & out) const override;
 
-    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::unsupported;  
-
     template <typename T>
     using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
 
@@ -138,7 +136,7 @@ public:
 
     void getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, const String & def, ColumnString * const out) const;
 
-    void has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const override;
+    void has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const;
 
     void isInVectorVector(
         const PaddedPODArray<Key> & child_ids, const PaddedPODArray<Key> & ancestor_ids, PaddedPODArray<UInt8> & out) const override;
diff --git a/src/Dictionaries/IDictionary.h b/src/Dictionaries/IDictionary.h
index 6bc8d32295a..ce613a26020 100644
--- a/src/Dictionaries/IDictionary.h
+++ b/src/Dictionaries/IDictionary.h
@@ -10,6 +10,8 @@
 #include <common/StringRef.h>
 #include "IDictionarySource.h"
 #include <Dictionaries/DictionaryStructure.h>
+#include <DataTypes/IDataType.h>
+#include <Columns/ColumnsNumber.h>
 
 #include <chrono>
 #include <memory>
@@ -29,6 +31,13 @@ using DictionaryPtr = std::unique_ptr<IDictionaryBase>;
 struct DictionaryStructure;
 class ColumnString;
 
+enum class DictionaryIdentifierType
+{
+    simple,
+    complex,
+    range
+};
+
 struct IDictionaryBase : public IExternalLoadable
 {
     using Key = UInt64;
@@ -85,6 +94,29 @@ struct IDictionaryBase : public IExternalLoadable
 
     virtual bool isInjective(const std::string & attribute_name) const = 0;
 
+    virtual DictionaryIdentifierType getIdentifierType() const /* = 0; */
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+                        "Get identifier type not supported", getDictionaryID().getNameForLogs());
+    }
+
+    virtual ColumnPtr getColumn(
+        const std::string & attribute_name [[maybe_unused]],
+        const DataTypePtr & result_type [[maybe_unused]],
+        const Columns & key_columns [[maybe_unused]],
+        const DataTypes & key_types [[maybe_unused]],
+        const ColumnPtr default_untyped [[maybe_unused]]) const /* = 0; */
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+                        "Get column not supported", getDictionaryID().getNameForLogs());
+    }
+
+    virtual ColumnUInt8::Ptr has(const Columns & key_columns [[maybe_unused]], const DataTypes & key_types [[maybe_unused]]) const /* = 0; */
+    {
+         throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+                        "Has not supported", getDictionaryID().getNameForLogs());
+    }
+
     virtual BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const = 0;
 
     bool supportUpdates() const override { return true; }
@@ -115,7 +147,6 @@ protected:
     const String full_name;
 };
 
-
 struct IDictionary : IDictionaryBase
 {
     IDictionary(const StorageID & dict_id_) : IDictionaryBase(dict_id_) {}
@@ -124,8 +155,6 @@ struct IDictionary : IDictionaryBase
 
     virtual void toParent(const PaddedPODArray<Key> & ids, PaddedPODArray<Key> & out) const = 0;
 
-    virtual void has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const = 0;
-
     /// Methods for hierarchy.
 
     virtual void isInVectorVector(
diff --git a/src/Dictionaries/IPAddressDictionary.cpp b/src/Dictionaries/IPAddressDictionary.cpp
index d2bbf6ec2fa..f8af4686ad8 100644
--- a/src/Dictionaries/IPAddressDictionary.cpp
+++ b/src/Dictionaries/IPAddressDictionary.cpp
@@ -1045,7 +1045,7 @@ static auto keyViewGetter()
 
 BlockInputStreamPtr IPAddressDictionary::getBlockInputStream(const Names & column_names, size_t max_block_size) const
 {
-    using BlockInputStreamType = DictionaryBlockInputStream<IPAddressDictionary, UInt64>;
+    using BlockInputStreamType = DictionaryBlockInputStream<UInt64>;
 
 
     const bool is_ipv4 = std::get_if<IPv4Container>(&ip_column) != nullptr;
diff --git a/src/Dictionaries/IPAddressDictionary.h b/src/Dictionaries/IPAddressDictionary.h
index 3040579134c..2009141ebcc 100644
--- a/src/Dictionaries/IPAddressDictionary.h
+++ b/src/Dictionaries/IPAddressDictionary.h
@@ -61,8 +61,6 @@ public:
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
     }
 
-    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::unsupported;
-
     template <typename T>
     using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
 
diff --git a/src/Dictionaries/PolygonDictionary.h b/src/Dictionaries/PolygonDictionary.h
index f22052b59b5..75114cff435 100644
--- a/src/Dictionaries/PolygonDictionary.h
+++ b/src/Dictionaries/PolygonDictionary.h
@@ -80,8 +80,6 @@ public:
 
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
 
-    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::unsupported;
-
     template <typename T>
     using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
 
diff --git a/src/Dictionaries/RangeHashedDictionary.h b/src/Dictionaries/RangeHashedDictionary.h
index 22037fa4718..46ae0390b6a 100644
--- a/src/Dictionaries/RangeHashedDictionary.h
+++ b/src/Dictionaries/RangeHashedDictionary.h
@@ -54,8 +54,6 @@ public:
 
     typedef Int64 RangeStorageType;
 
-    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::unsupported;
-
     template <typename T>
     using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
 
diff --git a/src/Dictionaries/SSDCacheDictionary.cpp b/src/Dictionaries/SSDCacheDictionary.cpp
index 1cf5946c95c..030f95da2ab 100644
--- a/src/Dictionaries/SSDCacheDictionary.cpp
+++ b/src/Dictionaries/SSDCacheDictionary.cpp
@@ -1575,7 +1575,7 @@ void SSDCacheDictionary::has(const PaddedPODArray<Key> & ids, PaddedPODArray<UIn
 
 BlockInputStreamPtr SSDCacheDictionary::getBlockInputStream(const Names & column_names, size_t max_block_size) const
 {
-    using BlockInputStreamType = DictionaryBlockInputStream<SSDCacheDictionary, Key>;
+    using BlockInputStreamType = DictionaryBlockInputStream<Key>;
     return std::make_shared<BlockInputStreamType>(shared_from_this(), max_block_size, storage.getCachedIds(), column_names);
 }
 
diff --git a/src/Dictionaries/SSDCacheDictionary.h b/src/Dictionaries/SSDCacheDictionary.h
index 0fa344adc6c..8219a52bac9 100644
--- a/src/Dictionaries/SSDCacheDictionary.h
+++ b/src/Dictionaries/SSDCacheDictionary.h
@@ -354,8 +354,6 @@ public:
     template <typename T>
     using ResultArrayType = SSDCacheStorage::ResultArrayType<T>;
 
-    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::unsupported;
-
 #define DECLARE(TYPE) \
     void get##TYPE(const std::string & attribute_name, const PaddedPODArray<Key> & ids, ResultArrayType<TYPE> & out) const;
     DECLARE(UInt8)
@@ -422,7 +420,7 @@ public:
 
     void getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, const String & def, ColumnString * out) const;
 
-    void has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const override;
+    void has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const;
 
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
 
diff --git a/src/Dictionaries/SSDComplexKeyCacheDictionary.h b/src/Dictionaries/SSDComplexKeyCacheDictionary.h
index b7ef53af054..4758d62f1df 100644
--- a/src/Dictionaries/SSDComplexKeyCacheDictionary.h
+++ b/src/Dictionaries/SSDComplexKeyCacheDictionary.h
@@ -569,8 +569,6 @@ public:
 
     std::exception_ptr getLastException() const override { return storage.getLastException(); }
 
-    static constexpr DictionaryGetByType get_by_type = DictionaryGetByType::unsupported;
-
     template <typename T>
     using ResultArrayType = SSDComplexKeyCacheStorage::ResultArrayType<T>;
 
diff --git a/src/Functions/FunctionsExternalDictionaries.h b/src/Functions/FunctionsExternalDictionaries.h
index d77d432bbf8..609e14dd38e 100644
--- a/src/Functions/FunctionsExternalDictionaries.h
+++ b/src/Functions/FunctionsExternalDictionaries.h
@@ -175,78 +175,24 @@ private:
         if (input_rows_count == 0)
             return result_type->createColumn();
 
-        auto dict = helper.getDictionary(arguments[0]);
-        ColumnPtr res;
+        auto dictionary = helper.getDictionary(arguments[0]);
+        auto dictionary_identifier_type = dictionary->getIdentifierType();
 
-        if (!((res = executeDispatchSimple<FlatDictionary>(arguments, dict))
-            || (res = executeDispatchSimple<DirectDictionary>(arguments, dict))
-            || (res = executeDispatchSimple<HashedDictionary>(arguments, dict))
-            || (res = executeDispatchSimple<CacheDictionary>(arguments, dict))
-#if defined(OS_LINUX) || defined(__FreeBSD__)
-            || (res = executeDispatchSimple<SSDCacheDictionary>(arguments, dict))
-#endif
-            || (res = executeDispatchComplex<ComplexKeyHashedDictionary>(arguments, dict))
-            || (res = executeDispatchComplex<ComplexKeyDirectDictionary>(arguments, dict))
-            || (res = executeDispatchComplex<ComplexKeyCacheDictionary>(arguments, dict))
-#if defined(OS_LINUX) || defined(__FreeBSD__)
-            || (res = executeDispatchComplex<SSDComplexKeyCacheDictionary>(arguments, dict))
-#endif
-#if !defined(ARCADIA_BUILD)
-            || (res = executeDispatchComplex<IPAddressDictionary>(arguments, dict))
-#endif
-            || (res = executeDispatchComplex<PolygonDictionarySimple>(arguments, dict))
-            || (res = executeDispatchComplex<PolygonDictionaryIndexEach>(arguments, dict))
-            || (res = executeDispatchComplex<PolygonDictionaryIndexCell>(arguments, dict))))
-            throw Exception{"Unsupported dictionary type " + dict->getTypeName(), ErrorCodes::UNKNOWN_TYPE};
+        const auto id_col_untyped = arguments[1].column;
 
-        return res;
-    }
-
-    template <typename DictionaryType>
-    ColumnPtr executeDispatchSimple(
-            const ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
-    {
-        const auto * dict = typeid_cast<const DictionaryType *>(dict_ptr.get());
-        if (!dict)
-            return nullptr;
-
-        const auto * id_col_untyped = arguments[1].column.get();
-        if (const auto * id_col = checkAndGetColumn<ColumnUInt64>(id_col_untyped))
+        if (dictionary_identifier_type == DictionaryIdentifierType::simple)
         {
-            const auto & ids = id_col->getData();
-
-            auto out = ColumnUInt8::create(ext::size(ids));
-            dict->has(ids, out->getData());
-            return out;
+            return dictionary->has({ id_col_untyped }, { std::make_shared<DataTypeUInt64>() });
+        }
+        else if (dictionary_identifier_type == DictionaryIdentifierType::complex)
+        {
+            /// TODO: Check if column is tuple and pass
+            return nullptr;
         }
         else
-            throw Exception{"Second argument of function " + getName() + " must be UInt64", ErrorCodes::ILLEGAL_COLUMN};
-
-        return nullptr;
-    }
-
-    template <typename DictionaryType>
-    ColumnPtr executeDispatchComplex(
-            const ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
-    {
-        const auto * dict = typeid_cast<const DictionaryType *>(dict_ptr.get());
-        if (!dict)
-            return nullptr;
-
-        const ColumnWithTypeAndName & key_col_with_type = arguments[1];
-        const ColumnPtr & key_col = key_col_with_type.column;
-
-        if (checkColumn<ColumnTuple>(key_col.get()))
         {
-            const auto & key_columns = assert_cast<const ColumnTuple &>(*key_col).getColumnsCopy();
-            const auto & key_types = static_cast<const DataTypeTuple &>(*key_col_with_type.type).getElements();
-
-            auto out = ColumnUInt8::create(key_col_with_type.column->size());
-            dict->has(key_columns, key_types, out->getData());
-            return out;
+            return nullptr;
         }
-        else
-            throw Exception{"Second argument of function " + getName() + " must be " + dict->getKeyDescription(), ErrorCodes::TYPE_MISMATCH};
     }
 
     mutable FunctionDictHelper helper;
@@ -342,44 +288,9 @@ private:
         if (input_rows_count == 0)
             return result_type->createColumn();
 
-        auto dict = helper.getDictionary(arguments[0]);
+        auto dictionary = helper.getDictionary(arguments[0]);
         ColumnPtr res;
 
-        if (!((res = executeDispatch<FlatDictionary>(arguments, result_type, dict))
-            || (res = executeDispatch<HashedDictionary>(arguments, result_type, dict))
-            || (res = executeDispatch<DirectDictionary>(arguments, result_type, dict))
-            || (res = executeDispatch<CacheDictionary>(arguments, result_type, dict))
-#if defined(OS_LINUX) || defined(__FreeBSD__)
-            || (res = executeDispatch<SSDCacheDictionary>(arguments, result_type, dict))
-#endif
-            || (res = executeDispatch<ComplexKeyHashedDictionary>(arguments, result_type, dict))
-            || (res = executeDispatch<ComplexKeyDirectDictionary>(arguments, result_type, dict))
-            || (res = executeDispatch<ComplexKeyCacheDictionary>(arguments, result_type, dict))
-#if defined(OS_LINUX) || defined(__FreeBSD__)
-            || (res = executeDispatch<SSDComplexKeyCacheDictionary>(arguments, result_type, dict))
-#endif
-#if !defined(ARCADIA_BUILD)
-            || (res = executeDispatch<IPAddressDictionary>(arguments, result_type, dict))
-#endif
-            || (res = executeDispatch<PolygonDictionarySimple>(arguments, result_type, dict))
-            || (res = executeDispatch<PolygonDictionaryIndexEach>(arguments, result_type, dict))
-            || (res = executeDispatch<PolygonDictionaryIndexCell>(arguments, result_type, dict))
-            || (res = executeDispatch<RangeHashedDictionary>(arguments, result_type, dict))))
-            throw Exception{"Unsupported dictionary type " + dict->getTypeName(), ErrorCodes::UNKNOWN_TYPE};
-
-        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 * dictionary = typeid_cast<const DictionaryType *>(dict_ptr.get());
-        if (!dictionary)
-            return nullptr;
-
         const auto * attr_name_col = checkAndGetColumnConst<ColumnString>(arguments[1].column.get());
         if (!attr_name_col)
             throw Exception{"Second argument of function " + getName() + " must be a constant string", ErrorCodes::ILLEGAL_COLUMN};
@@ -388,28 +299,30 @@ private:
 
         const auto id_col_untyped = arguments[2].column;
 
-        constexpr auto dictionary_get_by_type = DictionaryType::get_by_type;
+        auto dictionary_identifier_type = dictionary->getIdentifierType();
 
-        if constexpr (dictionary_get_by_type == DictionaryGetByType::getByIdentifiers)
+        if (dictionary_identifier_type == DictionaryIdentifierType::simple)
         {
             if (dictionary_get_function_type == DictionaryGetFunctionType::withDefault)
             {
                 const auto default_col_untyped = arguments[3].column;
-                return dictionary->get(attr_name, result_type, id_col_untyped, default_col_untyped);
+                res = dictionary->getColumn(attr_name, result_type, { id_col_untyped }, { std::make_shared<DataTypeUInt64>() }, default_col_untyped);
             }
             else
             {
-                return dictionary->get(attr_name, result_type, id_col_untyped, nullptr);
+                res = dictionary->getColumn(attr_name, result_type, { id_col_untyped }, { std::make_shared<DataTypeUInt64>() }, nullptr);
             }
         }
-        else if constexpr (dictionary_get_by_type == DictionaryGetByType::getByComplexKeys)
+        else if (dictionary_identifier_type == DictionaryIdentifierType::complex)
         {
-            return nullptr;
+            res = nullptr;
         }
         else
         {
-            return nullptr;
+            res = nullptr;
         }
+
+        return res;
     }
 
     mutable FunctionDictHelper helper;

From f24a8eadb26360ef024b3db8ec6052c68881a59a Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Sat, 19 Dec 2020 17:27:39 +0300
Subject: [PATCH 522/611] Updated ComplexKeyHashed dictionary to new interface

---
 .../ComplexKeyHashedDictionary.cpp            | 543 +++++++-----------
 src/Dictionaries/ComplexKeyHashedDictionary.h |  89 +--
 src/Dictionaries/DictionaryBlockInputStream.h |   3 +-
 src/Dictionaries/FlatDictionary.cpp           |  65 ++-
 src/Functions/FunctionsExternalDictionaries.h |  28 +-
 5 files changed, 290 insertions(+), 438 deletions(-)

diff --git a/src/Dictionaries/ComplexKeyHashedDictionary.cpp b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
index e5a9aa13f08..6a734a2f7ab 100644
--- a/src/Dictionaries/ComplexKeyHashedDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
@@ -1,6 +1,8 @@
 #include "ComplexKeyHashedDictionary.h"
 #include <ext/map.h>
 #include <ext/range.h>
+#include <Columns/ColumnsNumber.h>
+#include <Functions/FunctionHelpers.h>
 #include "DictionaryBlockInputStream.h"
 #include "DictionaryFactory.h"
 
@@ -32,216 +34,186 @@ ComplexKeyHashedDictionary::ComplexKeyHashedDictionary(
     calculateBytesAllocated();
 }
 
-#define DECLARE(TYPE) \
-    void ComplexKeyHashedDictionary::get##TYPE( \
-        const std::string & attribute_name, const Columns & key_columns, const DataTypes & key_types, ResultArrayType<TYPE> & out) const \
-    { \
-        dict_struct.validateKeyTypes(key_types); \
-\
-        const auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-\
-        const auto null_value = std::get<TYPE>(attribute.null_values); \
-\
-        getItemsImpl<TYPE, TYPE>( \
-            attribute, \
-            key_columns, \
-            [&](const size_t row, const auto value) { out[row] = value; }, \
-            [&](const size_t) { return null_value; }); \
-    }
-DECLARE(UInt8)
-DECLARE(UInt16)
-DECLARE(UInt32)
-DECLARE(UInt64)
-DECLARE(UInt128)
-DECLARE(Int8)
-DECLARE(Int16)
-DECLARE(Int32)
-DECLARE(Int64)
-DECLARE(Float32)
-DECLARE(Float64)
-DECLARE(Decimal32)
-DECLARE(Decimal64)
-DECLARE(Decimal128)
-#undef DECLARE
-
-void ComplexKeyHashedDictionary::getString(
-    const std::string & attribute_name, const Columns & key_columns, const DataTypes & key_types, ColumnString * out) const
-{
-    dict_struct.validateKeyTypes(key_types);
-
-    const auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
-
-    const auto & null_value = StringRef{std::get<String>(attribute.null_values)};
-
-    getItemsImpl<StringRef, StringRef>(
-        attribute,
-        key_columns,
-        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-        [&](const size_t) { return null_value; });
-}
-
-#define DECLARE(TYPE) \
-    void ComplexKeyHashedDictionary::get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes & key_types, \
-        const PaddedPODArray<TYPE> & def, \
-        ResultArrayType<TYPE> & out) const \
-    { \
-        dict_struct.validateKeyTypes(key_types); \
-\
-        const auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-\
-        getItemsImpl<TYPE, TYPE>( \
-            attribute, \
-            key_columns, \
-            [&](const size_t row, const auto value) { out[row] = value; }, \
-            [&](const size_t row) { return def[row]; }); \
-    }
-DECLARE(UInt8)
-DECLARE(UInt16)
-DECLARE(UInt32)
-DECLARE(UInt64)
-DECLARE(UInt128)
-DECLARE(Int8)
-DECLARE(Int16)
-DECLARE(Int32)
-DECLARE(Int64)
-DECLARE(Float32)
-DECLARE(Float64)
-DECLARE(Decimal32)
-DECLARE(Decimal64)
-DECLARE(Decimal128)
-#undef DECLARE
-
-void ComplexKeyHashedDictionary::getString(
+ColumnPtr ComplexKeyHashedDictionary::getColumn(
     const std::string & attribute_name,
+    const DataTypePtr &,
     const Columns & key_columns,
     const DataTypes & key_types,
-    const ColumnString * const def,
-    ColumnString * const out) const
+    const ColumnPtr default_untyped) const
 {
     dict_struct.validateKeyTypes(key_types);
 
+    ColumnPtr result;
+
     const auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
 
-    getItemsImpl<StringRef, StringRef>(
-        attribute,
-        key_columns,
-        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-        [&](const size_t row) { return def->getDataAt(row); });
+    /// TODO: Check that attribute type is same as result type
+
+    auto 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;
+
+        if constexpr (std::is_same_v<AttributeType, String>)
+        {
+            auto column_string = ColumnString::create();
+            auto out = column_string.get();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                {
+                    getItemsImpl<StringRef, StringRef>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                        [&](const size_t row) { return default_col->getDataAt(row); });
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<String>();
+
+                    getItemsImpl<StringRef, StringRef>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                        [&](const size_t) { return def; });
+                }
+            }
+            else
+            {
+                const auto & null_value = std::get<StringRef>(attribute.null_values);
+
+                getItemsImpl<StringRef, StringRef>(
+                    attribute,
+                    key_columns,
+                    [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                    [&](const size_t) { return null_value; });
+            }
+
+            result = std::move(column_string);
+        }
+        else if constexpr (IsNumber<AttributeType>)
+        {
+            auto column = ColumnVector<AttributeType>::create(size);
+            auto& out = column->getData();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnVector<AttributeType>>(*default_untyped))
+                {
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row) { return default_col->getData()[row]; }
+                    );
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnVector<AttributeType>>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<AttributeType>();
+
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t) { return def; }
+                    );
+                }
+            }
+            else
+            {
+                const auto null_value = std::get<AttributeType>(attribute.null_values);
+
+                getItemsImpl<AttributeType, AttributeType>(
+                    attribute,
+                    key_columns,
+                    [&](const size_t row, const auto value) { return out[row] = value; },
+                    [&](const size_t) { return null_value; });
+            }
+
+            result = std::move(column);
+        }
+        else if constexpr (IsDecimalNumber<AttributeType>)
+        {
+            // auto scale = getDecimalScale(*attribute.type);
+            auto column = ColumnDecimal<AttributeType>::create(size, 0);
+            auto& out = column->getData();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnDecimal<AttributeType>>(*default_untyped))
+                {
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row) { return default_col->getData()[row]; }
+                    );
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnDecimal<AttributeType>>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<AttributeType>();
+
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t) { return def; }
+                    );
+                }
+            }
+            else
+            {
+                const auto null_value = std::get<AttributeType>(attribute.null_values);
+
+                getItemsImpl<AttributeType, AttributeType>(
+                    attribute,
+                    key_columns,
+                    [&](const size_t row, const auto value) { return out[row] = value; },
+                    [&](const size_t) { return null_value; }
+                );
+            }
+
+            result = std::move(column);
+        }
+    };
+
+    callOnDictionaryAttributeType(attribute.type, type_call);
+   
+    return result;
 }
 
-#define DECLARE(TYPE) \
-    void ComplexKeyHashedDictionary::get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes & key_types, \
-        const TYPE def, \
-        ResultArrayType<TYPE> & out) const \
-    { \
-        dict_struct.validateKeyTypes(key_types); \
-\
-        const auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-\
-        getItemsImpl<TYPE, TYPE>( \
-            attribute, key_columns, [&](const size_t row, const auto value) { out[row] = value; }, [&](const size_t) { return def; }); \
-    }
-DECLARE(UInt8)
-DECLARE(UInt16)
-DECLARE(UInt32)
-DECLARE(UInt64)
-DECLARE(UInt128)
-DECLARE(Int8)
-DECLARE(Int16)
-DECLARE(Int32)
-DECLARE(Int64)
-DECLARE(Float32)
-DECLARE(Float64)
-DECLARE(Decimal32)
-DECLARE(Decimal64)
-DECLARE(Decimal128)
-#undef DECLARE
-
-void ComplexKeyHashedDictionary::getString(
-    const std::string & attribute_name,
-    const Columns & key_columns,
-    const DataTypes & key_types,
-    const String & def,
-    ColumnString * const out) const
+ColumnUInt8::Ptr ComplexKeyHashedDictionary::has(const Columns & key_columns, const DataTypes & key_types) const
 {
     dict_struct.validateKeyTypes(key_types);
 
-    const auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
-
-    getItemsImpl<StringRef, StringRef>(
-        attribute,
-        key_columns,
-        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-        [&](const size_t) { return StringRef{def}; });
-}
-
-void ComplexKeyHashedDictionary::has(const Columns & key_columns, const DataTypes & key_types, PaddedPODArray<UInt8> & out) 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();
 
-    switch (attribute.type)
+    auto type_call = [&](const auto & dictionary_attribute_type)
     {
-        case AttributeUnderlyingType::utUInt8:
-            has<UInt8>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utUInt16:
-            has<UInt16>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utUInt32:
-            has<UInt32>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utUInt64:
-            has<UInt64>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utUInt128:
-            has<UInt128>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utInt8:
-            has<Int8>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utInt16:
-            has<Int16>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utInt32:
-            has<Int32>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utInt64:
-            has<Int64>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utFloat32:
-            has<Float32>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utFloat64:
-            has<Float64>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utString:
-            has<StringRef>(attribute, key_columns, out);
-            break;
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
 
-        case AttributeUnderlyingType::utDecimal32:
-            has<Decimal32>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utDecimal64:
-            has<Decimal64>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utDecimal128:
-            has<Decimal128>(attribute, key_columns, out);
-            break;
-    }
+        if constexpr (std::is_same_v<AttributeType, String>)
+        {
+            has<StringRef>(attribute, key_columns, out);
+        }
+        else
+        {
+            has<AttributeType>(attribute, key_columns, out);
+        }
+    };
+
+    callOnDictionaryAttributeType(attribute.type, type_call);
+
+    return result;
 }
 
 void ComplexKeyHashedDictionary::createAttributes()
@@ -407,66 +379,30 @@ void ComplexKeyHashedDictionary::addAttributeSize(const Attribute & attribute)
     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)
     {
-        switch (attribute.type)
+        auto type_call = [&](const auto & dictionary_attribute_type)
         {
-            case AttributeUnderlyingType::utUInt8:
-                addAttributeSize<UInt8>(attribute);
-                break;
-            case AttributeUnderlyingType::utUInt16:
-                addAttributeSize<UInt16>(attribute);
-                break;
-            case AttributeUnderlyingType::utUInt32:
-                addAttributeSize<UInt32>(attribute);
-                break;
-            case AttributeUnderlyingType::utUInt64:
-                addAttributeSize<UInt64>(attribute);
-                break;
-            case AttributeUnderlyingType::utUInt128:
-                addAttributeSize<UInt128>(attribute);
-                break;
-            case AttributeUnderlyingType::utInt8:
-                addAttributeSize<Int8>(attribute);
-                break;
-            case AttributeUnderlyingType::utInt16:
-                addAttributeSize<Int16>(attribute);
-                break;
-            case AttributeUnderlyingType::utInt32:
-                addAttributeSize<Int32>(attribute);
-                break;
-            case AttributeUnderlyingType::utInt64:
-                addAttributeSize<Int64>(attribute);
-                break;
-            case AttributeUnderlyingType::utFloat32:
-                addAttributeSize<Float32>(attribute);
-                break;
-            case AttributeUnderlyingType::utFloat64:
-                addAttributeSize<Float64>(attribute);
-                break;
+            using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+            using AttributeType = typename Type::AttributeType;
 
-            case AttributeUnderlyingType::utDecimal32:
-                addAttributeSize<Decimal32>(attribute);
-                break;
-            case AttributeUnderlyingType::utDecimal64:
-                addAttributeSize<Decimal64>(attribute);
-                break;
-            case AttributeUnderlyingType::utDecimal128:
-                addAttributeSize<Decimal128>(attribute);
-                break;
+            addAttributeSize<AttributeType>(attribute);
+        };
 
-            case AttributeUnderlyingType::utString:
-            {
-                addAttributeSize<StringRef>(attribute);
-                bytes_allocated += sizeof(Arena) + attribute.string_arena->size();
-
-                break;
-            }
-        }
+        callOnDictionaryAttributeType(attribute.type, type_call);
     }
 
     bytes_allocated += keys_pool.size();
@@ -479,65 +415,29 @@ void ComplexKeyHashedDictionary::createAttributeImpl(Attribute & attribute, cons
     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::createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value)
 {
     Attribute attr{type, {}, {}, {}};
 
-    switch (type)
+    auto type_call = [&](const auto &dictionary_attribute_type)
     {
-        case AttributeUnderlyingType::utUInt8:
-            createAttributeImpl<UInt8>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt16:
-            createAttributeImpl<UInt16>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt32:
-            createAttributeImpl<UInt32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt64:
-            createAttributeImpl<UInt64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt128:
-            createAttributeImpl<UInt128>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt8:
-            createAttributeImpl<Int8>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt16:
-            createAttributeImpl<Int16>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt32:
-            createAttributeImpl<Int32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt64:
-            createAttributeImpl<Int64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utFloat32:
-            createAttributeImpl<Float32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utFloat64:
-            createAttributeImpl<Float64>(attr, null_value);
-            break;
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributType = typename Type::AttributeType;
+        createAttributeImpl<AttributType>(attr, null_value);
+    };
 
-        case AttributeUnderlyingType::utDecimal32:
-            createAttributeImpl<Decimal32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utDecimal64:
-            createAttributeImpl<Decimal64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utDecimal128:
-            createAttributeImpl<Decimal128>(attr, null_value);
-            break;
-
-        case AttributeUnderlyingType::utString:
-        {
-            attr.null_values = null_value.get<String>();
-            attr.maps.emplace<ContainerType<StringRef>>();
-            attr.string_arena = std::make_unique<Arena>();
-            break;
-        }
-    }
+    callOnDictionaryAttributeType(type, type_call);
 
     return attr;
 }
@@ -684,41 +584,26 @@ std::vector<StringRef> ComplexKeyHashedDictionary::getKeys() const
 {
     const Attribute & attribute = attributes.front();
 
-    switch (attribute.type)
-    {
-        case AttributeUnderlyingType::utUInt8:
-            return getKeys<UInt8>(attribute);
-        case AttributeUnderlyingType::utUInt16:
-            return getKeys<UInt16>(attribute);
-        case AttributeUnderlyingType::utUInt32:
-            return getKeys<UInt32>(attribute);
-        case AttributeUnderlyingType::utUInt64:
-            return getKeys<UInt64>(attribute);
-        case AttributeUnderlyingType::utUInt128:
-            return getKeys<UInt128>(attribute);
-        case AttributeUnderlyingType::utInt8:
-            return getKeys<Int8>(attribute);
-        case AttributeUnderlyingType::utInt16:
-            return getKeys<Int16>(attribute);
-        case AttributeUnderlyingType::utInt32:
-            return getKeys<Int32>(attribute);
-        case AttributeUnderlyingType::utInt64:
-            return getKeys<Int64>(attribute);
-        case AttributeUnderlyingType::utFloat32:
-            return getKeys<Float32>(attribute);
-        case AttributeUnderlyingType::utFloat64:
-            return getKeys<Float64>(attribute);
-        case AttributeUnderlyingType::utString:
-            return getKeys<StringRef>(attribute);
+    std::vector<StringRef> result;
 
-        case AttributeUnderlyingType::utDecimal32:
-            return getKeys<Decimal32>(attribute);
-        case AttributeUnderlyingType::utDecimal64:
-            return getKeys<Decimal64>(attribute);
-        case AttributeUnderlyingType::utDecimal128:
-            return getKeys<Decimal128>(attribute);
-    }
-    return {};
+    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>
diff --git a/src/Dictionaries/ComplexKeyHashedDictionary.h b/src/Dictionaries/ComplexKeyHashedDictionary.h
index baf6628eebd..01a222d8629 100644
--- a/src/Dictionaries/ComplexKeyHashedDictionary.h
+++ b/src/Dictionaries/ComplexKeyHashedDictionary.h
@@ -60,91 +60,16 @@ public:
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
     }
 
-    template <typename T>
-    using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
+    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::complex; }
 
-#define DECLARE(TYPE) \
-    void get##TYPE( \
-        const std::string & attribute_name, const Columns & key_columns, const DataTypes & key_types, ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void getString(const std::string & attribute_name, const Columns & key_columns, const DataTypes & key_types, ColumnString * out) const;
-
-#define DECLARE(TYPE) \
-    void get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes & key_types, \
-        const PaddedPODArray<TYPE> & def, \
-        ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void getString(
-        const std::string & attribute_name,
+    ColumnPtr getColumn(
+        const std::string& attribute_name,
+        const DataTypePtr & result_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnString * const def,
-        ColumnString * const out) const;
+        const ColumnPtr default_untyped) const override;
 
-#define DECLARE(TYPE) \
-    void get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes & key_types, \
-        const TYPE def, \
-        ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void getString(
-        const std::string & attribute_name,
-        const Columns & key_columns,
-        const DataTypes & key_types,
-        const String & def,
-        ColumnString * const out) const;
-
-    void has(const Columns & key_columns, const DataTypes & key_types, PaddedPODArray<UInt8> & out) const;
+    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) const override;
 
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
 
@@ -170,7 +95,7 @@ private:
             Decimal128,
             Float32,
             Float64,
-            String>
+            StringRef>
             null_values;
         std::variant<
             ContainerType<UInt8>,
diff --git a/src/Dictionaries/DictionaryBlockInputStream.h b/src/Dictionaries/DictionaryBlockInputStream.h
index 53b513b5d33..915ab7601ed 100644
--- a/src/Dictionaries/DictionaryBlockInputStream.h
+++ b/src/Dictionaries/DictionaryBlockInputStream.h
@@ -230,7 +230,8 @@ Block DictionaryBlockInputStream<Key>::fillBlock(
             }
             else if (dictionary_identifier_type == DictionaryIdentifierType::complex)
             {
-                column = nullptr;
+                column = dictionary->getColumn(
+                    attribute.name, attribute.type, keys, data_types, nullptr /* default_untyped*/);
             }
             else
             {
diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index fde46be7656..137255b370e 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -109,16 +109,15 @@ ColumnPtr FlatDictionary::getColumn(
         const std::string& attribute_name,
         const DataTypePtr &,
         const Columns & key_columns,
-        const DataTypes &,
+        const DataTypes & key_types,
         const ColumnPtr default_untyped) const
 {
-    assert(!key_columns.empty());
+    dict_struct.validateKeyTypes(key_types);
     ColumnPtr result;
 
     PaddedPODArray<Key> backup_storage;
 
     const auto& ids = getColumnDataAsIdendifiers(*key_columns.front(), backup_storage);
-    bool is_const = isColumnConst(*key_columns.front());
 
     const auto & attribute = getAttribute(attribute_name);
 
@@ -257,12 +256,7 @@ ColumnPtr FlatDictionary::getColumn(
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
-    
-    if (is_const)
-    {
-        result = ColumnConst::create(std::move(result), 1);
-    }
-
+   
     return result;
 }
 
@@ -540,14 +534,55 @@ void FlatDictionary::setAttributeValueImpl<String>(Attribute & attribute, const
 
 void FlatDictionary::setAttributeValue(Attribute & attribute, const Key id, const Field & value)
 {
-    auto type_call = [&](const auto &dictionary_attribute_type)
+    switch (attribute.type)
     {
-        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributeType = typename Type::AttributeType;
-        setAttributeValueImpl<AttributeType>(attribute, id, value.get<AttributeType>());
-    };
+        case AttributeUnderlyingType::utUInt8:
+            setAttributeValueImpl<UInt8>(attribute, id, value.get<UInt64>());
+            break;
+        case AttributeUnderlyingType::utUInt16:
+            setAttributeValueImpl<UInt16>(attribute, id, value.get<UInt64>());
+            break;
+        case AttributeUnderlyingType::utUInt32:
+            setAttributeValueImpl<UInt32>(attribute, id, value.get<UInt64>());
+            break;
+        case AttributeUnderlyingType::utUInt64:
+            setAttributeValueImpl<UInt64>(attribute, id, value.get<UInt64>());
+            break;
+        case AttributeUnderlyingType::utUInt128:
+            setAttributeValueImpl<UInt128>(attribute, id, value.get<UInt128>());
+            break;
+        case AttributeUnderlyingType::utInt8:
+            setAttributeValueImpl<Int8>(attribute, id, value.get<Int64>());
+            break;
+        case AttributeUnderlyingType::utInt16:
+            setAttributeValueImpl<Int16>(attribute, id, value.get<Int64>());
+            break;
+        case AttributeUnderlyingType::utInt32:
+            setAttributeValueImpl<Int32>(attribute, id, value.get<Int64>());
+            break;
+        case AttributeUnderlyingType::utInt64:
+            setAttributeValueImpl<Int64>(attribute, id, value.get<Int64>());
+            break;
+        case AttributeUnderlyingType::utFloat32:
+            setAttributeValueImpl<Float32>(attribute, id, value.get<Float64>());
+            break;
+        case AttributeUnderlyingType::utFloat64:
+            setAttributeValueImpl<Float64>(attribute, id, value.get<Float64>());
+            break;
+        case AttributeUnderlyingType::utString:
+            setAttributeValueImpl<String>(attribute, id, value.get<String>());
+            break;
 
-    callOnDictionaryAttributeType(attribute.type, type_call);
+        case AttributeUnderlyingType::utDecimal32:
+            setAttributeValueImpl<Decimal32>(attribute, id, value.get<Decimal32>());
+            break;
+        case AttributeUnderlyingType::utDecimal64:
+            setAttributeValueImpl<Decimal64>(attribute, id, value.get<Decimal64>());
+            break;
+        case AttributeUnderlyingType::utDecimal128:
+            setAttributeValueImpl<Decimal128>(attribute, id, value.get<Decimal128>());
+            break;
+    }
 }
 
 
diff --git a/src/Functions/FunctionsExternalDictionaries.h b/src/Functions/FunctionsExternalDictionaries.h
index 609e14dd38e..06c8cd5d650 100644
--- a/src/Functions/FunctionsExternalDictionaries.h
+++ b/src/Functions/FunctionsExternalDictionaries.h
@@ -297,25 +297,31 @@ private:
 
         String attr_name = attr_name_col->getValue<String>();
 
-        const auto id_col_untyped = arguments[2].column;
+        const ColumnWithTypeAndName & key_col_with_type = arguments[2];
+        const auto key_column = key_col_with_type.column;
 
         auto dictionary_identifier_type = dictionary->getIdentifierType();
+        
+        ColumnPtr default_col = nullptr;
+
+        if (dictionary_get_function_type == DictionaryGetFunctionType::withDefault)
+        {
+            default_col = arguments[3].column;
+        }
 
         if (dictionary_identifier_type == DictionaryIdentifierType::simple)
         {
-            if (dictionary_get_function_type == DictionaryGetFunctionType::withDefault)
-            {
-                const auto default_col_untyped = arguments[3].column;
-                res = dictionary->getColumn(attr_name, result_type, { id_col_untyped }, { std::make_shared<DataTypeUInt64>() }, default_col_untyped);
-            }
-            else
-            {
-                res = dictionary->getColumn(attr_name, result_type, { id_col_untyped }, { std::make_shared<DataTypeUInt64>() }, nullptr);
-            }
+            res = dictionary->getColumn(attr_name, result_type, { key_column }, { std::make_shared<DataTypeUInt64>() }, default_col);
         }
         else if (dictionary_identifier_type == DictionaryIdentifierType::complex)
         {
-            res = nullptr;
+            /// Functions in external dictionaries_loader only support full-value (not constant) columns with keys.
+            ColumnPtr key_column_full = key_col_with_type.column->convertToFullColumnIfConst();
+
+            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();
+
+            res = dictionary->getColumn(attr_name, result_type, key_columns, key_types, default_col);
         }
         else
         {

From 8bd98ae432acdb812fb65f19b7defdb229b0432d Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Sat, 19 Dec 2020 19:47:58 +0300
Subject: [PATCH 523/611] Remove previous interface enum

---
 src/Dictionaries/DictionaryStructure.cpp | 4 ++--
 src/Dictionaries/DictionaryStructure.h   | 7 -------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/Dictionaries/DictionaryStructure.cpp b/src/Dictionaries/DictionaryStructure.cpp
index 68be50daa2f..b2340cf39a0 100644
--- a/src/Dictionaries/DictionaryStructure.cpp
+++ b/src/Dictionaries/DictionaryStructure.cpp
@@ -14,8 +14,6 @@
 #include <unordered_set>
 #include <ext/range.h>
 
-#include <iostream>
-
 namespace DB
 {
 namespace ErrorCodes
@@ -316,6 +314,8 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
         if ((range_min && name == range_min->name) || (range_max && name == range_max->name))
             continue;
 
+
+        /// TODO: Rewrite
         const auto type_string = config.getString(prefix + "type");
         const auto initial_type = DataTypeFactory::instance().get(type_string);
         auto type = initial_type;
diff --git a/src/Dictionaries/DictionaryStructure.h b/src/Dictionaries/DictionaryStructure.h
index 5656815e375..db5c3fa0103 100644
--- a/src/Dictionaries/DictionaryStructure.h
+++ b/src/Dictionaries/DictionaryStructure.h
@@ -42,13 +42,6 @@ std::string toString(const AttributeUnderlyingType type);
 /// Min and max lifetimes for a dictionary or it's entry
 using DictionaryLifetime = ExternalLoadableLifetime;
 
-enum class DictionaryGetByType {
-    getByIdentifiers,
-    getByComplexKeys,
-    getByRange,
-    unsupported /* will be removed after migration to new interface */
-};
-
 /** Holds the description of a single dictionary attribute:
 *    - name, used for lookup into dictionary and source;
 *    - type, used in conjunction with DataTypeFactory and getAttributeUnderlyingTypeByname;

From d92d843e206d6913be9b80827dda515eae89a644 Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Sat, 19 Dec 2020 20:04:34 +0300
Subject: [PATCH 524/611] Fixed compile issue

---
 src/Dictionaries/FlatDictionary.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index 137255b370e..0fa5e88ab3b 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -467,7 +467,7 @@ void FlatDictionary::createAttributeImpl<String>(Attribute & attribute, const Fi
 
 FlatDictionary::Attribute FlatDictionary::createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value)
 {
-    Attribute attr{type, {}, {}, {}, {}};
+    Attribute attr{type, {}, {}, {}};
 
     auto type_call = [&](const auto &dictionary_attribute_type)
     {

From d61e8c083bcf4fa0b50ce2f7e9b0ef05bbb1d8b3 Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Sun, 20 Dec 2020 23:11:28 +0300
Subject: [PATCH 525/611] Updated RangeHashedDictionary to new interface

---
 .../ComplexKeyHashedDictionary.cpp            |   7 +-
 src/Dictionaries/FlatDictionary.cpp           |  35 +-
 src/Dictionaries/FlatDictionary.h             |   5 -
 src/Dictionaries/IDictionary.h                |  31 ++
 .../RangeDictionaryBlockInputStream.h         | 116 +----
 src/Dictionaries/RangeHashedDictionary.cpp    | 439 ++++++++++--------
 src/Dictionaries/RangeHashedDictionary.h      |  57 +--
 .../FunctionsExternalDictionaries.cpp         |   4 +-
 src/Functions/FunctionsExternalDictionaries.h | 282 ++++-------
 9 files changed, 406 insertions(+), 570 deletions(-)

diff --git a/src/Dictionaries/ComplexKeyHashedDictionary.cpp b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
index 6a734a2f7ab..23d28bfe6ec 100644
--- a/src/Dictionaries/ComplexKeyHashedDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
@@ -48,7 +48,8 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
     const auto & attribute = getAttribute(attribute_name);
 
     /// TODO: Check that attribute type is same as result type
-
+    /// TODO: Check if const will work as expected
+    
     auto size = key_columns.front()->size();
 
     auto type_call = [&](const auto &dictionary_attribute_type)
@@ -433,8 +434,8 @@ ComplexKeyHashedDictionary::createAttributeWithType(const AttributeUnderlyingTyp
     auto type_call = [&](const auto &dictionary_attribute_type)
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributType = typename Type::AttributeType;
-        createAttributeImpl<AttributType>(attr, null_value);
+        using AttributeType = typename Type::AttributeType;
+        createAttributeImpl<AttributeType>(attr, null_value);
     };
 
     callOnDictionaryAttributeType(type, type_call);
diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index 0fa5e88ab3b..58e54931dee 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -116,12 +116,12 @@ ColumnPtr FlatDictionary::getColumn(
     ColumnPtr result;
 
     PaddedPODArray<Key> backup_storage;
-
-    const auto& ids = getColumnDataAsIdendifiers(*key_columns.front(), backup_storage);
-
+    const auto& ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
+    
     const auto & attribute = getAttribute(attribute_name);
 
     /// TODO: Check that attribute type is same as result type
+    /// TODO: Check if const will work as expected
 
     auto type_call = [&](const auto &dictionary_attribute_type)
     {
@@ -266,7 +266,7 @@ ColumnUInt8::Ptr FlatDictionary::has(const Columns & key_columns, const DataType
     assert(!key_columns.empty());
 
     PaddedPODArray<Key> backup_storage;
-    const auto& ids = getColumnDataAsIdendifiers(*key_columns.front(), backup_storage);
+    const auto& ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
 
     auto result = ColumnUInt8::create(ext::size(ids));
     auto& out = result->getData();
@@ -472,8 +472,8 @@ FlatDictionary::Attribute FlatDictionary::createAttributeWithType(const Attribut
     auto type_call = [&](const auto &dictionary_attribute_type)
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributType = typename Type::AttributeType;
-        createAttributeImpl<AttributType>(attr, null_value);
+        using AttributeType = typename Type::AttributeType;
+        createAttributeImpl<AttributeType>(attr, null_value);
     };
 
     callOnDictionaryAttributeType(type, type_call);
@@ -595,29 +595,6 @@ const FlatDictionary::Attribute & FlatDictionary::getAttribute(const std::string
     return attributes[it->second];
 }
 
-const PaddedPODArray<FlatDictionary::Key> & FlatDictionary::getColumnDataAsIdendifiers(const IColumn & column, PaddedPODArray<Key> & backup_storage) const
-{
-
-    if (const auto *id_col = checkAndGetColumn<ColumnUInt64>(&column))
-    {
-        return id_col->getData();
-    }
-    else if (const auto *id_col_const = checkAndGetColumnConst<ColumnUInt64>(&column))
-    {
-        const auto full_column = id_col_const->convertToFullColumnIfConst();
-        const auto size = full_column->size();
-        backup_storage.resize(size);
-        for (size_t i = 0; i < size; ++i)
-            backup_storage[i] = full_column->getUInt(i);
-
-        return backup_storage;
-    }
-    else 
-        throw Exception{"Identifier column must be UInt64", ErrorCodes::ILLEGAL_COLUMN};
-
-    return backup_storage;
-}
-
 PaddedPODArray<FlatDictionary::Key> FlatDictionary::getIds() const
 {
     const auto ids_count = ext::size(loaded_ids);
diff --git a/src/Dictionaries/FlatDictionary.h b/src/Dictionaries/FlatDictionary.h
index af211f2edda..72da13b4cd4 100644
--- a/src/Dictionaries/FlatDictionary.h
+++ b/src/Dictionaries/FlatDictionary.h
@@ -78,7 +78,6 @@ public:
         const DataTypes & key_types,
         const ColumnPtr default_untyped) const override;
 
-
     ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) const override;
 
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
@@ -90,7 +89,6 @@ private:
     struct Attribute final
     {
         AttributeUnderlyingType type;
-        // bool is_array;
 
         std::variant<
             UInt8,
@@ -127,7 +125,6 @@ private:
             ContainerType<StringRef>>
             arrays;
 
-        std::optional<ContainerType<size_t>> array_offsets;
         std::unique_ptr<Arena> string_arena;
     };
 
@@ -163,8 +160,6 @@ private:
     template <typename ChildType, typename AncestorType>
     void isInImpl(const ChildType & child_ids, const AncestorType & ancestor_ids, PaddedPODArray<UInt8> & out) const;
 
-    const PaddedPODArray<Key> & getColumnDataAsIdendifiers(const IColumn & column, PaddedPODArray<Key> & backup_storage) const;
-
     PaddedPODArray<Key> getIds() const;
 
     const DictionaryStructure dict_struct;
diff --git a/src/Dictionaries/IDictionary.h b/src/Dictionaries/IDictionary.h
index ce613a26020..c619e85f523 100644
--- a/src/Dictionaries/IDictionary.h
+++ b/src/Dictionaries/IDictionary.h
@@ -155,6 +155,7 @@ struct IDictionary : IDictionaryBase
 
     virtual void toParent(const PaddedPODArray<Key> & ids, PaddedPODArray<Key> & out) const = 0;
 
+    /// TODO: Rewrite
     /// Methods for hierarchy.
 
     virtual void isInVectorVector(
@@ -196,4 +197,34 @@ inline void checkAttributeType(const IDictionaryBase * dictionary, const std::st
                         attribute_name, toString(attribute_type), toString(to)};
 }
 
+template <typename T>
+static const PaddedPODArray<T> &
+getColumnDataAsPaddedPODArray(const IDictionaryBase * dictionary, const ColumnPtr column, PaddedPODArray<T> & backup_storage)
+{
+    bool is_const_column = isColumnConst(*column);
+    auto full_column = column->convertToFullColumnIfConst();
+    auto vector_col = checkAndGetColumn<ColumnVector<T>>(full_column.get());
+
+    if (!vector_col)
+    {
+        throw Exception{
+            ErrorCodes::TYPE_MISMATCH,
+            "{}: type mismatch: column has wrong type expected {}",
+            dictionary->getDictionaryID().getNameForLogs(),
+            "" /* TODO: Type name*/};
+    }
+
+    if (is_const_column)
+    {
+        // With type conversion and const columns we need to use backup storage here
+        auto & data = vector_col->getData();
+        backup_storage.assign(data);
+
+        return backup_storage;
+    }
+    else
+    {
+        return vector_col->getData();
+    }
+}
 }
diff --git a/src/Dictionaries/RangeDictionaryBlockInputStream.h b/src/Dictionaries/RangeDictionaryBlockInputStream.h
index a2353051e5d..aeb16f389b4 100644
--- a/src/Dictionaries/RangeDictionaryBlockInputStream.h
+++ b/src/Dictionaries/RangeDictionaryBlockInputStream.h
@@ -37,26 +37,6 @@ protected:
     Block getBlock(size_t start, size_t length) const override;
 
 private:
-    template <typename Type>
-    using DictionaryGetter = void (DictionaryType::*)(
-        const std::string &, const PaddedPODArray<Key> &, const PaddedPODArray<Int64> &, PaddedPODArray<Type> &) const;
-
-    template <typename Type>
-    using DictionaryDecimalGetter = void (DictionaryType::*)(
-        const std::string &, const PaddedPODArray<Key> &, const PaddedPODArray<Int64> &, DecimalPaddedPODArray<Type> &) const;
-
-    template <typename AttributeType, typename Getter>
-    ColumnPtr getColumnFromAttribute(
-        Getter getter,
-        const PaddedPODArray<Key> & ids_to_fill,
-        const PaddedPODArray<Int64> & dates,
-        const DictionaryAttribute & attribute,
-        const DictionaryType & concrete_dictionary) const;
-    ColumnPtr getColumnFromAttributeString(
-        const PaddedPODArray<Key> & ids_to_fill,
-        const PaddedPODArray<Int64> & dates,
-        const DictionaryAttribute & attribute,
-        const DictionaryType & concrete_dictionary) const;
     template <typename T>
     ColumnPtr getColumnFromPODArray(const PaddedPODArray<T> & array) const;
 
@@ -122,41 +102,6 @@ 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 AttributeType, typename Getter>
-ColumnPtr RangeDictionaryBlockInputStream<DictionaryType, RangeType, Key>::getColumnFromAttribute(
-    Getter getter,
-    const PaddedPODArray<Key> & ids_to_fill,
-    const PaddedPODArray<Int64> & dates,
-    const DictionaryAttribute & attribute,
-    const DictionaryType & concrete_dictionary) const
-{
-    if constexpr (IsDecimalNumber<AttributeType>)
-    {
-        auto column = ColumnDecimal<AttributeType>::create(ids_to_fill.size(), 0); /// NOTE: There's wrong scale here, but it's unused.
-        (concrete_dictionary.*getter)(attribute.name, ids_to_fill, dates, column->getData());
-        return column;
-    }
-    else
-    {
-        auto column_vector = ColumnVector<AttributeType>::create(ids_to_fill.size());
-        (concrete_dictionary.*getter)(attribute.name, ids_to_fill, dates, column_vector->getData());
-        return column_vector;
-    }
-}
-
-template <typename DictionaryType, typename RangeType, typename Key>
-ColumnPtr RangeDictionaryBlockInputStream<DictionaryType, RangeType, Key>::getColumnFromAttributeString(
-    const PaddedPODArray<Key> & ids_to_fill,
-    const PaddedPODArray<Int64> & dates,
-    const DictionaryAttribute & attribute,
-    const DictionaryType & concrete_dictionary) const
-{
-    auto column_string = ColumnString::create();
-    concrete_dictionary.getString(attribute.name, ids_to_fill, dates, column_string.get());
-    return column_string;
-}
-
 template <typename DictionaryType, typename RangeType, typename Key>
 template <typename T>
 ColumnPtr RangeDictionaryBlockInputStream<DictionaryType, RangeType, Key>::getColumnFromPODArray(const PaddedPODArray<T> & array) const
@@ -168,7 +113,6 @@ ColumnPtr RangeDictionaryBlockInputStream<DictionaryType, RangeType, Key>::getCo
     return column_vector;
 }
 
-
 template <typename DictionaryType, typename RangeType, typename Key>
 template <typename DictionarySpecialAttributeType, typename T>
 void RangeDictionaryBlockInputStream<DictionaryType, RangeType, Key>::addSpecialColumn(
@@ -216,68 +160,24 @@ Block RangeDictionaryBlockInputStream<DictionaryType, RangeType, Key>::fillBlock
     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);
+    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 date_key = makeDateKey(block_start_dates, block_end_dates);
+    auto date_column = getColumnFromPODArray(date_key);
 
     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;
-#define GET_COLUMN_FORM_ATTRIBUTE(TYPE) \
-    column = getColumnFromAttribute<TYPE>(&DictionaryType::get##TYPE, ids_to_fill, date_key, attribute, *dictionary)
-            switch (attribute.underlying_type)
-            {
-                case AttributeUnderlyingType::utUInt8:
-                    GET_COLUMN_FORM_ATTRIBUTE(UInt8);
-                    break;
-                case AttributeUnderlyingType::utUInt16:
-                    GET_COLUMN_FORM_ATTRIBUTE(UInt16);
-                    break;
-                case AttributeUnderlyingType::utUInt32:
-                    GET_COLUMN_FORM_ATTRIBUTE(UInt32);
-                    break;
-                case AttributeUnderlyingType::utUInt64:
-                    GET_COLUMN_FORM_ATTRIBUTE(UInt64);
-                    break;
-                case AttributeUnderlyingType::utUInt128:
-                    GET_COLUMN_FORM_ATTRIBUTE(UInt128);
-                    break;
-                case AttributeUnderlyingType::utInt8:
-                    GET_COLUMN_FORM_ATTRIBUTE(Int8);
-                    break;
-                case AttributeUnderlyingType::utInt16:
-                    GET_COLUMN_FORM_ATTRIBUTE(Int16);
-                    break;
-                case AttributeUnderlyingType::utInt32:
-                    GET_COLUMN_FORM_ATTRIBUTE(Int32);
-                    break;
-                case AttributeUnderlyingType::utInt64:
-                    GET_COLUMN_FORM_ATTRIBUTE(Int64);
-                    break;
-                case AttributeUnderlyingType::utFloat32:
-                    GET_COLUMN_FORM_ATTRIBUTE(Float32);
-                    break;
-                case AttributeUnderlyingType::utFloat64:
-                    GET_COLUMN_FORM_ATTRIBUTE(Float64);
-                    break;
-                case AttributeUnderlyingType::utDecimal32:
-                    GET_COLUMN_FORM_ATTRIBUTE(Decimal32);
-                    break;
-                case AttributeUnderlyingType::utDecimal64:
-                    GET_COLUMN_FORM_ATTRIBUTE(Decimal64);
-                    break;
-                case AttributeUnderlyingType::utDecimal128:
-                    GET_COLUMN_FORM_ATTRIBUTE(Decimal128);
-                    break;
-                case AttributeUnderlyingType::utString:
-                    column = getColumnFromAttributeString(ids_to_fill, date_key, attribute, *dictionary);
-                    break;
-            }
-#undef GET_COLUMN_FORM_ATTRIBUTE
+            ColumnPtr column = dictionary->getColumn(
+                attribute.name,
+                attribute.type,
+                {ids_column, date_column},
+                {std::make_shared<DataTypeUInt64>(), structure.range_max->type},
+                nullptr);
             columns.emplace_back(column, attribute.type, attribute.name);
         }
     }
diff --git a/src/Dictionaries/RangeHashedDictionary.cpp b/src/Dictionaries/RangeHashedDictionary.cpp
index eeed581c6f4..57299da43b8 100644
--- a/src/Dictionaries/RangeHashedDictionary.cpp
+++ b/src/Dictionaries/RangeHashedDictionary.cpp
@@ -50,6 +50,7 @@ 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)
@@ -85,66 +86,163 @@ RangeHashedDictionary::RangeHashedDictionary(
     calculateBytesAllocated();
 }
 
-
-#define DECLARE_MULTIPLE_GETTER(TYPE) \
-    void RangeHashedDictionary::get##TYPE( \
-        const std::string & attribute_name, \
-        const PaddedPODArray<Key> & ids, \
-        const PaddedPODArray<RangeStorageType> & dates, \
-        ResultArrayType<TYPE> & out) const \
-    { \
-        const auto & attribute = getAttributeWithType(attribute_name, AttributeUnderlyingType::ut##TYPE); \
-        getItems<TYPE>(attribute, ids, dates, out); \
-    }
-DECLARE_MULTIPLE_GETTER(UInt8)
-DECLARE_MULTIPLE_GETTER(UInt16)
-DECLARE_MULTIPLE_GETTER(UInt32)
-DECLARE_MULTIPLE_GETTER(UInt64)
-DECLARE_MULTIPLE_GETTER(UInt128)
-DECLARE_MULTIPLE_GETTER(Int8)
-DECLARE_MULTIPLE_GETTER(Int16)
-DECLARE_MULTIPLE_GETTER(Int32)
-DECLARE_MULTIPLE_GETTER(Int64)
-DECLARE_MULTIPLE_GETTER(Float32)
-DECLARE_MULTIPLE_GETTER(Float64)
-DECLARE_MULTIPLE_GETTER(Decimal32)
-DECLARE_MULTIPLE_GETTER(Decimal64)
-DECLARE_MULTIPLE_GETTER(Decimal128)
-#undef DECLARE_MULTIPLE_GETTER
-
-void RangeHashedDictionary::getString(
+ColumnPtr RangeHashedDictionary::getColumn(
     const std::string & attribute_name,
-    const PaddedPODArray<Key> & ids,
-    const PaddedPODArray<RangeStorageType> & dates,
-    ColumnString * out) const
+    const DataTypePtr &,
+    const Columns & key_columns,
+    const DataTypes &,
+    const ColumnPtr default_untyped) const
 {
-    const auto & attribute = getAttributeWithType(attribute_name, AttributeUnderlyingType::utString);
-    const auto & attr = *std::get<Ptr<StringRef>>(attribute.maps);
-    const auto & null_value = std::get<String>(attribute.null_values);
+    /// TODO: Validate input types
 
-    for (const auto i : ext::range(0, ids.size()))
+    ColumnPtr result;
+
+    const auto & attribute = getAttribute(attribute_name);
+
+    /// TODO: Check that attribute type is same as result type
+
+    auto size = key_columns.front()->size();
+
+    auto type_call = [&](const auto &dictionary_attribute_type)
     {
-        const auto * it = attr.find(ids[i]);
-        if (it)
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
+
+        if constexpr (std::is_same_v<AttributeType, String>)
         {
-            const auto date = dates[i];
-            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<StringRef> & v)
-                  {
-                      return v.range.contains(date);
-                  });
+            auto column_string = ColumnString::create();
+            auto out = column_string.get();
 
-            const auto string_ref = val_it != std::end(ranges_and_values) ? val_it->value : StringRef{null_value};
-            out->insertData(string_ref.data, string_ref.size);
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                {
+                    getItemsImpl<StringRef, StringRef>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                        [&](const size_t row) { return default_col->getDataAt(row); });
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<String>();
+
+                    getItemsImpl<StringRef, StringRef>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                        [&](const size_t) { return def; });
+                }
+            }
+            else
+            {
+                const auto & null_value = std::get<StringRef>(attribute.null_values);
+
+                getItemsImpl<StringRef, StringRef>(
+                    attribute,
+                    key_columns,
+                    [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                    [&](const size_t) { return null_value; });
+            }
+
+            result = std::move(column_string);
         }
-        else
-            out->insertData(null_value.data(), null_value.size());
-    }
+        else if constexpr (IsNumber<AttributeType>)
+        {
+            auto column = ColumnVector<AttributeType>::create(size);
+            auto& out = column->getData();
 
-    query_count.fetch_add(ids.size(), std::memory_order_relaxed);
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnVector<AttributeType>>(*default_untyped))
+                {
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row) { return default_col->getData()[row]; }
+                    );
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnVector<AttributeType>>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<AttributeType>();
+
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t) { return def; }
+                    );
+                }
+            }
+            else
+            {
+                const auto null_value = std::get<AttributeType>(attribute.null_values);
+
+                getItemsImpl<AttributeType, AttributeType>(
+                    attribute,
+                    key_columns,
+                    [&](const size_t row, const auto value) { return out[row] = value; },
+                    [&](const size_t) { return null_value; });
+            }
+
+            result = std::move(column);
+        }
+        else if constexpr (IsDecimalNumber<AttributeType>)
+        {
+            // auto scale = getDecimalScale(*attribute.type);
+            auto column = ColumnDecimal<AttributeType>::create(size, 0);
+            auto& out = column->getData();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnDecimal<AttributeType>>(*default_untyped))
+                {
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row) { return default_col->getData()[row]; }
+                    );
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnDecimal<AttributeType>>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<AttributeType>();
+
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t) { return def; }
+                    );
+                }
+            }
+            else
+            {
+                const auto null_value = std::get<AttributeType>(attribute.null_values);
+
+                getItemsImpl<AttributeType, AttributeType>(
+                    attribute,
+                    key_columns,
+                    [&](const size_t row, const auto value) { return out[row] = value; },
+                    [&](const size_t) { return null_value; }
+                );
+            }
+
+            result = std::move(column);
+        }
+    };
+
+    callOnDictionaryAttributeType(attribute.type, type_call);
+   
+    return result;
 }
 
+ColumnUInt8::Ptr RangeHashedDictionary::has(const Columns &, const DataTypes &) const
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+        "Has not supported", getDictionaryID().getNameForLogs());
+}
 
 void RangeHashedDictionary::createAttributes()
 {
@@ -220,66 +318,84 @@ void RangeHashedDictionary::addAttributeSize(const Attribute & attribute)
     bucket_count = map_ref->getBufferSizeInCells();
 }
 
+template <>
+void RangeHashedDictionary::addAttributeSize<String>(const Attribute & attribute)
+{
+    const auto & map_ref = std::get<Ptr<StringRef>>(attribute.maps);
+    bytes_allocated += sizeof(Collection<StringRef>) + map_ref->getBufferSizeInBytes();
+    bucket_count = map_ref->getBufferSizeInCells();
+    bytes_allocated += sizeof(Arena) + attribute.string_arena->size();
+}
+
 void RangeHashedDictionary::calculateBytesAllocated()
 {
     bytes_allocated += attributes.size() * sizeof(attributes.front());
 
     for (const auto & attribute : attributes)
     {
-        switch (attribute.type)
+        auto type_call = [&](const auto & dictionary_attribute_type) 
         {
-            case AttributeUnderlyingType::utUInt8:
-                addAttributeSize<UInt8>(attribute);
-                break;
-            case AttributeUnderlyingType::utUInt16:
-                addAttributeSize<UInt16>(attribute);
-                break;
-            case AttributeUnderlyingType::utUInt32:
-                addAttributeSize<UInt32>(attribute);
-                break;
-            case AttributeUnderlyingType::utUInt64:
-                addAttributeSize<UInt64>(attribute);
-                break;
-            case AttributeUnderlyingType::utUInt128:
-                addAttributeSize<UInt128>(attribute);
-                break;
-            case AttributeUnderlyingType::utInt8:
-                addAttributeSize<Int8>(attribute);
-                break;
-            case AttributeUnderlyingType::utInt16:
-                addAttributeSize<Int16>(attribute);
-                break;
-            case AttributeUnderlyingType::utInt32:
-                addAttributeSize<Int32>(attribute);
-                break;
-            case AttributeUnderlyingType::utInt64:
-                addAttributeSize<Int64>(attribute);
-                break;
-            case AttributeUnderlyingType::utFloat32:
-                addAttributeSize<Float32>(attribute);
-                break;
-            case AttributeUnderlyingType::utFloat64:
-                addAttributeSize<Float64>(attribute);
-                break;
+            using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+            using AttributeType = typename Type::AttributeType;
+            addAttributeSize<AttributeType>(attribute);
+        };
 
-            case AttributeUnderlyingType::utDecimal32:
-                addAttributeSize<Decimal32>(attribute);
-                break;
-            case AttributeUnderlyingType::utDecimal64:
-                addAttributeSize<Decimal64>(attribute);
-                break;
-            case AttributeUnderlyingType::utDecimal128:
-                addAttributeSize<Decimal128>(attribute);
-                break;
+        callOnDictionaryAttributeType(attribute.type, type_call);
 
-            case AttributeUnderlyingType::utString:
-            {
-                addAttributeSize<StringRef>(attribute);
-                bytes_allocated += sizeof(Arena) + attribute.string_arena->size();
+        // switch (attribute.type)
+        // {
+        //     case AttributeUnderlyingType::utUInt8:
+        //         addAttributeSize<UInt8>(attribute);
+        //         break;
+        //     case AttributeUnderlyingType::utUInt16:
+        //         addAttributeSize<UInt16>(attribute);
+        //         break;
+        //     case AttributeUnderlyingType::utUInt32:
+        //         addAttributeSize<UInt32>(attribute);
+        //         break;
+        //     case AttributeUnderlyingType::utUInt64:
+        //         addAttributeSize<UInt64>(attribute);
+        //         break;
+        //     case AttributeUnderlyingType::utUInt128:
+        //         addAttributeSize<UInt128>(attribute);
+        //         break;
+        //     case AttributeUnderlyingType::utInt8:
+        //         addAttributeSize<Int8>(attribute);
+        //         break;
+        //     case AttributeUnderlyingType::utInt16:
+        //         addAttributeSize<Int16>(attribute);
+        //         break;
+        //     case AttributeUnderlyingType::utInt32:
+        //         addAttributeSize<Int32>(attribute);
+        //         break;
+        //     case AttributeUnderlyingType::utInt64:
+        //         addAttributeSize<Int64>(attribute);
+        //         break;
+        //     case AttributeUnderlyingType::utFloat32:
+        //         addAttributeSize<Float32>(attribute);
+        //         break;
+        //     case AttributeUnderlyingType::utFloat64:
+        //         addAttributeSize<Float64>(attribute);
+        //         break;
 
-                break;
-            }
-        }
+        //     case AttributeUnderlyingType::utDecimal32:
+        //         addAttributeSize<Decimal32>(attribute);
+        //         break;
+        //     case AttributeUnderlyingType::utDecimal64:
+        //         addAttributeSize<Decimal64>(attribute);
+        //         break;
+        //     case AttributeUnderlyingType::utDecimal128:
+        //         addAttributeSize<Decimal128>(attribute);
+        //         break;
+
+        //     case AttributeUnderlyingType::utString:
+        //     {
+        //         addAttributeSize<StringRef>(attribute);
+        //         bytes_allocated += sizeof(Arena) + attribute.string_arena->size();
+
+        //         break;
+        //     }
+        // }
     }
 }
 
@@ -290,113 +406,54 @@ void RangeHashedDictionary::createAttributeImpl(Attribute & attribute, const Fie
     attribute.maps = std::make_unique<Collection<T>>();
 }
 
+template <>
+void RangeHashedDictionary::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 = std::make_unique<Collection<StringRef>>();
+}
+
 RangeHashedDictionary::Attribute
 RangeHashedDictionary::createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value)
 {
     Attribute attr{type, {}, {}, {}};
 
-    switch (type)
+    auto type_call = [&](const auto &dictionary_attribute_type)
     {
-        case AttributeUnderlyingType::utUInt8:
-            createAttributeImpl<UInt8>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt16:
-            createAttributeImpl<UInt16>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt32:
-            createAttributeImpl<UInt32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt64:
-            createAttributeImpl<UInt64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt128:
-            createAttributeImpl<UInt128>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt8:
-            createAttributeImpl<Int8>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt16:
-            createAttributeImpl<Int16>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt32:
-            createAttributeImpl<Int32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt64:
-            createAttributeImpl<Int64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utFloat32:
-            createAttributeImpl<Float32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utFloat64:
-            createAttributeImpl<Float64>(attr, null_value);
-            break;
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
+        createAttributeImpl<AttributeType>(attr, null_value);
+    };
 
-        case AttributeUnderlyingType::utDecimal32:
-            createAttributeImpl<Decimal32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utDecimal64:
-            createAttributeImpl<Decimal64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utDecimal128:
-            createAttributeImpl<Decimal128>(attr, null_value);
-            break;
-
-        case AttributeUnderlyingType::utString:
-        {
-            attr.null_values = null_value.get<String>();
-            attr.maps = std::make_unique<Collection<StringRef>>();
-            attr.string_arena = std::make_unique<Arena>();
-            break;
-        }
-    }
+    callOnDictionaryAttributeType(type, type_call);
 
     return attr;
 }
 
-
-template <typename OutputType>
-void RangeHashedDictionary::getItems(
-    const Attribute & attribute,
-    const PaddedPODArray<Key> & ids,
-    const PaddedPODArray<RangeStorageType> & dates,
-    PaddedPODArray<OutputType> & out) const
-{
-    if (false) {} // NOLINT
-#define DISPATCH(TYPE) else if (attribute.type == AttributeUnderlyingType::ut##TYPE) getItemsImpl<TYPE, OutputType>(attribute, ids, dates, out);
-    DISPATCH(UInt8)
-    DISPATCH(UInt16)
-    DISPATCH(UInt32)
-    DISPATCH(UInt64)
-    DISPATCH(UInt128)
-    DISPATCH(Int8)
-    DISPATCH(Int16)
-    DISPATCH(Int32)
-    DISPATCH(Int64)
-    DISPATCH(Float32)
-    DISPATCH(Float64)
-    DISPATCH(Decimal32)
-    DISPATCH(Decimal64)
-    DISPATCH(Decimal128)
-#undef DISPATCH
-    else throw Exception("Unexpected type of attribute: " + toString(attribute.type), ErrorCodes::LOGICAL_ERROR);
-}
-
-template <typename AttributeType, typename OutputType>
+template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
 void RangeHashedDictionary::getItemsImpl(
     const Attribute & attribute,
-    const PaddedPODArray<Key> & ids,
-    const PaddedPODArray<RangeStorageType> & dates,
-    PaddedPODArray<OutputType> & out) const
+    const Columns & key_columns,
+    ValueSetter && set_value,
+    DefaultGetter && get_default) const
 {
-    const auto & attr = *std::get<Ptr<AttributeType>>(attribute.maps);
-    const auto null_value = std::get<AttributeType>(attribute.null_values);
+    PaddedPODArray<Key> key_backup_storage;
+    PaddedPODArray<RangeStorageType> range_backup_storage;
 
-    for (const auto i : ext::range(0, ids.size()))
+    const PaddedPODArray<Key> & ids = getColumnDataAsPaddedPODArray(this, key_columns[0], key_backup_storage);
+    const PaddedPODArray<RangeStorageType> & dates = getColumnDataAsPaddedPODArray(this, key_columns[1], range_backup_storage);
+
+    const auto & attr = *std::get<Ptr<AttributeType>>(attribute.maps);
+
+    for (const auto row : ext::range(0, ids.size()))
     {
-        const auto it = attr.find(ids[i]);
+        const auto it = attr.find(ids[row]);
         if (it)
         {
-            const auto date = dates[i];
+            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)
@@ -404,11 +461,11 @@ void RangeHashedDictionary::getItemsImpl(
                       return v.range.contains(date);
                   });
 
-            out[i] = static_cast<OutputType>(val_it != std::end(ranges_and_values) ? val_it->value : null_value); // NOLINT
+            set_value(row, static_cast<OutputType>(val_it != std::end(ranges_and_values) ? val_it->value : get_default(row))); // NOLINT
         }
         else
         {
-            out[i] = static_cast<OutputType>(null_value); // NOLINT
+            set_value(row, get_default(row));
         }
     }
 
diff --git a/src/Dictionaries/RangeHashedDictionary.h b/src/Dictionaries/RangeHashedDictionary.h
index 46ae0390b6a..5588bdb3ced 100644
--- a/src/Dictionaries/RangeHashedDictionary.h
+++ b/src/Dictionaries/RangeHashedDictionary.h
@@ -52,38 +52,18 @@ public:
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
     }
 
-    typedef Int64 RangeStorageType;
+    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::range; }
 
-    template <typename T>
-    using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
+    ColumnPtr getColumn(
+        const std::string& attribute_name,
+        const DataTypePtr & result_type,
+        const Columns & key_columns,
+        const DataTypes & key_types,
+        const ColumnPtr default_untyped) const override;
 
-#define DECLARE_MULTIPLE_GETTER(TYPE) \
-    void get##TYPE( \
-        const std::string & attribute_name, \
-        const PaddedPODArray<Key> & ids, \
-        const PaddedPODArray<RangeStorageType> & dates, \
-        ResultArrayType<TYPE> & out) const;
-    DECLARE_MULTIPLE_GETTER(UInt8)
-    DECLARE_MULTIPLE_GETTER(UInt16)
-    DECLARE_MULTIPLE_GETTER(UInt32)
-    DECLARE_MULTIPLE_GETTER(UInt64)
-    DECLARE_MULTIPLE_GETTER(UInt128)
-    DECLARE_MULTIPLE_GETTER(Int8)
-    DECLARE_MULTIPLE_GETTER(Int16)
-    DECLARE_MULTIPLE_GETTER(Int32)
-    DECLARE_MULTIPLE_GETTER(Int64)
-    DECLARE_MULTIPLE_GETTER(Float32)
-    DECLARE_MULTIPLE_GETTER(Float64)
-    DECLARE_MULTIPLE_GETTER(Decimal32)
-    DECLARE_MULTIPLE_GETTER(Decimal64)
-    DECLARE_MULTIPLE_GETTER(Decimal128)
-#undef DECLARE_MULTIPLE_GETTER
+    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) const override;
 
-    void getString(
-        const std::string & attribute_name,
-        const PaddedPODArray<Key> & ids,
-        const PaddedPODArray<RangeStorageType> & dates,
-        ColumnString * out) const;
+    using RangeStorageType = Int64;
 
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
 
@@ -130,7 +110,7 @@ private:
             Decimal128,
             Float32,
             Float64,
-            String>
+            StringRef>
             null_values;
         std::variant<
             Ptr<UInt8>,
@@ -166,21 +146,12 @@ private:
 
     Attribute createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value);
 
-
-    template <typename OutputType>
-    void getItems(
-        const Attribute & attribute,
-        const PaddedPODArray<Key> & ids,
-        const PaddedPODArray<RangeStorageType> & dates,
-        PaddedPODArray<OutputType> & out) const;
-
-    template <typename AttributeType, typename OutputType>
+    template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
     void getItemsImpl(
         const Attribute & attribute,
-        const PaddedPODArray<Key> & ids,
-        const PaddedPODArray<RangeStorageType> & dates,
-        PaddedPODArray<OutputType> & out) const;
-
+        const Columns & key_columns,
+        ValueSetter && set_value,
+        DefaultGetter && get_default) const;
 
     template <typename T>
     void setAttributeValueImpl(Attribute & attribute, const Key id, const Range & range, const T value);
diff --git a/src/Functions/FunctionsExternalDictionaries.cpp b/src/Functions/FunctionsExternalDictionaries.cpp
index 3d536630d7a..dbdbaf0e22a 100644
--- a/src/Functions/FunctionsExternalDictionaries.cpp
+++ b/src/Functions/FunctionsExternalDictionaries.cpp
@@ -38,8 +38,8 @@ void registerFunctionsExternalDictionaries(FunctionFactory & factory)
     factory.registerFunction<FunctionDictGetDateTimeOrDefault>();
     factory.registerFunction<FunctionDictGetUUIDOrDefault>();
     factory.registerFunction<FunctionDictGetStringOrDefault>();
-    factory.registerFunction<FunctionDictGetNoType>();
-    factory.registerFunction<FunctionDictGetNoTypeOrDefault>();
+    factory.registerFunction<FunctionDictGetNoType<DictionaryGetFunctionType::withoutDefault>>();
+    factory.registerFunction<FunctionDictGetNoType<DictionaryGetFunctionType::withDefault>>();
 }
 
 }
diff --git a/src/Functions/FunctionsExternalDictionaries.h b/src/Functions/FunctionsExternalDictionaries.h
index 06c8cd5d650..5b20a4dfc08 100644
--- a/src/Functions/FunctionsExternalDictionaries.h
+++ b/src/Functions/FunctionsExternalDictionaries.h
@@ -104,8 +104,8 @@ public:
         if (!sample_columns)
             return false;
 
-        if (sample_columns.columns() != 3 && sample_columns.columns() != 4)
-            throw Exception{"Function dictGet... takes 3 or 4 arguments", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+        if (sample_columns.columns() < 3)
+            throw Exception{"Wrong arguments count", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
 
         const auto * dict_name_col = checkAndGetColumnConst<ColumnString>(sample_columns.getByPosition(0).column.get());
         if (!dict_name_col)
@@ -121,7 +121,6 @@ public:
 private:
     const Context & context;
     const ExternalDictionariesLoader & external_loader;
-    mutable std::shared_ptr<const IDictionaryBase> dictionary;
     /// 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;
 };
@@ -178,19 +177,26 @@ private:
         auto dictionary = helper.getDictionary(arguments[0]);
         auto dictionary_identifier_type = dictionary->getIdentifierType();
 
-        const auto id_col_untyped = arguments[1].column;
+        const ColumnWithTypeAndName & key_column_with_type = arguments[1];
+        const auto key_column = key_column_with_type.column;
 
         if (dictionary_identifier_type == DictionaryIdentifierType::simple)
         {
-            return dictionary->has({ id_col_untyped }, { std::make_shared<DataTypeUInt64>() });
+            return dictionary->has({key_column}, {std::make_shared<DataTypeUInt64>()});
         }
         else if (dictionary_identifier_type == DictionaryIdentifierType::complex)
         {
-            /// TODO: Check if column is tuple and pass
-            return nullptr;
+            /// Functions in external dictionaries_loader only support full-value (not constant) columns with keys.
+            ColumnPtr key_column_full = key_column_with_type.column->convertToFullColumnIfConst();
+
+            const auto & key_columns = typeid_cast<const ColumnTuple &>(*key_column_full).getColumnsCopy();
+            const auto & key_types = static_cast<const DataTypeTuple &>(*key_column_with_type.type).getElements();
+
+            return dictionary->has(key_columns, key_types);
         }
         else
         {
+            /// TODO: Add support for range
             return nullptr;
         }
     }
@@ -198,13 +204,6 @@ private:
     mutable FunctionDictHelper helper;
 };
 
-
-/** For ColumnVector. Either returns a reference to internal data,
-  *  or convert it to T type, stores the result in backup_storage and returns a reference to it.
-  */
-template <typename T>
-static const PaddedPODArray<T> & getColumnDataAsPaddedPODArray(const IColumn & column, PaddedPODArray<T> & backup_storage);
-
 enum class DictionaryGetFunctionType
 {
     withoutDefault,
@@ -232,12 +231,9 @@ public:
     String getName() const override { return name; }
 
 private:
-    size_t getNumberOfArguments() const override {
-        /// TODO: Check if ranged dictionary is working
-        return dictionary_get_function_type == DictionaryGetFunctionType::withoutDefault ? 0 : 4; 
-    }
+    size_t getNumberOfArguments() const override { return 0; }
 
-    bool isVariadic() const override { return dictionary_get_function_type == DictionaryGetFunctionType::withoutDefault; }
+    bool isVariadic() const override { return true; }
 
     bool useDefaultImplementationForConstants() const final { return true; }
 
@@ -245,38 +241,8 @@ private:
 
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const final { return {0, 1}; }
 
-    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    DataTypePtr getReturnTypeImpl(const DataTypes &) 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};
-
-        if (!isString(arguments[1]))
-            throw Exception{"Illegal type " + arguments[1]->getName() + " of second argument of function " + getName()
-                + ", expected a string.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
-
-        if (!WhichDataType(arguments[2]).isUInt64() &&
-            !isTuple(arguments[2]))
-            throw Exception{"Illegal type " + arguments[2]->getName() + " of third argument of function " + getName()
-                + ", must be UInt64 or tuple(...).", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
-
-        if constexpr (dictionary_get_function_type == DictionaryGetFunctionType::withDefault)
-        {
-            if (!checkAndGetDataType<DataType>(arguments[3].get()))
-                throw Exception{"Illegal type " + arguments[3]->getName() + " of fourth argument of function " + getName()
-                    + ", must be " + TypeName<Type>::get() + ".", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
-        }
-        else
-        {
-            /// This is for the case of range dictionaries_loader.
-            if (arguments.size() == 4 && !arguments[3]->isValueRepresentedByInteger())
-            {
-                throw Exception{"Illegal type " + arguments[3]->getName() +
-                                " of fourth argument of function " + getName() +
-                                " must be convertible to Int64.", ErrorCodes::ILLEGAL_COLUMN};
-            }
-        }
-
         if constexpr (IsDataTypeDecimal<DataType>)
             return std::make_shared<DataType>(DataType::maxPrecision(), decimal_scale);
         else
@@ -285,11 +251,21 @@ private:
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
+        if (arguments.size() < 3)
+            throw Exception{"Wrong argument count for function " + getName(), ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+
         if (input_rows_count == 0)
             return result_type->createColumn();
 
-        auto dictionary = helper.getDictionary(arguments[0]);
-        ColumnPtr res;
+        const auto * dictionary_name_col = checkAndGetColumnConst<ColumnString>(arguments[0].column.get());
+        if (!dictionary_name_col)
+            throw Exception{"First argument of function " + getName() + " must be a constant string", ErrorCodes::ILLEGAL_COLUMN};
+
+        String dictionary_name = dictionary_name_col->getValue<String>();
+
+        auto dictionary = helper.getDictionary(dictionary_name);
+        if (!dictionary)
+            throw Exception("First argument of function " + getName() + " does not name a dictionary", ErrorCodes::ILLEGAL_COLUMN);
 
         const auto * attr_name_col = checkAndGetColumnConst<ColumnString>(arguments[1].column.get());
         if (!attr_name_col)
@@ -297,21 +273,57 @@ private:
 
         String attr_name = attr_name_col->getValue<String>();
 
-        const ColumnWithTypeAndName & key_col_with_type = arguments[2];
-        const auto key_column = key_col_with_type.column;
+        /// TODO: Use accurateCast if argument is integer
+        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};
 
         auto dictionary_identifier_type = dictionary->getIdentifierType();
-        
+
+        size_t current_arguments_index = 3;
+
+        /// TODO: Add more information to error messages
+
+        ColumnPtr range_col = nullptr;
+        DataTypePtr range_col_type = nullptr;
+
+        if (dictionary_identifier_type == DictionaryIdentifierType::range)
+        {
+            if (current_arguments_index >= arguments.size())
+                throw Exception{"Wrong argument count for function " + getName(), ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+
+            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};
+
+            ++current_arguments_index;
+        }
+
         ColumnPtr default_col = nullptr;
 
         if (dictionary_get_function_type == DictionaryGetFunctionType::withDefault)
         {
-            default_col = arguments[3].column;
+            if (current_arguments_index >= arguments.size())
+                throw Exception{"Wrong argument count for function test " + getName(), ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+
+            default_col = arguments[current_arguments_index].column;
         }
 
+        ColumnPtr res;
+
+        const ColumnWithTypeAndName & key_col_with_type = arguments[2];
+        const auto key_column = key_col_with_type.column;
+
         if (dictionary_identifier_type == DictionaryIdentifierType::simple)
         {
-            res = dictionary->getColumn(attr_name, result_type, { key_column }, { std::make_shared<DataTypeUInt64>() }, default_col);
+            res = dictionary->getColumn(attr_name, result_type, {key_column}, {std::make_shared<DataTypeUInt64>()}, default_col);
         }
         else if (dictionary_identifier_type == DictionaryIdentifierType::complex)
         {
@@ -323,10 +335,13 @@ private:
 
             res = dictionary->getColumn(attr_name, result_type, key_columns, key_types, default_col);
         }
-        else
+        else if (dictionary_identifier_type == DictionaryIdentifierType::range)
         {
-            res = nullptr;
+            res = dictionary->getColumn(
+                attr_name, result_type, {key_column, range_col}, {std::make_shared<DataTypeUInt64>(), range_col_type}, default_col);
         }
+        else
+            throw Exception{"Unknown dictionary identifier type", ErrorCodes::BAD_ARGUMENTS};
 
         return res;
     }
@@ -416,10 +431,11 @@ using FunctionDictGetStringOrDefault = FunctionDictGetOrDefault<DataTypeString,
 
 /// TODO: Use new API
 /// This variant of function derives the result type automatically.
+template <DictionaryGetFunctionType dictionary_get_function_type>
 class FunctionDictGetNoType final : public IFunction
 {
 public:
-    static constexpr auto name = "dictGet";
+    static constexpr auto name = dictionary_get_function_type == DictionaryGetFunctionType::withDefault ? "dictGetOrDefault" : "dictGet";
 
     static FunctionPtr create(const Context & context)
     {
@@ -437,6 +453,8 @@ private:
     bool useDefaultImplementationForConstants() const final { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const final { return {0, 1}; }
 
+    bool isDeterministic() const override { return false; }
+
     bool isInjective(const ColumnsWithTypeAndName & sample_columns) const override
     {
         return helper.isDictGetFunctionInjective(sample_columns);
@@ -444,8 +462,8 @@ private:
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
-        if (arguments.size() != 3 && arguments.size() != 4)
-            throw Exception{"Function " + getName() + " takes 3 or 4 arguments", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+        if (arguments.size() < 3)
+            throw Exception{"Wrong argument count for function " + getName(), ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
 
         String dict_name;
         if (const auto * name_col = checkAndGetColumnConst<ColumnString>(arguments[0].column.get()))
@@ -465,29 +483,20 @@ private:
             throw Exception{"Illegal type " + arguments[1].type->getName() + " of second argument of function " + getName()
                 + ", expected a const string.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
 
-        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};
-
-        if (arguments.size() == 4)
-        {
-            const auto * range_argument = arguments[3].type.get();
-            if (!(range_argument->isValueRepresentedByInteger() &&
-                   range_argument->getSizeOfValueInMemory() <= sizeof(Int64)))
-                throw Exception{"Illegal type " + range_argument->getName() + " of fourth argument of function " + getName()
-                    + ", must be convertible to " + TypeName<Int64>::get() + ".", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
-        }
-
         auto dict = helper.getDictionary(dict_name);
         const DictionaryStructure & structure = dict->getStructure();
 
-        for (const auto idx : ext::range(0, structure.attributes.size()))
+        for (const auto& attribute : structure.attributes)
         {
-            const DictionaryAttribute & attribute = structure.attributes[idx];
-            if (attribute.name == attr_name)
+            if (attribute.name != attr_name)
+            {
+                continue;
+            }
+
+            WhichDataType dt = attribute.type;
+
+            if constexpr (dictionary_get_function_type == DictionaryGetFunctionType::withoutDefault)
             {
-                WhichDataType dt = attribute.type;
                 switch (dt.idx)
                 {
                     case TypeIndex::String:
@@ -545,90 +554,9 @@ private:
                     default:
                         throw Exception("Unknown dictGet type", ErrorCodes::UNKNOWN_TYPE);
                 }
-                return attribute.type;
             }
-        }
-        throw Exception{"No such attribute '" + attr_name + "'", ErrorCodes::BAD_ARGUMENTS};
-    }
-
-    bool isDeterministic() const override { return false; }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
-    {
-        return impl->executeImpl(arguments, result_type, input_rows_count);
-    }
-
-    const Context & context;
-    mutable FunctionDictHelper helper;
-    mutable FunctionPtr impl; // underlying function used by dictGet function without explicit type info
-};
-
-
-class FunctionDictGetNoTypeOrDefault final : public IFunction
-{
-public:
-    static constexpr auto name = "dictGetOrDefault";
-
-    static FunctionPtr create(const Context & context)
-    {
-        return std::make_shared<FunctionDictGetNoTypeOrDefault>(context);
-    }
-
-    explicit FunctionDictGetNoTypeOrDefault(const Context & context_) : context(context_), helper(context_) {}
-
-    String getName() const override { return name; }
-
-private:
-    size_t getNumberOfArguments() const override { return 4; }
-
-    bool useDefaultImplementationForConstants() const final { return true; }
-    ColumnNumbers getArgumentsThatAreAlwaysConstant() const final { return {0, 1}; }
-
-    bool isInjective(const ColumnsWithTypeAndName & sample_columns) const override
-    {
-        return helper.isDictGetFunctionInjective(sample_columns);
-    }
-
-    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
-    {
-        String dict_name;
-        if (const auto * name_col = checkAndGetColumnConst<ColumnString>(arguments[0].column.get()))
-        {
-            dict_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};
-
-        String attr_name;
-        if (const auto * name_col = checkAndGetColumnConst<ColumnString>(arguments[1].column.get()))
-        {
-            attr_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};
-
-        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};
-
-        auto dict = helper.getDictionary(dict_name);
-        const DictionaryStructure & structure = dict->getStructure();
-
-        for (const auto idx : ext::range(0, structure.attributes.size()))
-        {
-            const DictionaryAttribute & attribute = structure.attributes[idx];
-            if (attribute.name == attr_name)
+            else
             {
-                auto arg_type = arguments[3].type;
-                WhichDataType dt = attribute.type;
-
-                if ((arg_type->getTypeId() != dt.idx) || (dt.isStringOrFixedString() && !isString(arg_type)))
-                    throw Exception{"Illegal type " + arg_type->getName() + " of fourth argument of function " + getName() +
-                        ", must be " + getTypeName(dt.idx) + ".", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
-
                 switch (dt.idx)
                 {
                     case TypeIndex::String:
@@ -685,15 +613,14 @@ private:
                     default:
                         throw Exception("Unknown dictGetOrDefault type", ErrorCodes::UNKNOWN_TYPE);
                 }
-
-                return attribute.type;
             }
+
+            return attribute.type;
         }
+
         throw Exception{"No such attribute '" + attr_name + "'", ErrorCodes::BAD_ARGUMENTS};
     }
 
-    bool isDeterministic() const override { return false; }
-
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         return impl->executeImpl(arguments, result_type, input_rows_count);
@@ -1004,27 +931,4 @@ private:
     mutable FunctionDictHelper helper;
 };
 
-
-template <typename T>
-static const PaddedPODArray<T> & getColumnDataAsPaddedPODArray(const IColumn & column, PaddedPODArray<T> & backup_storage)
-{
-    if (!isColumnConst(column))
-    {
-        if (const auto vector_col = checkAndGetColumn<ColumnVector<T>>(&column))
-        {
-            return vector_col->getData();
-        }
-    }
-
-    const auto full_column = column.convertToFullColumnIfConst();
-
-    // With type conversion and const columns we need to use backup storage here
-    const auto size = full_column->size();
-    backup_storage.resize(size);
-    for (size_t i = 0; i < size; ++i)
-        backup_storage[i] = full_column->getUInt(i);
-
-    return backup_storage;
-}
-
 }

From cc767d4f2e354fd7ea2a5f4783102f86bb1b3d22 Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Mon, 21 Dec 2020 17:39:15 +0300
Subject: [PATCH 526/611] Updated HashedDictionary to new interface

---
 src/Dictionaries/FlatDictionary.cpp   |   5 +-
 src/Dictionaries/HashedDictionary.cpp | 586 ++++++++++----------------
 src/Dictionaries/HashedDictionary.h   |  79 +---
 3 files changed, 243 insertions(+), 427 deletions(-)

diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index 58e54931dee..790c0100d24 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -109,10 +109,9 @@ ColumnPtr FlatDictionary::getColumn(
         const std::string& attribute_name,
         const DataTypePtr &,
         const Columns & key_columns,
-        const DataTypes & key_types,
+        const DataTypes &,
         const ColumnPtr default_untyped) const
 {
-    dict_struct.validateKeyTypes(key_types);
     ColumnPtr result;
 
     PaddedPODArray<Key> backup_storage;
@@ -263,8 +262,6 @@ ColumnPtr FlatDictionary::getColumn(
 
 ColumnUInt8::Ptr FlatDictionary::has(const Columns & key_columns, const DataTypes &) const
 {
-    assert(!key_columns.empty());
-
     PaddedPODArray<Key> backup_storage;
     const auto& ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
 
diff --git a/src/Dictionaries/HashedDictionary.cpp b/src/Dictionaries/HashedDictionary.cpp
index 34fa227e546..3034d585f88 100644
--- a/src/Dictionaries/HashedDictionary.cpp
+++ b/src/Dictionaries/HashedDictionary.cpp
@@ -4,7 +4,8 @@
 #include "DictionaryFactory.h"
 #include "ClickHouseDictionarySource.h"
 #include <Core/Defines.h>
-
+#include <Functions/FunctionHelpers.h>
+#include <Columns/ColumnsNumber.h>
 
 namespace
 {
@@ -125,183 +126,185 @@ void HashedDictionary::isInConstantVector(const Key child_id, const PaddedPODArr
     isInImpl(child_id, ancestor_ids, out);
 }
 
-
-#define DECLARE(TYPE) \
-    void HashedDictionary::get##TYPE(const std::string & attribute_name, const PaddedPODArray<Key> & ids, ResultArrayType<TYPE> & out) \
-        const \
-    { \
-        const auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-\
-        const auto null_value = std::get<TYPE>(attribute.null_values); \
-\
-        getItemsImpl<TYPE, TYPE>( \
-            attribute, ids, [&](const size_t row, const auto value) { out[row] = value; }, [&](const size_t) { return null_value; }); \
-    }
-DECLARE(UInt8)
-DECLARE(UInt16)
-DECLARE(UInt32)
-DECLARE(UInt64)
-DECLARE(UInt128)
-DECLARE(Int8)
-DECLARE(Int16)
-DECLARE(Int32)
-DECLARE(Int64)
-DECLARE(Float32)
-DECLARE(Float64)
-DECLARE(Decimal32)
-DECLARE(Decimal64)
-DECLARE(Decimal128)
-#undef DECLARE
-
-void HashedDictionary::getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, ColumnString * out) const
+ColumnPtr HashedDictionary::getColumn(
+    const std::string & attribute_name,
+    const DataTypePtr &,
+    const Columns & key_columns,
+    const DataTypes &,
+    const ColumnPtr default_untyped) const
 {
+    // dict_struct.validateKeyTypes(key_types);
+    ColumnPtr result;
+
+    PaddedPODArray<Key> backup_storage;
+    const auto& ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
+    
     const auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
 
-    const auto & null_value = StringRef{std::get<String>(attribute.null_values)};
+    /// TODO: Check that attribute type is same as result type
+    /// TODO: Check if const will work as expected
 
-    getItemsImpl<StringRef, StringRef>(
-        attribute,
-        ids,
-        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-        [&](const size_t) { return null_value; });
+    auto type_call = [&](const auto &dictionary_attribute_type)
+    {
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
+
+        auto size = ids.size();
+
+        if constexpr (std::is_same_v<AttributeType, String>)
+        {
+            auto column_string = ColumnString::create();
+            auto out = column_string.get();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                {
+                    getItemsImpl<StringRef, StringRef>(
+                        attribute,
+                        ids,
+                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                        [&](const size_t row) { return default_col->getDataAt(row); });
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<String>();
+
+                    getItemsImpl<StringRef, StringRef>(
+                        attribute,
+                        ids,
+                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                        [&](const size_t) { return def; });
+                }
+            }
+            else
+            {
+                const auto & null_value = std::get<StringRef>(attribute.null_values);
+
+                getItemsImpl<StringRef, StringRef>(
+                    attribute,
+                    ids,
+                    [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                    [&](const size_t) { return null_value; });
+            }
+
+            result = std::move(column_string);
+        }
+        else if constexpr (IsNumber<AttributeType>)
+        {
+            auto column = ColumnVector<AttributeType>::create(size);
+            auto& out = column->getData();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnVector<AttributeType>>(*default_untyped))
+                {
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        ids,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row) { return default_col->getData()[row]; }
+                    );
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnVector<AttributeType>>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<AttributeType>();
+
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        ids,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t) { return def; }
+                    );
+                }
+            }
+            else
+            {
+                const auto null_value = std::get<AttributeType>(attribute.null_values);
+
+                getItemsImpl<AttributeType, AttributeType>(
+                    attribute,
+                    ids,
+                    [&](const size_t row, const auto value) { return out[row] = value; },
+                    [&](const size_t) { return null_value; });
+            }
+
+            result = std::move(column);
+        }
+        else if constexpr (IsDecimalNumber<AttributeType>)
+        {
+            // auto scale = getDecimalScale(*attribute.type);
+            auto column = ColumnDecimal<AttributeType>::create(size, 0);
+            auto& out = column->getData();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnDecimal<AttributeType>>(*default_untyped))
+                {
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        ids,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row) { return default_col->getData()[row]; }
+                    );
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnDecimal<AttributeType>>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<AttributeType>();
+
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        ids,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t) { return def; }
+                    );
+                }
+            }
+            else
+            {
+                const auto null_value = std::get<AttributeType>(attribute.null_values);
+
+                getItemsImpl<AttributeType, AttributeType>(
+                    attribute,
+                    ids,
+                    [&](const size_t row, const auto value) { return out[row] = value; },
+                    [&](const size_t) { return null_value; }
+                );
+            }
+
+            result = std::move(column);
+        }
+    };
+
+    callOnDictionaryAttributeType(attribute.type, type_call);
+   
+    return result;
 }
 
-#define DECLARE(TYPE) \
-    void HashedDictionary::get##TYPE( \
-        const std::string & attribute_name, \
-        const PaddedPODArray<Key> & ids, \
-        const PaddedPODArray<TYPE> & def, \
-        ResultArrayType<TYPE> & out) const \
-    { \
-        const auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-\
-        getItemsImpl<TYPE, TYPE>( \
-            attribute, ids, [&](const size_t row, const auto value) { out[row] = value; }, [&](const size_t row) { return def[row]; }); \
-    }
-DECLARE(UInt8)
-DECLARE(UInt16)
-DECLARE(UInt32)
-DECLARE(UInt64)
-DECLARE(UInt128)
-DECLARE(Int8)
-DECLARE(Int16)
-DECLARE(Int32)
-DECLARE(Int64)
-DECLARE(Float32)
-DECLARE(Float64)
-DECLARE(Decimal32)
-DECLARE(Decimal64)
-DECLARE(Decimal128)
-#undef DECLARE
-
-void HashedDictionary::getString(
-    const std::string & attribute_name, const PaddedPODArray<Key> & ids, const ColumnString * const def, ColumnString * const out) const
+ColumnUInt8::Ptr HashedDictionary::has(const Columns & key_columns, const DataTypes &) const
 {
-    const auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
+    PaddedPODArray<Key> backup_storage;
+    const auto& ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
 
-    getItemsImpl<StringRef, StringRef>(
-        attribute,
-        ids,
-        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-        [&](const size_t row) { return def->getDataAt(row); });
-}
+    size_t ids_count = ext::size(ids);
 
-#define DECLARE(TYPE) \
-    void HashedDictionary::get##TYPE( \
-        const std::string & attribute_name, const PaddedPODArray<Key> & ids, const TYPE & def, ResultArrayType<TYPE> & out) const \
-    { \
-        const auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-\
-        getItemsImpl<TYPE, TYPE>( \
-            attribute, ids, [&](const size_t row, const auto value) { out[row] = value; }, [&](const size_t) { return def; }); \
-    }
-DECLARE(UInt8)
-DECLARE(UInt16)
-DECLARE(UInt32)
-DECLARE(UInt64)
-DECLARE(UInt128)
-DECLARE(Int8)
-DECLARE(Int16)
-DECLARE(Int32)
-DECLARE(Int64)
-DECLARE(Float32)
-DECLARE(Float64)
-DECLARE(Decimal32)
-DECLARE(Decimal64)
-DECLARE(Decimal128)
-#undef DECLARE
+    auto result = ColumnUInt8::create(ext::size(ids));
+    auto& out = result->getData();
 
-void HashedDictionary::getString(
-    const std::string & attribute_name, const PaddedPODArray<Key> & ids, const String & def, ColumnString * const out) const
-{
-    const auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
-
-    getItemsImpl<StringRef, StringRef>(
-        attribute,
-        ids,
-        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-        [&](const size_t) { return StringRef{def}; });
-}
-
-void HashedDictionary::has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const
-{
     const auto & attribute = attributes.front();
 
-    switch (attribute.type)
+    auto type_call = [&](const auto & dictionary_attribute_type)
     {
-        case AttributeUnderlyingType::utUInt8:
-            has<UInt8>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utUInt16:
-            has<UInt16>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utUInt32:
-            has<UInt32>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utUInt64:
-            has<UInt64>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utUInt128:
-            has<UInt128>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utInt8:
-            has<Int8>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utInt16:
-            has<Int16>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utInt32:
-            has<Int32>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utInt64:
-            has<Int64>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utFloat32:
-            has<Float32>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utFloat64:
-            has<Float64>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utString:
-            has<StringRef>(attribute, ids, out);
-            break;
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
+        has<AttributeType>(attribute, ids, out);
+    };
 
-        case AttributeUnderlyingType::utDecimal32:
-            has<Decimal32>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utDecimal64:
-            has<Decimal64>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utDecimal128:
-            has<Decimal128>(attribute, ids, out);
-            break;
-    }
+    callOnDictionaryAttributeType(attribute.type, type_call);
+
+    query_count.fetch_add(ids_count, std::memory_order_relaxed);
+
+    return result;
 }
 
 void HashedDictionary::createAttributes()
@@ -429,6 +432,13 @@ void HashedDictionary::resize(Attribute & attribute, size_t added_rows)
         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)
@@ -436,56 +446,14 @@ void HashedDictionary::resize(size_t added_rows)
 
     for (auto & attribute : attributes)
     {
-        switch (attribute.type)
+        auto type_call = [&](const auto & dictionary_attribute_type)
         {
-            case AttributeUnderlyingType::utUInt8:
-                resize<UInt8>(attribute, added_rows);
-                break;
-            case AttributeUnderlyingType::utUInt16:
-                resize<UInt16>(attribute, added_rows);
-                break;
-            case AttributeUnderlyingType::utUInt32:
-                resize<UInt32>(attribute, added_rows);
-                break;
-            case AttributeUnderlyingType::utUInt64:
-                resize<UInt64>(attribute, added_rows);
-                break;
-            case AttributeUnderlyingType::utUInt128:
-                resize<UInt128>(attribute, added_rows);
-                break;
-            case AttributeUnderlyingType::utInt8:
-                resize<Int8>(attribute, added_rows);
-                break;
-            case AttributeUnderlyingType::utInt16:
-                resize<Int16>(attribute, added_rows);
-                break;
-            case AttributeUnderlyingType::utInt32:
-                resize<Int32>(attribute, added_rows);
-                break;
-            case AttributeUnderlyingType::utInt64:
-                resize<Int64>(attribute, added_rows);
-                break;
-            case AttributeUnderlyingType::utFloat32:
-                resize<Float32>(attribute, added_rows);
-                break;
-            case AttributeUnderlyingType::utFloat64:
-                resize<Float64>(attribute, added_rows);
-                break;
+            using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+            using AttributeType = typename Type::AttributeType;
+            resize<AttributeType>(attribute, added_rows);
+        };
 
-            case AttributeUnderlyingType::utDecimal32:
-                resize<Decimal32>(attribute, added_rows);
-                break;
-            case AttributeUnderlyingType::utDecimal64:
-                resize<Decimal64>(attribute, added_rows);
-                break;
-            case AttributeUnderlyingType::utDecimal128:
-                resize<Decimal128>(attribute, added_rows);
-                break;
-
-            case AttributeUnderlyingType::utString:
-                resize<StringRef>(attribute, added_rows);
-                break;
-        }
+        callOnDictionaryAttributeType(attribute.type, type_call);
     }
 }
 
@@ -562,66 +530,27 @@ void HashedDictionary::addAttributeSize(const Attribute & attribute)
     }
 }
 
+template <>
+void HashedDictionary::addAttributeSize<String>(const Attribute & attribute)
+{
+    addAttributeSize<StringRef>(attribute);
+    bytes_allocated += sizeof(Arena) + attribute.string_arena->size();
+}
+
 void HashedDictionary::calculateBytesAllocated()
 {
     bytes_allocated += attributes.size() * sizeof(attributes.front());
 
     for (const auto & attribute : attributes)
     {
-        switch (attribute.type)
+        auto type_call = [&](const auto & dictionary_attribute_type)
         {
-            case AttributeUnderlyingType::utUInt8:
-                addAttributeSize<UInt8>(attribute);
-                break;
-            case AttributeUnderlyingType::utUInt16:
-                addAttributeSize<UInt16>(attribute);
-                break;
-            case AttributeUnderlyingType::utUInt32:
-                addAttributeSize<UInt32>(attribute);
-                break;
-            case AttributeUnderlyingType::utUInt64:
-                addAttributeSize<UInt64>(attribute);
-                break;
-            case AttributeUnderlyingType::utUInt128:
-                addAttributeSize<UInt128>(attribute);
-                break;
-            case AttributeUnderlyingType::utInt8:
-                addAttributeSize<Int8>(attribute);
-                break;
-            case AttributeUnderlyingType::utInt16:
-                addAttributeSize<Int16>(attribute);
-                break;
-            case AttributeUnderlyingType::utInt32:
-                addAttributeSize<Int32>(attribute);
-                break;
-            case AttributeUnderlyingType::utInt64:
-                addAttributeSize<Int64>(attribute);
-                break;
-            case AttributeUnderlyingType::utFloat32:
-                addAttributeSize<Float32>(attribute);
-                break;
-            case AttributeUnderlyingType::utFloat64:
-                addAttributeSize<Float64>(attribute);
-                break;
+            using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+            using AttributeType = typename Type::AttributeType;
+            addAttributeSize<AttributeType>(attribute);
+        };
 
-            case AttributeUnderlyingType::utDecimal32:
-                addAttributeSize<Decimal32>(attribute);
-                break;
-            case AttributeUnderlyingType::utDecimal64:
-                addAttributeSize<Decimal64>(attribute);
-                break;
-            case AttributeUnderlyingType::utDecimal128:
-                addAttributeSize<Decimal128>(attribute);
-                break;
-
-            case AttributeUnderlyingType::utString:
-            {
-                addAttributeSize<StringRef>(attribute);
-                bytes_allocated += sizeof(Arena) + attribute.string_arena->size();
-
-                break;
-            }
-        }
+        callOnDictionaryAttributeType(attribute.type, type_call);
     }
 }
 
@@ -635,67 +564,32 @@ void HashedDictionary::createAttributeImpl(Attribute & attribute, const Field &
         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::createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value)
 {
     Attribute attr{type, {}, {}, {}, {}};
 
-    switch (type)
+    auto type_call = [&](const auto &dictionary_attribute_type)
     {
-        case AttributeUnderlyingType::utUInt8:
-            createAttributeImpl<UInt8>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt16:
-            createAttributeImpl<UInt16>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt32:
-            createAttributeImpl<UInt32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt64:
-            createAttributeImpl<UInt64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt128:
-            createAttributeImpl<UInt128>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt8:
-            createAttributeImpl<Int8>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt16:
-            createAttributeImpl<Int16>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt32:
-            createAttributeImpl<Int32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt64:
-            createAttributeImpl<Int64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utFloat32:
-            createAttributeImpl<Float32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utFloat64:
-            createAttributeImpl<Float64>(attr, null_value);
-            break;
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
+        createAttributeImpl<AttributeType>(attr, null_value);
+    };
 
-        case AttributeUnderlyingType::utDecimal32:
-            createAttributeImpl<Decimal32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utDecimal64:
-            createAttributeImpl<Decimal64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utDecimal128:
-            createAttributeImpl<Decimal128>(attr, null_value);
-            break;
-
-        case AttributeUnderlyingType::utString:
-        {
-            attr.null_values = null_value.get<String>();
-            if (!sparse)
-                attr.maps = std::make_unique<CollectionType<StringRef>>();
-            else
-                attr.sparse_maps = std::make_unique<SparseCollectionType<StringRef>>();
-            attr.string_arena = std::make_unique<Arena>();
-            break;
-        }
-    }
+    callOnDictionaryAttributeType(type, type_call);
 
     return attr;
 }
@@ -811,8 +705,12 @@ void HashedDictionary::has(const Attribute & attribute, const PaddedPODArray<Key
 
     for (const auto i : ext::range(0, rows))
         out[i] = attr.find(ids[i]) != nullptr;
+}
 
-    query_count.fetch_add(rows, std::memory_order_relaxed);
+template <>
+void HashedDictionary::has<String>(const Attribute & attribute, const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const
+{
+    has<StringRef>(attribute, ids, out);
 }
 
 template <typename T, typename AttrType>
@@ -833,45 +731,27 @@ PaddedPODArray<HashedDictionary::Key> HashedDictionary::getIds(const Attribute &
     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;
 
-    switch (attribute.type)
+    auto type_call = [&](const auto &dictionary_attribute_type)
     {
-        case AttributeUnderlyingType::utUInt8:
-            return getIds<UInt8>(attribute);
-        case AttributeUnderlyingType::utUInt16:
-            return getIds<UInt16>(attribute);
-        case AttributeUnderlyingType::utUInt32:
-            return getIds<UInt32>(attribute);
-        case AttributeUnderlyingType::utUInt64:
-            return getIds<UInt64>(attribute);
-        case AttributeUnderlyingType::utUInt128:
-            return getIds<UInt128>(attribute);
-        case AttributeUnderlyingType::utInt8:
-            return getIds<Int8>(attribute);
-        case AttributeUnderlyingType::utInt16:
-            return getIds<Int16>(attribute);
-        case AttributeUnderlyingType::utInt32:
-            return getIds<Int32>(attribute);
-        case AttributeUnderlyingType::utInt64:
-            return getIds<Int64>(attribute);
-        case AttributeUnderlyingType::utFloat32:
-            return getIds<Float32>(attribute);
-        case AttributeUnderlyingType::utFloat64:
-            return getIds<Float64>(attribute);
-        case AttributeUnderlyingType::utString:
-            return getIds<StringRef>(attribute);
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
+        result = getIds<AttributeType>(attribute);
+    };
 
-        case AttributeUnderlyingType::utDecimal32:
-            return getIds<Decimal32>(attribute);
-        case AttributeUnderlyingType::utDecimal64:
-            return getIds<Decimal64>(attribute);
-        case AttributeUnderlyingType::utDecimal128:
-            return getIds<Decimal128>(attribute);
-    }
-    return PaddedPODArray<Key>();
+    callOnDictionaryAttributeType(attribute.type, type_call);
+
+    return result;
 }
 
 BlockInputStreamPtr HashedDictionary::getBlockInputStream(const Names & column_names, size_t max_block_size) const
diff --git a/src/Dictionaries/HashedDictionary.h b/src/Dictionaries/HashedDictionary.h
index b3d1c16ed26..ff64fb29f1f 100644
--- a/src/Dictionaries/HashedDictionary.h
+++ b/src/Dictionaries/HashedDictionary.h
@@ -66,77 +66,16 @@ public:
 
     void toParent(const PaddedPODArray<Key> & ids, PaddedPODArray<Key> & out) const override;
 
-    template <typename T>
-    using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
+    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::simple; }
 
-#define DECLARE(TYPE) \
-    void get##TYPE(const std::string & attribute_name, const PaddedPODArray<Key> & ids, ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
+    ColumnPtr getColumn(
+        const std::string& attribute_name,
+        const DataTypePtr & result_type,
+        const Columns & key_columns,
+        const DataTypes & key_types,
+        const ColumnPtr default_untyped) const override;
 
-    void getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, ColumnString * out) const;
-
-#define DECLARE(TYPE) \
-    void get##TYPE( \
-        const std::string & attribute_name, \
-        const PaddedPODArray<Key> & ids, \
-        const PaddedPODArray<TYPE> & def, \
-        ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void
-    getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, const ColumnString * const def, ColumnString * const out)
-        const;
-
-#define DECLARE(TYPE) \
-    void get##TYPE(const std::string & attribute_name, const PaddedPODArray<Key> & ids, const TYPE & def, ResultArrayType<TYPE> & out) \
-        const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, const String & def, ColumnString * const out) const;
-
-    void has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const;
+    ColumnUInt8::Ptr has(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;
@@ -180,7 +119,7 @@ private:
             Decimal128,
             Float32,
             Float64,
-            String>
+            StringRef>
             null_values;
         std::variant<
             CollectionPtrType<UInt8>,

From cd6ec3234e0ab9e37c297970de1caa27c6105b99 Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Sun, 27 Dec 2020 19:44:40 +0300
Subject: [PATCH 527/611] Updated DirectDictionary to new interface

---
 src/Dictionaries/DirectDictionary.cpp | 473 ++++++++++++--------------
 src/Dictionaries/DirectDictionary.h   |  79 +----
 2 files changed, 225 insertions(+), 327 deletions(-)

diff --git a/src/Dictionaries/DirectDictionary.cpp b/src/Dictionaries/DirectDictionary.cpp
index 1fbfcc07215..e101055aa5c 100644
--- a/src/Dictionaries/DirectDictionary.cpp
+++ b/src/Dictionaries/DirectDictionary.cpp
@@ -3,7 +3,7 @@
 #include "DictionaryBlockInputStream.h"
 #include "DictionaryFactory.h"
 #include <Core/Defines.h>
-
+#include <Functions/FunctionHelpers.h>
 
 namespace DB
 {
@@ -128,184 +128,218 @@ void DirectDictionary::isInConstantVector(const Key child_id, const PaddedPODArr
     isInImpl(child_id, ancestor_ids, out);
 }
 
-
-#define DECLARE(TYPE) \
-    void DirectDictionary::get##TYPE(const std::string & attribute_name, const PaddedPODArray<Key> & ids, ResultArrayType<TYPE> & out) const \
-    { \
-        const auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-\
-        const auto null_value = std::get<TYPE>(attribute.null_values); \
-\
-        getItemsImpl<TYPE, TYPE>( \
-            attribute, ids, [&](const size_t row, const auto value) { out[row] = value; }, [&](const size_t) { return null_value; }); \
-    }
-DECLARE(UInt8)
-DECLARE(UInt16)
-DECLARE(UInt32)
-DECLARE(UInt64)
-DECLARE(UInt128)
-DECLARE(Int8)
-DECLARE(Int16)
-DECLARE(Int32)
-DECLARE(Int64)
-DECLARE(Float32)
-DECLARE(Float64)
-DECLARE(Decimal32)
-DECLARE(Decimal64)
-DECLARE(Decimal128)
-#undef DECLARE
-
-void DirectDictionary::getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, ColumnString * out) const
+ColumnPtr DirectDictionary::getColumn(
+        const std::string& attribute_name,
+        const DataTypePtr &,
+        const Columns & key_columns,
+        const DataTypes &,
+        const ColumnPtr default_untyped) const
 {
+    ColumnPtr result;
+
+    PaddedPODArray<Key> backup_storage;
+    const auto& ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
+    
     const auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
 
-    const auto & null_value = std::get<StringRef>(attribute.null_values);
-    getItemsStringImpl<StringRef, StringRef>(
-        attribute,
-        ids,
-        [&](const size_t, const String value) { const auto ref = StringRef{value}; out->insertData(ref.data, ref.size); },
-        [&](const size_t) { return String(null_value.data, null_value.size); });
-}
+    /// TODO: Check that attribute type is same as result type
+    /// TODO: Check if const will work as expected
 
-#define DECLARE(TYPE) \
-    void DirectDictionary::get##TYPE( \
-        const std::string & attribute_name, \
-        const PaddedPODArray<Key> & ids, \
-        const PaddedPODArray<TYPE> & def, \
-        ResultArrayType<TYPE> & out) const \
-    { \
-        const auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-\
-        getItemsImpl<TYPE, TYPE>( \
-            attribute, ids, [&](const size_t row, const auto value) { out[row] = value; }, [&](const size_t row) { return def[row]; }); \
-    }
-DECLARE(UInt8)
-DECLARE(UInt16)
-DECLARE(UInt32)
-DECLARE(UInt64)
-DECLARE(UInt128)
-DECLARE(Int8)
-DECLARE(Int16)
-DECLARE(Int32)
-DECLARE(Int64)
-DECLARE(Float32)
-DECLARE(Float64)
-DECLARE(Decimal32)
-DECLARE(Decimal64)
-DECLARE(Decimal128)
-#undef DECLARE
-
-void DirectDictionary::getString(
-    const std::string & attribute_name, const PaddedPODArray<Key> & ids, const ColumnString * const def, ColumnString * const out) const
-{
-    const auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
-
-    getItemsStringImpl<StringRef, StringRef>(
-        attribute,
-        ids,
-        [&](const size_t, const String value) { const auto ref = StringRef{value}; out->insertData(ref.data, ref.size); },
-        [&](const size_t row) { const auto ref = def->getDataAt(row); return String(ref.data, ref.size); });
-}
-
-#define DECLARE(TYPE) \
-    void DirectDictionary::get##TYPE( \
-        const std::string & attribute_name, const PaddedPODArray<Key> & ids, const TYPE def, ResultArrayType<TYPE> & out) const \
-    { \
-        const auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-\
-        getItemsImpl<TYPE, TYPE>( \
-            attribute, ids, [&](const size_t row, const auto value) { out[row] = value; }, [&](const size_t) { return def; }); \
-    }
-DECLARE(UInt8)
-DECLARE(UInt16)
-DECLARE(UInt32)
-DECLARE(UInt64)
-DECLARE(UInt128)
-DECLARE(Int8)
-DECLARE(Int16)
-DECLARE(Int32)
-DECLARE(Int64)
-DECLARE(Float32)
-DECLARE(Float64)
-DECLARE(Decimal32)
-DECLARE(Decimal64)
-DECLARE(Decimal128)
-#undef DECLARE
-
-void DirectDictionary::getString(
-    const std::string & attribute_name, const PaddedPODArray<Key> & ids, const String & def, ColumnString * const out) const
-{
-    const auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
-
-    DirectDictionary::getItemsStringImpl<StringRef, StringRef>(
-        attribute,
-        ids,
-        [&](const size_t, const String value) { const auto ref = StringRef{value}; out->insertData(ref.data, ref.size); },
-        [&](const size_t) { return def; });
-}
-
-
-void DirectDictionary::has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const
-{
-    const auto & attribute = attributes.front();
-
-    switch (attribute.type)
+    auto type_call = [&](const auto &dictionary_attribute_type)
     {
-        case AttributeUnderlyingType::utUInt8:
-            has<UInt8>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utUInt16:
-            has<UInt16>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utUInt32:
-            has<UInt32>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utUInt64:
-            has<UInt64>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utUInt128:
-            has<UInt128>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utInt8:
-            has<Int8>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utInt16:
-            has<Int16>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utInt32:
-            has<Int32>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utInt64:
-            has<Int64>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utFloat32:
-            has<Float32>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utFloat64:
-            has<Float64>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utString:
-            has<String>(attribute, ids, out);
-            break;
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
 
-        case AttributeUnderlyingType::utDecimal32:
-            has<Decimal32>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utDecimal64:
-            has<Decimal64>(attribute, ids, out);
-            break;
-        case AttributeUnderlyingType::utDecimal128:
-            has<Decimal128>(attribute, ids, out);
-            break;
-    }
+        auto size = ids.size();
+
+        if constexpr (std::is_same_v<AttributeType, String>)
+        {
+            auto column_string = ColumnString::create();
+            auto out = column_string.get();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                {
+                    getItemsImpl<String, String>(
+                        attribute,
+                        ids,
+                        [&](const size_t, const String value)
+                        {
+                            const auto ref = StringRef{value};
+                            out->insertData(ref.data, ref.size);
+                        },
+                        [&](const size_t row)
+                        {
+                            const auto ref = default_col->getDataAt(row);
+                            return String(ref.data, ref.size);
+                        });
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<String>();
+
+                    getItemsImpl<String, String>(
+                        attribute,
+                        ids,
+                        [&](const size_t, const String value)
+                        {
+                            const auto ref = StringRef{value};
+                            out->insertData(ref.data, ref.size);
+                        },
+                        [&](const size_t) { return def; });
+                }
+            }
+            else
+            {
+                const auto & null_value = std::get<StringRef>(attribute.null_values);
+
+                getItemsImpl<String, String>(
+                    attribute,
+                    ids,
+                    [&](const size_t, const String value)
+                    {
+                        const auto ref = StringRef{value};
+                        out->insertData(ref.data, ref.size);
+                    },
+                    [&](const size_t) { return String(null_value.data, null_value.size); });
+            }
+
+            result = std::move(column_string);
+        }
+        else if constexpr (IsNumber<AttributeType>)
+        {
+            auto column = ColumnVector<AttributeType>::create(size);
+            auto& out = column->getData();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnVector<AttributeType>>(*default_untyped))
+                {
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        ids,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row) { return default_col->getData()[row]; }
+                    );
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnVector<AttributeType>>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<AttributeType>();
+
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        ids,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t) { return def; }
+                    );
+                }
+            }
+            else
+            {
+                const auto null_value = std::get<AttributeType>(attribute.null_values);
+
+                getItemsImpl<AttributeType, AttributeType>(
+                    attribute,
+                    ids,
+                    [&](const size_t row, const auto value) { return out[row] = value; },
+                    [&](const size_t) { return null_value; });
+            }
+
+            result = std::move(column);
+        }
+        else if constexpr (IsDecimalNumber<AttributeType>)
+        {
+            // auto scale = getDecimalScale(*attribute.type);
+            auto column = ColumnDecimal<AttributeType>::create(size, 0);
+            auto& out = column->getData();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnDecimal<AttributeType>>(*default_untyped))
+                {
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        ids,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row) { return default_col->getData()[row]; }
+                    );
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnDecimal<AttributeType>>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<AttributeType>();
+
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        ids,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t) { return def; }
+                    );
+                }
+            }
+            else
+            {
+                const auto null_value = std::get<AttributeType>(attribute.null_values);
+
+                getItemsImpl<AttributeType, AttributeType>(
+                    attribute,
+                    ids,
+                    [&](const size_t row, const auto value) { return out[row] = value; },
+                    [&](const size_t) { return null_value; }
+                );
+            }
+
+            result = std::move(column);
+        }
+    };
+
+    callOnDictionaryAttributeType(attribute.type, type_call);
+   
+    return result;
 }
 
+ColumnUInt8::Ptr DirectDictionary::has(const Columns & key_columns, const DataTypes &) const
+{
+    PaddedPODArray<Key> backup_storage;
+    const auto& ids = getColumnDataAsPaddedPODArray(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;
+
+        for (const auto row_idx : ext::range(0, id_column.size()))
+        {
+            const auto key = id_column[row_idx].get<UInt64>();
+            has_key[key] = 1;
+        }
+    }
+
+    stream->readSuffix();
+
+    for (const auto row : ext::range(0, rows))
+        out[row] = has_key[ids[row]];
+
+    query_count.fetch_add(rows, std::memory_order_relaxed);
+
+    return result;
+}
 
 void DirectDictionary::createAttributes()
 {
@@ -349,55 +383,14 @@ DirectDictionary::Attribute DirectDictionary::createAttributeWithType(const Attr
 {
     Attribute attr{type, {}, {}, attr_name};
 
-    switch (type)
+    auto type_call = [&](const auto &dictionary_attribute_type)
     {
-        case AttributeUnderlyingType::utUInt8:
-            createAttributeImpl<UInt8>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt16:
-            createAttributeImpl<UInt16>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt32:
-            createAttributeImpl<UInt32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt64:
-            createAttributeImpl<UInt64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt128:
-            createAttributeImpl<UInt128>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt8:
-            createAttributeImpl<Int8>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt16:
-            createAttributeImpl<Int16>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt32:
-            createAttributeImpl<Int32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt64:
-            createAttributeImpl<Int64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utFloat32:
-            createAttributeImpl<Float32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utFloat64:
-            createAttributeImpl<Float64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utString:
-            createAttributeImpl<String>(attr, null_value);
-            break;
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
+        createAttributeImpl<AttributeType>(attr, null_value);
+    };
 
-        case AttributeUnderlyingType::utDecimal32:
-            createAttributeImpl<Decimal32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utDecimal64:
-            createAttributeImpl<Decimal64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utDecimal128:
-            createAttributeImpl<Decimal128>(attr, null_value);
-            break;
-    }
+    callOnDictionaryAttributeType(type, type_call);
 
     return attr;
 }
@@ -427,13 +420,18 @@ void DirectDictionary::getItemsImpl(
 
         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 = *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 (value_by_key.find(key) != value_by_key.end() && attribute.name == attribute_name_by_index.at(attribute_idx))
+                if (value_by_key.find(key) != value_by_key.end())
                 {
                     if (attribute.type == AttributeUnderlyingType::utFloat32)
                     {
@@ -514,43 +512,6 @@ const DirectDictionary::Attribute & DirectDictionary::getAttribute(const std::st
 }
 
 
-template <typename T>
-void DirectDictionary::has(const Attribute &, const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const
-{
-    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;
-
-        for (const auto row_idx : ext::range(0, id_column.size()))
-        {
-            const auto key = id_column[row_idx].get<UInt64>();
-            has_key[key] = 1;
-        }
-    }
-
-    stream->readSuffix();
-
-    for (const auto row : ext::range(0, rows))
-        out[row] = has_key[ids[row]];
-
-    query_count.fetch_add(rows, std::memory_order_relaxed);
-}
-
-
 BlockInputStreamPtr DirectDictionary::getBlockInputStream(const Names & /* column_names */, size_t /* max_block_size */) const
 {
     return source_ptr->loadAll();
diff --git a/src/Dictionaries/DirectDictionary.h b/src/Dictionaries/DirectDictionary.h
index 8b59fe16c69..1ee67190f04 100644
--- a/src/Dictionaries/DirectDictionary.h
+++ b/src/Dictionaries/DirectDictionary.h
@@ -65,76 +65,16 @@ public:
     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;
 
-    template <typename T>
-    using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
+    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::simple; }
 
-#define DECLARE(TYPE) \
-    void get##TYPE(const std::string & attribute_name, const PaddedPODArray<Key> & ids, ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
+    ColumnPtr getColumn(
+        const std::string& attribute_name,
+        const DataTypePtr & result_type,
+        const Columns & key_columns,
+        const DataTypes & key_types,
+        const ColumnPtr default_untyped) const override;
 
-    void getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, ColumnString * out) const;
-
-#define DECLARE(TYPE) \
-    void get##TYPE( \
-        const std::string & attribute_name, \
-        const PaddedPODArray<Key> & ids, \
-        const PaddedPODArray<TYPE> & def, \
-        ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void
-    getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, const ColumnString * const def, ColumnString * const out)
-        const;
-
-#define DECLARE(TYPE) \
-    void get##TYPE(const std::string & attribute_name, const PaddedPODArray<Key> & ids, const TYPE def, ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, const String & def, ColumnString * const out) const;
-
-    void has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const;
+    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) const override;
 
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
 
@@ -193,9 +133,6 @@ private:
 
     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;
-
     Key getValueOrNullByKey(const Key & to_find) const;
 
     template <typename ChildType, typename AncestorType>

From 6017d1a034786a6e360950fce81c09cc340ec789 Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Sun, 27 Dec 2020 20:23:09 +0300
Subject: [PATCH 528/611] Updated CachedDictionary to new interface

---
 src/Dictionaries/CacheDictionary.cpp          | 165 +++++++++++++++---
 src/Dictionaries/CacheDictionary.h            |  77 ++------
 .../CacheDictionary_generate1.cpp             |  32 ----
 .../CacheDictionary_generate2.cpp             |  34 ----
 .../CacheDictionary_generate3.cpp             |  31 ----
 5 files changed, 154 insertions(+), 185 deletions(-)
 delete mode 100644 src/Dictionaries/CacheDictionary_generate1.cpp
 delete mode 100644 src/Dictionaries/CacheDictionary_generate2.cpp
 delete mode 100644 src/Dictionaries/CacheDictionary_generate3.cpp

diff --git a/src/Dictionaries/CacheDictionary.cpp b/src/Dictionaries/CacheDictionary.cpp
index 1a0d7e28fea..c7517332594 100644
--- a/src/Dictionaries/CacheDictionary.cpp
+++ b/src/Dictionaries/CacheDictionary.cpp
@@ -17,7 +17,7 @@
 #include "CacheDictionary.inc.h"
 #include "DictionaryBlockInputStream.h"
 #include "DictionaryFactory.h"
-
+#include <Functions/FunctionHelpers.h>
 
 namespace ProfileEvents
 {
@@ -249,32 +249,145 @@ void CacheDictionary::isInConstantVector(const Key child_id, const PaddedPODArra
         out[i] = std::find(ancestors.begin(), ancestors.end(), ancestor_ids[i]) != ancestors.end();
 }
 
-void CacheDictionary::getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, ColumnString * out) const
+ColumnPtr CacheDictionary::getColumn(
+    const std::string & attribute_name,
+    const DataTypePtr &,
+    const Columns & key_columns,
+    const DataTypes &,
+    const ColumnPtr default_untyped) const
 {
+    ColumnPtr result;
+
+    PaddedPODArray<Key> backup_storage;
+    const auto& ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
+    
     auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
 
-    const auto null_value = StringRef{std::get<String>(attribute.null_value)};
+    /// TODO: Check that attribute type is same as result type
+    /// TODO: Check if const will work as expected
 
-    getItemsString(attribute, ids, out, [&](const size_t) { return null_value; });
-}
+    auto type_call = [&](const auto &dictionary_attribute_type)
+    {
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
 
-void CacheDictionary::getString(
-    const std::string & attribute_name, const PaddedPODArray<Key> & ids, const ColumnString * const def, ColumnString * const out) const
-{
-    auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
+        auto identifiers_size = ids.size();
 
-    getItemsString(attribute, ids, out, [&](const size_t row) { return def->getDataAt(row); });
-}
+        if constexpr (std::is_same_v<AttributeType, String>)
+        {
+            auto column_string = ColumnString::create();
 
-void CacheDictionary::getString(
-    const std::string & attribute_name, const PaddedPODArray<Key> & ids, const String & def, ColumnString * const out) const
-{
-    auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                {
+                    getItemsString(attribute, ids, column_string.get(), [&](const size_t row) { return default_col->getDataAt(row); });
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<String>();
 
-    getItemsString(attribute, ids, out, [&](const size_t) { return StringRef{def}; });
+                    getItemsString(attribute, ids, column_string.get(), [&](const size_t) { return StringRef{def}; });
+                }
+            }
+            else
+            {
+                const auto null_value = StringRef{std::get<String>(attribute.null_value)};
+
+                getItemsString(attribute, ids, column_string.get(), [&](const size_t) { return null_value; });
+            }
+
+            result = std::move(column_string);
+        }
+        else if constexpr (IsNumber<AttributeType>)
+        {
+            auto column = ColumnVector<AttributeType>::create(identifiers_size);
+            auto& out = column->getData();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnVector<AttributeType>>(*default_untyped))
+                {
+                    getItemsNumberImpl<AttributeType, AttributeType>(
+                        attribute,
+                        ids,
+                        out,
+                        [&](const size_t row) { return default_col->getData()[row]; }
+                    );
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnVector<AttributeType>>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<AttributeType>();
+
+                    getItemsNumberImpl<AttributeType, AttributeType>(
+                        attribute,
+                        ids,
+                        out,
+                        [&](const size_t) { return def; }
+                    );
+                }
+            }
+            else
+            {
+                const auto null_value = std::get<AttributeType>(attribute.null_value);
+
+                getItemsNumberImpl<AttributeType, AttributeType>(
+                    attribute,
+                    ids,
+                    out,
+                    [&](const size_t) { return null_value; });
+            }
+
+            result = std::move(column);
+        }
+        else if constexpr (IsDecimalNumber<AttributeType>)
+        {
+            // auto scale = getDecimalScale(*attribute.type);
+            auto column = ColumnDecimal<AttributeType>::create(identifiers_size, 0);
+            auto& out = column->getData();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnDecimal<AttributeType>>(*default_untyped))
+                {
+                    getItemsNumberImpl<AttributeType, AttributeType>(
+                        attribute,
+                        ids,
+                        out,
+                        [&](const size_t row) { return default_col->getData()[row]; }
+                    );
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnDecimal<AttributeType>>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<AttributeType>();
+
+                    getItemsNumberImpl<AttributeType, AttributeType>(
+                        attribute,
+                        ids,
+                        out,
+                        [&](const size_t) { return def; }
+                    );
+                }
+            }
+            else
+            {
+                const auto null_value = std::get<AttributeType>(attribute.null_value);
+
+                getItemsNumberImpl<AttributeType, AttributeType>(
+                    attribute,
+                    ids,
+                    out,
+                    [&](const size_t) { return null_value; }
+                );
+            }
+
+            result = std::move(column);
+        }
+    };
+
+    callOnDictionaryAttributeType(attribute.type, type_call);
+   
+    return result;
 }
 
 template<class... Ts>
@@ -375,8 +488,14 @@ size_t CacheDictionary::findCellIdxForSet(const Key & id) const
     return oldest_id;
 }
 
-void CacheDictionary::has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const
+ColumnUInt8::Ptr CacheDictionary::has(const Columns & key_columns, const DataTypes &) const
 {
+    PaddedPODArray<Key> backup_storage;
+    const auto& ids = getColumnDataAsPaddedPODArray(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).
@@ -444,7 +563,7 @@ void CacheDictionary::has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8>
     {
         /// Nothing to update - return;
         if (!cache_expired_count)
-            return;
+            return result;
 
         if (allow_read_expired_keys)
         {
@@ -458,7 +577,7 @@ void CacheDictionary::has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8>
 
             tryPushToUpdateQueueOrThrow(update_unit_ptr);
             /// Update is async - no need to wait.
-            return;
+            return result;
         }
     }
 
@@ -483,6 +602,8 @@ void CacheDictionary::has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8>
             for (const auto row : cache_expired_or_not_found_ids[key])
                 out[row] = true;
     }
+
+    return result;
 }
 
 
diff --git a/src/Dictionaries/CacheDictionary.h b/src/Dictionaries/CacheDictionary.h
index d242c6bc3eb..5833f623517 100644
--- a/src/Dictionaries/CacheDictionary.h
+++ b/src/Dictionaries/CacheDictionary.h
@@ -119,77 +119,22 @@ public:
 
     std::exception_ptr getLastException() const override;
 
+    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::simple; }
+
+    ColumnPtr getColumn(
+        const std::string& attribute_name,
+        const DataTypePtr & result_type,
+        const Columns & key_columns,
+        const DataTypes & key_types,
+        const ColumnPtr default_untyped) const override;
+
+    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) const override;
+
     template <typename T>
     using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
 
-#define DECLARE(TYPE) \
-    void get##TYPE(const std::string & attribute_name, const PaddedPODArray<Key> & ids, ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, ColumnString * out) const;
-
-#define DECLARE(TYPE) \
-    void get##TYPE( \
-        const std::string & attribute_name, \
-        const PaddedPODArray<Key> & ids, \
-        const PaddedPODArray<TYPE> & def, \
-        ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void
-    getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, const ColumnString * const def, ColumnString * const out)
-        const;
-
-#define DECLARE(TYPE) \
-    void get##TYPE(const std::string & attribute_name, const PaddedPODArray<Key> & ids, const TYPE def, ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
     void getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, const String & def, ColumnString * const out) const;
 
-    void has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const;
-
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
 
 private:
diff --git a/src/Dictionaries/CacheDictionary_generate1.cpp b/src/Dictionaries/CacheDictionary_generate1.cpp
deleted file mode 100644
index 2c6742b3a8c..00000000000
--- a/src/Dictionaries/CacheDictionary_generate1.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <Dictionaries/CacheDictionary.h>
-#include <Dictionaries/CacheDictionary.inc.h>
-
-namespace DB
-{
-#define DEFINE(TYPE) \
-    void CacheDictionary::get##TYPE(const std::string & attribute_name, const PaddedPODArray<Key> & ids, ResultArrayType<TYPE> & out) \
-        const \
-    { \
-        auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-        const auto null_value = std::get<TYPE>(attribute.null_value); \
-        getItemsNumberImpl<TYPE, TYPE>(attribute, ids, out, [&](const size_t) { return null_value; }); \
-    }
-
-DEFINE(UInt8)
-DEFINE(UInt16)
-DEFINE(UInt32)
-DEFINE(UInt64)
-DEFINE(UInt128)
-DEFINE(Int8)
-DEFINE(Int16)
-DEFINE(Int32)
-DEFINE(Int64)
-DEFINE(Float32)
-DEFINE(Float64)
-DEFINE(Decimal32)
-DEFINE(Decimal64)
-DEFINE(Decimal128)
-
-#undef DEFINE
-}
diff --git a/src/Dictionaries/CacheDictionary_generate2.cpp b/src/Dictionaries/CacheDictionary_generate2.cpp
deleted file mode 100644
index be28a6302c2..00000000000
--- a/src/Dictionaries/CacheDictionary_generate2.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <Dictionaries/CacheDictionary.h>
-#include <Dictionaries/CacheDictionary.inc.h>
-
-namespace DB
-{
-#define DEFINE(TYPE) \
-    void CacheDictionary::get##TYPE( \
-        const std::string & attribute_name, \
-        const PaddedPODArray<Key> & ids, \
-        const PaddedPODArray<TYPE> & def, \
-        ResultArrayType<TYPE> & out) const \
-    { \
-        auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-        getItemsNumberImpl<TYPE, TYPE>(attribute, ids, out, [&](const size_t row) { return def[row]; }); \
-    }
-
-DEFINE(UInt8)
-DEFINE(UInt16)
-DEFINE(UInt32)
-DEFINE(UInt64)
-DEFINE(UInt128)
-DEFINE(Int8)
-DEFINE(Int16)
-DEFINE(Int32)
-DEFINE(Int64)
-DEFINE(Float32)
-DEFINE(Float64)
-DEFINE(Decimal32)
-DEFINE(Decimal64)
-DEFINE(Decimal128)
-
-#undef DEFINE
-}
diff --git a/src/Dictionaries/CacheDictionary_generate3.cpp b/src/Dictionaries/CacheDictionary_generate3.cpp
deleted file mode 100644
index 36195f166db..00000000000
--- a/src/Dictionaries/CacheDictionary_generate3.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <Dictionaries/CacheDictionary.h>
-#include <Dictionaries/CacheDictionary.inc.h>
-
-namespace DB
-{
-#define DEFINE(TYPE) \
-    void CacheDictionary::get##TYPE( \
-        const std::string & attribute_name, const PaddedPODArray<Key> & ids, const TYPE def, ResultArrayType<TYPE> & out) const \
-    { \
-        auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-        getItemsNumberImpl<TYPE, TYPE>(attribute, ids, out, [&](const size_t) { return def; }); \
-    }
-
-DEFINE(UInt8)
-DEFINE(UInt16)
-DEFINE(UInt32)
-DEFINE(UInt64)
-DEFINE(UInt128)
-DEFINE(Int8)
-DEFINE(Int16)
-DEFINE(Int32)
-DEFINE(Int64)
-DEFINE(Float32)
-DEFINE(Float64)
-DEFINE(Decimal32)
-DEFINE(Decimal64)
-DEFINE(Decimal128)
-
-#undef DEFINE
-}

From 81f4bc7b4c937703db0a6ea47ad7f22a29155c62 Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Sun, 27 Dec 2020 20:44:45 +0300
Subject: [PATCH 529/611] Updated SSDCacheDictionary to new interface

---
 src/Dictionaries/CacheDictionary.h      |   2 -
 src/Dictionaries/SSDCacheDictionary.cpp | 266 ++++++++++++++----------
 src/Dictionaries/SSDCacheDictionary.h   |  79 +------
 3 files changed, 163 insertions(+), 184 deletions(-)

diff --git a/src/Dictionaries/CacheDictionary.h b/src/Dictionaries/CacheDictionary.h
index 5833f623517..70bea884ae4 100644
--- a/src/Dictionaries/CacheDictionary.h
+++ b/src/Dictionaries/CacheDictionary.h
@@ -133,8 +133,6 @@ public:
     template <typename T>
     using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
 
-    void getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, const String & def, ColumnString * const out) const;
-
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
 
 private:
diff --git a/src/Dictionaries/SSDCacheDictionary.cpp b/src/Dictionaries/SSDCacheDictionary.cpp
index 030f95da2ab..23507792f7e 100644
--- a/src/Dictionaries/SSDCacheDictionary.cpp
+++ b/src/Dictionaries/SSDCacheDictionary.cpp
@@ -23,6 +23,7 @@
 #include <city.h>
 #include <fcntl.h>
 
+#include <Functions/FunctionHelpers.h>
 
 namespace ProfileEvents
 {
@@ -1327,93 +1328,146 @@ SSDCacheDictionary::SSDCacheDictionary(
     createAttributes();
 }
 
-#define DECLARE(TYPE) \
-    void SSDCacheDictionary::get##TYPE( \
-        const std::string & attribute_name, const PaddedPODArray<Key> & ids, ResultArrayType<TYPE> & out) const \
-    { \
-        const auto index = getAttributeIndex(attribute_name); \
-        checkAttributeType(this, attribute_name, dict_struct.attributes[index].underlying_type, AttributeUnderlyingType::ut##TYPE); \
-        const auto null_value = std::get<TYPE>(null_values[index]); /* NOLINT */ \
-        getItemsNumberImpl<TYPE, TYPE>(index, ids, out, [&](const size_t) { return null_value; }); /* NOLINT */ \
-    }
+ColumnPtr SSDCacheDictionary::getColumn(
+    const std::string & attribute_name,
+    const DataTypePtr &,
+    const Columns & key_columns,
+    const DataTypes &,
+    const ColumnPtr default_untyped) const
+{
+    ColumnPtr result;
 
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
+    PaddedPODArray<Key> backup_storage;
+    const auto& ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
+    
+    const auto index = getAttributeIndex(attribute_name);
 
-#define DECLARE(TYPE) \
-    void SSDCacheDictionary::get##TYPE( \
-        const std::string & attribute_name, \
-        const PaddedPODArray<Key> & ids, \
-        const PaddedPODArray<TYPE> & def, \
-        ResultArrayType<TYPE> & out) const \
-    { \
-        const auto index = getAttributeIndex(attribute_name); \
-        checkAttributeType(this, attribute_name, dict_struct.attributes[index].underlying_type, AttributeUnderlyingType::ut##TYPE); \
-        getItemsNumberImpl<TYPE, TYPE>( \
-            index, \
-            ids, \
-            out, \
-            [&](const size_t row) { return def[row]; }); \
-    }
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
+    /// TODO: Check that attribute type is same as result type
+    /// TODO: Check if const will work as expected
 
-#define DECLARE(TYPE) \
-    void SSDCacheDictionary::get##TYPE( \
-        const std::string & attribute_name, \
-        const PaddedPODArray<Key> & ids, \
-        const TYPE def, \
-        ResultArrayType<TYPE> & out) const \
-    { \
-        const auto index = getAttributeIndex(attribute_name); \
-        checkAttributeType(this, attribute_name, dict_struct.attributes[index].underlying_type, AttributeUnderlyingType::ut##TYPE); \
-        getItemsNumberImpl<TYPE, TYPE>( \
-            index, \
-            ids, \
-            out, \
-            [&](const size_t) { return def; }); \
-    }
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
+    auto type_call = [&](const auto &dictionary_attribute_type)
+    {
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
+
+        auto identifiers_size = ids.size();
+
+        if constexpr (std::is_same_v<AttributeType, String>)
+        {
+            auto column_string = ColumnString::create();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                {
+                    getItemsStringImpl(index, ids, column_string.get(), [&](const size_t row) { return default_col->getDataAt(row); });
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<String>();
+
+                    getItemsStringImpl(index, ids, column_string.get(), [&](const size_t) { return StringRef{def}; });
+                }
+            }
+            else
+            {
+                const auto null_value = StringRef{std::get<String>(null_values[index])};
+
+                getItemsStringImpl(index, ids, column_string.get(), [&](const size_t) { return null_value; });
+            }
+
+            result = std::move(column_string);
+        }
+        else if constexpr (IsNumber<AttributeType>)
+        {
+            auto column = ColumnVector<AttributeType>::create(identifiers_size);
+            auto& out = column->getData();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnVector<AttributeType>>(*default_untyped))
+                {
+                    getItemsNumberImpl<AttributeType, AttributeType>(
+                        index,
+                        ids,
+                        out,
+                        [&](const size_t row) { return default_col->getData()[row]; }
+                    );
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnVector<AttributeType>>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<AttributeType>();
+
+                    getItemsNumberImpl<AttributeType, AttributeType>(
+                        index,
+                        ids,
+                        out,
+                        [&](const size_t) { return def; }
+                    );
+                }
+            }
+            else
+            {
+                const auto null_value = std::get<AttributeType>(null_values[index]);;
+
+                getItemsNumberImpl<AttributeType, AttributeType>(
+                    index,
+                    ids,
+                    out,
+                    [&](const size_t) { return null_value; });
+            }
+
+            result = std::move(column);
+        }
+        else if constexpr (IsDecimalNumber<AttributeType>)
+        {
+            // auto scale = getDecimalScale(*attribute.type);
+            auto column = ColumnDecimal<AttributeType>::create(identifiers_size, 0);
+            auto& out = column->getData();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnDecimal<AttributeType>>(*default_untyped))
+                {
+                    getItemsNumberImpl<AttributeType, AttributeType>(
+                        index,
+                        ids,
+                        out,
+                        [&](const size_t row) { return default_col->getData()[row]; }
+                    );
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnDecimal<AttributeType>>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<AttributeType>();
+
+                    getItemsNumberImpl<AttributeType, AttributeType>(
+                        index,
+                        ids,
+                        out,
+                        [&](const size_t) { return def; }
+                    );
+                }
+            }
+            else
+            {
+                const auto null_value = std::get<AttributeType>(null_values[index]);;
+
+                getItemsNumberImpl<AttributeType, AttributeType>(
+                    index,
+                    ids,
+                    out,
+                    [&](const size_t) { return null_value; }
+                );
+            }
+
+            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(
@@ -1445,34 +1499,6 @@ void SSDCacheDictionary::getItemsNumberImpl(
             getLifetime());
 }
 
-void SSDCacheDictionary::getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, ColumnString * out) const
-{
-    const auto index = getAttributeIndex(attribute_name);
-    checkAttributeType(this, attribute_name, dict_struct.attributes[index].underlying_type, AttributeUnderlyingType::utString);
-
-    const auto null_value = StringRef{std::get<String>(null_values[index])};
-
-    getItemsStringImpl(index, ids, out, [&](const size_t) { return null_value; });
-}
-
-void SSDCacheDictionary::getString(
-        const std::string & attribute_name, const PaddedPODArray<Key> & ids, const ColumnString * const def, ColumnString * const out) const
-{
-    const auto index = getAttributeIndex(attribute_name);
-    checkAttributeType(this, attribute_name, dict_struct.attributes[index].underlying_type, AttributeUnderlyingType::utString);
-
-    getItemsStringImpl(index, ids, out, [&](const size_t row) { return def->getDataAt(row); });
-}
-
-void SSDCacheDictionary::getString(
-        const std::string & attribute_name, const PaddedPODArray<Key> & ids, const String & def, ColumnString * const out) const
-{
-    const auto index = getAttributeIndex(attribute_name);
-    checkAttributeType(this, attribute_name, dict_struct.attributes[index].underlying_type, AttributeUnderlyingType::utString);
-
-    getItemsStringImpl(index, ids, out, [&](const size_t) { return StringRef{def}; });
-}
-
 template <typename DefaultGetter>
 void SSDCacheDictionary::getItemsStringImpl(const size_t attribute_index, const PaddedPODArray<Key> & ids,
         ColumnString * out, DefaultGetter && get_default) const
@@ -1545,14 +1571,24 @@ void SSDCacheDictionary::getItemsStringImpl(const size_t attribute_index, const
     }
 }
 
-void SSDCacheDictionary::has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const
+ColumnUInt8::Ptr SSDCacheDictionary::has(const Columns & key_columns, const DataTypes &) const
 {
+    PaddedPODArray<Key> backup_storage;
+    const auto& ids = getColumnDataAsPaddedPODArray(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;
+        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; });
@@ -1571,6 +1607,8 @@ void SSDCacheDictionary::has(const PaddedPODArray<Key> & ids, PaddedPODArray<UIn
                     out[row] = false;
             },
             getLifetime());
+
+    return result;
 }
 
 BlockInputStreamPtr SSDCacheDictionary::getBlockInputStream(const Names & column_names, size_t max_block_size) const
diff --git a/src/Dictionaries/SSDCacheDictionary.h b/src/Dictionaries/SSDCacheDictionary.h
index 8219a52bac9..158bf38cf42 100644
--- a/src/Dictionaries/SSDCacheDictionary.h
+++ b/src/Dictionaries/SSDCacheDictionary.h
@@ -351,77 +351,20 @@ public:
 
     std::exception_ptr getLastException() const override { return storage.getLastException(); }
 
+    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::simple; }
+
+    ColumnPtr getColumn(
+        const std::string& attribute_name,
+        const DataTypePtr & result_type,
+        const Columns & key_columns,
+        const DataTypes & key_types,
+        const ColumnPtr default_untyped) const override;
+
+    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) const override;
+
     template <typename T>
     using ResultArrayType = SSDCacheStorage::ResultArrayType<T>;
 
-#define DECLARE(TYPE) \
-    void get##TYPE(const std::string & attribute_name, const PaddedPODArray<Key> & ids, ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, ColumnString * out) const;
-
-#define DECLARE(TYPE) \
-    void get##TYPE( \
-        const std::string & attribute_name, \
-        const PaddedPODArray<Key> & ids, \
-        const PaddedPODArray<TYPE> & def, \
-        ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void
-    getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, const ColumnString * def, ColumnString * out)
-    const;
-
-#define DECLARE(TYPE) \
-    void get##TYPE(const std::string & attribute_name, const PaddedPODArray<Key> & ids, const TYPE def, ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void getString(const std::string & attribute_name, const PaddedPODArray<Key> & ids, const String & def, ColumnString * out) const;
-
-    void has(const PaddedPODArray<Key> & ids, PaddedPODArray<UInt8> & out) const;
-
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
 
 private:

From b4896ee82bd2b2b061179adbb790b3cc9978c992 Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Mon, 28 Dec 2020 00:36:24 +0300
Subject: [PATCH 530/611] Updated ComplexKeyDirectDictionary to new interface

---
 .../ComplexKeyDirectDictionary.cpp            | 582 +++++++-----------
 src/Dictionaries/ComplexKeyDirectDictionary.h |  90 +--
 src/Dictionaries/DirectDictionary.cpp         |  47 --
 src/Dictionaries/DirectDictionary.h           |   9 -
 4 files changed, 239 insertions(+), 489 deletions(-)

diff --git a/src/Dictionaries/ComplexKeyDirectDictionary.cpp b/src/Dictionaries/ComplexKeyDirectDictionary.cpp
index c4b8678672c..0668c5da07a 100644
--- a/src/Dictionaries/ComplexKeyDirectDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyDirectDictionary.cpp
@@ -3,6 +3,7 @@
 #include "DictionaryBlockInputStream.h"
 #include "DictionaryFactory.h"
 #include <Core/Defines.h>
+#include <Functions/FunctionHelpers.h>
 
 namespace DB
 {
@@ -31,194 +32,235 @@ ComplexKeyDirectDictionary::ComplexKeyDirectDictionary(
     createAttributes();
 }
 
-#define DECLARE(TYPE) \
-    void ComplexKeyDirectDictionary::get##TYPE(const std::string & attribute_name, const Columns & key_columns, const DataTypes & key_types, ResultArrayType<TYPE> & out) const \
-    { \
-        dict_struct.validateKeyTypes(key_types); \
-        const auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-\
-        const auto null_value = std::get<TYPE>(attribute.null_values); \
-\
-        getItemsImpl<TYPE, TYPE>( \
-            attribute, key_columns, [&](const size_t row, const auto value) { out[row] = value; }, [&](const size_t) { return null_value; }); \
-    }
-DECLARE(UInt8)
-DECLARE(UInt16)
-DECLARE(UInt32)
-DECLARE(UInt64)
-DECLARE(UInt128)
-DECLARE(Int8)
-DECLARE(Int16)
-DECLARE(Int32)
-DECLARE(Int64)
-DECLARE(Float32)
-DECLARE(Float64)
-DECLARE(Decimal32)
-DECLARE(Decimal64)
-DECLARE(Decimal128)
-#undef DECLARE
-
-void ComplexKeyDirectDictionary::getString(
-    const std::string & attribute_name, const Columns & key_columns, const DataTypes & key_types, ColumnString * out) const
+ColumnPtr ComplexKeyDirectDictionary::getColumn(
+    const std::string & attribute_name,
+    const DataTypePtr &,
+    const Columns & key_columns,
+    const DataTypes & key_types,
+    const ColumnPtr default_untyped) const
 {
     dict_struct.validateKeyTypes(key_types);
-    const auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
 
-    const auto & null_value = std::get<StringRef>(attribute.null_values);
-    getItemsStringImpl<StringRef, StringRef>(
-        attribute,
-        key_columns,
-        [&](const size_t, const String value) { const auto ref = StringRef{value}; out->insertData(ref.data, ref.size); },
-        [&](const size_t) { return String(null_value.data, null_value.size); });
-}
-
-#define DECLARE(TYPE) \
-    void ComplexKeyDirectDictionary::get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes & key_types, \
-        const PaddedPODArray<TYPE> & def, \
-        ResultArrayType<TYPE> & out) const \
-    { \
-        dict_struct.validateKeyTypes(key_types); \
-        const auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-\
-        getItemsImpl<TYPE, TYPE>( \
-            attribute, key_columns, [&](const size_t row, const auto value) { out[row] = value; }, [&](const size_t row) { return def[row]; }); \
-    }
-DECLARE(UInt8)
-DECLARE(UInt16)
-DECLARE(UInt32)
-DECLARE(UInt64)
-DECLARE(UInt128)
-DECLARE(Int8)
-DECLARE(Int16)
-DECLARE(Int32)
-DECLARE(Int64)
-DECLARE(Float32)
-DECLARE(Float64)
-DECLARE(Decimal32)
-DECLARE(Decimal64)
-DECLARE(Decimal128)
-#undef DECLARE
-
-void ComplexKeyDirectDictionary::getString(
-    const std::string & attribute_name, const Columns & key_columns, const DataTypes & key_types, const ColumnString * const def, ColumnString * const out) const
-{
-    dict_struct.validateKeyTypes(key_types);
+    ColumnPtr result;
 
     const auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
 
-    getItemsStringImpl<StringRef, StringRef>(
-        attribute,
-        key_columns,
-        [&](const size_t, const String value) { const auto ref = StringRef{value}; out->insertData(ref.data, ref.size); },
-        [&](const size_t row) { const auto ref = def->getDataAt(row); return String(ref.data, ref.size); });
-}
+    /// TODO: Check that attribute type is same as result type
+    /// TODO: Check if const will work as expected
+    
+    auto size = key_columns.front()->size();
 
-#define DECLARE(TYPE) \
-    void ComplexKeyDirectDictionary::get##TYPE( \
-        const std::string & attribute_name, const Columns & key_columns, const DataTypes & key_types, const TYPE def, ResultArrayType<TYPE> & out) const \
-    { \
-        dict_struct.validateKeyTypes(key_types); \
-        const auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-\
-        getItemsImpl<TYPE, TYPE>( \
-            attribute, key_columns, [&](const size_t row, const auto value) { out[row] = value; }, [&](const size_t) { return def; }); \
-    }
-DECLARE(UInt8)
-DECLARE(UInt16)
-DECLARE(UInt32)
-DECLARE(UInt64)
-DECLARE(UInt128)
-DECLARE(Int8)
-DECLARE(Int16)
-DECLARE(Int32)
-DECLARE(Int64)
-DECLARE(Float32)
-DECLARE(Float64)
-DECLARE(Decimal32)
-DECLARE(Decimal64)
-DECLARE(Decimal128)
-#undef DECLARE
-
-void ComplexKeyDirectDictionary::getString(
-    const std::string & attribute_name, const Columns & key_columns, const DataTypes & key_types, const String & def, ColumnString * const out) const
-{
-    dict_struct.validateKeyTypes(key_types);
-
-    const auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
-
-    ComplexKeyDirectDictionary::getItemsStringImpl<StringRef, StringRef>(
-        attribute,
-        key_columns,
-        [&](const size_t, const String value) { const auto ref = StringRef{value}; out->insertData(ref.data, ref.size); },
-        [&](const size_t) { return def; });
-}
-
-
-void ComplexKeyDirectDictionary::has(const Columns & key_columns, const DataTypes & key_types, PaddedPODArray<UInt8> & out) const
-{
-    dict_struct.validateKeyTypes(key_types);
-    const auto & attribute = attributes.front();
-
-    switch (attribute.type)
+    auto type_call = [&](const auto &dictionary_attribute_type)
     {
-        case AttributeUnderlyingType::utUInt8:
-            has<UInt8>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utUInt16:
-            has<UInt16>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utUInt32:
-            has<UInt32>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utUInt64:
-            has<UInt64>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utUInt128:
-            has<UInt128>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utInt8:
-            has<Int8>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utInt16:
-            has<Int16>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utInt32:
-            has<Int32>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utInt64:
-            has<Int64>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utFloat32:
-            has<Float32>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utFloat64:
-            has<Float64>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utString:
-            has<String>(attribute, key_columns, out);
-            break;
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
 
-        case AttributeUnderlyingType::utDecimal32:
-            has<Decimal32>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utDecimal64:
-            has<Decimal64>(attribute, key_columns, out);
-            break;
-        case AttributeUnderlyingType::utDecimal128:
-            has<Decimal128>(attribute, key_columns, out);
-            break;
-    }
+        if constexpr (std::is_same_v<AttributeType, String>)
+        {
+            auto column_string = ColumnString::create();
+            auto out = column_string.get();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                {
+                    getItemsImpl<String, String>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t, const String value)
+                        {
+                            const auto ref = StringRef{value};
+                            out->insertData(ref.data, ref.size);
+                        },
+                        [&](const size_t row)
+                        {
+                            const auto ref = default_col->getDataAt(row);
+                            return String(ref.data, ref.size);
+                        });
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<String>();
+
+                    getItemsImpl<String, String>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t, const String value)
+                        {
+                            const auto ref = StringRef{value};
+                            out->insertData(ref.data, ref.size);
+                        },
+                        [&](const size_t) { return def; });
+                }
+            }
+            else
+            {
+                const auto & null_value = std::get<StringRef>(attribute.null_values);
+
+                getItemsImpl<String, String>(
+                    attribute,
+                    key_columns,
+                    [&](const size_t, const String value)
+                    {
+                        const auto ref = StringRef{value};
+                        out->insertData(ref.data, ref.size);
+                    },
+                    [&](const size_t) { return String(null_value.data, null_value.size); });
+            }
+
+            result = std::move(column_string);
+        }
+        else if constexpr (IsNumber<AttributeType>)
+        {
+            auto column = ColumnVector<AttributeType>::create(size);
+            auto& out = column->getData();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnVector<AttributeType>>(*default_untyped))
+                {
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row) { return default_col->getData()[row]; }
+                    );
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnVector<AttributeType>>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<AttributeType>();
+
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t) { return def; }
+                    );
+                }
+            }
+            else
+            {
+                const auto null_value = std::get<AttributeType>(attribute.null_values);
+
+                getItemsImpl<AttributeType, AttributeType>(
+                    attribute,
+                    key_columns,
+                    [&](const size_t row, const auto value) { return out[row] = value; },
+                    [&](const size_t) { return null_value; });
+            }
+
+            result = std::move(column);
+        }
+        else if constexpr (IsDecimalNumber<AttributeType>)
+        {
+            // auto scale = getDecimalScale(*attribute.type);
+            auto column = ColumnDecimal<AttributeType>::create(size, 0);
+            auto& out = column->getData();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnDecimal<AttributeType>>(*default_untyped))
+                {
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row) { return default_col->getData()[row]; }
+                    );
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnDecimal<AttributeType>>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<AttributeType>();
+
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t) { return def; }
+                    );
+                }
+            }
+            else
+            {
+                const auto null_value = std::get<AttributeType>(attribute.null_values);
+
+                getItemsImpl<AttributeType, AttributeType>(
+                    attribute,
+                    key_columns,
+                    [&](const size_t row, const auto value) { return out[row] = value; },
+                    [&](const size_t) { return null_value; }
+                );
+            }
+
+            result = std::move(column);
+        }
+    };
+
+    callOnDictionaryAttributeType(attribute.type, type_call);
+   
+    return result;
 }
 
+ColumnUInt8::Ptr ComplexKeyDirectDictionary::has(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()
 {
@@ -237,7 +279,6 @@ void ComplexKeyDirectDictionary::createAttributes()
     }
 }
 
-
 template <typename T>
 void ComplexKeyDirectDictionary::createAttributeImpl(Attribute & attribute, const Field & null_value)
 {
@@ -258,55 +299,14 @@ ComplexKeyDirectDictionary::Attribute ComplexKeyDirectDictionary::createAttribut
 {
     Attribute attr{type, {}, {}, attr_name};
 
-    switch (type)
+    auto type_call = [&](const auto &dictionary_attribute_type)
     {
-        case AttributeUnderlyingType::utUInt8:
-            createAttributeImpl<UInt8>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt16:
-            createAttributeImpl<UInt16>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt32:
-            createAttributeImpl<UInt32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt64:
-            createAttributeImpl<UInt64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt128:
-            createAttributeImpl<UInt128>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt8:
-            createAttributeImpl<Int8>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt16:
-            createAttributeImpl<Int16>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt32:
-            createAttributeImpl<Int32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt64:
-            createAttributeImpl<Int64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utFloat32:
-            createAttributeImpl<Float32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utFloat64:
-            createAttributeImpl<Float64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utString:
-            createAttributeImpl<String>(attr, null_value);
-            break;
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
+        createAttributeImpl<AttributeType>(attr, null_value);
+    };
 
-        case AttributeUnderlyingType::utDecimal32:
-            createAttributeImpl<Decimal32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utDecimal64:
-            createAttributeImpl<Decimal64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utDecimal128:
-            createAttributeImpl<Decimal128>(attr, null_value);
-            break;
-    }
+    callOnDictionaryAttributeType(type, type_call);
 
     return attr;
 }
@@ -392,6 +392,11 @@ void ComplexKeyDirectDictionary::getItemsImpl(
             });
         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;
 
@@ -402,7 +407,7 @@ void ComplexKeyDirectDictionary::getItemsImpl(
             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) && attribute.name == attribute_name_by_index.at(attribute_idx))
+                if (value_by_key.has(key))
                 {
                     if (attribute.type == AttributeUnderlyingType::utFloat32)
                     {
@@ -428,72 +433,6 @@ void ComplexKeyDirectDictionary::getItemsImpl(
     query_count.fetch_add(rows, std::memory_order_relaxed);
 }
 
-template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
-void ComplexKeyDirectDictionary::getItemsStringImpl(
-    const Attribute & attribute, const Columns & key_columns, ValueSetter && set_value, DefaultGetter && get_default) const
-{
-    const auto rows = key_columns.front()->size();
-    const auto keys_size = dict_struct.key->size();
-    StringRefs keys_array(keys_size);
-    MapType<String> value_by_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;
-        value_by_key[key] = get_default(row);
-        to_load[row] = row;
-    }
-
-    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()))
-        {
-            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) && attribute.name == attribute_name_by_index.at(attribute_idx))
-                {
-                    const String from_source = attribute_column[row_idx].template get<String>();
-                    value_by_key[key] = from_source;
-                }
-            }
-        }
-    }
-
-    stream->readSuffix();
-
-    for (const auto row : ext::range(0, rows))
-    {
-        set_value(row, value_by_key[keys[row]]);
-    }
-
-    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);
@@ -503,65 +442,6 @@ const ComplexKeyDirectDictionary::Attribute & ComplexKeyDirectDictionary::getAtt
     return attributes[it->second];
 }
 
-
-template <typename T>
-void ComplexKeyDirectDictionary::has(const Attribute & attribute, const Columns & key_columns, PaddedPODArray<UInt8> & out) const
-{
-    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; });
-
-        for (const size_t attribute_idx : ext::range(0, attributes.size()))
-        {
-            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) && attribute.name == attribute_name_by_index.at(attribute_idx))
-                {
-                    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);
-}
-
-
 BlockInputStreamPtr ComplexKeyDirectDictionary::getBlockInputStream(const Names & /* column_names */, size_t /* max_block_size */) const
 {
     return source_ptr->loadAll();
diff --git a/src/Dictionaries/ComplexKeyDirectDictionary.h b/src/Dictionaries/ComplexKeyDirectDictionary.h
index dc602be103f..6c1f73f12f7 100644
--- a/src/Dictionaries/ComplexKeyDirectDictionary.h
+++ b/src/Dictionaries/ComplexKeyDirectDictionary.h
@@ -60,78 +60,16 @@ public:
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
     }
 
-    template <typename T>
-    using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
+    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::complex; }
 
-#define DECLARE(TYPE) \
-    void get##TYPE(const std::string & attribute_name, const Columns & key_columns, const DataTypes & key_types, ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
+    ColumnPtr getColumn(
+        const std::string& attribute_name,
+        const DataTypePtr & result_type,
+        const Columns & key_columns,
+        const DataTypes & key_types,
+        const ColumnPtr default_untyped) const override;
 
-    void getString(
-    const std::string & attribute_name, const Columns & key_columns, const DataTypes & key_types, ColumnString * out) const;
-
-#define DECLARE(TYPE) \
-    void get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes & key_types, \
-        const PaddedPODArray<TYPE> & def, \
-        ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void getString(
-    const std::string & attribute_name, const Columns & key_columns, const DataTypes & key_types, const ColumnString * const def, ColumnString * const out) const;
-
-#define DECLARE(TYPE) \
-    void get##TYPE(const std::string & attribute_name, const Columns & key_columns, const DataTypes & key_types, const TYPE def, ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void getString(
-    const std::string & attribute_name, const Columns & key_columns, const DataTypes & key_types, const String & def, ColumnString * const out) const;
-
-    void has(const Columns & key_columns, const DataTypes & key_types, PaddedPODArray<UInt8> & out) const;
+    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) const override;
 
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
 
@@ -168,8 +106,6 @@ private:
     template <typename T>
     void addAttributeSize(const Attribute & attribute);
 
-    void calculateBytesAllocated();
-
     template <typename T>
     void createAttributeImpl(Attribute & attribute, const Field & null_value);
 
@@ -179,17 +115,10 @@ private:
     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 DefaultGetter>
-    void getItemsStringImpl(
-        const Attribute & attribute, const Columns & key_columns, ValueSetter && set_value, DefaultGetter && get_default) const;
-
     template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
     void getItemsImpl(
         const Attribute & attribute, const Columns & key_columns, ValueSetter && set_value, DefaultGetter && get_default) const;
 
-    template <typename T>
-    void resize(Attribute & attribute, const Key id);
-
     template <typename T>
     void setAttributeValueImpl(Attribute & attribute, const Key id, const T & value);
 
@@ -197,9 +126,6 @@ private:
 
     const Attribute & getAttribute(const std::string & attribute_name) const;
 
-    template <typename T>
-    void has(const Attribute & attribute, const Columns & key_columns, PaddedPODArray<UInt8> & out) const;
-
     const DictionaryStructure dict_struct;
     const DictionarySourcePtr source_ptr;
     const DictionaryLifetime dict_lifetime;
diff --git a/src/Dictionaries/DirectDictionary.cpp b/src/Dictionaries/DirectDictionary.cpp
index e101055aa5c..d024a7d7059 100644
--- a/src/Dictionaries/DirectDictionary.cpp
+++ b/src/Dictionaries/DirectDictionary.cpp
@@ -455,53 +455,6 @@ void DirectDictionary::getItemsImpl(
     query_count.fetch_add(rows, std::memory_order_relaxed);
 }
 
-template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
-void DirectDictionary::getItemsStringImpl(
-    const Attribute & attribute, const PaddedPODArray<Key> & ids, ValueSetter && set_value, DefaultGetter && get_default) const
-{
-    const auto rows = ext::size(ids);
-
-    HashMap<Key, String> value_by_key;
-    for (const auto row : ext::range(0, rows))
-        value_by_key[ids[row]] = get_default(row);
-
-    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();
-
-    while (const auto block = stream->read())
-    {
-        const IColumn & 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;
-
-            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() && attribute.name == attribute_name_by_index.at(attribute_idx))
-                {
-                    const String from_source = attribute_column[row_idx].get<String>();
-                    value_by_key[key] = from_source;
-                }
-            }
-        }
-    }
-    stream->readSuffix();
-
-    for (const auto row : ext::range(0, rows))
-        set_value(row, value_by_key[ids[row]]);
-
-    query_count.fetch_add(rows, std::memory_order_relaxed);
-}
-
-
 const DirectDictionary::Attribute & DirectDictionary::getAttribute(const std::string & attribute_name) const
 {
     const auto it = attribute_index_by_name.find(attribute_name);
diff --git a/src/Dictionaries/DirectDictionary.h b/src/Dictionaries/DirectDictionary.h
index 1ee67190f04..48250315657 100644
--- a/src/Dictionaries/DirectDictionary.h
+++ b/src/Dictionaries/DirectDictionary.h
@@ -108,24 +108,15 @@ private:
     template <typename T>
     void addAttributeSize(const Attribute & attribute);
 
-    void calculateBytesAllocated();
-
     template <typename T>
     void createAttributeImpl(Attribute & attribute, const Field & null_value);
 
     Attribute createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value, const std::string & name);
 
-    template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
-    void getItemsStringImpl(
-        const Attribute & attribute, const PaddedPODArray<Key> & ids, ValueSetter && set_value, DefaultGetter && get_default) const;
-
     template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
     void getItemsImpl(
         const Attribute & attribute, const PaddedPODArray<Key> & ids, ValueSetter && set_value, DefaultGetter && get_default) const;
 
-    template <typename T>
-    void resize(Attribute & attribute, const Key id);
-
     template <typename T>
     void setAttributeValueImpl(Attribute & attribute, const Key id, const T & value);
 

From 0d2e498ed4d84d116ec0095f5455833a2080f37c Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Mon, 28 Dec 2020 23:49:40 +0300
Subject: [PATCH 531/611] Updated ComplexKeyCacheDictionary to new interface

---
 .../ComplexKeyCacheDictionary.cpp             | 276 +++++++++++++++---
 src/Dictionaries/ComplexKeyCacheDictionary.h  |  89 +-----
 ...acheDictionary_createAttributeWithType.cpp |  45 ---
 .../ComplexKeyCacheDictionary_generate1.cpp   |  32 --
 .../ComplexKeyCacheDictionary_generate2.cpp   |  35 ---
 .../ComplexKeyCacheDictionary_generate3.cpp   |  35 ---
 ...exKeyCacheDictionary_setAttributeValue.cpp |  78 -----
 ...cheDictionary_setDefaultAttributeValue.cpp |  71 -----
 8 files changed, 245 insertions(+), 416 deletions(-)
 delete mode 100644 src/Dictionaries/ComplexKeyCacheDictionary_createAttributeWithType.cpp
 delete mode 100644 src/Dictionaries/ComplexKeyCacheDictionary_generate1.cpp
 delete mode 100644 src/Dictionaries/ComplexKeyCacheDictionary_generate2.cpp
 delete mode 100644 src/Dictionaries/ComplexKeyCacheDictionary_generate3.cpp
 delete mode 100644 src/Dictionaries/ComplexKeyCacheDictionary_setAttributeValue.cpp
 delete mode 100644 src/Dictionaries/ComplexKeyCacheDictionary_setDefaultAttributeValue.cpp

diff --git a/src/Dictionaries/ComplexKeyCacheDictionary.cpp b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
index fefa2a44aaf..504db30b8d1 100644
--- a/src/Dictionaries/ComplexKeyCacheDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
@@ -10,6 +10,7 @@
 #include <ext/range.h>
 #include "DictionaryBlockInputStream.h"
 #include "DictionaryFactory.h"
+#include <Functions/FunctionHelpers.h>
 
 
 namespace ProfileEvents
@@ -70,48 +71,145 @@ ComplexKeyCacheDictionary::ComplexKeyCacheDictionary(
     createAttributes();
 }
 
-
-void ComplexKeyCacheDictionary::getString(
-    const std::string & attribute_name, const Columns & key_columns, const DataTypes & key_types, ColumnString * out) const
-{
-    dict_struct.validateKeyTypes(key_types);
-
-    auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
-
-    const auto null_value = StringRef{std::get<String>(attribute.null_values)};
-
-    getItemsString(attribute, key_columns, out, [&](const size_t) { return null_value; });
-}
-
-void ComplexKeyCacheDictionary::getString(
+ColumnPtr ComplexKeyCacheDictionary::getColumn(
     const std::string & attribute_name,
+    const DataTypePtr &,
     const Columns & key_columns,
     const DataTypes & key_types,
-    const ColumnString * const def,
-    ColumnString * const out) const
+    const ColumnPtr default_untyped) const
 {
     dict_struct.validateKeyTypes(key_types);
 
-    auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
-
-    getItemsString(attribute, key_columns, out, [&](const size_t row) { return def->getDataAt(row); });
-}
-
-void ComplexKeyCacheDictionary::getString(
-    const std::string & attribute_name,
-    const Columns & key_columns,
-    const DataTypes & key_types,
-    const String & def,
-    ColumnString * const out) const
-{
-    dict_struct.validateKeyTypes(key_types);
+    ColumnPtr result;
 
     auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
 
-    getItemsString(attribute, key_columns, out, [&](const size_t) { return StringRef{def}; });
+    /// TODO: Check that attribute type is same as result type
+    /// TODO: Check if const will work as expected
+    
+    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;
+
+        if constexpr (std::is_same_v<AttributeType, String>)
+        {
+            auto column_string = ColumnString::create();
+            auto out = column_string.get();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                {
+                    getItemsString(attribute, key_columns, out, [&](const size_t row) { return default_col->getDataAt(row); });
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<String>();
+
+                    getItemsString(attribute, key_columns, out, [&](const size_t) { return StringRef{def}; });
+                }
+            }
+            else
+            {
+                    const auto null_value = StringRef{std::get<String>(attribute.null_values)};
+
+                    getItemsString(attribute, key_columns, out, [&](const size_t) { return null_value; });
+            }
+
+            result = std::move(column_string);
+        }
+        else if constexpr (IsNumber<AttributeType>)
+        {
+            auto column = ColumnVector<AttributeType>::create(keys_size);
+            auto& out = column->getData();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnVector<AttributeType>>(*default_untyped))
+                {
+                    getItemsNumberImpl<AttributeType, AttributeType>(
+                        attribute,
+                        key_columns,
+                        out,
+                        [&](const size_t row) { return default_col->getData()[row]; }
+                    );
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnVector<AttributeType>>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<AttributeType>();
+
+                    getItemsNumberImpl<AttributeType, AttributeType>(
+                        attribute,
+                        key_columns,
+                        out,
+                        [&](const size_t) { return def; }
+                    );
+                }
+            }
+            else
+            {
+                const auto null_value = std::get<AttributeType>(attribute.null_values);
+
+                getItemsNumberImpl<AttributeType, AttributeType>(
+                    attribute,
+                    key_columns,
+                    out,
+                    [&](const size_t) { return null_value; });
+            }
+
+            result = std::move(column);
+        }
+        else if constexpr (IsDecimalNumber<AttributeType>)
+        {
+            // auto scale = getDecimalScale(*attribute.type);
+            auto column = ColumnDecimal<AttributeType>::create(keys_size, 0);
+            auto& out = column->getData();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnDecimal<AttributeType>>(*default_untyped))
+                {
+                    getItemsNumberImpl<AttributeType, AttributeType>(
+                        attribute,
+                        key_columns,
+                        out,
+                        [&](const size_t row) { return default_col->getData()[row]; }
+                    );
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnDecimal<AttributeType>>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<AttributeType>();
+
+                    getItemsNumberImpl<AttributeType, AttributeType>(
+                        attribute,
+                        key_columns,
+                        out,
+                        [&](const size_t) { return def; }
+                    );
+                }
+            }
+            else
+            {
+                const auto null_value = std::get<AttributeType>(attribute.null_values);
+
+                getItemsNumberImpl<AttributeType, AttributeType>(
+                    attribute,
+                    key_columns,
+                    out,
+                    [&](const size_t) { return null_value; }
+                );
+            }
+
+            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,
@@ -158,15 +256,21 @@ ComplexKeyCacheDictionary::findCellIdx(const StringRef & key, const CellMetadata
     return {oldest_id, false, false};
 }
 
-void ComplexKeyCacheDictionary::has(const Columns & key_columns, const DataTypes & key_types, PaddedPODArray<UInt8> & out) const
+ColumnUInt8::Ptr ComplexKeyCacheDictionary::has(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 rows_num = key_columns.front()->size();
     const auto keys_size = dict_struct.key->size();
     StringRefs keys(keys_size);
     Arena temporary_keys_pool;
@@ -212,7 +316,7 @@ void ComplexKeyCacheDictionary::has(const Columns & key_columns, const DataTypes
     hit_count.fetch_add(rows_num - outdated_keys.size(), std::memory_order_release);
 
     if (outdated_keys.empty())
-        return;
+        return result;
 
     std::vector<size_t> required_rows(outdated_keys.size());
     std::transform(
@@ -233,6 +337,8 @@ void ComplexKeyCacheDictionary::has(const Columns & key_columns, const DataTypes
             for (const auto out_idx : outdated_keys[key])
                 out[out_idx] = false;
         });
+
+    return result;
 }
 
 void ComplexKeyCacheDictionary::createAttributes()
@@ -263,6 +369,102 @@ ComplexKeyCacheDictionary::Attribute & ComplexKeyCacheDictionary::getAttribute(c
     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)
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary.h b/src/Dictionaries/ComplexKeyCacheDictionary.h
index 2663fee266d..2711bd6c8cc 100644
--- a/src/Dictionaries/ComplexKeyCacheDictionary.h
+++ b/src/Dictionaries/ComplexKeyCacheDictionary.h
@@ -89,93 +89,16 @@ public:
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
     }
 
-    template <typename T>
-    using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
+    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::complex; }
 
-/// In all functions below, key_columns must be full (non-constant) columns.
-/// See the requirement in IDataType.h for text-serialization functions.
-#define DECLARE(TYPE) \
-    void get##TYPE( \
-        const std::string & attribute_name, const Columns & key_columns, const DataTypes & key_types, ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void getString(const std::string & attribute_name, const Columns & key_columns, const DataTypes & key_types, ColumnString * out) const;
-
-#define DECLARE(TYPE) \
-    void get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes & key_types, \
-        const PaddedPODArray<TYPE> & def, \
-        ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void getString(
-        const std::string & attribute_name,
+    ColumnPtr getColumn(
+        const std::string& attribute_name,
+        const DataTypePtr & result_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnString * const def,
-        ColumnString * const out) const;
+        const ColumnPtr default_untyped) const override;
 
-#define DECLARE(TYPE) \
-    void get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes & key_types, \
-        const TYPE def, \
-        ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void getString(
-        const std::string & attribute_name,
-        const Columns & key_columns,
-        const DataTypes & key_types,
-        const String & def,
-        ColumnString * const out) const;
-
-    void has(const Columns & key_columns, const DataTypes & key_types, PaddedPODArray<UInt8> & out) const;
+    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) const override; 
 
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
 
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary_createAttributeWithType.cpp b/src/Dictionaries/ComplexKeyCacheDictionary_createAttributeWithType.cpp
deleted file mode 100644
index ba9f8d014fd..00000000000
--- a/src/Dictionaries/ComplexKeyCacheDictionary_createAttributeWithType.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include "ComplexKeyCacheDictionary.h"
-
-namespace DB
-{
-ComplexKeyCacheDictionary::Attribute
-ComplexKeyCacheDictionary::createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value)
-{
-    Attribute attr{type, {}, {}};
-
-    switch (type)
-    {
-#define DISPATCH(TYPE) \
-    case AttributeUnderlyingType::ut##TYPE: \
-        attr.null_values = TYPE(null_value.get<NearestFieldType<TYPE>>()); /* NOLINT */ \
-        attr.arrays = std::make_unique<ContainerType<TYPE>>(size); /* NOLINT */ \
-        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_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>();
-            break;
-    }
-
-    return attr;
-}
-
-}
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary_generate1.cpp b/src/Dictionaries/ComplexKeyCacheDictionary_generate1.cpp
deleted file mode 100644
index 01d39722d33..00000000000
--- a/src/Dictionaries/ComplexKeyCacheDictionary_generate1.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <Dictionaries/ComplexKeyCacheDictionary.h>
-
-namespace DB
-{
-#define DEFINE(TYPE) \
-    void ComplexKeyCacheDictionary::get##TYPE( \
-        const std::string & attribute_name, const Columns & key_columns, const DataTypes & key_types, ResultArrayType<TYPE> & out) const \
-    { \
-        dict_struct.validateKeyTypes(key_types); \
-        auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-        const auto null_value = std::get<TYPE>(attribute.null_values); \
-        getItemsNumberImpl<TYPE, TYPE>(attribute, key_columns, out, [&](const size_t) { return null_value; }); \
-    }
-
-DEFINE(UInt8)
-DEFINE(UInt16)
-DEFINE(UInt32)
-DEFINE(UInt64)
-DEFINE(UInt128)
-DEFINE(Int8)
-DEFINE(Int16)
-DEFINE(Int32)
-DEFINE(Int64)
-DEFINE(Float32)
-DEFINE(Float64)
-DEFINE(Decimal32)
-DEFINE(Decimal64)
-DEFINE(Decimal128)
-
-#undef DEFINE
-}
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary_generate2.cpp b/src/Dictionaries/ComplexKeyCacheDictionary_generate2.cpp
deleted file mode 100644
index deb34706f54..00000000000
--- a/src/Dictionaries/ComplexKeyCacheDictionary_generate2.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <Dictionaries/ComplexKeyCacheDictionary.h>
-
-namespace DB
-{
-#define DEFINE(TYPE) \
-    void ComplexKeyCacheDictionary::get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes & key_types, \
-        const PaddedPODArray<TYPE> & def, \
-        ResultArrayType<TYPE> & out) const \
-    { \
-        dict_struct.validateKeyTypes(key_types); \
-        auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-        getItemsNumberImpl<TYPE, TYPE>(attribute, key_columns, out, [&](const size_t row) { return def[row]; }); \
-    }
-
-DEFINE(UInt8)
-DEFINE(UInt16)
-DEFINE(UInt32)
-DEFINE(UInt64)
-DEFINE(UInt128)
-DEFINE(Int8)
-DEFINE(Int16)
-DEFINE(Int32)
-DEFINE(Int64)
-DEFINE(Float32)
-DEFINE(Float64)
-DEFINE(Decimal32)
-DEFINE(Decimal64)
-DEFINE(Decimal128)
-
-#undef DEFINE
-}
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary_generate3.cpp b/src/Dictionaries/ComplexKeyCacheDictionary_generate3.cpp
deleted file mode 100644
index 2a84fdc89f6..00000000000
--- a/src/Dictionaries/ComplexKeyCacheDictionary_generate3.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <Dictionaries/ComplexKeyCacheDictionary.h>
-
-namespace DB
-{
-#define DEFINE(TYPE) \
-    void ComplexKeyCacheDictionary::get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes & key_types, \
-        const TYPE def, \
-        ResultArrayType<TYPE> & out) const \
-    { \
-        dict_struct.validateKeyTypes(key_types); \
-        auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-        getItemsNumberImpl<TYPE, TYPE>(attribute, key_columns, out, [&](const size_t) { return def; }); \
-    }
-
-DEFINE(UInt8)
-DEFINE(UInt16)
-DEFINE(UInt32)
-DEFINE(UInt64)
-DEFINE(UInt128)
-DEFINE(Int8)
-DEFINE(Int16)
-DEFINE(Int32)
-DEFINE(Int64)
-DEFINE(Float32)
-DEFINE(Float64)
-DEFINE(Decimal32)
-DEFINE(Decimal64)
-DEFINE(Decimal128)
-
-#undef DEFINE
-}
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary_setAttributeValue.cpp b/src/Dictionaries/ComplexKeyCacheDictionary_setAttributeValue.cpp
deleted file mode 100644
index 2df8f95bc0c..00000000000
--- a/src/Dictionaries/ComplexKeyCacheDictionary_setAttributeValue.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-#include "ComplexKeyCacheDictionary.h"
-
-namespace DB
-{
-void ComplexKeyCacheDictionary::setAttributeValue(Attribute & attribute, const size_t 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_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 = {};
-
-            break;
-        }
-    }
-}
-
-}
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary_setDefaultAttributeValue.cpp b/src/Dictionaries/ComplexKeyCacheDictionary_setDefaultAttributeValue.cpp
deleted file mode 100644
index aa03cc88038..00000000000
--- a/src/Dictionaries/ComplexKeyCacheDictionary_setDefaultAttributeValue.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-#include "ComplexKeyCacheDictionary.h"
-
-namespace DB
-{
-void ComplexKeyCacheDictionary::setDefaultAttributeValue(Attribute & attribute, const size_t idx) const
-{
-    switch (attribute.type)
-    {
-        case AttributeUnderlyingType::utUInt8:
-            std::get<ContainerPtrType<UInt8>>(attribute.arrays)[idx] = std::get<UInt8>(attribute.null_values);
-            break;
-        case AttributeUnderlyingType::utUInt16:
-            std::get<ContainerPtrType<UInt16>>(attribute.arrays)[idx] = std::get<UInt16>(attribute.null_values);
-            break;
-        case AttributeUnderlyingType::utUInt32:
-            std::get<ContainerPtrType<UInt32>>(attribute.arrays)[idx] = std::get<UInt32>(attribute.null_values);
-            break;
-        case AttributeUnderlyingType::utUInt64:
-            std::get<ContainerPtrType<UInt64>>(attribute.arrays)[idx] = std::get<UInt64>(attribute.null_values);
-            break;
-        case AttributeUnderlyingType::utUInt128:
-            std::get<ContainerPtrType<UInt128>>(attribute.arrays)[idx] = std::get<UInt128>(attribute.null_values);
-            break;
-        case AttributeUnderlyingType::utInt8:
-            std::get<ContainerPtrType<Int8>>(attribute.arrays)[idx] = std::get<Int8>(attribute.null_values);
-            break;
-        case AttributeUnderlyingType::utInt16:
-            std::get<ContainerPtrType<Int16>>(attribute.arrays)[idx] = std::get<Int16>(attribute.null_values);
-            break;
-        case AttributeUnderlyingType::utInt32:
-            std::get<ContainerPtrType<Int32>>(attribute.arrays)[idx] = std::get<Int32>(attribute.null_values);
-            break;
-        case AttributeUnderlyingType::utInt64:
-            std::get<ContainerPtrType<Int64>>(attribute.arrays)[idx] = std::get<Int64>(attribute.null_values);
-            break;
-        case AttributeUnderlyingType::utFloat32:
-            std::get<ContainerPtrType<Float32>>(attribute.arrays)[idx] = std::get<Float32>(attribute.null_values);
-            break;
-        case AttributeUnderlyingType::utFloat64:
-            std::get<ContainerPtrType<Float64>>(attribute.arrays)[idx] = std::get<Float64>(attribute.null_values);
-            break;
-
-        case AttributeUnderlyingType::utDecimal32:
-            std::get<ContainerPtrType<Decimal32>>(attribute.arrays)[idx] = std::get<Decimal32>(attribute.null_values);
-            break;
-        case AttributeUnderlyingType::utDecimal64:
-            std::get<ContainerPtrType<Decimal64>>(attribute.arrays)[idx] = std::get<Decimal64>(attribute.null_values);
-            break;
-        case AttributeUnderlyingType::utDecimal128:
-            std::get<ContainerPtrType<Decimal128>>(attribute.arrays)[idx] = std::get<Decimal128>(attribute.null_values);
-            break;
-
-        case AttributeUnderlyingType::utString:
-        {
-            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};
-            }
-
-            break;
-        }
-    }
-}
-
-}

From 07fab85cc464309df50674e0bedf9f9c71c6c2ec Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Tue, 29 Dec 2020 00:17:30 +0300
Subject: [PATCH 532/611] Updated SSDComplexKeyCacheDictionary to new interface

---
 .../SSDComplexKeyCacheDictionary.cpp          | 280 ++++++++++--------
 .../SSDComplexKeyCacheDictionary.h            |  90 +-----
 2 files changed, 169 insertions(+), 201 deletions(-)

diff --git a/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp b/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
index b23529eac7d..452065c20ad 100644
--- a/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
+++ b/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
@@ -24,6 +24,7 @@
 #include <city.h>
 #include <fcntl.h>
 
+#include <Functions/FunctionHelpers.h>
 
 namespace ProfileEvents
 {
@@ -1376,90 +1377,152 @@ SSDComplexKeyCacheDictionary::SSDComplexKeyCacheDictionary(
     createAttributes();
 }
 
-#define DECLARE(TYPE) \
-    void SSDComplexKeyCacheDictionary::get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes & key_types, \
-        ResultArrayType<TYPE> & out) const \
-    { \
-        const auto index = getAttributeIndex(attribute_name); \
-        checkAttributeType(this, attribute_name, dict_struct.attributes[index].underlying_type, AttributeUnderlyingType::ut##TYPE); \
-        const auto null_value = std::get<TYPE>(null_values[index]); /* NOLINT */ \
-        getItemsNumberImpl<TYPE, TYPE>(index, key_columns, key_types, out, [&](const size_t) { return null_value; }); /* NOLINT */ \
-    }
+ColumnPtr SSDComplexKeyCacheDictionary::getColumn(
+    const std::string & attribute_name,
+    const DataTypePtr &,
+    const Columns & key_columns,
+    const DataTypes & key_types,
+    const ColumnPtr default_untyped) const
+{
+    dict_struct.validateKeyTypes(key_types);
 
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
+    const auto index = getAttributeIndex(attribute_name);
 
-#define DECLARE(TYPE) \
-    void SSDComplexKeyCacheDictionary::get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes & key_types, \
-        const PaddedPODArray<TYPE> & def, \
-        ResultArrayType<TYPE> & out) const \
-    { \
-        const auto index = getAttributeIndex(attribute_name); \
-        checkAttributeType(this, attribute_name, dict_struct.attributes[index].underlying_type, AttributeUnderlyingType::ut##TYPE); \
-        getItemsNumberImpl<TYPE, TYPE>(index, key_columns, key_types, out, [&](const size_t row) { return def[row]; }); /* NOLINT */ \
-    }
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
+    ColumnPtr result;
 
-#define DECLARE(TYPE) \
-    void SSDComplexKeyCacheDictionary::get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes & key_types, \
-        const TYPE def, \
-        ResultArrayType<TYPE> & out) const \
-    { \
-        const auto index = getAttributeIndex(attribute_name); \
-        checkAttributeType(this, attribute_name, dict_struct.attributes[index].underlying_type, AttributeUnderlyingType::ut##TYPE); \
-        getItemsNumberImpl<TYPE, TYPE>(index, key_columns, key_types, out, [&](const size_t) { return def; }); /* NOLINT */ \
-    }
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
+    /// TODO: Check that attribute type is same as result type
+    /// TODO: Check if const will work as expected
+    
+    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;
+
+        if constexpr (std::is_same_v<AttributeType, String>)
+        {
+            auto column_string = ColumnString::create();
+            auto out = column_string.get();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                {
+                    getItemsStringImpl(index, key_columns, key_types, out, [&](const size_t row) { return default_col->getDataAt(row); });
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<String>();
+
+                    getItemsStringImpl(index, key_columns, key_types, out, [&](const size_t) { return StringRef{def}; });
+                }
+            }
+            else
+            {
+                const auto null_value = StringRef{std::get<String>(null_values[index])};
+
+                getItemsStringImpl(index, key_columns, key_types, out, [&](const size_t) { return null_value; });
+            }
+
+            result = std::move(column_string);
+        }
+        else if constexpr (IsNumber<AttributeType>)
+        {
+            auto column = ColumnVector<AttributeType>::create(keys_size);
+            auto& out = column->getData();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnVector<AttributeType>>(*default_untyped))
+                {
+                    getItemsNumberImpl<AttributeType, AttributeType>(
+                        index,
+                        key_columns,
+                        key_types,
+                        out,
+                        [&](const size_t row) { return default_col->getData()[row]; }
+                    );
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnVector<AttributeType>>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<AttributeType>();
+
+                    getItemsNumberImpl<AttributeType, AttributeType>(
+                        index,
+                        key_columns,
+                        key_types,
+                        out,
+                        [&](const size_t) { return def; }
+                    );
+                }
+            }
+            else
+            {
+                const auto null_value = std::get<AttributeType>(null_values[index]); /* NOLINT */
+
+                getItemsNumberImpl<AttributeType, AttributeType>(
+                    index,
+                    key_columns,
+                    key_types,
+                    out,
+                    [&](const size_t) { return null_value; });
+            }
+
+            result = std::move(column);
+        }
+        else if constexpr (IsDecimalNumber<AttributeType>)
+        {
+            // auto scale = getDecimalScale(*attribute.type);
+            auto column = ColumnDecimal<AttributeType>::create(keys_size, 0);
+            auto& out = column->getData();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnDecimal<AttributeType>>(*default_untyped))
+                {
+                    getItemsNumberImpl<AttributeType, AttributeType>(
+                        index,
+                        key_columns,
+                        key_types,
+                        out,
+                        [&](const size_t row) { return default_col->getData()[row]; }
+                    );
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnDecimal<AttributeType>>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<AttributeType>();
+
+                    getItemsNumberImpl<AttributeType, AttributeType>(
+                        index,
+                        key_columns,
+                        key_types,
+                        out,
+                        [&](const size_t) { return def; }
+                    );
+                }
+            }
+            else
+            {
+                const auto null_value = std::get<AttributeType>(null_values[index]); /* NOLINT */
+
+                getItemsNumberImpl<AttributeType, AttributeType>(
+                    index,
+                    key_columns,
+                    key_types,
+                    out,
+                    [&](const size_t) { return null_value; }
+                );
+            }
+
+            result = std::move(column);
+        }
+    };
+
+    callOnDictionaryAttributeType(dict_struct.attributes[index].underlying_type, type_call);
+   
+    return result;
+}
 
 template <typename AttributeType, typename OutputType, typename DefaultGetter>
 void SSDComplexKeyCacheDictionary::getItemsNumberImpl(
@@ -1508,42 +1571,6 @@ void SSDComplexKeyCacheDictionary::getItemsNumberImpl(
             getLifetime());
 }
 
-void SSDComplexKeyCacheDictionary::getString(
-    const std::string & attribute_name,
-    const Columns & key_columns, const DataTypes & key_types, ColumnString * out) const
-{
-    const auto index = getAttributeIndex(attribute_name);
-    checkAttributeType(this, attribute_name, dict_struct.attributes[index].underlying_type, AttributeUnderlyingType::utString);
-
-    const auto null_value = StringRef{std::get<String>(null_values[index])};
-
-    getItemsStringImpl(index, key_columns, key_types, out, [&](const size_t) { return null_value; });
-}
-
-void SSDComplexKeyCacheDictionary::getString(
-        const std::string & attribute_name,
-        const Columns & key_columns, const DataTypes & key_types,
-        const ColumnString * const def, ColumnString * const out) const
-{
-    const auto index = getAttributeIndex(attribute_name);
-    checkAttributeType(this, attribute_name, dict_struct.attributes[index].underlying_type, AttributeUnderlyingType::utString);
-
-    getItemsStringImpl(index, key_columns, key_types, out, [&](const size_t row) { return def->getDataAt(row); });
-}
-
-void SSDComplexKeyCacheDictionary::getString(
-        const std::string & attribute_name,
-        const Columns & key_columns,
-        const DataTypes & key_types,
-        const String & def,
-        ColumnString * const out) const
-{
-    const auto index = getAttributeIndex(attribute_name);
-    checkAttributeType(this, attribute_name, dict_struct.attributes[index].underlying_type, AttributeUnderlyingType::utString);
-
-    getItemsStringImpl(index, key_columns, key_types, out, [&](const size_t) { return StringRef{def}; });
-}
-
 template <typename DefaultGetter>
 void SSDComplexKeyCacheDictionary::getItemsStringImpl(
     const size_t attribute_index,
@@ -1639,20 +1666,27 @@ void SSDComplexKeyCacheDictionary::getItemsStringImpl(
     }
 }
 
-void SSDComplexKeyCacheDictionary::has(
-    const Columns & key_columns,
-    const DataTypes & key_types,
-    PaddedPODArray<UInt8> & out) const
+ColumnUInt8::Ptr SSDComplexKeyCacheDictionary::has(const Columns & key_columns, const DataTypes & key_types) const
 {
     dict_struct.validateKeyTypes(key_types);
 
+    PaddedPODArray<Key> backup_storage;
+    const auto& ids = getColumnDataAsPaddedPODArray(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<KeyRef, std::vector<size_t>> not_found_keys;
     TemporalComplexKeysPool not_found_pool;
     storage.has(key_columns, key_types, out, not_found_keys, not_found_pool, now);
     if (not_found_keys.empty())
-        return;
+        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; });
@@ -1681,6 +1715,8 @@ void SSDComplexKeyCacheDictionary::has(
                     out[row] = false;
             },
             getLifetime());
+
+    return result;
 }
 
 BlockInputStreamPtr SSDComplexKeyCacheDictionary::getBlockInputStream(
diff --git a/src/Dictionaries/SSDComplexKeyCacheDictionary.h b/src/Dictionaries/SSDComplexKeyCacheDictionary.h
index 4758d62f1df..47c8f54a77d 100644
--- a/src/Dictionaries/SSDComplexKeyCacheDictionary.h
+++ b/src/Dictionaries/SSDComplexKeyCacheDictionary.h
@@ -569,88 +569,20 @@ public:
 
     std::exception_ptr getLastException() const override { return storage.getLastException(); }
 
+    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::complex; }
+
+    ColumnPtr getColumn(
+        const std::string& attribute_name,
+        const DataTypePtr & result_type,
+        const Columns & key_columns,
+        const DataTypes & key_types,
+        const ColumnPtr default_untyped) const override;
+
+    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) const override; 
+
     template <typename T>
     using ResultArrayType = SSDComplexKeyCacheStorage::ResultArrayType<T>;
 
-#define DECLARE(TYPE) \
-    void get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes & key_types, \
-        ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void getString(const std::string & attribute_name, const Columns & key_columns,
-        const DataTypes & key_types, ColumnString * out) const;
-
-#define DECLARE(TYPE) \
-    void get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes & key_types, \
-        const PaddedPODArray<TYPE> & def, \
-        ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void getString(const std::string & attribute_name, const Columns & key_columns,
-        const DataTypes & key_types, const ColumnString * const def, ColumnString * const out) const;
-
-#define DECLARE(TYPE) \
-    void get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes & key_types, \
-        const TYPE def, \
-        ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void getString(const std::string & attribute_name, const Columns & key_columns,
-        const DataTypes & key_types, const String & def, ColumnString * const out) const;
-
-    void has(const Columns & key_columns, const DataTypes & key_types, PaddedPODArray<UInt8> & out) const;
-
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
 
 private:

From 6f7ad821602104e0849f1ae020ba0c1c5a2e2b2b Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Tue, 29 Dec 2020 13:09:01 +0300
Subject: [PATCH 533/611] Updated IPAddressDictionary to new interface

---
 src/Dictionaries/IPAddressDictionary.cpp | 473 +++++++++--------------
 src/Dictionaries/IPAddressDictionary.h   |  87 +----
 2 files changed, 196 insertions(+), 364 deletions(-)

diff --git a/src/Dictionaries/IPAddressDictionary.cpp b/src/Dictionaries/IPAddressDictionary.cpp
index f8af4686ad8..0f2c2c8a706 100644
--- a/src/Dictionaries/IPAddressDictionary.cpp
+++ b/src/Dictionaries/IPAddressDictionary.cpp
@@ -16,6 +16,7 @@
 #include <ext/range.h>
 #include "DictionaryBlockInputStream.h"
 #include "DictionaryFactory.h"
+#include <Functions/FunctionHelpers.h>
 
 namespace DB
 {
@@ -266,167 +267,170 @@ IPAddressDictionary::IPAddressDictionary(
     calculateBytesAllocated();
 }
 
-#define DECLARE(TYPE) \
-    void IPAddressDictionary::get##TYPE( \
-        const std::string & attribute_name, const Columns & key_columns, const DataTypes & key_types, ResultArrayType<TYPE> & out) const \
-    { \
-        validateKeyTypes(key_types); \
-\
-        const auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-\
-        const auto null_value = std::get<TYPE>(attribute.null_values); \
-\
-        getItemsImpl<TYPE, TYPE>( \
-            attribute, \
-            key_columns, \
-            [&](const size_t row, const auto value) { out[row] = value; }, \
-            [&](const size_t) { return null_value; }); \
-    }
-DECLARE(UInt8)
-DECLARE(UInt16)
-DECLARE(UInt32)
-DECLARE(UInt64)
-DECLARE(UInt128)
-DECLARE(Int8)
-DECLARE(Int16)
-DECLARE(Int32)
-DECLARE(Int64)
-DECLARE(Float32)
-DECLARE(Float64)
-DECLARE(Decimal32)
-DECLARE(Decimal64)
-DECLARE(Decimal128)
-#undef DECLARE
-
-void IPAddressDictionary::getString(
-    const std::string & attribute_name, const Columns & key_columns, const DataTypes & key_types, ColumnString * out) const
-{
-    validateKeyTypes(key_types);
-
-    const auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
-
-    const auto & null_value = StringRef{std::get<String>(attribute.null_values)};
-
-    getItemsImpl<StringRef, StringRef>(
-        attribute,
-        key_columns,
-        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-        [&](const size_t) { return null_value; });
-}
-
-#define DECLARE(TYPE) \
-    void IPAddressDictionary::get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes & key_types, \
-        const PaddedPODArray<TYPE> & def, \
-        ResultArrayType<TYPE> & out) const \
-    { \
-        validateKeyTypes(key_types); \
-\
-        const auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-\
-        getItemsImpl<TYPE, TYPE>( \
-            attribute, \
-            key_columns, \
-            [&](const size_t row, const auto value) { out[row] = value; }, \
-            [&](const size_t row) { return def[row]; }); \
-    }
-DECLARE(UInt8)
-DECLARE(UInt16)
-DECLARE(UInt32)
-DECLARE(UInt64)
-DECLARE(UInt128)
-DECLARE(Int8)
-DECLARE(Int16)
-DECLARE(Int32)
-DECLARE(Int64)
-DECLARE(Float32)
-DECLARE(Float64)
-DECLARE(Decimal32)
-DECLARE(Decimal64)
-DECLARE(Decimal128)
-#undef DECLARE
-
-void IPAddressDictionary::getString(
+ColumnPtr IPAddressDictionary::getColumn(
     const std::string & attribute_name,
+    const DataTypePtr &,
     const Columns & key_columns,
     const DataTypes & key_types,
-    const ColumnString * const def,
-    ColumnString * const out) const
+    const ColumnPtr default_untyped) const
 {
     validateKeyTypes(key_types);
 
-    const auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
-
-    getItemsImpl<StringRef, StringRef>(
-        attribute,
-        key_columns,
-        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-        [&](const size_t row) { return def->getDataAt(row); });
-}
-
-#define DECLARE(TYPE) \
-    void IPAddressDictionary::get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes & key_types, \
-        const TYPE def, \
-        ResultArrayType<TYPE> & out) const \
-    { \
-        validateKeyTypes(key_types); \
-\
-        const auto & attribute = getAttribute(attribute_name); \
-        checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::ut##TYPE); \
-\
-        getItemsImpl<TYPE, TYPE>( \
-            attribute, key_columns, [&](const size_t row, const auto value) { out[row] = value; }, [&](const size_t) { return def; }); \
-    }
-DECLARE(UInt8)
-DECLARE(UInt16)
-DECLARE(UInt32)
-DECLARE(UInt64)
-DECLARE(UInt128)
-DECLARE(Int8)
-DECLARE(Int16)
-DECLARE(Int32)
-DECLARE(Int64)
-DECLARE(Float32)
-DECLARE(Float64)
-DECLARE(Decimal32)
-DECLARE(Decimal64)
-DECLARE(Decimal128)
-#undef DECLARE
-
-void IPAddressDictionary::getString(
-    const std::string & attribute_name,
-    const Columns & key_columns,
-    const DataTypes & key_types,
-    const String & def,
-    ColumnString * const out) const
-{
-    validateKeyTypes(key_types);
+    ColumnPtr result;
 
     const auto & attribute = getAttribute(attribute_name);
-    checkAttributeType(this, attribute_name, attribute.type, AttributeUnderlyingType::utString);
 
-    getItemsImpl<StringRef, StringRef>(
-        attribute,
-        key_columns,
-        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-        [&](const size_t) { return StringRef{def}; });
+    /// TODO: Check that attribute type is same as result type
+    /// TODO: Check if const will work as expected
+    
+    auto 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;
+
+        if constexpr (std::is_same_v<AttributeType, String>)
+        {
+            auto column_string = ColumnString::create();
+            auto out = column_string.get();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                {
+                    getItemsImpl<StringRef, StringRef>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                        [&](const size_t row) { return default_col->getDataAt(row); });
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<String>();
+
+                    getItemsImpl<StringRef, StringRef>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                        [&](const size_t) { return StringRef { def }; });
+                }
+            }
+            else
+            {
+                const auto & null_value = StringRef{std::get<String>(attribute.null_values)};
+
+                getItemsImpl<StringRef, StringRef>(
+                    attribute,
+                    key_columns,
+                    [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                    [&](const size_t) { return null_value; });
+            }
+
+            result = std::move(column_string);
+        }
+        else if constexpr (IsNumber<AttributeType>)
+        {
+            auto column = ColumnVector<AttributeType>::create(size);
+            auto& out = column->getData();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnVector<AttributeType>>(*default_untyped))
+                {
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row) { return default_col->getData()[row]; }
+                    );
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnVector<AttributeType>>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<AttributeType>();
+
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t) { return def; }
+                    );
+                }
+            }
+            else
+            {
+                const auto null_value = std::get<AttributeType>(attribute.null_values);
+
+                getItemsImpl<AttributeType, AttributeType>(
+                    attribute,
+                    key_columns,
+                    [&](const size_t row, const auto value) { return out[row] = value; },
+                    [&](const size_t) { return null_value; });
+            }
+
+            result = std::move(column);
+        }
+        else if constexpr (IsDecimalNumber<AttributeType>)
+        {
+            // auto scale = getDecimalScale(*attribute.type);
+            auto column = ColumnDecimal<AttributeType>::create(size, 0);
+            auto& out = column->getData();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnDecimal<AttributeType>>(*default_untyped))
+                {
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row) { return default_col->getData()[row]; }
+                    );
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnDecimal<AttributeType>>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<AttributeType>();
+
+                    getItemsImpl<AttributeType, AttributeType>(
+                        attribute,
+                        key_columns,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t) { return def; }
+                    );
+                }
+            }
+            else
+            {
+                const auto null_value = std::get<AttributeType>(attribute.null_values);
+
+                getItemsImpl<AttributeType, AttributeType>(
+                    attribute,
+                    key_columns,
+                    [&](const size_t row, const auto value) { return out[row] = value; },
+                    [&](const size_t) { return null_value; }
+                );
+            }
+
+            result = std::move(column);
+        }
+    };
+
+    callOnDictionaryAttributeType(attribute.type, type_call);
+   
+    return result;
 }
 
-void IPAddressDictionary::has(const Columns & key_columns, const DataTypes & key_types, PaddedPODArray<UInt8> & out) const
+
+ColumnUInt8::Ptr IPAddressDictionary::has(const Columns & key_columns, const DataTypes & key_types) const
 {
     validateKeyTypes(key_types);
 
     const auto first_column = key_columns.front();
     const auto rows = first_column->size();
+
+    auto result = ColumnUInt8::create(rows);
+    auto& out = result->getData();
+
     if (first_column->isNumeric())
     {
         uint8_t addrv6_buf[IPV6_BINARY_LENGTH];
@@ -451,6 +455,8 @@ void IPAddressDictionary::has(const Columns & key_columns, const DataTypes & key
     }
 
     query_count.fetch_add(rows, std::memory_order_relaxed);
+
+    return result;
 }
 
 void IPAddressDictionary::createAttributes()
@@ -652,6 +658,13 @@ void IPAddressDictionary::addAttributeSize(const Attribute & attribute)
     bucket_count = vec.size();
 }
 
+template <>
+void IPAddressDictionary::addAttributeSize<String>(const Attribute & attribute)
+{
+    addAttributeSize<StringRef>(attribute);
+    bytes_allocated += sizeof(Arena) + attribute.string_arena->size();
+}
+
 void IPAddressDictionary::calculateBytesAllocated()
 {
     if (auto * ipv4_col = std::get_if<IPv4Container>(&ip_column))
@@ -669,64 +682,18 @@ void IPAddressDictionary::calculateBytesAllocated()
 
     for (const auto & attribute : attributes)
     {
-        switch (attribute.type)
+        auto type_call = [&](const auto & dictionary_attribute_type)
         {
-            case AttributeUnderlyingType::utUInt8:
-                addAttributeSize<UInt8>(attribute);
-                break;
-            case AttributeUnderlyingType::utUInt16:
-                addAttributeSize<UInt16>(attribute);
-                break;
-            case AttributeUnderlyingType::utUInt32:
-                addAttributeSize<UInt32>(attribute);
-                break;
-            case AttributeUnderlyingType::utUInt64:
-                addAttributeSize<UInt64>(attribute);
-                break;
-            case AttributeUnderlyingType::utUInt128:
-                addAttributeSize<UInt128>(attribute);
-                break;
-            case AttributeUnderlyingType::utInt8:
-                addAttributeSize<Int8>(attribute);
-                break;
-            case AttributeUnderlyingType::utInt16:
-                addAttributeSize<Int16>(attribute);
-                break;
-            case AttributeUnderlyingType::utInt32:
-                addAttributeSize<Int32>(attribute);
-                break;
-            case AttributeUnderlyingType::utInt64:
-                addAttributeSize<Int64>(attribute);
-                break;
-            case AttributeUnderlyingType::utFloat32:
-                addAttributeSize<Float32>(attribute);
-                break;
-            case AttributeUnderlyingType::utFloat64:
-                addAttributeSize<Float64>(attribute);
-                break;
+            using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+            using AttributeType = typename Type::AttributeType;
 
-            case AttributeUnderlyingType::utDecimal32:
-                addAttributeSize<Decimal32>(attribute);
-                break;
-            case AttributeUnderlyingType::utDecimal64:
-                addAttributeSize<Decimal64>(attribute);
-                break;
-            case AttributeUnderlyingType::utDecimal128:
-                addAttributeSize<Decimal128>(attribute);
-                break;
+            addAttributeSize<AttributeType>(attribute);
+        };
 
-            case AttributeUnderlyingType::utString:
-            {
-                addAttributeSize<StringRef>(attribute);
-                bytes_allocated += sizeof(Arena) + attribute.string_arena->size();
-
-                break;
-            }
-        }
+        callOnDictionaryAttributeType(attribute.type, type_call);
     }
 }
 
-
 template <typename T>
 void IPAddressDictionary::createAttributeImpl(Attribute & attribute, const Field & null_value)
 {
@@ -734,65 +701,27 @@ void IPAddressDictionary::createAttributeImpl(Attribute & attribute, const Field
     attribute.maps.emplace<ContainerType<T>>();
 }
 
+template <>
+void IPAddressDictionary::createAttributeImpl<String>(Attribute & attribute, const Field & null_value)
+{
+    attribute.null_values = null_value.isNull() ? String() : null_value.get<String>();
+    attribute.maps.emplace<ContainerType<StringRef>>();
+    attribute.string_arena = std::make_unique<Arena>();
+}
+
 IPAddressDictionary::Attribute IPAddressDictionary::createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value)
 {
     Attribute attr{type, {}, {}, {}};
 
-    switch (type)
+    auto type_call = [&](const auto & dictionary_attribute_type)
     {
-        case AttributeUnderlyingType::utUInt8:
-            createAttributeImpl<UInt8>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt16:
-            createAttributeImpl<UInt16>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt32:
-            createAttributeImpl<UInt32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt64:
-            createAttributeImpl<UInt64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utUInt128:
-            createAttributeImpl<UInt128>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt8:
-            createAttributeImpl<Int8>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt16:
-            createAttributeImpl<Int16>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt32:
-            createAttributeImpl<Int32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utInt64:
-            createAttributeImpl<Int64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utFloat32:
-            createAttributeImpl<Float32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utFloat64:
-            createAttributeImpl<Float64>(attr, null_value);
-            break;
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
 
-        case AttributeUnderlyingType::utDecimal32:
-            createAttributeImpl<Decimal32>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utDecimal64:
-            createAttributeImpl<Decimal64>(attr, null_value);
-            break;
-        case AttributeUnderlyingType::utDecimal128:
-            createAttributeImpl<Decimal128>(attr, null_value);
-            break;
+        createAttributeImpl<AttributeType>(attr, null_value);
+    };
 
-        case AttributeUnderlyingType::utString:
-        {
-
-            attr.null_values = null_value.isNull() ? String() : null_value.get<String>();
-            attr.maps.emplace<ContainerType<StringRef>>();
-            attr.string_arena = std::make_unique<Arena>();
-            break;
-        }
-    }
+    callOnDictionaryAttributeType(type, type_call);
 
     return attr;
 }
@@ -940,45 +869,23 @@ void IPAddressDictionary::setAttributeValueImpl(Attribute & attribute, const T v
 
 void IPAddressDictionary::setAttributeValue(Attribute & attribute, const Field & value)
 {
-    switch (attribute.type)
-    {
-        case AttributeUnderlyingType::utUInt8:
-            return setAttributeValueImpl<UInt8>(attribute, value.get<UInt64>());
-        case AttributeUnderlyingType::utUInt16:
-            return setAttributeValueImpl<UInt16>(attribute, value.get<UInt64>());
-        case AttributeUnderlyingType::utUInt32:
-            return setAttributeValueImpl<UInt32>(attribute, value.get<UInt64>());
-        case AttributeUnderlyingType::utUInt64:
-            return setAttributeValueImpl<UInt64>(attribute, value.get<UInt64>());
-        case AttributeUnderlyingType::utUInt128:
-            return setAttributeValueImpl<UInt128>(attribute, value.get<UInt128>());
-        case AttributeUnderlyingType::utInt8:
-            return setAttributeValueImpl<Int8>(attribute, value.get<Int64>());
-        case AttributeUnderlyingType::utInt16:
-            return setAttributeValueImpl<Int16>(attribute, value.get<Int64>());
-        case AttributeUnderlyingType::utInt32:
-            return setAttributeValueImpl<Int32>(attribute, value.get<Int64>());
-        case AttributeUnderlyingType::utInt64:
-            return setAttributeValueImpl<Int64>(attribute, value.get<Int64>());
-        case AttributeUnderlyingType::utFloat32:
-            return setAttributeValueImpl<Float32>(attribute, value.get<Float64>());
-        case AttributeUnderlyingType::utFloat64:
-            return setAttributeValueImpl<Float64>(attribute, value.get<Float64>());
+    auto type_call = [&](const auto & dictionary_attribute_type) {
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
 
-        case AttributeUnderlyingType::utDecimal32:
-            return setAttributeValueImpl<Decimal32>(attribute, value.get<Decimal32>());
-        case AttributeUnderlyingType::utDecimal64:
-            return setAttributeValueImpl<Decimal64>(attribute, value.get<Decimal64>());
-        case AttributeUnderlyingType::utDecimal128:
-            return setAttributeValueImpl<Decimal128>(attribute, value.get<Decimal128>());
-
-        case AttributeUnderlyingType::utString:
+        if constexpr (std::is_same_v<AttributeType, String>)
         {
             const auto & string = value.get<String>();
             const auto * string_in_arena = attribute.string_arena->insert(string.data(), string.size());
-            return setAttributeValueImpl<StringRef>(attribute, StringRef{string_in_arena, string.size()});
+            setAttributeValueImpl<StringRef>(attribute, StringRef{string_in_arena, string.size()}); 
         }
-    }
+        else
+        {
+            setAttributeValueImpl<AttributeType>(attribute, value.get<NearestFieldType<AttributeType>>());
+        }
+    };
+
+    callOnDictionaryAttributeType(attribute.type, type_call);
 }
 
 const IPAddressDictionary::Attribute & IPAddressDictionary::getAttribute(const std::string & attribute_name) const
diff --git a/src/Dictionaries/IPAddressDictionary.h b/src/Dictionaries/IPAddressDictionary.h
index 2009141ebcc..7db46ddf6a5 100644
--- a/src/Dictionaries/IPAddressDictionary.h
+++ b/src/Dictionaries/IPAddressDictionary.h
@@ -61,91 +61,16 @@ public:
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
     }
 
-    template <typename T>
-    using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
+    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::complex; }
 
-#define DECLARE(TYPE) \
-    void get##TYPE( \
-        const std::string & attribute_name, const Columns & key_columns, const DataTypes & key_types, ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void getString(const std::string & attribute_name, const Columns & key_columns, const DataTypes & key_types, ColumnString * out) const;
-
-#define DECLARE(TYPE) \
-    void get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes & key_types, \
-        const PaddedPODArray<TYPE> & def, \
-        ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void getString(
-        const std::string & attribute_name,
+    ColumnPtr getColumn(
+        const std::string& attribute_name,
+        const DataTypePtr & result_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnString * const def,
-        ColumnString * const out) const;
+        const ColumnPtr default_untyped) const override;
 
-#define DECLARE(TYPE) \
-    void get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes & key_types, \
-        const TYPE def, \
-        ResultArrayType<TYPE> & out) const;
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-    void getString(
-        const std::string & attribute_name,
-        const Columns & key_columns,
-        const DataTypes & key_types,
-        const String & def,
-        ColumnString * const out) const;
-
-    void has(const Columns & key_columns, const DataTypes & key_types, PaddedPODArray<UInt8> & out) const;
+    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) const override; 
 
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
 

From 0ed64d8ab0c5301c2e9eed1317dad86b9ba29a85 Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Tue, 29 Dec 2020 13:46:25 +0300
Subject: [PATCH 534/611] Simplified getColumn implementation

---
 src/Dictionaries/CacheDictionary.cpp          |  63 +++-------
 .../ComplexKeyCacheDictionary.cpp             |  63 +++-------
 .../ComplexKeyDirectDictionary.cpp            |  63 +++-------
 .../ComplexKeyHashedDictionary.cpp            |  63 +++-------
 src/Dictionaries/DirectDictionary.cpp         |  63 +++-------
 src/Dictionaries/FlatDictionary.cpp           |  63 +++-------
 src/Dictionaries/HashedDictionary.cpp         |  63 +++-------
 src/Dictionaries/IPAddressDictionary.cpp      |  63 +++-------
 src/Dictionaries/RangeHashedDictionary.cpp    | 118 +++---------------
 src/Dictionaries/SSDCacheDictionary.cpp       |  63 +++-------
 .../SSDComplexKeyCacheDictionary.cpp          |  66 +++-------
 11 files changed, 187 insertions(+), 564 deletions(-)

diff --git a/src/Dictionaries/CacheDictionary.cpp b/src/Dictionaries/CacheDictionary.cpp
index c7517332594..cbb12d3b2ec 100644
--- a/src/Dictionaries/CacheDictionary.cpp
+++ b/src/Dictionaries/CacheDictionary.cpp
@@ -299,14 +299,27 @@ ColumnPtr CacheDictionary::getColumn(
 
             result = std::move(column_string);
         }
-        else if constexpr (IsNumber<AttributeType>)
+        else
         {
-            auto column = ColumnVector<AttributeType>::create(identifiers_size);
+            using ResultColumnType
+                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
+            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
+
+            ResultColumnPtr column;
+
+            if constexpr (IsDecimalNumber<AttributeType>)
+            {
+                // auto scale = getDecimalScale(*attribute.type);
+                column = ColumnDecimal<AttributeType>::create(identifiers_size, 0);
+            }
+            else if constexpr (IsNumber<AttributeType>)
+                column = ColumnVector<AttributeType>::create(identifiers_size);
+ 
             auto& out = column->getData();
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ColumnVector<AttributeType>>(*default_untyped))
+                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
                 {
                     getItemsNumberImpl<AttributeType, AttributeType>(
                         attribute,
@@ -315,49 +328,7 @@ ColumnPtr CacheDictionary::getColumn(
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnVector<AttributeType>>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<AttributeType>();
-
-                    getItemsNumberImpl<AttributeType, AttributeType>(
-                        attribute,
-                        ids,
-                        out,
-                        [&](const size_t) { return def; }
-                    );
-                }
-            }
-            else
-            {
-                const auto null_value = std::get<AttributeType>(attribute.null_value);
-
-                getItemsNumberImpl<AttributeType, AttributeType>(
-                    attribute,
-                    ids,
-                    out,
-                    [&](const size_t) { return null_value; });
-            }
-
-            result = std::move(column);
-        }
-        else if constexpr (IsDecimalNumber<AttributeType>)
-        {
-            // auto scale = getDecimalScale(*attribute.type);
-            auto column = ColumnDecimal<AttributeType>::create(identifiers_size, 0);
-            auto& out = column->getData();
-
-            if (default_untyped != nullptr)
-            {
-                if (const auto default_col = checkAndGetColumn<ColumnDecimal<AttributeType>>(*default_untyped))
-                {
-                    getItemsNumberImpl<AttributeType, AttributeType>(
-                        attribute,
-                        ids,
-                        out,
-                        [&](const size_t row) { return default_col->getData()[row]; }
-                    );
-                }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnDecimal<AttributeType>>(default_untyped.get()))
+                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary.cpp b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
index 504db30b8d1..be67121aef1 100644
--- a/src/Dictionaries/ComplexKeyCacheDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
@@ -121,14 +121,27 @@ ColumnPtr ComplexKeyCacheDictionary::getColumn(
 
             result = std::move(column_string);
         }
-        else if constexpr (IsNumber<AttributeType>)
+        else
         {
-            auto column = ColumnVector<AttributeType>::create(keys_size);
+            using ResultColumnType
+                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
+            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
+
+            ResultColumnPtr column;
+
+            if constexpr (IsDecimalNumber<AttributeType>)
+            {
+                // auto scale = getDecimalScale(*attribute.type);
+                column = ColumnDecimal<AttributeType>::create(keys_size, 0);
+            }
+            else if constexpr (IsNumber<AttributeType>)
+                column = ColumnVector<AttributeType>::create(keys_size);
+ 
             auto& out = column->getData();
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ColumnVector<AttributeType>>(*default_untyped))
+                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
                 {
                     getItemsNumberImpl<AttributeType, AttributeType>(
                         attribute,
@@ -137,49 +150,7 @@ ColumnPtr ComplexKeyCacheDictionary::getColumn(
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnVector<AttributeType>>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<AttributeType>();
-
-                    getItemsNumberImpl<AttributeType, AttributeType>(
-                        attribute,
-                        key_columns,
-                        out,
-                        [&](const size_t) { return def; }
-                    );
-                }
-            }
-            else
-            {
-                const auto null_value = std::get<AttributeType>(attribute.null_values);
-
-                getItemsNumberImpl<AttributeType, AttributeType>(
-                    attribute,
-                    key_columns,
-                    out,
-                    [&](const size_t) { return null_value; });
-            }
-
-            result = std::move(column);
-        }
-        else if constexpr (IsDecimalNumber<AttributeType>)
-        {
-            // auto scale = getDecimalScale(*attribute.type);
-            auto column = ColumnDecimal<AttributeType>::create(keys_size, 0);
-            auto& out = column->getData();
-
-            if (default_untyped != nullptr)
-            {
-                if (const auto default_col = checkAndGetColumn<ColumnDecimal<AttributeType>>(*default_untyped))
-                {
-                    getItemsNumberImpl<AttributeType, AttributeType>(
-                        attribute,
-                        key_columns,
-                        out,
-                        [&](const size_t row) { return default_col->getData()[row]; }
-                    );
-                }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnDecimal<AttributeType>>(default_untyped.get()))
+                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 
diff --git a/src/Dictionaries/ComplexKeyDirectDictionary.cpp b/src/Dictionaries/ComplexKeyDirectDictionary.cpp
index 0668c5da07a..8e084375499 100644
--- a/src/Dictionaries/ComplexKeyDirectDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyDirectDictionary.cpp
@@ -110,14 +110,27 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
 
             result = std::move(column_string);
         }
-        else if constexpr (IsNumber<AttributeType>)
+        else
         {
-            auto column = ColumnVector<AttributeType>::create(size);
+            using ResultColumnType
+                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
+            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
+
+            ResultColumnPtr column;
+
+            if constexpr (IsDecimalNumber<AttributeType>)
+            {
+                // auto scale = getDecimalScale(*attribute.type);
+                column = ColumnDecimal<AttributeType>::create(size, 0);
+            }
+            else if constexpr (IsNumber<AttributeType>)
+                column = ColumnVector<AttributeType>::create(size);
+ 
             auto& out = column->getData();
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ColumnVector<AttributeType>>(*default_untyped))
+                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
                 {
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
@@ -126,49 +139,7 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnVector<AttributeType>>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<AttributeType>();
-
-                    getItemsImpl<AttributeType, AttributeType>(
-                        attribute,
-                        key_columns,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
-                        [&](const size_t) { return def; }
-                    );
-                }
-            }
-            else
-            {
-                const auto null_value = std::get<AttributeType>(attribute.null_values);
-
-                getItemsImpl<AttributeType, AttributeType>(
-                    attribute,
-                    key_columns,
-                    [&](const size_t row, const auto value) { return out[row] = value; },
-                    [&](const size_t) { return null_value; });
-            }
-
-            result = std::move(column);
-        }
-        else if constexpr (IsDecimalNumber<AttributeType>)
-        {
-            // auto scale = getDecimalScale(*attribute.type);
-            auto column = ColumnDecimal<AttributeType>::create(size, 0);
-            auto& out = column->getData();
-
-            if (default_untyped != nullptr)
-            {
-                if (const auto default_col = checkAndGetColumn<ColumnDecimal<AttributeType>>(*default_untyped))
-                {
-                    getItemsImpl<AttributeType, AttributeType>(
-                        attribute,
-                        key_columns,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
-                        [&](const size_t row) { return default_col->getData()[row]; }
-                    );
-                }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnDecimal<AttributeType>>(default_untyped.get()))
+                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 
diff --git a/src/Dictionaries/ComplexKeyHashedDictionary.cpp b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
index 23d28bfe6ec..a74185ec887 100644
--- a/src/Dictionaries/ComplexKeyHashedDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
@@ -96,14 +96,27 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
 
             result = std::move(column_string);
         }
-        else if constexpr (IsNumber<AttributeType>)
+        else
         {
-            auto column = ColumnVector<AttributeType>::create(size);
+            using ResultColumnType
+                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
+            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
+
+            ResultColumnPtr column;
+
+            if constexpr (IsDecimalNumber<AttributeType>)
+            {
+                // auto scale = getDecimalScale(*attribute.type);
+                column = ColumnDecimal<AttributeType>::create(size, 0);
+            }
+            else if constexpr (IsNumber<AttributeType>)
+                column = ColumnVector<AttributeType>::create(size);
+ 
             auto& out = column->getData();
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ColumnVector<AttributeType>>(*default_untyped))
+                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
                 {
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
@@ -112,49 +125,7 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnVector<AttributeType>>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<AttributeType>();
-
-                    getItemsImpl<AttributeType, AttributeType>(
-                        attribute,
-                        key_columns,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
-                        [&](const size_t) { return def; }
-                    );
-                }
-            }
-            else
-            {
-                const auto null_value = std::get<AttributeType>(attribute.null_values);
-
-                getItemsImpl<AttributeType, AttributeType>(
-                    attribute,
-                    key_columns,
-                    [&](const size_t row, const auto value) { return out[row] = value; },
-                    [&](const size_t) { return null_value; });
-            }
-
-            result = std::move(column);
-        }
-        else if constexpr (IsDecimalNumber<AttributeType>)
-        {
-            // auto scale = getDecimalScale(*attribute.type);
-            auto column = ColumnDecimal<AttributeType>::create(size, 0);
-            auto& out = column->getData();
-
-            if (default_untyped != nullptr)
-            {
-                if (const auto default_col = checkAndGetColumn<ColumnDecimal<AttributeType>>(*default_untyped))
-                {
-                    getItemsImpl<AttributeType, AttributeType>(
-                        attribute,
-                        key_columns,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
-                        [&](const size_t row) { return default_col->getData()[row]; }
-                    );
-                }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnDecimal<AttributeType>>(default_untyped.get()))
+                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 
diff --git a/src/Dictionaries/DirectDictionary.cpp b/src/Dictionaries/DirectDictionary.cpp
index d024a7d7059..8018fc02fcf 100644
--- a/src/Dictionaries/DirectDictionary.cpp
+++ b/src/Dictionaries/DirectDictionary.cpp
@@ -207,14 +207,27 @@ ColumnPtr DirectDictionary::getColumn(
 
             result = std::move(column_string);
         }
-        else if constexpr (IsNumber<AttributeType>)
+        else
         {
-            auto column = ColumnVector<AttributeType>::create(size);
+            using ResultColumnType
+                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
+            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
+
+            ResultColumnPtr column;
+
+            if constexpr (IsDecimalNumber<AttributeType>)
+            {
+                // auto scale = getDecimalScale(*attribute.type);
+                column = ColumnDecimal<AttributeType>::create(size, 0);
+            }
+            else if constexpr (IsNumber<AttributeType>)
+                column = ColumnVector<AttributeType>::create(size);
+ 
             auto& out = column->getData();
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ColumnVector<AttributeType>>(*default_untyped))
+                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
                 {
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
@@ -223,49 +236,7 @@ ColumnPtr DirectDictionary::getColumn(
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnVector<AttributeType>>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<AttributeType>();
-
-                    getItemsImpl<AttributeType, AttributeType>(
-                        attribute,
-                        ids,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
-                        [&](const size_t) { return def; }
-                    );
-                }
-            }
-            else
-            {
-                const auto null_value = std::get<AttributeType>(attribute.null_values);
-
-                getItemsImpl<AttributeType, AttributeType>(
-                    attribute,
-                    ids,
-                    [&](const size_t row, const auto value) { return out[row] = value; },
-                    [&](const size_t) { return null_value; });
-            }
-
-            result = std::move(column);
-        }
-        else if constexpr (IsDecimalNumber<AttributeType>)
-        {
-            // auto scale = getDecimalScale(*attribute.type);
-            auto column = ColumnDecimal<AttributeType>::create(size, 0);
-            auto& out = column->getData();
-
-            if (default_untyped != nullptr)
-            {
-                if (const auto default_col = checkAndGetColumn<ColumnDecimal<AttributeType>>(*default_untyped))
-                {
-                    getItemsImpl<AttributeType, AttributeType>(
-                        attribute,
-                        ids,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
-                        [&](const size_t row) { return default_col->getData()[row]; }
-                    );
-                }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnDecimal<AttributeType>>(default_untyped.get()))
+                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 
diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index 790c0100d24..2c856dc59ca 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -168,14 +168,27 @@ ColumnPtr FlatDictionary::getColumn(
 
             result = std::move(column_string);
         }
-        else if constexpr (IsNumber<AttributeType>)
+        else
         {
-            auto column = ColumnVector<AttributeType>::create(size);
+            using ResultColumnType
+                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
+            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
+
+            ResultColumnPtr column;
+
+            if constexpr (IsDecimalNumber<AttributeType>)
+            {
+                // auto scale = getDecimalScale(*attribute.type);
+                column = ColumnDecimal<AttributeType>::create(size, 0);
+            }
+            else if constexpr (IsNumber<AttributeType>)
+                column = ColumnVector<AttributeType>::create(size);
+ 
             auto& out = column->getData();
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ColumnVector<AttributeType>>(*default_untyped))
+                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
                 {
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
@@ -184,49 +197,7 @@ ColumnPtr FlatDictionary::getColumn(
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnVector<AttributeType>>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<AttributeType>();
-
-                    getItemsImpl<AttributeType, AttributeType>(
-                        attribute,
-                        ids,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
-                        [&](const size_t) { return def; }
-                    );
-                }
-            }
-            else
-            {
-                const auto null_value = std::get<AttributeType>(attribute.null_values);
-
-                getItemsImpl<AttributeType, AttributeType>(
-                    attribute,
-                    ids,
-                    [&](const size_t row, const auto value) { return out[row] = value; },
-                    [&](const size_t) { return null_value; });
-            }
-
-            result = std::move(column);
-        }
-        else if constexpr (IsDecimalNumber<AttributeType>)
-        {
-            // auto scale = getDecimalScale(*attribute.type);
-            auto column = ColumnDecimal<AttributeType>::create(size, 0);
-            auto& out = column->getData();
-
-            if (default_untyped != nullptr)
-            {
-                if (const auto default_col = checkAndGetColumn<ColumnDecimal<AttributeType>>(*default_untyped))
-                {
-                    getItemsImpl<AttributeType, AttributeType>(
-                        attribute,
-                        ids,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
-                        [&](const size_t row) { return default_col->getData()[row]; }
-                    );
-                }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnDecimal<AttributeType>>(default_untyped.get()))
+                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 
diff --git a/src/Dictionaries/HashedDictionary.cpp b/src/Dictionaries/HashedDictionary.cpp
index 3034d585f88..a1e3f176706 100644
--- a/src/Dictionaries/HashedDictionary.cpp
+++ b/src/Dictionaries/HashedDictionary.cpp
@@ -190,14 +190,27 @@ ColumnPtr HashedDictionary::getColumn(
 
             result = std::move(column_string);
         }
-        else if constexpr (IsNumber<AttributeType>)
+        else
         {
-            auto column = ColumnVector<AttributeType>::create(size);
+            using ResultColumnType
+                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
+            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
+
+            ResultColumnPtr column;
+
+            if constexpr (IsDecimalNumber<AttributeType>)
+            {
+                // auto scale = getDecimalScale(*attribute.type);
+                column = ColumnDecimal<AttributeType>::create(size, 0);
+            }
+            else if constexpr (IsNumber<AttributeType>)
+                column = ColumnVector<AttributeType>::create(size);
+ 
             auto& out = column->getData();
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ColumnVector<AttributeType>>(*default_untyped))
+                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
                 {
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
@@ -206,49 +219,7 @@ ColumnPtr HashedDictionary::getColumn(
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnVector<AttributeType>>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<AttributeType>();
-
-                    getItemsImpl<AttributeType, AttributeType>(
-                        attribute,
-                        ids,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
-                        [&](const size_t) { return def; }
-                    );
-                }
-            }
-            else
-            {
-                const auto null_value = std::get<AttributeType>(attribute.null_values);
-
-                getItemsImpl<AttributeType, AttributeType>(
-                    attribute,
-                    ids,
-                    [&](const size_t row, const auto value) { return out[row] = value; },
-                    [&](const size_t) { return null_value; });
-            }
-
-            result = std::move(column);
-        }
-        else if constexpr (IsDecimalNumber<AttributeType>)
-        {
-            // auto scale = getDecimalScale(*attribute.type);
-            auto column = ColumnDecimal<AttributeType>::create(size, 0);
-            auto& out = column->getData();
-
-            if (default_untyped != nullptr)
-            {
-                if (const auto default_col = checkAndGetColumn<ColumnDecimal<AttributeType>>(*default_untyped))
-                {
-                    getItemsImpl<AttributeType, AttributeType>(
-                        attribute,
-                        ids,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
-                        [&](const size_t row) { return default_col->getData()[row]; }
-                    );
-                }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnDecimal<AttributeType>>(default_untyped.get()))
+                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 
diff --git a/src/Dictionaries/IPAddressDictionary.cpp b/src/Dictionaries/IPAddressDictionary.cpp
index 0f2c2c8a706..028b01607d0 100644
--- a/src/Dictionaries/IPAddressDictionary.cpp
+++ b/src/Dictionaries/IPAddressDictionary.cpp
@@ -329,14 +329,27 @@ ColumnPtr IPAddressDictionary::getColumn(
 
             result = std::move(column_string);
         }
-        else if constexpr (IsNumber<AttributeType>)
+        else
         {
-            auto column = ColumnVector<AttributeType>::create(size);
+            using ResultColumnType
+                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
+            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
+
+            ResultColumnPtr column;
+
+            if constexpr (IsDecimalNumber<AttributeType>)
+            {
+                // auto scale = getDecimalScale(*attribute.type);
+                column = ColumnDecimal<AttributeType>::create(size, 0);
+            }
+            else if constexpr (IsNumber<AttributeType>)
+                column = ColumnVector<AttributeType>::create(size);
+ 
             auto& out = column->getData();
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ColumnVector<AttributeType>>(*default_untyped))
+                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
                 {
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
@@ -345,49 +358,7 @@ ColumnPtr IPAddressDictionary::getColumn(
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnVector<AttributeType>>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<AttributeType>();
-
-                    getItemsImpl<AttributeType, AttributeType>(
-                        attribute,
-                        key_columns,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
-                        [&](const size_t) { return def; }
-                    );
-                }
-            }
-            else
-            {
-                const auto null_value = std::get<AttributeType>(attribute.null_values);
-
-                getItemsImpl<AttributeType, AttributeType>(
-                    attribute,
-                    key_columns,
-                    [&](const size_t row, const auto value) { return out[row] = value; },
-                    [&](const size_t) { return null_value; });
-            }
-
-            result = std::move(column);
-        }
-        else if constexpr (IsDecimalNumber<AttributeType>)
-        {
-            // auto scale = getDecimalScale(*attribute.type);
-            auto column = ColumnDecimal<AttributeType>::create(size, 0);
-            auto& out = column->getData();
-
-            if (default_untyped != nullptr)
-            {
-                if (const auto default_col = checkAndGetColumn<ColumnDecimal<AttributeType>>(*default_untyped))
-                {
-                    getItemsImpl<AttributeType, AttributeType>(
-                        attribute,
-                        key_columns,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
-                        [&](const size_t row) { return default_col->getData()[row]; }
-                    );
-                }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnDecimal<AttributeType>>(default_untyped.get()))
+                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 
diff --git a/src/Dictionaries/RangeHashedDictionary.cpp b/src/Dictionaries/RangeHashedDictionary.cpp
index 57299da43b8..710a018d85f 100644
--- a/src/Dictionaries/RangeHashedDictionary.cpp
+++ b/src/Dictionaries/RangeHashedDictionary.cpp
@@ -147,14 +147,27 @@ ColumnPtr RangeHashedDictionary::getColumn(
 
             result = std::move(column_string);
         }
-        else if constexpr (IsNumber<AttributeType>)
+        else
         {
-            auto column = ColumnVector<AttributeType>::create(size);
+            using ResultColumnType
+                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
+            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
+
+            ResultColumnPtr column;
+
+            if constexpr (IsDecimalNumber<AttributeType>)
+            {
+                // auto scale = getDecimalScale(*attribute.type);
+                column = ColumnDecimal<AttributeType>::create(size, 0);
+            }
+            else if constexpr (IsNumber<AttributeType>)
+                column = ColumnVector<AttributeType>::create(size);
+ 
             auto& out = column->getData();
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ColumnVector<AttributeType>>(*default_untyped))
+                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
                 {
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
@@ -163,49 +176,7 @@ ColumnPtr RangeHashedDictionary::getColumn(
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnVector<AttributeType>>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<AttributeType>();
-
-                    getItemsImpl<AttributeType, AttributeType>(
-                        attribute,
-                        key_columns,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
-                        [&](const size_t) { return def; }
-                    );
-                }
-            }
-            else
-            {
-                const auto null_value = std::get<AttributeType>(attribute.null_values);
-
-                getItemsImpl<AttributeType, AttributeType>(
-                    attribute,
-                    key_columns,
-                    [&](const size_t row, const auto value) { return out[row] = value; },
-                    [&](const size_t) { return null_value; });
-            }
-
-            result = std::move(column);
-        }
-        else if constexpr (IsDecimalNumber<AttributeType>)
-        {
-            // auto scale = getDecimalScale(*attribute.type);
-            auto column = ColumnDecimal<AttributeType>::create(size, 0);
-            auto& out = column->getData();
-
-            if (default_untyped != nullptr)
-            {
-                if (const auto default_col = checkAndGetColumn<ColumnDecimal<AttributeType>>(*default_untyped))
-                {
-                    getItemsImpl<AttributeType, AttributeType>(
-                        attribute,
-                        key_columns,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
-                        [&](const size_t row) { return default_col->getData()[row]; }
-                    );
-                }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnDecimal<AttributeType>>(default_untyped.get()))
+                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 
@@ -341,61 +312,6 @@ void RangeHashedDictionary::calculateBytesAllocated()
         };
 
         callOnDictionaryAttributeType(attribute.type, type_call);
-
-        // switch (attribute.type)
-        // {
-        //     case AttributeUnderlyingType::utUInt8:
-        //         addAttributeSize<UInt8>(attribute);
-        //         break;
-        //     case AttributeUnderlyingType::utUInt16:
-        //         addAttributeSize<UInt16>(attribute);
-        //         break;
-        //     case AttributeUnderlyingType::utUInt32:
-        //         addAttributeSize<UInt32>(attribute);
-        //         break;
-        //     case AttributeUnderlyingType::utUInt64:
-        //         addAttributeSize<UInt64>(attribute);
-        //         break;
-        //     case AttributeUnderlyingType::utUInt128:
-        //         addAttributeSize<UInt128>(attribute);
-        //         break;
-        //     case AttributeUnderlyingType::utInt8:
-        //         addAttributeSize<Int8>(attribute);
-        //         break;
-        //     case AttributeUnderlyingType::utInt16:
-        //         addAttributeSize<Int16>(attribute);
-        //         break;
-        //     case AttributeUnderlyingType::utInt32:
-        //         addAttributeSize<Int32>(attribute);
-        //         break;
-        //     case AttributeUnderlyingType::utInt64:
-        //         addAttributeSize<Int64>(attribute);
-        //         break;
-        //     case AttributeUnderlyingType::utFloat32:
-        //         addAttributeSize<Float32>(attribute);
-        //         break;
-        //     case AttributeUnderlyingType::utFloat64:
-        //         addAttributeSize<Float64>(attribute);
-        //         break;
-
-        //     case AttributeUnderlyingType::utDecimal32:
-        //         addAttributeSize<Decimal32>(attribute);
-        //         break;
-        //     case AttributeUnderlyingType::utDecimal64:
-        //         addAttributeSize<Decimal64>(attribute);
-        //         break;
-        //     case AttributeUnderlyingType::utDecimal128:
-        //         addAttributeSize<Decimal128>(attribute);
-        //         break;
-
-        //     case AttributeUnderlyingType::utString:
-        //     {
-        //         addAttributeSize<StringRef>(attribute);
-        //         bytes_allocated += sizeof(Arena) + attribute.string_arena->size();
-
-        //         break;
-        //     }
-        // }
     }
 }
 
diff --git a/src/Dictionaries/SSDCacheDictionary.cpp b/src/Dictionaries/SSDCacheDictionary.cpp
index 23507792f7e..e3e4cf6c1a0 100644
--- a/src/Dictionaries/SSDCacheDictionary.cpp
+++ b/src/Dictionaries/SSDCacheDictionary.cpp
@@ -1378,14 +1378,27 @@ ColumnPtr SSDCacheDictionary::getColumn(
 
             result = std::move(column_string);
         }
-        else if constexpr (IsNumber<AttributeType>)
+        else
         {
-            auto column = ColumnVector<AttributeType>::create(identifiers_size);
+            using ResultColumnType
+                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
+            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
+
+            ResultColumnPtr column;
+
+            if constexpr (IsDecimalNumber<AttributeType>)
+            {
+                // auto scale = getDecimalScale(*attribute.type);
+                column = ColumnDecimal<AttributeType>::create(identifiers_size, 0);
+            }
+            else if constexpr (IsNumber<AttributeType>)
+                column = ColumnVector<AttributeType>::create(identifiers_size);
+ 
             auto& out = column->getData();
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ColumnVector<AttributeType>>(*default_untyped))
+                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
                 {
                     getItemsNumberImpl<AttributeType, AttributeType>(
                         index,
@@ -1394,49 +1407,7 @@ ColumnPtr SSDCacheDictionary::getColumn(
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnVector<AttributeType>>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<AttributeType>();
-
-                    getItemsNumberImpl<AttributeType, AttributeType>(
-                        index,
-                        ids,
-                        out,
-                        [&](const size_t) { return def; }
-                    );
-                }
-            }
-            else
-            {
-                const auto null_value = std::get<AttributeType>(null_values[index]);;
-
-                getItemsNumberImpl<AttributeType, AttributeType>(
-                    index,
-                    ids,
-                    out,
-                    [&](const size_t) { return null_value; });
-            }
-
-            result = std::move(column);
-        }
-        else if constexpr (IsDecimalNumber<AttributeType>)
-        {
-            // auto scale = getDecimalScale(*attribute.type);
-            auto column = ColumnDecimal<AttributeType>::create(identifiers_size, 0);
-            auto& out = column->getData();
-
-            if (default_untyped != nullptr)
-            {
-                if (const auto default_col = checkAndGetColumn<ColumnDecimal<AttributeType>>(*default_untyped))
-                {
-                    getItemsNumberImpl<AttributeType, AttributeType>(
-                        index,
-                        ids,
-                        out,
-                        [&](const size_t row) { return default_col->getData()[row]; }
-                    );
-                }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnDecimal<AttributeType>>(default_untyped.get()))
+                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 
diff --git a/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp b/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
index 452065c20ad..05aa5a27ea9 100644
--- a/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
+++ b/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
@@ -1427,14 +1427,27 @@ ColumnPtr SSDComplexKeyCacheDictionary::getColumn(
 
             result = std::move(column_string);
         }
-        else if constexpr (IsNumber<AttributeType>)
+        else
         {
-            auto column = ColumnVector<AttributeType>::create(keys_size);
+            using ResultColumnType
+                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
+            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
+
+            ResultColumnPtr column;
+
+            if constexpr (IsDecimalNumber<AttributeType>)
+            {
+                // auto scale = getDecimalScale(*attribute.type);
+                column = ColumnDecimal<AttributeType>::create(keys_size, 0);
+            }
+            else if constexpr (IsNumber<AttributeType>)
+                column = ColumnVector<AttributeType>::create(keys_size);
+ 
             auto& out = column->getData();
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ColumnVector<AttributeType>>(*default_untyped))
+                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
                 {
                     getItemsNumberImpl<AttributeType, AttributeType>(
                         index,
@@ -1444,52 +1457,7 @@ ColumnPtr SSDComplexKeyCacheDictionary::getColumn(
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnVector<AttributeType>>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<AttributeType>();
-
-                    getItemsNumberImpl<AttributeType, AttributeType>(
-                        index,
-                        key_columns,
-                        key_types,
-                        out,
-                        [&](const size_t) { return def; }
-                    );
-                }
-            }
-            else
-            {
-                const auto null_value = std::get<AttributeType>(null_values[index]); /* NOLINT */
-
-                getItemsNumberImpl<AttributeType, AttributeType>(
-                    index,
-                    key_columns,
-                    key_types,
-                    out,
-                    [&](const size_t) { return null_value; });
-            }
-
-            result = std::move(column);
-        }
-        else if constexpr (IsDecimalNumber<AttributeType>)
-        {
-            // auto scale = getDecimalScale(*attribute.type);
-            auto column = ColumnDecimal<AttributeType>::create(keys_size, 0);
-            auto& out = column->getData();
-
-            if (default_untyped != nullptr)
-            {
-                if (const auto default_col = checkAndGetColumn<ColumnDecimal<AttributeType>>(*default_untyped))
-                {
-                    getItemsNumberImpl<AttributeType, AttributeType>(
-                        index,
-                        key_columns,
-                        key_types,
-                        out,
-                        [&](const size_t row) { return default_col->getData()[row]; }
-                    );
-                }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnDecimal<AttributeType>>(default_untyped.get()))
+                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 

From 8fdbde864298aa5db53f3dc238a6160765b4fc4d Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Tue, 29 Dec 2020 13:55:40 +0300
Subject: [PATCH 535/611] Updated PolygonDictionary to new interface

---
 src/Dictionaries/PolygonDictionary.cpp | 277 ++++++++++++-------------
 src/Dictionaries/PolygonDictionary.h   | 104 +---------
 2 files changed, 144 insertions(+), 237 deletions(-)

diff --git a/src/Dictionaries/PolygonDictionary.cpp b/src/Dictionaries/PolygonDictionary.cpp
index 04eadbfc0ce..2b9bf951192 100644
--- a/src/Dictionaries/PolygonDictionary.cpp
+++ b/src/Dictionaries/PolygonDictionary.cpp
@@ -5,6 +5,7 @@
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
 #include <DataTypes/DataTypeArray.h>
+#include <Functions/FunctionHelpers.h>
 
 #include <numeric>
 
@@ -92,6 +93,129 @@ bool IPolygonDictionary::isInjective(const std::string &) const
     return false;
 }
 
+ColumnPtr IPolygonDictionary::getColumn(
+    const std::string & attribute_name,
+    const DataTypePtr &,
+    const Columns & key_columns,
+    const DataTypes &,
+    const ColumnPtr default_untyped) const
+{
+    /// TODO: Validate input types
+
+    ColumnPtr result;
+
+    const auto index = getAttributeIndex(attribute_name);
+
+    /// TODO: Check that attribute type is same as result type
+
+    auto 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;
+
+        if constexpr (std::is_same_v<AttributeType, String>)
+        {
+            auto column_string = ColumnString::create();
+            auto out = column_string.get();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                {
+                    getItemsImpl<String, StringRef>(
+                        index,
+                        key_columns,
+                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                        [&](const size_t row) { return default_col->getDataAt(row); });
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<String>();
+
+                    getItemsImpl<StringRef, StringRef>(
+                        index,
+                        key_columns,
+                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                        [&](const size_t) { return def; });
+                }
+            }
+            else
+            {
+                const auto & null_value = StringRef{std::get<String>(null_values[index])};
+
+                getItemsImpl<String, StringRef>(
+                    index,
+                    key_columns,
+                    [&](const size_t, const StringRef & value) { out->insertData(value.data, value.size); },
+                    [&](const size_t) { return null_value; });
+            }
+
+            result = std::move(column_string);
+        }
+        else
+        {
+            using ResultColumnType
+                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
+            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
+
+            ResultColumnPtr column;
+
+            if constexpr (IsDecimalNumber<AttributeType>)
+            {
+                // auto scale = getDecimalScale(*attribute.type);
+                column = ColumnDecimal<AttributeType>::create(size, 0);
+            }
+            else if constexpr (IsNumber<AttributeType>)
+                column = ColumnVector<AttributeType>::create(size);
+ 
+            auto& out = column->getData();
+
+            if (default_untyped != nullptr)
+            {
+                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
+                {
+                    getItemsImpl<AttributeType, AttributeType>(
+                        index,
+                        key_columns,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row) { return default_col->getData()[row]; }
+                    );
+                }
+                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
+                {
+                    const auto & def = default_col_const->template getValue<AttributeType>();
+
+                    getItemsImpl<AttributeType, AttributeType>(
+                        index,
+                        key_columns,
+                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t) { return def; }
+                    );
+                }
+            }
+            else
+            {
+                const auto null_value = std::get<AttributeType>(null_values[index]);
+
+                getItemsImpl<AttributeType, AttributeType>(
+                    index,
+                    key_columns,
+                    [&](const size_t row, const auto value) { return out[row] = value; },
+                    [&](const size_t) { return null_value; }
+                );
+            }
+
+            result = std::move(column);
+        }
+    };
+
+    callOnDictionaryAttributeType(dict_struct.attributes[index].underlying_type, type_call);
+   
+    return result;
+}
+
 BlockInputStreamPtr IPolygonDictionary::getBlockInputStream(const Names &, size_t) const
 {
     // TODO: In order for this to work one would first have to support retrieving arrays from dictionaries.
@@ -255,8 +379,14 @@ std::vector<IPolygonDictionary::Point> IPolygonDictionary::extractPoints(const C
     return result;
 }
 
-void IPolygonDictionary::has(const Columns & key_columns, const DataTypes &, PaddedPODArray<UInt8> & out) const
+ColumnUInt8::Ptr IPolygonDictionary::has(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();
+
     size_t row = 0;
     for (const auto & pt : extractPoints(key_columns))
     {
@@ -266,6 +396,8 @@ void IPolygonDictionary::has(const Columns & key_columns, const DataTypes &, Pad
     }
 
     query_count.fetch_add(row, std::memory_order_relaxed);
+
+    return result;
 }
 
 size_t IPolygonDictionary::getAttributeIndex(const std::string & attribute_name) const
@@ -276,149 +408,6 @@ size_t IPolygonDictionary::getAttributeIndex(const std::string & attribute_name)
     return it->second;
 }
 
-#define DECLARE(TYPE) \
-    void IPolygonDictionary::get##TYPE( \
-        const std::string & attribute_name, const Columns & key_columns, const DataTypes &, ResultArrayType<TYPE> & out) const \
-    { \
-        const auto ind = getAttributeIndex(attribute_name); \
-        checkAttributeType(this, attribute_name, dict_struct.attributes[ind].underlying_type, AttributeUnderlyingType::ut##TYPE); \
-\
-        const auto null_value = std::get<TYPE>(null_values[ind]); \
-\
-        getItemsImpl<TYPE, TYPE>( \
-            ind, \
-            key_columns, \
-            [&](const size_t row, const auto value) { out[row] = value; }, \
-            [&](const size_t) { return null_value; }); \
-    }
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-void IPolygonDictionary::getString(
-        const std::string & attribute_name, const Columns & key_columns, const DataTypes &, ColumnString * out) const
-{
-    const auto ind = getAttributeIndex(attribute_name);
-    checkAttributeType(this, attribute_name, dict_struct.attributes[ind].underlying_type, AttributeUnderlyingType::utString);
-
-    const auto & null_value = StringRef{std::get<String>(null_values[ind])};
-
-    getItemsImpl<String, StringRef>(
-            ind,
-            key_columns,
-            [&](const size_t, const StringRef & value) { out->insertData(value.data, value.size); },
-            [&](const size_t) { return null_value; });
-}
-
-#define DECLARE(TYPE) \
-    void IPolygonDictionary::get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes &, \
-        const PaddedPODArray<TYPE> & def, \
-        ResultArrayType<TYPE> & out) const \
-    { \
-        const auto ind = getAttributeIndex(attribute_name); \
-        checkAttributeType(this, attribute_name, dict_struct.attributes[ind].underlying_type, AttributeUnderlyingType::ut##TYPE); \
-\
-        getItemsImpl<TYPE, TYPE>( \
-            ind, \
-            key_columns, \
-            [&](const size_t row, const auto value) { out[row] = value; }, \
-            [&](const size_t row) { return def[row]; }); \
-    }
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-void IPolygonDictionary::getString(
-        const std::string & attribute_name,
-        const Columns & key_columns,
-        const DataTypes &,
-        const ColumnString * const def,
-        ColumnString * const out) const
-{
-    const auto ind = getAttributeIndex(attribute_name);
-    checkAttributeType(this, attribute_name, dict_struct.attributes[ind].underlying_type, AttributeUnderlyingType::utString);
-
-    getItemsImpl<String, StringRef>(
-            ind,
-            key_columns,
-            [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-            [&](const size_t row) { return def->getDataAt(row); });
-}
-
-#define DECLARE(TYPE) \
-    void IPolygonDictionary::get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes &, \
-        const TYPE def, \
-        ResultArrayType<TYPE> & out) const \
-    { \
-        const auto ind = getAttributeIndex(attribute_name); \
-        checkAttributeType(this, attribute_name, dict_struct.attributes[ind].underlying_type, AttributeUnderlyingType::ut##TYPE); \
-\
-        getItemsImpl<TYPE, TYPE>( \
-            ind, key_columns, [&](const size_t row, const auto value) { out[row] = value; }, [&](const size_t) { return def; }); \
-    }
-    DECLARE(UInt8)
-    DECLARE(UInt16)
-    DECLARE(UInt32)
-    DECLARE(UInt64)
-    DECLARE(UInt128)
-    DECLARE(Int8)
-    DECLARE(Int16)
-    DECLARE(Int32)
-    DECLARE(Int64)
-    DECLARE(Float32)
-    DECLARE(Float64)
-    DECLARE(Decimal32)
-    DECLARE(Decimal64)
-    DECLARE(Decimal128)
-#undef DECLARE
-
-void IPolygonDictionary::getString(
-        const std::string & attribute_name,
-        const Columns & key_columns,
-        const DataTypes &,
-        const String & def,
-        ColumnString * const out) const
-{
-    const auto ind = getAttributeIndex(attribute_name);
-    checkAttributeType(this, attribute_name, dict_struct.attributes[ind].underlying_type, AttributeUnderlyingType::utString);
-
-    getItemsImpl<String, StringRef>(
-            ind,
-            key_columns,
-            [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-            [&](const size_t) { return StringRef{def}; });
-}
-
 template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
 void IPolygonDictionary::getItemsImpl(
         size_t attribute_ind, const Columns & key_columns, ValueSetter && set_value, DefaultGetter && get_default) const
diff --git a/src/Dictionaries/PolygonDictionary.h b/src/Dictionaries/PolygonDictionary.h
index 75114cff435..f7b7d92fd27 100644
--- a/src/Dictionaries/PolygonDictionary.h
+++ b/src/Dictionaries/PolygonDictionary.h
@@ -78,101 +78,19 @@ public:
 
     bool isInjective(const std::string & attribute_name) const override;
 
+    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::complex; }
+
+    ColumnPtr getColumn(
+        const std::string& attribute_name,
+        const DataTypePtr & result_type,
+        const Columns & key_columns,
+        const DataTypes & key_types,
+        const ColumnPtr default_untyped) const override;
+
+    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) const override;
+
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
 
-    template <typename T>
-    using ResultArrayType = std::conditional_t<IsDecimalNumber<T>, DecimalPaddedPODArray<T>, PaddedPODArray<T>>;
-
-    /** Functions used to retrieve attributes of specific type by key. */
-
-#define DECLARE(TYPE) \
-    void get##TYPE( \
-        const std::string & attribute_name, const Columns & key_columns, const DataTypes &, ResultArrayType<TYPE> & out) const;
-        DECLARE(UInt8)
-        DECLARE(UInt16)
-        DECLARE(UInt32)
-        DECLARE(UInt64)
-        DECLARE(UInt128)
-        DECLARE(Int8)
-        DECLARE(Int16)
-        DECLARE(Int32)
-        DECLARE(Int64)
-        DECLARE(Float32)
-        DECLARE(Float64)
-        DECLARE(Decimal32)
-        DECLARE(Decimal64)
-        DECLARE(Decimal128)
-#undef DECLARE
-
-    void getString(const std::string & attribute_name, const Columns & key_columns, const DataTypes &, ColumnString * out) const;
-
-#define DECLARE(TYPE) \
-    void get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes &, \
-        const PaddedPODArray<TYPE> & def, \
-        ResultArrayType<TYPE> & out) const;
-        DECLARE(UInt8)
-        DECLARE(UInt16)
-        DECLARE(UInt32)
-        DECLARE(UInt64)
-        DECLARE(UInt128)
-        DECLARE(Int8)
-        DECLARE(Int16)
-        DECLARE(Int32)
-        DECLARE(Int64)
-        DECLARE(Float32)
-        DECLARE(Float64)
-        DECLARE(Decimal32)
-        DECLARE(Decimal64)
-        DECLARE(Decimal128)
-#undef DECLARE
-
-    void getString(
-            const std::string & attribute_name,
-            const Columns & key_columns,
-            const DataTypes &,
-            const ColumnString * const def,
-            ColumnString * const out) const;
-
-#define DECLARE(TYPE) \
-    void get##TYPE( \
-        const std::string & attribute_name, \
-        const Columns & key_columns, \
-        const DataTypes &, \
-        const TYPE def, \
-        ResultArrayType<TYPE> & out) const;
-        DECLARE(UInt8)
-        DECLARE(UInt16)
-        DECLARE(UInt32)
-        DECLARE(UInt64)
-        DECLARE(UInt128)
-        DECLARE(Int8)
-        DECLARE(Int16)
-        DECLARE(Int32)
-        DECLARE(Int64)
-        DECLARE(Float32)
-        DECLARE(Float64)
-        DECLARE(Decimal32)
-        DECLARE(Decimal64)
-        DECLARE(Decimal128)
-#undef DECLARE
-
-    void getString(
-            const std::string & attribute_name,
-            const Columns & key_columns,
-            const DataTypes & key_types,
-            const String & def,
-            ColumnString * const out) const;
-
-    /** Checks whether or not a point can be found in one of the polygons in the dictionary.
-     *  The check is performed for multiple points represented by columns of their x and y coordinates.
-     *  The boolean result is written to out.
-     */
-    // TODO: Refactor the whole dictionary design to perform stronger checks, i.e. make this an override.
-    void has(const Columns & key_columns, const DataTypes & key_types, PaddedPODArray<UInt8> & out) const;
-
     /** Single coordinate type. */
     using Coord = Float32;
     /** A two-dimensional point in Euclidean coordinates. */

From 791c7204d76516bf560aaeed94bc63a172f56b7b Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Tue, 29 Dec 2020 18:21:49 +0300
Subject: [PATCH 536/611] Fix style issues

---
 src/Dictionaries/CacheDictionary.cpp             | 10 +++++-----
 src/Dictionaries/ComplexKeyCacheDictionary.cpp   | 10 +++++-----
 src/Dictionaries/ComplexKeyCacheDictionary.h     |  2 +-
 src/Dictionaries/ComplexKeyDirectDictionary.cpp  | 10 +++++-----
 src/Dictionaries/ComplexKeyHashedDictionary.cpp  |  8 ++++----
 src/Dictionaries/DictionaryStructure.cpp         |  2 +-
 src/Dictionaries/DirectDictionary.cpp            | 10 +++++-----
 src/Dictionaries/FlatDictionary.cpp              | 11 +++++------
 src/Dictionaries/HashedDictionary.cpp            | 16 ++++++++--------
 src/Dictionaries/IDictionary.h                   |  3 +--
 src/Dictionaries/IPAddressDictionary.cpp         | 13 +++++++------
 src/Dictionaries/IPAddressDictionary.h           |  2 +-
 src/Dictionaries/PolygonDictionary.cpp           |  8 ++++----
 src/Dictionaries/RangeHashedDictionary.cpp       |  8 ++++----
 src/Dictionaries/SSDCacheDictionary.cpp          | 10 +++++-----
 .../SSDComplexKeyCacheDictionary.cpp             |  8 ++++----
 src/Dictionaries/SSDComplexKeyCacheDictionary.h  |  2 +-
 src/Dictionaries/ya.make                         |  9 ---------
 src/Functions/FunctionsExternalDictionaries.h    | 11 ++++-------
 19 files changed, 70 insertions(+), 83 deletions(-)

diff --git a/src/Dictionaries/CacheDictionary.cpp b/src/Dictionaries/CacheDictionary.cpp
index cbb12d3b2ec..d8dd390576c 100644
--- a/src/Dictionaries/CacheDictionary.cpp
+++ b/src/Dictionaries/CacheDictionary.cpp
@@ -259,8 +259,8 @@ ColumnPtr CacheDictionary::getColumn(
     ColumnPtr result;
 
     PaddedPODArray<Key> backup_storage;
-    const auto& ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
-    
+    const auto & ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
+
     auto & attribute = getAttribute(attribute_name);
 
     /// TODO: Check that attribute type is same as result type
@@ -314,8 +314,8 @@ ColumnPtr CacheDictionary::getColumn(
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(identifiers_size);
- 
-            auto& out = column->getData();
+
+            auto & out = column->getData();
 
             if (default_untyped != nullptr)
             {
@@ -357,7 +357,7 @@ ColumnPtr CacheDictionary::getColumn(
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
-   
+
     return result;
 }
 
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary.cpp b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
index be67121aef1..4059915666e 100644
--- a/src/Dictionaries/ComplexKeyCacheDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
@@ -86,7 +86,7 @@ ColumnPtr ComplexKeyCacheDictionary::getColumn(
 
     /// TODO: Check that attribute type is same as result type
     /// TODO: Check if const will work as expected
-    
+
     auto keys_size = key_columns.front()->size();
 
     auto type_call = [&](const auto &dictionary_attribute_type)
@@ -136,8 +136,8 @@ ColumnPtr ComplexKeyCacheDictionary::getColumn(
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(keys_size);
- 
-            auto& out = column->getData();
+
+            auto & out = column->getData();
 
             if (default_untyped != nullptr)
             {
@@ -179,7 +179,7 @@ ColumnPtr ComplexKeyCacheDictionary::getColumn(
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
-   
+
     return result;
 }
 
@@ -362,7 +362,7 @@ void ComplexKeyCacheDictionary::setDefaultAttributeValue(Attribute & attribute,
         }
         else
         {
-            std::get<ContainerPtrType<AttributeType>>(attribute.arrays)[idx] = std::get<AttributeType>(attribute.null_values); 
+            std::get<ContainerPtrType<AttributeType>>(attribute.arrays)[idx] = std::get<AttributeType>(attribute.null_values);
         }
     };
 
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary.h b/src/Dictionaries/ComplexKeyCacheDictionary.h
index 2711bd6c8cc..1f8248c594a 100644
--- a/src/Dictionaries/ComplexKeyCacheDictionary.h
+++ b/src/Dictionaries/ComplexKeyCacheDictionary.h
@@ -98,7 +98,7 @@ public:
         const DataTypes & key_types,
         const ColumnPtr default_untyped) const override;
 
-    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) const override; 
+    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) const override;
 
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
 
diff --git a/src/Dictionaries/ComplexKeyDirectDictionary.cpp b/src/Dictionaries/ComplexKeyDirectDictionary.cpp
index 8e084375499..ffcdb746bba 100644
--- a/src/Dictionaries/ComplexKeyDirectDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyDirectDictionary.cpp
@@ -47,10 +47,10 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
 
     /// TODO: Check that attribute type is same as result type
     /// TODO: Check if const will work as expected
-    
+
     auto size = key_columns.front()->size();
 
-    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;
@@ -125,8 +125,8 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(size);
- 
-            auto& out = column->getData();
+
+            auto & out = column->getData();
 
             if (default_untyped != nullptr)
             {
@@ -168,7 +168,7 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
-   
+
     return result;
 }
 
diff --git a/src/Dictionaries/ComplexKeyHashedDictionary.cpp b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
index a74185ec887..1b7ef979d38 100644
--- a/src/Dictionaries/ComplexKeyHashedDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
@@ -49,7 +49,7 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
 
     /// TODO: Check that attribute type is same as result type
     /// TODO: Check if const will work as expected
-    
+
     auto size = key_columns.front()->size();
 
     auto type_call = [&](const auto &dictionary_attribute_type)
@@ -111,8 +111,8 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(size);
- 
-            auto& out = column->getData();
+
+            auto & out = column->getData();
 
             if (default_untyped != nullptr)
             {
@@ -154,7 +154,7 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
-   
+
     return result;
 }
 
diff --git a/src/Dictionaries/DictionaryStructure.cpp b/src/Dictionaries/DictionaryStructure.cpp
index b2340cf39a0..7164d3cfd5d 100644
--- a/src/Dictionaries/DictionaryStructure.cpp
+++ b/src/Dictionaries/DictionaryStructure.cpp
@@ -328,7 +328,7 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
             is_array = true;
             type = array_type->getNestedType();
         }
-        
+
         if (type->isNullable())
         {
             is_nullable = true;
diff --git a/src/Dictionaries/DirectDictionary.cpp b/src/Dictionaries/DirectDictionary.cpp
index 8018fc02fcf..992fd32e4a6 100644
--- a/src/Dictionaries/DirectDictionary.cpp
+++ b/src/Dictionaries/DirectDictionary.cpp
@@ -138,8 +138,8 @@ ColumnPtr DirectDictionary::getColumn(
     ColumnPtr result;
 
     PaddedPODArray<Key> backup_storage;
-    const auto& ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
-    
+    const auto & ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
+
     const auto & attribute = getAttribute(attribute_name);
 
     /// TODO: Check that attribute type is same as result type
@@ -222,8 +222,8 @@ ColumnPtr DirectDictionary::getColumn(
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(size);
- 
-            auto& out = column->getData();
+
+            auto & out = column->getData();
 
             if (default_untyped != nullptr)
             {
@@ -265,7 +265,7 @@ ColumnPtr DirectDictionary::getColumn(
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
-   
+
     return result;
 }
 
diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index 2c856dc59ca..959f852d431 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -16,7 +16,6 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
     extern const int DICTIONARY_IS_EMPTY;
     extern const int UNSUPPORTED_METHOD;
-    extern const int ILLEGAL_COLUMN;
 }
 
 static const auto initial_array_size = 1024;
@@ -115,8 +114,8 @@ ColumnPtr FlatDictionary::getColumn(
     ColumnPtr result;
 
     PaddedPODArray<Key> backup_storage;
-    const auto& ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
-    
+    const auto & ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
+
     const auto & attribute = getAttribute(attribute_name);
 
     /// TODO: Check that attribute type is same as result type
@@ -183,8 +182,8 @@ ColumnPtr FlatDictionary::getColumn(
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(size);
- 
-            auto& out = column->getData();
+
+            auto & out = column->getData();
 
             if (default_untyped != nullptr)
             {
@@ -226,7 +225,7 @@ ColumnPtr FlatDictionary::getColumn(
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
-   
+
     return result;
 }
 
diff --git a/src/Dictionaries/HashedDictionary.cpp b/src/Dictionaries/HashedDictionary.cpp
index a1e3f176706..4fbc24e3bda 100644
--- a/src/Dictionaries/HashedDictionary.cpp
+++ b/src/Dictionaries/HashedDictionary.cpp
@@ -137,14 +137,14 @@ ColumnPtr HashedDictionary::getColumn(
     ColumnPtr result;
 
     PaddedPODArray<Key> backup_storage;
-    const auto& ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
-    
+    const auto & ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
+
     const auto & attribute = getAttribute(attribute_name);
 
     /// TODO: Check that attribute type is same as result type
     /// TODO: Check if const will work as expected
 
-    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;
@@ -205,8 +205,8 @@ ColumnPtr HashedDictionary::getColumn(
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(size);
- 
-            auto& out = column->getData();
+
+            auto & out = column->getData();
 
             if (default_untyped != nullptr)
             {
@@ -248,7 +248,7 @@ ColumnPtr HashedDictionary::getColumn(
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
-   
+
     return result;
 }
 
@@ -706,14 +706,14 @@ 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 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;
diff --git a/src/Dictionaries/IDictionary.h b/src/Dictionaries/IDictionary.h
index c619e85f523..61f249bad44 100644
--- a/src/Dictionaries/IDictionary.h
+++ b/src/Dictionaries/IDictionary.h
@@ -207,8 +207,7 @@ getColumnDataAsPaddedPODArray(const IDictionaryBase * dictionary, const ColumnPt
 
     if (!vector_col)
     {
-        throw Exception{
-            ErrorCodes::TYPE_MISMATCH,
+        throw Exception{ErrorCodes::TYPE_MISMATCH,
             "{}: type mismatch: column has wrong type expected {}",
             dictionary->getDictionaryID().getNameForLogs(),
             "" /* TODO: Type name*/};
diff --git a/src/Dictionaries/IPAddressDictionary.cpp b/src/Dictionaries/IPAddressDictionary.cpp
index 028b01607d0..477b379150f 100644
--- a/src/Dictionaries/IPAddressDictionary.cpp
+++ b/src/Dictionaries/IPAddressDictionary.cpp
@@ -282,7 +282,7 @@ ColumnPtr IPAddressDictionary::getColumn(
 
     /// TODO: Check that attribute type is same as result type
     /// TODO: Check if const will work as expected
-    
+
     auto size = key_columns.front()->size();
 
     auto type_call = [&](const auto &dictionary_attribute_type)
@@ -344,8 +344,8 @@ ColumnPtr IPAddressDictionary::getColumn(
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(size);
- 
-            auto& out = column->getData();
+
+            auto & out = column->getData();
 
             if (default_untyped != nullptr)
             {
@@ -387,7 +387,7 @@ ColumnPtr IPAddressDictionary::getColumn(
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
-   
+
     return result;
 }
 
@@ -840,7 +840,8 @@ void IPAddressDictionary::setAttributeValueImpl(Attribute & attribute, const T v
 
 void IPAddressDictionary::setAttributeValue(Attribute & attribute, const Field & value)
 {
-    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;
 
@@ -848,7 +849,7 @@ void IPAddressDictionary::setAttributeValue(Attribute & attribute, const Field &
         {
             const auto & string = value.get<String>();
             const auto * string_in_arena = attribute.string_arena->insert(string.data(), string.size());
-            setAttributeValueImpl<StringRef>(attribute, StringRef{string_in_arena, string.size()}); 
+            setAttributeValueImpl<StringRef>(attribute, StringRef{string_in_arena, string.size()});
         }
         else
         {
diff --git a/src/Dictionaries/IPAddressDictionary.h b/src/Dictionaries/IPAddressDictionary.h
index 7db46ddf6a5..3d9565c47ce 100644
--- a/src/Dictionaries/IPAddressDictionary.h
+++ b/src/Dictionaries/IPAddressDictionary.h
@@ -70,7 +70,7 @@ public:
         const DataTypes & key_types,
         const ColumnPtr default_untyped) const override;
 
-    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) const override; 
+    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) const override;
 
     BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
 
diff --git a/src/Dictionaries/PolygonDictionary.cpp b/src/Dictionaries/PolygonDictionary.cpp
index 2b9bf951192..da3f367e1a5 100644
--- a/src/Dictionaries/PolygonDictionary.cpp
+++ b/src/Dictionaries/PolygonDictionary.cpp
@@ -134,7 +134,7 @@ ColumnPtr IPolygonDictionary::getColumn(
                 {
                     const auto & def = default_col_const->template getValue<String>();
 
-                    getItemsImpl<StringRef, StringRef>(
+                    getItemsImpl<String, StringRef>(
                         index,
                         key_columns,
                         [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
@@ -169,8 +169,8 @@ ColumnPtr IPolygonDictionary::getColumn(
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(size);
- 
-            auto& out = column->getData();
+
+            auto & out = column->getData();
 
             if (default_untyped != nullptr)
             {
@@ -212,7 +212,7 @@ ColumnPtr IPolygonDictionary::getColumn(
     };
 
     callOnDictionaryAttributeType(dict_struct.attributes[index].underlying_type, type_call);
-   
+
     return result;
 }
 
diff --git a/src/Dictionaries/RangeHashedDictionary.cpp b/src/Dictionaries/RangeHashedDictionary.cpp
index 710a018d85f..97c8fcb257c 100644
--- a/src/Dictionaries/RangeHashedDictionary.cpp
+++ b/src/Dictionaries/RangeHashedDictionary.cpp
@@ -162,8 +162,8 @@ ColumnPtr RangeHashedDictionary::getColumn(
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(size);
- 
-            auto& out = column->getData();
+
+            auto & out = column->getData();
 
             if (default_untyped != nullptr)
             {
@@ -205,7 +205,7 @@ ColumnPtr RangeHashedDictionary::getColumn(
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
-   
+
     return result;
 }
 
@@ -304,7 +304,7 @@ void RangeHashedDictionary::calculateBytesAllocated()
 
     for (const auto & attribute : attributes)
     {
-        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;
diff --git a/src/Dictionaries/SSDCacheDictionary.cpp b/src/Dictionaries/SSDCacheDictionary.cpp
index e3e4cf6c1a0..dccc1932250 100644
--- a/src/Dictionaries/SSDCacheDictionary.cpp
+++ b/src/Dictionaries/SSDCacheDictionary.cpp
@@ -1338,8 +1338,8 @@ ColumnPtr SSDCacheDictionary::getColumn(
     ColumnPtr result;
 
     PaddedPODArray<Key> backup_storage;
-    const auto& ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
-    
+    const auto & ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
+
     const auto index = getAttributeIndex(attribute_name);
 
     /// TODO: Check that attribute type is same as result type
@@ -1393,8 +1393,8 @@ ColumnPtr SSDCacheDictionary::getColumn(
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(identifiers_size);
- 
-            auto& out = column->getData();
+
+            auto & out = column->getData();
 
             if (default_untyped != nullptr)
             {
@@ -1436,7 +1436,7 @@ ColumnPtr SSDCacheDictionary::getColumn(
     };
 
     callOnDictionaryAttributeType(dict_struct.attributes[index].underlying_type, type_call);
-   
+
     return result;
 }
 
diff --git a/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp b/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
index 05aa5a27ea9..0d19b6f8463 100644
--- a/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
+++ b/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
@@ -1392,7 +1392,7 @@ ColumnPtr SSDComplexKeyCacheDictionary::getColumn(
 
     /// TODO: Check that attribute type is same as result type
     /// TODO: Check if const will work as expected
-    
+
     auto keys_size = key_columns.front()->size();
 
     auto type_call = [&](const auto &dictionary_attribute_type)
@@ -1442,8 +1442,8 @@ ColumnPtr SSDComplexKeyCacheDictionary::getColumn(
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(keys_size);
- 
-            auto& out = column->getData();
+
+            auto & out = column->getData();
 
             if (default_untyped != nullptr)
             {
@@ -1488,7 +1488,7 @@ ColumnPtr SSDComplexKeyCacheDictionary::getColumn(
     };
 
     callOnDictionaryAttributeType(dict_struct.attributes[index].underlying_type, type_call);
-   
+
     return result;
 }
 
diff --git a/src/Dictionaries/SSDComplexKeyCacheDictionary.h b/src/Dictionaries/SSDComplexKeyCacheDictionary.h
index 47c8f54a77d..a12a9789c45 100644
--- a/src/Dictionaries/SSDComplexKeyCacheDictionary.h
+++ b/src/Dictionaries/SSDComplexKeyCacheDictionary.h
@@ -578,7 +578,7 @@ public:
         const DataTypes & key_types,
         const ColumnPtr default_untyped) const override;
 
-    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) const override; 
+    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) const override;
 
     template <typename T>
     using ResultArrayType = SSDComplexKeyCacheStorage::ResultArrayType<T>;
diff --git a/src/Dictionaries/ya.make b/src/Dictionaries/ya.make
index 19a0f5008b8..f754f250b38 100644
--- a/src/Dictionaries/ya.make
+++ b/src/Dictionaries/ya.make
@@ -17,20 +17,11 @@ NO_COMPILER_WARNINGS()
 
 SRCS(
     CacheDictionary.cpp
-    CacheDictionary_generate1.cpp
-    CacheDictionary_generate2.cpp
-    CacheDictionary_generate3.cpp
     CassandraBlockInputStream.cpp
     CassandraDictionarySource.cpp
     CassandraHelpers.cpp
     ClickHouseDictionarySource.cpp
     ComplexKeyCacheDictionary.cpp
-    ComplexKeyCacheDictionary_createAttributeWithType.cpp
-    ComplexKeyCacheDictionary_generate1.cpp
-    ComplexKeyCacheDictionary_generate2.cpp
-    ComplexKeyCacheDictionary_generate3.cpp
-    ComplexKeyCacheDictionary_setAttributeValue.cpp
-    ComplexKeyCacheDictionary_setDefaultAttributeValue.cpp
     ComplexKeyDirectDictionary.cpp
     ComplexKeyHashedDictionary.cpp
     DictionaryBlockInputStreamBase.cpp
diff --git a/src/Functions/FunctionsExternalDictionaries.h b/src/Functions/FunctionsExternalDictionaries.h
index 5b20a4dfc08..5e63e41d7df 100644
--- a/src/Functions/FunctionsExternalDictionaries.h
+++ b/src/Functions/FunctionsExternalDictionaries.h
@@ -54,7 +54,6 @@ namespace ErrorCodes
     extern const int UNSUPPORTED_METHOD;
     extern const int UNKNOWN_TYPE;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-    extern const int TYPE_MISMATCH;
     extern const int ILLEGAL_COLUMN;
     extern const int BAD_ARGUMENTS;
 }
@@ -275,9 +274,8 @@ private:
 
         /// TODO: Use accurateCast if argument is integer
         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(...).",
+            throw Exception{"Illegal type " + arguments[2].type->getName() + " of third argument of function "
+                    + getName() + ", must be UInt64 or tuple(...).",
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
 
         auto dictionary_identifier_type = dictionary->getIdentifierType();
@@ -298,9 +296,8 @@ private:
             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.",
+                throw Exception{"Illegal type " + range_col_type->getName() + " of fourth argument of function "
+                        + getName() + " must be convertible to Int64.",
                     ErrorCodes::ILLEGAL_COLUMN};
 
             ++current_arguments_index;

From 164e55972bab6b388611305b51223ea520ddeaf9 Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Tue, 29 Dec 2020 19:29:36 +0300
Subject: [PATCH 537/611] Fix style issue

---
 src/Dictionaries/SSDCacheDictionary.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Dictionaries/SSDCacheDictionary.cpp b/src/Dictionaries/SSDCacheDictionary.cpp
index dccc1932250..c5a8d55b7f2 100644
--- a/src/Dictionaries/SSDCacheDictionary.cpp
+++ b/src/Dictionaries/SSDCacheDictionary.cpp
@@ -1421,7 +1421,7 @@ ColumnPtr SSDCacheDictionary::getColumn(
             }
             else
             {
-                const auto null_value = std::get<AttributeType>(null_values[index]);;
+                const auto null_value = std::get<AttributeType>(null_values[index]);
 
                 getItemsNumberImpl<AttributeType, AttributeType>(
                     index,

From b01027787e2fad6792063f903b9f68cbb56a40f0 Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Sat, 2 Jan 2021 18:03:28 +0300
Subject: [PATCH 538/611] Fixed tests

---
 src/Dictionaries/CacheDictionary.cpp          |  8 ++---
 .../ComplexKeyCacheDictionary.cpp             | 10 +++---
 .../ComplexKeyDirectDictionary.cpp            | 10 +++---
 .../ComplexKeyHashedDictionary.cpp            | 10 +++---
 src/Dictionaries/DictionaryBlockInputStream.h |  3 +-
 src/Dictionaries/DictionaryStructure.cpp      | 30 +++++++++-------
 src/Dictionaries/DirectDictionary.cpp         | 10 +++---
 src/Dictionaries/FlatDictionary.cpp           | 10 +++---
 src/Dictionaries/HashedDictionary.cpp         | 10 +++---
 src/Dictionaries/IPAddressDictionary.cpp      | 10 +++---
 src/Dictionaries/PolygonDictionary.cpp        | 14 ++++----
 .../RangeDictionaryBlockInputStream.h         |  2 +-
 src/Dictionaries/RangeHashedDictionary.cpp    | 34 ++++++++++++-------
 src/Dictionaries/SSDCacheDictionary.cpp       |  8 ++---
 .../SSDComplexKeyCacheDictionary.cpp          | 18 +++++-----
 15 files changed, 98 insertions(+), 89 deletions(-)

diff --git a/src/Dictionaries/CacheDictionary.cpp b/src/Dictionaries/CacheDictionary.cpp
index d8dd390576c..521b95243ae 100644
--- a/src/Dictionaries/CacheDictionary.cpp
+++ b/src/Dictionaries/CacheDictionary.cpp
@@ -279,11 +279,11 @@ ColumnPtr CacheDictionary::getColumn(
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
                 {
                     getItemsString(attribute, ids, column_string.get(), [&](const size_t row) { return default_col->getDataAt(row); });
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<String>();
 
@@ -319,7 +319,7 @@ ColumnPtr CacheDictionary::getColumn(
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
                 {
                     getItemsNumberImpl<AttributeType, AttributeType>(
                         attribute,
@@ -328,7 +328,7 @@ ColumnPtr CacheDictionary::getColumn(
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary.cpp b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
index 4059915666e..336c2a9eeef 100644
--- a/src/Dictionaries/ComplexKeyCacheDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
@@ -97,15 +97,15 @@ ColumnPtr ComplexKeyCacheDictionary::getColumn(
         if constexpr (std::is_same_v<AttributeType, String>)
         {
             auto column_string = ColumnString::create();
-            auto out = column_string.get();
+            auto * out = column_string.get();
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
                 {
                     getItemsString(attribute, key_columns, out, [&](const size_t row) { return default_col->getDataAt(row); });
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<String>();
 
@@ -141,7 +141,7 @@ ColumnPtr ComplexKeyCacheDictionary::getColumn(
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
                 {
                     getItemsNumberImpl<AttributeType, AttributeType>(
                         attribute,
@@ -150,7 +150,7 @@ ColumnPtr ComplexKeyCacheDictionary::getColumn(
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 
diff --git a/src/Dictionaries/ComplexKeyDirectDictionary.cpp b/src/Dictionaries/ComplexKeyDirectDictionary.cpp
index ffcdb746bba..3d96f1e410a 100644
--- a/src/Dictionaries/ComplexKeyDirectDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyDirectDictionary.cpp
@@ -58,11 +58,11 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
         if constexpr (std::is_same_v<AttributeType, String>)
         {
             auto column_string = ColumnString::create();
-            auto out = column_string.get();
+            auto * out = column_string.get();
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
                 {
                     getItemsImpl<String, String>(
                         attribute,
@@ -78,7 +78,7 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
                             return String(ref.data, ref.size);
                         });
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<String>();
 
@@ -130,7 +130,7 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
                 {
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
@@ -139,7 +139,7 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 
diff --git a/src/Dictionaries/ComplexKeyHashedDictionary.cpp b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
index 1b7ef979d38..8bb1243dd2a 100644
--- a/src/Dictionaries/ComplexKeyHashedDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
@@ -60,11 +60,11 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
         if constexpr (std::is_same_v<AttributeType, String>)
         {
             auto column_string = ColumnString::create();
-            auto out = column_string.get();
+            auto * out = column_string.get();
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
                 {
                     getItemsImpl<StringRef, StringRef>(
                         attribute,
@@ -72,7 +72,7 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
                         [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
                         [&](const size_t row) { return default_col->getDataAt(row); });
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<String>();
 
@@ -116,7 +116,7 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
                 {
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
@@ -125,7 +125,7 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 
diff --git a/src/Dictionaries/DictionaryBlockInputStream.h b/src/Dictionaries/DictionaryBlockInputStream.h
index 915ab7601ed..e22f9579621 100644
--- a/src/Dictionaries/DictionaryBlockInputStream.h
+++ b/src/Dictionaries/DictionaryBlockInputStream.h
@@ -205,11 +205,10 @@ Block DictionaryBlockInputStream<Key>::fillBlock(
             block_columns.push_back(column);
 
     const DictionaryStructure & structure = dictionary->getStructure();
-    ColumnPtr ids_column;
+    ColumnPtr ids_column = getColumnFromIds(ids_to_fill);
 
     if (structure.id && names.find(structure.id->name) != names.end())
     {
-        ids_column = getColumnFromIds(ids_to_fill);
         block_columns.emplace_back(ids_column, std::make_shared<DataTypeUInt64>(), structure.id->name);
     }
 
diff --git a/src/Dictionaries/DictionaryStructure.cpp b/src/Dictionaries/DictionaryStructure.cpp
index 7164d3cfd5d..75e2616ad97 100644
--- a/src/Dictionaries/DictionaryStructure.cpp
+++ b/src/Dictionaries/DictionaryStructure.cpp
@@ -84,6 +84,11 @@ AttributeUnderlyingType getAttributeUnderlyingType(const std::string & type)
             return AttributeUnderlyingType::utDecimal128;
     }
 
+    // Temporary hack to allow arrays in keys, since they are never retrieved for polygon dictionaries.
+    // TODO: This should be fixed by fully supporting arrays in dictionaries.
+    if (type.find("Array") == 0)
+        return AttributeUnderlyingType::utString;
+
     throw Exception{"Unknown type " + type, ErrorCodes::UNKNOWN_TYPE};
 }
 
@@ -322,21 +327,20 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
         bool is_array = false;
         bool is_nullable = false;
 
-        const DataTypeArray * array_type = checkAndGetDataType<DataTypeArray>(type.get());
-        if (array_type)
-        {
-            is_array = true;
-            type = array_type->getNestedType();
-        }
+        // const DataTypeArray * array_type = checkAndGetDataType<DataTypeArray>(type.get());
+        // if (array_type)
+        // {
+        //     is_array = true;
+        //     type = array_type->getNestedType();
+        // }
 
-        if (type->isNullable())
-        {
-            is_nullable = true;
-            type = removeNullable(type);
-        }
+        // if (type->isNullable())
+        // {
+        //     is_nullable = true;
+        //     type = removeNullable(type);
+        // }
 
-        /// TODO: Fix for decimal
-        const auto underlying_type = getAttributeUnderlyingType(type->getName());
+        const auto underlying_type = getAttributeUnderlyingType(type_string);
 
         const auto expression = config.getString(prefix + "expression", "");
         if (!expression.empty())
diff --git a/src/Dictionaries/DirectDictionary.cpp b/src/Dictionaries/DirectDictionary.cpp
index 992fd32e4a6..8995a9f3f3f 100644
--- a/src/Dictionaries/DirectDictionary.cpp
+++ b/src/Dictionaries/DirectDictionary.cpp
@@ -155,11 +155,11 @@ ColumnPtr DirectDictionary::getColumn(
         if constexpr (std::is_same_v<AttributeType, String>)
         {
             auto column_string = ColumnString::create();
-            auto out = column_string.get();
+            auto * out = column_string.get();
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
                 {
                     getItemsImpl<String, String>(
                         attribute,
@@ -175,7 +175,7 @@ ColumnPtr DirectDictionary::getColumn(
                             return String(ref.data, ref.size);
                         });
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<String>();
 
@@ -227,7 +227,7 @@ ColumnPtr DirectDictionary::getColumn(
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
                 {
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
@@ -236,7 +236,7 @@ ColumnPtr DirectDictionary::getColumn(
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 
diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index 959f852d431..0bbd856fcfe 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -131,11 +131,11 @@ ColumnPtr FlatDictionary::getColumn(
         if constexpr (std::is_same_v<AttributeType, String>)
         {
             auto column_string = ColumnString::create();
-            auto out = column_string.get();
+            auto * out = column_string.get();
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
                 {
                     getItemsImpl<StringRef, StringRef>(
                         attribute,
@@ -143,7 +143,7 @@ ColumnPtr FlatDictionary::getColumn(
                         [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
                         [&](const size_t row) { return default_col->getDataAt(row); });
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<String>();
 
@@ -187,7 +187,7 @@ ColumnPtr FlatDictionary::getColumn(
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
                 {
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
@@ -196,7 +196,7 @@ ColumnPtr FlatDictionary::getColumn(
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 
diff --git a/src/Dictionaries/HashedDictionary.cpp b/src/Dictionaries/HashedDictionary.cpp
index 4fbc24e3bda..7cb116c7bc9 100644
--- a/src/Dictionaries/HashedDictionary.cpp
+++ b/src/Dictionaries/HashedDictionary.cpp
@@ -154,11 +154,11 @@ ColumnPtr HashedDictionary::getColumn(
         if constexpr (std::is_same_v<AttributeType, String>)
         {
             auto column_string = ColumnString::create();
-            auto out = column_string.get();
+            auto * out = column_string.get();
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
                 {
                     getItemsImpl<StringRef, StringRef>(
                         attribute,
@@ -166,7 +166,7 @@ ColumnPtr HashedDictionary::getColumn(
                         [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
                         [&](const size_t row) { return default_col->getDataAt(row); });
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<String>();
 
@@ -210,7 +210,7 @@ ColumnPtr HashedDictionary::getColumn(
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
                 {
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
@@ -219,7 +219,7 @@ ColumnPtr HashedDictionary::getColumn(
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 
diff --git a/src/Dictionaries/IPAddressDictionary.cpp b/src/Dictionaries/IPAddressDictionary.cpp
index 477b379150f..5706c5bc39a 100644
--- a/src/Dictionaries/IPAddressDictionary.cpp
+++ b/src/Dictionaries/IPAddressDictionary.cpp
@@ -293,11 +293,11 @@ ColumnPtr IPAddressDictionary::getColumn(
         if constexpr (std::is_same_v<AttributeType, String>)
         {
             auto column_string = ColumnString::create();
-            auto out = column_string.get();
+            auto * out = column_string.get();
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
                 {
                     getItemsImpl<StringRef, StringRef>(
                         attribute,
@@ -305,7 +305,7 @@ ColumnPtr IPAddressDictionary::getColumn(
                         [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
                         [&](const size_t row) { return default_col->getDataAt(row); });
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<String>();
 
@@ -349,7 +349,7 @@ ColumnPtr IPAddressDictionary::getColumn(
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
                 {
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
@@ -358,7 +358,7 @@ ColumnPtr IPAddressDictionary::getColumn(
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 
diff --git a/src/Dictionaries/PolygonDictionary.cpp b/src/Dictionaries/PolygonDictionary.cpp
index da3f367e1a5..3bfc8d997ac 100644
--- a/src/Dictionaries/PolygonDictionary.cpp
+++ b/src/Dictionaries/PolygonDictionary.cpp
@@ -118,11 +118,11 @@ ColumnPtr IPolygonDictionary::getColumn(
         if constexpr (std::is_same_v<AttributeType, String>)
         {
             auto column_string = ColumnString::create();
-            auto out = column_string.get();
+            auto * out = column_string.get();
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
                 {
                     getItemsImpl<String, StringRef>(
                         index,
@@ -130,7 +130,7 @@ ColumnPtr IPolygonDictionary::getColumn(
                         [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
                         [&](const size_t row) { return default_col->getDataAt(row); });
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<String>();
 
@@ -174,7 +174,7 @@ ColumnPtr IPolygonDictionary::getColumn(
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
                 {
                     getItemsImpl<AttributeType, AttributeType>(
                         index,
@@ -183,7 +183,7 @@ ColumnPtr IPolygonDictionary::getColumn(
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 
@@ -379,10 +379,8 @@ std::vector<IPolygonDictionary::Point> IPolygonDictionary::extractPoints(const C
     return result;
 }
 
-ColumnUInt8::Ptr IPolygonDictionary::has(const Columns & key_columns, const DataTypes & key_types) const
+ColumnUInt8::Ptr IPolygonDictionary::has(const Columns & key_columns, const DataTypes &) const
 {
-    dict_struct.validateKeyTypes(key_types);
-
     auto size = key_columns.front()->size();
     auto result = ColumnUInt8::create(size);
     auto& out = result->getData();
diff --git a/src/Dictionaries/RangeDictionaryBlockInputStream.h b/src/Dictionaries/RangeDictionaryBlockInputStream.h
index aeb16f389b4..3da43c85c45 100644
--- a/src/Dictionaries/RangeDictionaryBlockInputStream.h
+++ b/src/Dictionaries/RangeDictionaryBlockInputStream.h
@@ -176,7 +176,7 @@ Block RangeDictionaryBlockInputStream<DictionaryType, RangeType, Key>::fillBlock
                 attribute.name,
                 attribute.type,
                 {ids_column, date_column},
-                {std::make_shared<DataTypeUInt64>(), structure.range_max->type},
+                {std::make_shared<DataTypeUInt64>(), std::make_shared<DataTypeInt64>()},
                 nullptr);
             columns.emplace_back(column, attribute.type, attribute.name);
         }
diff --git a/src/Dictionaries/RangeHashedDictionary.cpp b/src/Dictionaries/RangeHashedDictionary.cpp
index 97c8fcb257c..9684eec5cfa 100644
--- a/src/Dictionaries/RangeHashedDictionary.cpp
+++ b/src/Dictionaries/RangeHashedDictionary.cpp
@@ -5,6 +5,7 @@
 #include <ext/range.h>
 #include "DictionaryFactory.h"
 #include "RangeDictionaryBlockInputStream.h"
+#include <Interpreters/castColumn.h>
 
 namespace
 {
@@ -90,7 +91,7 @@ ColumnPtr RangeHashedDictionary::getColumn(
     const std::string & attribute_name,
     const DataTypePtr &,
     const Columns & key_columns,
-    const DataTypes &,
+    const DataTypes & key_types,
     const ColumnPtr default_untyped) const
 {
     /// TODO: Validate input types
@@ -103,6 +104,15 @@ ColumnPtr RangeHashedDictionary::getColumn(
 
     auto size = key_columns.front()->size();
 
+    /// Cast second column to storage type
+    Columns modified_key_columns = key_columns;
+
+    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>();
+    modified_key_columns[1] = castColumnAccurate(column_to_cast, range_column_storage_type);
+
     auto type_call = [&](const auto &dictionary_attribute_type)
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
@@ -111,25 +121,25 @@ ColumnPtr RangeHashedDictionary::getColumn(
         if constexpr (std::is_same_v<AttributeType, String>)
         {
             auto column_string = ColumnString::create();
-            auto out = column_string.get();
+            auto * out = column_string.get();
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
                 {
                     getItemsImpl<StringRef, StringRef>(
                         attribute,
-                        key_columns,
+                        modified_key_columns,
                         [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
                         [&](const size_t row) { return default_col->getDataAt(row); });
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<String>();
 
                     getItemsImpl<StringRef, StringRef>(
                         attribute,
-                        key_columns,
+                        modified_key_columns,
                         [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
                         [&](const size_t) { return def; });
                 }
@@ -140,7 +150,7 @@ ColumnPtr RangeHashedDictionary::getColumn(
 
                 getItemsImpl<StringRef, StringRef>(
                     attribute,
-                    key_columns,
+                    modified_key_columns,
                     [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
                     [&](const size_t) { return null_value; });
             }
@@ -167,22 +177,22 @@ ColumnPtr RangeHashedDictionary::getColumn(
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
                 {
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
-                        key_columns,
+                        modified_key_columns,
                         [&](const size_t row, const auto value) { return out[row] = value; },
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
-                        key_columns,
+                        modified_key_columns,
                         [&](const size_t row, const auto value) { return out[row] = value; },
                         [&](const size_t) { return def; }
                     );
@@ -194,7 +204,7 @@ ColumnPtr RangeHashedDictionary::getColumn(
 
                 getItemsImpl<AttributeType, AttributeType>(
                     attribute,
-                    key_columns,
+                    modified_key_columns,
                     [&](const size_t row, const auto value) { return out[row] = value; },
                     [&](const size_t) { return null_value; }
                 );
diff --git a/src/Dictionaries/SSDCacheDictionary.cpp b/src/Dictionaries/SSDCacheDictionary.cpp
index c5a8d55b7f2..aa3893daaeb 100644
--- a/src/Dictionaries/SSDCacheDictionary.cpp
+++ b/src/Dictionaries/SSDCacheDictionary.cpp
@@ -1358,11 +1358,11 @@ ColumnPtr SSDCacheDictionary::getColumn(
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
                 {
                     getItemsStringImpl(index, ids, column_string.get(), [&](const size_t row) { return default_col->getDataAt(row); });
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<String>();
 
@@ -1398,7 +1398,7 @@ ColumnPtr SSDCacheDictionary::getColumn(
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
                 {
                     getItemsNumberImpl<AttributeType, AttributeType>(
                         index,
@@ -1407,7 +1407,7 @@ ColumnPtr SSDCacheDictionary::getColumn(
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 
diff --git a/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp b/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
index 0d19b6f8463..f878c25fef5 100644
--- a/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
+++ b/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
@@ -1403,15 +1403,15 @@ ColumnPtr SSDComplexKeyCacheDictionary::getColumn(
         if constexpr (std::is_same_v<AttributeType, String>)
         {
             auto column_string = ColumnString::create();
-            auto out = column_string.get();
+            auto * out = column_string.get();
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
                 {
                     getItemsStringImpl(index, key_columns, key_types, out, [&](const size_t row) { return default_col->getDataAt(row); });
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<String>();
 
@@ -1447,7 +1447,7 @@ ColumnPtr SSDComplexKeyCacheDictionary::getColumn(
 
             if (default_untyped != nullptr)
             {
-                if (const auto default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
                 {
                     getItemsNumberImpl<AttributeType, AttributeType>(
                         index,
@@ -1457,7 +1457,7 @@ ColumnPtr SSDComplexKeyCacheDictionary::getColumn(
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 
@@ -1638,14 +1638,12 @@ ColumnUInt8::Ptr SSDComplexKeyCacheDictionary::has(const Columns & key_columns,
 {
     dict_struct.validateKeyTypes(key_types);
 
-    PaddedPODArray<Key> backup_storage;
-    const auto& ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
+    const auto rows_num = key_columns.front()->size();
 
-    auto result = ColumnUInt8::create(ext::size(ids));
+    auto result = ColumnUInt8::create(rows_num);
     auto& out = result->getData();
 
-    const auto rows = ext::size(ids);
-    for (const auto row : ext::range(0, rows))
+    for (const auto row : ext::range(0, rows_num))
         out[row] = false;
 
     const auto now = std::chrono::system_clock::now();

From 7ded8be0d5c4af97c6a995831f1669be23f4199c Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Sun, 3 Jan 2021 01:08:54 +0300
Subject: [PATCH 539/611] Added Nullable support for FlatDictionary

---
 src/Dictionaries/DictionaryBlockInputStream.h |   6 +-
 src/Dictionaries/DictionaryStructure.cpp      |  84 +++++------
 src/Dictionaries/FlatDictionary.cpp           | 110 ++++++++-------
 src/Dictionaries/FlatDictionary.h             |   6 +-
 .../FunctionsExternalDictionaries.cpp         |   5 +-
 src/Functions/FunctionsExternalDictionaries.h | 131 ++++++++++++++++--
 6 files changed, 224 insertions(+), 118 deletions(-)

diff --git a/src/Dictionaries/DictionaryBlockInputStream.h b/src/Dictionaries/DictionaryBlockInputStream.h
index e22f9579621..8361c01a75f 100644
--- a/src/Dictionaries/DictionaryBlockInputStream.h
+++ b/src/Dictionaries/DictionaryBlockInputStream.h
@@ -227,15 +227,11 @@ Block DictionaryBlockInputStream<Key>::fillBlock(
                 column = dictionary->getColumn(
                     attribute.name, attribute.type, {ids_column}, {std::make_shared<DataTypeUInt64>()}, nullptr /* default_untyped*/);
             }
-            else if (dictionary_identifier_type == DictionaryIdentifierType::complex)
+            else
             {
                 column = dictionary->getColumn(
                     attribute.name, attribute.type, keys, data_types, nullptr /* default_untyped*/);
             }
-            else
-            {
-                column = nullptr;
-            }
 
             block_columns.emplace_back(column, attribute.type, attribute.name);
         }
diff --git a/src/Dictionaries/DictionaryStructure.cpp b/src/Dictionaries/DictionaryStructure.cpp
index 75e2616ad97..3ccfdd49a27 100644
--- a/src/Dictionaries/DictionaryStructure.cpp
+++ b/src/Dictionaries/DictionaryStructure.cpp
@@ -42,54 +42,44 @@ namespace
 }
 
 
-AttributeUnderlyingType getAttributeUnderlyingType(const std::string & type)
+AttributeUnderlyingType getAttributeUnderlyingType(const DataTypePtr & type)
 {
-    static const std::unordered_map<std::string, AttributeUnderlyingType> dictionary
+    auto type_index = type->getTypeId();
+
+    switch (type_index)
     {
-        {"UInt8", AttributeUnderlyingType::utUInt8},
-        {"UInt16", AttributeUnderlyingType::utUInt16},
-        {"UInt32", AttributeUnderlyingType::utUInt32},
-        {"UInt64", AttributeUnderlyingType::utUInt64},
-        {"UUID", AttributeUnderlyingType::utUInt128},
-        {"Int8", AttributeUnderlyingType::utInt8},
-        {"Int16", AttributeUnderlyingType::utInt16},
-        {"Int32", AttributeUnderlyingType::utInt32},
-        {"Int64", AttributeUnderlyingType::utInt64},
-        {"Float32", AttributeUnderlyingType::utFloat32},
-        {"Float64", AttributeUnderlyingType::utFloat64},
-        {"String", AttributeUnderlyingType::utString},
-        {"Date", AttributeUnderlyingType::utUInt16},
-    };
+        case TypeIndex::UInt8:          return AttributeUnderlyingType::utUInt8;
+        case TypeIndex::UInt16:         return AttributeUnderlyingType::utUInt16;
+        case TypeIndex::UInt32:         return AttributeUnderlyingType::utUInt32;
+        case TypeIndex::UInt64:         return AttributeUnderlyingType::utUInt64;
+        case TypeIndex::UInt128:        return AttributeUnderlyingType::utUInt128;
 
-    const auto it = dictionary.find(type);
-    if (it != std::end(dictionary))
-        return it->second;
+        case TypeIndex::Int8:           return AttributeUnderlyingType::utInt8;
+        case TypeIndex::Int16:          return AttributeUnderlyingType::utInt16;
+        case TypeIndex::Int32:          return AttributeUnderlyingType::utInt32;
+        case TypeIndex::Int64:          return AttributeUnderlyingType::utInt64;
 
-    /// Can contain arbitrary scale and timezone parameters.
-    if (type.find("DateTime64") == 0)
-        return AttributeUnderlyingType::utUInt64;
+        case TypeIndex::Float32:        return AttributeUnderlyingType::utFloat32;
+        case TypeIndex::Float64:        return AttributeUnderlyingType::utFloat64;
 
-    /// Can contain arbitrary timezone as parameter.
-    if (type.find("DateTime") == 0)
-        return AttributeUnderlyingType::utUInt32;
+        case TypeIndex::Decimal32:      return AttributeUnderlyingType::utDecimal32;
+        case TypeIndex::Decimal64:      return AttributeUnderlyingType::utDecimal64;
+        case TypeIndex::Decimal128:     return AttributeUnderlyingType::utDecimal128;
 
-    if (type.find("Decimal") == 0)
-    {
-        size_t start = strlen("Decimal");
-        if (type.find("32", start) == start)
-            return AttributeUnderlyingType::utDecimal32;
-        if (type.find("64", start) == start)
-            return AttributeUnderlyingType::utDecimal64;
-        if (type.find("128", start) == start)
-            return AttributeUnderlyingType::utDecimal128;
+        case TypeIndex::Date:           return AttributeUnderlyingType::utUInt16;
+        case TypeIndex::DateTime:       return AttributeUnderlyingType::utUInt32;
+        case TypeIndex::DateTime64:     return AttributeUnderlyingType::utUInt64;
+
+        case TypeIndex::String:         return AttributeUnderlyingType::utString;
+
+        // Temporary hack to allow arrays in keys, since they are never retrieved for polygon dictionaries.
+        // TODO: This should be fixed by fully supporting arrays in dictionaries.
+        case TypeIndex::Array:          return AttributeUnderlyingType::utString;
+
+        default: break;
     }
 
-    // Temporary hack to allow arrays in keys, since they are never retrieved for polygon dictionaries.
-    // TODO: This should be fixed by fully supporting arrays in dictionaries.
-    if (type.find("Array") == 0)
-        return AttributeUnderlyingType::utString;
-
-    throw Exception{"Unknown type " + type, ErrorCodes::UNKNOWN_TYPE};
+    throw Exception{"Unknown type for dictionary" + type->getName(), ErrorCodes::UNKNOWN_TYPE};
 }
 
 
@@ -334,13 +324,13 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
         //     type = array_type->getNestedType();
         // }
 
-        // if (type->isNullable())
-        // {
-        //     is_nullable = true;
-        //     type = removeNullable(type);
-        // }
+        if (type->isNullable())
+        {
+            is_nullable = true;
+            type = removeNullable(type);
+        }
 
-        const auto underlying_type = getAttributeUnderlyingType(type_string);
+        const auto underlying_type = getAttributeUnderlyingType(type);
 
         const auto expression = config.getString(prefix + "expression", "");
         if (!expression.empty())
@@ -353,7 +343,9 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
             try
             {
                 if (null_value_string.empty())
+                {
                     null_value = type->getDefault();
+                }
                 else
                 {
                     ReadBufferFromString null_value_buffer{null_value_string};
diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index 0bbd856fcfe..a7346fb0ad7 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -1,6 +1,7 @@
 #include "FlatDictionary.h"
 #include <IO/WriteHelpers.h>
 #include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnNullable.h>
 #include <Functions/FunctionHelpers.h>
 #include "DictionaryBlockInputStream.h"
 #include "DictionaryFactory.h"
@@ -116,8 +117,18 @@ ColumnPtr FlatDictionary::getColumn(
     PaddedPODArray<Key> backup_storage;
     const auto & ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
 
+    auto size = ids.size();
+
     const auto & attribute = getAttribute(attribute_name);
 
+    ColumnUInt8::MutablePtr col_null_map_to;
+    ColumnUInt8::Container * vec_null_map_to = nullptr;
+    if (attribute.is_nullable)
+    {
+        col_null_map_to = ColumnUInt8::create(size, false);
+        vec_null_map_to = &col_null_map_to->getData();
+    }
+
     /// TODO: Check that attribute type is same as result type
     /// TODO: Check if const will work as expected
 
@@ -126,8 +137,6 @@ ColumnPtr FlatDictionary::getColumn(
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
 
-        auto size = ids.size();
-
         if constexpr (std::is_same_v<AttributeType, String>)
         {
             auto column_string = ColumnString::create();
@@ -226,6 +235,21 @@ ColumnPtr FlatDictionary::getColumn(
 
     callOnDictionaryAttributeType(attribute.type, type_call);
 
+    /// TODO: Fix
+    if (attribute.is_nullable)
+    {
+        for (size_t row = 0; row < ids.size(); ++row)
+        {
+            auto id = ids[row];
+            if (attribute.nullable_set->find(id) != attribute.nullable_set->end())
+            {
+                (*vec_null_map_to)[row] = true;
+            }
+        }
+
+        result = ColumnNullable::create(result, std::move(col_null_map_to));
+    }
+
     return result;
 }
 
@@ -259,7 +283,7 @@ void FlatDictionary::createAttributes()
     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));
+        attributes.push_back(createAttribute(attribute, attribute.null_value));
 
         if (attribute.hierarchical)
         {
@@ -432,18 +456,20 @@ void FlatDictionary::createAttributeImpl<String>(Attribute & attribute, const Fi
 }
 
 
-FlatDictionary::Attribute FlatDictionary::createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value)
+FlatDictionary::Attribute FlatDictionary::createAttribute(const DictionaryAttribute& attribute, const Field & null_value)
 {
-    Attribute attr{type, {}, {}, {}};
+    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(type, type_call);
+    callOnDictionaryAttributeType(attribute.underlying_type, type_call);
 
     return attr;
 }
@@ -501,55 +527,33 @@ void FlatDictionary::setAttributeValueImpl<String>(Attribute & attribute, const
 
 void FlatDictionary::setAttributeValue(Attribute & attribute, const Key id, const Field & value)
 {
-    switch (attribute.type)
+    auto type_call = [&](const auto &dictionary_attribute_type)
     {
-        case AttributeUnderlyingType::utUInt8:
-            setAttributeValueImpl<UInt8>(attribute, id, value.get<UInt64>());
-            break;
-        case AttributeUnderlyingType::utUInt16:
-            setAttributeValueImpl<UInt16>(attribute, id, value.get<UInt64>());
-            break;
-        case AttributeUnderlyingType::utUInt32:
-            setAttributeValueImpl<UInt32>(attribute, id, value.get<UInt64>());
-            break;
-        case AttributeUnderlyingType::utUInt64:
-            setAttributeValueImpl<UInt64>(attribute, id, value.get<UInt64>());
-            break;
-        case AttributeUnderlyingType::utUInt128:
-            setAttributeValueImpl<UInt128>(attribute, id, value.get<UInt128>());
-            break;
-        case AttributeUnderlyingType::utInt8:
-            setAttributeValueImpl<Int8>(attribute, id, value.get<Int64>());
-            break;
-        case AttributeUnderlyingType::utInt16:
-            setAttributeValueImpl<Int16>(attribute, id, value.get<Int64>());
-            break;
-        case AttributeUnderlyingType::utInt32:
-            setAttributeValueImpl<Int32>(attribute, id, value.get<Int64>());
-            break;
-        case AttributeUnderlyingType::utInt64:
-            setAttributeValueImpl<Int64>(attribute, id, value.get<Int64>());
-            break;
-        case AttributeUnderlyingType::utFloat32:
-            setAttributeValueImpl<Float32>(attribute, id, value.get<Float64>());
-            break;
-        case AttributeUnderlyingType::utFloat64:
-            setAttributeValueImpl<Float64>(attribute, id, value.get<Float64>());
-            break;
-        case AttributeUnderlyingType::utString:
-            setAttributeValueImpl<String>(attribute, id, value.get<String>());
-            break;
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
 
-        case AttributeUnderlyingType::utDecimal32:
-            setAttributeValueImpl<Decimal32>(attribute, id, value.get<Decimal32>());
-            break;
-        case AttributeUnderlyingType::utDecimal64:
-            setAttributeValueImpl<Decimal64>(attribute, id, value.get<Decimal64>());
-            break;
-        case AttributeUnderlyingType::utDecimal128:
-            setAttributeValueImpl<Decimal128>(attribute, id, value.get<Decimal128>());
-            break;
-    }
+        if (attribute.is_nullable)
+        {
+            if (value.isNull())
+            {
+                attribute.nullable_set->insert(id);
+                loaded_ids[id] = true;
+                return;
+            }
+            else
+            {
+                auto find_iter = attribute.nullable_set->find(id);
+                if (find_iter != attribute.nullable_set->end())
+                {
+                    attribute.nullable_set->erase(find_iter);
+                }
+            }
+        }
+
+        setAttributeValueImpl<AttributeType>(attribute, id, value.get<NearestFieldType<AttributeType>>());
+    };
+
+    callOnDictionaryAttributeType(attribute.type, type_call);
 }
 
 
diff --git a/src/Dictionaries/FlatDictionary.h b/src/Dictionaries/FlatDictionary.h
index 72da13b4cd4..1796b721129 100644
--- a/src/Dictionaries/FlatDictionary.h
+++ b/src/Dictionaries/FlatDictionary.h
@@ -86,9 +86,13 @@ private:
     template <typename Value>
     using ContainerType = PaddedPODArray<Value>;
 
+    using NullableSet = std::set<size_t>;
+
     struct Attribute final
     {
         AttributeUnderlyingType type;
+        bool is_nullable;
+        std::unique_ptr<NullableSet> nullable_set;
 
         std::variant<
             UInt8,
@@ -141,7 +145,7 @@ private:
     template <typename T>
     void createAttributeImpl(Attribute & attribute, const Field & null_value);
 
-    Attribute createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value);
+    Attribute createAttribute(const DictionaryAttribute& attribute, const Field & null_value);
 
     template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
     void getItemsImpl(
diff --git a/src/Functions/FunctionsExternalDictionaries.cpp b/src/Functions/FunctionsExternalDictionaries.cpp
index dbdbaf0e22a..1bd900f3cbe 100644
--- a/src/Functions/FunctionsExternalDictionaries.cpp
+++ b/src/Functions/FunctionsExternalDictionaries.cpp
@@ -38,8 +38,9 @@ void registerFunctionsExternalDictionaries(FunctionFactory & factory)
     factory.registerFunction<FunctionDictGetDateTimeOrDefault>();
     factory.registerFunction<FunctionDictGetUUIDOrDefault>();
     factory.registerFunction<FunctionDictGetStringOrDefault>();
-    factory.registerFunction<FunctionDictGetNoType<DictionaryGetFunctionType::withoutDefault>>();
-    factory.registerFunction<FunctionDictGetNoType<DictionaryGetFunctionType::withDefault>>();
+    factory.registerFunction<FunctionDictGetNoType<DictionaryGetFunctionType::get>>();
+    factory.registerFunction<FunctionDictGetNoType<DictionaryGetFunctionType::getOrDefault>>();
+    factory.registerFunction<FunctionDictGetNoType<DictionaryGetFunctionType::getOrNull>>();
 }
 
 }
diff --git a/src/Functions/FunctionsExternalDictionaries.h b/src/Functions/FunctionsExternalDictionaries.h
index 5e63e41d7df..0734754289c 100644
--- a/src/Functions/FunctionsExternalDictionaries.h
+++ b/src/Functions/FunctionsExternalDictionaries.h
@@ -8,6 +8,7 @@
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeUUID.h>
+#include <DataTypes/DataTypeNullable.h>
 
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
@@ -205,8 +206,9 @@ private:
 
 enum class DictionaryGetFunctionType
 {
-    withoutDefault,
-    withDefault
+    get,
+    getOrDefault,
+    getOrNull
 };
 
 template <typename DataType, typename Name, DictionaryGetFunctionType dictionary_get_function_type>
@@ -242,10 +244,19 @@ private:
 
     DataTypePtr getReturnTypeImpl(const DataTypes &) const override
     {
+        DataTypePtr result;
+        /// TODO: Decimal will not work properly during FunctionDictGetImpl call decimal_scale will not be iniitalized.
         if constexpr (IsDataTypeDecimal<DataType>)
-            return std::make_shared<DataType>(DataType::maxPrecision(), decimal_scale);
+            result = std::make_shared<DataType>(DataType::maxPrecision(), decimal_scale);
         else
-            return std::make_shared<DataType>();
+            result = std::make_shared<DataType>();
+
+        if constexpr (dictionary_get_function_type == DictionaryGetFunctionType::getOrNull)
+        {
+            result = std::make_shared<DataTypeNullable>(result);
+        }
+
+        return result;
     }
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
@@ -305,7 +316,7 @@ private:
 
         ColumnPtr default_col = nullptr;
 
-        if (dictionary_get_function_type == DictionaryGetFunctionType::withDefault)
+        if (dictionary_get_function_type == DictionaryGetFunctionType::getOrDefault)
         {
             if (current_arguments_index >= arguments.size())
                 throw Exception{"Wrong argument count for function test " + getName(), ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
@@ -348,7 +359,7 @@ private:
 };
 
 template<typename DataType, typename Name>
-using FunctionDictGet = FunctionDictGetImpl<DataType, Name, DictionaryGetFunctionType::withoutDefault>;
+using FunctionDictGet = FunctionDictGetImpl<DataType, Name, DictionaryGetFunctionType::get>;
 
 struct NameDictGetUInt8 { static constexpr auto name = "dictGetUInt8"; };
 struct NameDictGetUInt16 { static constexpr auto name = "dictGetUInt16"; };
@@ -387,7 +398,7 @@ using FunctionDictGetDecimal128 = FunctionDictGet<DataTypeDecimal<Decimal128>, N
 using FunctionDictGetString = FunctionDictGet<DataTypeString, NameDictGetString>;
 
 template<typename DataType, typename Name>
-using FunctionDictGetOrDefault = FunctionDictGetImpl<DataType, Name, DictionaryGetFunctionType::withDefault>;
+using FunctionDictGetOrDefault = FunctionDictGetImpl<DataType, Name, DictionaryGetFunctionType::getOrDefault>;
 
 struct NameDictGetUInt8OrDefault { static constexpr auto name = "dictGetUInt8OrDefault"; };
 struct NameDictGetUInt16OrDefault { static constexpr auto name = "dictGetUInt16OrDefault"; };
@@ -425,6 +436,44 @@ using FunctionDictGetDecimal64OrDefault = FunctionDictGetOrDefault<DataTypeDecim
 using FunctionDictGetDecimal128OrDefault = FunctionDictGetOrDefault<DataTypeDecimal<Decimal128>, NameDictGetDecimal128OrDefault>;
 using FunctionDictGetStringOrDefault = FunctionDictGetOrDefault<DataTypeString, NameDictGetStringOrDefault>;
 
+template<typename DataType, typename Name>
+using FunctionDictGetOrNull = FunctionDictGetImpl<DataType, Name, DictionaryGetFunctionType::getOrNull>;
+
+struct NameDictGetUInt8OrNull { static constexpr auto name = "dictGetUInt8OrNull"; };
+struct NameDictGetUInt16OrNull { static constexpr auto name = "dictGetUInt16OrNull"; };
+struct NameDictGetUInt32OrNull { static constexpr auto name = "dictGetUInt32OrNull"; };
+struct NameDictGetUInt64OrNull { static constexpr auto name = "dictGetUInt64OrNull"; };
+struct NameDictGetInt8OrNull { static constexpr auto name = "dictGetInt8OrNull"; };
+struct NameDictGetInt16OrNull { static constexpr auto name = "dictGetInt16OrNull"; };
+struct NameDictGetInt32OrNull { static constexpr auto name = "dictGetInt32OrNull"; };
+struct NameDictGetInt64OrNull { static constexpr auto name = "dictGetInt64OrNull"; };
+struct NameDictGetFloat32OrNull { static constexpr auto name = "dictGetFloat32OrNull"; };
+struct NameDictGetFloat64OrNull { static constexpr auto name = "dictGetFloat64OrNull"; };
+struct NameDictGetDateOrNull { static constexpr auto name = "dictGetDateOrNull"; };
+struct NameDictGetDateTimeOrNull { static constexpr auto name = "dictGetDateTimeOrNull"; };
+struct NameDictGetUUIDOrNull { static constexpr auto name = "dictGetUUIDOrNull"; };
+struct NameDictGetDecimal32OrNull { static constexpr auto name = "dictGetDecimal32OrNull"; };
+struct NameDictGetDecimal64OrNull { static constexpr auto name = "dictGetDecimal64OrNull"; };
+struct NameDictGetDecimal128OrNull { static constexpr auto name = "dictGetDecimal128OrNull"; };
+struct NameDictGetStringOrNull { static constexpr auto name = "dictGetStringOrNull"; };
+
+using FunctionDictGetUInt8OrNull = FunctionDictGetOrNull<DataTypeUInt8, NameDictGetUInt8OrNull>;
+using FunctionDictGetUInt16OrNull = FunctionDictGetOrNull<DataTypeUInt16, NameDictGetUInt16OrNull>;
+using FunctionDictGetUInt32OrNull = FunctionDictGetOrNull<DataTypeUInt32, NameDictGetUInt32OrNull>;
+using FunctionDictGetUInt64OrNull = FunctionDictGetOrNull<DataTypeUInt64, NameDictGetUInt64OrNull>;
+using FunctionDictGetInt8OrNull = FunctionDictGetOrNull<DataTypeInt8, NameDictGetInt8OrNull>;
+using FunctionDictGetInt16OrNull = FunctionDictGetOrNull<DataTypeInt16, NameDictGetInt16OrNull>;
+using FunctionDictGetInt32OrNull = FunctionDictGetOrNull<DataTypeInt32, NameDictGetInt32OrNull>;
+using FunctionDictGetInt64OrNull = FunctionDictGetOrNull<DataTypeInt64, NameDictGetInt64OrNull>;
+using FunctionDictGetFloat32OrNull = FunctionDictGetOrNull<DataTypeFloat32, NameDictGetFloat32OrNull>;
+using FunctionDictGetFloat64OrNull = FunctionDictGetOrNull<DataTypeFloat64, NameDictGetFloat64OrNull>;
+using FunctionDictGetDateOrNull = FunctionDictGetOrNull<DataTypeDate, NameDictGetDateOrNull>;
+using FunctionDictGetDateTimeOrNull = FunctionDictGetOrNull<DataTypeDateTime, NameDictGetDateTimeOrNull>;
+using FunctionDictGetUUIDOrNull = FunctionDictGetOrNull<DataTypeUUID, NameDictGetUUIDOrNull>;
+using FunctionDictGetDecimal32OrNull = FunctionDictGetOrNull<DataTypeDecimal<Decimal32>, NameDictGetDecimal32OrNull>;
+using FunctionDictGetDecimal64OrNull = FunctionDictGetOrNull<DataTypeDecimal<Decimal64>, NameDictGetDecimal64OrNull>;
+using FunctionDictGetDecimal128OrNull = FunctionDictGetOrNull<DataTypeDecimal<Decimal128>, NameDictGetDecimal128OrNull>;
+using FunctionDictGetStringOrNull = FunctionDictGetOrNull<DataTypeString, NameDictGetStringOrNull>;
 
 /// TODO: Use new API
 /// This variant of function derives the result type automatically.
@@ -432,7 +481,8 @@ template <DictionaryGetFunctionType dictionary_get_function_type>
 class FunctionDictGetNoType final : public IFunction
 {
 public:
-    static constexpr auto name = dictionary_get_function_type == DictionaryGetFunctionType::withDefault ? "dictGetOrDefault" : "dictGet";
+    static constexpr auto name = dictionary_get_function_type == DictionaryGetFunctionType::get ? "dictGet"
+        : (dictionary_get_function_type == DictionaryGetFunctionType::getOrDefault ? "dictGetOrDefault" : "dictGetOrNull");
 
     static FunctionPtr create(const Context & context)
     {
@@ -490,9 +540,9 @@ private:
                 continue;
             }
 
-            WhichDataType dt = attribute.type;
+            WhichDataType dt = removeNullable(attribute.type);
 
-            if constexpr (dictionary_get_function_type == DictionaryGetFunctionType::withoutDefault)
+            if constexpr (dictionary_get_function_type == DictionaryGetFunctionType::get)
             {
                 switch (dt.idx)
                 {
@@ -552,7 +602,7 @@ private:
                         throw Exception("Unknown dictGet type", ErrorCodes::UNKNOWN_TYPE);
                 }
             }
-            else
+            else if constexpr (dictionary_get_function_type == DictionaryGetFunctionType::getOrDefault)
             {
                 switch (dt.idx)
                 {
@@ -611,6 +661,65 @@ private:
                         throw Exception("Unknown dictGetOrDefault type", ErrorCodes::UNKNOWN_TYPE);
                 }
             }
+            else if constexpr (dictionary_get_function_type == DictionaryGetFunctionType::getOrNull)
+            {
+                switch (dt.idx)
+                {
+                    case TypeIndex::String:
+                        impl = FunctionDictGetStringOrNull::create(context);
+                        break;
+                    case TypeIndex::UInt8:
+                        impl = FunctionDictGetUInt8OrNull::create(context);
+                        break;
+                    case TypeIndex::UInt16:
+                        impl = FunctionDictGetUInt16OrNull::create(context);
+                        break;
+                    case TypeIndex::UInt32:
+                        impl = FunctionDictGetUInt32OrNull::create(context);
+                        break;
+                    case TypeIndex::UInt64:
+                        impl = FunctionDictGetUInt64OrNull::create(context);
+                        break;
+                    case TypeIndex::Int8:
+                        impl = FunctionDictGetInt8OrNull::create(context);
+                        break;
+                    case TypeIndex::Int16:
+                        impl = FunctionDictGetInt16OrNull::create(context);
+                        break;
+                    case TypeIndex::Int32:
+                        impl = FunctionDictGetInt32OrNull::create(context);
+                        break;
+                    case TypeIndex::Int64:
+                        impl = FunctionDictGetInt64OrNull::create(context);
+                        break;
+                    case TypeIndex::Float32:
+                        impl = FunctionDictGetFloat32OrNull::create(context);
+                        break;
+                    case TypeIndex::Float64:
+                        impl = FunctionDictGetFloat64OrNull::create(context);
+                        break;
+                    case TypeIndex::Date:
+                        impl = FunctionDictGetDateOrNull::create(context);
+                        break;
+                    case TypeIndex::DateTime:
+                        impl = FunctionDictGetDateTimeOrNull::create(context);
+                        break;
+                    case TypeIndex::UUID:
+                        impl = FunctionDictGetUUIDOrNull::create(context);
+                        break;
+                    case TypeIndex::Decimal32:
+                        impl = FunctionDictGetDecimal32OrNull::create(context, getDecimalScale(*attribute.type));
+                        break;
+                    case TypeIndex::Decimal64:
+                        impl = FunctionDictGetDecimal64OrNull::create(context, getDecimalScale(*attribute.type));
+                        break;
+                    case TypeIndex::Decimal128:
+                        impl = FunctionDictGetDecimal128OrNull::create(context, getDecimalScale(*attribute.type));
+                        break;
+                    default:
+                        throw Exception("Unknown dictGetOrNull type", ErrorCodes::UNKNOWN_TYPE);
+                }
+            }
 
             return attribute.type;
         }

From 3e2d615e6245f735fcd19bed6f5e32baa22982fa Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Sun, 3 Jan 2021 13:07:21 +0300
Subject: [PATCH 540/611] Added Nullable support for HashedDictionary

---
 src/Dictionaries/DictionaryStructure.cpp |   2 +
 src/Dictionaries/FlatDictionary.cpp      |   9 +-
 src/Dictionaries/FlatDictionary.h        |   3 +-
 src/Dictionaries/HashedDictionary.cpp    | 118 ++++++++++++++---------
 src/Dictionaries/HashedDictionary.h      |   8 +-
 5 files changed, 85 insertions(+), 55 deletions(-)

diff --git a/src/Dictionaries/DictionaryStructure.cpp b/src/Dictionaries/DictionaryStructure.cpp
index 3ccfdd49a27..df785bcb550 100644
--- a/src/Dictionaries/DictionaryStructure.cpp
+++ b/src/Dictionaries/DictionaryStructure.cpp
@@ -70,6 +70,8 @@ AttributeUnderlyingType getAttributeUnderlyingType(const DataTypePtr & type)
         case TypeIndex::DateTime:       return AttributeUnderlyingType::utUInt32;
         case TypeIndex::DateTime64:     return AttributeUnderlyingType::utUInt64;
 
+        case TypeIndex::UUID:           return AttributeUnderlyingType::utUInt128;
+
         case TypeIndex::String:         return AttributeUnderlyingType::utString;
 
         // Temporary hack to allow arrays in keys, since they are never retrieved for polygon dictionaries.
diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index a7346fb0ad7..9cbbbbd4f83 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -235,13 +235,12 @@ ColumnPtr FlatDictionary::getColumn(
 
     callOnDictionaryAttributeType(attribute.type, type_call);
 
-    /// TODO: Fix
     if (attribute.is_nullable)
     {
         for (size_t row = 0; row < ids.size(); ++row)
         {
             auto id = ids[row];
-            if (attribute.nullable_set->find(id) != attribute.nullable_set->end())
+            if (attribute.nullable_set->find(id) != nullptr)
             {
                 (*vec_null_map_to)[row] = true;
             }
@@ -542,11 +541,7 @@ void FlatDictionary::setAttributeValue(Attribute & attribute, const Key id, cons
             }
             else
             {
-                auto find_iter = attribute.nullable_set->find(id);
-                if (find_iter != attribute.nullable_set->end())
-                {
-                    attribute.nullable_set->erase(find_iter);
-                }
+                attribute.nullable_set->erase(id);
             }
         }
 
diff --git a/src/Dictionaries/FlatDictionary.h b/src/Dictionaries/FlatDictionary.h
index 1796b721129..8de90ca0c15 100644
--- a/src/Dictionaries/FlatDictionary.h
+++ b/src/Dictionaries/FlatDictionary.h
@@ -4,6 +4,7 @@
 #include <variant>
 #include <vector>
 #include <optional>
+#include <Common/HashTable/HashSet.h>
 #include <Columns/ColumnDecimal.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnArray.h>
@@ -86,7 +87,7 @@ private:
     template <typename Value>
     using ContainerType = PaddedPODArray<Value>;
 
-    using NullableSet = std::set<size_t>;
+    using NullableSet = HashSet<Key, DefaultHash<Key>>;
 
     struct Attribute final
     {
diff --git a/src/Dictionaries/HashedDictionary.cpp b/src/Dictionaries/HashedDictionary.cpp
index 7cb116c7bc9..133d9c0db99 100644
--- a/src/Dictionaries/HashedDictionary.cpp
+++ b/src/Dictionaries/HashedDictionary.cpp
@@ -6,6 +6,7 @@
 #include <Core/Defines.h>
 #include <Functions/FunctionHelpers.h>
 #include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnNullable.h>
 
 namespace
 {
@@ -139,8 +140,18 @@ ColumnPtr HashedDictionary::getColumn(
     PaddedPODArray<Key> backup_storage;
     const auto & ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
 
+    auto size = ids.size();
+
     const auto & attribute = getAttribute(attribute_name);
 
+    ColumnUInt8::MutablePtr col_null_map_to;
+    ColumnUInt8::Container * vec_null_map_to = nullptr;
+    if (attribute.is_nullable)
+    {
+        col_null_map_to = ColumnUInt8::create(size, false);
+        vec_null_map_to = &col_null_map_to->getData();
+    }
+
     /// TODO: Check that attribute type is same as result type
     /// TODO: Check if const will work as expected
 
@@ -149,8 +160,6 @@ ColumnPtr HashedDictionary::getColumn(
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
 
-        auto size = ids.size();
-
         if constexpr (std::is_same_v<AttributeType, String>)
         {
             auto column_string = ColumnString::create();
@@ -249,6 +258,20 @@ ColumnPtr HashedDictionary::getColumn(
 
     callOnDictionaryAttributeType(attribute.type, type_call);
 
+    if (attribute.is_nullable)
+    {
+        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;
+            }
+        }
+
+        result = ColumnNullable::create(result, std::move(col_null_map_to));
+    }
+
     return result;
 }
 
@@ -286,7 +309,7 @@ void HashedDictionary::createAttributes()
     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));
+        attributes.push_back(createAttribute(attribute, attribute.null_value));
 
         if (attribute.hierarchical)
         {
@@ -549,9 +572,10 @@ void HashedDictionary::createAttributeImpl<String>(Attribute & attribute, const
         attribute.sparse_maps = std::make_unique<SparseCollectionType<StringRef>>();
 }
 
-HashedDictionary::Attribute HashedDictionary::createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value)
+HashedDictionary::Attribute HashedDictionary::createAttribute(const DictionaryAttribute& attribute, const Field & null_value)
 {
-    Attribute attr{type, {}, {}, {}, {}};
+    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)
     {
@@ -560,7 +584,7 @@ HashedDictionary::Attribute HashedDictionary::createAttributeWithType(const Attr
         createAttributeImpl<AttributeType>(attr, null_value);
     };
 
-    callOnDictionaryAttributeType(type, type_call);
+    callOnDictionaryAttributeType(attribute.underlying_type, type_call);
 
     return attr;
 }
@@ -605,58 +629,51 @@ bool HashedDictionary::setAttributeValueImpl(Attribute & attribute, const Key id
     }
 }
 
+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());
+    if (!sparse)
+    {
+        auto & map = *std::get<CollectionPtrType<StringRef>>(attribute.maps);
+        return map.insert({id, StringRef{string_in_arena, value.size()}}).second;
+    }
+    else
+    {
+        auto & map = *std::get<SparseCollectionPtrType<StringRef>>(attribute.sparse_maps);
+        return map.insert({id, StringRef{string_in_arena, value.size()}}).second;
+    }
+}
+
 bool HashedDictionary::setAttributeValue(Attribute & attribute, const Key id, const Field & value)
 {
-    switch (attribute.type)
+    bool result = false;
+
+    auto type_call = [&](const auto &dictionary_attribute_type)
     {
-        case AttributeUnderlyingType::utUInt8:
-            return setAttributeValueImpl<UInt8>(attribute, id, value.get<UInt64>());
-        case AttributeUnderlyingType::utUInt16:
-            return setAttributeValueImpl<UInt16>(attribute, id, value.get<UInt64>());
-        case AttributeUnderlyingType::utUInt32:
-            return setAttributeValueImpl<UInt32>(attribute, id, value.get<UInt64>());
-        case AttributeUnderlyingType::utUInt64:
-            return setAttributeValueImpl<UInt64>(attribute, id, value.get<UInt64>());
-        case AttributeUnderlyingType::utUInt128:
-            return setAttributeValueImpl<UInt128>(attribute, id, value.get<UInt128>());
-        case AttributeUnderlyingType::utInt8:
-            return setAttributeValueImpl<Int8>(attribute, id, value.get<Int64>());
-        case AttributeUnderlyingType::utInt16:
-            return setAttributeValueImpl<Int16>(attribute, id, value.get<Int64>());
-        case AttributeUnderlyingType::utInt32:
-            return setAttributeValueImpl<Int32>(attribute, id, value.get<Int64>());
-        case AttributeUnderlyingType::utInt64:
-            return setAttributeValueImpl<Int64>(attribute, id, value.get<Int64>());
-        case AttributeUnderlyingType::utFloat32:
-            return setAttributeValueImpl<Float32>(attribute, id, value.get<Float64>());
-        case AttributeUnderlyingType::utFloat64:
-            return setAttributeValueImpl<Float64>(attribute, id, value.get<Float64>());
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
 
-        case AttributeUnderlyingType::utDecimal32:
-            return setAttributeValueImpl<Decimal32>(attribute, id, value.get<Decimal32>());
-        case AttributeUnderlyingType::utDecimal64:
-            return setAttributeValueImpl<Decimal64>(attribute, id, value.get<Decimal64>());
-        case AttributeUnderlyingType::utDecimal128:
-            return setAttributeValueImpl<Decimal128>(attribute, id, value.get<Decimal128>());
-
-        case AttributeUnderlyingType::utString:
+        if (attribute.is_nullable)
         {
-            const auto & string = value.get<String>();
-            const auto * string_in_arena = attribute.string_arena->insert(string.data(), string.size());
-            if (!sparse)
+            if (value.isNull())
             {
-                auto & map = *std::get<CollectionPtrType<StringRef>>(attribute.maps);
-                return map.insert({id, StringRef{string_in_arena, string.size()}}).second;
+                attribute.nullable_set->insert(id);
+                result = true;
+                return;
             }
             else
             {
-                auto & map = *std::get<SparseCollectionPtrType<StringRef>>(attribute.sparse_maps);
-                return map.insert({id, StringRef{string_in_arena, string.size()}}).second;
+                attribute.nullable_set->erase(id);
             }
         }
-    }
 
-    throw Exception{"Invalid attribute type", ErrorCodes::BAD_ARGUMENTS};
+        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
@@ -717,7 +734,16 @@ PaddedPODArray<HashedDictionary::Key> HashedDictionary::getIds() const
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
+        /// TODO: Check if order is satisfied
         result = getIds<AttributeType>(attribute);
+
+        if (attribute.is_nullable)
+        {
+            for (const auto& value: *attribute.nullable_set)
+            {
+                result.push_back(value.getKey());
+            }
+        }
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
diff --git a/src/Dictionaries/HashedDictionary.h b/src/Dictionaries/HashedDictionary.h
index ff64fb29f1f..0f718c8132b 100644
--- a/src/Dictionaries/HashedDictionary.h
+++ b/src/Dictionaries/HashedDictionary.h
@@ -7,6 +7,7 @@
 #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"
@@ -101,9 +102,14 @@ private:
     template <typename Value>
     using SparseCollectionPtrType = std::unique_ptr<SparseCollectionType<Value>>;
 
+    using NullableSet = HashSet<Key, DefaultHash<Key>>;
+
     struct Attribute final
     {
         AttributeUnderlyingType type;
+        bool is_nullable;
+        std::unique_ptr<NullableSet> nullable_set;
+
         std::variant<
             UInt8,
             UInt16,
@@ -174,7 +180,7 @@ private:
     template <typename T>
     void createAttributeImpl(Attribute & attribute, const Field & null_value);
 
-    Attribute createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value);
+    Attribute createAttribute(const DictionaryAttribute& attribute, const Field & null_value);
 
     template <typename OutputType, typename AttrType, typename ValueSetter, typename DefaultGetter>
     void getItemsAttrImpl(

From b745c6445982195e623657072e31a186b71614de Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Sun, 3 Jan 2021 23:05:14 +0300
Subject: [PATCH 541/611] Added Nullable support for DirectDictionary

---
 src/Dictionaries/CacheDictionary.cpp          |   4 +
 .../ComplexKeyCacheDictionary.cpp             |   4 +
 .../ComplexKeyDirectDictionary.cpp            |   4 +
 .../ComplexKeyHashedDictionary.cpp            |   4 +
 src/Dictionaries/DirectDictionary.cpp         | 137 +++++++++++++-----
 src/Dictionaries/DirectDictionary.h           |   3 +-
 src/Dictionaries/FlatDictionary.cpp           |  10 +-
 src/Dictionaries/HashedDictionary.cpp         |   9 ++
 src/Dictionaries/IPAddressDictionary.cpp      |   4 +
 src/Dictionaries/PolygonDictionary.cpp        |   4 +
 src/Dictionaries/RangeHashedDictionary.cpp    |   4 +
 src/Dictionaries/SSDCacheDictionary.cpp       |   4 +
 .../SSDComplexKeyCacheDictionary.cpp          |   4 +
 src/Formats/MySQLBlockInputStream.cpp         |  18 ++-
 14 files changed, 170 insertions(+), 43 deletions(-)

diff --git a/src/Dictionaries/CacheDictionary.cpp b/src/Dictionaries/CacheDictionary.cpp
index 521b95243ae..71490897131 100644
--- a/src/Dictionaries/CacheDictionary.cpp
+++ b/src/Dictionaries/CacheDictionary.cpp
@@ -289,6 +289,8 @@ ColumnPtr CacheDictionary::getColumn(
 
                     getItemsString(attribute, ids, column_string.get(), [&](const size_t) { return StringRef{def}; });
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
             }
             else
             {
@@ -339,6 +341,8 @@ ColumnPtr CacheDictionary::getColumn(
                         [&](const size_t) { return def; }
                     );
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
             }
             else
             {
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary.cpp b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
index 336c2a9eeef..60d2878f694 100644
--- a/src/Dictionaries/ComplexKeyCacheDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
@@ -111,6 +111,8 @@ ColumnPtr ComplexKeyCacheDictionary::getColumn(
 
                     getItemsString(attribute, key_columns, out, [&](const size_t) { return StringRef{def}; });
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
             }
             else
             {
@@ -161,6 +163,8 @@ ColumnPtr ComplexKeyCacheDictionary::getColumn(
                         [&](const size_t) { return def; }
                     );
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
             }
             else
             {
diff --git a/src/Dictionaries/ComplexKeyDirectDictionary.cpp b/src/Dictionaries/ComplexKeyDirectDictionary.cpp
index 3d96f1e410a..c476348ccd5 100644
--- a/src/Dictionaries/ComplexKeyDirectDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyDirectDictionary.cpp
@@ -92,6 +92,8 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
                         },
                         [&](const size_t) { return def; });
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
             }
             else
             {
@@ -150,6 +152,8 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
                         [&](const size_t) { return def; }
                     );
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
             }
             else
             {
diff --git a/src/Dictionaries/ComplexKeyHashedDictionary.cpp b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
index 8bb1243dd2a..6aee03668ab 100644
--- a/src/Dictionaries/ComplexKeyHashedDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
@@ -82,6 +82,8 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
                         [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
                         [&](const size_t) { return def; });
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
             }
             else
             {
@@ -136,6 +138,8 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
                         [&](const size_t) { return def; }
                     );
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
             }
             else
             {
diff --git a/src/Dictionaries/DirectDictionary.cpp b/src/Dictionaries/DirectDictionary.cpp
index 8995a9f3f3f..ffd1dd2d01b 100644
--- a/src/Dictionaries/DirectDictionary.cpp
+++ b/src/Dictionaries/DirectDictionary.cpp
@@ -4,6 +4,7 @@
 #include "DictionaryFactory.h"
 #include <Core/Defines.h>
 #include <Functions/FunctionHelpers.h>
+#include <Columns/ColumnNullable.h>
 
 namespace DB
 {
@@ -38,7 +39,7 @@ void DirectDictionary::toParent(const PaddedPODArray<Key> & ids, PaddedPODArray<
     getItemsImpl<UInt64, UInt64>(
         *hierarchical_attribute,
         ids,
-        [&](const size_t row, const UInt64 value) { out[row] = value; },
+        [&](const size_t row, const UInt64 value, bool) { out[row] = value; },
         [&](const size_t) { return null_value; });
 }
 
@@ -142,6 +143,16 @@ ColumnPtr DirectDictionary::getColumn(
 
     const auto & attribute = getAttribute(attribute_name);
 
+    auto 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(size, false);
+        vec_null_map_to = &col_null_map_to->getData();
+    }
+
     /// TODO: Check that attribute type is same as result type
     /// TODO: Check if const will work as expected
 
@@ -150,8 +161,6 @@ ColumnPtr DirectDictionary::getColumn(
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
 
-        auto size = ids.size();
-
         if constexpr (std::is_same_v<AttributeType, String>)
         {
             auto column_string = ColumnString::create();
@@ -164,8 +173,13 @@ ColumnPtr DirectDictionary::getColumn(
                     getItemsImpl<String, String>(
                         attribute,
                         ids,
-                        [&](const size_t, const String value)
+                        [&](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);
                         },
@@ -182,13 +196,21 @@ ColumnPtr DirectDictionary::getColumn(
                     getItemsImpl<String, String>(
                         attribute,
                         ids,
-                        [&](const size_t, const String value)
+                        [&](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);
                         },
                         [&](const size_t) { return def; });
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
+ 
             }
             else
             {
@@ -197,8 +219,13 @@ ColumnPtr DirectDictionary::getColumn(
                 getItemsImpl<String, String>(
                     attribute,
                     ids,
-                    [&](const size_t, const String value)
+                    [&](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);
                     },
@@ -232,7 +259,15 @@ ColumnPtr DirectDictionary::getColumn(
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
                         ids,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row, const auto value, bool is_null)
+                        {
+                            if (attribute.is_nullable)
+                            {
+                                (*vec_null_map_to)[row] = is_null;
+                            }
+ 
+                            out[row] = value; 
+                        },
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
@@ -243,10 +278,20 @@ ColumnPtr DirectDictionary::getColumn(
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
                         ids,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row, const auto value, bool is_null)
+                        {
+                            if (attribute.is_nullable)
+                            {
+                                (*vec_null_map_to)[row] = is_null;
+                            }
+ 
+                            out[row] = value; 
+                        },
                         [&](const size_t) { return def; }
                     );
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
             }
             else
             {
@@ -255,7 +300,15 @@ ColumnPtr DirectDictionary::getColumn(
                 getItemsImpl<AttributeType, AttributeType>(
                     attribute,
                     ids,
-                    [&](const size_t row, const auto value) { return out[row] = value; },
+                    [&](const size_t row, const auto value, bool is_null)
+                    {
+                        if (attribute.is_nullable)
+                        {
+                            (*vec_null_map_to)[row] = is_null;
+                        }
+ 
+                        out[row] = value; 
+                    },
                     [&](const size_t) { return null_value; }
                 );
             }
@@ -266,6 +319,11 @@ ColumnPtr DirectDictionary::getColumn(
 
     callOnDictionaryAttributeType(attribute.type, type_call);
 
+    if (attribute.is_nullable)
+    {
+        result = ColumnNullable::create(result, std::move(col_null_map_to));
+    }
+
     return result;
 }
 
@@ -321,7 +379,7 @@ void DirectDictionary::createAttributes()
     {
         attribute_index_by_name.emplace(attribute.name, attributes.size());
         attribute_name_by_index.emplace(attributes.size(), attribute.name);
-        attributes.push_back(createAttributeWithType(attribute.underlying_type, attribute.null_value, attribute.name));
+        attributes.push_back(createAttribute(attribute, attribute.null_value, attribute.name));
 
         if (attribute.hierarchical)
         {
@@ -350,9 +408,9 @@ void DirectDictionary::createAttributeImpl<String>(Attribute & attribute, const
 }
 
 
-DirectDictionary::Attribute DirectDictionary::createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value, const std::string & attr_name)
+DirectDictionary::Attribute DirectDictionary::createAttribute(const DictionaryAttribute& attribute, const Field & null_value, const std::string & attr_name)
 {
-    Attribute attr{type, {}, {}, attr_name};
+    Attribute attr{attribute.underlying_type, attribute.is_nullable, {}, {}, attr_name};
 
     auto type_call = [&](const auto &dictionary_attribute_type)
     {
@@ -361,7 +419,7 @@ DirectDictionary::Attribute DirectDictionary::createAttributeWithType(const Attr
         createAttributeImpl<AttributeType>(attr, null_value);
     };
 
-    callOnDictionaryAttributeType(type, type_call);
+    callOnDictionaryAttributeType(attribute.underlying_type, type_call);
 
     return attr;
 }
@@ -374,8 +432,14 @@ void DirectDictionary::getItemsImpl(
     const auto rows = ext::size(ids);
 
     HashMap<Key, OutputType> value_by_key;
+    HashMap<Key, bool> value_is_null;
+
     for (const auto row : ext::range(0, rows))
-        value_by_key[ids[row]] = get_default(row);
+    {
+        auto key = ids[row];
+        value_by_key[key] = get_default(row);
+        value_is_null[key] = false;
+    }
 
     std::vector<Key> to_load;
     to_load.reserve(value_by_key.size());
@@ -385,35 +449,30 @@ void DirectDictionary::getItemsImpl(
     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;
 
-        for (const size_t attribute_idx : ext::range(0, attributes.size()))
+        const IColumn & attribute_column = *block.safeGetByPosition(attribute_index + 1).column;
+
+        for (const auto row_idx : ext::range(0, id_column.size()))
         {
-            if (attribute.name != attribute_name_by_index.at(attribute_idx))
+            const auto key = id_column[row_idx].get<UInt64>();
+
+            if (value_by_key.find(key) != value_by_key.end())
             {
-                continue;
-            }
+                auto value = attribute_column[row_idx];
 
-            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 (value_by_key.find(key) != value_by_key.end())
-                {
-                    if (attribute.type == AttributeUnderlyingType::utFloat32)
-                    {
-                        value_by_key[key] = static_cast<Float32>(attribute_column[row_idx].get<Float64>());
-                    }
-                    else
-                    {
-                        value_by_key[key] = static_cast<OutputType>(attribute_column[row_idx].get<AttributeType>());
-                    }
-
-                }
+                if (value.isNull())
+                    value_is_null[key] = true;
+                else
+                    value_by_key[key] = static_cast<OutputType>(value.get<NearestFieldType<AttributeType>>());
             }
         }
     }
@@ -421,7 +480,11 @@ void DirectDictionary::getItemsImpl(
     stream->readSuffix();
 
     for (const auto row : ext::range(0, rows))
-        set_value(row, value_by_key[ids[row]]);
+    {
+        auto key = ids[row];
+        std::cerr << "DirectDictionary set_value " << row << std::endl;
+        set_value(row, value_by_key[key], value_is_null[key]);
+    }
 
     query_count.fetch_add(rows, std::memory_order_relaxed);
 }
diff --git a/src/Dictionaries/DirectDictionary.h b/src/Dictionaries/DirectDictionary.h
index 48250315657..dcfea296778 100644
--- a/src/Dictionaries/DirectDictionary.h
+++ b/src/Dictionaries/DirectDictionary.h
@@ -82,6 +82,7 @@ private:
     struct Attribute final
     {
         AttributeUnderlyingType type;
+        bool is_nullable;
         std::variant<
             UInt8,
             UInt16,
@@ -111,7 +112,7 @@ private:
     template <typename T>
     void createAttributeImpl(Attribute & attribute, const Field & null_value);
 
-    Attribute createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value, const std::string & name);
+    Attribute createAttribute(const DictionaryAttribute& attribute, const Field & null_value, const std::string & name);
 
     template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
     void getItemsImpl(
diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index 9cbbbbd4f83..7278808f773 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -162,6 +162,8 @@ ColumnPtr FlatDictionary::getColumn(
                         [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
                         [&](const size_t) { return def; });
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
             }
             else
             {
@@ -201,7 +203,7 @@ ColumnPtr FlatDictionary::getColumn(
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
                         ids,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row, const auto value) { out[row] = value; },
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
@@ -212,10 +214,12 @@ ColumnPtr FlatDictionary::getColumn(
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
                         ids,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row, const auto value) { out[row] = value; },
                         [&](const size_t) { return def; }
                     );
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
             }
             else
             {
@@ -224,7 +228,7 @@ ColumnPtr FlatDictionary::getColumn(
                 getItemsImpl<AttributeType, AttributeType>(
                     attribute,
                     ids,
-                    [&](const size_t row, const auto value) { return out[row] = value; },
+                    [&](const size_t row, const auto value) { out[row] = value; },
                     [&](const size_t) { return null_value; }
                 );
             }
diff --git a/src/Dictionaries/HashedDictionary.cpp b/src/Dictionaries/HashedDictionary.cpp
index 133d9c0db99..571d70eb303 100644
--- a/src/Dictionaries/HashedDictionary.cpp
+++ b/src/Dictionaries/HashedDictionary.cpp
@@ -185,6 +185,8 @@ ColumnPtr HashedDictionary::getColumn(
                         [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
                         [&](const size_t) { return def; });
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
             }
             else
             {
@@ -239,6 +241,8 @@ ColumnPtr HashedDictionary::getColumn(
                         [&](const size_t) { return def; }
                     );
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
             }
             else
             {
@@ -692,7 +696,12 @@ void HashedDictionary::has(const Attribute & attribute, const PaddedPODArray<Key
     const auto rows = ext::size(ids);
 
     for (const auto i : ext::range(0, rows))
+    {
         out[i] = attr.find(ids[i]) != nullptr;
+
+        if (attribute.is_nullable && !out[i])
+            out[i] = attribute.nullable_set->find(ids[i]) != nullptr;
+    }
 }
 
 template <>
diff --git a/src/Dictionaries/IPAddressDictionary.cpp b/src/Dictionaries/IPAddressDictionary.cpp
index 5706c5bc39a..f611725f740 100644
--- a/src/Dictionaries/IPAddressDictionary.cpp
+++ b/src/Dictionaries/IPAddressDictionary.cpp
@@ -315,6 +315,8 @@ ColumnPtr IPAddressDictionary::getColumn(
                         [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
                         [&](const size_t) { return StringRef { def }; });
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
             }
             else
             {
@@ -369,6 +371,8 @@ ColumnPtr IPAddressDictionary::getColumn(
                         [&](const size_t) { return def; }
                     );
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
             }
             else
             {
diff --git a/src/Dictionaries/PolygonDictionary.cpp b/src/Dictionaries/PolygonDictionary.cpp
index 3bfc8d997ac..3b8d3ad3b5a 100644
--- a/src/Dictionaries/PolygonDictionary.cpp
+++ b/src/Dictionaries/PolygonDictionary.cpp
@@ -140,6 +140,8 @@ ColumnPtr IPolygonDictionary::getColumn(
                         [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
                         [&](const size_t) { return def; });
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
             }
             else
             {
@@ -194,6 +196,8 @@ ColumnPtr IPolygonDictionary::getColumn(
                         [&](const size_t) { return def; }
                     );
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
             }
             else
             {
diff --git a/src/Dictionaries/RangeHashedDictionary.cpp b/src/Dictionaries/RangeHashedDictionary.cpp
index 9684eec5cfa..1bee24f6bcb 100644
--- a/src/Dictionaries/RangeHashedDictionary.cpp
+++ b/src/Dictionaries/RangeHashedDictionary.cpp
@@ -143,6 +143,8 @@ ColumnPtr RangeHashedDictionary::getColumn(
                         [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
                         [&](const size_t) { return def; });
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
             }
             else
             {
@@ -197,6 +199,8 @@ ColumnPtr RangeHashedDictionary::getColumn(
                         [&](const size_t) { return def; }
                     );
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
             }
             else
             {
diff --git a/src/Dictionaries/SSDCacheDictionary.cpp b/src/Dictionaries/SSDCacheDictionary.cpp
index aa3893daaeb..4cac3ffb94d 100644
--- a/src/Dictionaries/SSDCacheDictionary.cpp
+++ b/src/Dictionaries/SSDCacheDictionary.cpp
@@ -1368,6 +1368,8 @@ ColumnPtr SSDCacheDictionary::getColumn(
 
                     getItemsStringImpl(index, ids, column_string.get(), [&](const size_t) { return StringRef{def}; });
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
             }
             else
             {
@@ -1418,6 +1420,8 @@ ColumnPtr SSDCacheDictionary::getColumn(
                         [&](const size_t) { return def; }
                     );
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
             }
             else
             {
diff --git a/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp b/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
index f878c25fef5..17c9bd137af 100644
--- a/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
+++ b/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
@@ -1417,6 +1417,8 @@ ColumnPtr SSDComplexKeyCacheDictionary::getColumn(
 
                     getItemsStringImpl(index, key_columns, key_types, out, [&](const size_t) { return StringRef{def}; });
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
             }
             else
             {
@@ -1469,6 +1471,8 @@ ColumnPtr SSDComplexKeyCacheDictionary::getColumn(
                         [&](const size_t) { return def; }
                     );
                 }
+                else
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
             }
             else
             {
diff --git a/src/Formats/MySQLBlockInputStream.cpp b/src/Formats/MySQLBlockInputStream.cpp
index 5a1af418b7d..9b4e37df353 100644
--- a/src/Formats/MySQLBlockInputStream.cpp
+++ b/src/Formats/MySQLBlockInputStream.cpp
@@ -70,6 +70,7 @@ namespace
                 assert_cast<ColumnUInt32 &>(column).insertValue(value.getUInt());
                 break;
             case ValueType::vtUInt64:
+                std::cerr << "Insert uint64 " << value.getUInt() << std::endl;
                 assert_cast<ColumnUInt64 &>(column).insertValue(value.getUInt());
                 break;
             case ValueType::vtInt8:
@@ -91,6 +92,7 @@ namespace
                 assert_cast<ColumnFloat64 &>(column).insertValue(value.getDouble());
                 break;
             case ValueType::vtString:
+                std::cerr << "Insert string " << std::string(value.data(), value.size()) << std::endl;
                 assert_cast<ColumnString &>(column).insertData(value.data(), value.size());
                 break;
             case ValueType::vtDate:
@@ -146,20 +148,32 @@ Block MySQLBlockInputStream::readImpl()
             const auto value = row[position_mapping[index]];
             const auto & sample = description.sample_block.getByPosition(index);
 
+            bool is_type_nullable = description.types[index].second;
+
             if (!value.isNull())
             {
-                if (description.types[index].second)
+                if (is_type_nullable)
                 {
                     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);
-                    column_nullable.getNullMapData().emplace_back(0);
+                    column_nullable.getNullMapData().emplace_back(false);
                 }
                 else
+                {
                     insertValue(*sample.type, *columns[index], description.types[index].first, value);
+                }
             }
             else
+            {
                 insertDefaultValue(*columns[index], *sample.column);
+
+                if (is_type_nullable)
+                {
+                    ColumnNullable & column_nullable = assert_cast<ColumnNullable &>(*columns[index]);
+                    column_nullable.getNullMapData().back() = true;
+                }
+            }
         }
 
         ++num_rows;

From 6e51b2f60a4cdf44f264975c39ef76de0bec6186 Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Tue, 5 Jan 2021 00:07:45 +0300
Subject: [PATCH 542/611] Added Nullable support for RangeHashedDictionary

---
 src/Dictionaries/RangeHashedDictionary.cpp | 270 ++++++++++-----------
 src/Dictionaries/RangeHashedDictionary.h   |  13 +-
 2 files changed, 140 insertions(+), 143 deletions(-)

diff --git a/src/Dictionaries/RangeHashedDictionary.cpp b/src/Dictionaries/RangeHashedDictionary.cpp
index 1bee24f6bcb..d1ce99b6c3a 100644
--- a/src/Dictionaries/RangeHashedDictionary.cpp
+++ b/src/Dictionaries/RangeHashedDictionary.cpp
@@ -113,6 +113,14 @@ ColumnPtr RangeHashedDictionary::getColumn(
     auto range_column_storage_type = std::make_shared<DataTypeInt64>();
     modified_key_columns[1] = castColumnAccurate(column_to_cast, range_column_storage_type);
 
+    ColumnUInt8::MutablePtr col_null_map_to;
+    ColumnUInt8::Container * vec_null_map_to = nullptr;
+    if (attribute.is_nullable)
+    {
+        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)
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
@@ -130,7 +138,15 @@ ColumnPtr RangeHashedDictionary::getColumn(
                     getItemsImpl<StringRef, StringRef>(
                         attribute,
                         modified_key_columns,
-                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                        [&](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);
+                        },
                         [&](const size_t row) { return default_col->getDataAt(row); });
                 }
                 else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
@@ -140,7 +156,15 @@ ColumnPtr RangeHashedDictionary::getColumn(
                     getItemsImpl<StringRef, StringRef>(
                         attribute,
                         modified_key_columns,
-                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                        [&](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);
+                        },
                         [&](const size_t) { return def; });
                 }
                 else
@@ -153,7 +177,15 @@ ColumnPtr RangeHashedDictionary::getColumn(
                 getItemsImpl<StringRef, StringRef>(
                     attribute,
                     modified_key_columns,
-                    [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                    [&](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);
+                    },
                     [&](const size_t) { return null_value; });
             }
 
@@ -184,7 +216,15 @@ ColumnPtr RangeHashedDictionary::getColumn(
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
                         modified_key_columns,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row, const auto value, bool is_null)
+                        {
+                            if (attribute.is_nullable)
+                            {
+                                (*vec_null_map_to)[row] = is_null;
+                            }
+
+                            out[row] = value; 
+                        },
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
@@ -195,7 +235,15 @@ ColumnPtr RangeHashedDictionary::getColumn(
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
                         modified_key_columns,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row, const auto value, bool is_null)
+                        {
+                            if (attribute.is_nullable)
+                            {
+                                (*vec_null_map_to)[row] = is_null;
+                            }
+
+                            out[row] = value; 
+                        },
                         [&](const size_t) { return def; }
                     );
                 }
@@ -209,9 +257,16 @@ ColumnPtr RangeHashedDictionary::getColumn(
                 getItemsImpl<AttributeType, AttributeType>(
                     attribute,
                     modified_key_columns,
-                    [&](const size_t row, const auto value) { return out[row] = value; },
-                    [&](const size_t) { return null_value; }
-                );
+                    [&](const size_t row, const auto value, bool is_null)
+                    {
+                        if (attribute.is_nullable)
+                        {
+                            (*vec_null_map_to)[row] = is_null;
+                        }
+
+                        out[row] = value;
+                    },
+                    [&](const size_t) { return null_value; });
             }
 
             result = std::move(column);
@@ -220,6 +275,11 @@ ColumnPtr RangeHashedDictionary::getColumn(
 
     callOnDictionaryAttributeType(attribute.type, type_call);
 
+    if (attribute.is_nullable)
+    {
+        result = ColumnNullable::create(result, std::move(col_null_map_to));
+    }
+
     return result;
 }
 
@@ -237,7 +297,7 @@ void RangeHashedDictionary::createAttributes()
     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));
+        attributes.push_back(createAttribute(attribute, attribute.null_value));
 
         if (attribute.hierarchical)
             throw Exception{ErrorCodes::BAD_ARGUMENTS, "Hierarchical attributes not supported by {} dictionary.",
@@ -306,9 +366,7 @@ void RangeHashedDictionary::addAttributeSize(const Attribute & attribute)
 template <>
 void RangeHashedDictionary::addAttributeSize<String>(const Attribute & attribute)
 {
-    const auto & map_ref = std::get<Ptr<StringRef>>(attribute.maps);
-    bytes_allocated += sizeof(Collection<StringRef>) + map_ref->getBufferSizeInBytes();
-    bucket_count = map_ref->getBufferSizeInCells();
+    addAttributeSize<StringRef>(attribute);
     bytes_allocated += sizeof(Arena) + attribute.string_arena->size();
 }
 
@@ -347,9 +405,9 @@ void RangeHashedDictionary::createAttributeImpl<String>(Attribute & attribute, c
 }
 
 RangeHashedDictionary::Attribute
-RangeHashedDictionary::createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value)
+RangeHashedDictionary::createAttribute(const DictionaryAttribute& attribute, const Field & null_value)
 {
-    Attribute attr{type, {}, {}, {}};
+    Attribute attr{attribute.underlying_type, attribute.is_nullable, {}, {}, {}};
 
     auto type_call = [&](const auto &dictionary_attribute_type)
     {
@@ -358,7 +416,7 @@ RangeHashedDictionary::createAttributeWithType(const AttributeUnderlyingType typ
         createAttributeImpl<AttributeType>(attr, null_value);
     };
 
-    callOnDictionaryAttributeType(type, type_call);
+    callOnDictionaryAttributeType(attribute.underlying_type, type_call);
 
     return attr;
 }
@@ -391,11 +449,23 @@ void RangeHashedDictionary::getItemsImpl(
                       return v.range.contains(date);
                   });
 
-            set_value(row, static_cast<OutputType>(val_it != std::end(ranges_and_values) ? val_it->value : get_default(row))); // NOLINT
+            if (val_it != std::end(ranges_and_values))
+            {
+                auto& value = val_it->value;
+
+                if (value)
+                    set_value(row, static_cast<OutputType>(*value), false); // NOLINT
+                else
+                    set_value(row, get_default(row), true);
+            }
+            else
+            {
+                set_value(row, get_default(row), false);
+            }
         }
         else
         {
-            set_value(row, get_default(row));
+            set_value(row, get_default(row), false);
         }
     }
 
@@ -404,9 +474,32 @@ void RangeHashedDictionary::getItemsImpl(
 
 
 template <typename T>
-void RangeHashedDictionary::setAttributeValueImpl(Attribute & attribute, const Key id, const Range & range, const T value)
+void RangeHashedDictionary::setAttributeValueImpl(Attribute & attribute, const Key id, const Range & range, const Field & value)
 {
-    auto & map = *std::get<Ptr<T>>(attribute.maps);
+    using ValueType = std::conditional_t<std::is_same_v<T, String>, StringRef, T>;
+    auto & map = *std::get<Ptr<ValueType>>(attribute.maps);
+    
+    Value<ValueType> value_to_insert;
+
+    if (attribute.is_nullable && value.isNull())
+    {
+        value_to_insert = { range, {} };
+    }
+    else
+    {
+        if constexpr (std::is_same_v<T, String>)
+        {
+            const auto & string = value.get<String>();
+            const auto * string_in_arena = attribute.string_arena->insert(string.data(), string.size());
+            const StringRef string_ref{string_in_arena, string.size()};
+            value_to_insert = Value<ValueType>{ range, { string_ref }};
+        }
+        else
+        {
+            value_to_insert = Value<ValueType>{ range, { value.get<NearestFieldType<ValueType>>() }};
+        }
+    }
+
     const auto it = map.find(id);
 
     if (it)
@@ -414,92 +507,28 @@ void RangeHashedDictionary::setAttributeValueImpl(Attribute & attribute, const K
         auto & values = it->getMapped();
 
         const auto insert_it
-            = std::lower_bound(std::begin(values), std::end(values), range, [](const Value<T> & lhs, const Range & rhs_range)
+            = std::lower_bound(std::begin(values), std::end(values), range, [](const Value<ValueType> & lhs, const Range & rhs_range)
               {
                   return lhs.range < rhs_range;
               });
 
-        values.insert(insert_it, Value<T>{range, value});
+        values.insert(insert_it, std::move(value_to_insert));
     }
     else
-        map.insert({id, Values<T>{Value<T>{range, value}}});
+        map.insert({id, Values<ValueType>{std::move(value_to_insert)}});
 }
 
 void RangeHashedDictionary::setAttributeValue(Attribute & attribute, const Key id, const Range & range, const Field & value)
 {
-    switch (attribute.type)
+    auto type_call = [&](const auto &dictionary_attribute_type)
     {
-        case AttributeUnderlyingType::utUInt8:
-            setAttributeValueImpl<UInt8>(attribute, id, range, value.get<UInt64>());
-            break;
-        case AttributeUnderlyingType::utUInt16:
-            setAttributeValueImpl<UInt16>(attribute, id, range, value.get<UInt64>());
-            break;
-        case AttributeUnderlyingType::utUInt32:
-            setAttributeValueImpl<UInt32>(attribute, id, range, value.get<UInt64>());
-            break;
-        case AttributeUnderlyingType::utUInt64:
-            setAttributeValueImpl<UInt64>(attribute, id, range, value.get<UInt64>());
-            break;
-        case AttributeUnderlyingType::utUInt128:
-            setAttributeValueImpl<UInt128>(attribute, id, range, value.get<UInt128>());
-            break;
-        case AttributeUnderlyingType::utInt8:
-            setAttributeValueImpl<Int8>(attribute, id, range, value.get<Int64>());
-            break;
-        case AttributeUnderlyingType::utInt16:
-            setAttributeValueImpl<Int16>(attribute, id, range, value.get<Int64>());
-            break;
-        case AttributeUnderlyingType::utInt32:
-            setAttributeValueImpl<Int32>(attribute, id, range, value.get<Int64>());
-            break;
-        case AttributeUnderlyingType::utInt64:
-            setAttributeValueImpl<Int64>(attribute, id, range, value.get<Int64>());
-            break;
-        case AttributeUnderlyingType::utFloat32:
-            setAttributeValueImpl<Float32>(attribute, id, range, value.get<Float64>());
-            break;
-        case AttributeUnderlyingType::utFloat64:
-            setAttributeValueImpl<Float64>(attribute, id, range, value.get<Float64>());
-            break;
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
 
-        case AttributeUnderlyingType::utDecimal32:
-            setAttributeValueImpl<Decimal32>(attribute, id, range, value.get<Decimal32>());
-            break;
-        case AttributeUnderlyingType::utDecimal64:
-            setAttributeValueImpl<Decimal64>(attribute, id, range, value.get<Decimal64>());
-            break;
-        case AttributeUnderlyingType::utDecimal128:
-            setAttributeValueImpl<Decimal128>(attribute, id, range, value.get<Decimal128>());
-            break;
+        setAttributeValueImpl<AttributeType>(attribute, id, range, value);
+    };
 
-        case AttributeUnderlyingType::utString:
-        {
-            auto & map = *std::get<Ptr<StringRef>>(attribute.maps);
-            const auto & string = value.get<String>();
-            const auto * string_in_arena = attribute.string_arena->insert(string.data(), string.size());
-            const StringRef string_ref{string_in_arena, string.size()};
-
-            auto * it = map.find(id);
-
-            if (it)
-            {
-                auto & values = it->getMapped();
-
-                const auto insert_it = std::lower_bound(
-                    std::begin(values), std::end(values), range, [](const Value<StringRef> & lhs, const Range & rhs_range)
-                    {
-                        return lhs.range < rhs_range;
-                    });
-
-                values.insert(insert_it, Value<StringRef>{range, string_ref});
-            }
-            else
-                map.insert({id, Values<StringRef>{Value<StringRef>{range, string_ref}}});
-
-            break;
-        }
-    }
+    callOnDictionaryAttributeType(attribute.type, type_call);
 }
 
 const RangeHashedDictionary::Attribute & RangeHashedDictionary::getAttribute(const std::string & attribute_name) const
@@ -528,55 +557,18 @@ void RangeHashedDictionary::getIdsAndDates(
 {
     const auto & attribute = attributes.front();
 
-    switch (attribute.type)
+    auto type_call = [&](const auto &dictionary_attribute_type)
     {
-        case AttributeUnderlyingType::utUInt8:
-            getIdsAndDates<UInt8>(attribute, ids, start_dates, end_dates);
-            break;
-        case AttributeUnderlyingType::utUInt16:
-            getIdsAndDates<UInt16>(attribute, ids, start_dates, end_dates);
-            break;
-        case AttributeUnderlyingType::utUInt32:
-            getIdsAndDates<UInt32>(attribute, ids, start_dates, end_dates);
-            break;
-        case AttributeUnderlyingType::utUInt64:
-            getIdsAndDates<UInt64>(attribute, ids, start_dates, end_dates);
-            break;
-        case AttributeUnderlyingType::utUInt128:
-            getIdsAndDates<UInt128>(attribute, ids, start_dates, end_dates);
-            break;
-        case AttributeUnderlyingType::utInt8:
-            getIdsAndDates<Int8>(attribute, ids, start_dates, end_dates);
-            break;
-        case AttributeUnderlyingType::utInt16:
-            getIdsAndDates<Int16>(attribute, ids, start_dates, end_dates);
-            break;
-        case AttributeUnderlyingType::utInt32:
-            getIdsAndDates<Int32>(attribute, ids, start_dates, end_dates);
-            break;
-        case AttributeUnderlyingType::utInt64:
-            getIdsAndDates<Int64>(attribute, ids, start_dates, end_dates);
-            break;
-        case AttributeUnderlyingType::utFloat32:
-            getIdsAndDates<Float32>(attribute, ids, start_dates, end_dates);
-            break;
-        case AttributeUnderlyingType::utFloat64:
-            getIdsAndDates<Float64>(attribute, ids, start_dates, end_dates);
-            break;
-        case AttributeUnderlyingType::utString:
-            getIdsAndDates<StringRef>(attribute, ids, start_dates, end_dates);
-            break;
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
 
-        case AttributeUnderlyingType::utDecimal32:
-            getIdsAndDates<Decimal32>(attribute, ids, start_dates, end_dates);
-            break;
-        case AttributeUnderlyingType::utDecimal64:
-            getIdsAndDates<Decimal64>(attribute, ids, start_dates, end_dates);
-            break;
-        case AttributeUnderlyingType::utDecimal128:
-            getIdsAndDates<Decimal128>(attribute, ids, start_dates, end_dates);
-            break;
-    }
+        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);
+    };
+
+    callOnDictionaryAttributeType(attribute.type, type_call);
 }
 
 template <typename T, typename RangeType>
diff --git a/src/Dictionaries/RangeHashedDictionary.h b/src/Dictionaries/RangeHashedDictionary.h
index 5588bdb3ced..1a3bfd65d33 100644
--- a/src/Dictionaries/RangeHashedDictionary.h
+++ b/src/Dictionaries/RangeHashedDictionary.h
@@ -3,6 +3,7 @@
 #include <Columns/ColumnDecimal.h>
 #include <Columns/ColumnString.h>
 #include <Common/HashTable/HashMap.h>
+#include <Common/HashTable/HashSet.h>
 #include "DictionaryStructure.h"
 #include "IDictionary.h"
 #include "IDictionarySource.h"
@@ -10,7 +11,7 @@
 #include <atomic>
 #include <memory>
 #include <variant>
-
+#include <optional>
 
 namespace DB
 {
@@ -81,7 +82,7 @@ private:
     struct Value final
     {
         Range range;
-        T value;
+        std::optional<T> value;
     };
 
     template <typename T>
@@ -91,10 +92,14 @@ private:
     template <typename T>
     using Ptr = std::unique_ptr<Collection<T>>;
 
+    using NullableSet = HashSet<Key, DefaultHash<Key>>;
+
     struct Attribute final
     {
     public:
         AttributeUnderlyingType type;
+        bool is_nullable;
+
         std::variant<
             UInt8,
             UInt16,
@@ -144,7 +149,7 @@ private:
     template <typename T>
     void createAttributeImpl(Attribute & attribute, const Field & null_value);
 
-    Attribute createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value);
+    Attribute createAttribute(const DictionaryAttribute& attribute, const Field & null_value);
 
     template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
     void getItemsImpl(
@@ -154,7 +159,7 @@ private:
         DefaultGetter && get_default) const;
 
     template <typename T>
-    void setAttributeValueImpl(Attribute & attribute, const Key id, const Range & range, const T value);
+    void setAttributeValueImpl(Attribute & attribute, const Key id, const Range & range, const Field & value);
 
     void setAttributeValue(Attribute & attribute, const Key id, const Range & range, const Field & value);
 

From 25d6e18ec0aaa18afbfb66fed49ba8ad6228b7bc Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Tue, 5 Jan 2021 00:45:58 +0300
Subject: [PATCH 543/611] Added Nullable support for ComplexKeyHashedDictionary

---
 .../ComplexKeyHashedDictionary.cpp            | 175 +++++++++++++-----
 src/Dictionaries/ComplexKeyHashedDictionary.h |   8 +-
 src/Dictionaries/HashedDictionary.cpp         |  13 +-
 3 files changed, 132 insertions(+), 64 deletions(-)

diff --git a/src/Dictionaries/ComplexKeyHashedDictionary.cpp b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
index 6aee03668ab..787ba459123 100644
--- a/src/Dictionaries/ComplexKeyHashedDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
@@ -2,6 +2,7 @@
 #include <ext/map.h>
 #include <ext/range.h>
 #include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnNullable.h>
 #include <Functions/FunctionHelpers.h>
 #include "DictionaryBlockInputStream.h"
 #include "DictionaryFactory.h"
@@ -52,6 +53,14 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
 
     auto 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(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)>;
@@ -69,7 +78,15 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
                     getItemsImpl<StringRef, StringRef>(
                         attribute,
                         key_columns,
-                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                        [&](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);
+                        },
                         [&](const size_t row) { return default_col->getDataAt(row); });
                 }
                 else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
@@ -79,7 +96,15 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
                     getItemsImpl<StringRef, StringRef>(
                         attribute,
                         key_columns,
-                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                        [&](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);
+                        },
                         [&](const size_t) { return def; });
                 }
                 else
@@ -92,7 +117,15 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
                 getItemsImpl<StringRef, StringRef>(
                     attribute,
                     key_columns,
-                    [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                    [&](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);
+                    },
                     [&](const size_t) { return null_value; });
             }
 
@@ -123,7 +156,15 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
                         key_columns,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row, const auto value, bool is_null)
+                        {
+                            if (attribute.is_nullable)
+                            {
+                                (*vec_null_map_to)[row] = is_null;
+                            }
+
+                            out[row] = value;
+                        },
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
@@ -134,7 +175,15 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
                         key_columns,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row, const auto value, bool is_null)
+                        { 
+                            if (attribute.is_nullable)
+                            {
+                                (*vec_null_map_to)[row] = is_null;
+                            }
+                            
+                            out[row] = value;
+                        },
                         [&](const size_t) { return def; }
                     );
                 }
@@ -148,9 +197,16 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
                 getItemsImpl<AttributeType, AttributeType>(
                     attribute,
                     key_columns,
-                    [&](const size_t row, const auto value) { return out[row] = value; },
-                    [&](const size_t) { return null_value; }
-                );
+                    [&](const size_t row, const auto value, bool is_null)
+                    {
+                        if (attribute.is_nullable)
+                        {
+                            (*vec_null_map_to)[row] = is_null;
+                        }
+
+                        out[row] = value;
+                    },
+                    [&](const size_t) { return null_value; });
             }
 
             result = std::move(column);
@@ -159,6 +215,11 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
 
     callOnDictionaryAttributeType(attribute.type, type_call);
 
+    if (attribute.is_nullable)
+    {
+        result = ColumnNullable::create(result, std::move(col_null_map_to));
+    }
+
     return result;
 }
 
@@ -200,7 +261,7 @@ void ComplexKeyHashedDictionary::createAttributes()
     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));
+        attributes.push_back(createAttribute(attribute, attribute.null_value));
 
         if (attribute.hierarchical)
             throw Exception{full_name + ": hierarchical attributes not supported for dictionary of type " + getTypeName(),
@@ -402,9 +463,10 @@ void ComplexKeyHashedDictionary::createAttributeImpl<String>(Attribute & attribu
 }
 
 ComplexKeyHashedDictionary::Attribute
-ComplexKeyHashedDictionary::createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value)
+ComplexKeyHashedDictionary::createAttribute(const DictionaryAttribute & attribute, const Field & null_value)
 {
-    Attribute attr{type, {}, {}, {}};
+    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)
     {
@@ -413,7 +475,7 @@ ComplexKeyHashedDictionary::createAttributeWithType(const AttributeUnderlyingTyp
         createAttributeImpl<AttributeType>(attr, null_value);
     };
 
-    callOnDictionaryAttributeType(type, type_call);
+    callOnDictionaryAttributeType(attribute.underlying_type, type_call);
 
     return attr;
 }
@@ -436,7 +498,18 @@ void ComplexKeyHashedDictionary::getItemsImpl(
         const auto key = placeKeysInPool(i, key_columns, keys, temporary_keys_pool);
 
         const auto it = attr.find(key);
-        set_value(i, it ? static_cast<OutputType>(it->getMapped()) : get_default(i));
+
+        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, get_default(i), true);
+            else
+                set_value(i, get_default(i), false);
+        }
 
         /// free memory allocated for the key
         temporary_keys_pool.rollback(key.size);
@@ -454,51 +527,42 @@ bool ComplexKeyHashedDictionary::setAttributeValueImpl(Attribute & attribute, co
     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, string_in_arena);
+}
+
 bool ComplexKeyHashedDictionary::setAttributeValue(Attribute & attribute, const StringRef key, const Field & value)
 {
-    switch (attribute.type)
+    bool result = false;
+
+    auto type_call = [&](const auto &dictionary_attribute_type)
     {
-        case AttributeUnderlyingType::utUInt8:
-            return setAttributeValueImpl<UInt8>(attribute, key, value.get<UInt64>());
-        case AttributeUnderlyingType::utUInt16:
-            return setAttributeValueImpl<UInt16>(attribute, key, value.get<UInt64>());
-        case AttributeUnderlyingType::utUInt32:
-            return setAttributeValueImpl<UInt32>(attribute, key, value.get<UInt64>());
-        case AttributeUnderlyingType::utUInt64:
-            return setAttributeValueImpl<UInt64>(attribute, key, value.get<UInt64>());
-        case AttributeUnderlyingType::utUInt128:
-            return setAttributeValueImpl<UInt128>(attribute, key, value.get<UInt128>());
-        case AttributeUnderlyingType::utInt8:
-            return setAttributeValueImpl<Int8>(attribute, key, value.get<Int64>());
-        case AttributeUnderlyingType::utInt16:
-            return setAttributeValueImpl<Int16>(attribute, key, value.get<Int64>());
-        case AttributeUnderlyingType::utInt32:
-            return setAttributeValueImpl<Int32>(attribute, key, value.get<Int64>());
-        case AttributeUnderlyingType::utInt64:
-            return setAttributeValueImpl<Int64>(attribute, key, value.get<Int64>());
-        case AttributeUnderlyingType::utFloat32:
-            return setAttributeValueImpl<Float32>(attribute, key, value.get<Float64>());
-        case AttributeUnderlyingType::utFloat64:
-            return setAttributeValueImpl<Float64>(attribute, key, value.get<Float64>());
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
 
-        case AttributeUnderlyingType::utDecimal32:
-            return setAttributeValueImpl<Decimal32>(attribute, key, value.get<Decimal32>());
-        case AttributeUnderlyingType::utDecimal64:
-            return setAttributeValueImpl<Decimal64>(attribute, key, value.get<Decimal64>());
-        case AttributeUnderlyingType::utDecimal128:
-            return setAttributeValueImpl<Decimal128>(attribute, key, value.get<Decimal128>());
-
-        case AttributeUnderlyingType::utString:
+        if (attribute.is_nullable)
         {
-            auto & map = std::get<ContainerType<StringRef>>(attribute.maps);
-            const auto & string = value.get<String>();
-            const auto * string_in_arena = attribute.string_arena->insert(string.data(), string.size());
-            const auto pair = map.insert({key, StringRef{string_in_arena, string.size()}});
-            return pair.second;
+            if (value.isNull())
+            {
+                attribute.nullable_set->insert(key);
+                result = true;
+                return;
+            }
+            else
+            {
+                attribute.nullable_set->erase(key);
+            }
         }
-    }
 
-    return {};
+        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
@@ -549,6 +613,9 @@ void ComplexKeyHashedDictionary::has(const Attribute & attribute, const Columns
         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);
     }
@@ -591,6 +658,12 @@ std::vector<StringRef> ComplexKeyHashedDictionary::getKeys(const Attribute & att
     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;
 }
 
diff --git a/src/Dictionaries/ComplexKeyHashedDictionary.h b/src/Dictionaries/ComplexKeyHashedDictionary.h
index 01a222d8629..a21ad223f19 100644
--- a/src/Dictionaries/ComplexKeyHashedDictionary.h
+++ b/src/Dictionaries/ComplexKeyHashedDictionary.h
@@ -7,6 +7,7 @@
 #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>
@@ -77,9 +78,14 @@ 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,
@@ -133,7 +139,7 @@ private:
     template <typename T>
     void createAttributeImpl(Attribute & attribute, const Field & null_value);
 
-    Attribute createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value);
+    Attribute createAttribute(const DictionaryAttribute & attribute, const Field & null_value);
 
     template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
     void
diff --git a/src/Dictionaries/HashedDictionary.cpp b/src/Dictionaries/HashedDictionary.cpp
index 571d70eb303..d13e1b11b17 100644
--- a/src/Dictionaries/HashedDictionary.cpp
+++ b/src/Dictionaries/HashedDictionary.cpp
@@ -637,16 +637,7 @@ 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());
-    if (!sparse)
-    {
-        auto & map = *std::get<CollectionPtrType<StringRef>>(attribute.maps);
-        return map.insert({id, StringRef{string_in_arena, value.size()}}).second;
-    }
-    else
-    {
-        auto & map = *std::get<SparseCollectionPtrType<StringRef>>(attribute.sparse_maps);
-        return map.insert({id, StringRef{string_in_arena, value.size()}}).second;
-    }
+    return setAttributeValueImpl<StringRef>(attribute, id, string_in_arena);
 }
 
 bool HashedDictionary::setAttributeValue(Attribute & attribute, const Key id, const Field & value)
@@ -749,9 +740,7 @@ PaddedPODArray<HashedDictionary::Key> HashedDictionary::getIds() const
         if (attribute.is_nullable)
         {
             for (const auto& value: *attribute.nullable_set)
-            {
                 result.push_back(value.getKey());
-            }
         }
     };
 

From 357b0b95a94e4d409fcc45a76962a879c50e5636 Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Tue, 5 Jan 2021 20:25:34 +0300
Subject: [PATCH 544/611] Added Nullable support for ComplexDirectDictionary

---
 .../ComplexKeyDirectDictionary.cpp            | 89 +++++++++++++++----
 src/Dictionaries/ComplexKeyDirectDictionary.h |  4 +-
 src/Dictionaries/DirectDictionary.cpp         |  1 -
 3 files changed, 77 insertions(+), 17 deletions(-)

diff --git a/src/Dictionaries/ComplexKeyDirectDictionary.cpp b/src/Dictionaries/ComplexKeyDirectDictionary.cpp
index c476348ccd5..cfc01fee42a 100644
--- a/src/Dictionaries/ComplexKeyDirectDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyDirectDictionary.cpp
@@ -3,6 +3,7 @@
 #include "DictionaryBlockInputStream.h"
 #include "DictionaryFactory.h"
 #include <Core/Defines.h>
+#include <Columns/ColumnNullable.h>
 #include <Functions/FunctionHelpers.h>
 
 namespace DB
@@ -50,6 +51,14 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
 
     auto 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(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)>;
@@ -67,8 +76,13 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
                     getItemsImpl<String, String>(
                         attribute,
                         key_columns,
-                        [&](const size_t, const String value)
+                        [&](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);
                         },
@@ -85,8 +99,13 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
                     getItemsImpl<String, String>(
                         attribute,
                         key_columns,
-                        [&](const size_t, const String value)
+                        [&](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);
                         },
@@ -102,8 +121,13 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
                 getItemsImpl<String, String>(
                     attribute,
                     key_columns,
-                    [&](const size_t, const String value)
+                    [&](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);
                     },
@@ -137,7 +161,15 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
                         key_columns,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row, const auto value, bool is_null)
+                        {
+                            if (attribute.is_nullable)
+                            {
+                                (*vec_null_map_to)[row] = is_null;
+                            }
+ 
+                            out[row] = value;
+                        },
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
@@ -148,7 +180,15 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
                         key_columns,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
+                        [&](const size_t row, const auto value, bool is_null)
+                        {
+                            if (attribute.is_nullable)
+                            {
+                                (*vec_null_map_to)[row] = is_null;
+                            }
+
+                            out[row] = value;
+                        },
                         [&](const size_t) { return def; }
                     );
                 }
@@ -162,7 +202,15 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
                 getItemsImpl<AttributeType, AttributeType>(
                     attribute,
                     key_columns,
-                    [&](const size_t row, const auto value) { return out[row] = value; },
+                    [&](const size_t row, const auto value, bool is_null)
+                    { 
+                        if (attribute.is_nullable)
+                        {
+                            (*vec_null_map_to)[row] = is_null;
+                        } 
+
+                        out[row] = value;
+                    },
                     [&](const size_t) { return null_value; }
                 );
             }
@@ -173,6 +221,11 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
 
     callOnDictionaryAttributeType(attribute.type, type_call);
 
+    if (attribute.is_nullable)
+    {
+        result = ColumnNullable::create(result, std::move(col_null_map_to));
+    }
+
     return result;
 }
 
@@ -246,7 +299,7 @@ void ComplexKeyDirectDictionary::createAttributes()
     {
         attribute_index_by_name.emplace(attribute.name, attributes.size());
         attribute_name_by_index.emplace(attributes.size(), attribute.name);
-        attributes.push_back(createAttributeWithType(attribute.underlying_type, attribute.null_value, 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(),
@@ -270,9 +323,10 @@ void ComplexKeyDirectDictionary::createAttributeImpl<String>(Attribute & attribu
 }
 
 
-ComplexKeyDirectDictionary::Attribute ComplexKeyDirectDictionary::createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value, const std::string & attr_name)
+ComplexKeyDirectDictionary::Attribute ComplexKeyDirectDictionary::createAttribute(
+    const DictionaryAttribute & attribute, const Field & null_value, const std::string & attr_name)
 {
-    Attribute attr{type, {}, {}, attr_name};
+    Attribute attr{attribute.underlying_type, attribute.is_nullable, {}, {}, attr_name};
 
     auto type_call = [&](const auto &dictionary_attribute_type)
     {
@@ -281,7 +335,7 @@ ComplexKeyDirectDictionary::Attribute ComplexKeyDirectDictionary::createAttribut
         createAttributeImpl<AttributeType>(attr, null_value);
     };
 
-    callOnDictionaryAttributeType(type, type_call);
+    callOnDictionaryAttributeType(attribute.underlying_type, type_call);
 
     return attr;
 }
@@ -339,6 +393,7 @@ void ComplexKeyDirectDictionary::getItemsImpl(
     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);
@@ -349,6 +404,7 @@ void ComplexKeyDirectDictionary::getItemsImpl(
         keys[row] = key;
         value_by_key[key] = get_default(row);
         to_load[row] = row;
+        value_is_null[key] = false;
     }
 
     auto stream = source_ptr->loadKeys(key_columns, to_load);
@@ -382,17 +438,19 @@ void ComplexKeyDirectDictionary::getItemsImpl(
             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))
                 {
-                    if (attribute.type == AttributeUnderlyingType::utFloat32)
+                    auto value = attribute_column[row_idx];
+
+                    if (value.isNull())
                     {
-                        value_by_key[key] = static_cast<Float32>(attribute_column[row_idx].template get<Float64>());
+                        value_is_null[key] = true;
                     }
                     else
                     {
-                        value_by_key[key] = static_cast<OutputType>(attribute_column[row_idx].template get<AttributeType>());
+                        value_by_key[key] = static_cast<OutputType>(value.template get<NearestFieldType<AttributeType>>());
                     }
-
                 }
             }
         }
@@ -402,7 +460,8 @@ void ComplexKeyDirectDictionary::getItemsImpl(
 
     for (const auto row : ext::range(0, rows))
     {
-        set_value(row, value_by_key[keys[row]]);
+        auto key = keys[row];
+        set_value(row, value_by_key[key], value_is_null[key]);
     }
 
     query_count.fetch_add(rows, std::memory_order_relaxed);
diff --git a/src/Dictionaries/ComplexKeyDirectDictionary.h b/src/Dictionaries/ComplexKeyDirectDictionary.h
index 6c1f73f12f7..ddc72483dcb 100644
--- a/src/Dictionaries/ComplexKeyDirectDictionary.h
+++ b/src/Dictionaries/ComplexKeyDirectDictionary.h
@@ -80,6 +80,8 @@ private:
     struct Attribute final
     {
         AttributeUnderlyingType type;
+        bool is_nullable;
+        
         std::variant<
             UInt8,
             UInt16,
@@ -109,7 +111,7 @@ private:
     template <typename T>
     void createAttributeImpl(Attribute & attribute, const Field & null_value);
 
-    Attribute createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value, const std::string & name);
+    Attribute createAttribute(const DictionaryAttribute & attribute, const Field & null_value, const std::string & name);
 
     template <typename Pool>
     StringRef placeKeysInPool(
diff --git a/src/Dictionaries/DirectDictionary.cpp b/src/Dictionaries/DirectDictionary.cpp
index ffd1dd2d01b..830cbc9967d 100644
--- a/src/Dictionaries/DirectDictionary.cpp
+++ b/src/Dictionaries/DirectDictionary.cpp
@@ -482,7 +482,6 @@ void DirectDictionary::getItemsImpl(
     for (const auto row : ext::range(0, rows))
     {
         auto key = ids[row];
-        std::cerr << "DirectDictionary set_value " << row << std::endl;
         set_value(row, value_by_key[key], value_is_null[key]);
     }
 

From a45459e09552c45aaca5d3609a401da960962c98 Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Thu, 7 Jan 2021 19:24:18 +0300
Subject: [PATCH 545/611] Fixed tests

---
 .../ComplexKeyCacheDictionary.cpp             | 379 ++++++++++++++++++
 src/Dictionaries/ComplexKeyCacheDictionary.h  | 366 +----------------
 .../ComplexKeyDirectDictionary.cpp            |  12 +-
 src/Dictionaries/ComplexKeyDirectDictionary.h |   2 +-
 .../ComplexKeyHashedDictionary.cpp            |   8 +-
 src/Dictionaries/DirectDictionary.cpp         |  18 +-
 src/Dictionaries/HashedDictionary.cpp         |   3 +-
 src/Dictionaries/RangeHashedDictionary.cpp    |   6 +-
 src/Formats/MySQLBlockInputStream.cpp         |   2 -
 9 files changed, 407 insertions(+), 389 deletions(-)

diff --git a/src/Dictionaries/ComplexKeyCacheDictionary.cpp b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
index 60d2878f694..60457f81027 100644
--- a/src/Dictionaries/ComplexKeyCacheDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
@@ -316,6 +316,385 @@ ColumnUInt8::Ptr ComplexKeyCacheDictionary::has(const Columns & key_columns, con
     return result;
 }
 
+
+template <typename AttributeType, typename OutputType, typename DefaultGetter>
+void ComplexKeyCacheDictionary::getItemsNumberImpl(
+    Attribute & attribute, const Columns & key_columns, PaddedPODArray<OutputType> & out, DefaultGetter && get_default) 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() ? get_default(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] = get_default(row);
+        });
+}
+
+template <typename DefaultGetter>
+void ComplexKeyCacheDictionary::getItemsString(Attribute & attribute, const Columns & key_columns, ColumnString * out, DefaultGetter && get_default) 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() ? get_default(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() ? get_default(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 += get_default(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];
+        const auto it = map.find(key);
+        const auto string_ref = it ? it->getMapped() : get_default(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();
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary.h b/src/Dictionaries/ComplexKeyCacheDictionary.h
index 1f8248c594a..45719171478 100644
--- a/src/Dictionaries/ComplexKeyCacheDictionary.h
+++ b/src/Dictionaries/ComplexKeyCacheDictionary.h
@@ -177,225 +177,10 @@ private:
 
     template <typename AttributeType, typename OutputType, typename DefaultGetter>
     void getItemsNumberImpl(
-        Attribute & attribute, const Columns & key_columns, PaddedPODArray<OutputType> & out, DefaultGetter && get_default) 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() ? get_default(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] = get_default(row);
-            });
-    }
+        Attribute & attribute, const Columns & key_columns, PaddedPODArray<OutputType> & out, DefaultGetter && get_default) const;
 
     template <typename DefaultGetter>
-    void getItemsString(Attribute & attribute, const Columns & key_columns, ColumnString * out, DefaultGetter && get_default) 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() ? get_default(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() ? get_default(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 += get_default(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];
-            const auto it = map.find(key);
-            const auto string_ref = it ? it->getMapped() : get_default(row);
-            out->insertData(string_ref.data, string_ref.size);
-        }
-    }
+    void getItemsString(Attribute & attribute, const Columns & key_columns, ColumnString * out, DefaultGetter && get_default) const;
 
     template <typename PresentKeyHandler, typename AbsentKeyHandler>
     void update(
@@ -403,152 +188,7 @@ private:
         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);
-    }
+        AbsentKeyHandler && on_key_not_found) const;
 
     UInt64 getCellIdx(const StringRef key) const;
 
diff --git a/src/Dictionaries/ComplexKeyDirectDictionary.cpp b/src/Dictionaries/ComplexKeyDirectDictionary.cpp
index cfc01fee42a..35ca970889f 100644
--- a/src/Dictionaries/ComplexKeyDirectDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyDirectDictionary.cpp
@@ -82,7 +82,7 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
                             {
                                 (*vec_null_map_to)[row] = is_null;
                             }
- 
+
                             const auto ref = StringRef{value};
                             out->insertData(ref.data, ref.size);
                         },
@@ -105,7 +105,7 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
                             {
                                 (*vec_null_map_to)[row] = is_null;
                             }
- 
+
                             const auto ref = StringRef{value};
                             out->insertData(ref.data, ref.size);
                         },
@@ -126,7 +126,7 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
                         if (attribute.is_nullable)
                         {
                             (*vec_null_map_to)[row] = is_null;
-                        } 
+                        }
 
                         const auto ref = StringRef{value};
                         out->insertData(ref.data, ref.size);
@@ -167,7 +167,7 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
                             {
                                 (*vec_null_map_to)[row] = is_null;
                             }
- 
+
                             out[row] = value;
                         },
                         [&](const size_t row) { return default_col->getData()[row]; }
@@ -203,11 +203,11 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
                     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;
                     },
diff --git a/src/Dictionaries/ComplexKeyDirectDictionary.h b/src/Dictionaries/ComplexKeyDirectDictionary.h
index ddc72483dcb..fddf34694ba 100644
--- a/src/Dictionaries/ComplexKeyDirectDictionary.h
+++ b/src/Dictionaries/ComplexKeyDirectDictionary.h
@@ -81,7 +81,7 @@ private:
     {
         AttributeUnderlyingType type;
         bool is_nullable;
-        
+
         std::variant<
             UInt8,
             UInt16,
diff --git a/src/Dictionaries/ComplexKeyHashedDictionary.cpp b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
index 787ba459123..85540a8a7f3 100644
--- a/src/Dictionaries/ComplexKeyHashedDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
@@ -176,12 +176,12 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
                         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;
                         },
                         [&](const size_t) { return def; }
@@ -501,7 +501,7 @@ void ComplexKeyHashedDictionary::getItemsImpl(
 
         if (it)
         {
-            set_value(i, static_cast<OutputType>(it->getMapped()), false); 
+            set_value(i, static_cast<OutputType>(it->getMapped()), false);
         }
         else
         {
@@ -531,7 +531,7 @@ 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, string_in_arena);
+    return setAttributeValueImpl<StringRef>(attribute, key, StringRef{string_in_arena, value.size()});
 }
 
 bool ComplexKeyHashedDictionary::setAttributeValue(Attribute & attribute, const StringRef key, const Field & value)
diff --git a/src/Dictionaries/DirectDictionary.cpp b/src/Dictionaries/DirectDictionary.cpp
index 830cbc9967d..15020d11b0d 100644
--- a/src/Dictionaries/DirectDictionary.cpp
+++ b/src/Dictionaries/DirectDictionary.cpp
@@ -179,7 +179,7 @@ ColumnPtr DirectDictionary::getColumn(
                             {
                                 (*vec_null_map_to)[row] = is_null;
                             }
- 
+
                             const auto ref = StringRef{value};
                             out->insertData(ref.data, ref.size);
                         },
@@ -202,7 +202,7 @@ ColumnPtr DirectDictionary::getColumn(
                             {
                                 (*vec_null_map_to)[row] = is_null;
                             }
- 
+
                             const auto ref = StringRef{value};
                             out->insertData(ref.data, ref.size);
                         },
@@ -210,7 +210,7 @@ ColumnPtr DirectDictionary::getColumn(
                 }
                 else
                     throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
- 
+
             }
             else
             {
@@ -265,8 +265,8 @@ ColumnPtr DirectDictionary::getColumn(
                             {
                                 (*vec_null_map_to)[row] = is_null;
                             }
- 
-                            out[row] = value; 
+
+                            out[row] = value;
                         },
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
@@ -284,8 +284,8 @@ ColumnPtr DirectDictionary::getColumn(
                             {
                                 (*vec_null_map_to)[row] = is_null;
                             }
- 
-                            out[row] = value; 
+
+                            out[row] = value;
                         },
                         [&](const size_t) { return def; }
                     );
@@ -306,8 +306,8 @@ ColumnPtr DirectDictionary::getColumn(
                         {
                             (*vec_null_map_to)[row] = is_null;
                         }
- 
-                        out[row] = value; 
+
+                        out[row] = value;
                     },
                     [&](const size_t) { return null_value; }
                 );
diff --git a/src/Dictionaries/HashedDictionary.cpp b/src/Dictionaries/HashedDictionary.cpp
index d13e1b11b17..c32dc4492a0 100644
--- a/src/Dictionaries/HashedDictionary.cpp
+++ b/src/Dictionaries/HashedDictionary.cpp
@@ -608,6 +608,7 @@ void HashedDictionary::getItemsAttrImpl(
 
     query_count.fetch_add(rows, std::memory_order_relaxed);
 }
+
 template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
 void HashedDictionary::getItemsImpl(
     const Attribute & attribute, const PaddedPODArray<Key> & ids, ValueSetter && set_value, DefaultGetter && get_default) const
@@ -637,7 +638,7 @@ 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, string_in_arena);
+    return setAttributeValueImpl<StringRef>(attribute, id, StringRef{string_in_arena, value.size()});
 }
 
 bool HashedDictionary::setAttributeValue(Attribute & attribute, const Key id, const Field & value)
diff --git a/src/Dictionaries/RangeHashedDictionary.cpp b/src/Dictionaries/RangeHashedDictionary.cpp
index d1ce99b6c3a..de36419ffba 100644
--- a/src/Dictionaries/RangeHashedDictionary.cpp
+++ b/src/Dictionaries/RangeHashedDictionary.cpp
@@ -223,7 +223,7 @@ ColumnPtr RangeHashedDictionary::getColumn(
                                 (*vec_null_map_to)[row] = is_null;
                             }
 
-                            out[row] = value; 
+                            out[row] = value;
                         },
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
@@ -242,7 +242,7 @@ ColumnPtr RangeHashedDictionary::getColumn(
                                 (*vec_null_map_to)[row] = is_null;
                             }
 
-                            out[row] = value; 
+                            out[row] = value;
                         },
                         [&](const size_t) { return def; }
                     );
@@ -478,7 +478,7 @@ void RangeHashedDictionary::setAttributeValueImpl(Attribute & attribute, const K
 {
     using ValueType = std::conditional_t<std::is_same_v<T, String>, StringRef, T>;
     auto & map = *std::get<Ptr<ValueType>>(attribute.maps);
-    
+
     Value<ValueType> value_to_insert;
 
     if (attribute.is_nullable && value.isNull())
diff --git a/src/Formats/MySQLBlockInputStream.cpp b/src/Formats/MySQLBlockInputStream.cpp
index 9b4e37df353..87df0c1f4b1 100644
--- a/src/Formats/MySQLBlockInputStream.cpp
+++ b/src/Formats/MySQLBlockInputStream.cpp
@@ -70,7 +70,6 @@ namespace
                 assert_cast<ColumnUInt32 &>(column).insertValue(value.getUInt());
                 break;
             case ValueType::vtUInt64:
-                std::cerr << "Insert uint64 " << value.getUInt() << std::endl;
                 assert_cast<ColumnUInt64 &>(column).insertValue(value.getUInt());
                 break;
             case ValueType::vtInt8:
@@ -92,7 +91,6 @@ namespace
                 assert_cast<ColumnFloat64 &>(column).insertValue(value.getDouble());
                 break;
             case ValueType::vtString:
-                std::cerr << "Insert string " << std::string(value.data(), value.size()) << std::endl;
                 assert_cast<ColumnString &>(column).insertData(value.data(), value.size());
                 break;
             case ValueType::vtDate:

From 3d0778cba49913a94be5be45318a388b73cf096d Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Sat, 9 Jan 2021 00:02:47 +0300
Subject: [PATCH 546/611] FunctionsExternalDictionaries refactored

---
 .../FunctionsExternalDictionaries.cpp         |   1 -
 src/Functions/FunctionsExternalDictionaries.h | 497 +++++-------------
 2 files changed, 134 insertions(+), 364 deletions(-)

diff --git a/src/Functions/FunctionsExternalDictionaries.cpp b/src/Functions/FunctionsExternalDictionaries.cpp
index 1bd900f3cbe..f037a3bd808 100644
--- a/src/Functions/FunctionsExternalDictionaries.cpp
+++ b/src/Functions/FunctionsExternalDictionaries.cpp
@@ -40,7 +40,6 @@ void registerFunctionsExternalDictionaries(FunctionFactory & factory)
     factory.registerFunction<FunctionDictGetStringOrDefault>();
     factory.registerFunction<FunctionDictGetNoType<DictionaryGetFunctionType::get>>();
     factory.registerFunction<FunctionDictGetNoType<DictionaryGetFunctionType::getOrDefault>>();
-    factory.registerFunction<FunctionDictGetNoType<DictionaryGetFunctionType::getOrNull>>();
 }
 
 }
diff --git a/src/Functions/FunctionsExternalDictionaries.h b/src/Functions/FunctionsExternalDictionaries.h
index 0734754289c..11adf63a4d9 100644
--- a/src/Functions/FunctionsExternalDictionaries.h
+++ b/src/Functions/FunctionsExternalDictionaries.h
@@ -9,6 +9,7 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeUUID.h>
 #include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
@@ -118,6 +119,20 @@ public:
         return getDictionary(dict_name_col->getValue<String>())->isInjective(attr_name_col->getValue<String>());
     }
 
+    DictionaryAttribute getDictionaryAttribute(std::shared_ptr<const IDictionaryBase> dictionary, const String& attribute_name) const
+    {
+        const DictionaryStructure & structure = dictionary->getStructure();
+
+        auto find_iter = std::find_if(structure.attributes.begin(), structure.attributes.end(), [&](const auto &attribute)
+        {
+            return attribute.name == attribute_name;
+        });
+
+        if (find_iter == structure.attributes.end())
+            throw Exception{"No such attribute '" + attribute_name + "'", ErrorCodes::BAD_ARGUMENTS};
+
+        return *find_iter;
+    }
 private:
     const Context & context;
     const ExternalDictionariesLoader & external_loader;
@@ -179,15 +194,24 @@ private:
 
         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);
 
         if (dictionary_identifier_type == DictionaryIdentifierType::simple)
         {
+            if (!key_column_type.isUInt64())
+                throw Exception{"Second argument of function " + getName() + " must be " + dictionary->getStructure().getKeyDescription(),
+                    ErrorCodes::TYPE_MISMATCH};
+
             return dictionary->has({key_column}, {std::make_shared<DataTypeUInt64>()});
         }
         else if (dictionary_identifier_type == DictionaryIdentifierType::complex)
         {
+            if (!key_column_type.isTuple())
+                throw Exception{"Second argument of function " + getName() + " must be " + dictionary->getStructure().getKeyDescription(),
+                    ErrorCodes::TYPE_MISMATCH};
+
             /// Functions in external dictionaries_loader only support full-value (not constant) columns with keys.
-            ColumnPtr key_column_full = key_column_with_type.column->convertToFullColumnIfConst();
+            ColumnPtr key_column_full = key_column->convertToFullColumnIfConst();
 
             const auto & key_columns = typeid_cast<const ColumnTuple &>(*key_column_full).getColumnsCopy();
             const auto & key_types = static_cast<const DataTypeTuple &>(*key_column_with_type.type).getElements();
@@ -195,10 +219,7 @@ private:
             return dictionary->has(key_columns, key_types);
         }
         else
-        {
-            /// TODO: Add support for range
-            return nullptr;
-        }
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Has not supported for range dictionary", dictionary->getDictionaryID().getNameForLogs());
     }
 
     mutable FunctionDictHelper helper;
@@ -207,82 +228,66 @@ private:
 enum class DictionaryGetFunctionType
 {
     get,
-    getOrDefault,
-    getOrNull
+    getOrDefault
 };
 
-template <typename DataType, typename Name, DictionaryGetFunctionType dictionary_get_function_type>
-class FunctionDictGetImpl final : public IFunction
+/// This variant of function derives the result type automatically.
+template <DictionaryGetFunctionType dictionary_get_function_type>
+class FunctionDictGetNoType final : public IFunction
 {
-    using Type = typename DataType::FieldType;
-
 public:
-    static constexpr auto name = Name::name;
+    static constexpr auto name = dictionary_get_function_type == DictionaryGetFunctionType::get ? "dictGet" : "dictGetOrDefault";
 
-    static FunctionPtr create(const Context & context, UInt32 dec_scale = 0)
+    static FunctionPtr create(const Context & context)
     {
-        return std::make_shared<FunctionDictGetImpl>(context, dec_scale);
+        return std::make_shared<FunctionDictGetNoType>(context);
     }
 
-    explicit FunctionDictGetImpl(const Context & context_, UInt32 dec_scale = 0)
-        : helper(context_)
-        , decimal_scale(dec_scale)
-    {}
+    explicit FunctionDictGetNoType(const Context & context_) : helper(context_) {}
 
     String getName() const override { return name; }
 
-private:
+    bool isVariadic() const override { return true; }
     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, 1}; }
 
     bool isDeterministic() const override { return false; }
 
-    ColumnNumbers getArgumentsThatAreAlwaysConstant() const final { return {0, 1}; }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes &) const override
+    bool isInjective(const ColumnsWithTypeAndName & sample_columns) const override
     {
-        DataTypePtr result;
-        /// TODO: Decimal will not work properly during FunctionDictGetImpl call decimal_scale will not be iniitalized.
-        if constexpr (IsDataTypeDecimal<DataType>)
-            result = std::make_shared<DataType>(DataType::maxPrecision(), decimal_scale);
-        else
-            result = std::make_shared<DataType>();
-
-        if constexpr (dictionary_get_function_type == DictionaryGetFunctionType::getOrNull)
-        {
-            result = std::make_shared<DataTypeNullable>(result);
-        }
-
-        return result;
+        return helper.isDictGetFunctionInjective(sample_columns);
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    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};
 
+        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};
+
+        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};
+
+        dictionary = helper.getDictionary(dictionary_name);
+
+        return helper.getDictionaryAttribute(dictionary, attribute_name).type;
+    }
+
+    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();
 
-        const auto * dictionary_name_col = checkAndGetColumnConst<ColumnString>(arguments[0].column.get());
-        if (!dictionary_name_col)
-            throw Exception{"First argument of function " + getName() + " must be a constant string", ErrorCodes::ILLEGAL_COLUMN};
-
-        String dictionary_name = dictionary_name_col->getValue<String>();
-
-        auto dictionary = helper.getDictionary(dictionary_name);
-        if (!dictionary)
-            throw Exception("First argument of function " + getName() + " does not name a dictionary", ErrorCodes::ILLEGAL_COLUMN);
-
-        const auto * attr_name_col = checkAndGetColumnConst<ColumnString>(arguments[1].column.get());
-        if (!attr_name_col)
-            throw Exception{"Second argument of function " + getName() + " must be a constant string", ErrorCodes::ILLEGAL_COLUMN};
-
-        String attr_name = attr_name_col->getValue<String>();
-
         /// TODO: Use accurateCast if argument is integer
         if (!WhichDataType(arguments[2].type).isUInt64() && !isTuple(arguments[2].type))
             throw Exception{"Illegal type " + arguments[2].type->getName() + " of third argument of function "
@@ -319,19 +324,19 @@ private:
         if (dictionary_get_function_type == DictionaryGetFunctionType::getOrDefault)
         {
             if (current_arguments_index >= arguments.size())
-                throw Exception{"Wrong argument count for function test " + getName(), ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+                throw Exception{"Wrong argument count for function " + getName(), ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
 
             default_col = arguments[current_arguments_index].column;
         }
 
-        ColumnPtr res;
+        ColumnPtr result;
 
         const ColumnWithTypeAndName & key_col_with_type = arguments[2];
         const auto key_column = key_col_with_type.column;
 
         if (dictionary_identifier_type == DictionaryIdentifierType::simple)
         {
-            res = dictionary->getColumn(attr_name, result_type, {key_column}, {std::make_shared<DataTypeUInt64>()}, default_col);
+            result = dictionary->getColumn(attribute_name, result_type, {key_column}, {std::make_shared<DataTypeUInt64>()}, default_col);
         }
         else if (dictionary_identifier_type == DictionaryIdentifierType::complex)
         {
@@ -341,21 +346,88 @@ private:
             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();
 
-            res = dictionary->getColumn(attr_name, result_type, key_columns, key_types, default_col);
+            result = dictionary->getColumn(attribute_name, result_type, key_columns, key_types, default_col);
         }
         else if (dictionary_identifier_type == DictionaryIdentifierType::range)
         {
-            res = dictionary->getColumn(
-                attr_name, result_type, {key_column, range_col}, {std::make_shared<DataTypeUInt64>(), range_col_type}, default_col);
+            result = dictionary->getColumn(
+                attribute_name, result_type, {key_column, range_col}, {std::make_shared<DataTypeUInt64>(), range_col_type}, default_col);
         }
         else
             throw Exception{"Unknown dictionary identifier type", ErrorCodes::BAD_ARGUMENTS};
 
-        return res;
+        return result;
     }
 
+private:
     mutable FunctionDictHelper helper;
-    UInt32 decimal_scale;
+    /// Initialized in getReturnTypeImpl
+    mutable std::shared_ptr<const IDictionaryBase> dictionary;
+    mutable String attribute_name;
+};
+
+template <typename DataType, typename Name, DictionaryGetFunctionType dictionary_get_function_type>
+class FunctionDictGetImpl final : public IFunction
+{
+    using Type = typename DataType::FieldType;
+
+public:
+    static constexpr auto name = Name::name;
+
+    static FunctionPtr create(const Context &context)
+    {
+        return std::make_shared<FunctionDictGetImpl>(context);
+    }
+
+    explicit FunctionDictGetImpl(const Context & context_) : 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 final { return true; }
+
+    bool isDeterministic() const override { return false; }
+
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const final { return {0, 1}; }
+
+    bool isInjective(const ColumnsWithTypeAndName & sample_columns) const override
+    {
+        return impl.isInjective(sample_columns);
+    }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes &) const override
+    {
+        DataTypePtr result;
+        
+        if constexpr (IsDataTypeDecimal<DataType>)
+            result = std::make_shared<DataType>(DataType::maxPrecision(), 0);
+        else
+            result = std::make_shared<DataType>();
+
+        return result;
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    {
+        auto return_type = impl.getReturnTypeImpl(arguments);
+
+        if (!areTypesEqual(return_type, result_type))
+            throw Exception{"Dictionary attribute has different type " + return_type->getName() + " expected " + result_type->getName(),
+                    ErrorCodes::TYPE_MISMATCH};
+
+        return impl.executeImpl(arguments, return_type, input_rows_count);
+    }
+
+    static bool areTypesEqual(const DataTypePtr & lhs, const DataTypePtr & rhs)
+    {
+        return removeNullable(recursiveRemoveLowCardinality(lhs))->equals(*removeNullable(recursiveRemoveLowCardinality(rhs)));
+    }
+
+    const FunctionDictGetNoType<dictionary_get_function_type> impl;
 };
 
 template<typename DataType, typename Name>
@@ -436,307 +508,6 @@ using FunctionDictGetDecimal64OrDefault = FunctionDictGetOrDefault<DataTypeDecim
 using FunctionDictGetDecimal128OrDefault = FunctionDictGetOrDefault<DataTypeDecimal<Decimal128>, NameDictGetDecimal128OrDefault>;
 using FunctionDictGetStringOrDefault = FunctionDictGetOrDefault<DataTypeString, NameDictGetStringOrDefault>;
 
-template<typename DataType, typename Name>
-using FunctionDictGetOrNull = FunctionDictGetImpl<DataType, Name, DictionaryGetFunctionType::getOrNull>;
-
-struct NameDictGetUInt8OrNull { static constexpr auto name = "dictGetUInt8OrNull"; };
-struct NameDictGetUInt16OrNull { static constexpr auto name = "dictGetUInt16OrNull"; };
-struct NameDictGetUInt32OrNull { static constexpr auto name = "dictGetUInt32OrNull"; };
-struct NameDictGetUInt64OrNull { static constexpr auto name = "dictGetUInt64OrNull"; };
-struct NameDictGetInt8OrNull { static constexpr auto name = "dictGetInt8OrNull"; };
-struct NameDictGetInt16OrNull { static constexpr auto name = "dictGetInt16OrNull"; };
-struct NameDictGetInt32OrNull { static constexpr auto name = "dictGetInt32OrNull"; };
-struct NameDictGetInt64OrNull { static constexpr auto name = "dictGetInt64OrNull"; };
-struct NameDictGetFloat32OrNull { static constexpr auto name = "dictGetFloat32OrNull"; };
-struct NameDictGetFloat64OrNull { static constexpr auto name = "dictGetFloat64OrNull"; };
-struct NameDictGetDateOrNull { static constexpr auto name = "dictGetDateOrNull"; };
-struct NameDictGetDateTimeOrNull { static constexpr auto name = "dictGetDateTimeOrNull"; };
-struct NameDictGetUUIDOrNull { static constexpr auto name = "dictGetUUIDOrNull"; };
-struct NameDictGetDecimal32OrNull { static constexpr auto name = "dictGetDecimal32OrNull"; };
-struct NameDictGetDecimal64OrNull { static constexpr auto name = "dictGetDecimal64OrNull"; };
-struct NameDictGetDecimal128OrNull { static constexpr auto name = "dictGetDecimal128OrNull"; };
-struct NameDictGetStringOrNull { static constexpr auto name = "dictGetStringOrNull"; };
-
-using FunctionDictGetUInt8OrNull = FunctionDictGetOrNull<DataTypeUInt8, NameDictGetUInt8OrNull>;
-using FunctionDictGetUInt16OrNull = FunctionDictGetOrNull<DataTypeUInt16, NameDictGetUInt16OrNull>;
-using FunctionDictGetUInt32OrNull = FunctionDictGetOrNull<DataTypeUInt32, NameDictGetUInt32OrNull>;
-using FunctionDictGetUInt64OrNull = FunctionDictGetOrNull<DataTypeUInt64, NameDictGetUInt64OrNull>;
-using FunctionDictGetInt8OrNull = FunctionDictGetOrNull<DataTypeInt8, NameDictGetInt8OrNull>;
-using FunctionDictGetInt16OrNull = FunctionDictGetOrNull<DataTypeInt16, NameDictGetInt16OrNull>;
-using FunctionDictGetInt32OrNull = FunctionDictGetOrNull<DataTypeInt32, NameDictGetInt32OrNull>;
-using FunctionDictGetInt64OrNull = FunctionDictGetOrNull<DataTypeInt64, NameDictGetInt64OrNull>;
-using FunctionDictGetFloat32OrNull = FunctionDictGetOrNull<DataTypeFloat32, NameDictGetFloat32OrNull>;
-using FunctionDictGetFloat64OrNull = FunctionDictGetOrNull<DataTypeFloat64, NameDictGetFloat64OrNull>;
-using FunctionDictGetDateOrNull = FunctionDictGetOrNull<DataTypeDate, NameDictGetDateOrNull>;
-using FunctionDictGetDateTimeOrNull = FunctionDictGetOrNull<DataTypeDateTime, NameDictGetDateTimeOrNull>;
-using FunctionDictGetUUIDOrNull = FunctionDictGetOrNull<DataTypeUUID, NameDictGetUUIDOrNull>;
-using FunctionDictGetDecimal32OrNull = FunctionDictGetOrNull<DataTypeDecimal<Decimal32>, NameDictGetDecimal32OrNull>;
-using FunctionDictGetDecimal64OrNull = FunctionDictGetOrNull<DataTypeDecimal<Decimal64>, NameDictGetDecimal64OrNull>;
-using FunctionDictGetDecimal128OrNull = FunctionDictGetOrNull<DataTypeDecimal<Decimal128>, NameDictGetDecimal128OrNull>;
-using FunctionDictGetStringOrNull = FunctionDictGetOrNull<DataTypeString, NameDictGetStringOrNull>;
-
-/// TODO: Use new API
-/// This variant of function derives the result type automatically.
-template <DictionaryGetFunctionType dictionary_get_function_type>
-class FunctionDictGetNoType final : public IFunction
-{
-public:
-    static constexpr auto name = dictionary_get_function_type == DictionaryGetFunctionType::get ? "dictGet"
-        : (dictionary_get_function_type == DictionaryGetFunctionType::getOrDefault ? "dictGetOrDefault" : "dictGetOrNull");
-
-    static FunctionPtr create(const Context & context)
-    {
-        return std::make_shared<FunctionDictGetNoType>(context);
-    }
-
-    explicit FunctionDictGetNoType(const Context & context_) : context(context_), helper(context_) {}
-
-    String getName() const override { return name; }
-
-private:
-    bool isVariadic() const override { return true; }
-    size_t getNumberOfArguments() const override { return 0; }
-
-    bool useDefaultImplementationForConstants() const final { return true; }
-    ColumnNumbers getArgumentsThatAreAlwaysConstant() const final { return {0, 1}; }
-
-    bool isDeterministic() const override { return false; }
-
-    bool isInjective(const ColumnsWithTypeAndName & sample_columns) const override
-    {
-        return helper.isDictGetFunctionInjective(sample_columns);
-    }
-
-    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};
-
-        String dict_name;
-        if (const auto * name_col = checkAndGetColumnConst<ColumnString>(arguments[0].column.get()))
-        {
-            dict_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};
-
-        String attr_name;
-        if (const auto * name_col = checkAndGetColumnConst<ColumnString>(arguments[1].column.get()))
-        {
-            attr_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};
-
-        auto dict = helper.getDictionary(dict_name);
-        const DictionaryStructure & structure = dict->getStructure();
-
-        for (const auto& attribute : structure.attributes)
-        {
-            if (attribute.name != attr_name)
-            {
-                continue;
-            }
-
-            WhichDataType dt = removeNullable(attribute.type);
-
-            if constexpr (dictionary_get_function_type == DictionaryGetFunctionType::get)
-            {
-                switch (dt.idx)
-                {
-                    case TypeIndex::String:
-                    case TypeIndex::FixedString:
-                        impl = FunctionDictGetString::create(context);
-                        break;
-                    case TypeIndex::UInt8:
-                        impl = FunctionDictGetUInt8::create(context);
-                        break;
-                    case TypeIndex::UInt16:
-                        impl = FunctionDictGetUInt16::create(context);
-                        break;
-                    case TypeIndex::UInt32:
-                        impl = FunctionDictGetUInt32::create(context);
-                        break;
-                    case TypeIndex::UInt64:
-                        impl = FunctionDictGetUInt64::create(context);
-                        break;
-                    case TypeIndex::Int8:
-                        impl = FunctionDictGetInt8::create(context);
-                        break;
-                    case TypeIndex::Int16:
-                        impl = FunctionDictGetInt16::create(context);
-                        break;
-                    case TypeIndex::Int32:
-                        impl = FunctionDictGetInt32::create(context);
-                        break;
-                    case TypeIndex::Int64:
-                        impl = FunctionDictGetInt64::create(context);
-                        break;
-                    case TypeIndex::Float32:
-                        impl = FunctionDictGetFloat32::create(context);
-                        break;
-                    case TypeIndex::Float64:
-                        impl = FunctionDictGetFloat64::create(context);
-                        break;
-                    case TypeIndex::Date:
-                        impl = FunctionDictGetDate::create(context);
-                        break;
-                    case TypeIndex::DateTime:
-                        impl = FunctionDictGetDateTime::create(context);
-                        break;
-                    case TypeIndex::UUID:
-                        impl = FunctionDictGetUUID::create(context);
-                        break;
-                    case TypeIndex::Decimal32:
-                        impl = FunctionDictGetDecimal32::create(context, getDecimalScale(*attribute.type));
-                        break;
-                    case TypeIndex::Decimal64:
-                        impl = FunctionDictGetDecimal64::create(context, getDecimalScale(*attribute.type));
-                        break;
-                    case TypeIndex::Decimal128:
-                        impl = FunctionDictGetDecimal128::create(context, getDecimalScale(*attribute.type));
-                        break;
-                    default:
-                        throw Exception("Unknown dictGet type", ErrorCodes::UNKNOWN_TYPE);
-                }
-            }
-            else if constexpr (dictionary_get_function_type == DictionaryGetFunctionType::getOrDefault)
-            {
-                switch (dt.idx)
-                {
-                    case TypeIndex::String:
-                        impl = FunctionDictGetStringOrDefault::create(context);
-                        break;
-                    case TypeIndex::UInt8:
-                        impl = FunctionDictGetUInt8OrDefault::create(context);
-                        break;
-                    case TypeIndex::UInt16:
-                        impl = FunctionDictGetUInt16OrDefault::create(context);
-                        break;
-                    case TypeIndex::UInt32:
-                        impl = FunctionDictGetUInt32OrDefault::create(context);
-                        break;
-                    case TypeIndex::UInt64:
-                        impl = FunctionDictGetUInt64OrDefault::create(context);
-                        break;
-                    case TypeIndex::Int8:
-                        impl = FunctionDictGetInt8OrDefault::create(context);
-                        break;
-                    case TypeIndex::Int16:
-                        impl = FunctionDictGetInt16OrDefault::create(context);
-                        break;
-                    case TypeIndex::Int32:
-                        impl = FunctionDictGetInt32OrDefault::create(context);
-                        break;
-                    case TypeIndex::Int64:
-                        impl = FunctionDictGetInt64OrDefault::create(context);
-                        break;
-                    case TypeIndex::Float32:
-                        impl = FunctionDictGetFloat32OrDefault::create(context);
-                        break;
-                    case TypeIndex::Float64:
-                        impl = FunctionDictGetFloat64OrDefault::create(context);
-                        break;
-                    case TypeIndex::Date:
-                        impl = FunctionDictGetDateOrDefault::create(context);
-                        break;
-                    case TypeIndex::DateTime:
-                        impl = FunctionDictGetDateTimeOrDefault::create(context);
-                        break;
-                    case TypeIndex::UUID:
-                        impl = FunctionDictGetUUIDOrDefault::create(context);
-                        break;
-                    case TypeIndex::Decimal32:
-                        impl = FunctionDictGetDecimal32OrDefault::create(context, getDecimalScale(*attribute.type));
-                        break;
-                    case TypeIndex::Decimal64:
-                        impl = FunctionDictGetDecimal64OrDefault::create(context, getDecimalScale(*attribute.type));
-                        break;
-                    case TypeIndex::Decimal128:
-                        impl = FunctionDictGetDecimal128OrDefault::create(context, getDecimalScale(*attribute.type));
-                        break;
-                    default:
-                        throw Exception("Unknown dictGetOrDefault type", ErrorCodes::UNKNOWN_TYPE);
-                }
-            }
-            else if constexpr (dictionary_get_function_type == DictionaryGetFunctionType::getOrNull)
-            {
-                switch (dt.idx)
-                {
-                    case TypeIndex::String:
-                        impl = FunctionDictGetStringOrNull::create(context);
-                        break;
-                    case TypeIndex::UInt8:
-                        impl = FunctionDictGetUInt8OrNull::create(context);
-                        break;
-                    case TypeIndex::UInt16:
-                        impl = FunctionDictGetUInt16OrNull::create(context);
-                        break;
-                    case TypeIndex::UInt32:
-                        impl = FunctionDictGetUInt32OrNull::create(context);
-                        break;
-                    case TypeIndex::UInt64:
-                        impl = FunctionDictGetUInt64OrNull::create(context);
-                        break;
-                    case TypeIndex::Int8:
-                        impl = FunctionDictGetInt8OrNull::create(context);
-                        break;
-                    case TypeIndex::Int16:
-                        impl = FunctionDictGetInt16OrNull::create(context);
-                        break;
-                    case TypeIndex::Int32:
-                        impl = FunctionDictGetInt32OrNull::create(context);
-                        break;
-                    case TypeIndex::Int64:
-                        impl = FunctionDictGetInt64OrNull::create(context);
-                        break;
-                    case TypeIndex::Float32:
-                        impl = FunctionDictGetFloat32OrNull::create(context);
-                        break;
-                    case TypeIndex::Float64:
-                        impl = FunctionDictGetFloat64OrNull::create(context);
-                        break;
-                    case TypeIndex::Date:
-                        impl = FunctionDictGetDateOrNull::create(context);
-                        break;
-                    case TypeIndex::DateTime:
-                        impl = FunctionDictGetDateTimeOrNull::create(context);
-                        break;
-                    case TypeIndex::UUID:
-                        impl = FunctionDictGetUUIDOrNull::create(context);
-                        break;
-                    case TypeIndex::Decimal32:
-                        impl = FunctionDictGetDecimal32OrNull::create(context, getDecimalScale(*attribute.type));
-                        break;
-                    case TypeIndex::Decimal64:
-                        impl = FunctionDictGetDecimal64OrNull::create(context, getDecimalScale(*attribute.type));
-                        break;
-                    case TypeIndex::Decimal128:
-                        impl = FunctionDictGetDecimal128OrNull::create(context, getDecimalScale(*attribute.type));
-                        break;
-                    default:
-                        throw Exception("Unknown dictGetOrNull type", ErrorCodes::UNKNOWN_TYPE);
-                }
-            }
-
-            return attribute.type;
-        }
-
-        throw Exception{"No such attribute '" + attr_name + "'", ErrorCodes::BAD_ARGUMENTS};
-    }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
-    {
-        return impl->executeImpl(arguments, result_type, input_rows_count);
-    }
-
-    const Context & context;
-    mutable FunctionDictHelper helper;
-    mutable FunctionPtr impl; // underlying function used by dictGet function without explicit type info
-};
-
 /// Functions to work with hierarchies.
 
 class FunctionDictGetHierarchy final : public IFunction

From 42d4fc1bbd8c926b23c8d18f888467928104495b Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Sun, 10 Jan 2021 00:23:59 +0300
Subject: [PATCH 547/611] Updated FlatDictionary

---
 src/Dictionaries/FlatDictionary.cpp | 11 ++++++-----
 src/Dictionaries/IDictionary.h      |  3 ---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index 7278808f773..0b19b117fec 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -512,7 +512,6 @@ void FlatDictionary::resize(Attribute & attribute, const Key id)
 template <typename T>
 void FlatDictionary::setAttributeValueImpl(Attribute & attribute, const Key id, const T & value)
 {
-    resize<T>(attribute, id);
     auto & array = std::get<ContainerType<T>>(attribute.arrays);
     array[id] = value;
     loaded_ids[id] = true;
@@ -521,11 +520,8 @@ void FlatDictionary::setAttributeValueImpl(Attribute & attribute, const Key id,
 template <>
 void FlatDictionary::setAttributeValueImpl<String>(Attribute & attribute, const Key id, const String & value)
 {
-    resize<StringRef>(attribute, id);
     const auto * string_in_arena = attribute.string_arena->insert(value.data(), value.size());
-    auto & array = std::get<ContainerType<StringRef>>(attribute.arrays);
-    array[id] = StringRef{string_in_arena, value.size()};
-    loaded_ids[id] = true;
+    setAttributeValueImpl(attribute, id, StringRef{string_in_arena, value.size()});
 }
 
 void FlatDictionary::setAttributeValue(Attribute & attribute, const Key id, const Field & value)
@@ -534,6 +530,9 @@ void FlatDictionary::setAttributeValue(Attribute & attribute, const Key id, cons
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
+        using ResizeType = std::conditional_t<std::is_same_v<AttributeType, String>, StringRef, AttributeType>;
+
+        resize<ResizeType>(attribute, id);
 
         if (attribute.is_nullable)
         {
@@ -570,6 +569,8 @@ 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);
diff --git a/src/Dictionaries/IDictionary.h b/src/Dictionaries/IDictionary.h
index 61f249bad44..0de251ff8b4 100644
--- a/src/Dictionaries/IDictionary.h
+++ b/src/Dictionaries/IDictionary.h
@@ -28,9 +28,6 @@ namespace ErrorCodes
 struct IDictionaryBase;
 using DictionaryPtr = std::unique_ptr<IDictionaryBase>;
 
-struct DictionaryStructure;
-class ColumnString;
-
 enum class DictionaryIdentifierType
 {
     simple,

From 77d2e00dd88a7a84e6e0b5ff6d74bf64eeb46873 Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Mon, 11 Jan 2021 00:15:55 +0300
Subject: [PATCH 548/611] Updated DictionaryStructure

---
 src/Dictionaries/DictionaryStructure.cpp | 24 ++++++++++++++++++++++--
 src/Dictionaries/DictionaryStructure.h   |  2 ++
 src/Dictionaries/FlatDictionary.cpp      | 21 ++++++++++++---------
 src/Dictionaries/FlatDictionary.h        |  7 ++++---
 4 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/src/Dictionaries/DictionaryStructure.cpp b/src/Dictionaries/DictionaryStructure.cpp
index df785bcb550..12c33cbb58d 100644
--- a/src/Dictionaries/DictionaryStructure.cpp
+++ b/src/Dictionaries/DictionaryStructure.cpp
@@ -379,11 +379,31 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
 
         has_hierarchy = has_hierarchy || hierarchical;
 
-        res_attributes.emplace_back(
-            DictionaryAttribute{name, underlying_type, initial_type, expression, null_value, hierarchical, injective, is_object_id, is_nullable, is_array});
+        res_attributes.emplace_back(DictionaryAttribute{
+            name,
+            underlying_type,
+            initial_type,
+            type,
+            expression,
+            null_value,
+            hierarchical,
+            injective,
+            is_object_id,
+            is_nullable,
+            is_array});
     }
 
     return res_attributes;
 }
 
+const DictionaryAttribute & DictionaryStructure::getAttribute(const 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())
+        throw Exception{"No such attribute '" + attribute_name + "'", ErrorCodes::BAD_ARGUMENTS};
+
+    return *find_iter;
+}
 }
diff --git a/src/Dictionaries/DictionaryStructure.h b/src/Dictionaries/DictionaryStructure.h
index db5c3fa0103..5e7964e1c6f 100644
--- a/src/Dictionaries/DictionaryStructure.h
+++ b/src/Dictionaries/DictionaryStructure.h
@@ -56,6 +56,7 @@ struct DictionaryAttribute final
     const std::string name;
     const AttributeUnderlyingType underlying_type;
     const DataTypePtr type;
+    const DataTypePtr nested_type;
     const std::string expression;
     const Field null_value;
     const bool hierarchical;
@@ -157,6 +158,7 @@ struct DictionaryStructure final
     bool isKeySizeFixed() const;
     size_t getKeySize() const;
 
+    const DictionaryAttribute &getAttribute(const String& attribute_name) const;
 private:
     /// range_min and range_max have to be parsed before this function call
     std::vector<DictionaryAttribute> getAttributes(
diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index 0b19b117fec..07dfe498b67 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -1,12 +1,14 @@
 #include "FlatDictionary.h"
+
+#include <Core/Defines.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 <Core/Defines.h>
-
 
 namespace DB
 {
@@ -120,10 +122,11 @@ ColumnPtr FlatDictionary::getColumn(
     auto size = ids.size();
 
     const auto & attribute = getAttribute(attribute_name);
+    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name);
 
     ColumnUInt8::MutablePtr col_null_map_to;
     ColumnUInt8::Container * vec_null_map_to = nullptr;
-    if (attribute.is_nullable)
+    if (attribute.nullable_set)
     {
         col_null_map_to = ColumnUInt8::create(size, false);
         vec_null_map_to = &col_null_map_to->getData();
@@ -188,8 +191,8 @@ ColumnPtr FlatDictionary::getColumn(
 
             if constexpr (IsDecimalNumber<AttributeType>)
             {
-                // auto scale = getDecimalScale(*attribute.type);
-                column = ColumnDecimal<AttributeType>::create(size, 0);
+                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
+                column = ColumnDecimal<AttributeType>::create(size, scale);
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(size);
@@ -239,7 +242,7 @@ ColumnPtr FlatDictionary::getColumn(
 
     callOnDictionaryAttributeType(attribute.type, type_call);
 
-    if (attribute.is_nullable)
+    if (attribute.nullable_set)
     {
         for (size_t row = 0; row < ids.size(); ++row)
         {
@@ -461,8 +464,8 @@ void FlatDictionary::createAttributeImpl<String>(Attribute & attribute, const Fi
 
 FlatDictionary::Attribute FlatDictionary::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 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)
     {
@@ -534,7 +537,7 @@ void FlatDictionary::setAttributeValue(Attribute & attribute, const Key id, cons
 
         resize<ResizeType>(attribute, id);
 
-        if (attribute.is_nullable)
+        if (attribute.nullable_set)
         {
             if (value.isNull())
             {
diff --git a/src/Dictionaries/FlatDictionary.h b/src/Dictionaries/FlatDictionary.h
index 8de90ca0c15..ee461ba51ee 100644
--- a/src/Dictionaries/FlatDictionary.h
+++ b/src/Dictionaries/FlatDictionary.h
@@ -4,15 +4,17 @@
 #include <variant>
 #include <vector>
 #include <optional>
+
 #include <Common/HashTable/HashSet.h>
+#include <Common/Arena.h>
 #include <Columns/ColumnDecimal.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnArray.h>
 #include <DataTypes/IDataType.h>
-#include <Common/Arena.h>
 #include <Core/Block.h>
 #include <ext/range.h>
 #include <ext/size.h>
+
 #include "DictionaryStructure.h"
 #include "IDictionary.h"
 #include "IDictionarySource.h"
@@ -92,8 +94,7 @@ private:
     struct Attribute final
     {
         AttributeUnderlyingType type;
-        bool is_nullable;
-        std::unique_ptr<NullableSet> nullable_set;
+        std::optional<NullableSet> nullable_set;
 
         std::variant<
             UInt8,

From 498df53ebfba5e450d7c99bf3800393fe4dfadea Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Wed, 13 Jan 2021 00:26:32 +0300
Subject: [PATCH 549/611] Fixed style issues

---
 src/Dictionaries/SSDCacheDictionary.cpp           | 1 -
 src/Dictionaries/SSDComplexKeyCacheDictionary.cpp | 1 -
 src/Functions/FunctionsExternalDictionaries.h     | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Dictionaries/SSDCacheDictionary.cpp b/src/Dictionaries/SSDCacheDictionary.cpp
index 4cac3ffb94d..c0e1b8c935d 100644
--- a/src/Dictionaries/SSDCacheDictionary.cpp
+++ b/src/Dictionaries/SSDCacheDictionary.cpp
@@ -22,7 +22,6 @@
 #include <filesystem>
 #include <city.h>
 #include <fcntl.h>
-
 #include <Functions/FunctionHelpers.h>
 
 namespace ProfileEvents
diff --git a/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp b/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
index 17c9bd137af..e36ec446845 100644
--- a/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
+++ b/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
@@ -23,7 +23,6 @@
 #include <filesystem>
 #include <city.h>
 #include <fcntl.h>
-
 #include <Functions/FunctionHelpers.h>
 
 namespace ProfileEvents
diff --git a/src/Functions/FunctionsExternalDictionaries.h b/src/Functions/FunctionsExternalDictionaries.h
index 11adf63a4d9..0a87b4e2c3f 100644
--- a/src/Functions/FunctionsExternalDictionaries.h
+++ b/src/Functions/FunctionsExternalDictionaries.h
@@ -402,7 +402,7 @@ private:
     DataTypePtr getReturnTypeImpl(const DataTypes &) const override
     {
         DataTypePtr result;
-        
+
         if constexpr (IsDataTypeDecimal<DataType>)
             result = std::make_shared<DataType>(DataType::maxPrecision(), 0);
         else

From 7cb7d4dbce0a23e20d42fb92a3deb49c170d1ce7 Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Thu, 21 Jan 2021 17:42:50 +0300
Subject: [PATCH 550/611] Fixed dicitionaries todo

---
 src/Dictionaries/CacheDictionary.cpp          | 11 ++---
 .../ComplexKeyCacheDictionary.cpp             | 12 ++---
 .../ComplexKeyDirectDictionary.cpp            | 11 ++---
 .../ComplexKeyHashedDictionary.cpp            | 11 ++---
 src/Dictionaries/DictionaryStructure.cpp      | 46 +++++++++----------
 src/Dictionaries/DictionaryStructure.h        |  3 +-
 src/Dictionaries/DirectDictionary.cpp         | 12 ++---
 src/Dictionaries/FlatDictionary.cpp           | 25 ++++------
 src/Dictionaries/HashedDictionary.cpp         | 43 +++++++----------
 src/Dictionaries/HashedDictionary.h           |  4 +-
 src/Dictionaries/IPAddressDictionary.cpp      | 11 ++---
 src/Dictionaries/PolygonDictionary.cpp        | 10 ++--
 src/Dictionaries/RangeHashedDictionary.cpp    | 10 ++--
 src/Dictionaries/SSDCacheDictionary.cpp       | 11 ++---
 .../SSDComplexKeyCacheDictionary.cpp          | 15 +++---
 src/Functions/FunctionHelpers.cpp             |  8 ++++
 src/Functions/FunctionHelpers.h               |  4 ++
 src/Functions/FunctionsExternalDictionaries.h |  2 +
 18 files changed, 117 insertions(+), 132 deletions(-)

diff --git a/src/Dictionaries/CacheDictionary.cpp b/src/Dictionaries/CacheDictionary.cpp
index 71490897131..d5f3c0b1c4a 100644
--- a/src/Dictionaries/CacheDictionary.cpp
+++ b/src/Dictionaries/CacheDictionary.cpp
@@ -14,6 +14,7 @@
 #include <ext/range.h>
 #include <ext/size.h>
 #include <Common/setThreadName.h>
+#include <DataTypes/DataTypesDecimal.h>
 #include "CacheDictionary.inc.h"
 #include "DictionaryBlockInputStream.h"
 #include "DictionaryFactory.h"
@@ -251,7 +252,7 @@ void CacheDictionary::isInConstantVector(const Key child_id, const PaddedPODArra
 
 ColumnPtr CacheDictionary::getColumn(
     const std::string & attribute_name,
-    const DataTypePtr &,
+    const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes &,
     const ColumnPtr default_untyped) const
@@ -262,9 +263,7 @@ ColumnPtr CacheDictionary::getColumn(
     const auto & ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
 
     auto & attribute = getAttribute(attribute_name);
-
-    /// TODO: Check that attribute type is same as result type
-    /// TODO: Check if const will work as expected
+    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
 
     auto type_call = [&](const auto &dictionary_attribute_type)
     {
@@ -311,8 +310,8 @@ ColumnPtr CacheDictionary::getColumn(
 
             if constexpr (IsDecimalNumber<AttributeType>)
             {
-                // auto scale = getDecimalScale(*attribute.type);
-                column = ColumnDecimal<AttributeType>::create(identifiers_size, 0);
+                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
+                column = ColumnDecimal<AttributeType>::create(size, scale);
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(identifiers_size);
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary.cpp b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
index 60457f81027..d27a8c1483e 100644
--- a/src/Dictionaries/ComplexKeyCacheDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
@@ -11,7 +11,7 @@
 #include "DictionaryBlockInputStream.h"
 #include "DictionaryFactory.h"
 #include <Functions/FunctionHelpers.h>
-
+#include <DataTypes/DataTypesDecimal.h>
 
 namespace ProfileEvents
 {
@@ -73,7 +73,7 @@ ComplexKeyCacheDictionary::ComplexKeyCacheDictionary(
 
 ColumnPtr ComplexKeyCacheDictionary::getColumn(
     const std::string & attribute_name,
-    const DataTypePtr &,
+    const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes & key_types,
     const ColumnPtr default_untyped) const
@@ -83,9 +83,7 @@ ColumnPtr ComplexKeyCacheDictionary::getColumn(
     ColumnPtr result;
 
     auto & attribute = getAttribute(attribute_name);
-
-    /// TODO: Check that attribute type is same as result type
-    /// TODO: Check if const will work as expected
+    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
 
     auto keys_size = key_columns.front()->size();
 
@@ -133,8 +131,8 @@ ColumnPtr ComplexKeyCacheDictionary::getColumn(
 
             if constexpr (IsDecimalNumber<AttributeType>)
             {
-                // auto scale = getDecimalScale(*attribute.type);
-                column = ColumnDecimal<AttributeType>::create(keys_size, 0);
+                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
+                column = ColumnDecimal<AttributeType>::create(size, scale);
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(keys_size);
diff --git a/src/Dictionaries/ComplexKeyDirectDictionary.cpp b/src/Dictionaries/ComplexKeyDirectDictionary.cpp
index 35ca970889f..e719c247279 100644
--- a/src/Dictionaries/ComplexKeyDirectDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyDirectDictionary.cpp
@@ -5,6 +5,7 @@
 #include <Core/Defines.h>
 #include <Columns/ColumnNullable.h>
 #include <Functions/FunctionHelpers.h>
+#include <DataTypes/DataTypesDecimal.h>
 
 namespace DB
 {
@@ -35,7 +36,7 @@ ComplexKeyDirectDictionary::ComplexKeyDirectDictionary(
 
 ColumnPtr ComplexKeyDirectDictionary::getColumn(
     const std::string & attribute_name,
-    const DataTypePtr &,
+    const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes & key_types,
     const ColumnPtr default_untyped) const
@@ -45,9 +46,7 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
     ColumnPtr result;
 
     const auto & attribute = getAttribute(attribute_name);
-
-    /// TODO: Check that attribute type is same as result type
-    /// TODO: Check if const will work as expected
+    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
 
     auto size = key_columns.front()->size();
 
@@ -146,8 +145,8 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
 
             if constexpr (IsDecimalNumber<AttributeType>)
             {
-                // auto scale = getDecimalScale(*attribute.type);
-                column = ColumnDecimal<AttributeType>::create(size, 0);
+                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
+                column = ColumnDecimal<AttributeType>::create(size, scale);
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(size);
diff --git a/src/Dictionaries/ComplexKeyHashedDictionary.cpp b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
index 85540a8a7f3..3d48638a1b2 100644
--- a/src/Dictionaries/ComplexKeyHashedDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
@@ -4,6 +4,7 @@
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnNullable.h>
 #include <Functions/FunctionHelpers.h>
+#include <DataTypes/DataTypesDecimal.h>
 #include "DictionaryBlockInputStream.h"
 #include "DictionaryFactory.h"
 
@@ -37,7 +38,7 @@ ComplexKeyHashedDictionary::ComplexKeyHashedDictionary(
 
 ColumnPtr ComplexKeyHashedDictionary::getColumn(
     const std::string & attribute_name,
-    const DataTypePtr &,
+    const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes & key_types,
     const ColumnPtr default_untyped) const
@@ -47,9 +48,7 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
     ColumnPtr result;
 
     const auto & attribute = getAttribute(attribute_name);
-
-    /// TODO: Check that attribute type is same as result type
-    /// TODO: Check if const will work as expected
+    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
 
     auto size = key_columns.front()->size();
 
@@ -141,8 +140,8 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
 
             if constexpr (IsDecimalNumber<AttributeType>)
             {
-                // auto scale = getDecimalScale(*attribute.type);
-                column = ColumnDecimal<AttributeType>::create(size, 0);
+                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
+                column = ColumnDecimal<AttributeType>::create(size, scale);
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(size);
diff --git a/src/Dictionaries/DictionaryStructure.cpp b/src/Dictionaries/DictionaryStructure.cpp
index 12c33cbb58d..5c6863da651 100644
--- a/src/Dictionaries/DictionaryStructure.cpp
+++ b/src/Dictionaries/DictionaryStructure.cpp
@@ -208,16 +208,32 @@ void DictionaryStructure::validateKeyTypes(const DataTypes & key_types) const
 
     for (const auto i : ext::range(0, key_types.size()))
     {
-        const auto & expected_type = (*key)[i].type->getName();
-        const auto & actual_type = key_types[i]->getName();
+        const auto & expected_type = (*key)[i].type;
+        const auto & actual_type = key_types[i];
 
-        if (expected_type != actual_type)
-            throw Exception{"Key type at position " + std::to_string(i) + " does not match, expected " + expected_type + ", found "
-                                + actual_type,
-                            ErrorCodes::TYPE_MISMATCH};
+        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};
     }
 }
 
+const DictionaryAttribute & DictionaryStructure::getAttribute(const String& attribute_name, const DataTypePtr & type) const
+{
+    auto find_iter
+        = std::find_if(attributes.begin(), attributes.end(), [&](const auto & attribute) { return attribute.name == attribute_name; });
+
+    if (find_iter == attributes.end())
+        throw Exception{"No such attribute '" + attribute_name + "'", ErrorCodes::BAD_ARGUMENTS};
+
+    auto & attribute = *find_iter;
+
+    if (!areTypesEqual(attribute.type, type))
+        throw Exception{"Attribute type does not match, expected " + attribute.type->getName() + ", found " + type->getName(),
+            ErrorCodes::TYPE_MISMATCH};
+
+    return *find_iter;
+}
 
 std::string DictionaryStructure::getKeyDescription() const
 {
@@ -312,20 +328,12 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
             continue;
 
 
-        /// TODO: Rewrite
         const auto type_string = config.getString(prefix + "type");
         const auto initial_type = DataTypeFactory::instance().get(type_string);
         auto type = initial_type;
         bool is_array = false;
         bool is_nullable = false;
 
-        // const DataTypeArray * array_type = checkAndGetDataType<DataTypeArray>(type.get());
-        // if (array_type)
-        // {
-        //     is_array = true;
-        //     type = array_type->getNestedType();
-        // }
-
         if (type->isNullable())
         {
             is_nullable = true;
@@ -396,14 +404,4 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
     return res_attributes;
 }
 
-const DictionaryAttribute & DictionaryStructure::getAttribute(const 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())
-        throw Exception{"No such attribute '" + attribute_name + "'", ErrorCodes::BAD_ARGUMENTS};
-
-    return *find_iter;
-}
 }
diff --git a/src/Dictionaries/DictionaryStructure.h b/src/Dictionaries/DictionaryStructure.h
index 5e7964e1c6f..945e1c55494 100644
--- a/src/Dictionaries/DictionaryStructure.h
+++ b/src/Dictionaries/DictionaryStructure.h
@@ -154,11 +154,10 @@ struct DictionaryStructure final
     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 DataTypePtr & type) const;
     std::string getKeyDescription() const;
     bool isKeySizeFixed() const;
     size_t getKeySize() const;
-
-    const DictionaryAttribute &getAttribute(const String& attribute_name) const;
 private:
     /// range_min and range_max have to be parsed before this function call
     std::vector<DictionaryAttribute> getAttributes(
diff --git a/src/Dictionaries/DirectDictionary.cpp b/src/Dictionaries/DirectDictionary.cpp
index 15020d11b0d..5f556aa2057 100644
--- a/src/Dictionaries/DirectDictionary.cpp
+++ b/src/Dictionaries/DirectDictionary.cpp
@@ -5,6 +5,7 @@
 #include <Core/Defines.h>
 #include <Functions/FunctionHelpers.h>
 #include <Columns/ColumnNullable.h>
+#include <DataTypes/DataTypesDecimal.h>
 
 namespace DB
 {
@@ -130,8 +131,8 @@ void DirectDictionary::isInConstantVector(const Key child_id, const PaddedPODArr
 }
 
 ColumnPtr DirectDictionary::getColumn(
-        const std::string& attribute_name,
-        const DataTypePtr &,
+        const std::string & attribute_name,
+        const DataTypePtr & result_type,
         const Columns & key_columns,
         const DataTypes &,
         const ColumnPtr default_untyped) const
@@ -153,8 +154,7 @@ ColumnPtr DirectDictionary::getColumn(
         vec_null_map_to = &col_null_map_to->getData();
     }
 
-    /// TODO: Check that attribute type is same as result type
-    /// TODO: Check if const will work as expected
+    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
 
     auto type_call = [&](const auto &dictionary_attribute_type)
     {
@@ -244,8 +244,8 @@ ColumnPtr DirectDictionary::getColumn(
 
             if constexpr (IsDecimalNumber<AttributeType>)
             {
-                // auto scale = getDecimalScale(*attribute.type);
-                column = ColumnDecimal<AttributeType>::create(size, 0);
+                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
+                column = ColumnDecimal<AttributeType>::create(size, scale);
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(size);
diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index 07dfe498b67..b19164a4ebc 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -108,8 +108,8 @@ void FlatDictionary::isInConstantVector(const Key child_id, const PaddedPODArray
 }
 
 ColumnPtr FlatDictionary::getColumn(
-        const std::string& attribute_name,
-        const DataTypePtr &,
+        const std::string & attribute_name,
+        const DataTypePtr & result_type,
         const Columns & key_columns,
         const DataTypes &,
         const ColumnPtr default_untyped) const
@@ -122,18 +122,7 @@ ColumnPtr FlatDictionary::getColumn(
     auto size = ids.size();
 
     const auto & attribute = getAttribute(attribute_name);
-    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name);
-
-    ColumnUInt8::MutablePtr col_null_map_to;
-    ColumnUInt8::Container * vec_null_map_to = nullptr;
-    if (attribute.nullable_set)
-    {
-        col_null_map_to = ColumnUInt8::create(size, false);
-        vec_null_map_to = &col_null_map_to->getData();
-    }
-
-    /// TODO: Check that attribute type is same as result type
-    /// TODO: Check if const will work as expected
+    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
 
     auto type_call = [&](const auto &dictionary_attribute_type)
     {
@@ -244,13 +233,15 @@ 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();
+
         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;
-            }
+                vec_null_map_to[row] = true;
         }
 
         result = ColumnNullable::create(result, std::move(col_null_map_to));
diff --git a/src/Dictionaries/HashedDictionary.cpp b/src/Dictionaries/HashedDictionary.cpp
index c32dc4492a0..eb742834bac 100644
--- a/src/Dictionaries/HashedDictionary.cpp
+++ b/src/Dictionaries/HashedDictionary.cpp
@@ -7,6 +7,7 @@
 #include <Functions/FunctionHelpers.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnNullable.h>
+#include <DataTypes/DataTypesDecimal.h>
 
 namespace
 {
@@ -129,12 +130,11 @@ void HashedDictionary::isInConstantVector(const Key child_id, const PaddedPODArr
 
 ColumnPtr HashedDictionary::getColumn(
     const std::string & attribute_name,
-    const DataTypePtr &,
+    const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes &,
     const ColumnPtr default_untyped) const
 {
-    // dict_struct.validateKeyTypes(key_types);
     ColumnPtr result;
 
     PaddedPODArray<Key> backup_storage;
@@ -143,17 +143,7 @@ ColumnPtr HashedDictionary::getColumn(
     auto size = ids.size();
 
     const auto & attribute = getAttribute(attribute_name);
-
-    ColumnUInt8::MutablePtr col_null_map_to;
-    ColumnUInt8::Container * vec_null_map_to = nullptr;
-    if (attribute.is_nullable)
-    {
-        col_null_map_to = ColumnUInt8::create(size, false);
-        vec_null_map_to = &col_null_map_to->getData();
-    }
-
-    /// TODO: Check that attribute type is same as result type
-    /// TODO: Check if const will work as expected
+    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
 
     auto type_call = [&](const auto & dictionary_attribute_type)
     {
@@ -211,8 +201,8 @@ ColumnPtr HashedDictionary::getColumn(
 
             if constexpr (IsDecimalNumber<AttributeType>)
             {
-                // auto scale = getDecimalScale(*attribute.type);
-                column = ColumnDecimal<AttributeType>::create(size, 0);
+                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
+                column = ColumnDecimal<AttributeType>::create(size, scale);
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(size);
@@ -262,15 +252,17 @@ ColumnPtr HashedDictionary::getColumn(
 
     callOnDictionaryAttributeType(attribute.type, type_call);
 
-    if (attribute.is_nullable)
+    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;
-            }
+                vec_null_map_to[row] = true;
         }
 
         result = ColumnNullable::create(result, std::move(col_null_map_to));
@@ -578,8 +570,8 @@ void HashedDictionary::createAttributeImpl<String>(Attribute & attribute, const
 
 HashedDictionary::Attribute HashedDictionary::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 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)
     {
@@ -650,12 +642,11 @@ bool HashedDictionary::setAttributeValue(Attribute & attribute, const Key id, co
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
 
-        if (attribute.is_nullable)
+        if (attribute.nullable_set)
         {
             if (value.isNull())
             {
-                attribute.nullable_set->insert(id);
-                result = true;
+                result = attribute.nullable_set->insert(id).second;
                 return;
             }
             else
@@ -691,7 +682,7 @@ void HashedDictionary::has(const Attribute & attribute, const PaddedPODArray<Key
     {
         out[i] = attr.find(ids[i]) != nullptr;
 
-        if (attribute.is_nullable && !out[i])
+        if (attribute.nullable_set && !out[i])
             out[i] = attribute.nullable_set->find(ids[i]) != nullptr;
     }
 }
@@ -738,7 +729,7 @@ PaddedPODArray<HashedDictionary::Key> HashedDictionary::getIds() const
         /// TODO: Check if order is satisfied
         result = getIds<AttributeType>(attribute);
 
-        if (attribute.is_nullable)
+        if (attribute.nullable_set)
         {
             for (const auto& value: *attribute.nullable_set)
                 result.push_back(value.getKey());
diff --git a/src/Dictionaries/HashedDictionary.h b/src/Dictionaries/HashedDictionary.h
index 0f718c8132b..25024a28d73 100644
--- a/src/Dictionaries/HashedDictionary.h
+++ b/src/Dictionaries/HashedDictionary.h
@@ -3,6 +3,7 @@
 #include <atomic>
 #include <memory>
 #include <variant>
+#include <optional>
 #include <Columns/ColumnDecimal.h>
 #include <Columns/ColumnString.h>
 #include <Core/Block.h>
@@ -107,8 +108,7 @@ private:
     struct Attribute final
     {
         AttributeUnderlyingType type;
-        bool is_nullable;
-        std::unique_ptr<NullableSet> nullable_set;
+        std::optional<NullableSet> nullable_set;
 
         std::variant<
             UInt8,
diff --git a/src/Dictionaries/IPAddressDictionary.cpp b/src/Dictionaries/IPAddressDictionary.cpp
index f611725f740..93451635cb2 100644
--- a/src/Dictionaries/IPAddressDictionary.cpp
+++ b/src/Dictionaries/IPAddressDictionary.cpp
@@ -8,6 +8,7 @@
 #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>
@@ -269,7 +270,7 @@ IPAddressDictionary::IPAddressDictionary(
 
 ColumnPtr IPAddressDictionary::getColumn(
     const std::string & attribute_name,
-    const DataTypePtr &,
+    const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes & key_types,
     const ColumnPtr default_untyped) const
@@ -279,9 +280,7 @@ ColumnPtr IPAddressDictionary::getColumn(
     ColumnPtr result;
 
     const auto & attribute = getAttribute(attribute_name);
-
-    /// TODO: Check that attribute type is same as result type
-    /// TODO: Check if const will work as expected
+    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
 
     auto size = key_columns.front()->size();
 
@@ -341,8 +340,8 @@ ColumnPtr IPAddressDictionary::getColumn(
 
             if constexpr (IsDecimalNumber<AttributeType>)
             {
-                // auto scale = getDecimalScale(*attribute.type);
-                column = ColumnDecimal<AttributeType>::create(size, 0);
+                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
+                column = ColumnDecimal<AttributeType>::create(size, scale);
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(size);
diff --git a/src/Dictionaries/PolygonDictionary.cpp b/src/Dictionaries/PolygonDictionary.cpp
index 3b8d3ad3b5a..c1969ea7b35 100644
--- a/src/Dictionaries/PolygonDictionary.cpp
+++ b/src/Dictionaries/PolygonDictionary.cpp
@@ -6,6 +6,7 @@
 #include <Columns/ColumnTuple.h>
 #include <DataTypes/DataTypeArray.h>
 #include <Functions/FunctionHelpers.h>
+#include <DataTypes/DataTypesDecimal.h>
 
 #include <numeric>
 
@@ -95,7 +96,7 @@ bool IPolygonDictionary::isInjective(const std::string &) const
 
 ColumnPtr IPolygonDictionary::getColumn(
     const std::string & attribute_name,
-    const DataTypePtr &,
+    const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes &,
     const ColumnPtr default_untyped) const
@@ -105,8 +106,7 @@ ColumnPtr IPolygonDictionary::getColumn(
     ColumnPtr result;
 
     const auto index = getAttributeIndex(attribute_name);
-
-    /// TODO: Check that attribute type is same as result type
+    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
 
     auto size = key_columns.front()->size();
 
@@ -166,8 +166,8 @@ ColumnPtr IPolygonDictionary::getColumn(
 
             if constexpr (IsDecimalNumber<AttributeType>)
             {
-                // auto scale = getDecimalScale(*attribute.type);
-                column = ColumnDecimal<AttributeType>::create(size, 0);
+                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
+                column = ColumnDecimal<AttributeType>::create(size, scale);
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(size);
diff --git a/src/Dictionaries/RangeHashedDictionary.cpp b/src/Dictionaries/RangeHashedDictionary.cpp
index de36419ffba..02fb71ca3d7 100644
--- a/src/Dictionaries/RangeHashedDictionary.cpp
+++ b/src/Dictionaries/RangeHashedDictionary.cpp
@@ -6,6 +6,7 @@
 #include "DictionaryFactory.h"
 #include "RangeDictionaryBlockInputStream.h"
 #include <Interpreters/castColumn.h>
+#include <DataTypes/DataTypesDecimal.h>
 
 namespace
 {
@@ -89,7 +90,7 @@ RangeHashedDictionary::RangeHashedDictionary(
 
 ColumnPtr RangeHashedDictionary::getColumn(
     const std::string & attribute_name,
-    const DataTypePtr &,
+    const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes & key_types,
     const ColumnPtr default_untyped) const
@@ -99,8 +100,7 @@ ColumnPtr RangeHashedDictionary::getColumn(
     ColumnPtr result;
 
     const auto & attribute = getAttribute(attribute_name);
-
-    /// TODO: Check that attribute type is same as result type
+    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
 
     auto size = key_columns.front()->size();
 
@@ -201,8 +201,8 @@ ColumnPtr RangeHashedDictionary::getColumn(
 
             if constexpr (IsDecimalNumber<AttributeType>)
             {
-                // auto scale = getDecimalScale(*attribute.type);
-                column = ColumnDecimal<AttributeType>::create(size, 0);
+                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
+                column = ColumnDecimal<AttributeType>::create(size, scale);
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(size);
diff --git a/src/Dictionaries/SSDCacheDictionary.cpp b/src/Dictionaries/SSDCacheDictionary.cpp
index c0e1b8c935d..642e956f97e 100644
--- a/src/Dictionaries/SSDCacheDictionary.cpp
+++ b/src/Dictionaries/SSDCacheDictionary.cpp
@@ -23,6 +23,7 @@
 #include <city.h>
 #include <fcntl.h>
 #include <Functions/FunctionHelpers.h>
+#include <DataTypes/DataTypesDecimal.h>
 
 namespace ProfileEvents
 {
@@ -1329,7 +1330,7 @@ SSDCacheDictionary::SSDCacheDictionary(
 
 ColumnPtr SSDCacheDictionary::getColumn(
     const std::string & attribute_name,
-    const DataTypePtr &,
+    const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes &,
     const ColumnPtr default_untyped) const
@@ -1340,9 +1341,7 @@ ColumnPtr SSDCacheDictionary::getColumn(
     const auto & ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
 
     const auto index = getAttributeIndex(attribute_name);
-
-    /// TODO: Check that attribute type is same as result type
-    /// TODO: Check if const will work as expected
+    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
 
     auto type_call = [&](const auto &dictionary_attribute_type)
     {
@@ -1389,8 +1388,8 @@ ColumnPtr SSDCacheDictionary::getColumn(
 
             if constexpr (IsDecimalNumber<AttributeType>)
             {
-                // auto scale = getDecimalScale(*attribute.type);
-                column = ColumnDecimal<AttributeType>::create(identifiers_size, 0);
+                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
+                column = ColumnDecimal<AttributeType>::create(identifiers_size, scale);
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(identifiers_size);
diff --git a/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp b/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
index e36ec446845..5372e0e1afb 100644
--- a/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
+++ b/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
@@ -9,6 +9,7 @@
 #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>
@@ -1378,19 +1379,17 @@ SSDComplexKeyCacheDictionary::SSDComplexKeyCacheDictionary(
 
 ColumnPtr SSDComplexKeyCacheDictionary::getColumn(
     const std::string & attribute_name,
-    const DataTypePtr &,
+    const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes & key_types,
     const ColumnPtr default_untyped) const
 {
+    ColumnPtr result;
+
     dict_struct.validateKeyTypes(key_types);
 
     const auto index = getAttributeIndex(attribute_name);
-
-    ColumnPtr result;
-
-    /// TODO: Check that attribute type is same as result type
-    /// TODO: Check if const will work as expected
+    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
 
     auto keys_size = key_columns.front()->size();
 
@@ -1438,8 +1437,8 @@ ColumnPtr SSDComplexKeyCacheDictionary::getColumn(
 
             if constexpr (IsDecimalNumber<AttributeType>)
             {
-                // auto scale = getDecimalScale(*attribute.type);
-                column = ColumnDecimal<AttributeType>::create(keys_size, 0);
+                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
+                column = ColumnDecimal<AttributeType>::create(keys_size, scale);
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(keys_size);
diff --git a/src/Functions/FunctionHelpers.cpp b/src/Functions/FunctionHelpers.cpp
index f5ace858665..d64646ecaf1 100644
--- a/src/Functions/FunctionHelpers.cpp
+++ b/src/Functions/FunctionHelpers.cpp
@@ -212,4 +212,12 @@ checkAndGetNestedArrayOffset(const IColumn ** columns, size_t num_arguments)
     return {nested_columns, offsets->data()};
 }
 
+bool areTypesEqual(const DataTypePtr & lhs, const DataTypePtr & rhs)
+{
+    const auto & lhs_name = lhs->getName();
+    const auto & rhs_name = rhs->getName();
+
+    return lhs_name == rhs_name;
+}
+
 }
diff --git a/src/Functions/FunctionHelpers.h b/src/Functions/FunctionHelpers.h
index ac10fc14d39..76e420957be 100644
--- a/src/Functions/FunctionHelpers.h
+++ b/src/Functions/FunctionHelpers.h
@@ -152,4 +152,8 @@ void validateFunctionArgumentTypes(const IFunction & func, const ColumnsWithType
 std::pair<std::vector<const IColumn *>, const ColumnArray::Offset *>
 checkAndGetNestedArrayOffset(const IColumn ** columns, size_t num_arguments);
 
+
+/// Check if two types are equal
+bool areTypesEqual(const DataTypePtr & lhs, const DataTypePtr & rhs);
+
 }
diff --git a/src/Functions/FunctionsExternalDictionaries.h b/src/Functions/FunctionsExternalDictionaries.h
index 0a87b4e2c3f..2130771251a 100644
--- a/src/Functions/FunctionsExternalDictionaries.h
+++ b/src/Functions/FunctionsExternalDictionaries.h
@@ -58,6 +58,8 @@ namespace ErrorCodes
     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;
 }
 
 

From b11905f493b95390db71aa1c16d2a23219b0ab54 Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Thu, 21 Jan 2021 21:21:07 +0300
Subject: [PATCH 551/611] Fixed tests

---
 src/Dictionaries/CacheDictionary.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Dictionaries/CacheDictionary.cpp b/src/Dictionaries/CacheDictionary.cpp
index d5f3c0b1c4a..5b4690c206e 100644
--- a/src/Dictionaries/CacheDictionary.cpp
+++ b/src/Dictionaries/CacheDictionary.cpp
@@ -289,7 +289,7 @@ ColumnPtr CacheDictionary::getColumn(
                     getItemsString(attribute, ids, column_string.get(), [&](const size_t) { return StringRef{def}; });
                 }
                 else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
+                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH}; 
             }
             else
             {
@@ -311,7 +311,7 @@ ColumnPtr CacheDictionary::getColumn(
             if constexpr (IsDecimalNumber<AttributeType>)
             {
                 auto scale = getDecimalScale(*dictionary_attribute.nested_type);
-                column = ColumnDecimal<AttributeType>::create(size, scale);
+                column = ColumnDecimal<AttributeType>::create(identifiers_size, scale);
             }
             else if constexpr (IsNumber<AttributeType>)
                 column = ColumnVector<AttributeType>::create(identifiers_size);

From b0d3f32a3697d662ec4455bf4f3856ad25b96284 Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Fri, 22 Jan 2021 17:54:51 +0300
Subject: [PATCH 552/611] Added DefaultValueExtractor

---
 src/Dictionaries/FlatDictionary.cpp   | 95 +++++++--------------------
 src/Dictionaries/FlatDictionary.h     | 50 +++++++++++++-
 src/Dictionaries/HashedDictionary.cpp | 14 ++--
 src/Dictionaries/HashedDictionary.h   |  2 +-
 src/Dictionaries/IDictionary.h        |  2 +-
 5 files changed, 79 insertions(+), 84 deletions(-)

diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index b19164a4ebc..307b231071e 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -49,12 +49,13 @@ FlatDictionary::FlatDictionary(
 void FlatDictionary::toParent(const PaddedPODArray<Key> & ids, PaddedPODArray<Key> & out) const
 {
     const auto null_value = std::get<UInt64>(hierarchical_attribute->null_values);
+    DefaultValueExtractor<UInt64> extractor(null_value, nullptr);
 
     getItemsImpl<UInt64, UInt64>(
         *hierarchical_attribute,
         ids,
         [&](const size_t row, const UInt64 value) { out[row] = value; },
-        [&](const size_t) { return null_value; });
+        extractor);
 }
 
 
@@ -112,7 +113,7 @@ ColumnPtr FlatDictionary::getColumn(
         const DataTypePtr & result_type,
         const Columns & key_columns,
         const DataTypes &,
-        const ColumnPtr default_untyped) const
+        const ColumnPtr default_values_column) const
 {
     ColumnPtr result;
 
@@ -134,39 +135,14 @@ ColumnPtr FlatDictionary::getColumn(
             auto column_string = ColumnString::create();
             auto * out = column_string.get();
 
-            if (default_untyped != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
-                {
-                    getItemsImpl<StringRef, StringRef>(
-                        attribute,
-                        ids,
-                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-                        [&](const size_t row) { return default_col->getDataAt(row); });
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<String>();
+            const auto & null_value = std::get<StringRef>(attribute.null_values);
+            DefaultValueExtractor<StringRef> extractor(null_value, default_values_column);
 
-                    getItemsImpl<StringRef, StringRef>(
-                        attribute,
-                        ids,
-                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-                        [&](const size_t) { return def; });
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-            }
-            else
-            {
-                const auto & null_value = std::get<StringRef>(attribute.null_values);
-
-                getItemsImpl<StringRef, StringRef>(
-                    attribute,
-                    ids,
-                    [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-                    [&](const size_t) { return null_value; });
-            }
+            getItemsImpl<StringRef, StringRef>(
+                attribute,
+                ids,
+                [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                extractor);
 
             result = std::move(column_string);
         }
@@ -188,42 +164,14 @@ ColumnPtr FlatDictionary::getColumn(
 
             auto & out = column->getData();
 
-            if (default_untyped != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
-                {
-                    getItemsImpl<AttributeType, AttributeType>(
-                        attribute,
-                        ids,
-                        [&](const size_t row, const auto value) { out[row] = value; },
-                        [&](const size_t row) { return default_col->getData()[row]; }
-                    );
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<AttributeType>();
+            const auto null_value = std::get<AttributeType>(attribute.null_values);
+            DefaultValueExtractor<AttributeType> extractor(null_value, default_values_column);
 
-                    getItemsImpl<AttributeType, AttributeType>(
-                        attribute,
-                        ids,
-                        [&](const size_t row, const auto value) { out[row] = value; },
-                        [&](const size_t) { return def; }
-                    );
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-            }
-            else
-            {
-                const auto null_value = std::get<AttributeType>(attribute.null_values);
-
-                getItemsImpl<AttributeType, AttributeType>(
-                    attribute,
-                    ids,
-                    [&](const size_t row, const auto value) { out[row] = value; },
-                    [&](const size_t) { return null_value; }
-                );
-            }
+            getItemsImpl<AttributeType, AttributeType>(
+                attribute, 
+                ids, 
+                [&](const size_t row, const auto value) { out[row] = value; },
+                extractor);
 
             result = std::move(column);
         }
@@ -472,9 +420,12 @@ FlatDictionary::Attribute FlatDictionary::createAttribute(const DictionaryAttrib
 }
 
 
-template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
+template <typename AttributeType, typename OutputType, typename ValueSetter>
 void FlatDictionary::getItemsImpl(
-    const Attribute & attribute, const PaddedPODArray<Key> & ids, ValueSetter && set_value, DefaultGetter && get_default) const
+    const Attribute & attribute,
+    const PaddedPODArray<Key> & ids,
+    ValueSetter && set_value,
+    DefaultValueExtractor<AttributeType> & default_value_extractor) const
 {
     const auto & attr = std::get<ContainerType<AttributeType>>(attribute.arrays);
     const auto rows = ext::size(ids);
@@ -482,7 +433,7 @@ void FlatDictionary::getItemsImpl(
     for (const auto row : ext::range(0, rows))
     {
         const auto id = ids[row];
-        set_value(row, id < ext::size(attr) && loaded_ids[id] ? static_cast<OutputType>(attr[id]) : get_default(row));
+        set_value(row, id < ext::size(attr) && loaded_ids[id] ? static_cast<OutputType>(attr[id]) : default_value_extractor[row]);
     }
 
     query_count.fetch_add(rows, std::memory_order_relaxed);
diff --git a/src/Dictionaries/FlatDictionary.h b/src/Dictionaries/FlatDictionary.h
index ee461ba51ee..2aa32a1d8fe 100644
--- a/src/Dictionaries/FlatDictionary.h
+++ b/src/Dictionaries/FlatDictionary.h
@@ -24,6 +24,50 @@ namespace DB
 {
 using BlockPtr = std::shared_ptr<Block>;
 
+template <typename DefaultValue>
+class DefaultValueExtractor
+{
+public:
+    using ResultColumnType = std::conditional_t<
+        std::is_same_v<DefaultValue, StringRef>,
+        ColumnString,
+        std::conditional_t<IsDecimalNumber<DefaultValue>, ColumnDecimal<DefaultValue>, ColumnVector<DefaultValue>>>;
+
+    DefaultValueExtractor(DefaultValue default_value_, ColumnPtr default_values_)
+    {
+        if (default_values_ != nullptr)
+        {
+            if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_values_))
+            {
+                default_values = default_col;
+            }
+            else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_values_.get()))
+            {
+                using ConstColumnValue = std::conditional_t<std::is_same_v<DefaultValue, StringRef>, String, DefaultValue>;
+                default_value = std::make_optional<DefaultValue>(default_col_const->template getValue<ConstColumnValue>());
+            }
+            else
+                throw Exception{"Type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
+        }
+        else
+            default_value = std::make_optional<DefaultValue>(default_value_);
+    }
+
+    DefaultValue operator[](size_t row)
+    {
+        if (default_value)
+            return *default_value;
+        
+        if constexpr (std::is_same_v<ResultColumnType, ColumnString>)
+            return default_values->getDataAt(row);
+        else
+            return default_values->getData()[row];
+    }
+private:
+    const ResultColumnType * default_values = nullptr;
+    std::optional<DefaultValue> default_value = {};
+};
+
 class FlatDictionary final : public IDictionary
 {
 public:
@@ -79,7 +123,7 @@ public:
         const DataTypePtr & result_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnPtr default_untyped) const override;
+        const ColumnPtr default_values_column) const override;
 
     ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) const override;
 
@@ -149,9 +193,9 @@ private:
 
     Attribute createAttribute(const DictionaryAttribute& attribute, const Field & null_value);
 
-    template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
+    template <typename AttributeType, typename OutputType, typename ValueSetter>
     void getItemsImpl(
-        const Attribute & attribute, const PaddedPODArray<Key> & ids, ValueSetter && set_value, DefaultGetter && get_default) const;
+        const Attribute & attribute, const PaddedPODArray<Key> & ids, ValueSetter && set_value, DefaultValueExtractor<AttributeType> & default_value_extractor) const;
 
     template <typename T>
     void resize(Attribute & attribute, const Key id);
diff --git a/src/Dictionaries/HashedDictionary.cpp b/src/Dictionaries/HashedDictionary.cpp
index eb742834bac..b71ee666d9e 100644
--- a/src/Dictionaries/HashedDictionary.cpp
+++ b/src/Dictionaries/HashedDictionary.cpp
@@ -133,7 +133,7 @@ ColumnPtr HashedDictionary::getColumn(
     const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes &,
-    const ColumnPtr default_untyped) const
+    const ColumnPtr default_values_column) const
 {
     ColumnPtr result;
 
@@ -155,9 +155,9 @@ ColumnPtr HashedDictionary::getColumn(
             auto column_string = ColumnString::create();
             auto * out = column_string.get();
 
-            if (default_untyped != nullptr)
+            if (default_values_column != nullptr)
             {
-                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_values_column))
                 {
                     getItemsImpl<StringRef, StringRef>(
                         attribute,
@@ -165,7 +165,7 @@ ColumnPtr HashedDictionary::getColumn(
                         [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
                         [&](const size_t row) { return default_col->getDataAt(row); });
                 }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_values_column.get()))
                 {
                     const auto & def = default_col_const->template getValue<String>();
 
@@ -209,9 +209,9 @@ ColumnPtr HashedDictionary::getColumn(
 
             auto & out = column->getData();
 
-            if (default_untyped != nullptr)
+            if (default_values_column != nullptr)
             {
-                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
+                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_values_column))
                 {
                     getItemsImpl<AttributeType, AttributeType>(
                         attribute,
@@ -220,7 +220,7 @@ ColumnPtr HashedDictionary::getColumn(
                         [&](const size_t row) { return default_col->getData()[row]; }
                     );
                 }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
+                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_values_column.get()))
                 {
                     const auto & def = default_col_const->template getValue<AttributeType>();
 
diff --git a/src/Dictionaries/HashedDictionary.h b/src/Dictionaries/HashedDictionary.h
index 25024a28d73..776b2f37f36 100644
--- a/src/Dictionaries/HashedDictionary.h
+++ b/src/Dictionaries/HashedDictionary.h
@@ -75,7 +75,7 @@ public:
         const DataTypePtr & result_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnPtr default_untyped) const override;
+        const ColumnPtr default_values_column) const override;
 
     ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) const override;
 
diff --git a/src/Dictionaries/IDictionary.h b/src/Dictionaries/IDictionary.h
index 0de251ff8b4..c774ab7f676 100644
--- a/src/Dictionaries/IDictionary.h
+++ b/src/Dictionaries/IDictionary.h
@@ -102,7 +102,7 @@ struct IDictionaryBase : public IExternalLoadable
         const DataTypePtr & result_type [[maybe_unused]],
         const Columns & key_columns [[maybe_unused]],
         const DataTypes & key_types [[maybe_unused]],
-        const ColumnPtr default_untyped [[maybe_unused]]) const /* = 0; */
+        const ColumnPtr default_values_column [[maybe_unused]]) const /* = 0; */
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED,
                         "Get column not supported", getDictionaryID().getNameForLogs());

From c4ffa2160f05144440fb1dcf350f531e13d74bb0 Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Sat, 23 Jan 2021 16:18:24 +0300
Subject: [PATCH 553/611] Updated interfaces. Added documentation.

---
 src/Core/Block.h                              |   1 +
 src/Dictionaries/CacheDictionary.cpp          | 438 ++++++++++++++----
 src/Dictionaries/CacheDictionary.h            |  24 +-
 src/Dictionaries/CacheDictionary.inc.h        | 368 ---------------
 .../ComplexKeyCacheDictionary.cpp             | 121 ++---
 src/Dictionaries/ComplexKeyCacheDictionary.h  |  20 +-
 .../ComplexKeyDirectDictionary.cpp            | 192 ++------
 src/Dictionaries/ComplexKeyDirectDictionary.h |  18 +-
 .../ComplexKeyHashedDictionary.cpp            | 189 ++------
 src/Dictionaries/ComplexKeyHashedDictionary.h |  20 +-
 src/Dictionaries/DictionaryBlockInputStream.h |  35 +-
 src/Dictionaries/DictionaryHelpers.h          | 142 ++++++
 src/Dictionaries/DirectDictionary.cpp         | 204 ++------
 src/Dictionaries/DirectDictionary.h           |  16 +-
 src/Dictionaries/FlatDictionary.cpp           |  58 +--
 src/Dictionaries/FlatDictionary.h             |  56 +--
 src/Dictionaries/HashedDictionary.cpp         | 138 ++----
 src/Dictionaries/HashedDictionary.h           |  21 +-
 src/Dictionaries/IDictionary.h                |  96 ++--
 src/Dictionaries/IPAddressDictionary.cpp      | 138 ++----
 src/Dictionaries/IPAddressDictionary.h        |  23 +-
 src/Dictionaries/PolygonDictionary.cpp        | 125 ++---
 src/Dictionaries/PolygonDictionary.h          |  15 +-
 src/Dictionaries/RangeHashedDictionary.cpp    | 198 ++------
 src/Dictionaries/RangeHashedDictionary.h      |  21 +-
 src/Dictionaries/SSDCacheDictionary.cpp       | 124 ++---
 src/Dictionaries/SSDCacheDictionary.h         |  41 +-
 .../SSDComplexKeyCacheDictionary.cpp          | 143 ++----
 .../SSDComplexKeyCacheDictionary.h            |  45 +-
 src/Functions/FunctionsExternalDictionaries.h |  22 +-
 30 files changed, 1133 insertions(+), 1919 deletions(-)
 delete mode 100644 src/Dictionaries/CacheDictionary.inc.h
 create mode 100644 src/Dictionaries/DictionaryHelpers.h

diff --git a/src/Core/Block.h b/src/Core/Block.h
index eef3c27363b..f588373aaed 100644
--- a/src/Core/Block.h
+++ b/src/Core/Block.h
@@ -163,6 +163,7 @@ private:
     friend class ActionsDAG;
 };
 
+using BlockPtr = std::shared_ptr<Block>;
 using Blocks = std::vector<Block>;
 using BlocksList = std::list<Block>;
 using BlocksPtr = std::shared_ptr<Blocks>;
diff --git a/src/Dictionaries/CacheDictionary.cpp b/src/Dictionaries/CacheDictionary.cpp
index 5b4690c206e..eac2cd1b41d 100644
--- a/src/Dictionaries/CacheDictionary.cpp
+++ b/src/Dictionaries/CacheDictionary.cpp
@@ -13,9 +13,10 @@
 #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 "CacheDictionary.inc.h"
 #include "DictionaryBlockInputStream.h"
 #include "DictionaryFactory.h"
 #include <Functions/FunctionHelpers.h>
@@ -131,8 +132,8 @@ const IDictionarySource * CacheDictionary::getSource() const
 void CacheDictionary::toParent(const PaddedPODArray<Key> & ids, PaddedPODArray<Key> & out) const
 {
     const auto null_value = std::get<UInt64>(hierarchical_attribute->null_value);
-
-    getItemsNumberImpl<UInt64, UInt64>(*hierarchical_attribute, ids, out, [&](const size_t) { return null_value; });
+    DictionaryDefaultValueExtractor<UInt64> default_value_extractor(null_value);
+    getItemsNumberImpl<UInt64, UInt64>(*hierarchical_attribute, ids, out, default_value_extractor);
 }
 
 
@@ -255,12 +256,13 @@ ColumnPtr CacheDictionary::getColumn(
     const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes &,
-    const ColumnPtr default_untyped) const
+    const ColumnPtr default_values_column) const
 {
     ColumnPtr result;
 
     PaddedPODArray<Key> backup_storage;
-    const auto & ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
+    const auto & keys = getColumnVectorData(this, key_columns.front(), backup_storage);
+    auto keys_size = keys.size();
 
     auto & attribute = getAttribute(attribute_name);
     const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
@@ -269,94 +271,25 @@ ColumnPtr CacheDictionary::getColumn(
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
+        using ValueType = DictionaryValueType<AttributeType>;
+        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
+ 
+        const auto null_value = static_cast<ValueType>(std::get<AttributeType>(attribute.null_value));
+        DictionaryDefaultValueExtractor<ValueType> default_value_extractor(null_value, default_values_column);
 
-        auto identifiers_size = ids.size();
+        auto column = ColumnProvider::getColumn(dictionary_attribute, keys_size);
 
         if constexpr (std::is_same_v<AttributeType, String>)
         {
-            auto column_string = ColumnString::create();
-
-            if (default_untyped != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
-                {
-                    getItemsString(attribute, ids, column_string.get(), [&](const size_t row) { return default_col->getDataAt(row); });
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<String>();
-
-                    getItemsString(attribute, ids, column_string.get(), [&](const size_t) { return StringRef{def}; });
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH}; 
-            }
-            else
-            {
-                const auto null_value = StringRef{std::get<String>(attribute.null_value)};
-
-                getItemsString(attribute, ids, column_string.get(), [&](const size_t) { return null_value; });
-            }
-
-            result = std::move(column_string);
+            getItemsString(attribute, keys, column.get(), default_value_extractor);
         }
         else
         {
-            using ResultColumnType
-                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
-            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
-
-            ResultColumnPtr column;
-
-            if constexpr (IsDecimalNumber<AttributeType>)
-            {
-                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
-                column = ColumnDecimal<AttributeType>::create(identifiers_size, scale);
-            }
-            else if constexpr (IsNumber<AttributeType>)
-                column = ColumnVector<AttributeType>::create(identifiers_size);
-
             auto & out = column->getData();
-
-            if (default_untyped != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
-                {
-                    getItemsNumberImpl<AttributeType, AttributeType>(
-                        attribute,
-                        ids,
-                        out,
-                        [&](const size_t row) { return default_col->getData()[row]; }
-                    );
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<AttributeType>();
-
-                    getItemsNumberImpl<AttributeType, AttributeType>(
-                        attribute,
-                        ids,
-                        out,
-                        [&](const size_t) { return def; }
-                    );
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-            }
-            else
-            {
-                const auto null_value = std::get<AttributeType>(attribute.null_value);
-
-                getItemsNumberImpl<AttributeType, AttributeType>(
-                    attribute,
-                    ids,
-                    out,
-                    [&](const size_t) { return null_value; }
-                );
-            }
-
-            result = std::move(column);
+            getItemsNumberImpl<AttributeType, AttributeType>(attribute, keys, out, default_value_extractor);
         }
+
+        result = std::move(column);
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
@@ -364,6 +297,339 @@ ColumnPtr CacheDictionary::getColumn(
     return result;
 }
 
+template <typename AttributeType, typename OutputType>
+void CacheDictionary::getItemsNumberImpl(
+    Attribute & attribute, 
+    const PaddedPODArray<Key> & ids,
+    ResultArrayType<OutputType> & out,
+    DictionaryDefaultValueExtractor<AttributeType> & 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);
+            }
+        }
+    }
+
+    ProfileEvents::increment(ProfileEvents::DictCacheKeysExpired, cache_expired_cound);
+    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_not_found_count - cache_expired_cound, std::memory_order_release);
+
+    if (!cache_not_found_count)
+    {
+        /// Nothing to update - return
+        if (!cache_expired_cound)
+            return;
+
+        /// 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<StringRef> & 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();
+        }
+        else
+        {
+            for (const auto row : cache_expired_or_not_found_ids[key])
+                total_length += default_value_extractor[row].size + 1;
+        }
+    }
+
+    out->getChars().reserve(total_length);
+
+    for (const auto row : ext::range(0, ext::size(ids)))
+    {
+        const auto id = ids[row];
+        StringRef value;
+
+        /// 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);
+    }
+}
+
+
 template<class... Ts>
 struct Overloaded : Ts... {using Ts::operator()...;};
 
@@ -462,10 +728,10 @@ size_t CacheDictionary::findCellIdxForSet(const Key & id) const
     return oldest_id;
 }
 
-ColumnUInt8::Ptr CacheDictionary::has(const Columns & key_columns, const DataTypes &) const
+ColumnUInt8::Ptr CacheDictionary::hasKeys(const Columns & key_columns, const DataTypes &) const
 {
     PaddedPODArray<Key> backup_storage;
-    const auto& ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
+    const auto& ids = getColumnVectorData(this, key_columns.front(), backup_storage);
 
     auto result = ColumnUInt8::create(ext::size(ids));
     auto& out = result->getData();
diff --git a/src/Dictionaries/CacheDictionary.h b/src/Dictionaries/CacheDictionary.h
index 70bea884ae4..9f0b3fa4f63 100644
--- a/src/Dictionaries/CacheDictionary.h
+++ b/src/Dictionaries/CacheDictionary.h
@@ -21,6 +21,7 @@
 #include "DictionaryStructure.h"
 #include "IDictionary.h"
 #include "IDictionarySource.h"
+#include "DictionaryHelpers.h"
 
 namespace CurrentMetrics
 {
@@ -119,16 +120,16 @@ public:
 
     std::exception_ptr getLastException() const override;
 
-    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::simple; }
+    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_untyped) const override;
+        const ColumnPtr default_values_column) const override;
 
-    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) 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>>;
@@ -203,12 +204,18 @@ private:
     /* 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 DefaultGetter>
+    template <typename AttributeType, typename OutputType>
     void getItemsNumberImpl(
-        Attribute & attribute, const PaddedPODArray<Key> & ids, ResultArrayType<OutputType> & out, DefaultGetter && get_default) const;
+        Attribute & attribute,
+        const PaddedPODArray<Key> & ids,
+        ResultArrayType<OutputType> & out,
+        DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const;
 
-    template <typename DefaultGetter>
-    void getItemsString(Attribute & attribute, const PaddedPODArray<Key> & ids, ColumnString * out, DefaultGetter && get_default) const;
+    void getItemsString(
+        Attribute & attribute,
+        const PaddedPODArray<Key> & ids,
+        ColumnString * out,
+        DictionaryDefaultValueExtractor<StringRef> & default_value_extractor) const;
 
     PaddedPODArray<Key> getCachedIds() const;
 
@@ -399,5 +406,6 @@ private:
     mutable std::condition_variable is_update_finished;
 
     std::atomic<bool> finished{false};
-    };
+};
+
 }
diff --git a/src/Dictionaries/CacheDictionary.inc.h b/src/Dictionaries/CacheDictionary.inc.h
deleted file mode 100644
index 803b3b2566f..00000000000
--- a/src/Dictionaries/CacheDictionary.inc.h
+++ /dev/null
@@ -1,368 +0,0 @@
-#pragma once
-
-#include <stdexcept>
-
-#include "CacheDictionary.h"
-#include <Columns/ColumnsNumber.h>
-#include <Common/ProfilingScopedRWLock.h>
-#include <Common/typeid_cast.h>
-#include <DataStreams/IBlockInputStream.h>
-#include <ext/chrono_io.h>
-#include <ext/map.h>
-#include <ext/range.h>
-#include <ext/size.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;
-}
-
-namespace CurrentMetrics
-{
-extern const Metric DictCacheRequests;
-}
-
-namespace DB
-{
-namespace ErrorCodes
-{
-}
-
-template <typename AttributeType, typename OutputType, typename DefaultGetter>
-void CacheDictionary::getItemsNumberImpl(
-    Attribute & attribute, const PaddedPODArray<Key> & ids, ResultArrayType<OutputType> & out, DefaultGetter && get_default) const
-{
-    /// First fill everything with default values
-    const auto rows = ext::size(ids);
-    for (const auto row : ext::range(0, rows))
-        out[row] = get_default(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);
-            }
-        }
-    }
-
-    ProfileEvents::increment(ProfileEvents::DictCacheKeysExpired, cache_expired_cound);
-    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_not_found_count - cache_expired_cound, std::memory_order_release);
-
-    if (!cache_not_found_count)
-    {
-        /// Nothing to update - return
-        if (!cache_expired_cound)
-            return;
-
-        /// 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]);
-        }
-    }
-}
-
-template <typename DefaultGetter>
-void CacheDictionary::getItemsString(
-    Attribute & attribute, const PaddedPODArray<Key> & ids, ColumnString * out, DefaultGetter && get_default) 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() ? get_default(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() ? get_default(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 = get_default(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();
-        }
-        else
-        {
-            for (const auto row : cache_expired_or_not_found_ids[key])
-                total_length += get_default(row).size + 1;
-        }
-    }
-
-    out->getChars().reserve(total_length);
-
-    for (const auto row : ext::range(0, ext::size(ids)))
-    {
-        const auto id = ids[row];
-        StringRef value;
-
-        /// 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 = get_default(row);
-        }
-
-        out->insertData(value.data, value.size);
-    }
-}
-
-}
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary.cpp b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
index d27a8c1483e..6775f2b737b 100644
--- a/src/Dictionaries/ComplexKeyCacheDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
@@ -76,7 +76,7 @@ ColumnPtr ComplexKeyCacheDictionary::getColumn(
     const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes & key_types,
-    const ColumnPtr default_untyped) const
+    const ColumnPtr default_values_column) const
 {
     dict_struct.validateKeyTypes(key_types);
 
@@ -91,93 +91,26 @@ ColumnPtr ComplexKeyCacheDictionary::getColumn(
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
+        using ValueType = DictionaryValueType<AttributeType>;
+        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>; 
+
+        const auto null_value = ValueType{std::get<AttributeType>(attribute.null_values)};
+        DictionaryDefaultValueExtractor<ValueType> 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 column_string = ColumnString::create();
-            auto * out = column_string.get();
-
-            if (default_untyped != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
-                {
-                    getItemsString(attribute, key_columns, out, [&](const size_t row) { return default_col->getDataAt(row); });
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<String>();
-
-                    getItemsString(attribute, key_columns, out, [&](const size_t) { return StringRef{def}; });
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-            }
-            else
-            {
-                    const auto null_value = StringRef{std::get<String>(attribute.null_values)};
-
-                    getItemsString(attribute, key_columns, out, [&](const size_t) { return null_value; });
-            }
-
-            result = std::move(column_string);
+            auto * out = column.get();
+            getItemsString(attribute, key_columns, out, default_value_extractor);
         }
         else
         {
-            using ResultColumnType
-                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
-            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
-
-            ResultColumnPtr column;
-
-            if constexpr (IsDecimalNumber<AttributeType>)
-            {
-                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
-                column = ColumnDecimal<AttributeType>::create(size, scale);
-            }
-            else if constexpr (IsNumber<AttributeType>)
-                column = ColumnVector<AttributeType>::create(keys_size);
-
             auto & out = column->getData();
-
-            if (default_untyped != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
-                {
-                    getItemsNumberImpl<AttributeType, AttributeType>(
-                        attribute,
-                        key_columns,
-                        out,
-                        [&](const size_t row) { return default_col->getData()[row]; }
-                    );
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<AttributeType>();
-
-                    getItemsNumberImpl<AttributeType, AttributeType>(
-                        attribute,
-                        key_columns,
-                        out,
-                        [&](const size_t) { return def; }
-                    );
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-            }
-            else
-            {
-                const auto null_value = std::get<AttributeType>(attribute.null_values);
-
-                getItemsNumberImpl<AttributeType, AttributeType>(
-                    attribute,
-                    key_columns,
-                    out,
-                    [&](const size_t) { return null_value; }
-                );
-            }
-
-            result = std::move(column);
+            getItemsNumberImpl<AttributeType, AttributeType>(attribute, key_columns, out, default_value_extractor);
         }
+
+        result = std::move(column);
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
@@ -229,7 +162,7 @@ ComplexKeyCacheDictionary::findCellIdx(const StringRef & key, const CellMetadata
     return {oldest_id, false, false};
 }
 
-ColumnUInt8::Ptr ComplexKeyCacheDictionary::has(const Columns & key_columns, const DataTypes & key_types) const
+ColumnUInt8::Ptr ComplexKeyCacheDictionary::hasKeys(const Columns & key_columns, const DataTypes & key_types) const
 {
     dict_struct.validateKeyTypes(key_types);
 
@@ -315,9 +248,12 @@ ColumnUInt8::Ptr ComplexKeyCacheDictionary::has(const Columns & key_columns, con
 }
 
 
-template <typename AttributeType, typename OutputType, typename DefaultGetter>
+template <typename AttributeType, typename OutputType>
 void ComplexKeyCacheDictionary::getItemsNumberImpl(
-    Attribute & attribute, const Columns & key_columns, PaddedPODArray<OutputType> & out, DefaultGetter && get_default) const
+    Attribute & attribute, 
+    const Columns & key_columns,
+    PaddedPODArray<OutputType> & out,
+    DictionaryDefaultValueExtractor<AttributeType> & 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;
@@ -359,7 +295,7 @@ void ComplexKeyCacheDictionary::getItemsNumberImpl(
                 ++cache_hit;
                 const auto & cell_idx = find_result.cell_idx;
                 const auto & cell = cells[cell_idx];
-                out[row] = cell.isDefault() ? get_default(row) : static_cast<OutputType>(attribute_array[cell_idx]);
+                out[row] = cell.isDefault() ? default_value_extractor[row] : static_cast<OutputType>(attribute_array[cell_idx]);
             }
         }
     }
@@ -391,12 +327,15 @@ void ComplexKeyCacheDictionary::getItemsNumberImpl(
         [&](const StringRef key, const size_t)
         {
             for (const auto row : outdated_keys[key])
-                out[row] = get_default(row);
+                out[row] = default_value_extractor[row];
         });
 }
 
-template <typename DefaultGetter>
-void ComplexKeyCacheDictionary::getItemsString(Attribute & attribute, const Columns & key_columns, ColumnString * out, DefaultGetter && get_default) const
+void ComplexKeyCacheDictionary::getItemsString(
+    Attribute & attribute,
+    const Columns & key_columns,
+    ColumnString * out,
+    DictionaryDefaultValueExtractor<StringRef> & default_value_extractor) const
 {
     const auto rows_num = key_columns.front()->size();
     /// save on some allocations
@@ -431,7 +370,7 @@ void ComplexKeyCacheDictionary::getItemsString(Attribute & attribute, const Colu
             {
                 const auto & cell_idx = find_result.cell_idx;
                 const auto & cell = cells[cell_idx];
-                const auto string_ref = cell.isDefault() ? get_default(row) : attribute_array[cell_idx];
+                const auto string_ref = cell.isDefault() ? default_value_extractor[row] : attribute_array[cell_idx];
                 out->insertData(string_ref.data, string_ref.size);
             }
         }
@@ -480,7 +419,7 @@ void ComplexKeyCacheDictionary::getItemsString(Attribute & attribute, const Colu
                 ++cache_hit;
                 const auto & cell_idx = find_result.cell_idx;
                 const auto & cell = cells[cell_idx];
-                const auto string_ref = cell.isDefault() ? get_default(row) : attribute_array[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);
@@ -524,7 +463,7 @@ void ComplexKeyCacheDictionary::getItemsString(Attribute & attribute, const Colu
             [&](const StringRef key, const size_t)
             {
                 for (const auto row : outdated_keys[key])
-                    total_length += get_default(row).size + 1;
+                    total_length += default_value_extractor[row].size + 1;
             });
     }
 
@@ -534,7 +473,7 @@ void ComplexKeyCacheDictionary::getItemsString(Attribute & attribute, const Colu
     {
         const StringRef key = keys_array[row];
         const auto it = map.find(key);
-        const auto string_ref = it ? it->getMapped() : get_default(row);
+        const auto string_ref = it ? it->getMapped() : default_value_extractor[row];
         out->insertData(string_ref.data, string_ref.size);
     }
 }
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary.h b/src/Dictionaries/ComplexKeyCacheDictionary.h
index 45719171478..de6fb508e5a 100644
--- a/src/Dictionaries/ComplexKeyCacheDictionary.h
+++ b/src/Dictionaries/ComplexKeyCacheDictionary.h
@@ -23,7 +23,7 @@
 #include "IDictionary.h"
 #include "IDictionarySource.h"
 #include <DataStreams/IBlockInputStream.h>
-
+#include "DictionaryHelpers.h"
 
 namespace ProfileEvents
 {
@@ -89,7 +89,7 @@ public:
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
     }
 
-    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::complex; }
+    DictionaryKeyType getKeyType() const override { return DictionaryKeyType::complex; }
 
     ColumnPtr getColumn(
         const std::string& attribute_name,
@@ -98,7 +98,7 @@ public:
         const DataTypes & key_types,
         const ColumnPtr default_untyped) const override;
 
-    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) 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;
 
@@ -175,12 +175,18 @@ private:
 
     Attribute createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value);
 
-    template <typename AttributeType, typename OutputType, typename DefaultGetter>
+    template <typename AttributeType, typename OutputType>
     void getItemsNumberImpl(
-        Attribute & attribute, const Columns & key_columns, PaddedPODArray<OutputType> & out, DefaultGetter && get_default) const;
+        Attribute & attribute,
+        const Columns & key_columns,
+        PaddedPODArray<OutputType> & out,
+        DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const;
 
-    template <typename DefaultGetter>
-    void getItemsString(Attribute & attribute, const Columns & key_columns, ColumnString * out, DefaultGetter && get_default) const;
+    void getItemsString(
+        Attribute & attribute,
+        const Columns & key_columns,
+        ColumnString * out,
+        DictionaryDefaultValueExtractor<StringRef> & default_value_extractor) const;
 
     template <typename PresentKeyHandler, typename AbsentKeyHandler>
     void update(
diff --git a/src/Dictionaries/ComplexKeyDirectDictionary.cpp b/src/Dictionaries/ComplexKeyDirectDictionary.cpp
index e719c247279..6186b8b7dae 100644
--- a/src/Dictionaries/ComplexKeyDirectDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyDirectDictionary.cpp
@@ -39,7 +39,7 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
     const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes & key_types,
-    const ColumnPtr default_untyped) const
+    const ColumnPtr default_values_column) const
 {
     dict_struct.validateKeyTypes(key_types);
 
@@ -48,13 +48,13 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
     const auto & attribute = getAttribute(attribute_name);
     const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
 
-    auto size = key_columns.front()->size();
+    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(size, false);
+        col_null_map_to = ColumnUInt8::create(keys_size, false);
         vec_null_map_to = &col_null_map_to->getData();
     }
 
@@ -62,160 +62,49 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
+        using ValueType = DictionaryValueType<AttributeType>;
+        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
+ 
+        const auto null_value = std::get<ValueType>(attribute.null_values);
+        DictionaryDefaultValueExtractor<ValueType> 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 column_string = ColumnString::create();
-            auto * out = column_string.get();
+            auto * out = column.get();
 
-            if (default_untyped != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+            getItemsImpl<String, String>(
+                attribute,
+                key_columns,
+                [&](const size_t row, const String value, bool is_null)
                 {
-                    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;
-                            }
+                    if (attribute.is_nullable)
+                        (*vec_null_map_to)[row] = is_null;
 
-                            const auto ref = StringRef{value};
-                            out->insertData(ref.data, ref.size);
-                        },
-                        [&](const size_t row)
-                        {
-                            const auto ref = default_col->getDataAt(row);
-                            return String(ref.data, ref.size);
-                        });
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<String>();
-
-                    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);
-                        },
-                        [&](const size_t) { return def; });
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-            }
-            else
-            {
-                const auto & null_value = std::get<StringRef>(attribute.null_values);
-
-                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);
-                    },
-                    [&](const size_t) { return String(null_value.data, null_value.size); });
-            }
-
-            result = std::move(column_string);
+                    const auto ref = StringRef{value};
+                    out->insertData(ref.data, ref.size);
+                },
+                default_value_extractor);
         }
         else
         {
-            using ResultColumnType
-                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
-            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
-
-            ResultColumnPtr column;
-
-            if constexpr (IsDecimalNumber<AttributeType>)
-            {
-                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
-                column = ColumnDecimal<AttributeType>::create(size, scale);
-            }
-            else if constexpr (IsNumber<AttributeType>)
-                column = ColumnVector<AttributeType>::create(size);
-
             auto & out = column->getData();
 
-            if (default_untyped != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
-                {
-                    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;
-                            }
+            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;
-                        },
-                        [&](const size_t row) { return default_col->getData()[row]; }
-                    );
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<AttributeType>();
-
-                    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;
-                        },
-                        [&](const size_t) { return def; }
-                    );
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-            }
-            else
-            {
-                const auto null_value = std::get<AttributeType>(attribute.null_values);
-
-                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;
-                    },
-                    [&](const size_t) { return null_value; }
-                );
-            }
-
-            result = std::move(column);
+                    out[row] = value;
+                },
+                default_value_extractor);
         }
+
+
+        result = std::move(column);
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
@@ -228,7 +117,7 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
     return result;
 }
 
-ColumnUInt8::Ptr ComplexKeyDirectDictionary::has(const Columns & key_columns, const DataTypes & key_types) const
+ColumnUInt8::Ptr ComplexKeyDirectDictionary::hasKeys(const Columns & key_columns, const DataTypes & key_types) const
 {
     dict_struct.validateKeyTypes(key_types);
 
@@ -384,9 +273,12 @@ StringRef ComplexKeyDirectDictionary::placeKeysInPool(
 }
 
 
-template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
+template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
 void ComplexKeyDirectDictionary::getItemsImpl(
-    const Attribute & attribute, const Columns & key_columns, ValueSetter && set_value, DefaultGetter && get_default) const
+    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();
@@ -401,7 +293,7 @@ void ComplexKeyDirectDictionary::getItemsImpl(
     {
         const StringRef key = placeKeysInPool(row, key_columns, keys_array, *dict_struct.key, temporary_keys_pool);
         keys[row] = key;
-        value_by_key[key] = get_default(row);
+        value_by_key[key] = static_cast<AttributeType>(default_value_extractor[row]);
         to_load[row] = row;
         value_is_null[key] = false;
     }
@@ -443,13 +335,9 @@ void ComplexKeyDirectDictionary::getItemsImpl(
                     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>>());
-                    }
                 }
             }
         }
diff --git a/src/Dictionaries/ComplexKeyDirectDictionary.h b/src/Dictionaries/ComplexKeyDirectDictionary.h
index fddf34694ba..11158b23c5a 100644
--- a/src/Dictionaries/ComplexKeyDirectDictionary.h
+++ b/src/Dictionaries/ComplexKeyDirectDictionary.h
@@ -12,14 +12,13 @@
 #include <ext/range.h>
 #include <ext/size.h>
 #include <ext/map.h>
-#include "DictionaryStructure.h"
 #include "IDictionary.h"
 #include "IDictionarySource.h"
-
+#include "DictionaryStructure.h"
+#include "DictionaryHelpers.h"
 
 namespace DB
 {
-using BlockPtr = std::shared_ptr<Block>;
 
 class ComplexKeyDirectDictionary final : public IDictionaryBase
 {
@@ -60,16 +59,16 @@ public:
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
     }
 
-    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::complex; }
+    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_untyped) const override;
+        const ColumnPtr default_values_column) const override;
 
-    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) 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;
 
@@ -117,9 +116,12 @@ private:
     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 DefaultGetter>
+    template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
     void getItemsImpl(
-        const Attribute & attribute, const Columns & key_columns, ValueSetter && set_value, DefaultGetter && get_default) const;
+        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);
diff --git a/src/Dictionaries/ComplexKeyHashedDictionary.cpp b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
index 3d48638a1b2..76eaad1dcbc 100644
--- a/src/Dictionaries/ComplexKeyHashedDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
@@ -41,7 +41,7 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
     const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes & key_types,
-    const ColumnPtr default_untyped) const
+    const ColumnPtr default_values_column) const
 {
     dict_struct.validateKeyTypes(key_types);
 
@@ -50,13 +50,13 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
     const auto & attribute = getAttribute(attribute_name);
     const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
 
-    auto size = key_columns.front()->size();
+    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(size, false);
+        col_null_map_to = ColumnUInt8::create(keys_size, false);
         vec_null_map_to = &col_null_map_to->getData();
     }
 
@@ -64,152 +64,48 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
+        using ValueType = DictionaryValueType<AttributeType>;
+        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>; 
+
+        const auto null_value = std::get<ValueType>(attribute.null_values);
+        DictionaryDefaultValueExtractor<ValueType> 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 column_string = ColumnString::create();
-            auto * out = column_string.get();
+            auto * out = column.get();
 
-            if (default_untyped != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+            getItemsImpl<StringRef, StringRef>(
+                attribute,
+                key_columns,
+                [&](const size_t row, const StringRef value, bool is_null)
                 {
-                    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;
-                            }
+                    if (attribute.is_nullable)
+                        (*vec_null_map_to)[row] = is_null;
 
-                            out->insertData(value.data, value.size);
-                        },
-                        [&](const size_t row) { return default_col->getDataAt(row); });
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<String>();
-
-                    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);
-                        },
-                        [&](const size_t) { return def; });
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-            }
-            else
-            {
-                const auto & null_value = std::get<StringRef>(attribute.null_values);
-
-                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);
-                    },
-                    [&](const size_t) { return null_value; });
-            }
-
-            result = std::move(column_string);
+                    out->insertData(value.data, value.size);
+                },
+                default_value_extractor);
         }
         else
         {
-            using ResultColumnType
-                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
-            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
-
-            ResultColumnPtr column;
-
-            if constexpr (IsDecimalNumber<AttributeType>)
-            {
-                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
-                column = ColumnDecimal<AttributeType>::create(size, scale);
-            }
-            else if constexpr (IsNumber<AttributeType>)
-                column = ColumnVector<AttributeType>::create(size);
-
             auto & out = column->getData();
 
-            if (default_untyped != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
+            getItemsImpl<AttributeType, AttributeType>(
+                attribute,
+                key_columns,
+                [&](const size_t row, const auto value, bool is_null)
                 {
-                    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;
-                            }
+                    if (attribute.is_nullable)
+                        (*vec_null_map_to)[row] = is_null;
 
-                            out[row] = value;
-                        },
-                        [&](const size_t row) { return default_col->getData()[row]; }
-                    );
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<AttributeType>();
-
-                    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;
-                        },
-                        [&](const size_t) { return def; }
-                    );
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-            }
-            else
-            {
-                const auto null_value = std::get<AttributeType>(attribute.null_values);
-
-                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;
-                    },
-                    [&](const size_t) { return null_value; });
-            }
-
-            result = std::move(column);
+                    out[row] = value;
+                },
+                default_value_extractor);
         }
+
+        result = std::move(column);
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
@@ -222,7 +118,7 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
     return result;
 }
 
-ColumnUInt8::Ptr ComplexKeyHashedDictionary::has(const Columns & key_columns, const DataTypes & key_types) const
+ColumnUInt8::Ptr ComplexKeyHashedDictionary::hasKeys(const Columns & key_columns, const DataTypes & key_types) const
 {
     dict_struct.validateKeyTypes(key_types);
 
@@ -236,15 +132,9 @@ ColumnUInt8::Ptr ComplexKeyHashedDictionary::has(const Columns & key_columns, co
     {
         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>)
-        {
-            has<StringRef>(attribute, key_columns, out);
-        }
-        else
-        {
-            has<AttributeType>(attribute, key_columns, out);
-        }
+        has<ValueType>(attribute, key_columns, out);
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
@@ -480,9 +370,12 @@ ComplexKeyHashedDictionary::createAttribute(const DictionaryAttribute & attribut
 }
 
 
-template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
+template <typename AttributeType, typename OutputType, typename ValueSetter>
 void ComplexKeyHashedDictionary::getItemsImpl(
-    const Attribute & attribute, const Columns & key_columns, ValueSetter && set_value, DefaultGetter && get_default) const
+    const Attribute & attribute,
+    const Columns & key_columns,
+    ValueSetter && set_value,
+    DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const
 {
     const auto & attr = std::get<ContainerType<AttributeType>>(attribute.maps);
 
@@ -505,9 +398,9 @@ void ComplexKeyHashedDictionary::getItemsImpl(
         else
         {
             if (attribute.is_nullable && attribute.nullable_set->find(key) != nullptr)
-                set_value(i, get_default(i), true);
+                set_value(i, default_value_extractor[i], true);
             else
-                set_value(i, get_default(i), false);
+                set_value(i, default_value_extractor[i], false);
         }
 
         /// free memory allocated for the key
diff --git a/src/Dictionaries/ComplexKeyHashedDictionary.h b/src/Dictionaries/ComplexKeyHashedDictionary.h
index a21ad223f19..63458c3c759 100644
--- a/src/Dictionaries/ComplexKeyHashedDictionary.h
+++ b/src/Dictionaries/ComplexKeyHashedDictionary.h
@@ -11,14 +11,13 @@
 #include <Core/Block.h>
 #include <common/StringRef.h>
 #include <ext/range.h>
-#include "DictionaryStructure.h"
 #include "IDictionary.h"
 #include "IDictionarySource.h"
-
+#include "DictionaryStructure.h"
+#include "DictionaryHelpers.h"
 
 namespace DB
 {
-using BlockPtr = std::shared_ptr<Block>;
 
 class ComplexKeyHashedDictionary final : public IDictionaryBase
 {
@@ -61,16 +60,16 @@ public:
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
     }
 
-    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::complex; }
+    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_untyped) const override;
+        const ColumnPtr default_values_column) const override;
 
-    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) 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;
 
@@ -141,9 +140,12 @@ private:
 
     Attribute createAttribute(const DictionaryAttribute & attribute, const Field & null_value);
 
-    template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
-    void
-    getItemsImpl(const Attribute & attribute, const Columns & key_columns, ValueSetter && set_value, DefaultGetter && get_default) const;
+    template <typename AttributeType, typename OutputType, typename ValueSetter>
+    void getItemsImpl(
+        const Attribute & attribute,
+        const Columns & key_columns,
+        ValueSetter && set_value,
+        DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const;
 
     template <typename T>
     bool setAttributeValueImpl(Attribute & attribute, const StringRef key, const T value);
diff --git a/src/Dictionaries/DictionaryBlockInputStream.h b/src/Dictionaries/DictionaryBlockInputStream.h
index 8361c01a75f..b5ab19acb6f 100644
--- a/src/Dictionaries/DictionaryBlockInputStream.h
+++ b/src/Dictionaries/DictionaryBlockInputStream.h
@@ -79,14 +79,14 @@ private:
     GetColumnsFunction get_key_columns_function;
     GetColumnsFunction get_view_columns_function;
 
-    enum class DictionaryKeyType
+    enum class DictionaryInputStreamKeyType
     {
         Id,
         ComplexKey,
         Callback
     };
 
-    DictionaryKeyType key_type;
+    DictionaryInputStreamKeyType key_type;
 };
 
 
@@ -97,7 +97,7 @@ DictionaryBlockInputStream<Key>::DictionaryBlockInputStream(
     , dictionary(dictionary_)
     , column_names(column_names_)
     , ids(std::move(ids_))
-    , key_type(DictionaryKeyType::Id)
+    , key_type(DictionaryInputStreamKeyType::Id)
 {
 }
 
@@ -110,7 +110,7 @@ DictionaryBlockInputStream<Key>::DictionaryBlockInputStream(
     : DictionaryBlockInputStreamBase(keys.size(), max_block_size_)
     , dictionary(dictionary_)
     , column_names(column_names_)
-    , key_type(DictionaryKeyType::ComplexKey)
+    , key_type(DictionaryInputStreamKeyType::ComplexKey)
 {
     const DictionaryStructure & dictionary_structure = dictionary->getStructure();
     fillKeyColumns(keys, 0, keys.size(), dictionary_structure, key_columns);
@@ -130,7 +130,7 @@ DictionaryBlockInputStream<Key>::DictionaryBlockInputStream(
     , 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(DictionaryKeyType::Callback)
+    , key_type(DictionaryInputStreamKeyType::Callback)
 {
 }
 
@@ -141,7 +141,7 @@ Block DictionaryBlockInputStream<Key>::getBlock(size_t start, size_t length) con
     /// TODO: Rewrite
     switch (key_type)
     {
-        case DictionaryKeyType::ComplexKey:
+        case DictionaryInputStreamKeyType::ComplexKey:
         {
             Columns columns;
             ColumnsWithTypeAndName view_columns;
@@ -155,13 +155,13 @@ Block DictionaryBlockInputStream<Key>::getBlock(size_t start, size_t length) con
             return fillBlock({}, columns, {}, std::move(view_columns));
         }
 
-        case DictionaryKeyType::Id:
+        case DictionaryInputStreamKeyType::Id:
         {
             PaddedPODArray<Key> ids_to_fill(ids.begin() + start, ids.begin() + start + length);
             return fillBlock(ids_to_fill, {}, {}, {});
         }
 
-        case DictionaryKeyType::Callback:
+        case DictionaryInputStreamKeyType::Callback:
         {
             Columns columns;
             columns.reserve(data_columns.size());
@@ -182,7 +182,7 @@ Block DictionaryBlockInputStream<Key>::getBlock(size_t start, size_t length) con
         }
     }
 
-    throw Exception("Unexpected DictionaryKeyType.", ErrorCodes::LOGICAL_ERROR);
+    throw Exception("Unexpected DictionaryInputStreamKeyType.", ErrorCodes::LOGICAL_ERROR);
 }
 
 template <typename Key>
@@ -212,8 +212,7 @@ Block DictionaryBlockInputStream<Key>::fillBlock(
         block_columns.emplace_back(ids_column, std::make_shared<DataTypeUInt64>(), structure.id->name);
     }
 
-    /// TODO: This can be optimized
-    auto dictionary_identifier_type = dictionary->getIdentifierType();
+    auto dictionary_key_type = dictionary->getKeyType();
 
     for (const auto idx : ext::range(0, structure.attributes.size()))
     {
@@ -222,15 +221,23 @@ Block DictionaryBlockInputStream<Key>::fillBlock(
         {
             ColumnPtr column;
 
-            if (dictionary_identifier_type == DictionaryIdentifierType::simple)
+            if (dictionary_key_type == DictionaryKeyType::simple)
             {
                 column = dictionary->getColumn(
-                    attribute.name, attribute.type, {ids_column}, {std::make_shared<DataTypeUInt64>()}, nullptr /* default_untyped*/);
+                    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_untyped*/);
+                    attribute.name, 
+                    attribute.type,
+                    keys,
+                    data_types,
+                    nullptr /* default_values_column*/);
             }
 
             block_columns.emplace_back(column, attribute.type, attribute.name);
diff --git a/src/Dictionaries/DictionaryHelpers.h b/src/Dictionaries/DictionaryHelpers.h
new file mode 100644
index 00000000000..001a2a804b7
--- /dev/null
+++ b/src/Dictionaries/DictionaryHelpers.h
@@ -0,0 +1,142 @@
+#pragma once
+
+#include <Columns/IColumn.h>
+#include <Columns/ColumnDecimal.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnVector.h>
+#include <DataTypes/DataTypesDecimal.h>
+#include "DictionaryStructure.h"
+
+namespace DB
+{
+
+/**
+ * In Dictionaries implementation String attribute is stored in arena and StringRefs are pointing to it.
+ */
+template <typename DictionaryAttributeType>
+using DictionaryValueType = 
+    std::conditional_t<std::is_same_v<DictionaryAttributeType, String>, StringRef, DictionaryAttributeType>;
+
+/**
+ * Used to create column with right type for DictionaryAttributeType.
+ */
+template <typename DictionaryAttributeType>
+class DictionaryAttributeColumnProvider
+{
+public:
+    using ColumnType = 
+        std::conditional_t<std::is_same_v<DictionaryAttributeType, String>, ColumnString,
+            std::conditional_t<IsDecimalNumber<DictionaryAttributeType>, ColumnDecimal<DictionaryAttributeType>, 
+                ColumnVector<DictionaryAttributeType>>>;
+
+    using ColumnPtr = typename ColumnType::MutablePtr;
+
+    static ColumnPtr getColumn(const DictionaryAttribute & dictionary_attribute, size_t size)
+    {
+        if constexpr (std::is_same_v<DictionaryAttributeType, String>)
+        {
+            return ColumnType::create();
+        }
+        if constexpr (IsDecimalNumber<DictionaryAttributeType>)
+        {
+            auto scale = getDecimalScale(*dictionary_attribute.nested_type);
+            return ColumnType::create(size, scale);
+        }
+        else if constexpr (IsNumber<DictionaryAttributeType>)
+            return ColumnType::create(size);
+        else
+            throw Exception{"Unsupported attribute type.", ErrorCodes::TYPE_MISMATCH};
+    }
+};
+
+/**
+ * DictionaryDefaultValueExtractor used to simplify getting default value for IDictionary function `getColumn`.
+ * Provides interface for getting default value with operator[];
+ * 
+ * If default_values_column is not null in constructor than this column values will be used as default values.
+ * If default_values_column is null then attribute_default_value will be used.
+ */
+template <typename DefaultValueType>
+class DictionaryDefaultValueExtractor
+{
+    using ResultColumnType = 
+        std::conditional_t< std::is_same_v<DefaultValueType, StringRef>, ColumnString,
+            std::conditional_t<IsDecimalNumber<DefaultValueType>, ColumnDecimal<DefaultValueType>,
+                ColumnVector<DefaultValueType>>>;
+
+public:
+    DictionaryDefaultValueExtractor(DefaultValueType attribute_default_value, ColumnPtr default_values_column_ = nullptr)
+    {
+        if (default_values_column_ != nullptr)
+        {
+            if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_values_column))
+            {
+                default_values_column = default_col;
+            }
+            else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_values_column_.get()))
+            {
+                /// TODO: Check String lifetime safety
+                /// DefaultValueType for StringColumn is StringRef, but const column getValue will return String
+                using ConstColumnValue = std::conditional_t<std::is_same_v<DefaultValueType, StringRef>, String, DefaultValueType>;
+                default_value = std::make_optional<DefaultValueType>(default_col_const->template getValue<ConstColumnValue>());
+            }
+            else
+                throw Exception{"Type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
+        }
+        else
+            default_value = std::make_optional<DefaultValueType>(attribute_default_value);
+    }
+
+    DefaultValueType operator[](size_t row)
+    {
+        if (default_value)
+            return *default_value;
+        
+        if constexpr (std::is_same_v<ResultColumnType, ColumnString>)
+            return default_values_column->getDataAt(row);
+        else
+            return default_values_column->getData()[row];
+    }
+private:
+    const ResultColumnType * default_values_column = nullptr;
+    std::optional<DefaultValueType> default_value = {};
+};
+
+/**
+ * Returns ColumnVector data as PaddedPodArray. 
+ * 
+ * If column is constant parameter backup_storage is used to store values.
+ */
+template <typename T>
+static const PaddedPODArray<T> & getColumnVectorData(
+    const IDictionaryBase * dictionary [[maybe_unused]],
+    const ColumnPtr column,
+    PaddedPODArray<T> & backup_storage)
+{
+    bool is_const_column = isColumnConst(*column);
+    auto full_column = column->convertToFullColumnIfConst();
+    auto vector_col = checkAndGetColumn<ColumnVector<T>>(full_column.get());
+
+    if (!vector_col)
+    {
+        throw Exception{ErrorCodes::TYPE_MISMATCH,
+            "{}: type mismatch: column has wrong type expected {}",
+            dictionary->getDictionaryID().getNameForLogs(),
+            TypeName<T>::get()};
+    }
+
+    if (is_const_column)
+    {
+        // With type conversion and const columns we need to use backup storage here
+        auto & data = vector_col->getData();
+        backup_storage.assign(data);
+
+        return backup_storage;
+    }
+    else
+    {
+        return vector_col->getData();
+    }
+}
+
+}
diff --git a/src/Dictionaries/DirectDictionary.cpp b/src/Dictionaries/DirectDictionary.cpp
index 5f556aa2057..0d767f322f7 100644
--- a/src/Dictionaries/DirectDictionary.cpp
+++ b/src/Dictionaries/DirectDictionary.cpp
@@ -6,6 +6,7 @@
 #include <Functions/FunctionHelpers.h>
 #include <Columns/ColumnNullable.h>
 #include <DataTypes/DataTypesDecimal.h>
+#include <Common/HashTable/HashSet.h>
 
 namespace DB
 {
@@ -37,11 +38,13 @@ DirectDictionary::DirectDictionary(
 void DirectDictionary::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, bool) { out[row] = value; },
-        [&](const size_t) { return null_value; });
+        extractor);
 }
 
 
@@ -135,22 +138,22 @@ ColumnPtr DirectDictionary::getColumn(
         const DataTypePtr & result_type,
         const Columns & key_columns,
         const DataTypes &,
-        const ColumnPtr default_untyped) const
+        const ColumnPtr default_values_column) const
 {
     ColumnPtr result;
 
     PaddedPODArray<Key> backup_storage;
-    const auto & ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
+    const auto & ids = getColumnVectorData(this, key_columns.front(), backup_storage);
 
     const auto & attribute = getAttribute(attribute_name);
 
-    auto size = ids.size();
+    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(size, false);
+        col_null_map_to = ColumnUInt8::create(keys_size, false);
         vec_null_map_to = &col_null_map_to->getData();
     }
 
@@ -161,160 +164,49 @@ ColumnPtr DirectDictionary::getColumn(
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
 
+        using ValueType = DictionaryValueType<AttributeType>;
+        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
+ 
+        const auto null_value = std::get<ValueType>(attribute.null_values);
+        DictionaryDefaultValueExtractor<ValueType> 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 column_string = ColumnString::create();
-            auto * out = column_string.get();
+            auto * out = column.get();
 
-            if (default_untyped != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
+            getItemsImpl<String, String>(
+                attribute,
+                ids,
+                [&](const size_t row, const String value, bool is_null)
                 {
-                    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;
-                            }
+                    if (attribute.is_nullable)
+                        (*vec_null_map_to)[row] = is_null;
 
-                            const auto ref = StringRef{value};
-                            out->insertData(ref.data, ref.size);
-                        },
-                        [&](const size_t row)
-                        {
-                            const auto ref = default_col->getDataAt(row);
-                            return String(ref.data, ref.size);
-                        });
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<String>();
-
-                    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);
-                        },
-                        [&](const size_t) { return def; });
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-
-            }
-            else
-            {
-                const auto & null_value = std::get<StringRef>(attribute.null_values);
-
-                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);
-                    },
-                    [&](const size_t) { return String(null_value.data, null_value.size); });
-            }
-
-            result = std::move(column_string);
+                    const auto ref = StringRef{value};
+                    out->insertData(ref.data, ref.size);
+                },
+                default_value_extractor);
         }
         else
         {
-            using ResultColumnType
-                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
-            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
-
-            ResultColumnPtr column;
-
-            if constexpr (IsDecimalNumber<AttributeType>)
-            {
-                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
-                column = ColumnDecimal<AttributeType>::create(size, scale);
-            }
-            else if constexpr (IsNumber<AttributeType>)
-                column = ColumnVector<AttributeType>::create(size);
-
             auto & out = column->getData();
 
-            if (default_untyped != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
+            getItemsImpl<AttributeType, AttributeType>(
+                attribute,
+                ids,
+                [&](const size_t row, const auto value, bool is_null)
                 {
-                    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;
-                            }
+                    if (attribute.is_nullable)
+                        (*vec_null_map_to)[row] = is_null;
 
-                            out[row] = value;
-                        },
-                        [&](const size_t row) { return default_col->getData()[row]; }
-                    );
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<AttributeType>();
-
-                    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;
-                        },
-                        [&](const size_t) { return def; }
-                    );
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-            }
-            else
-            {
-                const auto null_value = std::get<AttributeType>(attribute.null_values);
-
-                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;
-                    },
-                    [&](const size_t) { return null_value; }
-                );
-            }
-
-            result = std::move(column);
+                    out[row] = value;
+                },
+                default_value_extractor);
         }
+
+        result = std::move(column);
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
@@ -327,10 +219,10 @@ ColumnPtr DirectDictionary::getColumn(
     return result;
 }
 
-ColumnUInt8::Ptr DirectDictionary::has(const Columns & key_columns, const DataTypes &) const
+ColumnUInt8::Ptr DirectDictionary::hasKeys(const Columns & key_columns, const DataTypes &) const
 {
     PaddedPODArray<Key> backup_storage;
-    const auto& ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
+    const auto& ids = getColumnVectorData(this, key_columns.front(), backup_storage);
 
     auto result = ColumnUInt8::create(ext::size(ids));
     auto& out = result->getData();
@@ -425,20 +317,22 @@ DirectDictionary::Attribute DirectDictionary::createAttribute(const DictionaryAt
 }
 
 
-template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
+template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
 void DirectDictionary::getItemsImpl(
-    const Attribute & attribute, const PaddedPODArray<Key> & ids, ValueSetter && set_value, DefaultGetter && get_default) const
+    const Attribute & attribute,
+    const PaddedPODArray<Key> & ids,
+    ValueSetter && set_value,
+    DefaultValueExtractor & default_value_extractor) const
 {
     const auto rows = ext::size(ids);
 
     HashMap<Key, OutputType> value_by_key;
-    HashMap<Key, bool> value_is_null;
+    HashSet<Key> value_is_null;
 
     for (const auto row : ext::range(0, rows))
     {
         auto key = ids[row];
-        value_by_key[key] = get_default(row);
-        value_is_null[key] = false;
+        value_by_key[key] = static_cast<AttributeType>(default_value_extractor[row]);
     }
 
     std::vector<Key> to_load;
@@ -470,7 +364,7 @@ void DirectDictionary::getItemsImpl(
                 auto value = attribute_column[row_idx];
 
                 if (value.isNull())
-                    value_is_null[key] = true;
+                    value_is_null.insert(key);
                 else
                     value_by_key[key] = static_cast<OutputType>(value.get<NearestFieldType<AttributeType>>());
             }
@@ -482,7 +376,7 @@ void DirectDictionary::getItemsImpl(
     for (const auto row : ext::range(0, rows))
     {
         auto key = ids[row];
-        set_value(row, value_by_key[key], value_is_null[key]);
+        set_value(row, value_by_key[key], value_is_null.find(key) != nullptr);
     }
 
     query_count.fetch_add(rows, std::memory_order_relaxed);
diff --git a/src/Dictionaries/DirectDictionary.h b/src/Dictionaries/DirectDictionary.h
index dcfea296778..9daa8415de8 100644
--- a/src/Dictionaries/DirectDictionary.h
+++ b/src/Dictionaries/DirectDictionary.h
@@ -13,11 +13,10 @@
 #include "DictionaryStructure.h"
 #include "IDictionary.h"
 #include "IDictionarySource.h"
-
+#include "DictionaryHelpers.h"
 
 namespace DB
 {
-using BlockPtr = std::shared_ptr<Block>;
 
 class DirectDictionary final : public IDictionary
 {
@@ -65,16 +64,16 @@ public:
     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;
 
-    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::simple; }
+    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_untyped) const override;
+        const ColumnPtr default_values_column) const override;
 
-    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) 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;
 
@@ -114,9 +113,12 @@ private:
 
     Attribute createAttribute(const DictionaryAttribute& attribute, const Field & null_value, const std::string & name);
 
-    template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
+    template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
     void getItemsImpl(
-        const Attribute & attribute, const PaddedPODArray<Key> & ids, ValueSetter && set_value, DefaultGetter && get_default) const;
+        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);
diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index 307b231071e..3f6dad9a20d 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -49,7 +49,7 @@ FlatDictionary::FlatDictionary(
 void FlatDictionary::toParent(const PaddedPODArray<Key> & ids, PaddedPODArray<Key> & out) const
 {
     const auto null_value = std::get<UInt64>(hierarchical_attribute->null_values);
-    DefaultValueExtractor<UInt64> extractor(null_value, nullptr);
+    DictionaryDefaultValueExtractor<UInt64> extractor(null_value);
 
     getItemsImpl<UInt64, UInt64>(
         *hierarchical_attribute,
@@ -118,7 +118,7 @@ ColumnPtr FlatDictionary::getColumn(
     ColumnPtr result;
 
     PaddedPODArray<Key> backup_storage;
-    const auto & ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
+    const auto & ids = getColumnVectorData(this, key_columns.front(), backup_storage);
 
     auto size = ids.size();
 
@@ -129,52 +129,36 @@ ColumnPtr FlatDictionary::getColumn(
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
+        using ValueType = DictionaryValueType<AttributeType>;
+        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
+        
+        const auto null_value = std::get<ValueType>(attribute.null_values);
+        DictionaryDefaultValueExtractor<ValueType> default_value_extractor(null_value, default_values_column);
 
-        if constexpr (std::is_same_v<AttributeType, String>)
+        auto column = ColumnProvider::getColumn(dictionary_attribute, size);
+
+        if constexpr (std::is_same_v<ValueType, StringRef>)
         {
-            auto column_string = ColumnString::create();
-            auto * out = column_string.get();
+            auto * out = column.get();
 
-            const auto & null_value = std::get<StringRef>(attribute.null_values);
-            DefaultValueExtractor<StringRef> extractor(null_value, default_values_column);
-
-            getItemsImpl<StringRef, StringRef>(
+            getItemsImpl<ValueType, ValueType>(
                 attribute,
                 ids,
                 [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-                extractor);
-
-            result = std::move(column_string);
+                default_value_extractor);
         }
         else
         {
-            using ResultColumnType
-                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
-            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
-
-            ResultColumnPtr column;
-
-            if constexpr (IsDecimalNumber<AttributeType>)
-            {
-                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
-                column = ColumnDecimal<AttributeType>::create(size, scale);
-            }
-            else if constexpr (IsNumber<AttributeType>)
-                column = ColumnVector<AttributeType>::create(size);
-
             auto & out = column->getData();
 
-            const auto null_value = std::get<AttributeType>(attribute.null_values);
-            DefaultValueExtractor<AttributeType> extractor(null_value, default_values_column);
-
-            getItemsImpl<AttributeType, AttributeType>(
-                attribute, 
+            getItemsImpl<ValueType, ValueType>(
+                attribute,
                 ids, 
                 [&](const size_t row, const auto value) { out[row] = value; },
-                extractor);
-
-            result = std::move(column);
+                default_value_extractor);
         }
+
+        result = std::move(column);
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
@@ -199,10 +183,10 @@ ColumnPtr FlatDictionary::getColumn(
 }
 
 
-ColumnUInt8::Ptr FlatDictionary::has(const Columns & key_columns, const DataTypes &) const
+ColumnUInt8::Ptr FlatDictionary::hasKeys(const Columns & key_columns, const DataTypes &) const
 {
     PaddedPODArray<Key> backup_storage;
-    const auto& ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
+    const auto& ids = getColumnVectorData(this, key_columns.front(), backup_storage);
 
     auto result = ColumnUInt8::create(ext::size(ids));
     auto& out = result->getData();
@@ -425,7 +409,7 @@ void FlatDictionary::getItemsImpl(
     const Attribute & attribute,
     const PaddedPODArray<Key> & ids,
     ValueSetter && set_value,
-    DefaultValueExtractor<AttributeType> & default_value_extractor) const
+    DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const
 {
     const auto & attr = std::get<ContainerType<AttributeType>>(attribute.arrays);
     const auto rows = ext::size(ids);
diff --git a/src/Dictionaries/FlatDictionary.h b/src/Dictionaries/FlatDictionary.h
index 2aa32a1d8fe..9e719a4368d 100644
--- a/src/Dictionaries/FlatDictionary.h
+++ b/src/Dictionaries/FlatDictionary.h
@@ -18,55 +18,10 @@
 #include "DictionaryStructure.h"
 #include "IDictionary.h"
 #include "IDictionarySource.h"
-
+#include "DictionaryHelpers.h"
 
 namespace DB
 {
-using BlockPtr = std::shared_ptr<Block>;
-
-template <typename DefaultValue>
-class DefaultValueExtractor
-{
-public:
-    using ResultColumnType = std::conditional_t<
-        std::is_same_v<DefaultValue, StringRef>,
-        ColumnString,
-        std::conditional_t<IsDecimalNumber<DefaultValue>, ColumnDecimal<DefaultValue>, ColumnVector<DefaultValue>>>;
-
-    DefaultValueExtractor(DefaultValue default_value_, ColumnPtr default_values_)
-    {
-        if (default_values_ != nullptr)
-        {
-            if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_values_))
-            {
-                default_values = default_col;
-            }
-            else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_values_.get()))
-            {
-                using ConstColumnValue = std::conditional_t<std::is_same_v<DefaultValue, StringRef>, String, DefaultValue>;
-                default_value = std::make_optional<DefaultValue>(default_col_const->template getValue<ConstColumnValue>());
-            }
-            else
-                throw Exception{"Type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-        }
-        else
-            default_value = std::make_optional<DefaultValue>(default_value_);
-    }
-
-    DefaultValue operator[](size_t row)
-    {
-        if (default_value)
-            return *default_value;
-        
-        if constexpr (std::is_same_v<ResultColumnType, ColumnString>)
-            return default_values->getDataAt(row);
-        else
-            return default_values->getData()[row];
-    }
-private:
-    const ResultColumnType * default_values = nullptr;
-    std::optional<DefaultValue> default_value = {};
-};
 
 class FlatDictionary final : public IDictionary
 {
@@ -116,7 +71,7 @@ public:
     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;
 
-    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::simple; }
+    DictionaryKeyType getKeyType() const override { return DictionaryKeyType::simple; }
 
     ColumnPtr getColumn(
         const std::string& attribute_name,
@@ -125,7 +80,7 @@ public:
         const DataTypes & key_types,
         const ColumnPtr default_values_column) const override;
 
-    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) 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;
 
@@ -195,7 +150,10 @@ private:
 
     template <typename AttributeType, typename OutputType, typename ValueSetter>
     void getItemsImpl(
-        const Attribute & attribute, const PaddedPODArray<Key> & ids, ValueSetter && set_value, DefaultValueExtractor<AttributeType> & default_value_extractor) const;
+        const Attribute & attribute,
+        const PaddedPODArray<Key> & ids,
+        ValueSetter && set_value,
+        DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const;
 
     template <typename T>
     void resize(Attribute & attribute, const Key id);
diff --git a/src/Dictionaries/HashedDictionary.cpp b/src/Dictionaries/HashedDictionary.cpp
index b71ee666d9e..22bcd3a602c 100644
--- a/src/Dictionaries/HashedDictionary.cpp
+++ b/src/Dictionaries/HashedDictionary.cpp
@@ -60,12 +60,13 @@ HashedDictionary::HashedDictionary(
 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; },
-        [&](const size_t) { return null_value; });
+        extractor);
 }
 
 
@@ -138,7 +139,7 @@ ColumnPtr HashedDictionary::getColumn(
     ColumnPtr result;
 
     PaddedPODArray<Key> backup_storage;
-    const auto & ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
+    const auto & ids = getColumnVectorData(this, key_columns.front(), backup_storage);
 
     auto size = ids.size();
 
@@ -149,105 +150,36 @@ ColumnPtr HashedDictionary::getColumn(
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
+        using ValueType = DictionaryValueType<AttributeType>;
+        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
+ 
+        const auto null_value = std::get<ValueType>(attribute.null_values);
+        DictionaryDefaultValueExtractor<ValueType> default_value_extractor(null_value, default_values_column);
+
+        auto column = ColumnProvider::getColumn(dictionary_attribute, size);
 
         if constexpr (std::is_same_v<AttributeType, String>)
         {
-            auto column_string = ColumnString::create();
-            auto * out = column_string.get();
+            auto * out = column.get();
 
-            if (default_values_column != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_values_column))
-                {
-                    getItemsImpl<StringRef, StringRef>(
-                        attribute,
-                        ids,
-                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-                        [&](const size_t row) { return default_col->getDataAt(row); });
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_values_column.get()))
-                {
-                    const auto & def = default_col_const->template getValue<String>();
-
-                    getItemsImpl<StringRef, StringRef>(
-                        attribute,
-                        ids,
-                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-                        [&](const size_t) { return def; });
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-            }
-            else
-            {
-                const auto & null_value = std::get<StringRef>(attribute.null_values);
-
-                getItemsImpl<StringRef, StringRef>(
-                    attribute,
-                    ids,
-                    [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-                    [&](const size_t) { return null_value; });
-            }
-
-            result = std::move(column_string);
+            getItemsImpl<StringRef, StringRef>(
+                attribute,
+                ids,
+                [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                default_value_extractor);
         }
         else
         {
-            using ResultColumnType
-                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
-            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
-
-            ResultColumnPtr column;
-
-            if constexpr (IsDecimalNumber<AttributeType>)
-            {
-                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
-                column = ColumnDecimal<AttributeType>::create(size, scale);
-            }
-            else if constexpr (IsNumber<AttributeType>)
-                column = ColumnVector<AttributeType>::create(size);
-
             auto & out = column->getData();
 
-            if (default_values_column != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_values_column))
-                {
-                    getItemsImpl<AttributeType, AttributeType>(
-                        attribute,
-                        ids,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
-                        [&](const size_t row) { return default_col->getData()[row]; }
-                    );
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_values_column.get()))
-                {
-                    const auto & def = default_col_const->template getValue<AttributeType>();
-
-                    getItemsImpl<AttributeType, AttributeType>(
-                        attribute,
-                        ids,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
-                        [&](const size_t) { return def; }
-                    );
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-            }
-            else
-            {
-                const auto null_value = std::get<AttributeType>(attribute.null_values);
-
-                getItemsImpl<AttributeType, AttributeType>(
-                    attribute,
-                    ids,
-                    [&](const size_t row, const auto value) { return out[row] = value; },
-                    [&](const size_t) { return null_value; }
-                );
-            }
-
-            result = std::move(column);
+            getItemsImpl<AttributeType, AttributeType>(
+                attribute,
+                ids,
+                [&](const size_t row, const auto value) { return out[row] = value; },
+                default_value_extractor);
         }
+        
+        result = std::move(column);
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
@@ -271,10 +203,10 @@ ColumnPtr HashedDictionary::getColumn(
     return result;
 }
 
-ColumnUInt8::Ptr HashedDictionary::has(const Columns & key_columns, const DataTypes &) const
+ColumnUInt8::Ptr HashedDictionary::hasKeys(const Columns & key_columns, const DataTypes &) const
 {
     PaddedPODArray<Key> backup_storage;
-    const auto& ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
+    const auto& ids = getColumnVectorData(this, key_columns.front(), backup_storage);
 
     size_t ids_count = ext::size(ids);
 
@@ -586,28 +518,34 @@ HashedDictionary::Attribute HashedDictionary::createAttribute(const DictionaryAt
 }
 
 
-template <typename OutputType, typename AttrType, typename ValueSetter, typename DefaultGetter>
+template <typename AttributeType, typename OutputType, typename MapType, typename ValueSetter>
 void HashedDictionary::getItemsAttrImpl(
-    const AttrType & attr, const PaddedPODArray<Key> & ids, ValueSetter && set_value, DefaultGetter && get_default) const
+    const MapType & attr,
+    const PaddedPODArray<Key> & ids,
+    ValueSetter && set_value,
+    DictionaryDefaultValueExtractor<AttributeType> & 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)) : get_default(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 DefaultGetter>
+template <typename AttributeType, typename OutputType, typename ValueSetter>
 void HashedDictionary::getItemsImpl(
-    const Attribute & attribute, const PaddedPODArray<Key> & ids, ValueSetter && set_value, DefaultGetter && get_default) const
+    const Attribute & attribute,
+    const PaddedPODArray<Key> & ids,
+    ValueSetter && set_value,
+    DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const
 {
     if (!sparse)
-        return getItemsAttrImpl<OutputType>(*std::get<CollectionPtrType<AttributeType>>(attribute.maps), ids, set_value, get_default);
-    return getItemsAttrImpl<OutputType>(*std::get<SparseCollectionPtrType<AttributeType>>(attribute.sparse_maps), ids, set_value, get_default);
+        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);
 }
 
 
diff --git a/src/Dictionaries/HashedDictionary.h b/src/Dictionaries/HashedDictionary.h
index 776b2f37f36..fd8bc0c10b1 100644
--- a/src/Dictionaries/HashedDictionary.h
+++ b/src/Dictionaries/HashedDictionary.h
@@ -14,6 +14,7 @@
 #include "DictionaryStructure.h"
 #include "IDictionary.h"
 #include "IDictionarySource.h"
+#include "DictionaryHelpers.h"
 
 /** This dictionary stores all content in a hash table in memory
   * (a separate Key -> Value map for each attribute)
@@ -22,7 +23,6 @@
 
 namespace DB
 {
-using BlockPtr = std::shared_ptr<Block>;
 
 class HashedDictionary final : public IDictionary
 {
@@ -68,7 +68,7 @@ public:
 
     void toParent(const PaddedPODArray<Key> & ids, PaddedPODArray<Key> & out) const override;
 
-    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::simple; }
+    DictionaryKeyType getKeyType() const override { return DictionaryKeyType::simple; }
 
     ColumnPtr getColumn(
         const std::string& attribute_name,
@@ -77,7 +77,7 @@ public:
         const DataTypes & key_types,
         const ColumnPtr default_values_column) const override;
 
-    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) 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;
@@ -182,12 +182,19 @@ private:
 
     Attribute createAttribute(const DictionaryAttribute& attribute, const Field & null_value);
 
-    template <typename OutputType, typename AttrType, typename ValueSetter, typename DefaultGetter>
+    template <typename AttributeType, typename OutputType, typename MapType, typename ValueSetter>
     void getItemsAttrImpl(
-        const AttrType & attr, const PaddedPODArray<Key> & ids, ValueSetter && set_value, DefaultGetter && get_default) const;
-    template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
+        const MapType & attr,
+        const PaddedPODArray<Key> & ids,
+        ValueSetter && set_value,
+        DictionaryDefaultValueExtractor<AttributeType> & extractor) const;
+
+    template <typename AttributeType, typename OutputType, typename ValueSetter>
     void getItemsImpl(
-        const Attribute & attribute, const PaddedPODArray<Key> & ids, ValueSetter && set_value, DefaultGetter && get_default) const;
+        const Attribute & attribute,
+        const PaddedPODArray<Key> & ids,
+        ValueSetter && set_value,
+        DictionaryDefaultValueExtractor<AttributeType> & extractor) const;
 
     template <typename T>
     bool setAttributeValueImpl(Attribute & attribute, const Key id, const T value);
diff --git a/src/Dictionaries/IDictionary.h b/src/Dictionaries/IDictionary.h
index c774ab7f676..4c03b7cf2ad 100644
--- a/src/Dictionaries/IDictionary.h
+++ b/src/Dictionaries/IDictionary.h
@@ -28,13 +28,26 @@ namespace ErrorCodes
 struct IDictionaryBase;
 using DictionaryPtr = std::unique_ptr<IDictionaryBase>;
 
-enum class DictionaryIdentifierType
+/** DictionaryKeyType provides IDictionary client information about 
+  *  which key type is supported by dictionary.
+  * 
+  *  Simple is for dictionaries that support UInt64 key column.
+  * 
+  *  Complex is for dictionaries that support any combination of key columns.
+  * 
+  *  Range is for dictionary that support combination of UInt64 key column,
+  *  and Integer representable range key column.
+  */
+enum class DictionaryKeyType
 {
     simple,
     complex,
     range
 };
 
+/**
+ * Base class for Dictionaries implementation.
+ */ 
 struct IDictionaryBase : public IExternalLoadable
 {
     using Key = UInt64;
@@ -91,28 +104,32 @@ struct IDictionaryBase : public IExternalLoadable
 
     virtual bool isInjective(const std::string & attribute_name) const = 0;
 
-    virtual DictionaryIdentifierType getIdentifierType() const /* = 0; */
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
-                        "Get identifier type not supported", getDictionaryID().getNameForLogs());
-    }
+    /** Subclass must provide key type that is supported by dictionary.
+      * Client will use that key type to provide valid key columns for `getColumn` and `has` functions.
+      */
+    virtual DictionaryKeyType getKeyType() const = 0;
 
+    /** Subclass must validate key columns and keys types 
+      * and return column representation of dictionary attribute.
+      * 
+      * Parameter default_values_column must be used to provide default values
+      * for keys that are not in dictionary. If null pointer is passed, 
+      * then default attribute value must be used.
+      */
     virtual ColumnPtr getColumn(
-        const std::string & attribute_name [[maybe_unused]],
-        const DataTypePtr & result_type [[maybe_unused]],
-        const Columns & key_columns [[maybe_unused]],
-        const DataTypes & key_types [[maybe_unused]],
-        const ColumnPtr default_values_column [[maybe_unused]]) const /* = 0; */
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
-                        "Get column not supported", getDictionaryID().getNameForLogs());
-    }
+        const std::string & attribute_name,
+        const DataTypePtr & result_type,
+        const Columns & key_columns,
+        const DataTypes & key_types,
+        const ColumnPtr default_values_column) const = 0;
 
-    virtual ColumnUInt8::Ptr has(const Columns & key_columns [[maybe_unused]], const DataTypes & key_types [[maybe_unused]]) const /* = 0; */
-    {
-         throw Exception(ErrorCodes::NOT_IMPLEMENTED,
-                        "Has not supported", getDictionaryID().getNameForLogs());
-    }
+    /** Subclass must validate key columns and key types and return ColumnUInt8 that 
+      * is bitmask representation of is key in dictionary or not. 
+      * If key is in dictionary then value of associated row will be 1, otherwise 0.
+      */
+    virtual ColumnUInt8::Ptr hasKeys(
+        const Columns & key_columns,
+        const DataTypes & key_types) const = 0;
 
     virtual BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const = 0;
 
@@ -184,43 +201,4 @@ struct IDictionary : IDictionaryBase
     }
 };
 
-/// Implicit conversions in dictGet functions is disabled.
-inline void checkAttributeType(const IDictionaryBase * dictionary, const std::string & attribute_name,
-                               AttributeUnderlyingType attribute_type, AttributeUnderlyingType to)
-{
-    if (attribute_type != to)
-        throw Exception{ErrorCodes::TYPE_MISMATCH, "{}: type mismatch: attribute {} has type {}, expected {}",
-                        dictionary->getDictionaryID().getNameForLogs(),
-                        attribute_name, toString(attribute_type), toString(to)};
-}
-
-template <typename T>
-static const PaddedPODArray<T> &
-getColumnDataAsPaddedPODArray(const IDictionaryBase * dictionary, const ColumnPtr column, PaddedPODArray<T> & backup_storage)
-{
-    bool is_const_column = isColumnConst(*column);
-    auto full_column = column->convertToFullColumnIfConst();
-    auto vector_col = checkAndGetColumn<ColumnVector<T>>(full_column.get());
-
-    if (!vector_col)
-    {
-        throw Exception{ErrorCodes::TYPE_MISMATCH,
-            "{}: type mismatch: column has wrong type expected {}",
-            dictionary->getDictionaryID().getNameForLogs(),
-            "" /* TODO: Type name*/};
-    }
-
-    if (is_const_column)
-    {
-        // With type conversion and const columns we need to use backup storage here
-        auto & data = vector_col->getData();
-        backup_storage.assign(data);
-
-        return backup_storage;
-    }
-    else
-    {
-        return vector_col->getData();
-    }
-}
 }
diff --git a/src/Dictionaries/IPAddressDictionary.cpp b/src/Dictionaries/IPAddressDictionary.cpp
index 93451635cb2..468d720f69d 100644
--- a/src/Dictionaries/IPAddressDictionary.cpp
+++ b/src/Dictionaries/IPAddressDictionary.cpp
@@ -273,7 +273,7 @@ ColumnPtr IPAddressDictionary::getColumn(
     const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes & key_types,
-    const ColumnPtr default_untyped) const
+    const ColumnPtr default_values_column) const
 {
     validateKeyTypes(key_types);
 
@@ -288,105 +288,37 @@ ColumnPtr IPAddressDictionary::getColumn(
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
+        using ValueType = DictionaryValueType<AttributeType>;
+        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>; 
+
+        const auto null_value = ValueType{std::get<AttributeType>(attribute.null_values)};
+        DictionaryDefaultValueExtractor<ValueType> default_value_extractor(null_value, default_values_column);
+
+        auto column = ColumnProvider::getColumn(dictionary_attribute, size);
+
 
         if constexpr (std::is_same_v<AttributeType, String>)
         {
-            auto column_string = ColumnString::create();
-            auto * out = column_string.get();
+            auto * out = column.get();
 
-            if (default_untyped != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
-                {
-                    getItemsImpl<StringRef, StringRef>(
-                        attribute,
-                        key_columns,
-                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-                        [&](const size_t row) { return default_col->getDataAt(row); });
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<String>();
-
-                    getItemsImpl<StringRef, StringRef>(
-                        attribute,
-                        key_columns,
-                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-                        [&](const size_t) { return StringRef { def }; });
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-            }
-            else
-            {
-                const auto & null_value = StringRef{std::get<String>(attribute.null_values)};
-
-                getItemsImpl<StringRef, StringRef>(
-                    attribute,
-                    key_columns,
-                    [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-                    [&](const size_t) { return null_value; });
-            }
-
-            result = std::move(column_string);
+            getItemsImpl<ValueType, ValueType>(
+                attribute,
+                key_columns,
+                [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
+                default_value_extractor);
         }
         else
         {
-            using ResultColumnType
-                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
-            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
-
-            ResultColumnPtr column;
-
-            if constexpr (IsDecimalNumber<AttributeType>)
-            {
-                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
-                column = ColumnDecimal<AttributeType>::create(size, scale);
-            }
-            else if constexpr (IsNumber<AttributeType>)
-                column = ColumnVector<AttributeType>::create(size);
-
             auto & out = column->getData();
 
-            if (default_untyped != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
-                {
-                    getItemsImpl<AttributeType, AttributeType>(
-                        attribute,
-                        key_columns,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
-                        [&](const size_t row) { return default_col->getData()[row]; }
-                    );
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<AttributeType>();
-
-                    getItemsImpl<AttributeType, AttributeType>(
-                        attribute,
-                        key_columns,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
-                        [&](const size_t) { return def; }
-                    );
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-            }
-            else
-            {
-                const auto null_value = std::get<AttributeType>(attribute.null_values);
-
-                getItemsImpl<AttributeType, AttributeType>(
-                    attribute,
-                    key_columns,
-                    [&](const size_t row, const auto value) { return out[row] = value; },
-                    [&](const size_t) { return null_value; }
-                );
-            }
-
-            result = std::move(column);
+            getItemsImpl<ValueType, ValueType>(
+                attribute,
+                key_columns,
+                [&](const size_t row, const auto value) { return out[row] = value; },
+                default_value_extractor);
         }
+
+        result = std::move(column);
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
@@ -395,7 +327,7 @@ ColumnPtr IPAddressDictionary::getColumn(
 }
 
 
-ColumnUInt8::Ptr IPAddressDictionary::has(const Columns & key_columns, const DataTypes & key_types) const
+ColumnUInt8::Ptr IPAddressDictionary::hasKeys(const Columns & key_columns, const DataTypes & key_types) const
 {
     validateKeyTypes(key_types);
 
@@ -705,9 +637,12 @@ const uint8_t * IPAddressDictionary::getIPv6FromOffset(const IPAddressDictionary
     return reinterpret_cast<const uint8_t *>(&ipv6_col[i * IPV6_BINARY_LENGTH]);
 }
 
-template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
+template <typename AttributeType, typename OutputType, typename ValueSetter>
 void IPAddressDictionary::getItemsByTwoKeyColumnsImpl(
-    const Attribute & attribute, const Columns & key_columns, ValueSetter && set_value, DefaultGetter && get_default) const
+    const Attribute & attribute,
+    const Columns & key_columns,
+    ValueSetter && set_value,
+    DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const
 {
     const auto first_column = key_columns.front();
     const auto rows = first_column->size();
@@ -744,7 +679,7 @@ void IPAddressDictionary::getItemsByTwoKeyColumnsImpl(
                 set_value(i, static_cast<OutputType>(vec[row_idx[*found_it]]));
             }
             else
-                set_value(i, get_default(i));
+                set_value(i, default_value_extractor[i]);
         }
         return;
     }
@@ -779,13 +714,16 @@ void IPAddressDictionary::getItemsByTwoKeyColumnsImpl(
             mask_column[*found_it] == mask))
             set_value(i, static_cast<OutputType>(vec[row_idx[*found_it]]));
         else
-            set_value(i, get_default(i));
+            set_value(i, default_value_extractor[i]);
     }
 }
 
-template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
+template <typename AttributeType, typename OutputType, typename ValueSetter>
 void IPAddressDictionary::getItemsImpl(
-    const Attribute & attribute, const Columns & key_columns, ValueSetter && set_value, DefaultGetter && get_default) const
+    const Attribute & attribute,
+    const Columns & key_columns,
+    ValueSetter && set_value,
+    DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const
 {
     const auto first_column = key_columns.front();
     const auto rows = first_column->size();
@@ -794,7 +732,7 @@ void IPAddressDictionary::getItemsImpl(
     if (unlikely(key_columns.size() == 2))
     {
         getItemsByTwoKeyColumnsImpl<AttributeType, OutputType>(
-            attribute, key_columns, std::forward<ValueSetter>(set_value), std::forward<DefaultGetter>(get_default));
+            attribute, key_columns, std::forward<ValueSetter>(set_value), default_value_extractor);
         query_count.fetch_add(rows, std::memory_order_relaxed);
         return;
     }
@@ -812,7 +750,7 @@ void IPAddressDictionary::getItemsImpl(
             if (found != ipNotFound())
                 set_value(i, static_cast<OutputType>(vec[*found]));
             else
-                set_value(i, get_default(i));
+                set_value(i, default_value_extractor[i]);
         }
     }
     else
@@ -827,7 +765,7 @@ void IPAddressDictionary::getItemsImpl(
             if (found != ipNotFound())
                 set_value(i, static_cast<OutputType>(vec[*found]));
             else
-                set_value(i, get_default(i));
+                set_value(i, default_value_extractor[i]);
         }
     }
 
diff --git a/src/Dictionaries/IPAddressDictionary.h b/src/Dictionaries/IPAddressDictionary.h
index 3d9565c47ce..0694724aaca 100644
--- a/src/Dictionaries/IPAddressDictionary.h
+++ b/src/Dictionaries/IPAddressDictionary.h
@@ -16,6 +16,7 @@
 #include "DictionaryStructure.h"
 #include "IDictionary.h"
 #include "IDictionarySource.h"
+#include "DictionaryHelpers.h"
 
 namespace DB
 {
@@ -61,16 +62,16 @@ public:
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
     }
 
-    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::complex; }
+    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_untyped) const override;
+        const ColumnPtr default_values_column) const override;
 
-    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) 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;
 
@@ -140,13 +141,19 @@ private:
 
     Attribute createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value);
 
-    template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
+    template <typename AttributeType, typename OutputType, typename ValueSetter>
     void getItemsByTwoKeyColumnsImpl(
-        const Attribute & attribute, const Columns & key_columns, ValueSetter && set_value, DefaultGetter && get_default) const;
+        const Attribute & attribute,
+        const Columns & key_columns,
+        ValueSetter && set_value,
+        DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const;
 
-    template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
-    void
-    getItemsImpl(const Attribute & attribute, const Columns & key_columns, ValueSetter && set_value, DefaultGetter && get_default) const;
+    template <typename AttributeType, typename OutputType, typename ValueSetter>
+    void getItemsImpl(
+        const Attribute & attribute,
+        const Columns & key_columns,
+        ValueSetter && set_value,
+        DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const;
 
     template <typename T>
     void setAttributeValueImpl(Attribute & attribute, const T value);
diff --git a/src/Dictionaries/PolygonDictionary.cpp b/src/Dictionaries/PolygonDictionary.cpp
index c1969ea7b35..15af4680d9d 100644
--- a/src/Dictionaries/PolygonDictionary.cpp
+++ b/src/Dictionaries/PolygonDictionary.cpp
@@ -99,120 +99,50 @@ ColumnPtr IPolygonDictionary::getColumn(
     const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes &,
-    const ColumnPtr default_untyped) const
+    const ColumnPtr default_values_column) const
 {
-    /// TODO: Validate input types
-
     ColumnPtr result;
 
     const auto index = getAttributeIndex(attribute_name);
     const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
 
-    auto size = key_columns.front()->size();
+    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 ValueType = DictionaryValueType<AttributeType>;
+        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
+ 
+        const auto null_value = static_cast<ValueType>(std::get<AttributeType>(null_values[index]));
+        DictionaryDefaultValueExtractor<ValueType> 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 column_string = ColumnString::create();
-            auto * out = column_string.get();
+            auto * out = column.get();
 
-            if (default_untyped != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
-                {
-                    getItemsImpl<String, StringRef>(
-                        index,
-                        key_columns,
-                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-                        [&](const size_t row) { return default_col->getDataAt(row); });
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<String>();
-
-                    getItemsImpl<String, StringRef>(
-                        index,
-                        key_columns,
-                        [&](const size_t, const StringRef value) { out->insertData(value.data, value.size); },
-                        [&](const size_t) { return def; });
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-            }
-            else
-            {
-                const auto & null_value = StringRef{std::get<String>(null_values[index])};
-
-                getItemsImpl<String, StringRef>(
-                    index,
-                    key_columns,
-                    [&](const size_t, const StringRef & value) { out->insertData(value.data, value.size); },
-                    [&](const size_t) { return null_value; });
-            }
-
-            result = std::move(column_string);
+            getItemsImpl<String, StringRef>(
+                index,
+                key_columns,
+                [&](const size_t, const StringRef & value) { out->insertData(value.data, value.size); },
+                default_value_extractor);
         }
         else
         {
-            using ResultColumnType
-                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
-            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
-
-            ResultColumnPtr column;
-
-            if constexpr (IsDecimalNumber<AttributeType>)
-            {
-                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
-                column = ColumnDecimal<AttributeType>::create(size, scale);
-            }
-            else if constexpr (IsNumber<AttributeType>)
-                column = ColumnVector<AttributeType>::create(size);
-
             auto & out = column->getData();
 
-            if (default_untyped != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
-                {
-                    getItemsImpl<AttributeType, AttributeType>(
-                        index,
-                        key_columns,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
-                        [&](const size_t row) { return default_col->getData()[row]; }
-                    );
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<AttributeType>();
-
-                    getItemsImpl<AttributeType, AttributeType>(
-                        index,
-                        key_columns,
-                        [&](const size_t row, const auto value) { return out[row] = value; },
-                        [&](const size_t) { return def; }
-                    );
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-            }
-            else
-            {
-                const auto null_value = std::get<AttributeType>(null_values[index]);
-
-                getItemsImpl<AttributeType, AttributeType>(
-                    index,
-                    key_columns,
-                    [&](const size_t row, const auto value) { return out[row] = value; },
-                    [&](const size_t) { return null_value; }
-                );
-            }
-
-            result = std::move(column);
+            getItemsImpl<AttributeType, AttributeType>(
+                index,
+                key_columns,
+                [&](const size_t row, const auto value) { return out[row] = value; },
+                default_value_extractor);
         }
+
+        result = std::move(column);
     };
 
     callOnDictionaryAttributeType(dict_struct.attributes[index].underlying_type, type_call);
@@ -383,7 +313,7 @@ std::vector<IPolygonDictionary::Point> IPolygonDictionary::extractPoints(const C
     return result;
 }
 
-ColumnUInt8::Ptr IPolygonDictionary::has(const Columns & key_columns, const DataTypes &) const
+ColumnUInt8::Ptr IPolygonDictionary::hasKeys(const Columns & key_columns, const DataTypes &) const
 {
     auto size = key_columns.front()->size();
     auto result = ColumnUInt8::create(size);
@@ -410,9 +340,12 @@ size_t IPolygonDictionary::getAttributeIndex(const std::string & attribute_name)
     return it->second;
 }
 
-template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
+template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
 void IPolygonDictionary::getItemsImpl(
-        size_t attribute_ind, const Columns & key_columns, ValueSetter && set_value, DefaultGetter && get_default) const
+        size_t attribute_ind,
+        const Columns & key_columns,
+        ValueSetter && set_value,
+        DefaultValueExtractor & default_value_extractor) const
 {
     const auto points = extractPoints(key_columns);
 
@@ -428,7 +361,7 @@ void IPolygonDictionary::getItemsImpl(
         id = ids[id];
         if (!found)
         {
-            set_value(i, static_cast<OutputType>(get_default(i)));
+            set_value(i, static_cast<OutputType>(default_value_extractor[i]));
             continue;
         }
         if constexpr (std::is_same<AttributeType, String>::value)
diff --git a/src/Dictionaries/PolygonDictionary.h b/src/Dictionaries/PolygonDictionary.h
index f7b7d92fd27..a0ea189c10a 100644
--- a/src/Dictionaries/PolygonDictionary.h
+++ b/src/Dictionaries/PolygonDictionary.h
@@ -12,6 +12,7 @@
 #include "DictionaryStructure.h"
 #include "IDictionary.h"
 #include "IDictionarySource.h"
+#include "DictionaryHelpers.h"
 
 namespace DB
 {
@@ -78,16 +79,16 @@ public:
 
     bool isInjective(const std::string & attribute_name) const override;
 
-    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::complex; }
+    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_untyped) const override;
+        const ColumnPtr default_values_column) const override;
 
-    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) 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;
 
@@ -142,8 +143,12 @@ private:
     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 DefaultGetter>
-    void getItemsImpl(size_t attribute_ind, const Columns & key_columns, ValueSetter && set_value, DefaultGetter && get_default) const;
+    template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
+    void getItemsImpl(
+        size_t attribute_ind,
+        const Columns & key_columns,
+        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;
diff --git a/src/Dictionaries/RangeHashedDictionary.cpp b/src/Dictionaries/RangeHashedDictionary.cpp
index 02fb71ca3d7..a1f5c7a68fb 100644
--- a/src/Dictionaries/RangeHashedDictionary.cpp
+++ b/src/Dictionaries/RangeHashedDictionary.cpp
@@ -93,16 +93,14 @@ ColumnPtr RangeHashedDictionary::getColumn(
     const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes & key_types,
-    const ColumnPtr default_untyped) const
+    const ColumnPtr default_values_column) const
 {
-    /// TODO: Validate input types
-
     ColumnPtr result;
 
     const auto & attribute = getAttribute(attribute_name);
     const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
 
-    auto size = key_columns.front()->size();
+    auto keys_size = key_columns.front()->size();
 
     /// Cast second column to storage type
     Columns modified_key_columns = key_columns;
@@ -117,7 +115,7 @@ ColumnPtr RangeHashedDictionary::getColumn(
     ColumnUInt8::Container * vec_null_map_to = nullptr;
     if (attribute.is_nullable)
     {
-        col_null_map_to = ColumnUInt8::create(size, false);
+        col_null_map_to = ColumnUInt8::create(keys_size, false);
         vec_null_map_to = &col_null_map_to->getData();
     }
 
@@ -125,152 +123,46 @@ ColumnPtr RangeHashedDictionary::getColumn(
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
+        using ValueType = DictionaryValueType<AttributeType>;
+        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>; 
+
+        const auto null_value = std::get<ValueType>(attribute.null_values);
+        DictionaryDefaultValueExtractor<ValueType> 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 column_string = ColumnString::create();
-            auto * out = column_string.get();
+            auto * out = column.get();
 
-            if (default_untyped != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
-                {
-                    getItemsImpl<StringRef, StringRef>(
-                        attribute,
-                        modified_key_columns,
-                        [&](const size_t row, const StringRef value, bool is_null)
-                        {
-                            if (attribute.is_nullable)
-                            {
-                                (*vec_null_map_to)[row] = is_null;
-                            }
+            getItemsImpl<ValueType, ValueType>(
+                attribute,
+                modified_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);
-                        },
-                        [&](const size_t row) { return default_col->getDataAt(row); });
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<String>();
-
-                    getItemsImpl<StringRef, StringRef>(
-                        attribute,
-                        modified_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);
-                        },
-                        [&](const size_t) { return def; });
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-            }
-            else
-            {
-                const auto & null_value = std::get<StringRef>(attribute.null_values);
-
-                getItemsImpl<StringRef, StringRef>(
-                    attribute,
-                    modified_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);
-                    },
-                    [&](const size_t) { return null_value; });
-            }
-
-            result = std::move(column_string);
+                    out->insertData(value.data, value.size);
+                },
+                default_value_extractor);
         }
         else
         {
-            using ResultColumnType
-                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
-            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
-
-            ResultColumnPtr column;
-
-            if constexpr (IsDecimalNumber<AttributeType>)
-            {
-                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
-                column = ColumnDecimal<AttributeType>::create(size, scale);
-            }
-            else if constexpr (IsNumber<AttributeType>)
-                column = ColumnVector<AttributeType>::create(size);
-
             auto & out = column->getData();
 
-            if (default_untyped != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
-                {
-                    getItemsImpl<AttributeType, AttributeType>(
-                        attribute,
-                        modified_key_columns,
-                        [&](const size_t row, const auto value, bool is_null)
-                        {
-                            if (attribute.is_nullable)
-                            {
-                                (*vec_null_map_to)[row] = is_null;
-                            }
+            getItemsImpl<ValueType, ValueType>(
+                attribute,
+                modified_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;
-                        },
-                        [&](const size_t row) { return default_col->getData()[row]; }
-                    );
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<AttributeType>();
-
-                    getItemsImpl<AttributeType, AttributeType>(
-                        attribute,
-                        modified_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;
-                        },
-                        [&](const size_t) { return def; }
-                    );
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-            }
-            else
-            {
-                const auto null_value = std::get<AttributeType>(attribute.null_values);
-
-                getItemsImpl<AttributeType, AttributeType>(
-                    attribute,
-                    modified_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;
-                    },
-                    [&](const size_t) { return null_value; });
-            }
-
-            result = std::move(column);
+                    out[row] = value;
+                },
+                default_value_extractor);
         }
+
+        result = std::move(column);
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
@@ -283,7 +175,7 @@ ColumnPtr RangeHashedDictionary::getColumn(
     return result;
 }
 
-ColumnUInt8::Ptr RangeHashedDictionary::has(const Columns &, const DataTypes &) const
+ColumnUInt8::Ptr RangeHashedDictionary::hasKeys(const Columns &, const DataTypes &) const
 {
     throw Exception(ErrorCodes::NOT_IMPLEMENTED,
         "Has not supported", getDictionaryID().getNameForLogs());
@@ -421,18 +313,18 @@ RangeHashedDictionary::createAttribute(const DictionaryAttribute& attribute, con
     return attr;
 }
 
-template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
+template <typename AttributeType, typename OutputType, typename ValueSetter>
 void RangeHashedDictionary::getItemsImpl(
     const Attribute & attribute,
     const Columns & key_columns,
     ValueSetter && set_value,
-    DefaultGetter && get_default) const
+    DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const
 {
     PaddedPODArray<Key> key_backup_storage;
     PaddedPODArray<RangeStorageType> range_backup_storage;
 
-    const PaddedPODArray<Key> & ids = getColumnDataAsPaddedPODArray(this, key_columns[0], key_backup_storage);
-    const PaddedPODArray<RangeStorageType> & dates = getColumnDataAsPaddedPODArray(this, key_columns[1], range_backup_storage);
+    const PaddedPODArray<Key> & 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);
 
@@ -443,11 +335,13 @@ void RangeHashedDictionary::getItemsImpl(
         {
             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);
-                  });
+            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))
             {
@@ -456,16 +350,16 @@ void RangeHashedDictionary::getItemsImpl(
                 if (value)
                     set_value(row, static_cast<OutputType>(*value), false); // NOLINT
                 else
-                    set_value(row, get_default(row), true);
+                    set_value(row, default_value_extractor[row], true);
             }
             else
             {
-                set_value(row, get_default(row), false);
+                set_value(row, default_value_extractor[row], false);
             }
         }
         else
         {
-            set_value(row, get_default(row), false);
+            set_value(row, default_value_extractor[row], false);
         }
     }
 
diff --git a/src/Dictionaries/RangeHashedDictionary.h b/src/Dictionaries/RangeHashedDictionary.h
index 1a3bfd65d33..8252ee24cd5 100644
--- a/src/Dictionaries/RangeHashedDictionary.h
+++ b/src/Dictionaries/RangeHashedDictionary.h
@@ -1,5 +1,10 @@
 #pragma once
 
+#include <atomic>
+#include <memory>
+#include <variant>
+#include <optional>
+
 #include <Columns/ColumnDecimal.h>
 #include <Columns/ColumnString.h>
 #include <Common/HashTable/HashMap.h>
@@ -7,11 +12,7 @@
 #include "DictionaryStructure.h"
 #include "IDictionary.h"
 #include "IDictionarySource.h"
-
-#include <atomic>
-#include <memory>
-#include <variant>
-#include <optional>
+#include "DictionaryHelpers.h"
 
 namespace DB
 {
@@ -53,16 +54,16 @@ public:
         return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
     }
 
-    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::range; }
+    DictionaryKeyType getKeyType() const override { return DictionaryKeyType::range; }
 
     ColumnPtr getColumn(
         const std::string& attribute_name,
         const DataTypePtr & result_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnPtr default_untyped) const override;
+        const ColumnPtr default_values_column) const override;
 
-    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) const override;
+    ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
     using RangeStorageType = Int64;
 
@@ -151,12 +152,12 @@ private:
 
     Attribute createAttribute(const DictionaryAttribute& attribute, const Field & null_value);
 
-    template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultGetter>
+    template <typename AttributeType, typename OutputType, typename ValueSetter>
     void getItemsImpl(
         const Attribute & attribute,
         const Columns & key_columns,
         ValueSetter && set_value,
-        DefaultGetter && get_default) const;
+        DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const;
 
     template <typename T>
     void setAttributeValueImpl(Attribute & attribute, const Key id, const Range & range, const Field & value);
diff --git a/src/Dictionaries/SSDCacheDictionary.cpp b/src/Dictionaries/SSDCacheDictionary.cpp
index 642e956f97e..c064ccb0e63 100644
--- a/src/Dictionaries/SSDCacheDictionary.cpp
+++ b/src/Dictionaries/SSDCacheDictionary.cpp
@@ -446,7 +446,7 @@ void SSDCachePartition::flush()
 
 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 & get_default,
+    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)
@@ -457,7 +457,7 @@ void SSDCachePartition::getValue(const size_t attribute_index, const PaddedPODAr
         if (metadata.expiresAt() > now)
         {
             if (metadata.isDefault())
-                out[index] = get_default(index);
+                out[index] = default_value_extractor[index];
             else
             {
                 ignoreFromBufferToAttributeIndex(attribute_index, buf);
@@ -1333,12 +1333,13 @@ ColumnPtr SSDCacheDictionary::getColumn(
     const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes &,
-    const ColumnPtr default_untyped) const
+    const ColumnPtr default_values_column) const
 {
     ColumnPtr result;
 
     PaddedPODArray<Key> backup_storage;
-    const auto & ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), 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);
@@ -1347,94 +1348,25 @@ ColumnPtr SSDCacheDictionary::getColumn(
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
+        using ValueType = DictionaryValueType<AttributeType>;
+        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
 
-        auto identifiers_size = ids.size();
+        const auto null_value = static_cast<ValueType>(std::get<AttributeType>(null_values[index]));
+        DictionaryDefaultValueExtractor<ValueType> 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 column_string = ColumnString::create();
-
-            if (default_untyped != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
-                {
-                    getItemsStringImpl(index, ids, column_string.get(), [&](const size_t row) { return default_col->getDataAt(row); });
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<String>();
-
-                    getItemsStringImpl(index, ids, column_string.get(), [&](const size_t) { return StringRef{def}; });
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-            }
-            else
-            {
-                const auto null_value = StringRef{std::get<String>(null_values[index])};
-
-                getItemsStringImpl(index, ids, column_string.get(), [&](const size_t) { return null_value; });
-            }
-
-            result = std::move(column_string);
+            getItemsStringImpl(index, ids, column.get(), default_value_extractor);
         }
         else
         {
-            using ResultColumnType
-                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
-            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
-
-            ResultColumnPtr column;
-
-            if constexpr (IsDecimalNumber<AttributeType>)
-            {
-                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
-                column = ColumnDecimal<AttributeType>::create(identifiers_size, scale);
-            }
-            else if constexpr (IsNumber<AttributeType>)
-                column = ColumnVector<AttributeType>::create(identifiers_size);
-
             auto & out = column->getData();
-
-            if (default_untyped != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
-                {
-                    getItemsNumberImpl<AttributeType, AttributeType>(
-                        index,
-                        ids,
-                        out,
-                        [&](const size_t row) { return default_col->getData()[row]; }
-                    );
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<AttributeType>();
-
-                    getItemsNumberImpl<AttributeType, AttributeType>(
-                        index,
-                        ids,
-                        out,
-                        [&](const size_t) { return def; }
-                    );
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-            }
-            else
-            {
-                const auto null_value = std::get<AttributeType>(null_values[index]);
-
-                getItemsNumberImpl<AttributeType, AttributeType>(
-                    index,
-                    ids,
-                    out,
-                    [&](const size_t) { return null_value; }
-                );
-            }
-
-            result = std::move(column);
+            getItemsNumberImpl<AttributeType, AttributeType>(index, ids, out, default_value_extractor);
         }
+
+        result = std::move(column);
     };
 
     callOnDictionaryAttributeType(dict_struct.attributes[index].underlying_type, type_call);
@@ -1444,12 +1376,15 @@ ColumnPtr SSDCacheDictionary::getColumn(
 
 template <typename AttributeType, typename OutputType, typename DefaultGetter>
 void SSDCacheDictionary::getItemsNumberImpl(
-        const size_t attribute_index, const PaddedPODArray<Key> & ids, ResultArrayType<OutputType> & out, DefaultGetter && get_default) const
+        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, get_default, now);
+    storage.getValue<OutputType>(attribute_index, ids, out, not_found_ids, default_value_extractor, now);
     if (not_found_ids.empty())
         return;
 
@@ -1467,14 +1402,17 @@ void SSDCacheDictionary::getItemsNumberImpl(
             [&](const size_t id)
             {
                 for (const size_t row : not_found_ids[id])
-                    out[row] = get_default(row);
+                    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 && get_default) const
+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();
 
@@ -1493,7 +1431,7 @@ void SSDCacheDictionary::getItemsStringImpl(const size_t attribute_index, const
         {
             if (unlikely(default_index != default_rows.size() && default_rows[default_index] == row))
             {
-                auto to_insert = get_default(row);
+                auto to_insert = default_value_extractor[row];
                 out->insertData(to_insert.data, to_insert.size);
                 ++default_index;
             }
@@ -1524,7 +1462,7 @@ void SSDCacheDictionary::getItemsStringImpl(const size_t attribute_index, const
         const auto & id = ids[row];
         if (unlikely(default_index != default_rows.size() && default_rows[default_index] == row))
         {
-            auto to_insert = get_default(row);
+            auto to_insert = default_value_extractor[row];
             out->insertData(to_insert.data, to_insert.size);
             ++default_index;
         }
@@ -1538,16 +1476,16 @@ void SSDCacheDictionary::getItemsStringImpl(const size_t attribute_index, const
         }
         else
         {
-            auto to_insert = get_default(row);
+            auto to_insert = default_value_extractor[row];
             out->insertData(to_insert.data, to_insert.size);
         }
     }
 }
 
-ColumnUInt8::Ptr SSDCacheDictionary::has(const Columns & key_columns, const DataTypes &) const
+ColumnUInt8::Ptr SSDCacheDictionary::hasKeys(const Columns & key_columns, const DataTypes &) const
 {
     PaddedPODArray<Key> backup_storage;
-    const auto& ids = getColumnDataAsPaddedPODArray(this, key_columns.front(), backup_storage);
+    const auto& ids = getColumnVectorData(this, key_columns.front(), backup_storage);
 
     auto result = ColumnUInt8::create(ext::size(ids));
     auto& out = result->getData();
diff --git a/src/Dictionaries/SSDCacheDictionary.h b/src/Dictionaries/SSDCacheDictionary.h
index 158bf38cf42..4d4d3befa22 100644
--- a/src/Dictionaries/SSDCacheDictionary.h
+++ b/src/Dictionaries/SSDCacheDictionary.h
@@ -2,11 +2,15 @@
 
 #if defined(__linux__) || defined(__FreeBSD__)
 
-#include "DictionaryStructure.h"
-#include "IDictionary.h"
-#include "IDictionarySource.h"
 #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>
@@ -16,12 +20,11 @@
 #include <Core/Block.h>
 #include <Dictionaries/BucketCache.h>
 #include <IO/HashingWriteBuffer.h>
-#include <list>
 #include <pcg_random.hpp>
-#include <Poco/Logger.h>
-#include <shared_mutex>
-#include <variant>
-#include <vector>
+#include "DictionaryStructure.h"
+#include "IDictionary.h"
+#include "IDictionarySource.h"
+#include "DictionaryHelpers.h"
 
 namespace DB
 {
@@ -109,7 +112,7 @@ public:
 
     template <typename Out, typename GetDefault>
     void getValue(size_t attribute_index, const PaddedPODArray<UInt64> & ids,
-            ResultArrayType<Out> & out, std::vector<bool> & found, GetDefault & get_default,
+            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,
@@ -232,7 +235,7 @@ public:
     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 & get_default, std::chrono::system_clock::time_point now) const;
+            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,
@@ -351,16 +354,16 @@ public:
 
     std::exception_ptr getLastException() const override { return storage.getLastException(); }
 
-    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::simple; }
+    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_untyped) const override;
+        const ColumnPtr default_values_column) const override;
 
-    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) const override;
+    ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
     template <typename T>
     using ResultArrayType = SSDCacheStorage::ResultArrayType<T>;
@@ -377,11 +380,17 @@ private:
 
     template <typename AttributeType, typename OutputType, typename DefaultGetter>
     void getItemsNumberImpl(
-            size_t attribute_index, const PaddedPODArray<Key> & ids, ResultArrayType<OutputType> & out, DefaultGetter && get_default) const;
+        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 && get_default) const;
+    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;
diff --git a/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp b/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
index 5372e0e1afb..1bff34b7cb3 100644
--- a/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
+++ b/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
@@ -462,8 +462,12 @@ void SSDComplexKeyCachePartition::flush()
 
 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 & get_default,
+    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)
@@ -475,7 +479,7 @@ void SSDComplexKeyCachePartition::getValue(
         if (metadata.expiresAt() > now)
         {
             if (metadata.isDefault())
-                out[index] = get_default(index);
+                out[index] = default_value_extractor[index];
             else
             {
                 ignoreFromBufferToAttributeIndex(attribute_index, buf);
@@ -521,7 +525,7 @@ void SSDComplexKeyCachePartition::getString(const size_t attribute_index,
     getImpl(key_columns, key_types, set_value, found);
 }
 
-void SSDComplexKeyCachePartition::has(
+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
 {
@@ -1019,7 +1023,7 @@ void SSDComplexKeyCacheStorage::getString(
     hit_count.fetch_add(n - count_not_found, std::memory_order_release);
 }
 
-void SSDComplexKeyCacheStorage::has(
+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
@@ -1032,7 +1036,7 @@ void SSDComplexKeyCacheStorage::has(
     {
         std::shared_lock lock(rw_lock);
         for (const auto & partition : partitions)
-            partition->has(key_columns, key_types, out, found, now);
+            partition->hasKeys(key_columns, key_types, out, found, now);
     }
 
     size_t count_not_found = 0;
@@ -1382,7 +1386,7 @@ ColumnPtr SSDComplexKeyCacheDictionary::getColumn(
     const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes & key_types,
-    const ColumnPtr default_untyped) const
+    const ColumnPtr default_values_column) const
 {
     ColumnPtr result;
 
@@ -1398,95 +1402,31 @@ ColumnPtr SSDComplexKeyCacheDictionary::getColumn(
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
 
+        using ValueType = DictionaryValueType<AttributeType>;
+        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
+
+        const auto null_value = static_cast<ValueType>(std::get<AttributeType>(null_values[index]));
+        DictionaryDefaultValueExtractor<ValueType> 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 column_string = ColumnString::create();
-            auto * out = column_string.get();
-
-            if (default_untyped != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ColumnString>(*default_untyped))
-                {
-                    getItemsStringImpl(index, key_columns, key_types, out, [&](const size_t row) { return default_col->getDataAt(row); });
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ColumnString>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<String>();
-
-                    getItemsStringImpl(index, key_columns, key_types, out, [&](const size_t) { return StringRef{def}; });
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-            }
-            else
-            {
-                const auto null_value = StringRef{std::get<String>(null_values[index])};
-
-                getItemsStringImpl(index, key_columns, key_types, out, [&](const size_t) { return null_value; });
-            }
-
-            result = std::move(column_string);
+            auto * out = column.get();
+            getItemsStringImpl(index, key_columns, key_types, out, default_value_extractor);
         }
         else
         {
-            using ResultColumnType
-                = std::conditional_t<IsDecimalNumber<AttributeType>, ColumnDecimal<AttributeType>, ColumnVector<AttributeType>>;
-            using ResultColumnPtr = typename ResultColumnType::MutablePtr;
-
-            ResultColumnPtr column;
-
-            if constexpr (IsDecimalNumber<AttributeType>)
-            {
-                auto scale = getDecimalScale(*dictionary_attribute.nested_type);
-                column = ColumnDecimal<AttributeType>::create(keys_size, scale);
-            }
-            else if constexpr (IsNumber<AttributeType>)
-                column = ColumnVector<AttributeType>::create(keys_size);
-
             auto & out = column->getData();
-
-            if (default_untyped != nullptr)
-            {
-                if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_untyped))
-                {
-                    getItemsNumberImpl<AttributeType, AttributeType>(
-                        index,
-                        key_columns,
-                        key_types,
-                        out,
-                        [&](const size_t row) { return default_col->getData()[row]; }
-                    );
-                }
-                else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_untyped.get()))
-                {
-                    const auto & def = default_col_const->template getValue<AttributeType>();
-
-                    getItemsNumberImpl<AttributeType, AttributeType>(
-                        index,
-                        key_columns,
-                        key_types,
-                        out,
-                        [&](const size_t) { return def; }
-                    );
-                }
-                else
-                    throw Exception{full_name + ": type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
-            }
-            else
-            {
-                const auto null_value = std::get<AttributeType>(null_values[index]); /* NOLINT */
-
-                getItemsNumberImpl<AttributeType, AttributeType>(
-                    index,
-                    key_columns,
-                    key_types,
-                    out,
-                    [&](const size_t) { return null_value; }
-                );
-            }
-
-            result = std::move(column);
+            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);
@@ -1494,11 +1434,13 @@ ColumnPtr SSDComplexKeyCacheDictionary::getColumn(
     return result;
 }
 
-template <typename AttributeType, typename OutputType, typename DefaultGetter>
+template <typename AttributeType, typename OutputType>
 void SSDComplexKeyCacheDictionary::getItemsNumberImpl(
     const size_t attribute_index,
-    const Columns & key_columns, const DataTypes & key_types,
-    ResultArrayType<OutputType> & out, DefaultGetter && get_default) const
+    const Columns & key_columns,
+    const DataTypes & key_types,
+    ResultArrayType<OutputType> & out,
+    DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const
 {
     assert(dict_struct.key);
     assert(key_columns.size() == key_types.size());
@@ -1509,7 +1451,7 @@ void SSDComplexKeyCacheDictionary::getItemsNumberImpl(
 
     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, get_default, now);
+    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;
 
@@ -1536,18 +1478,17 @@ void SSDComplexKeyCacheDictionary::getItemsNumberImpl(
             [&](const auto key)
             {
                 for (const size_t row : not_found_keys[key])
-                    out[row] = get_default(row);
+                    out[row] = default_value_extractor[row];
             },
             getLifetime());
 }
 
-template <typename DefaultGetter>
 void SSDComplexKeyCacheDictionary::getItemsStringImpl(
     const size_t attribute_index,
     const Columns & key_columns,
     const DataTypes & key_types,
     ColumnString * out,
-    DefaultGetter && get_default) const
+    DictionaryDefaultValueExtractor<StringRef> & default_value_extractor) const
 {
     dict_struct.validateKeyTypes(key_types);
 
@@ -1573,7 +1514,7 @@ void SSDComplexKeyCacheDictionary::getItemsStringImpl(
         {
             if (unlikely(default_index != default_rows.size() && default_rows[default_index] == row))
             {
-                auto to_insert = get_default(row);
+                auto to_insert = default_value_extractor[row];
                 out->insertData(to_insert.data, to_insert.size);
                 ++default_index;
             }
@@ -1616,7 +1557,7 @@ void SSDComplexKeyCacheDictionary::getItemsStringImpl(
         SCOPE_EXIT(tmp_keys_pool.rollback(key));
         if (unlikely(default_index != default_rows.size() && default_rows[default_index] == row))
         {
-            auto to_insert = get_default(row);
+            auto to_insert = default_value_extractor[row];
             out->insertData(to_insert.data, to_insert.size);
             ++default_index;
         }
@@ -1630,13 +1571,13 @@ void SSDComplexKeyCacheDictionary::getItemsStringImpl(
         }
         else
         {
-            auto to_insert = get_default(row);
+            auto to_insert = default_value_extractor[row];
             out->insertData(to_insert.data, to_insert.size);
         }
     }
 }
 
-ColumnUInt8::Ptr SSDComplexKeyCacheDictionary::has(const Columns & key_columns, const DataTypes & key_types) const
+ColumnUInt8::Ptr SSDComplexKeyCacheDictionary::hasKeys(const Columns & key_columns, const DataTypes & key_types) const
 {
     dict_struct.validateKeyTypes(key_types);
 
@@ -1652,7 +1593,7 @@ ColumnUInt8::Ptr SSDComplexKeyCacheDictionary::has(const Columns & key_columns,
 
     std::unordered_map<KeyRef, std::vector<size_t>> not_found_keys;
     TemporalComplexKeysPool not_found_pool;
-    storage.has(key_columns, key_types, out, not_found_keys, not_found_pool, now);
+    storage.hasKeys(key_columns, key_types, out, not_found_keys, not_found_pool, now);
     if (not_found_keys.empty())
         return result;
 
diff --git a/src/Dictionaries/SSDComplexKeyCacheDictionary.h b/src/Dictionaries/SSDComplexKeyCacheDictionary.h
index a12a9789c45..9e33e1dbdfb 100644
--- a/src/Dictionaries/SSDComplexKeyCacheDictionary.h
+++ b/src/Dictionaries/SSDComplexKeyCacheDictionary.h
@@ -2,11 +2,13 @@
 
 #if defined(OS_LINUX) || defined(__FreeBSD__)
 
-#include "DictionaryStructure.h"
-#include "IDictionary.h"
-#include "IDictionarySource.h"
 #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>
@@ -19,13 +21,11 @@
 #include <Dictionaries/BucketCache.h>
 #include <ext/scope_guard.h>
 #include <IO/HashingWriteBuffer.h>
-#include <list>
 #include <pcg_random.hpp>
-#include <Poco/Logger.h>
-#include <shared_mutex>
-#include <variant>
-#include <vector>
-
+#include "IDictionary.h"
+#include "IDictionarySource.h"
+#include "DictionaryStructure.h"
+#include "DictionaryHelpers.h"
 
 namespace DB
 {
@@ -313,7 +313,7 @@ public:
     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 & get_default,
+            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,
@@ -321,7 +321,7 @@ public:
             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 Columns & key_columns, const DataTypes & key_types,
+    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;
 
@@ -459,7 +459,7 @@ public:
             TemporalComplexKeysPool & not_found_pool,
             std::vector<size_t> & default_ids, std::chrono::system_clock::time_point now) const;
 
-    void has(const Columns & key_columns, const DataTypes & key_types, ResultArrayType<UInt8> & out,
+    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;
 
@@ -569,16 +569,16 @@ public:
 
     std::exception_ptr getLastException() const override { return storage.getLastException(); }
 
-    DictionaryIdentifierType getIdentifierType() const override { return DictionaryIdentifierType::complex; }
+    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_untyped) const override;
+        const ColumnPtr default_values_column) const override;
 
-    ColumnUInt8::Ptr has(const Columns & key_columns, const DataTypes & key_types) const override;
+    ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
     template <typename T>
     using ResultArrayType = SSDComplexKeyCacheStorage::ResultArrayType<T>;
@@ -593,17 +593,20 @@ private:
     AttributeValueVariant createAttributeNullValueWithType(const AttributeUnderlyingType type, const Field & null_value);
     void createAttributes();
 
-    template <typename AttributeType, typename OutputType, typename DefaultGetter>
+    template <typename AttributeType, typename OutputType>
     void getItemsNumberImpl(
         const size_t attribute_index,
-        const Columns & key_columns, const DataTypes & key_types,
-        ResultArrayType<OutputType> & out, DefaultGetter && get_default) const;
+        const Columns & key_columns,
+        const DataTypes & key_types,
+        ResultArrayType<OutputType> & out,
+        DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const;
 
-    template <typename DefaultGetter>
     void getItemsStringImpl(
         const size_t attribute_index,
-        const Columns & key_columns, const DataTypes & key_types,
-        ColumnString * out, DefaultGetter && get_default) const;
+        const Columns & key_columns,
+        const DataTypes & key_types,
+        ColumnString * out,
+        DictionaryDefaultValueExtractor<StringRef> & default_value_extractor) const;
 
     const std::string name;
     const DictionaryStructure dict_struct;
diff --git a/src/Functions/FunctionsExternalDictionaries.h b/src/Functions/FunctionsExternalDictionaries.h
index 2130771251a..e48265aa2b7 100644
--- a/src/Functions/FunctionsExternalDictionaries.h
+++ b/src/Functions/FunctionsExternalDictionaries.h
@@ -192,21 +192,21 @@ private:
             return result_type->createColumn();
 
         auto dictionary = helper.getDictionary(arguments[0]);
-        auto dictionary_identifier_type = dictionary->getIdentifierType();
+        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);
 
-        if (dictionary_identifier_type == DictionaryIdentifierType::simple)
+        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};
 
-            return dictionary->has({key_column}, {std::make_shared<DataTypeUInt64>()});
+            return dictionary->hasKeys({key_column}, {std::make_shared<DataTypeUInt64>()});
         }
-        else if (dictionary_identifier_type == DictionaryIdentifierType::complex)
+        else if (dictionary_key_type == DictionaryKeyType::complex)
         {
             if (!key_column_type.isTuple())
                 throw Exception{"Second argument of function " + getName() + " must be " + dictionary->getStructure().getKeyDescription(),
@@ -218,7 +218,7 @@ private:
             const auto & key_columns = typeid_cast<const ColumnTuple &>(*key_column_full).getColumnsCopy();
             const auto & key_types = static_cast<const DataTypeTuple &>(*key_column_with_type.type).getElements();
 
-            return dictionary->has(key_columns, key_types);
+            return dictionary->hasKeys(key_columns, key_types);
         }
         else
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Has not supported for range dictionary", dictionary->getDictionaryID().getNameForLogs());
@@ -296,16 +296,14 @@ public:
                     + getName() + ", must be UInt64 or tuple(...).",
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
 
-        auto dictionary_identifier_type = dictionary->getIdentifierType();
+        auto dictionary_key_type = dictionary->getKeyType();
 
         size_t current_arguments_index = 3;
 
-        /// TODO: Add more information to error messages
-
         ColumnPtr range_col = nullptr;
         DataTypePtr range_col_type = nullptr;
 
-        if (dictionary_identifier_type == DictionaryIdentifierType::range)
+        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};
@@ -336,11 +334,11 @@ public:
         const ColumnWithTypeAndName & key_col_with_type = arguments[2];
         const auto key_column = key_col_with_type.column;
 
-        if (dictionary_identifier_type == DictionaryIdentifierType::simple)
+        if (dictionary_key_type == DictionaryKeyType::simple)
         {
             result = dictionary->getColumn(attribute_name, result_type, {key_column}, {std::make_shared<DataTypeUInt64>()}, default_col);
         }
-        else if (dictionary_identifier_type == DictionaryIdentifierType::complex)
+        else if (dictionary_key_type == DictionaryKeyType::complex)
         {
             /// Functions in external dictionaries_loader only support full-value (not constant) columns with keys.
             ColumnPtr key_column_full = key_col_with_type.column->convertToFullColumnIfConst();
@@ -350,7 +348,7 @@ public:
 
             result = dictionary->getColumn(attribute_name, result_type, key_columns, key_types, default_col);
         }
-        else if (dictionary_identifier_type == DictionaryIdentifierType::range)
+        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);

From b7a150cc6311beadda6ae9b8633068195fb41c16 Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Sat, 23 Jan 2021 19:47:33 +0300
Subject: [PATCH 554/611] Updated DictionaryDefaultValueExtractor interface

---
 src/Dictionaries/CacheDictionary.cpp          | 15 ++---
 src/Dictionaries/CacheDictionary.h            |  6 +-
 .../ComplexKeyCacheDictionary.cpp             | 15 ++---
 src/Dictionaries/ComplexKeyCacheDictionary.h  |  6 +-
 .../ComplexKeyDirectDictionary.cpp            | 10 +--
 .../ComplexKeyHashedDictionary.cpp            | 11 ++--
 src/Dictionaries/ComplexKeyHashedDictionary.h |  4 +-
 src/Dictionaries/DictionaryBlockInputStream.h |  2 +-
 src/Dictionaries/DictionaryHelpers.h          | 65 +++++++++----------
 src/Dictionaries/DirectDictionary.cpp         |  9 +--
 src/Dictionaries/FlatDictionary.cpp           | 13 ++--
 src/Dictionaries/FlatDictionary.h             |  4 +-
 src/Dictionaries/HashedDictionary.cpp         | 17 ++---
 src/Dictionaries/HashedDictionary.h           |  8 +--
 src/Dictionaries/IDictionary.h                | 31 +++++----
 src/Dictionaries/IPAddressDictionary.cpp      | 14 ++--
 src/Dictionaries/IPAddressDictionary.h        |  8 +--
 src/Dictionaries/PolygonDictionary.cpp        |  7 +-
 src/Dictionaries/RangeHashedDictionary.cpp    | 17 +++--
 src/Dictionaries/RangeHashedDictionary.h      |  4 +-
 src/Dictionaries/SSDCacheDictionary.cpp       |  5 +-
 .../SSDComplexKeyCacheDictionary.cpp          | 12 ++--
 .../SSDComplexKeyCacheDictionary.h            |  6 +-
 23 files changed, 145 insertions(+), 144 deletions(-)

diff --git a/src/Dictionaries/CacheDictionary.cpp b/src/Dictionaries/CacheDictionary.cpp
index eac2cd1b41d..ee9408e0c91 100644
--- a/src/Dictionaries/CacheDictionary.cpp
+++ b/src/Dictionaries/CacheDictionary.cpp
@@ -271,11 +271,10 @@ ColumnPtr CacheDictionary::getColumn(
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
-        using ValueType = DictionaryValueType<AttributeType>;
         using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
- 
-        const auto null_value = static_cast<ValueType>(std::get<AttributeType>(attribute.null_value));
-        DictionaryDefaultValueExtractor<ValueType> default_value_extractor(null_value, default_values_column);
+
+        const auto null_value = std::get<AttributeType>(attribute.null_value);
+        DictionaryDefaultValueExtractor<AttributeType> default_value_extractor(null_value, default_values_column);
 
         auto column = ColumnProvider::getColumn(dictionary_attribute, keys_size);
 
@@ -297,12 +296,12 @@ ColumnPtr CacheDictionary::getColumn(
     return result;
 }
 
-template <typename AttributeType, typename OutputType>
+template <typename AttributeType, typename OutputType, typename DefaultValueExtractor>
 void CacheDictionary::getItemsNumberImpl(
-    Attribute & attribute, 
+    Attribute & attribute,
     const PaddedPODArray<Key> & ids,
     ResultArrayType<OutputType> & out,
-    DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const
+    DefaultValueExtractor & default_value_extractor) const
 {
     /// First fill everything with default values
     const auto rows = ext::size(ids);
@@ -427,7 +426,7 @@ void CacheDictionary::getItemsString(
     Attribute & attribute,
     const PaddedPODArray<Key> & ids,
     ColumnString * out,
-    DictionaryDefaultValueExtractor<StringRef> & default_value_extractor) const
+    DictionaryDefaultValueExtractor<String> & default_value_extractor) const
 {
     const auto rows = ext::size(ids);
 
diff --git a/src/Dictionaries/CacheDictionary.h b/src/Dictionaries/CacheDictionary.h
index 9f0b3fa4f63..35d38f03cbe 100644
--- a/src/Dictionaries/CacheDictionary.h
+++ b/src/Dictionaries/CacheDictionary.h
@@ -204,18 +204,18 @@ private:
     /* NOLINTNEXTLINE(readability-convert-member-functions-to-static) */
     Attribute createAttributeWithTypeAndName(const AttributeUnderlyingType type, const String & name, const Field & null_value);
 
-    template <typename AttributeType, typename OutputType>
+    template <typename AttributeType, typename OutputType, typename DefaultValueExtractor>
     void getItemsNumberImpl(
         Attribute & attribute,
         const PaddedPODArray<Key> & ids,
         ResultArrayType<OutputType> & out,
-        DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const;
+        DefaultValueExtractor & default_value_extractor) const;
 
     void getItemsString(
         Attribute & attribute,
         const PaddedPODArray<Key> & ids,
         ColumnString * out,
-        DictionaryDefaultValueExtractor<StringRef> & default_value_extractor) const;
+        DictionaryDefaultValueExtractor<String> & default_value_extractor) const;
 
     PaddedPODArray<Key> getCachedIds() const;
 
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary.cpp b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
index 6775f2b737b..ff5a0ed9356 100644
--- a/src/Dictionaries/ComplexKeyCacheDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
@@ -91,11 +91,10 @@ ColumnPtr ComplexKeyCacheDictionary::getColumn(
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
-        using ValueType = DictionaryValueType<AttributeType>;
-        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>; 
+        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
 
-        const auto null_value = ValueType{std::get<AttributeType>(attribute.null_values)};
-        DictionaryDefaultValueExtractor<ValueType> default_value_extractor(null_value, default_values_column);
+        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);
 
@@ -248,12 +247,12 @@ ColumnUInt8::Ptr ComplexKeyCacheDictionary::hasKeys(const Columns & key_columns,
 }
 
 
-template <typename AttributeType, typename OutputType>
+template <typename AttributeType, typename OutputType, typename DefaultValueExtractor>
 void ComplexKeyCacheDictionary::getItemsNumberImpl(
-    Attribute & attribute, 
+    Attribute & attribute,
     const Columns & key_columns,
     PaddedPODArray<OutputType> & out,
-    DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const
+    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;
@@ -335,7 +334,7 @@ void ComplexKeyCacheDictionary::getItemsString(
     Attribute & attribute,
     const Columns & key_columns,
     ColumnString * out,
-    DictionaryDefaultValueExtractor<StringRef> & default_value_extractor) const
+    DictionaryDefaultValueExtractor<String> & default_value_extractor) const
 {
     const auto rows_num = key_columns.front()->size();
     /// save on some allocations
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary.h b/src/Dictionaries/ComplexKeyCacheDictionary.h
index de6fb508e5a..48ffcb814ef 100644
--- a/src/Dictionaries/ComplexKeyCacheDictionary.h
+++ b/src/Dictionaries/ComplexKeyCacheDictionary.h
@@ -175,18 +175,18 @@ private:
 
     Attribute createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value);
 
-    template <typename AttributeType, typename OutputType>
+    template <typename AttributeType, typename OutputType, typename DefaultValueExtractor>
     void getItemsNumberImpl(
         Attribute & attribute,
         const Columns & key_columns,
         PaddedPODArray<OutputType> & out,
-        DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const;
+        DefaultValueExtractor & default_value_extractor) const;
 
     void getItemsString(
         Attribute & attribute,
         const Columns & key_columns,
         ColumnString * out,
-        DictionaryDefaultValueExtractor<StringRef> & default_value_extractor) const;
+        DictionaryDefaultValueExtractor<String> & default_value_extractor) const;
 
     template <typename PresentKeyHandler, typename AbsentKeyHandler>
     void update(
diff --git a/src/Dictionaries/ComplexKeyDirectDictionary.cpp b/src/Dictionaries/ComplexKeyDirectDictionary.cpp
index 6186b8b7dae..391b5c47980 100644
--- a/src/Dictionaries/ComplexKeyDirectDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyDirectDictionary.cpp
@@ -64,9 +64,10 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
         using AttributeType = typename Type::AttributeType;
         using ValueType = DictionaryValueType<AttributeType>;
         using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
- 
-        const auto null_value = std::get<ValueType>(attribute.null_values);
-        DictionaryDefaultValueExtractor<ValueType> default_value_extractor(null_value, default_values_column);
+
+        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);
 
@@ -94,7 +95,8 @@ ColumnPtr ComplexKeyDirectDictionary::getColumn(
             getItemsImpl<AttributeType, AttributeType>(
                 attribute,
                 key_columns,
-                [&](const size_t row, const auto value, bool is_null) {
+                [&](const size_t row, const auto value, bool is_null)
+                {
                     if (attribute.is_nullable)
                         (*vec_null_map_to)[row] = is_null;
 
diff --git a/src/Dictionaries/ComplexKeyHashedDictionary.cpp b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
index 76eaad1dcbc..01cc089b99a 100644
--- a/src/Dictionaries/ComplexKeyHashedDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
@@ -65,10 +65,11 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
         using ValueType = DictionaryValueType<AttributeType>;
-        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>; 
+        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
 
-        const auto null_value = std::get<ValueType>(attribute.null_values);
-        DictionaryDefaultValueExtractor<ValueType> default_value_extractor(null_value, default_values_column);
+        const auto attribute_null_value = std::get<ValueType>(attribute.null_values);
+        AttributeType null_value = attribute_null_value;
+        DictionaryDefaultValueExtractor<AttributeType> default_value_extractor(std::move(null_value), default_values_column);
 
         auto column = ColumnProvider::getColumn(dictionary_attribute, keys_size);
 
@@ -370,12 +371,12 @@ ComplexKeyHashedDictionary::createAttribute(const DictionaryAttribute & attribut
 }
 
 
-template <typename AttributeType, typename OutputType, typename ValueSetter>
+template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
 void ComplexKeyHashedDictionary::getItemsImpl(
     const Attribute & attribute,
     const Columns & key_columns,
     ValueSetter && set_value,
-    DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const
+    DefaultValueExtractor & default_value_extractor) const
 {
     const auto & attr = std::get<ContainerType<AttributeType>>(attribute.maps);
 
diff --git a/src/Dictionaries/ComplexKeyHashedDictionary.h b/src/Dictionaries/ComplexKeyHashedDictionary.h
index 63458c3c759..6acb6600189 100644
--- a/src/Dictionaries/ComplexKeyHashedDictionary.h
+++ b/src/Dictionaries/ComplexKeyHashedDictionary.h
@@ -140,12 +140,12 @@ private:
 
     Attribute createAttribute(const DictionaryAttribute & attribute, const Field & null_value);
 
-    template <typename AttributeType, typename OutputType, typename ValueSetter>
+    template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
     void getItemsImpl(
         const Attribute & attribute,
         const Columns & key_columns,
         ValueSetter && set_value,
-        DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const;
+        DefaultValueExtractor & default_value_extractor) const;
 
     template <typename T>
     bool setAttributeValueImpl(Attribute & attribute, const StringRef key, const T value);
diff --git a/src/Dictionaries/DictionaryBlockInputStream.h b/src/Dictionaries/DictionaryBlockInputStream.h
index b5ab19acb6f..f045d47c2c2 100644
--- a/src/Dictionaries/DictionaryBlockInputStream.h
+++ b/src/Dictionaries/DictionaryBlockInputStream.h
@@ -233,7 +233,7 @@ Block DictionaryBlockInputStream<Key>::fillBlock(
             else
             {
                 column = dictionary->getColumn(
-                    attribute.name, 
+                    attribute.name,
                     attribute.type,
                     keys,
                     data_types,
diff --git a/src/Dictionaries/DictionaryHelpers.h b/src/Dictionaries/DictionaryHelpers.h
index 001a2a804b7..587a4dc8f5a 100644
--- a/src/Dictionaries/DictionaryHelpers.h
+++ b/src/Dictionaries/DictionaryHelpers.h
@@ -10,11 +10,16 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int TYPE_MISMATCH;
+}
+
 /**
  * In Dictionaries implementation String attribute is stored in arena and StringRefs are pointing to it.
  */
 template <typename DictionaryAttributeType>
-using DictionaryValueType = 
+using DictionaryValueType =
     std::conditional_t<std::is_same_v<DictionaryAttributeType, String>, StringRef, DictionaryAttributeType>;
 
 /**
@@ -24,9 +29,9 @@ template <typename DictionaryAttributeType>
 class DictionaryAttributeColumnProvider
 {
 public:
-    using ColumnType = 
+    using ColumnType =
         std::conditional_t<std::is_same_v<DictionaryAttributeType, String>, ColumnString,
-            std::conditional_t<IsDecimalNumber<DictionaryAttributeType>, ColumnDecimal<DictionaryAttributeType>, 
+            std::conditional_t<IsDecimalNumber<DictionaryAttributeType>, ColumnDecimal<DictionaryAttributeType>,
                 ColumnVector<DictionaryAttributeType>>>;
 
     using ColumnPtr = typename ColumnType::MutablePtr;
@@ -50,66 +55,60 @@ public:
 };
 
 /**
- * DictionaryDefaultValueExtractor used to simplify getting default value for IDictionary function `getColumn`.
- * Provides interface for getting default value with operator[];
- * 
- * If default_values_column is not null in constructor than this column values will be used as default values.
- * If default_values_column is null then attribute_default_value will be used.
+  * DictionaryDefaultValueExtractor used to simplify getting default value for IDictionary function `getColumn`.
+  * Provides interface for getting default value with operator[];
+  *
+  * If default_values_column is null then attribute_default_value will be used.
+  * If default_values_column is not null in constructor than this column values will be used as default values.
  */
-template <typename DefaultValueType>
+template <typename DictionaryAttributeType>
 class DictionaryDefaultValueExtractor
 {
-    using ResultColumnType = 
-        std::conditional_t< std::is_same_v<DefaultValueType, StringRef>, ColumnString,
-            std::conditional_t<IsDecimalNumber<DefaultValueType>, ColumnDecimal<DefaultValueType>,
-                ColumnVector<DefaultValueType>>>;
+    using DefaultColumnType = typename DictionaryAttributeColumnProvider<DictionaryAttributeType>::ColumnType;
 
 public:
-    DictionaryDefaultValueExtractor(DefaultValueType attribute_default_value, ColumnPtr default_values_column_ = nullptr)
+    DictionaryDefaultValueExtractor(DictionaryAttributeType attribute_default_value, ColumnPtr default_values_column_ = nullptr)
     {
-        if (default_values_column_ != nullptr)
+        if (!default_values_column_)
+            default_value = { std::move(attribute_default_value) };
+        else
         {
-            if (const auto * const default_col = checkAndGetColumn<ResultColumnType>(*default_values_column))
+            if (const auto * const default_col = checkAndGetColumn<DefaultColumnType>(*default_values_column))
             {
                 default_values_column = default_col;
             }
-            else if (const auto * const default_col_const = checkAndGetColumnConst<ResultColumnType>(default_values_column_.get()))
+            else if (const auto * const default_col_const = checkAndGetColumnConst<DefaultColumnType>(default_values_column_.get()))
             {
-                /// TODO: Check String lifetime safety
-                /// DefaultValueType for StringColumn is StringRef, but const column getValue will return String
-                using ConstColumnValue = std::conditional_t<std::is_same_v<DefaultValueType, StringRef>, String, DefaultValueType>;
-                default_value = std::make_optional<DefaultValueType>(default_col_const->template getValue<ConstColumnValue>());
+                default_value = { default_col_const->template getValue<DictionaryAttributeType>() };
             }
             else
-                throw Exception{"Type of default column is not the same as result type.", ErrorCodes::TYPE_MISMATCH};
+                throw Exception{"Type of default column is not the same as dictionary attribute type.", ErrorCodes::TYPE_MISMATCH};
         }
-        else
-            default_value = std::make_optional<DefaultValueType>(attribute_default_value);
     }
 
-    DefaultValueType operator[](size_t row)
+    DictionaryValueType<DictionaryAttributeType> operator[](size_t row)
     {
         if (default_value)
-            return *default_value;
-        
-        if constexpr (std::is_same_v<ResultColumnType, ColumnString>)
+            return static_cast<DictionaryAttributeType>(*default_value);
+
+        if constexpr (std::is_same_v<DefaultColumnType, ColumnString>)
             return default_values_column->getDataAt(row);
         else
             return default_values_column->getData()[row];
     }
 private:
-    const ResultColumnType * default_values_column = nullptr;
-    std::optional<DefaultValueType> default_value = {};
+    const DefaultColumnType * default_values_column = nullptr;
+    std::optional<DictionaryAttributeType> default_value = {};
 };
 
 /**
- * Returns ColumnVector data as PaddedPodArray. 
- * 
+ * Returns ColumnVector data as PaddedPodArray.
+
  * If column is constant parameter backup_storage is used to store values.
  */
 template <typename T>
 static const PaddedPODArray<T> & getColumnVectorData(
-    const IDictionaryBase * dictionary [[maybe_unused]],
+    const IDictionaryBase * dictionary,
     const ColumnPtr column,
     PaddedPODArray<T> & backup_storage)
 {
diff --git a/src/Dictionaries/DirectDictionary.cpp b/src/Dictionaries/DirectDictionary.cpp
index 0d767f322f7..b61f256b0cc 100644
--- a/src/Dictionaries/DirectDictionary.cpp
+++ b/src/Dictionaries/DirectDictionary.cpp
@@ -39,7 +39,7 @@ void DirectDictionary::toParent(const PaddedPODArray<Key> & ids, PaddedPODArray<
 {
     const auto null_value = std::get<UInt64>(hierarchical_attribute->null_values);
     DictionaryDefaultValueExtractor<UInt64> extractor(null_value);
-    
+
     getItemsImpl<UInt64, UInt64>(
         *hierarchical_attribute,
         ids,
@@ -166,9 +166,10 @@ ColumnPtr DirectDictionary::getColumn(
 
         using ValueType = DictionaryValueType<AttributeType>;
         using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
- 
-        const auto null_value = std::get<ValueType>(attribute.null_values);
-        DictionaryDefaultValueExtractor<ValueType> default_value_extractor(null_value, default_values_column);
+
+        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);
 
diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index 3f6dad9a20d..f4f50a69598 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -131,9 +131,10 @@ ColumnPtr FlatDictionary::getColumn(
         using AttributeType = typename Type::AttributeType;
         using ValueType = DictionaryValueType<AttributeType>;
         using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
-        
-        const auto null_value = std::get<ValueType>(attribute.null_values);
-        DictionaryDefaultValueExtractor<ValueType> default_value_extractor(null_value, default_values_column);
+
+        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, size);
 
@@ -153,7 +154,7 @@ ColumnPtr FlatDictionary::getColumn(
 
             getItemsImpl<ValueType, ValueType>(
                 attribute,
-                ids, 
+                ids,
                 [&](const size_t row, const auto value) { out[row] = value; },
                 default_value_extractor);
         }
@@ -404,12 +405,12 @@ FlatDictionary::Attribute FlatDictionary::createAttribute(const DictionaryAttrib
 }
 
 
-template <typename AttributeType, typename OutputType, typename ValueSetter>
+template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
 void FlatDictionary::getItemsImpl(
     const Attribute & attribute,
     const PaddedPODArray<Key> & ids,
     ValueSetter && set_value,
-    DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const
+    DefaultValueExtractor & default_value_extractor) const
 {
     const auto & attr = std::get<ContainerType<AttributeType>>(attribute.arrays);
     const auto rows = ext::size(ids);
diff --git a/src/Dictionaries/FlatDictionary.h b/src/Dictionaries/FlatDictionary.h
index 9e719a4368d..90123ce08bf 100644
--- a/src/Dictionaries/FlatDictionary.h
+++ b/src/Dictionaries/FlatDictionary.h
@@ -148,12 +148,12 @@ private:
 
     Attribute createAttribute(const DictionaryAttribute& attribute, const Field & null_value);
 
-    template <typename AttributeType, typename OutputType, typename ValueSetter>
+    template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
     void getItemsImpl(
         const Attribute & attribute,
         const PaddedPODArray<Key> & ids,
         ValueSetter && set_value,
-        DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const;
+        DefaultValueExtractor & default_value_extractor) const;
 
     template <typename T>
     void resize(Attribute & attribute, const Key id);
diff --git a/src/Dictionaries/HashedDictionary.cpp b/src/Dictionaries/HashedDictionary.cpp
index 22bcd3a602c..5a9f9a02066 100644
--- a/src/Dictionaries/HashedDictionary.cpp
+++ b/src/Dictionaries/HashedDictionary.cpp
@@ -152,9 +152,10 @@ ColumnPtr HashedDictionary::getColumn(
         using AttributeType = typename Type::AttributeType;
         using ValueType = DictionaryValueType<AttributeType>;
         using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
- 
-        const auto null_value = std::get<ValueType>(attribute.null_values);
-        DictionaryDefaultValueExtractor<ValueType> default_value_extractor(null_value, default_values_column);
+
+        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, size);
 
@@ -178,7 +179,7 @@ ColumnPtr HashedDictionary::getColumn(
                 [&](const size_t row, const auto value) { return out[row] = value; },
                 default_value_extractor);
         }
-        
+
         result = std::move(column);
     };
 
@@ -518,12 +519,12 @@ HashedDictionary::Attribute HashedDictionary::createAttribute(const DictionaryAt
 }
 
 
-template <typename AttributeType, typename OutputType, typename MapType, typename ValueSetter>
+template <typename AttributeType, typename OutputType, typename MapType, typename ValueSetter, typename DefaultValueExtractor>
 void HashedDictionary::getItemsAttrImpl(
     const MapType & attr,
     const PaddedPODArray<Key> & ids,
     ValueSetter && set_value,
-    DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const
+    DefaultValueExtractor & default_value_extractor) const
 {
     const auto rows = ext::size(ids);
 
@@ -536,12 +537,12 @@ void HashedDictionary::getItemsAttrImpl(
     query_count.fetch_add(rows, std::memory_order_relaxed);
 }
 
-template <typename AttributeType, typename OutputType, typename ValueSetter>
+template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
 void HashedDictionary::getItemsImpl(
     const Attribute & attribute,
     const PaddedPODArray<Key> & ids,
     ValueSetter && set_value,
-    DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const
+    DefaultValueExtractor & default_value_extractor) const
 {
     if (!sparse)
         return getItemsAttrImpl<AttributeType, OutputType>(*std::get<CollectionPtrType<AttributeType>>(attribute.maps), ids, set_value, default_value_extractor);
diff --git a/src/Dictionaries/HashedDictionary.h b/src/Dictionaries/HashedDictionary.h
index fd8bc0c10b1..97b329a8b25 100644
--- a/src/Dictionaries/HashedDictionary.h
+++ b/src/Dictionaries/HashedDictionary.h
@@ -182,19 +182,19 @@ private:
 
     Attribute createAttribute(const DictionaryAttribute& attribute, const Field & null_value);
 
-    template <typename AttributeType, typename OutputType, typename MapType, typename ValueSetter>
+    template <typename AttributeType, typename OutputType, typename MapType, typename ValueSetter, typename DefaultValueExtractor>
     void getItemsAttrImpl(
         const MapType & attr,
         const PaddedPODArray<Key> & ids,
         ValueSetter && set_value,
-        DictionaryDefaultValueExtractor<AttributeType> & extractor) const;
+        DefaultValueExtractor & default_value_extractor) const;
 
-    template <typename AttributeType, typename OutputType, typename ValueSetter>
+    template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
     void getItemsImpl(
         const Attribute & attribute,
         const PaddedPODArray<Key> & ids,
         ValueSetter && set_value,
-        DictionaryDefaultValueExtractor<AttributeType> & extractor) const;
+        DefaultValueExtractor & default_value_extractor) const;
 
     template <typename T>
     bool setAttributeValueImpl(Attribute & attribute, const Key id, const T value);
diff --git a/src/Dictionaries/IDictionary.h b/src/Dictionaries/IDictionary.h
index 4c03b7cf2ad..e0e4c7eb880 100644
--- a/src/Dictionaries/IDictionary.h
+++ b/src/Dictionaries/IDictionary.h
@@ -22,21 +22,20 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int NOT_IMPLEMENTED;
-    extern const int TYPE_MISMATCH;
 }
 
 struct IDictionaryBase;
 using DictionaryPtr = std::unique_ptr<IDictionaryBase>;
 
-/** DictionaryKeyType provides IDictionary client information about 
-  *  which key type is supported by dictionary.
-  * 
-  *  Simple is for dictionaries that support UInt64 key column.
-  * 
-  *  Complex is for dictionaries that support any combination of key columns.
-  * 
-  *  Range is for dictionary that support combination of UInt64 key column,
-  *  and Integer representable range key column.
+/** DictionaryKeyType provides IDictionary client information about
+  * which key type is supported by dictionary.
+  *
+  * Simple is for dictionaries that support UInt64 key column.
+  *
+  * Complex is for dictionaries that support any combination of key columns.
+  *
+  * Range is for dictionary that support combination of UInt64 key column,
+  * and numeric representable range key column.
   */
 enum class DictionaryKeyType
 {
@@ -47,7 +46,7 @@ enum class DictionaryKeyType
 
 /**
  * Base class for Dictionaries implementation.
- */ 
+ */
 struct IDictionaryBase : public IExternalLoadable
 {
     using Key = UInt64;
@@ -109,11 +108,11 @@ struct IDictionaryBase : public IExternalLoadable
       */
     virtual DictionaryKeyType getKeyType() const = 0;
 
-    /** Subclass must validate key columns and keys types 
+    /** Subclass must validate key columns and keys types
       * and return column representation of dictionary attribute.
-      * 
+      *
       * Parameter default_values_column must be used to provide default values
-      * for keys that are not in dictionary. If null pointer is passed, 
+      * for keys that are not in dictionary. If null pointer is passed,
       * then default attribute value must be used.
       */
     virtual ColumnPtr getColumn(
@@ -123,8 +122,8 @@ struct IDictionaryBase : public IExternalLoadable
         const DataTypes & key_types,
         const ColumnPtr default_values_column) const = 0;
 
-    /** Subclass must validate key columns and key types and return ColumnUInt8 that 
-      * is bitmask representation of is key in dictionary or not. 
+    /** Subclass must validate key columns and key types and return ColumnUInt8 that
+      * is bitmask representation of is key in dictionary or not.
       * If key is in dictionary then value of associated row will be 1, otherwise 0.
       */
     virtual ColumnUInt8::Ptr hasKeys(
diff --git a/src/Dictionaries/IPAddressDictionary.cpp b/src/Dictionaries/IPAddressDictionary.cpp
index 468d720f69d..b59fa85cc51 100644
--- a/src/Dictionaries/IPAddressDictionary.cpp
+++ b/src/Dictionaries/IPAddressDictionary.cpp
@@ -289,10 +289,10 @@ ColumnPtr IPAddressDictionary::getColumn(
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
         using ValueType = DictionaryValueType<AttributeType>;
-        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>; 
+        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
 
-        const auto null_value = ValueType{std::get<AttributeType>(attribute.null_values)};
-        DictionaryDefaultValueExtractor<ValueType> default_value_extractor(null_value, default_values_column);
+        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, size);
 
@@ -637,12 +637,12 @@ const uint8_t * IPAddressDictionary::getIPv6FromOffset(const IPAddressDictionary
     return reinterpret_cast<const uint8_t *>(&ipv6_col[i * IPV6_BINARY_LENGTH]);
 }
 
-template <typename AttributeType, typename OutputType, typename ValueSetter>
+template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
 void IPAddressDictionary::getItemsByTwoKeyColumnsImpl(
     const Attribute & attribute,
     const Columns & key_columns,
     ValueSetter && set_value,
-    DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const
+    DefaultValueExtractor & default_value_extractor) const
 {
     const auto first_column = key_columns.front();
     const auto rows = first_column->size();
@@ -718,12 +718,12 @@ void IPAddressDictionary::getItemsByTwoKeyColumnsImpl(
     }
 }
 
-template <typename AttributeType, typename OutputType, typename ValueSetter>
+template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
 void IPAddressDictionary::getItemsImpl(
     const Attribute & attribute,
     const Columns & key_columns,
     ValueSetter && set_value,
-    DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const
+    DefaultValueExtractor & default_value_extractor) const
 {
     const auto first_column = key_columns.front();
     const auto rows = first_column->size();
diff --git a/src/Dictionaries/IPAddressDictionary.h b/src/Dictionaries/IPAddressDictionary.h
index 0694724aaca..445cea9910f 100644
--- a/src/Dictionaries/IPAddressDictionary.h
+++ b/src/Dictionaries/IPAddressDictionary.h
@@ -141,19 +141,19 @@ private:
 
     Attribute createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value);
 
-    template <typename AttributeType, typename OutputType, typename ValueSetter>
+    template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
     void getItemsByTwoKeyColumnsImpl(
         const Attribute & attribute,
         const Columns & key_columns,
         ValueSetter && set_value,
-        DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const;
+        DefaultValueExtractor & default_value_extractor) const;
 
-    template <typename AttributeType, typename OutputType, typename ValueSetter>
+    template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
     void getItemsImpl(
         const Attribute & attribute,
         const Columns & key_columns,
         ValueSetter && set_value,
-        DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const;
+        DefaultValueExtractor & default_value_extractor) const;
 
     template <typename T>
     void setAttributeValueImpl(Attribute & attribute, const T value);
diff --git a/src/Dictionaries/PolygonDictionary.cpp b/src/Dictionaries/PolygonDictionary.cpp
index 15af4680d9d..497a7483808 100644
--- a/src/Dictionaries/PolygonDictionary.cpp
+++ b/src/Dictionaries/PolygonDictionary.cpp
@@ -112,11 +112,10 @@ ColumnPtr IPolygonDictionary::getColumn(
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
-        using ValueType = DictionaryValueType<AttributeType>;
         using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
- 
-        const auto null_value = static_cast<ValueType>(std::get<AttributeType>(null_values[index]));
-        DictionaryDefaultValueExtractor<ValueType> default_value_extractor(null_value, default_values_column);
+
+        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);
 
diff --git a/src/Dictionaries/RangeHashedDictionary.cpp b/src/Dictionaries/RangeHashedDictionary.cpp
index a1f5c7a68fb..9fb1a57a381 100644
--- a/src/Dictionaries/RangeHashedDictionary.cpp
+++ b/src/Dictionaries/RangeHashedDictionary.cpp
@@ -124,10 +124,11 @@ ColumnPtr RangeHashedDictionary::getColumn(
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
         using ValueType = DictionaryValueType<AttributeType>;
-        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>; 
+        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
 
-        const auto null_value = std::get<ValueType>(attribute.null_values);
-        DictionaryDefaultValueExtractor<ValueType> default_value_extractor(null_value, default_values_column);
+        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);
 
@@ -138,7 +139,8 @@ ColumnPtr RangeHashedDictionary::getColumn(
             getItemsImpl<ValueType, ValueType>(
                 attribute,
                 modified_key_columns,
-                [&](const size_t row, const StringRef value, bool is_null) {
+                [&](const size_t row, const StringRef value, bool is_null)
+                {
                     if (attribute.is_nullable)
                         (*vec_null_map_to)[row] = is_null;
 
@@ -153,7 +155,8 @@ ColumnPtr RangeHashedDictionary::getColumn(
             getItemsImpl<ValueType, ValueType>(
                 attribute,
                 modified_key_columns,
-                [&](const size_t row, const auto value, bool is_null) {
+                [&](const size_t row, const auto value, bool is_null)
+                {
                     if (attribute.is_nullable)
                         (*vec_null_map_to)[row] = is_null;
 
@@ -313,12 +316,12 @@ RangeHashedDictionary::createAttribute(const DictionaryAttribute& attribute, con
     return attr;
 }
 
-template <typename AttributeType, typename OutputType, typename ValueSetter>
+template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
 void RangeHashedDictionary::getItemsImpl(
     const Attribute & attribute,
     const Columns & key_columns,
     ValueSetter && set_value,
-    DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const
+    DefaultValueExtractor & default_value_extractor) const
 {
     PaddedPODArray<Key> key_backup_storage;
     PaddedPODArray<RangeStorageType> range_backup_storage;
diff --git a/src/Dictionaries/RangeHashedDictionary.h b/src/Dictionaries/RangeHashedDictionary.h
index 8252ee24cd5..216559089f5 100644
--- a/src/Dictionaries/RangeHashedDictionary.h
+++ b/src/Dictionaries/RangeHashedDictionary.h
@@ -152,12 +152,12 @@ private:
 
     Attribute createAttribute(const DictionaryAttribute& attribute, const Field & null_value);
 
-    template <typename AttributeType, typename OutputType, typename ValueSetter>
+    template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
     void getItemsImpl(
         const Attribute & attribute,
         const Columns & key_columns,
         ValueSetter && set_value,
-        DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const;
+        DefaultValueExtractor & default_value_extractor) const;
 
     template <typename T>
     void setAttributeValueImpl(Attribute & attribute, const Key id, const Range & range, const Field & value);
diff --git a/src/Dictionaries/SSDCacheDictionary.cpp b/src/Dictionaries/SSDCacheDictionary.cpp
index c064ccb0e63..217ae6ca1f0 100644
--- a/src/Dictionaries/SSDCacheDictionary.cpp
+++ b/src/Dictionaries/SSDCacheDictionary.cpp
@@ -1348,11 +1348,10 @@ ColumnPtr SSDCacheDictionary::getColumn(
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
-        using ValueType = DictionaryValueType<AttributeType>;
         using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
 
-        const auto null_value = static_cast<ValueType>(std::get<AttributeType>(null_values[index]));
-        DictionaryDefaultValueExtractor<ValueType> default_value_extractor(null_value, default_values_column);
+        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);
 
diff --git a/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp b/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
index 1bff34b7cb3..a51df76c92f 100644
--- a/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
+++ b/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
@@ -1401,12 +1401,10 @@ ColumnPtr SSDComplexKeyCacheDictionary::getColumn(
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
-
-        using ValueType = DictionaryValueType<AttributeType>;
         using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
 
-        const auto null_value = static_cast<ValueType>(std::get<AttributeType>(null_values[index]));
-        DictionaryDefaultValueExtractor<ValueType> default_value_extractor(null_value, default_values_column);
+        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);
 
@@ -1434,13 +1432,13 @@ ColumnPtr SSDComplexKeyCacheDictionary::getColumn(
     return result;
 }
 
-template <typename AttributeType, typename OutputType>
+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,
-    DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const
+    DefaultValueExtractor & default_value_extractor) const
 {
     assert(dict_struct.key);
     assert(key_columns.size() == key_types.size());
@@ -1488,7 +1486,7 @@ void SSDComplexKeyCacheDictionary::getItemsStringImpl(
     const Columns & key_columns,
     const DataTypes & key_types,
     ColumnString * out,
-    DictionaryDefaultValueExtractor<StringRef> & default_value_extractor) const
+    DictionaryDefaultValueExtractor<String> & default_value_extractor) const
 {
     dict_struct.validateKeyTypes(key_types);
 
diff --git a/src/Dictionaries/SSDComplexKeyCacheDictionary.h b/src/Dictionaries/SSDComplexKeyCacheDictionary.h
index 9e33e1dbdfb..be65d823e34 100644
--- a/src/Dictionaries/SSDComplexKeyCacheDictionary.h
+++ b/src/Dictionaries/SSDComplexKeyCacheDictionary.h
@@ -593,20 +593,20 @@ private:
     AttributeValueVariant createAttributeNullValueWithType(const AttributeUnderlyingType type, const Field & null_value);
     void createAttributes();
 
-    template <typename AttributeType, typename OutputType>
+    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,
-        DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const;
+        DefaultValueExtractor & default_value_extractor) const;
 
     void getItemsStringImpl(
         const size_t attribute_index,
         const Columns & key_columns,
         const DataTypes & key_types,
         ColumnString * out,
-        DictionaryDefaultValueExtractor<StringRef> & default_value_extractor) const;
+        DictionaryDefaultValueExtractor<String> & default_value_extractor) const;
 
     const std::string name;
     const DictionaryStructure dict_struct;

From 6653e356a353d082f28d5cfa3c53d1c385808a13 Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Sat, 23 Jan 2021 20:08:27 +0300
Subject: [PATCH 555/611] Fixed build issues

---
 src/Dictionaries/ComplexKeyHashedDictionary.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Dictionaries/ComplexKeyHashedDictionary.cpp b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
index 01cc089b99a..a0784b5a417 100644
--- a/src/Dictionaries/ComplexKeyHashedDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyHashedDictionary.cpp
@@ -68,7 +68,7 @@ ColumnPtr ComplexKeyHashedDictionary::getColumn(
         using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
 
         const auto attribute_null_value = std::get<ValueType>(attribute.null_values);
-        AttributeType null_value = attribute_null_value;
+        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);

From 8e8d6f36ac4ace7f6fa0b7de7d874dbed7690056 Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Mon, 25 Jan 2021 11:18:07 +0300
Subject: [PATCH 556/611] Fixed DictionaryDefaultValueExtractor

---
 src/Dictionaries/DictionaryHelpers.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Dictionaries/DictionaryHelpers.h b/src/Dictionaries/DictionaryHelpers.h
index 587a4dc8f5a..3bc6c3bd344 100644
--- a/src/Dictionaries/DictionaryHelpers.h
+++ b/src/Dictionaries/DictionaryHelpers.h
@@ -69,11 +69,11 @@ class DictionaryDefaultValueExtractor
 public:
     DictionaryDefaultValueExtractor(DictionaryAttributeType attribute_default_value, ColumnPtr default_values_column_ = nullptr)
     {
-        if (!default_values_column_)
+        if (default_values_column_ == nullptr)
             default_value = { std::move(attribute_default_value) };
         else
         {
-            if (const auto * const default_col = checkAndGetColumn<DefaultColumnType>(*default_values_column))
+            if (const auto * const default_col = checkAndGetColumn<DefaultColumnType>(*default_values_column_))
             {
                 default_values_column = default_col;
             }

From 31881d24ad1aa7a5b09dc477d4f3107165e1720d Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Mon, 25 Jan 2021 15:58:26 +0300
Subject: [PATCH 557/611] Fixed clang errors

---
 src/Dictionaries/CacheDictionary.cpp              | 2 +-
 src/Dictionaries/ComplexKeyCacheDictionary.cpp    | 2 +-
 src/Dictionaries/DictionaryHelpers.h              | 6 ++++--
 src/Dictionaries/IPAddressDictionary.cpp          | 2 +-
 src/Dictionaries/PolygonDictionary.cpp            | 2 +-
 src/Dictionaries/SSDCacheDictionary.cpp           | 6 +++---
 src/Dictionaries/SSDComplexKeyCacheDictionary.cpp | 2 +-
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/Dictionaries/CacheDictionary.cpp b/src/Dictionaries/CacheDictionary.cpp
index ee9408e0c91..ad98d69fdf9 100644
--- a/src/Dictionaries/CacheDictionary.cpp
+++ b/src/Dictionaries/CacheDictionary.cpp
@@ -273,7 +273,7 @@ ColumnPtr CacheDictionary::getColumn(
         using AttributeType = typename Type::AttributeType;
         using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
 
-        const auto null_value = std::get<AttributeType>(attribute.null_value);
+        const auto & null_value = std::get<AttributeType>(attribute.null_value);
         DictionaryDefaultValueExtractor<AttributeType> default_value_extractor(null_value, default_values_column);
 
         auto column = ColumnProvider::getColumn(dictionary_attribute, keys_size);
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary.cpp b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
index ff5a0ed9356..a6478e96a15 100644
--- a/src/Dictionaries/ComplexKeyCacheDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
@@ -93,7 +93,7 @@ ColumnPtr ComplexKeyCacheDictionary::getColumn(
         using AttributeType = typename Type::AttributeType;
         using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
 
-        const auto null_value = std::get<AttributeType>(attribute.null_values);
+        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);
diff --git a/src/Dictionaries/DictionaryHelpers.h b/src/Dictionaries/DictionaryHelpers.h
index 3bc6c3bd344..726837b2418 100644
--- a/src/Dictionaries/DictionaryHelpers.h
+++ b/src/Dictionaries/DictionaryHelpers.h
@@ -67,6 +67,8 @@ class DictionaryDefaultValueExtractor
     using DefaultColumnType = typename DictionaryAttributeColumnProvider<DictionaryAttributeType>::ColumnType;
 
 public:
+    using DefaultValueType = DictionaryValueType<DictionaryAttributeType>;
+
     DictionaryDefaultValueExtractor(DictionaryAttributeType attribute_default_value, ColumnPtr default_values_column_ = nullptr)
     {
         if (default_values_column_ == nullptr)
@@ -86,10 +88,10 @@ public:
         }
     }
 
-    DictionaryValueType<DictionaryAttributeType> operator[](size_t row)
+    DefaultValueType operator[](size_t row)
     {
         if (default_value)
-            return static_cast<DictionaryAttributeType>(*default_value);
+            return static_cast<DefaultValueType>(*default_value);
 
         if constexpr (std::is_same_v<DefaultColumnType, ColumnString>)
             return default_values_column->getDataAt(row);
diff --git a/src/Dictionaries/IPAddressDictionary.cpp b/src/Dictionaries/IPAddressDictionary.cpp
index b59fa85cc51..fa9f8899142 100644
--- a/src/Dictionaries/IPAddressDictionary.cpp
+++ b/src/Dictionaries/IPAddressDictionary.cpp
@@ -291,7 +291,7 @@ ColumnPtr IPAddressDictionary::getColumn(
         using ValueType = DictionaryValueType<AttributeType>;
         using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
 
-        const auto null_value = std::get<AttributeType>(attribute.null_values);
+        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, size);
diff --git a/src/Dictionaries/PolygonDictionary.cpp b/src/Dictionaries/PolygonDictionary.cpp
index 497a7483808..e0d0fa0a0e6 100644
--- a/src/Dictionaries/PolygonDictionary.cpp
+++ b/src/Dictionaries/PolygonDictionary.cpp
@@ -114,7 +114,7 @@ ColumnPtr IPolygonDictionary::getColumn(
         using AttributeType = typename Type::AttributeType;
         using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
 
-        const auto null_value = std::get<AttributeType>(null_values[index]);
+        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);
diff --git a/src/Dictionaries/SSDCacheDictionary.cpp b/src/Dictionaries/SSDCacheDictionary.cpp
index 217ae6ca1f0..cbeea39decb 100644
--- a/src/Dictionaries/SSDCacheDictionary.cpp
+++ b/src/Dictionaries/SSDCacheDictionary.cpp
@@ -940,14 +940,14 @@ SSDCacheStorage::~SSDCacheStorage()
 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 & get_default, std::chrono::system_clock::time_point now) const
+      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, get_default, now);
+            partition->getValue<Out>(attribute_index, ids, out, found, default_value_extractor, now);
     }
 
     for (size_t i = 0; i < ids.size(); ++i)
@@ -1350,7 +1350,7 @@ ColumnPtr SSDCacheDictionary::getColumn(
         using AttributeType = typename Type::AttributeType;
         using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
 
-        const auto null_value = std::get<AttributeType>(null_values[index]);
+        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);
diff --git a/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp b/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
index a51df76c92f..cb22dd2be15 100644
--- a/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
+++ b/src/Dictionaries/SSDComplexKeyCacheDictionary.cpp
@@ -1403,7 +1403,7 @@ ColumnPtr SSDComplexKeyCacheDictionary::getColumn(
         using AttributeType = typename Type::AttributeType;
         using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
 
-        const auto null_value = std::get<AttributeType>(null_values[index]);
+        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);

From 67ffa4189e9776b008e06c1fabdaf0f006170648 Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Tue, 26 Jan 2021 13:47:12 +0300
Subject: [PATCH 558/611] Fixed clang build

---
 src/Dictionaries/ComplexKeyCacheDictionary.cpp |  2 +-
 src/Dictionaries/ComplexKeyCacheDictionary.h   |  2 +-
 src/Dictionaries/ComplexKeyDirectDictionary.h  |  4 ++--
 src/Dictionaries/ComplexKeyHashedDictionary.h  |  8 ++++----
 src/Dictionaries/DictionaryHelpers.h           | 16 +++++++++++-----
 src/Dictionaries/DictionaryStructure.cpp       |  2 +-
 src/Dictionaries/DirectDictionary.h            |  4 ++--
 src/Dictionaries/FlatDictionary.h              |  4 ++--
 src/Dictionaries/HashedDictionary.cpp          |  4 ++--
 src/Dictionaries/IPAddressDictionary.h         |  4 ++--
 src/Dictionaries/RangeHashedDictionary.h       |  9 +++++----
 11 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/Dictionaries/ComplexKeyCacheDictionary.cpp b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
index a6478e96a15..cbb57f81793 100644
--- a/src/Dictionaries/ComplexKeyCacheDictionary.cpp
+++ b/src/Dictionaries/ComplexKeyCacheDictionary.cpp
@@ -471,7 +471,7 @@ void ComplexKeyCacheDictionary::getItemsString(
     for (const auto row : ext::range(0, ext::size(keys_array)))
     {
         const StringRef key = keys_array[row];
-        const auto it = map.find(key);
+        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);
     }
diff --git a/src/Dictionaries/ComplexKeyCacheDictionary.h b/src/Dictionaries/ComplexKeyCacheDictionary.h
index 48ffcb814ef..f5643fc799c 100644
--- a/src/Dictionaries/ComplexKeyCacheDictionary.h
+++ b/src/Dictionaries/ComplexKeyCacheDictionary.h
@@ -96,7 +96,7 @@ public:
         const DataTypePtr & result_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnPtr default_untyped) const override;
+        const ColumnPtr default_values_column) const override;
 
     ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
diff --git a/src/Dictionaries/ComplexKeyDirectDictionary.h b/src/Dictionaries/ComplexKeyDirectDictionary.h
index 11158b23c5a..0e191321daa 100644
--- a/src/Dictionaries/ComplexKeyDirectDictionary.h
+++ b/src/Dictionaries/ComplexKeyDirectDictionary.h
@@ -108,9 +108,9 @@ private:
     void addAttributeSize(const Attribute & attribute);
 
     template <typename T>
-    void createAttributeImpl(Attribute & attribute, const Field & null_value);
+    static void createAttributeImpl(Attribute & attribute, const Field & null_value);
 
-    Attribute createAttribute(const DictionaryAttribute & attribute, const Field & null_value, const std::string & name);
+    static Attribute createAttribute(const DictionaryAttribute & attribute, const Field & null_value, const std::string & name);
 
     template <typename Pool>
     StringRef placeKeysInPool(
diff --git a/src/Dictionaries/ComplexKeyHashedDictionary.h b/src/Dictionaries/ComplexKeyHashedDictionary.h
index 6acb6600189..ecc720ca0b0 100644
--- a/src/Dictionaries/ComplexKeyHashedDictionary.h
+++ b/src/Dictionaries/ComplexKeyHashedDictionary.h
@@ -136,9 +136,9 @@ private:
     void calculateBytesAllocated();
 
     template <typename T>
-    void createAttributeImpl(Attribute & attribute, const Field & null_value);
+    static void createAttributeImpl(Attribute & attribute, const Field & null_value);
 
-    Attribute createAttribute(const DictionaryAttribute & 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(
@@ -148,9 +148,9 @@ private:
         DefaultValueExtractor & default_value_extractor) const;
 
     template <typename T>
-    bool setAttributeValueImpl(Attribute & attribute, const StringRef key, const T value);
+    static bool setAttributeValueImpl(Attribute & attribute, const StringRef key, const T value);
 
-    bool setAttributeValue(Attribute & attribute, const StringRef key, const Field & value);
+    static bool setAttributeValue(Attribute & attribute, const StringRef key, const Field & value);
 
     const Attribute & getAttribute(const std::string & attribute_name) const;
 
diff --git a/src/Dictionaries/DictionaryHelpers.h b/src/Dictionaries/DictionaryHelpers.h
index 726837b2418..0026d8848ca 100644
--- a/src/Dictionaries/DictionaryHelpers.h
+++ b/src/Dictionaries/DictionaryHelpers.h
@@ -70,18 +70,21 @@ public:
     using DefaultValueType = DictionaryValueType<DictionaryAttributeType>;
 
     DictionaryDefaultValueExtractor(DictionaryAttributeType attribute_default_value, ColumnPtr default_values_column_ = nullptr)
+        : default_value(std::move(attribute_default_value))
     {
         if (default_values_column_ == nullptr)
-            default_value = { std::move(attribute_default_value) };
+            use_default_value_from_column = false;
         else
         {
             if (const auto * const default_col = checkAndGetColumn<DefaultColumnType>(*default_values_column_))
             {
                 default_values_column = default_col;
+                use_default_value_from_column = true;
             }
             else if (const auto * const default_col_const = checkAndGetColumnConst<DefaultColumnType>(default_values_column_.get()))
             {
-                default_value = { default_col_const->template getValue<DictionaryAttributeType>() };
+                default_value = default_col_const->template getValue<DictionaryAttributeType>();
+                use_default_value_from_column = false;
             }
             else
                 throw Exception{"Type of default column is not the same as dictionary attribute type.", ErrorCodes::TYPE_MISMATCH};
@@ -90,8 +93,10 @@ public:
 
     DefaultValueType operator[](size_t row)
     {
-        if (default_value)
-            return static_cast<DefaultValueType>(*default_value);
+        if (!use_default_value_from_column)
+            return static_cast<DefaultValueType>(default_value);
+
+        assert(default_values_column != nullptr);
 
         if constexpr (std::is_same_v<DefaultColumnType, ColumnString>)
             return default_values_column->getDataAt(row);
@@ -99,8 +104,9 @@ public:
             return default_values_column->getData()[row];
     }
 private:
+    DictionaryAttributeType default_value;
     const DefaultColumnType * default_values_column = nullptr;
-    std::optional<DictionaryAttributeType> default_value = {};
+    bool use_default_value_from_column = false;
 };
 
 /**
diff --git a/src/Dictionaries/DictionaryStructure.cpp b/src/Dictionaries/DictionaryStructure.cpp
index 5c6863da651..95c2e0a3e09 100644
--- a/src/Dictionaries/DictionaryStructure.cpp
+++ b/src/Dictionaries/DictionaryStructure.cpp
@@ -226,7 +226,7 @@ const DictionaryAttribute & DictionaryStructure::getAttribute(const String& attr
     if (find_iter == attributes.end())
         throw Exception{"No such attribute '" + attribute_name + "'", ErrorCodes::BAD_ARGUMENTS};
 
-    auto & attribute = *find_iter;
+    const auto & attribute = *find_iter;
 
     if (!areTypesEqual(attribute.type, type))
         throw Exception{"Attribute type does not match, expected " + attribute.type->getName() + ", found " + type->getName(),
diff --git a/src/Dictionaries/DirectDictionary.h b/src/Dictionaries/DirectDictionary.h
index 9daa8415de8..c6f4c15556b 100644
--- a/src/Dictionaries/DirectDictionary.h
+++ b/src/Dictionaries/DirectDictionary.h
@@ -109,9 +109,9 @@ private:
     void addAttributeSize(const Attribute & attribute);
 
     template <typename T>
-    void createAttributeImpl(Attribute & attribute, const Field & null_value);
+    static void createAttributeImpl(Attribute & attribute, const Field & null_value);
 
-    Attribute createAttribute(const DictionaryAttribute& attribute, const Field & null_value, const std::string & name);
+    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(
diff --git a/src/Dictionaries/FlatDictionary.h b/src/Dictionaries/FlatDictionary.h
index 90123ce08bf..23bfa3d37b5 100644
--- a/src/Dictionaries/FlatDictionary.h
+++ b/src/Dictionaries/FlatDictionary.h
@@ -144,9 +144,9 @@ private:
     void calculateBytesAllocated();
 
     template <typename T>
-    void createAttributeImpl(Attribute & attribute, const Field & null_value);
+    static void createAttributeImpl(Attribute & attribute, const Field & null_value);
 
-    Attribute createAttribute(const DictionaryAttribute& 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(
diff --git a/src/Dictionaries/HashedDictionary.cpp b/src/Dictionaries/HashedDictionary.cpp
index 5a9f9a02066..b51f2414142 100644
--- a/src/Dictionaries/HashedDictionary.cpp
+++ b/src/Dictionaries/HashedDictionary.cpp
@@ -506,7 +506,7 @@ HashedDictionary::Attribute HashedDictionary::createAttribute(const DictionaryAt
     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 = [&, this](const auto &dictionary_attribute_type)
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
@@ -576,7 +576,7 @@ bool HashedDictionary::setAttributeValue(Attribute & attribute, const Key id, co
 {
     bool result = false;
 
-    auto type_call = [&](const auto &dictionary_attribute_type)
+    auto type_call = [&, this](const auto &dictionary_attribute_type)
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
diff --git a/src/Dictionaries/IPAddressDictionary.h b/src/Dictionaries/IPAddressDictionary.h
index 445cea9910f..629a850267c 100644
--- a/src/Dictionaries/IPAddressDictionary.h
+++ b/src/Dictionaries/IPAddressDictionary.h
@@ -137,9 +137,9 @@ private:
     void calculateBytesAllocated();
 
     template <typename T>
-    void createAttributeImpl(Attribute & attribute, const Field & null_value);
+    static void createAttributeImpl(Attribute & attribute, const Field & null_value);
 
-    Attribute createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value);
+    static Attribute createAttributeWithType(const AttributeUnderlyingType type, const Field & null_value);
 
     template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
     void getItemsByTwoKeyColumnsImpl(
diff --git a/src/Dictionaries/RangeHashedDictionary.h b/src/Dictionaries/RangeHashedDictionary.h
index 216559089f5..201e61df5e5 100644
--- a/src/Dictionaries/RangeHashedDictionary.h
+++ b/src/Dictionaries/RangeHashedDictionary.h
@@ -148,9 +148,10 @@ private:
     void calculateBytesAllocated();
 
     template <typename T>
-    void createAttributeImpl(Attribute & attribute, const Field & null_value);
+    static void createAttributeImpl(Attribute & attribute, const Field & null_value);
 
-    Attribute createAttribute(const DictionaryAttribute& 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(
@@ -160,9 +161,9 @@ private:
         DefaultValueExtractor & default_value_extractor) const;
 
     template <typename T>
-    void setAttributeValueImpl(Attribute & attribute, const Key id, const Range & range, const Field & value);
+    static void setAttributeValueImpl(Attribute & attribute, const Key id, const Range & range, const Field & value);
 
-    void setAttributeValue(Attribute & attribute, const Key id, const Range & range, const Field & value);
+    static void setAttributeValue(Attribute & attribute, const Key id, const Range & range, const Field & value);
 
     const Attribute & getAttribute(const std::string & attribute_name) const;
 

From f0b1bc88c72fb262572053812eb7e14293f8e056 Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Tue, 26 Jan 2021 20:49:02 +0300
Subject: [PATCH 559/611] Fixed style issues

---
 src/Dictionaries/RangeHashedDictionary.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Dictionaries/RangeHashedDictionary.h b/src/Dictionaries/RangeHashedDictionary.h
index 201e61df5e5..80cf47eb93b 100644
--- a/src/Dictionaries/RangeHashedDictionary.h
+++ b/src/Dictionaries/RangeHashedDictionary.h
@@ -150,7 +150,6 @@ private:
     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>

From eba2cbfaff066c0388c533ba438c9b85d4313af4 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <KochetovNicolai@users.noreply.github.com>
Date: Wed, 27 Jan 2021 16:26:16 +0300
Subject: [PATCH 560/611] Update neighbor.cpp

---
 src/Functions/neighbor.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Functions/neighbor.cpp b/src/Functions/neighbor.cpp
index 413eeb39e45..598e1225877 100644
--- a/src/Functions/neighbor.cpp
+++ b/src/Functions/neighbor.cpp
@@ -50,6 +50,8 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return false; }
 
+    /// We do not use default implementation for LowCardinality because this is not a pure function.
+    /// If used, optimization for LC may execute function only for dictionary, which gives wrong result.
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override

From 3b943cd00b742b7fe96ae85029b9e9aec0de5811 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Wed, 27 Jan 2021 16:59:44 +0300
Subject: [PATCH 561/611] Fix flaky test
 concat_nary_const_with_nonconst_segfault

---
 .../00086_concat_nary_const_with_nonconst_segfault.sql          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/queries/0_stateless/00086_concat_nary_const_with_nonconst_segfault.sql b/tests/queries/0_stateless/00086_concat_nary_const_with_nonconst_segfault.sql
index a9d4be129b9..2f0ef648983 100644
--- a/tests/queries/0_stateless/00086_concat_nary_const_with_nonconst_segfault.sql
+++ b/tests/queries/0_stateless/00086_concat_nary_const_with_nonconst_segfault.sql
@@ -1 +1 @@
-SELECT * FROM system.numbers_mt WHERE concat(materialize('1'), '...', toString(number)) LIKE '%10000000%' LIMIT 1
+SELECT extract(toString(number), '10000000') FROM system.numbers_mt WHERE concat(materialize('1'), '...', toString(number)) LIKE '%10000000%' LIMIT 1

From 9db9ce11dc030cec3c8ef4b830d7737d323fdedb Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Wed, 27 Jan 2021 17:10:06 +0300
Subject: [PATCH 562/611] Added functions parseDateTimeBestEffortUSOrZero,
 parseDateTimeBestEffortUSOrNull

---
 src/Functions/FunctionsConversion.cpp         |  4 ++-
 src/Functions/FunctionsConversion.h           | 19 ++++++++++--
 src/IO/parseDateTimeBestEffort.cpp            |  5 +++
 src/IO/parseDateTimeBestEffort.h              |  3 +-
 ...1_parse_date_time_best_effort_us.reference | 22 +++++++++++++
 .../01351_parse_date_time_best_effort_us.sql  | 31 +++++++++++++++++++
 6 files changed, 79 insertions(+), 5 deletions(-)

diff --git a/src/Functions/FunctionsConversion.cpp b/src/Functions/FunctionsConversion.cpp
index 257b852ecd8..0149649791a 100644
--- a/src/Functions/FunctionsConversion.cpp
+++ b/src/Functions/FunctionsConversion.cpp
@@ -92,9 +92,11 @@ void registerFunctionsConversion(FunctionFactory & factory)
     factory.registerFunction<FunctionToUUIDOrNull>();
 
     factory.registerFunction<FunctionParseDateTimeBestEffort>();
-    factory.registerFunction<FunctionParseDateTimeBestEffortUS>();
     factory.registerFunction<FunctionParseDateTimeBestEffortOrZero>();
     factory.registerFunction<FunctionParseDateTimeBestEffortOrNull>();
+    factory.registerFunction<FunctionParseDateTimeBestEffortUS>();
+    factory.registerFunction<FunctionParseDateTimeBestEffortUSOrZero>();
+    factory.registerFunction<FunctionParseDateTimeBestEffortUSOrNull>();
     factory.registerFunction<FunctionParseDateTime32BestEffort>();
     factory.registerFunction<FunctionParseDateTime32BestEffortOrZero>();
     factory.registerFunction<FunctionParseDateTime32BestEffortOrNull>();
diff --git a/src/Functions/FunctionsConversion.h b/src/Functions/FunctionsConversion.h
index 0e162fc2469..96e49686526 100644
--- a/src/Functions/FunctionsConversion.h
+++ b/src/Functions/FunctionsConversion.h
@@ -955,6 +955,12 @@ struct ConvertThroughParsing
                         vec_to[i] = res;
                     }
                 }
+                else if constexpr (parsing_mode == ConvertFromStringParsingMode::BestEffortUS)
+                {
+                    time_t res;
+                    parsed = tryParseDateTimeBestEffortUS(res, read_buffer, *local_time_zone, *utc_time_zone);
+                    vec_to[i] = res;
+                }
                 else
                 {
                     if constexpr (to_datetime64)
@@ -2003,9 +2009,11 @@ using FunctionToDecimal256OrNull = FunctionConvertFromString<DataTypeDecimal<Dec
 using FunctionToUUIDOrNull = FunctionConvertFromString<DataTypeUUID, NameToUUIDOrNull, ConvertFromStringExceptionMode::Null>;
 
 struct NameParseDateTimeBestEffort { static constexpr auto name = "parseDateTimeBestEffort"; };
-struct NameParseDateTimeBestEffortUS { static constexpr auto name = "parseDateTimeBestEffortUS"; };
 struct NameParseDateTimeBestEffortOrZero { static constexpr auto name = "parseDateTimeBestEffortOrZero"; };
 struct NameParseDateTimeBestEffortOrNull { static constexpr auto name = "parseDateTimeBestEffortOrNull"; };
+struct NameParseDateTimeBestEffortUS { static constexpr auto name = "parseDateTimeBestEffortUS"; };
+struct NameParseDateTimeBestEffortUSOrZero { static constexpr auto name = "parseDateTimeBestEffortUSOrZero"; };
+struct NameParseDateTimeBestEffortUSOrNull { static constexpr auto name = "parseDateTimeBestEffortUSOrNull"; };
 struct NameParseDateTime32BestEffort { static constexpr auto name = "parseDateTime32BestEffort"; };
 struct NameParseDateTime32BestEffortOrZero { static constexpr auto name = "parseDateTime32BestEffortOrZero"; };
 struct NameParseDateTime32BestEffortOrNull { static constexpr auto name = "parseDateTime32BestEffortOrNull"; };
@@ -2016,13 +2024,18 @@ struct NameParseDateTime64BestEffortOrNull { static constexpr auto name = "parse
 
 using FunctionParseDateTimeBestEffort = FunctionConvertFromString<
     DataTypeDateTime, NameParseDateTimeBestEffort, ConvertFromStringExceptionMode::Throw, ConvertFromStringParsingMode::BestEffort>;
-using FunctionParseDateTimeBestEffortUS = FunctionConvertFromString<
-    DataTypeDateTime, NameParseDateTimeBestEffortUS, ConvertFromStringExceptionMode::Throw, ConvertFromStringParsingMode::BestEffortUS>;
 using FunctionParseDateTimeBestEffortOrZero = FunctionConvertFromString<
     DataTypeDateTime, NameParseDateTimeBestEffortOrZero, ConvertFromStringExceptionMode::Zero, ConvertFromStringParsingMode::BestEffort>;
 using FunctionParseDateTimeBestEffortOrNull = FunctionConvertFromString<
     DataTypeDateTime, NameParseDateTimeBestEffortOrNull, ConvertFromStringExceptionMode::Null, ConvertFromStringParsingMode::BestEffort>;
 
+using FunctionParseDateTimeBestEffortUS = FunctionConvertFromString<
+    DataTypeDateTime, NameParseDateTimeBestEffortUS, ConvertFromStringExceptionMode::Throw, ConvertFromStringParsingMode::BestEffortUS>;
+using FunctionParseDateTimeBestEffortUSOrZero = FunctionConvertFromString<
+    DataTypeDateTime, NameParseDateTimeBestEffortUSOrZero, ConvertFromStringExceptionMode::Zero, ConvertFromStringParsingMode::BestEffortUS>;
+using FunctionParseDateTimeBestEffortUSOrNull = FunctionConvertFromString<
+    DataTypeDateTime, NameParseDateTimeBestEffortUSOrNull, ConvertFromStringExceptionMode::Null, ConvertFromStringParsingMode::BestEffortUS>;
+
 using FunctionParseDateTime32BestEffort = FunctionConvertFromString<
     DataTypeDateTime, NameParseDateTime32BestEffort, ConvertFromStringExceptionMode::Throw, ConvertFromStringParsingMode::BestEffort>;
 using FunctionParseDateTime32BestEffortOrZero = FunctionConvertFromString<
diff --git a/src/IO/parseDateTimeBestEffort.cpp b/src/IO/parseDateTimeBestEffort.cpp
index a3ea418dd9f..47a298ede29 100644
--- a/src/IO/parseDateTimeBestEffort.cpp
+++ b/src/IO/parseDateTimeBestEffort.cpp
@@ -654,6 +654,11 @@ bool tryParseDateTimeBestEffort(time_t & res, ReadBuffer & in, const DateLUTImpl
     return parseDateTimeBestEffortImpl<bool, false>(res, in, local_time_zone, utc_time_zone, nullptr);
 }
 
+bool tryParseDateTimeBestEffortUS(time_t & res, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone)
+{
+    return parseDateTimeBestEffortImpl<bool, true>(res, in, local_time_zone, utc_time_zone, nullptr);
+}
+
 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);
diff --git a/src/IO/parseDateTimeBestEffort.h b/src/IO/parseDateTimeBestEffort.h
index 61de31a0213..65e92cbee42 100644
--- a/src/IO/parseDateTimeBestEffort.h
+++ b/src/IO/parseDateTimeBestEffort.h
@@ -57,8 +57,9 @@ class ReadBuffer;
   */
 
 void parseDateTimeBestEffort(time_t & res, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
-void parseDateTimeBestEffortUS(time_t & res, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
 bool tryParseDateTimeBestEffort(time_t & res, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
+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);
 bool tryParseDateTime64BestEffort(DateTime64 & res, UInt32 scale, ReadBuffer & in, const DateLUTImpl & local_time_zone, const DateLUTImpl & utc_time_zone);
 
diff --git a/tests/queries/0_stateless/01351_parse_date_time_best_effort_us.reference b/tests/queries/0_stateless/01351_parse_date_time_best_effort_us.reference
index 9d0a11776b9..23bcb901557 100644
--- a/tests/queries/0_stateless/01351_parse_date_time_best_effort_us.reference
+++ b/tests/queries/0_stateless/01351_parse_date_time_best_effort_us.reference
@@ -1,3 +1,4 @@
+parseDateTimeBestEffortUS
  s                                             a
 
  1970/01/02 010203Z          1970-01-02 01:02:03 
@@ -16,3 +17,24 @@
  12/13/2019                  2019-12-13 00:00:00 
  13/12/2019                  2019-12-13 00:00:00 
  03/04/2019                  2019-03-04 00:00:00 
+parseDateTimeBestEffortUSOrZero	parseDateTimeBestEffortUSOrNull
+ s                                             a                     b
+
+ 1970/01/02 010203Z          1970-01-02 01:02:03   1970-01-02 01:02:03 
+ 01-02-2001 UTC              2001-01-02 00:00:00   2001-01-02 00:00:00 
+ 10.23.1990                  1990-10-23 00:00:00   1990-10-23 00:00:00 
+ 01-02-2017 03:04:05+1       2017-01-02 02:04:05   2017-01-02 02:04:05 
+ 01/02/2017 03:04:05+300     2017-01-02 00:04:05   2017-01-02 00:04:05 
+ 01.02.2017 03:04:05GMT      2017-01-02 03:04:05   2017-01-02 03:04:05 
+ 01-02-2017 03:04:05 MSD     2017-01-01 23:04:05   2017-01-01 23:04:05 
+ 01-02-2017 11:04:05 AM      2017-01-02 11:04:05   2017-01-02 11:04:05 
+ 01-02-2017 11:04:05 PM      2017-01-02 23:04:05   2017-01-02 23:04:05 
+ 01-02-2017 12:04:05 AM      2017-01-02 00:04:05   2017-01-02 00:04:05 
+ 01-02-2017 12:04:05 PM      2017-01-02 12:04:05   2017-01-02 12:04:05 
+ 01.02.17 03:04:05 MSD Feb   2017-02-01 23:04:05   2017-02-01 23:04:05 
+ 01/02/2017 03:04:05 MSK     2017-01-02 00:04:05   2017-01-02 00:04:05 
+ 12/13/2019                  2019-12-13 00:00:00   2019-12-13 00:00:00 
+ 13/12/2019                  2019-12-13 00:00:00   2019-12-13 00:00:00 
+ 03/04/2019                  2019-03-04 00:00:00   2019-03-04 00:00:00 
+                             1970-01-01 00:00:00                  ᴺᵁᴸᴸ 
+ xyz                         1970-01-01 00:00:00                  ᴺᵁᴸᴸ 
diff --git a/tests/queries/0_stateless/01351_parse_date_time_best_effort_us.sql b/tests/queries/0_stateless/01351_parse_date_time_best_effort_us.sql
index 3345ace8305..ca3166142f0 100644
--- a/tests/queries/0_stateless/01351_parse_date_time_best_effort_us.sql
+++ b/tests/queries/0_stateless/01351_parse_date_time_best_effort_us.sql
@@ -1,3 +1,5 @@
+SELECT 'parseDateTimeBestEffortUS';
+
 SELECT
     s,
     parseDateTimeBestEffortUS(s, 'UTC') AS a
@@ -22,3 +24,32 @@ FROM
 '03/04/2019'
 ]) AS s)
 FORMAT PrettySpaceNoEscapes;
+
+SELECT 'parseDateTimeBestEffortUSOrZero', 'parseDateTimeBestEffortUSOrNull';
+SELECT
+    s,
+    parseDateTimeBestEffortUSOrZero(s, 'UTC') AS a,
+    parseDateTimeBestEffortUSOrNull(s, 'UTC') AS b
+FROM
+(
+    SELECT arrayJoin([
+'1970/01/02 010203Z',
+'01-02-2001 UTC',
+'10.23.1990',
+'01-02-2017 03:04:05+1',
+'01/02/2017 03:04:05+300',
+'01.02.2017 03:04:05GMT',
+'01-02-2017 03:04:05 MSD',
+'01-02-2017 11:04:05 AM',
+'01-02-2017 11:04:05 PM',
+'01-02-2017 12:04:05 AM',
+'01-02-2017 12:04:05 PM',
+'01.02.17 03:04:05 MSD Feb',
+'01/02/2017 03:04:05 MSK',
+'12/13/2019',
+'13/12/2019',
+'03/04/2019',
+'',
+'xyz'
+]) AS s)
+FORMAT PrettySpaceNoEscapes;

From 48884d22310c069889e7894e2a89829a8b1ecc48 Mon Sep 17 00:00:00 2001
From: Vitaliy Zakaznikov <vzakaznikov@protonmail.com>
Date: Wed, 27 Jan 2021 09:27:34 -0500
Subject: [PATCH 563/611] Adding tests to check passing invalid data types to
 encrypt and aes_encrypt_mysql functions.

---
 tests/testflows/aes_encryption/regression.py  |  4 ++
 .../testflows/aes_encryption/tests/encrypt.py | 37 +++++++++++++++++++
 .../aes_encryption/tests/encrypt_mysql.py     | 37 +++++++++++++++++++
 3 files changed, 78 insertions(+)

diff --git a/tests/testflows/aes_encryption/regression.py b/tests/testflows/aes_encryption/regression.py
index b0dc2761b59..f3321489b76 100755
--- a/tests/testflows/aes_encryption/regression.py
+++ b/tests/testflows/aes_encryption/regression.py
@@ -18,11 +18,15 @@ xfails = {
      [(Fail, "known issue")],
     "encrypt/invalid key or iv length for mode/mode=\"'aes-???-gcm'\", key_len=??, iv_len=12, aad=True/iv is too long":
      [(Fail, "known issue")],
+    "encrypt/invalid plaintext data type/data_type='IPv6', value=\"toIPv6('2001:0db8:0000:85a3:0000:0000:ac1f:8001')\"":
+     [(Fail, "known issue as IPv6 is implemented as FixedString(16)")],
     # encrypt_mysql
     "encrypt_mysql/key or iv length for mode/mode=\"'aes-???-ecb'\", key_len=??, iv_len=None":
      [(Fail, issue_18251)],
     "encrypt_mysql/invalid parameters/iv not valid for mode":
      [(Fail, issue_18251)],
+    "encrypt_mysql/invalid plaintext data type/data_type='IPv6', value=\"toIPv6('2001:0db8:0000:85a3:0000:0000:ac1f:8001')\"":
+     [(Fail, "known issue as IPv6 is implemented as FixedString(16)")],
     # decrypt_mysql
     "decrypt_mysql/key or iv length for mode/mode=\"'aes-???-ecb'\", key_len=??, iv_len=None:":
      [(Fail, issue_18251)],
diff --git a/tests/testflows/aes_encryption/tests/encrypt.py b/tests/testflows/aes_encryption/tests/encrypt.py
index e6562dc51f5..dde27c9d454 100644
--- a/tests/testflows/aes_encryption/tests/encrypt.py
+++ b/tests/testflows/aes_encryption/tests/encrypt.py
@@ -108,6 +108,43 @@ def invalid_parameters(self):
             encrypt(plaintext="'hello there'", key="'0123456789123456'", mode="'AES-128-ECB'", exitcode=36,
                 message="DB::Exception: Invalid mode: AES-128-ECB")
 
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS008_AES_Functions_InvalidParameters("1.0")
+)
+@Examples("data_type, value", [
+    ("UInt8", "toUInt8('1')"),
+    ("UInt16", "toUInt16('1')"),
+    ("UInt32", "toUInt32('1')"),
+    ("UInt64", "toUInt64('1')"),
+    ("Int8", "toInt8('1')"),
+    ("Int16", "toInt16('1')"),
+    ("Int32", "toInt32('1')"),
+    ("Int64", "toInt64('1')"),
+    ("Float32", "toFloat32('1.0')"),
+    ("Float64", "toFloat64('1.0')"),
+    ("Decimal32", "toDecimal32(2, 4)"),
+    ("Decimal64", "toDecimal64(2, 4)"),
+    ("Decimal128", "toDecimal128(2, 4)"),
+    ("UUID", "toUUID('61f0c404-5cb3-11e7-907b-a6006ad3dba0')"),
+    ("Date", "toDate('2020-01-01')"),
+    ("DateTime", "toDateTime('2020-01-01 20:01:02')"),
+    ("DateTime64", "toDateTime64('2020-01-01 20:01:02.123', 3)"),
+    ("Array", "[1,2]"),
+    ("Tuple", "(1,'a')"),
+    ("IPv4", "toIPv4('171.225.130.45')"),
+    ("IPv6", "toIPv6('2001:0db8:0000:85a3:0000:0000:ac1f:8001')"),
+    ("Enum8", r"CAST('a', 'Enum8(\'a\' = 1, \'b\' = 2)')"),
+    ("Enum16", r"CAST('a', 'Enum16(\'a\' = 1, \'b\' = 2)')")
+])
+def invalid_plaintext_data_type(self, data_type, value):
+    """Check that encrypt function returns an error if the
+    plaintext parameter has invalid data type.
+    """
+    with When("I try to encrypt plaintext with invalid data type", description=f"{data_type} with value {value}"):
+        encrypt(plaintext=value, key="'0123456789123456'", mode="'aes-128-cbc'", iv="'0123456789123456'",
+            exitcode=43, message="DB::Exception: Illegal type of argument")
+
 @TestOutline(Scenario)
 @Requirements(
     RQ_SRS008_AES_Encrypt_Function_Key_Length_InvalidLengthError("1.0"),
diff --git a/tests/testflows/aes_encryption/tests/encrypt_mysql.py b/tests/testflows/aes_encryption/tests/encrypt_mysql.py
index 89d000d83be..b831d6dda85 100644
--- a/tests/testflows/aes_encryption/tests/encrypt_mysql.py
+++ b/tests/testflows/aes_encryption/tests/encrypt_mysql.py
@@ -107,6 +107,43 @@ def invalid_parameters(self):
             aes_encrypt_mysql(plaintext="'hello there'", key="'0123456789123456'", mode="'AES-128-ECB'", exitcode=36,
                 message="DB::Exception: Invalid mode: AES-128-ECB")
 
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS008_AES_Functions_InvalidParameters("1.0")
+)
+@Examples("data_type, value", [
+    ("UInt8", "toUInt8('1')"),
+    ("UInt16", "toUInt16('1')"),
+    ("UInt32", "toUInt32('1')"),
+    ("UInt64", "toUInt64('1')"),
+    ("Int8", "toInt8('1')"),
+    ("Int16", "toInt16('1')"),
+    ("Int32", "toInt32('1')"),
+    ("Int64", "toInt64('1')"),
+    ("Float32", "toFloat32('1.0')"),
+    ("Float64", "toFloat64('1.0')"),
+    ("Decimal32", "toDecimal32(2, 4)"),
+    ("Decimal64", "toDecimal64(2, 4)"),
+    ("Decimal128", "toDecimal128(2, 4)"),
+    ("UUID", "toUUID('61f0c404-5cb3-11e7-907b-a6006ad3dba0')"),
+    ("Date", "toDate('2020-01-01')"),
+    ("DateTime", "toDateTime('2020-01-01 20:01:02')"),
+    ("DateTime64", "toDateTime64('2020-01-01 20:01:02.123', 3)"),
+    ("Array", "[1,2]"),
+    ("Tuple", "(1,'a')"),
+    ("IPv4", "toIPv4('171.225.130.45')"),
+    ("IPv6", "toIPv6('2001:0db8:0000:85a3:0000:0000:ac1f:8001')"),
+    ("Enum8", r"CAST('a', 'Enum8(\'a\' = 1, \'b\' = 2)')"),
+    ("Enum16", r"CAST('a', 'Enum16(\'a\' = 1, \'b\' = 2)')")
+])
+def invalid_plaintext_data_type(self, data_type, value):
+    """Check that aes_encrypt_mysql function returns an error if the
+    plaintext parameter has invalid data type.
+    """
+    with When("I try to encrypt plaintext with invalid data type", description=f"{data_type} with value {value}"):
+        aes_encrypt_mysql(plaintext=value, key="'0123456789123456'", mode="'aes-128-cbc'", iv="'0123456789123456'",
+            exitcode=43, message="DB::Exception: Illegal type of argument")
+
 @TestOutline(Scenario)
 @Requirements(
     RQ_SRS008_AES_MySQL_Encrypt_Function_Key_Length_TooShortError("1.0"),

From a3d6888c5bebe17f2209e22551763bfc5171bab2 Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Wed, 27 Jan 2021 18:01:08 +0300
Subject: [PATCH 564/611] RoaringBitmapWithSmallSet rb_andnot fix

---
 src/AggregateFunctions/AggregateFunctionGroupBitmapData.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h b/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h
index 39ab846e61e..ec945d418f2 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h
@@ -229,7 +229,7 @@ public:
         {
             for (const auto & x : small)
             {
-                if (!rb->contains(static_cast<Value>(x.getValue())))
+                if (!r1.rb->contains(static_cast<Value>(x.getValue())))
                     buffer.push_back(x.getValue());
             }
 

From 01d3d0aeca450b1905fadadc7059f12385ad3fa7 Mon Sep 17 00:00:00 2001
From: Vitaliy Zakaznikov <vzakaznikov@protonmail.com>
Date: Wed, 27 Jan 2021 10:01:47 -0500
Subject: [PATCH 565/611] Fixing requirement names.

---
 .../tests/compatibility/mysql/database_engine.py              | 2 +-
 .../aes_encryption/tests/compatibility/mysql/dictionary.py    | 2 +-
 .../aes_encryption/tests/compatibility/mysql/feature.py       | 2 +-
 .../aes_encryption/tests/compatibility/mysql/table_engine.py  | 2 +-
 .../tests/compatibility/mysql/table_function.py               | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/testflows/aes_encryption/tests/compatibility/mysql/database_engine.py b/tests/testflows/aes_encryption/tests/compatibility/mysql/database_engine.py
index 3547dc95ab0..911d03fe016 100644
--- a/tests/testflows/aes_encryption/tests/compatibility/mysql/database_engine.py
+++ b/tests/testflows/aes_encryption/tests/compatibility/mysql/database_engine.py
@@ -182,7 +182,7 @@ def encrypt(self, mysql_datatype):
 @TestFeature
 @Name("database engine")
 @Requirements(
-    RQ_SRS008_AES_Functions_Compatability_Engine_Database_MySQL("1.0")
+    RQ_SRS008_AES_Functions_Compatibility_Engine_Database_MySQL("1.0")
 )
 def feature(self, node="clickhouse1", mysql_node="mysql1"):
     """Check usage of encryption functions with [MySQL database engine].
diff --git a/tests/testflows/aes_encryption/tests/compatibility/mysql/dictionary.py b/tests/testflows/aes_encryption/tests/compatibility/mysql/dictionary.py
index 66b9e3acbf8..76d010f348d 100644
--- a/tests/testflows/aes_encryption/tests/compatibility/mysql/dictionary.py
+++ b/tests/testflows/aes_encryption/tests/compatibility/mysql/dictionary.py
@@ -237,7 +237,7 @@ def decrypt(self, mysql_datatype):
 @TestFeature
 @Name("dictionary")
 @Requirements(
-    RQ_SRS008_AES_Functions_Compatability_Dictionaries("1.0")
+    RQ_SRS008_AES_Functions_Compatibility_Dictionaries("1.0")
 )
 def feature(self, node="clickhouse1", mysql_node="mysql1"):
     """Check usage of encryption functions with [MySQL dictionary].
diff --git a/tests/testflows/aes_encryption/tests/compatibility/mysql/feature.py b/tests/testflows/aes_encryption/tests/compatibility/mysql/feature.py
index 5c6338bfdff..bc470dd13a7 100644
--- a/tests/testflows/aes_encryption/tests/compatibility/mysql/feature.py
+++ b/tests/testflows/aes_encryption/tests/compatibility/mysql/feature.py
@@ -5,7 +5,7 @@ from aes_encryption.requirements import *
 @TestFeature
 @Name("mysql")
 @Requirements(
-    RQ_SRS008_AES_Functions_Compatability_MySQL("1.0")
+    RQ_SRS008_AES_Functions_Compatibility_MySQL("1.0")
 )
 def feature(self, node="clickhouse1"):
     """Check encryption functions usage compatibility with MySQL.
diff --git a/tests/testflows/aes_encryption/tests/compatibility/mysql/table_engine.py b/tests/testflows/aes_encryption/tests/compatibility/mysql/table_engine.py
index 5a5c7d9d58a..5598cf2d98c 100644
--- a/tests/testflows/aes_encryption/tests/compatibility/mysql/table_engine.py
+++ b/tests/testflows/aes_encryption/tests/compatibility/mysql/table_engine.py
@@ -188,7 +188,7 @@ def encrypt(self, mysql_datatype):
 @TestFeature
 @Name("table engine")
 @Requirements(
-    RQ_SRS008_AES_Functions_Compatability_Engine_Table_MySQL("1.0")
+    RQ_SRS008_AES_Functions_Compatibility_Engine_Table_MySQL("1.0")
 )
 def feature(self, node="clickhouse1", mysql_node="mysql1"):
     """Check usage of encryption functions with [MySQL table engine].
diff --git a/tests/testflows/aes_encryption/tests/compatibility/mysql/table_function.py b/tests/testflows/aes_encryption/tests/compatibility/mysql/table_function.py
index cd3487c5c74..937a46ce2c4 100644
--- a/tests/testflows/aes_encryption/tests/compatibility/mysql/table_function.py
+++ b/tests/testflows/aes_encryption/tests/compatibility/mysql/table_function.py
@@ -169,7 +169,7 @@ def encrypt(self, mysql_datatype):
 @TestFeature
 @Name("table function")
 @Requirements(
-    RQ_SRS008_AES_Functions_Compatability_TableFunction_MySQL("1.0")
+    RQ_SRS008_AES_Functions_Compatibility_TableFunction_MySQL("1.0")
 )
 def feature(self, node="clickhouse1", mysql_node="mysql1"):
     """Check usage of encryption functions with [MySQL table function].
@@ -180,4 +180,4 @@ def feature(self, node="clickhouse1", mysql_node="mysql1"):
     self.context.mysql_node = self.context.cluster.node(mysql_node)
 
     for scenario in loads(current_module(), Scenario):
-        Scenario(run=scenario, flags=TE)
\ No newline at end of file
+        Scenario(run=scenario, flags=TE)

From 8070562bd00e61ab64f3a41bd1b8e7383e729da4 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Wed, 27 Jan 2021 18:24:39 +0300
Subject: [PATCH 566/611] Run tests in parallel in flaky check

---
 docker/test/stateless/run.sh | 11 +++++------
 tests/clickhouse-test        |  7 +++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/docker/test/stateless/run.sh b/docker/test/stateless/run.sh
index d9a03f84726..fb510a87fcd 100755
--- a/docker/test/stateless/run.sh
+++ b/docker/test/stateless/run.sh
@@ -55,12 +55,11 @@ function run_tests()
         ADDITIONAL_OPTIONS+=('00000_no_tests_to_skip')
     fi
 
-    for _ in $(seq 1 "$NUM_TRIES"); do
-        clickhouse-test --testname --shard --zookeeper --hung-check --print-time "$SKIP_LIST_OPT" "${ADDITIONAL_OPTIONS[@]}" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee -a test_output/test_result.txt
-        if [ "${PIPESTATUS[0]}" -ne "0" ]; then
-            break;
-        fi
-    done
+    clickhouse-test --testname --shard --zookeeper --hung-check --print-time \
+            --test-runs "$NUM_TRIES" --jobs 4 \
+            "$SKIP_LIST_OPT" "${ADDITIONAL_OPTIONS[@]}" 2>&1 \
+        | ts '%Y-%m-%d %H:%M:%S' \
+        | tee -a test_output/test_result.txt
 }
 
 export -f run_tests
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index d5c6019d28f..70f7fe18982 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -342,9 +342,10 @@ def run_tests_array(all_tests_with_params):
                             SERVER_DIED = True
                             break
 
+                    file_suffix = ('.' + str(os.getpid())) if is_concurrent else ''
                     reference_file = os.path.join(suite_dir, name) + '.reference'
-                    stdout_file = os.path.join(suite_tmp_dir, name) + '.stdout'
-                    stderr_file = os.path.join(suite_tmp_dir, name) + '.stderr'
+                    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)
 
@@ -717,6 +718,7 @@ def main(args):
             all_tests = [case for case in all_tests if is_test_from_dir(suite_dir, case)]
             if args.test:
                 all_tests = [t for t in all_tests if any([re.search(r, t) for r in args.test])]
+            all_tests = all_tests * args.test_runs
             all_tests.sort(key=key_func)
 
             jobs = args.jobs
@@ -886,6 +888,7 @@ if __name__ == '__main__':
     parser.add_argument('--database', help='Database for tests (random name test_XXXXXX by default)')
     parser.add_argument('--parallel', default='1/1', help='One parallel test run number/total')
     parser.add_argument('-j', '--jobs', default=1, nargs='?', type=int, help='Run all tests in parallel')
+    parser.add_argument('--test-runs', default=1, nargs='?', type=int, help='Run each test many times (useful for e.g. flaky check)')
     parser.add_argument('-U', '--unified', default=3, type=int, help='output NUM lines of unified context')
     parser.add_argument('-r', '--server-check-retries', default=30, type=int, help='Num of tries to execute SELECT 1 before tests started')
     parser.add_argument('--skip-list-path', help="Path to skip-list file")

From 0db606084a3924cbd0de2251a327cb8b2780ae75 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Wed, 27 Jan 2021 18:30:09 +0300
Subject: [PATCH 567/611] change some tests to see the effect

---
 tests/queries/0_stateless/00459_group_array_insert_at.sql | 1 +
 tests/queries/0_stateless/01014_lazy_database_basic.sh    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/tests/queries/0_stateless/00459_group_array_insert_at.sql b/tests/queries/0_stateless/00459_group_array_insert_at.sql
index 59ecfc05045..8bc329d9103 100644
--- a/tests/queries/0_stateless/00459_group_array_insert_at.sql
+++ b/tests/queries/0_stateless/00459_group_array_insert_at.sql
@@ -1,3 +1,4 @@
+-- remove this comment before merge
 SELECT groupArrayInsertAt(toString(number), number * 2) FROM (SELECT * FROM system.numbers LIMIT 10);
 SELECT groupArrayInsertAt('-')(toString(number), number * 2) FROM (SELECT * FROM system.numbers LIMIT 10);
 SELECT groupArrayInsertAt([123])(range(number), number * 2) FROM (SELECT * FROM system.numbers LIMIT 10);
diff --git a/tests/queries/0_stateless/01014_lazy_database_basic.sh b/tests/queries/0_stateless/01014_lazy_database_basic.sh
index 11d698e764e..76cbcea6d97 100755
--- a/tests/queries/0_stateless/01014_lazy_database_basic.sh
+++ b/tests/queries/0_stateless/01014_lazy_database_basic.sh
@@ -4,6 +4,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+# remove this comment before merge
+
 ${CLICKHOUSE_CLIENT} -n -q "DROP DATABASE IF EXISTS testlazy"
 
 ${CLICKHOUSE_CLIENT} -n -q "

From 83b9677f1cf51d75114927e8fcdb2fe12ae078db Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Wed, 27 Jan 2021 20:35:50 +0300
Subject: [PATCH 568/611] Added test

---
 ...egate_function_group_bitmap_data.reference | 60 +++++++++++++++++++
 ...1_aggregate_function_group_bitmap_data.sql | 55 +++++++++++++++++
 2 files changed, 115 insertions(+)
 create mode 100644 tests/queries/0_stateless/01671_aggregate_function_group_bitmap_data.reference
 create mode 100644 tests/queries/0_stateless/01671_aggregate_function_group_bitmap_data.sql

diff --git a/tests/queries/0_stateless/01671_aggregate_function_group_bitmap_data.reference b/tests/queries/0_stateless/01671_aggregate_function_group_bitmap_data.reference
new file mode 100644
index 00000000000..161f4a6372f
--- /dev/null
+++ b/tests/queries/0_stateless/01671_aggregate_function_group_bitmap_data.reference
@@ -0,0 +1,60 @@
+1	50	50	1	0	49
+1	50	50	1	0	49
+1	50	50	1	0	49
+1	50	51	0	1	51
+1	50	50	1	0	49
+1	50	51	0	1	51
+1	50	50	1	0	49
+1	50	50	1	0	49
+1	50	50	1	0	49
+1	50	50	1	0	49
+1	50	50	1	0	49
+1	50	51	0	1	51
+1	50	50	1	0	49
+1	50	51	0	1	51
+1	50	50	1	0	49
+1	50	51	0	1	51
+1	50	50	1	0	49
+1	50	51	0	1	51
+1	50	50	1	0	49
+1	50	50	1	0	49
+1	50	50	1	0	49
+1	50	51	0	1	51
+1	50	50	1	0	49
+1	50	51	0	1	51
+1	50	50	1	0	49
+1	50	50	1	0	49
+1	50	50	1	0	49
+1	50	50	1	0	49
+1	50	50	1	0	49
+1	50	50	1	0	49
+1	50	50	1	0	49
+1	50	51	0	1	51
+1	50	50	1	0	49
+1	50	51	0	1	51
+1	50	50	1	0	49
+1	50	51	0	1	51
+1	50	51	0	1	51
+1	50	50	1	0	49
+1	50	50	1	0	49
+1	50	50	1	0	49
+1	50	51	0	1	51
+1	50	50	1	0	49
+1	50	50	1	0	49
+1	50	51	0	1	51
+1	50	51	0	1	51
+1	50	50	1	0	49
+1	50	51	0	1	51
+1	50	50	1	0	49
+1	50	50	1	0	49
+1	50	50	1	0	49
+1	50	50	1	0	49
+1	50	51	0	1	51
+1	50	51	0	1	51
+1	50	50	1	0	49
+1	50	50	1	0	49
+1	50	51	0	1	51
+1	50	50	1	0	49
+1	50	50	1	0	49
+1	50	50	1	0	49
+1	50	51	0	1	51
diff --git a/tests/queries/0_stateless/01671_aggregate_function_group_bitmap_data.sql b/tests/queries/0_stateless/01671_aggregate_function_group_bitmap_data.sql
new file mode 100644
index 00000000000..3f5c5c2f25b
--- /dev/null
+++ b/tests/queries/0_stateless/01671_aggregate_function_group_bitmap_data.sql
@@ -0,0 +1,55 @@
+CREATE TABLE group_bitmap_data_test
+(
+    `pickup_date` Date,
+    `city_id` UInt32,
+    `uid` UInt32
+)
+ENGINE = Memory;
+
+INSERT INTO group_bitmap_data_test SELECT
+    '2019-01-01',
+    1,
+    number
+FROM numbers(1, 50);
+
+INSERT INTO group_bitmap_data_test SELECT
+    '2019-01-02',
+    1,
+    number
+FROM numbers(11, 60);
+
+INSERT INTO group_bitmap_data_test SELECT
+    '2019-01-03',
+    2,
+    number
+FROM numbers(1, 10);
+
+SELECT
+    bitmapCardinality(day_today) AS today_users,
+    bitmapCardinality(day_before) AS before_users,
+    bitmapCardinality(bitmapOr(day_today, day_before)) AS ll_users,
+    bitmapCardinality(bitmapAnd(day_today, day_before)) AS old_users,
+    bitmapCardinality(bitmapAndnot(day_today, day_before)) AS new_users,
+    bitmapCardinality(bitmapXor(day_today, day_before)) AS diff_users
+FROM
+(
+    SELECT
+        city_id,
+        groupBitmapState(uid) AS day_today
+    FROM group_bitmap_data_test
+    WHERE pickup_date = '2019-01-02'
+    GROUP BY
+        uid,
+        city_id
+) AS js1
+ALL LEFT JOIN
+(
+    SELECT
+        city_id,
+        groupBitmapState(uid) AS day_before
+    FROM group_bitmap_data_test
+    WHERE pickup_date = '2019-01-01'
+    GROUP BY city_id
+) AS js2 USING (city_id);
+
+DROP TABLE IF EXISTS group_bitmap_data_test;

From a727fc4755b9d0249fa4e92083d4a53f3f621cbb Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Wed, 27 Jan 2021 21:15:18 +0300
Subject: [PATCH 569/611] Fix 01115_join_with_dictionary flakiness

---
 .../0_stateless/01115_join_with_dictionary.reference      | 4 ++--
 tests/queries/0_stateless/01115_join_with_dictionary.sql  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/queries/0_stateless/01115_join_with_dictionary.reference b/tests/queries/0_stateless/01115_join_with_dictionary.reference
index f909a3d61f5..fbff63d1777 100644
--- a/tests/queries/0_stateless/01115_join_with_dictionary.reference
+++ b/tests/queries/0_stateless/01115_join_with_dictionary.reference
@@ -93,11 +93,11 @@ not optimized (smoke)
 -
 0	0	0	0
 1	1	1	1
-3	3	3	3
 2	2	2	2
+3	3	3	3
 -
 0	0	0	0
 1	1	1	1
 -
-3	3	3	3
 2	2	2	2
+3	3	3	3
diff --git a/tests/queries/0_stateless/01115_join_with_dictionary.sql b/tests/queries/0_stateless/01115_join_with_dictionary.sql
index 70aecf1c478..a5714169641 100644
--- a/tests/queries/0_stateless/01115_join_with_dictionary.sql
+++ b/tests/queries/0_stateless/01115_join_with_dictionary.sql
@@ -74,13 +74,13 @@ SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 RIGHT JOIN dict_flat d O
 SELECT '-';
 SELECT * FROM (SELECT number + 2 AS key FROM numbers(4)) s1 FULL JOIN dict_flat d USING(key) ORDER BY s1.key, d.key;
 SELECT '-';
-SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 ANY INNER JOIN dict_flat d USING(key);
+SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 ANY INNER JOIN dict_flat d USING(key) ORDER BY s1.key;
 SELECT '-';
-SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 ANY RIGHT JOIN dict_flat d USING(key);
+SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 ANY RIGHT JOIN dict_flat d USING(key) ORDER BY s1.key;
 SELECT '-';
-SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 SEMI RIGHT JOIN dict_flat d USING(key);
+SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 SEMI RIGHT JOIN dict_flat d USING(key) ORDER BY s1.key;
 SELECT '-';
-SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 ANTI RIGHT JOIN dict_flat d USING(key);
+SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 ANTI RIGHT JOIN dict_flat d USING(key) ORDER BY s1.key;
 
 DROP DICTIONARY dict_flat;
 DROP DICTIONARY dict_hashed;

From 54f47c468cc3dfa67e87c3a6486294351585937d Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Wed, 27 Jan 2021 21:34:48 +0300
Subject: [PATCH 570/611] mark all create database tests as sequential-only

---
 tests/queries/skip_list.json | 91 +++++++++++++++++++++++++++++++++++-
 1 file changed, 89 insertions(+), 2 deletions(-)

diff --git a/tests/queries/skip_list.json b/tests/queries/skip_list.json
index c01cfee5993..b48d642befd 100644
--- a/tests/queries/skip_list.json
+++ b/tests/queries/skip_list.json
@@ -314,11 +314,14 @@
         /// Pessimistic list of tests which work badly in parallel.
         /// Probably they need better investigation.
         "00062_replicated_merge_tree_alter_zookeeper",
+        "00080_show_tables_and_system_tables",
+        "00101_materialized_views_and_insert_without_explicit_database",
         "00109_shard_totals_after_having",
         "00110_external_sort",
         "00116_storage_set",
         "00121_drop_column_zookeeper",
         "00133_long_shard_memory_tracker_and_exception_safety",
+        "00158_buffer_and_nonexistent_table",
         "00180_attach_materialized_view",
         "00226_zookeeper_deduplication_and_unexpected_parts",
         "00236_replicated_drop_on_non_leader_zookeeper",
@@ -339,9 +342,12 @@
         "00571_non_exist_database_when_create_materializ_view",
         "00575_illegal_column_exception_when_drop_depen_column",
         "00599_create_view_with_subquery",
+        "00604_show_create_database",
         "00612_http_max_query_size",
         "00619_union_highlite",
         "00620_optimize_on_nonleader_replica_zookeeper",
+        "00623_truncate_table",
+        "00623_truncate_table_throw_exception",
         "00625_arrays_in_nested",
         "00626_replace_partition_from_table",
         "00626_replace_partition_from_table_zookeeper",
@@ -354,20 +360,28 @@
         "00699_materialized_view_mutations",
         "00701_rollup",
         "00715_fetch_merged_or_mutated_part_zookeeper",
+        "00716_allow_ddl",
+        "00719_parallel_ddl_db",
+        "00740_database_in_nested_view",
+        "00741_client_comment_multiline",
         "00751_default_databasename_for_view",
         "00753_alter_attach",
         "00754_alter_modify_column_partitions",
         "00754_alter_modify_order_by_replicated_zookeeper",
         "00763_long_lock_buffer_alter_destination_table",
+        "00800_versatile_storage_join",
         "00804_test_alter_compression_codecs",
         "00804_test_custom_compression_codecs",
         "00804_test_custom_compression_codes_log_storages",
         "00804_test_delta_codec_compression",
+        "00815_left_join_on_stepanel",
         "00834_cancel_http_readonly_queries_on_client_close",
         "00834_kill_mutation",
         "00834_kill_mutation_replicated_zookeeper",
         "00840_long_concurrent_select_and_drop_deadlock",
+        "00857_global_joinsavel_table_alias",
         "00899_long_attach_memory_limit",
+        "00910_buffer_prewhere",
         "00910_zookeeper_custom_compression_codecs_replicated",
         "00926_adaptive_index_granularity_merge_tree",
         "00926_adaptive_index_granularity_pk",
@@ -385,49 +399,94 @@
         "00988_constraints_replication_zookeeper",
         "00989_parallel_parts_loading",
         "00993_system_parts_race_condition_drop_zookeeper",
+        "01012_show_tables_limit",
         "01013_sync_replica_timeout_zookeeper",
+        "01014_lazy_database_basic",
         "01014_lazy_database_concurrent_recreate_reattach_and_show_tables",
         "01015_attach_part",
+        "01015_database_bad_tables",
         "01018_ddl_dictionaries_concurrent_requrests",
         "01018_ddl_dictionaries_create",
         "01018_ddl_dictionaries_select",
+        "01018_ddl_dictionaries_special",
+        "01018_dictionaries_from_dictionaries",
+        "01018_ip_dictionary",
         "01021_only_tuple_columns",
+        "01023_materialized_view_query_context",
         "01031_mutations_interpreter_and_context",
         "01033_dictionaries_lifetime",
         "01035_concurrent_move_partition_from_table_zookeeper",
+        "01036_no_superfluous_dict_reload_on_create_database",
+        "01036_no_superfluous_dict_reload_on_create_database_2",
+        "01037_polygon_dicts_correctness_all",
+        "01037_polygon_dicts_correctness_fast",
+        "01037_polygon_dicts_simple_functions",
+        "01038_dictionary_lifetime_min_zero_sec",
+        "01040_dictionary_invalidate_query_switchover_long",
+        "01041_create_dictionary_if_not_exists",
+        "01042_system_reload_dictionary_reloads_completely",
+        "01043_dictionary_attribute_properties_values",
+        "01045_dictionaries_restrictions",
         "01045_zookeeper_system_mutations_with_parts_names",
+        "01048_exists_query",
+        "01053_drop_database_mat_view",
         "01053_ssd_dictionary",
+        "01054_cache_dictionary_bunch_update",
+        "01054_cache_dictionary_overflow_cell",
         "01055_compact_parts_1",
+        "01056_create_table_as",
         "01060_avro",
         "01060_shutdown_table_after_detach",
+        "01069_database_memory",
         "01070_materialize_ttl",
         "01070_modify_ttl",
         "01070_mutations_with_dependencies",
         "01071_live_view_detach_dependency",
         "01071_prohibition_secondary_index_with_old_format_merge_tree",
         "01073_attach_if_not_exists",
+        "01073_show_tables_not_like",
+        "01076_cache_dictionary_datarace_exception_ptr",
         "01076_parallel_alter_replicated_zookeeper",
         "01079_parallel_alter_add_drop_column_zookeeper",
         "01079_parallel_alter_detach_table_zookeeper",
+        "01080_check_for_error_incorrect_size_of_nested_column",
         "01083_expressions_in_engine_arguments",
+        "01084_regexp_empty",
         "01085_max_distributed_connections_http",
         "01092_memory_profiler",
         "01098_temporary_and_external_tables",
+        "01103_distributed_product_mode_local_column_renames",
         "01107_atomic_db_detach_attach",
         "01108_restart_replicas_rename_deadlock_zookeeper",
+        "01109_exchange_tables",
         "01110_dictionary_layout_without_arguments",
+        "01113_local_dictionary_type_conversion",
         "01114_database_atomic",
+        "01114_mysql_database_engine_segfault",
+        "01115_join_with_dictionary",
+        "01125_dict_ddl_cannot_add_column",
         "01127_month_partitioning_consistency_select",
         "01130_in_memory_parts_partitons",
         "01135_default_and_alter_zookeeper",
         "01148_zookeeper_path_macros_unfolding",
+        "01150_ddl_guard_rwr",
+        "01185_create_or_replace_table",
         "01190_full_attach_syntax",
+        "01191_rename_dictionary",
+        "01192_rename_database_zookeeper",
         "01193_metadata_loading",
         "01200_mutations_memory_consumption",
+        "01224_no_superfluous_dict_reload",
+        "01225_drop_dictionary_as_table",
+        "01225_show_create_table_from_dictionary",
+        "01231_distributed_aggregation_memory_efficient_mix_levels",
+        "01232_extremes",
         "01238_http_memory_tracking",
         "01249_bad_arguments_for_bloom_filter",
         "01251_dict_is_in_infinite_loop",
+        "01254_dict_create_without_db",
         "01254_dict_load_after_detach_attach",
+        "01257_dictionary_mismatch_types",
         "01259_dictionary_custom_settings_ddl",
         "01267_alter_default_key_columns_zookeeper",
         "01268_dictionary_direct_layout",
@@ -441,18 +500,25 @@
         "01293_system_distribution_queue",
         "01294_lazy_database_concurrent",
         "01294_lazy_database_concurrent_recreate_reattach_and_show_tables",
+        "01294_system_distributed_on_cluster",
+        "01296_create_row_policy_in_current_database",
         "01305_replica_create_drop_zookeeper",
         "01307_multiple_leaders_zookeeper",
         "01318_long_unsuccessful_mutation_zookeeper",
         "01319_manual_write_to_replicas",
+        "01320_create_sync_race_condition_zookeeper",
         "01338_long_select_and_alter",
         "01338_long_select_and_alter_zookeeper",
         "01355_alter_column_with_order",
         "01355_ilike",
         "01357_version_collapsing_attach_detach_zookeeper",
         "01375_compact_parts_codecs",
+        "01376_GROUP_BY_injective_elimination_dictGet",
         "01378_alter_rename_with_ttl_zookeeper",
+        "01383_remote_ambiguous_column_shard",
         "01388_clear_all_columns",
+        "01391_join_on_dict_crash",
+        "01392_column_resolve",
         "01396_inactive_replica_cleanup_nodes_zookeeper",
         "01412_cache_dictionary_race",
         "01414_mutations_and_errors_zookeeper",
@@ -461,20 +527,41 @@
         "01417_freeze_partition_verbose",
         "01417_freeze_partition_verbose_zookeeper",
         "01430_modify_sample_by_zookeeper",
+        "01444_create_table_drop_database_race",
         "01454_storagememory_data_race_challenge",
+        "01455_rank_correlation_spearman",
         "01456_modify_column_type_via_add_drop_update",
         "01457_create_as_table_function_structure",
         "01459_manual_write_to_replicas",
         "01460_DistributedFilesToInsert",
         "01465_ttl_recompression",
+        "01470_show_databases_like",
         "01471_calculate_ttl_during_merge",
+        "01487_distributed_in_not_default_db",
         "01493_alter_remove_properties_zookeeper",
         "01493_storage_set_persistency",
         "01494_storage_join_persistency",
+        "01501_cache_dictionary_all_fields",
+        "01507_clickhouse_server_start_with_embedded_config",
+        "01509_dictionary_preallocate",
+        "01516_create_table_primary_key",
         "01516_drop_table_stress",
+        "01517_drop_mv_with_inner_table",
+        "01526_complex_key_dict_direct_layout",
+        "01527_clickhouse_local_optimize",
+        "01527_dist_sharding_key_dictGet_reload",
+        "01530_drop_database_atomic_sync",
         "01541_max_memory_usage_for_user",
-        "01646_system_restart_replicas_smoke", // system restart replicas is a global query
+        "01542_dictionary_load_exception_race",
+        "01575_disable_detach_table_of_dictionary",
         "01600_count_of_parts_metrics", // tests global system metrics
+        "01600_detach_permanently",
+        "01600_log_queries_with_extensive_info",
+        "01600_multiple_left_join_with_aliases",
+        "01601_detach_permanently",
+        "01602_show_create_view",
+        "01603_rename_overwrite_bug",
+        "01646_system_restart_replicas_smoke", // system restart replicas is a global query
         "attach",
         "ddl_dictionaries",
         "dictionary",
@@ -482,6 +569,6 @@
         "live_view",
         "memory_leak",
         "memory_limit",
-        "polygon_dicts" // they use an explicitly specified database
+        "polygon_dicts", // they use an explicitly specified database
     ]
 }

From f4f66e953787a0a939d304784c7fd9ca202eebb3 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Wed, 27 Jan 2021 21:37:28 +0300
Subject: [PATCH 571/611] try to use predictable names for stdout/err when
 possible

---
 tests/clickhouse-test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index 70f7fe18982..8f9aaeb6ed8 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -342,7 +342,7 @@ def run_tests_array(all_tests_with_params):
                             SERVER_DIED = True
                             break
 
-                    file_suffix = ('.' + str(os.getpid())) if is_concurrent else ''
+                    file_suffix = ('.' + str(os.getpid())) if is_concurrent and args.test_runs > 1 else ''
                     reference_file = os.path.join(suite_dir, name) + '.reference'
                     stdout_file = os.path.join(suite_tmp_dir, name) + file_suffix + '.stdout'
                     stderr_file = os.path.join(suite_tmp_dir, name) + file_suffix + '.stderr'

From 0cb8a8070ed54a6d7bc8ff97f1ce61bee2fb703b Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <36882414+akuzm@users.noreply.github.com>
Date: Wed, 27 Jan 2021 22:50:18 +0300
Subject: [PATCH 572/611] Update skip_list.json

---
 tests/queries/skip_list.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/queries/skip_list.json b/tests/queries/skip_list.json
index b48d642befd..79aae32da45 100644
--- a/tests/queries/skip_list.json
+++ b/tests/queries/skip_list.json
@@ -569,6 +569,6 @@
         "live_view",
         "memory_leak",
         "memory_limit",
-        "polygon_dicts", // they use an explicitly specified database
+        "polygon_dicts" // they use an explicitly specified database
     ]
 }

From 3f305cecc3dd165d7c2d4d0224bbceddb0c4dfb3 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Wed, 27 Jan 2021 22:52:18 +0300
Subject: [PATCH 573/611] add empty line after error messages in client

---
 programs/client/Client.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 06bd7d84526..ef12974adea 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -931,13 +931,13 @@ private:
             }
             std::cerr << "Received exception from server (version "
                 << server_version << "):" << std::endl << "Code: "
-                << server_exception->code() << ". " << text << std::endl;
+                << server_exception->code() << ". " << text << std::endl << std::endl;
         }
 
         if (client_exception)
         {
             fmt::print(stderr,
-                "Error on processing query '{}':\n{}\n",
+                "Error on processing query '{}':\n{}\n\n",
                 full_query, client_exception->message());
         }
 

From 76e62739ede5c1164a98812eb2ea46560651e83e Mon Sep 17 00:00:00 2001
From: Vladimir Chebotarev <vladimir.chebotarev@gmail.com>
Date: Wed, 27 Jan 2021 23:05:41 +0300
Subject: [PATCH 574/611] Fixed build.

---
 src/IO/S3Common.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/IO/S3Common.cpp b/src/IO/S3Common.cpp
index 69b7a3088fb..fbcd4ed97f1 100644
--- a/src/IO/S3Common.cpp
+++ b/src/IO/S3Common.cpp
@@ -339,7 +339,7 @@ namespace S3
         );
     }
 
-    PocoHTTPClientConfiguration ClientFactory::createClientConfiguration(
+    PocoHTTPClientConfiguration ClientFactory::createClientConfiguration( // NOLINT
         const RemoteHostFilter & remote_host_filter,
         unsigned int s3_max_redirects)
     {

From ff371ccdb69a47d064a087c4ad6a434fbba3a85a Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Wed, 27 Jan 2021 23:22:05 +0300
Subject: [PATCH 575/611] Fixed data race in function DictGetNoType

---
 src/Functions/FunctionsExternalDictionaries.h | 31 ++++++++++++++++---
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/Functions/FunctionsExternalDictionaries.h b/src/Functions/FunctionsExternalDictionaries.h
index e48265aa2b7..cf8eb2f90df 100644
--- a/src/Functions/FunctionsExternalDictionaries.h
+++ b/src/Functions/FunctionsExternalDictionaries.h
@@ -267,30 +267,54 @@ public:
         if (arguments.size() < 3)
             throw Exception{"Wrong argument count for function " + getName(), ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
 
+        /// TODO: We can load only dictionary structure
+
         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};
 
+        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};
 
-        dictionary = helper.getDictionary(dictionary_name);
+        auto dictionary = helper.getDictionary(dictionary_name);
 
         return helper.getDictionaryAttribute(dictionary, attribute_name).type;
     }
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
+        std::cerr << "FunctionDictGetNoType::executeImpl " << this << std::endl;
+
         if (input_rows_count == 0)
             return result_type->createColumn();
 
-        /// TODO: Use accurateCast if argument is integer
+        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};
+
+        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};
+
+        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(...).",
@@ -361,9 +385,6 @@ public:
 
 private:
     mutable FunctionDictHelper helper;
-    /// Initialized in getReturnTypeImpl
-    mutable std::shared_ptr<const IDictionaryBase> dictionary;
-    mutable String attribute_name;
 };
 
 template <typename DataType, typename Name, DictionaryGetFunctionType dictionary_get_function_type>

From 442c6d758a225d9ba7aad152797d83a8e20f9c04 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 28 Jan 2021 04:09:47 +0300
Subject: [PATCH 576/611] Fuzzer: better messages.

---
 docker/test/fuzzer/run-fuzzer.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index 20cdc5bf10c..b036f99e91d 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -189,14 +189,14 @@ case "$stage" in
         echo "failure" > status.txt
         if ! grep -ao "Received signal.*\|Logical error.*\|Assertion.*failed\|Failed assertion.*\|.*runtime error: .*\|.*is located.*\|SUMMARY: MemorySanitizer:.*\|SUMMARY: ThreadSanitizer:.*" server.log > description.txt
         then
-            echo "Lost connection to server. See the logs" > description.txt
+            echo "Lost connection to server. See the logs." > description.txt
         fi
     else
         # Something different -- maybe the fuzzer itself died? Don't grep the
         # server log in this case, because we will find a message about normal
         # server termination (Received signal 15), which is confusing.
         echo "failure" > status.txt
-        echo "Fuzzer failed ($fuzzer_exit_code). See the logs" > description.txt
+        echo "Fuzzer failed ($fuzzer_exit_code). See the logs." > description.txt
     fi
     ;&
 "report")

From 708e68b98313be485f3414aa1f4591dcea633592 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 28 Jan 2021 04:28:19 +0300
Subject: [PATCH 577/611] Fix stack overflow in coroutine

---
 src/DataTypes/DataTypeFactory.cpp                |  8 +++++++-
 .../01675_data_type_coroutine.reference          |  1 +
 .../0_stateless/01675_data_type_coroutine.sh     | 16 ++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 tests/queries/0_stateless/01675_data_type_coroutine.reference
 create mode 100755 tests/queries/0_stateless/01675_data_type_coroutine.sh

diff --git a/src/DataTypes/DataTypeFactory.cpp b/src/DataTypes/DataTypeFactory.cpp
index 2f100202ee9..dc3ce039dbd 100644
--- a/src/DataTypes/DataTypeFactory.cpp
+++ b/src/DataTypes/DataTypeFactory.cpp
@@ -29,8 +29,14 @@ namespace ErrorCodes
 
 DataTypePtr DataTypeFactory::get(const String & full_name) const
 {
+    /// Data type parser can be invoked from coroutines with small stack.
+    /// Value 315 is known to cause stack overflow in some test configurations (debug build, sanitizers)
+    /// let's make the threshold significantly lower.
+    /// It is impractical for user to have complex data types with this depth.
+    static constexpr size_t data_type_max_parse_depth = 200;
+
     ParserDataType parser;
-    ASTPtr ast = parseQuery(parser, full_name.data(), full_name.data() + full_name.size(), "data type", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+    ASTPtr ast = parseQuery(parser, full_name.data(), full_name.data() + full_name.size(), "data type", 0, data_type_max_parse_depth);
     return get(ast);
 }
 
diff --git a/tests/queries/0_stateless/01675_data_type_coroutine.reference b/tests/queries/0_stateless/01675_data_type_coroutine.reference
new file mode 100644
index 00000000000..7326d960397
--- /dev/null
+++ b/tests/queries/0_stateless/01675_data_type_coroutine.reference
@@ -0,0 +1 @@
+Ok
diff --git a/tests/queries/0_stateless/01675_data_type_coroutine.sh b/tests/queries/0_stateless/01675_data_type_coroutine.sh
new file mode 100755
index 00000000000..781e43e4134
--- /dev/null
+++ b/tests/queries/0_stateless/01675_data_type_coroutine.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+I=0
+while true
+do
+    I=$((I + 1))
+    TYPE=$(perl -e "print 'Array(' x $I; print 'UInt8'; print ')' x $I")
+    ${CLICKHOUSE_CLIENT} --max_parser_depth 1000000 --query "SELECT * FROM remote('127.0.0.{1,2}', generateRandom('x $TYPE', 1, 1, 1)) LIMIT 1 FORMAT Null" 2>&1 | grep -q -F 'Maximum parse depth' && break;
+done
+
+#echo "I = ${I}"
+echo 'Ok'

From 297cfb4857836295f25cdb783d6b6afe78d7e017 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 28 Jan 2021 06:34:44 +0300
Subject: [PATCH 578/611] Less parser depth

---
 src/Parsers/ParserDataType.cpp | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/Parsers/ParserDataType.cpp b/src/Parsers/ParserDataType.cpp
index 0148f2f3bb9..3d3f393a300 100644
--- a/src/Parsers/ParserDataType.cpp
+++ b/src/Parsers/ParserDataType.cpp
@@ -14,21 +14,29 @@ namespace
 {
 
 /// Wrapper to allow mixed lists of nested and normal types.
-class ParserNestedTableOrExpression : public IParserBase
+/// Parameters are either:
+/// - Nested table elements;
+/// - Enum element in form of 'a' = 1;
+/// - literal;
+/// - another data type (or identifier)
+class ParserDataTypeArgument : public IParserBase
 {
-    private:
-        const char * getName() const override { return "data type or expression"; }
-        bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override
-        {
-            ParserNestedTable parser1;
+private:
+    const char * getName() const override { return "data type argument"; }
+    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override
+    {
+        ParserNestedTable nested_parser;
+        ParserDataType data_type_parser;
+        ParserLiteral literal_parser;
 
-            if (parser1.parse(pos, node, expected))
-                return true;
+        const char * operators[] = {"=", "equals", nullptr};
+        ParserLeftAssociativeBinaryOperatorList enum_parser(operators, std::make_unique<ParserLiteral>());
 
-            ParserExpression parser2;
-
-            return parser2.parse(pos, node, expected);
-        }
+        return nested_parser.parse(pos, node, expected)
+            || enum_parser.parse(pos, node, expected)
+            || literal_parser.parse(pos, node, expected)
+            || data_type_parser.parse(pos, node, expected);
+    }
 };
 
 }
@@ -104,7 +112,7 @@ bool ParserDataType::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     ++pos;
 
     /// Parse optional parameters
-    ParserList args_parser(std::make_unique<ParserNestedTableOrExpression>(), std::make_unique<ParserToken>(TokenType::Comma));
+    ParserList args_parser(std::make_unique<ParserDataTypeArgument>(), std::make_unique<ParserToken>(TokenType::Comma));
     ASTPtr expr_list_args;
 
     if (!args_parser.parse(pos, expr_list_args, expected))

From 2acff24aaf63afeb0dc57ab4206ac7bb9dec8ef0 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 28 Jan 2021 06:42:20 +0300
Subject: [PATCH 579/611] The test most likely would not work in Arcadia

---
 tests/queries/0_stateless/arcadia_skip_list.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/queries/0_stateless/arcadia_skip_list.txt b/tests/queries/0_stateless/arcadia_skip_list.txt
index 1b42e38a8e9..a34621fc55a 100644
--- a/tests/queries/0_stateless/arcadia_skip_list.txt
+++ b/tests/queries/0_stateless/arcadia_skip_list.txt
@@ -196,3 +196,4 @@
 01181_db_atomic_drop_on_cluster
 01658_test_base64Encode_mysql_compatibility
 01659_test_base64Decode_mysql_compatibility
+01675_data_type_coroutine

From 68c542aec681bbf841f45fc879c1e97052449555 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 28 Jan 2021 07:43:59 +0300
Subject: [PATCH 580/611] Update test

---
 .../0_stateless/00945_bloom_filter_index.sql  | 28 +++++++++----------
 .../01414_low_cardinality_nullable.sql        |  6 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/tests/queries/0_stateless/00945_bloom_filter_index.sql b/tests/queries/0_stateless/00945_bloom_filter_index.sql
index 82321a75c67..ad9c807fc5a 100644
--- a/tests/queries/0_stateless/00945_bloom_filter_index.sql
+++ b/tests/queries/0_stateless/00945_bloom_filter_index.sql
@@ -163,23 +163,23 @@ DROP TABLE IF EXISTS bloom_filter_lc_null_types_test;
 DROP TABLE IF EXISTS bloom_filter_array_lc_null_types_test;
 
 CREATE TABLE bloom_filter_array_lc_null_types_test (
-    order_key   Array(LowCardinality(Nullable((UInt64)))),
+    order_key   Array(LowCardinality(Nullable(UInt64))),
 
-    i8 Array(LowCardinality(Nullable((Int8)))),
-    i16 Array(LowCardinality(Nullable((Int16)))),
-    i32 Array(LowCardinality(Nullable((Int32)))),
-    i64 Array(LowCardinality(Nullable((Int64)))),
-    u8 Array(LowCardinality(Nullable((UInt8)))),
-    u16 Array(LowCardinality(Nullable((UInt16)))),
-    u32 Array(LowCardinality(Nullable((UInt32)))),
-    u64 Array(LowCardinality(Nullable((UInt64)))),
-    f32 Array(LowCardinality(Nullable((Float32)))),
-    f64 Array(LowCardinality(Nullable((Float64)))),
+    i8 Array(LowCardinality(Nullable(Int8))),
+    i16 Array(LowCardinality(Nullable(Int16))),
+    i32 Array(LowCardinality(Nullable(Int32))),
+    i64 Array(LowCardinality(Nullable(Int64))),
+    u8 Array(LowCardinality(Nullable(UInt8))),
+    u16 Array(LowCardinality(Nullable(UInt16))),
+    u32 Array(LowCardinality(Nullable(UInt32))),
+    u64 Array(LowCardinality(Nullable(UInt64))),
+    f32 Array(LowCardinality(Nullable(Float32))),
+    f64 Array(LowCardinality(Nullable(Float64))),
 
-    date Array(LowCardinality(Nullable((Date)))),
+    date Array(LowCardinality(Nullable(Date))),
     date_time Array(LowCardinality(Nullable(DateTime('Europe/Moscow')))),
 
-    str Array(LowCardinality(Nullable((String)))),
+    str Array(LowCardinality(Nullable(String))),
     fixed_string Array(LowCardinality(Nullable(FixedString(5)))),
     INDEX idx (i8, i16, i32, i64, u8, u16, u32, u64, f32, f64, date, date_time, str, fixed_string)
     TYPE bloom_filter GRANULARITY 1)
@@ -286,7 +286,7 @@ SELECT COUNT() FROM bloom_filter_array_lc_null_types_test WHERE has(fixed_string
 DROP TABLE IF EXISTS bloom_filter_array_lc_null_types_test;
 
 DROP TABLE IF EXISTS bloom_filter_array_offsets_lc_str;
-CREATE TABLE bloom_filter_array_offsets_lc_str (order_key int, str Array(LowCardinality((String))), INDEX idx str TYPE bloom_filter(1.) GRANULARITY 1024) ENGINE = MergeTree() ORDER BY order_key SETTINGS index_granularity = 1024;
+CREATE TABLE bloom_filter_array_offsets_lc_str (order_key int, str Array(LowCardinality(String)), INDEX idx str TYPE bloom_filter(1.) GRANULARITY 1024) ENGINE = MergeTree() ORDER BY order_key SETTINGS index_granularity = 1024;
 INSERT INTO bloom_filter_array_offsets_lc_str SELECT number AS i, if(i%2, ['value'], []) FROM system.numbers LIMIT 10000;
 SELECT count() FROM bloom_filter_array_offsets_lc_str WHERE has(str, 'value');
 DROP TABLE IF EXISTS bloom_filter_array_offsets_lc_str;
diff --git a/tests/queries/0_stateless/01414_low_cardinality_nullable.sql b/tests/queries/0_stateless/01414_low_cardinality_nullable.sql
index 9a554ead776..596e90adfd6 100644
--- a/tests/queries/0_stateless/01414_low_cardinality_nullable.sql
+++ b/tests/queries/0_stateless/01414_low_cardinality_nullable.sql
@@ -1,7 +1,7 @@
 DROP TABLE IF EXISTS lc_nullable;
 
 CREATE TABLE lc_nullable (
-    order_key   Array(LowCardinality(Nullable((UInt64)))),
+    order_key   Array(LowCardinality(Nullable(UInt64))),
 
     i8  Array(LowCardinality(Nullable(Int8))),
     i16 Array(LowCardinality(Nullable(Int16))),
@@ -14,10 +14,10 @@ CREATE TABLE lc_nullable (
     f32 Array(LowCardinality(Nullable(Float32))),
     f64 Array(LowCardinality(Nullable(Float64))),
 
-    date Array(LowCardinality(Nullable((Date)))),
+    date Array(LowCardinality(Nullable(Date))),
     date_time Array(LowCardinality(Nullable(DateTime('Europe/Moscow')))),
 
-    str Array(LowCardinality(Nullable((String)))),
+    str Array(LowCardinality(Nullable(String))),
     fixed_string Array(LowCardinality(Nullable(FixedString(5))))
 ) ENGINE = MergeTree() ORDER BY order_key;
 

From d9ca77d90ece2edd77aeedc06e33d74302bf5292 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Thu, 28 Jan 2021 09:58:35 +0300
Subject: [PATCH 581/611] Add missing lsof for fasttest docker image

---
 docker/test/fasttest/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/test/fasttest/Dockerfile b/docker/test/fasttest/Dockerfile
index ac22a9dfaf0..03b7b2fc53a 100644
--- a/docker/test/fasttest/Dockerfile
+++ b/docker/test/fasttest/Dockerfile
@@ -43,6 +43,7 @@ RUN apt-get update \
         clang-tidy-${LLVM_VERSION} \
         cmake \
         curl \
+        lsof \
         expect \
         fakeroot \
         git \

From 4c0c2d03fbd4a34bfd3bd5ef6269be0a1d070bc5 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 28 Jan 2021 10:21:54 +0300
Subject: [PATCH 582/611] Make Fuzzer more reliable

---
 docker/test/fuzzer/run-fuzzer.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index b036f99e91d..9af401238a3 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -21,13 +21,16 @@ function clone
 
     git init
     git remote add origin https://github.com/ClickHouse/ClickHouse
-    git fetch --depth=100 origin "$SHA_TO_TEST"
-    git fetch --depth=100 origin master # Used to obtain the list of modified or added tests
+
+    # 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
-        git fetch --depth=100 origin "refs/pull/$PR_TO_TEST/*:refs/heads/pull/$PR_TO_TEST/*"
+        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"

From d37ca628df96acd631bd3834d620228e19a8e2c5 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 28 Jan 2021 10:44:29 +0300
Subject: [PATCH 583/611] Arcadia does not have bitmaps

---
 tests/queries/0_stateless/arcadia_skip_list.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/queries/0_stateless/arcadia_skip_list.txt b/tests/queries/0_stateless/arcadia_skip_list.txt
index 1b42e38a8e9..871d429e037 100644
--- a/tests/queries/0_stateless/arcadia_skip_list.txt
+++ b/tests/queries/0_stateless/arcadia_skip_list.txt
@@ -196,3 +196,4 @@
 01181_db_atomic_drop_on_cluster
 01658_test_base64Encode_mysql_compatibility
 01659_test_base64Decode_mysql_compatibility
+01671_aggregate_function_group_bitmap_data

From b9b573976e465670990c041ec303b59df1ee3919 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 28 Jan 2021 11:26:10 +0300
Subject: [PATCH 584/611] Minor code improvement in JOIN

---
 src/Interpreters/HashJoin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Interpreters/HashJoin.cpp b/src/Interpreters/HashJoin.cpp
index ac2429334e4..ad1a37c2703 100644
--- a/src/Interpreters/HashJoin.cpp
+++ b/src/Interpreters/HashJoin.cpp
@@ -688,7 +688,7 @@ public:
         if constexpr (has_defaults)
             applyLazyDefaults();
 
-        for (size_t j = 0; j < right_indexes.size(); ++j)
+        for (size_t j = 0, size = right_indexes.size(); j < size; ++j)
             columns[j]->insertFrom(*block.getByPosition(right_indexes[j]).column, row_num);
     }
 
@@ -701,7 +701,7 @@ public:
     {
         if (lazy_defaults_count)
         {
-            for (size_t j = 0; j < right_indexes.size(); ++j)
+            for (size_t j = 0, size = right_indexes.size(); j < size; ++j)
                 JoinCommon::addDefaultValues(*columns[j], type_name[j].first, lazy_defaults_count);
             lazy_defaults_count = 0;
         }

From 18f1fd0caad0af4bb3d38274664babb01bf284fc Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Thu, 28 Jan 2021 11:40:12 +0300
Subject: [PATCH 585/611] Make integration odbc tests idempotent

---
 tests/integration/test_odbc_interaction/test.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/integration/test_odbc_interaction/test.py b/tests/integration/test_odbc_interaction/test.py
index 0ec89be9413..084fc407f39 100644
--- a/tests/integration/test_odbc_interaction/test.py
+++ b/tests/integration/test_odbc_interaction/test.py
@@ -262,18 +262,20 @@ def test_sqlite_odbc_cached_dictionary(started_cluster):
     assert_eq_with_retry(node1, "select dictGetUInt8('sqlite3_odbc_cached', 'Z', toUInt64(1))", "12")
 
 
-def test_postgres_odbc_hached_dictionary_with_schema(started_cluster):
+def test_postgres_odbc_hashed_dictionary_with_schema(started_cluster):
     conn = get_postgres_conn()
     cursor = conn.cursor()
+    cursor.execute("truncate table clickhouse.test_table")
     cursor.execute("insert into clickhouse.test_table values(1, 'hello'),(2, 'world')")
     node1.query("SYSTEM RELOAD DICTIONARY postgres_odbc_hashed")
     assert_eq_with_retry(node1, "select dictGetString('postgres_odbc_hashed', 'column2', toUInt64(1))", "hello")
     assert_eq_with_retry(node1, "select dictGetString('postgres_odbc_hashed', 'column2', toUInt64(2))", "world")
 
 
-def test_postgres_odbc_hached_dictionary_no_tty_pipe_overflow(started_cluster):
+def test_postgres_odbc_hashed_dictionary_no_tty_pipe_overflow(started_cluster):
     conn = get_postgres_conn()
     cursor = conn.cursor()
+    cursor.execute("truncate table clickhouse.test_table")
     cursor.execute("insert into clickhouse.test_table values(3, 'xxx')")
     for i in range(100):
         try:

From 879adc5437754c677abd76915de485a973298037 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Thu, 28 Jan 2021 11:55:20 +0300
Subject: [PATCH 586/611] Add new line to status

---
 tests/clickhouse-test | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index e168f9372de..b2d97679b47 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -434,6 +434,9 @@ def run_tests_array(all_tests_with_params):
                                 if os.path.exists(stderr_file):
                                     os.remove(stderr_file)
 
+            if status and not status.endswith('\n'):
+                status += '\n'
+
             sys.stdout.write(status)
             sys.stdout.flush()
         except KeyboardInterrupt as e:

From 895600f67612d6db21a7aba53920e9827d93773c Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Thu, 28 Jan 2021 11:57:12 +0300
Subject: [PATCH 587/611] Add lsof to fasttest

---
 docker/test/fasttest/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/test/fasttest/Dockerfile b/docker/test/fasttest/Dockerfile
index ac22a9dfaf0..e508c217e25 100644
--- a/docker/test/fasttest/Dockerfile
+++ b/docker/test/fasttest/Dockerfile
@@ -61,6 +61,7 @@ RUN apt-get update \
         software-properties-common \
         tzdata \
         unixodbc \
+        lsof \
        --yes --no-install-recommends
 
 RUN pip3 install numpy scipy pandas

From e1a138cda31678263848ae3e3e6bada0b715c245 Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Thu, 28 Jan 2021 16:59:42 +0800
Subject: [PATCH 588/611] correct style zh doc typo

---
 docs/zh/development/style.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/development/style.md b/docs/zh/development/style.md
index 8f104e3a7d8..c8e883920dd 100644
--- a/docs/zh/development/style.md
+++ b/docs/zh/development/style.md
@@ -118,7 +118,7 @@ for (auto & stream : streams)
     stream.second->finalize();
 ```
 
-**18.** 行的某尾不应该包含空格。
+**18.** 行的末尾不应该包含空格。
 
 **19.** 源文件应该用 UTF-8 编码。
 

From 670d054cf3b2e161e9a79525bcae13d8f160c353 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Thu, 28 Jan 2021 12:08:48 +0300
Subject: [PATCH 589/611] Remove redundant lsof

---
 docker/test/fasttest/Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker/test/fasttest/Dockerfile b/docker/test/fasttest/Dockerfile
index 46c0173c226..03b7b2fc53a 100644
--- a/docker/test/fasttest/Dockerfile
+++ b/docker/test/fasttest/Dockerfile
@@ -62,7 +62,6 @@ RUN apt-get update \
         software-properties-common \
         tzdata \
         unixodbc \
-        lsof \
        --yes --no-install-recommends
 
 RUN pip3 install numpy scipy pandas

From b5d2611aeae5972224790ed6732f52a595d9b219 Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Thu, 28 Jan 2021 12:36:17 +0300
Subject: [PATCH 590/611] Clickhouse client query param CTE added test

---
 .../01674_clickhouse_client_query_param_cte.reference      | 1 +
 .../0_stateless/01674_clickhouse_client_query_param_cte.sh | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 100644 tests/queries/0_stateless/01674_clickhouse_client_query_param_cte.reference
 create mode 100755 tests/queries/0_stateless/01674_clickhouse_client_query_param_cte.sh

diff --git a/tests/queries/0_stateless/01674_clickhouse_client_query_param_cte.reference b/tests/queries/0_stateless/01674_clickhouse_client_query_param_cte.reference
new file mode 100644
index 00000000000..9daeafb9864
--- /dev/null
+++ b/tests/queries/0_stateless/01674_clickhouse_client_query_param_cte.reference
@@ -0,0 +1 @@
+test
diff --git a/tests/queries/0_stateless/01674_clickhouse_client_query_param_cte.sh b/tests/queries/0_stateless/01674_clickhouse_client_query_param_cte.sh
new file mode 100755
index 00000000000..ee75f675eb3
--- /dev/null
+++ b/tests/queries/0_stateless/01674_clickhouse_client_query_param_cte.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_CLIENT --param_paramName="test" -q "WITH subquery AS (SELECT {paramName:String}) SELECT * FROM subquery"

From e2ade3c57463e9e971bfddf9bee25b120e9a7312 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Thu, 28 Jan 2021 12:40:08 +0300
Subject: [PATCH 591/611] Check where and prewhere identifiers exist.

---
 src/Interpreters/ExpressionAnalyzer.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Interpreters/ExpressionAnalyzer.cpp b/src/Interpreters/ExpressionAnalyzer.cpp
index 77f3c9d7537..116c47eda55 100644
--- a/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/src/Interpreters/ExpressionAnalyzer.cpp
@@ -844,7 +844,12 @@ ActionsDAGPtr SelectQueryExpressionAnalyzer::appendPrewhere(
     step.required_output.push_back(prewhere_column_name);
     step.can_remove_required_output.push_back(true);
 
-    auto filter_type = (*step.actions()->getIndex().find(prewhere_column_name))->result_type;
+    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;
     if (!filter_type->canBeUsedInBooleanContext())
         throw Exception("Invalid type for filter in PREWHERE: " + filter_type->getName(),
                         ErrorCodes::ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER);
@@ -944,7 +949,12 @@ bool SelectQueryExpressionAnalyzer::appendWhere(ExpressionActionsChain & chain,
     step.required_output.push_back(where_column_name);
     step.can_remove_required_output = {true};
 
-    auto filter_type = (*step.actions()->getIndex().find(where_column_name))->result_type;
+    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;
     if (!filter_type->canBeUsedInBooleanContext())
         throw Exception("Invalid type for filter in WHERE: " + filter_type->getName(),
                         ErrorCodes::ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER);

From 3d0f878535b530620e061e750178ccbb0fc18585 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Thu, 28 Jan 2021 12:44:12 +0300
Subject: [PATCH 592/611] Added test.

---
 .../0_stateless/01674_where_prewhere_array_crash.reference   | 0
 .../queries/0_stateless/01674_where_prewhere_array_crash.sql | 5 +++++
 2 files changed, 5 insertions(+)
 create mode 100644 tests/queries/0_stateless/01674_where_prewhere_array_crash.reference
 create mode 100644 tests/queries/0_stateless/01674_where_prewhere_array_crash.sql

diff --git a/tests/queries/0_stateless/01674_where_prewhere_array_crash.reference b/tests/queries/0_stateless/01674_where_prewhere_array_crash.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01674_where_prewhere_array_crash.sql b/tests/queries/0_stateless/01674_where_prewhere_array_crash.sql
new file mode 100644
index 00000000000..d6eef000b36
--- /dev/null
+++ b/tests/queries/0_stateless/01674_where_prewhere_array_crash.sql
@@ -0,0 +1,5 @@
+drop table if exists tab;
+create table tab  (x UInt64, `arr.a` Array(UInt64), `arr.b` Array(UInt64)) engine = MergeTree order by x;
+select x from tab array join arr prewhere x != 0 where arr; -- { serverError 47; }
+select x from tab array join arr prewhere arr where x != 0; -- { serverError 47; }
+drop table if exists tab;

From f3dd1aadc37598babf558b2d4df56587c9349e25 Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Thu, 28 Jan 2021 13:06:44 +0300
Subject: [PATCH 593/611] Syntax and links

---
 docs/en/operations/system-tables/quotas.md       | 16 ++++++++--------
 docs/en/sql-reference/statements/create/quota.md | 14 +++++++++-----
 docs/ru/sql-reference/statements/create/quota.md | 13 ++++++++-----
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/docs/en/operations/system-tables/quotas.md b/docs/en/operations/system-tables/quotas.md
index f4f52a4a131..3e797c9bdc6 100644
--- a/docs/en/operations/system-tables/quotas.md
+++ b/docs/en/operations/system-tables/quotas.md
@@ -7,16 +7,16 @@ Columns:
 - `id` ([UUID](../../sql-reference/data-types/uuid.md)) — Quota ID.
 - `storage`([String](../../sql-reference/data-types/string.md)) — Storage of quotas. Possible value: “users.xml” if a quota configured in the users.xml file, “disk” if a quota configured by an SQL-query.
 - `keys` ([Array](../../sql-reference/data-types/array.md)([Enum8](../../sql-reference/data-types/enum.md))) — Key specifies how the quota should be shared. If two connections use the same quota and key, they share the same amounts of resources. Values:
-- `[]` — All users share the same quota.
-- `['user_name']` — Connections with the same user name share the same quota.
-- `['ip_address']` — Connections from the same IP share the same quota.
-- `['client_key']` — Connections with the same key share the same quota. A key must be explicitly provided by a client. When using [clickhouse-client](../../interfaces/cli.md), pass a key value in the `--quota-key` parameter, or use the `quota_key` parameter in the client configuration file. When using HTTP interface, use the `X-ClickHouse-Quota` header.
-- `['user_name', 'client_key']` — Connections with the same `client_key` share the same quota. If a key isn’t provided by a client, the qouta is tracked for `user_name`.
-- `['client_key', 'ip_address']` — Connections with the same `client_key` share the same quota. If a key isn’t provided by a client, the qouta is tracked for `ip_address`.
+    - `[]` — All users share the same quota.
+    - `['user_name']` — Connections with the same user name share the same quota.
+    - `['ip_address']` — Connections from the same IP share the same quota.
+    - `['client_key']` — Connections with the same key share the same quota. A key must be explicitly provided by a client. When using [clickhouse-client](../../interfaces/cli.md), pass a key value in the `--quota-key` parameter, or use the `quota_key` parameter in the client configuration file. When using HTTP interface, use the `X-ClickHouse-Quota` header.
+    - `['user_name', 'client_key']` — Connections with the same `client_key` share the same quota. If a key isn’t provided by a client, the qouta is tracked for `user_name`.
+    - `['client_key', 'ip_address']` — Connections with the same `client_key` share the same quota. If a key isn’t provided by a client, the qouta is tracked for `ip_address`.
 - `durations` ([Array](../../sql-reference/data-types/array.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Time interval lengths in seconds.
 - `apply_to_all` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Logical value. It shows which users the quota is applied to. Values:
-- `0` — The quota applies to users specify in the `apply_to_list`.
-- `1` — The quota applies to all users except those listed in `apply_to_except`.
+    - `0` — The quota applies to users specify in the `apply_to_list`.
+    - `1` — The quota applies to all users except those listed in `apply_to_except`.
 - `apply_to_list` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — List of user names/[roles](../../operations/access-rights.md#role-management) that the quota should be applied to.
 - `apply_to_except` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — List of user names/roles that the quota should not apply to.
 
diff --git a/docs/en/sql-reference/statements/create/quota.md b/docs/en/sql-reference/statements/create/quota.md
index 8f3b89790e4..ec980af921f 100644
--- a/docs/en/sql-reference/statements/create/quota.md
+++ b/docs/en/sql-reference/statements/create/quota.md
@@ -11,13 +11,17 @@ Syntax:
 
 ``` sql
 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 } [,...] |
+    [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 } [,...] |
          NO LIMITS | TRACKING ONLY} [,...]]
     [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.
+
+Parameters `queries`, `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.
+
 `ON CLUSTER` clause allows creating quotas on a cluster, see [Distributed DDL](../../../sql-reference/distributed-ddl.md).
 
 **Examples** 
@@ -25,11 +29,11 @@ CREATE QUOTA [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
 Limit the maximum number of queries for the current user with 123 queries in 15 months constraint:
 
 ``` sql
-CREATE QUOTA qA FOR INTERVAL 15 MONTH MAX QUERIES 123 TO CURRENT_USER;
+CREATE QUOTA qA FOR INTERVAL 15 month MAX queries = 123 TO CURRENT_USER;
 ```
 
 For the default user limit the maximum execution time with half a second in 30 minutes, and limit the maximum number of queries with 321 and the maximum number of errors with 10 in 5 quaters:
 
 ``` sql
-CREATE QUOTA qB FOR INTERVAL 30 MINUTE MAX EXECUTION_TIME = 0.5, FOR INTERVAL 5 QUATER MAX QUERIES = 321, ERRORS = 10 TO default;
+CREATE QUOTA qB FOR INTERVAL 30 minute MAX execution_time = 0.5, FOR INTERVAL 5 quarter MAX queries = 321, errors = 10 TO default;
 ```
diff --git a/docs/ru/sql-reference/statements/create/quota.md b/docs/ru/sql-reference/statements/create/quota.md
index 8ae3cc45ee1..65762071ea2 100644
--- a/docs/ru/sql-reference/statements/create/quota.md
+++ b/docs/ru/sql-reference/statements/create/quota.md
@@ -11,12 +11,15 @@ toc_title: "\u041a\u0432\u043e\u0442\u0430"
 
 ``` sql
 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 } [,...] |
+    [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 } [,...] |
          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).
 
 В секции `ON CLUSTER` можно указать кластеры, на которых создается квота, см. [Распределенные DDL запросы](../../../sql-reference/distributed-ddl.md).
 
@@ -25,13 +28,13 @@ CREATE QUOTA [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
 Ограничить максимальное количество запросов для текущего пользователя — не более 123 запросов за каждые 15 месяцев:
 
 ``` sql
-CREATE QUOTA qA FOR INTERVAL 15 MONTH MAX QUERIES 123 TO CURRENT_USER;
+CREATE QUOTA qA FOR INTERVAL 15 month MAX queries = 123 TO CURRENT_USER;
 ```
 
 Ограничить по умолчанию максимальное время выполнения запроса — не более полсекунды за каждые 30 минут, а также максимальное число запросов — не более 321 и максимальное число ошибок — не более 10 за каждые 5 кварталов:
 
 ``` sql
-CREATE QUOTA qB FOR INTERVAL 30 MINUTE MAX EXECUTION_TIME = 0.5, FOR INTERVAL 5 QUATER MAX QUERIES = 321, ERRORS = 10 TO default;
+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) 

From 09e0fa45d297a594d34a43073649dfddf9f9d0f2 Mon Sep 17 00:00:00 2001
From: emhlbmc <lunatictwo@163.com>
Date: Thu, 28 Jan 2021 18:13:31 +0800
Subject: [PATCH 594/611] Update mergetree.md

---
 docs/zh/engines/table-engines/mergetree-family/mergetree.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/engines/table-engines/mergetree-family/mergetree.md b/docs/zh/engines/table-engines/mergetree-family/mergetree.md
index 2fffcbe7ef3..353dd5f5bc8 100644
--- a/docs/zh/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/zh/engines/table-engines/mergetree-family/mergetree.md
@@ -401,7 +401,7 @@ TTL date_time + INTERVAL 15 HOUR
 
 ### 列 TTL {#mergetree-column-ttl}
 
-当列中的值过期时, ClickHouse会将它们替换成该列数据类型的默认值。如果数据片段中列的所有值均已过期，则ClickHouse 会从文件系统中的数据片段中此列。
+当列中的值过期时, ClickHouse会将它们替换成该列数据类型的默认值。如果数据片段中列的所有值均已过期，则ClickHouse 会从文件系统中的数据片段中删除此列。
 
 `TTL`子句不能被用于主键字段。
 

From 0749d20712707c9431015aad0e0092efc262b677 Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Thu, 28 Jan 2021 13:17:50 +0300
Subject: [PATCH 595/611] Same for ALTER

---
 docs/en/sql-reference/statements/alter/quota.md | 15 ++++++++++-----
 docs/ru/sql-reference/statements/alter/quota.md | 16 +++++++++++-----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/docs/en/sql-reference/statements/alter/quota.md b/docs/en/sql-reference/statements/alter/quota.md
index 18083e4a523..905c57503fc 100644
--- a/docs/en/sql-reference/statements/alter/quota.md
+++ b/docs/en/sql-reference/statements/alter/quota.md
@@ -12,23 +12,28 @@ Syntax:
 ``` sql
 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 } [,...] |
+    [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 } [,...] |
         NO LIMITS | TRACKING ONLY} [,...]]
     [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.
+
+Parameters `queries`, `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.
+
+`ON CLUSTER` clause allows creating quotas on a cluster, see [Distributed DDL](../../../sql-reference/distributed-ddl.md).
 
 **Examples**
 
 Limit the maximum number of queries for the current user with 123 queries in 15 months constraint:
 
 ``` sql
-ALTER QUOTA IF EXISTS qA FOR INTERVAL 15 MONTH MAX QUERIES 123 TO CURRENT_USER;
+ALTER QUOTA IF EXISTS qA FOR INTERVAL 15 month MAX queries = 123 TO CURRENT_USER;
 ```
 
 For the default user limit the maximum execution time with half a second in 30 minutes, and limit the maximum number of queries with 321 and the maximum number of errors with 10 in 5 quaters:
 
 ``` sql
-ALTER QUOTA IF EXISTS qB FOR INTERVAL 30 MINUTE MAX EXECUTION_TIME = 0.5, FOR INTERVAL 5 QUATER MAX QUERIES = 321, ERRORS = 10 TO default;
+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;
 ```
diff --git a/docs/ru/sql-reference/statements/alter/quota.md b/docs/ru/sql-reference/statements/alter/quota.md
index 1abb6336321..0bdac1381da 100644
--- a/docs/ru/sql-reference/statements/alter/quota.md
+++ b/docs/ru/sql-reference/statements/alter/quota.md
@@ -12,25 +12,31 @@ toc_title: QUOTA
 ``` sql
 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 } [,...] |
+    [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 } [,...] |
         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).
+
+В секции `ON CLUSTER` можно указать кластеры, на которых создается квота, см. [Распределенные DDL запросы](../../../sql-reference/distributed-ddl.md).
+
 **Примеры**
 
 Ограничить для текущего пользователя максимальное число запросов — не более 123 запросов за каждые 15 месяцев:
 
 ``` sql
-ALTER QUOTA IF EXISTS qA FOR INTERVAL 15 MONTH MAX QUERIES 123 TO CURRENT_USER;
+ALTER QUOTA IF EXISTS qA FOR INTERVAL 15 month MAX queries = 123 TO CURRENT_USER;
 ```
 
 Ограничить по умолчанию максимальное время выполнения запроса — не более полсекунды за каждые 30 минут, а также максимальное число запросов — не более 321 и максимальное число ошибок — не более 10 за каждые 5 кварталов:
 
 ``` sql
-ALTER QUOTA IF EXISTS qB FOR INTERVAL 30 MINUTE MAX EXECUTION_TIME = 0.5, FOR INTERVAL 5 QUATER MAX QUERIES = 321, ERRORS = 10 TO default;
+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-->

From 105ecef628b8273e92096e230c767328f85476eb Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Thu, 28 Jan 2021 14:11:34 +0300
Subject: [PATCH 596/611] LowCardinality UUID fix

---
 src/DataTypes/DataTypeLowCardinality.cpp             | 12 +++++++-----
 src/DataTypes/DataTypeUUID.h                         |  1 +
 .../00688_low_cardinality_syntax.reference           |  3 +++
 .../0_stateless/00688_low_cardinality_syntax.sql     |  9 +++++++++
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/DataTypes/DataTypeLowCardinality.cpp b/src/DataTypes/DataTypeLowCardinality.cpp
index a433d39c561..9614c150c7d 100644
--- a/src/DataTypes/DataTypeLowCardinality.cpp
+++ b/src/DataTypes/DataTypeLowCardinality.cpp
@@ -885,15 +885,17 @@ MutableColumnUniquePtr DataTypeLowCardinality::createColumnUniqueImpl(const IDat
     if (const auto * nullable_type = typeid_cast<const DataTypeNullable *>(&keys_type))
         type = nullable_type->getNestedType().get();
 
-    if (isString(type))
+    WhichDataType which(type);
+
+    if (which.isString())
         return creator(static_cast<ColumnString *>(nullptr));
-    if (isFixedString(type))
+    else if (which.isFixedString())
         return creator(static_cast<ColumnFixedString *>(nullptr));
-    if (typeid_cast<const DataTypeDate *>(type))
+    else if (which.isDate())
         return creator(static_cast<ColumnVector<UInt16> *>(nullptr));
-    if (typeid_cast<const DataTypeDateTime *>(type))
+    else if (which.isDateTime())
         return creator(static_cast<ColumnVector<UInt32> *>(nullptr));
-    if (isColumnedAsNumber(type))
+    else if (which.isInt() || which.isUInt() || which.isFloat())
     {
         MutableColumnUniquePtr column;
         TypeListNativeNumbers::forEach(CreateColumnVector(column, *type, creator));
diff --git a/src/DataTypes/DataTypeUUID.h b/src/DataTypes/DataTypeUUID.h
index e9f1d22325b..6290d05cc3b 100644
--- a/src/DataTypes/DataTypeUUID.h
+++ b/src/DataTypes/DataTypeUUID.h
@@ -31,6 +31,7 @@ public:
 
     bool canBeUsedInBitOperations() const override { return true; }
     bool canBeInsideNullable() const override { return true; }
+    bool canBeInsideLowCardinality() const override { return false; }
 
     bool canBePromoted() const override { return false; }
 };
diff --git a/tests/queries/0_stateless/00688_low_cardinality_syntax.reference b/tests/queries/0_stateless/00688_low_cardinality_syntax.reference
index 035402c889d..ca27069a7df 100644
--- a/tests/queries/0_stateless/00688_low_cardinality_syntax.reference
+++ b/tests/queries/0_stateless/00688_low_cardinality_syntax.reference
@@ -18,3 +18,6 @@ c
 d
 cb
 db
+-
+61f0c404-5cb3-11e7-907b-a6006ad3dba0	61f0c404-5cb3-11e7-907b-a6006ad3dba0	61f0c404-5cb3-11e7-907b-a6006ad3dba0
+\N	\N	\N
diff --git a/tests/queries/0_stateless/00688_low_cardinality_syntax.sql b/tests/queries/0_stateless/00688_low_cardinality_syntax.sql
index 98d7b7f5f8a..3ca7b482b84 100644
--- a/tests/queries/0_stateless/00688_low_cardinality_syntax.sql
+++ b/tests/queries/0_stateless/00688_low_cardinality_syntax.sql
@@ -71,3 +71,12 @@ select (toLowCardinality('a') as val) || 'b' group by val;
 select toLowCardinality(z) as val from (select arrayJoin(['c', 'd']) as z) group by val;
 select (toLowCardinality(z) as val) || 'b'  from (select arrayJoin(['c', 'd']) as z) group by val;
 
+select '-';
+drop table if exists lc_str_uuid;
+create table lc_str_uuid(str1 String, str2 LowCardinality(String), str3 StringWithDictionary) ENGINE=Memory;
+select toUUID(str1), toUUID(str2), toUUID(str3) from lc_str_uuid;
+select toUUID(str1, '', NULL), toUUID(str2, '', NULL), toUUID(str3, '', NULL) from lc_str_uuid;
+insert into lc_str_uuid values ('61f0c404-5cb3-11e7-907b-a6006ad3dba0', '61f0c404-5cb3-11e7-907b-a6006ad3dba0', '61f0c404-5cb3-11e7-907b-a6006ad3dba0');
+select toUUID(str1), toUUID(str2), toUUID(str3) from lc_str_uuid;
+select toUUID(str1, '', NULL), toUUID(str2, '', NULL), toUUID(str3, '', NULL) from lc_str_uuid;
+drop table if exists lc_str_uuid;

From 70963e439666be6ecd8a55d3399e344671abc721 Mon Sep 17 00:00:00 2001
From: Yatsishin Ilya <2159081+qoega@users.noreply.github.com>
Date: Thu, 28 Jan 2021 17:57:57 +0300
Subject: [PATCH 597/611] Fixed test_kafka_flush_by_time test.

---
 .../configs/kafka_macros.xml                  | 13 ----------
 tests/integration/test_storage_kafka/test.py  | 26 ++++++++++++++-----
 2 files changed, 19 insertions(+), 20 deletions(-)
 delete mode 100644 tests/integration/test_storage_kafka/configs/kafka_macros.xml

diff --git a/tests/integration/test_storage_kafka/configs/kafka_macros.xml b/tests/integration/test_storage_kafka/configs/kafka_macros.xml
deleted file mode 100644
index 7f6cfb5eb1f..00000000000
--- a/tests/integration/test_storage_kafka/configs/kafka_macros.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" ?>
-<yandex>
-	<macros>
-        <kafka_broker>kafka1</kafka_broker>
-        <kafka_topic_old>old</kafka_topic_old>
-        <kafka_group_name_old>old</kafka_group_name_old>
-
-        <kafka_topic_new>new</kafka_topic_new>
-        <kafka_group_name_new>new</kafka_group_name_new>
-        <kafka_client_id>instance</kafka_client_id>
-        <kafka_format_json_each_row>JSONEachRow</kafka_format_json_each_row>
-	</macros>
-</yandex>
\ No newline at end of file
diff --git a/tests/integration/test_storage_kafka/test.py b/tests/integration/test_storage_kafka/test.py
index 1f31cbdbbc7..5f2726832cc 100644
--- a/tests/integration/test_storage_kafka/test.py
+++ b/tests/integration/test_storage_kafka/test.py
@@ -39,9 +39,16 @@ from . import social_pb2
 
 cluster = ClickHouseCluster(__file__)
 instance = cluster.add_instance('instance',
-                                main_configs=['configs/kafka.xml', 'configs/log_conf.xml', 'configs/kafka_macros.xml'],
+                                main_configs=['configs/kafka.xml', 'configs/log_conf.xml'],
                                 with_kafka=True,
                                 with_zookeeper=True,
+                                macros={"kafka_broker":"kafka1",
+                                        "kafka_topic_old":"old",
+                                        "kafka_group_name_old":"old",
+                                        "kafka_topic_new":"new",
+                                        "kafka_group_name_new":"new",
+                                        "kafka_client_id":"instance",
+                                        "kafka_format_json_each_row":"JSONEachRow"},
                                 clickhouse_path_dir='clickhouse_path')
 kafka_id = ''
 
@@ -1732,6 +1739,11 @@ def test_kafka_produce_key_timestamp(kafka_cluster):
 
 @pytest.mark.timeout(600)
 def test_kafka_flush_by_time(kafka_cluster):
+    admin_client = KafkaAdminClient(bootstrap_servers="localhost:9092")
+    topic_list = []
+    topic_list.append(NewTopic(name="flush_by_time", num_partitions=1, replication_factor=1))
+    admin_client.create_topics(new_topics=topic_list, validate_only=False)
+
     instance.query('''
         DROP TABLE IF EXISTS test.view;
         DROP TABLE IF EXISTS test.consumer;
@@ -1771,7 +1783,7 @@ def test_kafka_flush_by_time(kafka_cluster):
 
     time.sleep(18)
 
-    result = instance.query('SELECT uniqExact(ts) = 2, count() > 15 FROM test.view')
+    result = instance.query('SELECT uniqExact(ts) = 2, count() >= 15 FROM test.view')
 
     cancel.set()
     kafka_thread.join()
@@ -2357,9 +2369,9 @@ def test_premature_flush_on_eof(kafka_cluster):
     ''')
 
     # messages created here will be consumed immedeately after MV creation
-    # reaching topic EOF. 
+    # reaching topic EOF.
     # But we should not do flush immedeately after reaching EOF, because
-    # next poll can return more data, and we should respect kafka_flush_interval_ms 
+    # next poll can return more data, and we should respect kafka_flush_interval_ms
     # and try to form bigger block
     messages = [json.dumps({'key': j + 1, 'value': j + 1}) for j in range(1)]
     kafka_produce('premature_flush_on_eof', messages)
@@ -2379,11 +2391,11 @@ 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"  
-    
+                  # TODO: wait for messages in log: "Polled batch of 1 messages", followed by "Stalled"
+
     # produce more messages after delay
     kafka_produce('premature_flush_on_eof', messages)
 

From 8b3e0e5493ff5347ba7d51a71a5ae36ca4ba2d40 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <36882414+akuzm@users.noreply.github.com>
Date: Thu, 28 Jan 2021 19:15:39 +0300
Subject: [PATCH 598/611] Update 00459_group_array_insert_at.sql

---
 tests/queries/0_stateless/00459_group_array_insert_at.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/queries/0_stateless/00459_group_array_insert_at.sql b/tests/queries/0_stateless/00459_group_array_insert_at.sql
index 8bc329d9103..59ecfc05045 100644
--- a/tests/queries/0_stateless/00459_group_array_insert_at.sql
+++ b/tests/queries/0_stateless/00459_group_array_insert_at.sql
@@ -1,4 +1,3 @@
--- remove this comment before merge
 SELECT groupArrayInsertAt(toString(number), number * 2) FROM (SELECT * FROM system.numbers LIMIT 10);
 SELECT groupArrayInsertAt('-')(toString(number), number * 2) FROM (SELECT * FROM system.numbers LIMIT 10);
 SELECT groupArrayInsertAt([123])(range(number), number * 2) FROM (SELECT * FROM system.numbers LIMIT 10);

From e9b570aceef54b0b169ae60a1984ba98c6c16d5c Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <36882414+akuzm@users.noreply.github.com>
Date: Thu, 28 Jan 2021 19:15:56 +0300
Subject: [PATCH 599/611] Update 01014_lazy_database_basic.sh

---
 tests/queries/0_stateless/01014_lazy_database_basic.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/queries/0_stateless/01014_lazy_database_basic.sh b/tests/queries/0_stateless/01014_lazy_database_basic.sh
index 76cbcea6d97..11d698e764e 100755
--- a/tests/queries/0_stateless/01014_lazy_database_basic.sh
+++ b/tests/queries/0_stateless/01014_lazy_database_basic.sh
@@ -4,8 +4,6 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-# remove this comment before merge
-
 ${CLICKHOUSE_CLIENT} -n -q "DROP DATABASE IF EXISTS testlazy"
 
 ${CLICKHOUSE_CLIENT} -n -q "

From f6218714653c30d8e48e067fd16ea330fd7b4af0 Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Thu, 28 Jan 2021 19:17:46 +0300
Subject: [PATCH 600/611] Fixed race in tests

---
 src/Functions/FunctionsExternalDictionaries.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Functions/FunctionsExternalDictionaries.h b/src/Functions/FunctionsExternalDictionaries.h
index cf8eb2f90df..3c955ffbcf0 100644
--- a/src/Functions/FunctionsExternalDictionaries.h
+++ b/src/Functions/FunctionsExternalDictionaries.h
@@ -292,8 +292,6 @@ public:
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
-        std::cerr << "FunctionDictGetNoType::executeImpl " << this << std::endl;
-
         if (input_rows_count == 0)
             return result_type->createColumn();
 

From d72b302b9790b56036201a6a424660b713b67828 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <36882414+akuzm@users.noreply.github.com>
Date: Thu, 28 Jan 2021 23:16:35 +0300
Subject: [PATCH 601/611] Update Client.cpp

---
 programs/client/Client.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index ef12974adea..9a8b580407a 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -931,14 +931,22 @@ private:
             }
             std::cerr << "Received exception from server (version "
                 << server_version << "):" << std::endl << "Code: "
-                << server_exception->code() << ". " << text << std::endl << std::endl;
+                << server_exception->code() << ". " << text << std::endl;
+            if (is_interactive)
+            {
+                std::cerr << std::endl;
+            }
         }
 
         if (client_exception)
         {
             fmt::print(stderr,
-                "Error on processing query '{}':\n{}\n\n",
+                "Error on processing query '{}':\n{}\n",
                 full_query, client_exception->message());
+            if (is_interactive)
+            {
+                fmt::print(stderr, "\n");
+            }
         }
 
         // A debug check -- at least some exception must be set, if the error

From 5e3fce1509e9532e91a06afd0ec8ce2a12720d49 Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Fri, 29 Jan 2021 00:29:51 +0300
Subject: [PATCH 602/611] Added test to ANTLR skip_list.json

---
 tests/queries/skip_list.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/queries/skip_list.json b/tests/queries/skip_list.json
index 8ed1e890cf1..95163bae9f8 100644
--- a/tests/queries/skip_list.json
+++ b/tests/queries/skip_list.json
@@ -310,7 +310,8 @@
         "01642_if_nullable_regression",
         "01643_system_suspend",
         "01655_plan_optimizations",
-        "01475_read_subcolumns_storages"
+        "01475_read_subcolumns_storages",
+        "01674_clickhouse_client_query_param_cte"
     ],
     "parallel":
     [

From 9c111a7bdb553e784f32f501f9f2cbc9be396a28 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Fri, 29 Jan 2021 03:53:54 +0300
Subject: [PATCH 603/611] Translate comment in test

---
 tests/queries/1_stateful/00139_like.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/queries/1_stateful/00139_like.sql b/tests/queries/1_stateful/00139_like.sql
index ccc195bc81d..8cb84558407 100644
--- a/tests/queries/1_stateful/00139_like.sql
+++ b/tests/queries/1_stateful/00139_like.sql
@@ -1,4 +1,4 @@
-/* Заметим, что запросы написаны так, как будто пользователь не понимает смысл символа _ в LIKE выражении. */
+/* Note that queries are written as the user doesn't really understand that the symbol _ has special meaning in LIKE pattern. */
 SELECT count() FROM test.hits WHERE URL LIKE '%/avtomobili_s_probegom/_%__%__%__%';
 SELECT count() FROM test.hits WHERE URL LIKE '/avtomobili_s_probegom/_%__%__%__%';
 SELECT count() FROM test.hits WHERE URL LIKE '%_/avtomobili_s_probegom/_%__%__%__%';

From eb0473c3f92371fde097e2e5be40ecbb1d2029f8 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Fri, 29 Jan 2021 04:03:38 +0300
Subject: [PATCH 604/611] Fix UBSan report in "round"

---
 base/common/defines.h                                     | 2 ++
 src/Functions/FunctionsRound.h                            | 3 ++-
 tests/queries/0_stateless/01676_round_int_ubsan.reference | 1 +
 tests/queries/0_stateless/01676_round_int_ubsan.sql       | 6 ++++++
 4 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 tests/queries/0_stateless/01676_round_int_ubsan.reference
 create mode 100644 tests/queries/0_stateless/01676_round_int_ubsan.sql

diff --git a/base/common/defines.h b/base/common/defines.h
index 39df4698b88..845a53179ef 100644
--- a/base/common/defines.h
+++ b/base/common/defines.h
@@ -84,10 +84,12 @@
 #    define NO_SANITIZE_UNDEFINED __attribute__((__no_sanitize__("undefined")))
 #    define NO_SANITIZE_ADDRESS __attribute__((__no_sanitize__("address")))
 #    define NO_SANITIZE_THREAD __attribute__((__no_sanitize__("thread")))
+#    define ALWAYS_INLINE_NO_SANITIZE_UNDEFINED __attribute__((__always_inline__, __no_sanitize__("undefined")))
 #else  /// It does not work in GCC. GCC 7 cannot recognize this attribute and GCC 8 simply ignores it.
 #    define NO_SANITIZE_UNDEFINED
 #    define NO_SANITIZE_ADDRESS
 #    define NO_SANITIZE_THREAD
+#    define ALWAYS_INLINE_NO_SANITIZE_UNDEFINED ALWAYS_INLINE
 #endif
 
 /// A template function for suppressing warnings about unused variables or function results.
diff --git a/src/Functions/FunctionsRound.h b/src/Functions/FunctionsRound.h
index f942b894052..b510f62662e 100644
--- a/src/Functions/FunctionsRound.h
+++ b/src/Functions/FunctionsRound.h
@@ -101,7 +101,8 @@ struct IntegerRoundingComputation
         return scale;
     }
 
-    static ALWAYS_INLINE T computeImpl(T x, T scale)
+    /// Integer overflow is Ok.
+    static ALWAYS_INLINE_NO_SANITIZE_UNDEFINED T computeImpl(T x, T scale)
     {
         switch (rounding_mode)
         {
diff --git a/tests/queries/0_stateless/01676_round_int_ubsan.reference b/tests/queries/0_stateless/01676_round_int_ubsan.reference
new file mode 100644
index 00000000000..cec4825deb9
--- /dev/null
+++ b/tests/queries/0_stateless/01676_round_int_ubsan.reference
@@ -0,0 +1 @@
+9223372036854775700
diff --git a/tests/queries/0_stateless/01676_round_int_ubsan.sql b/tests/queries/0_stateless/01676_round_int_ubsan.sql
new file mode 100644
index 00000000000..45aa5706a05
--- /dev/null
+++ b/tests/queries/0_stateless/01676_round_int_ubsan.sql
@@ -0,0 +1,6 @@
+-- Overflow during integer rounding is implementation specific behaviour.
+-- This test allows to be aware if the impkementation changes.
+-- Changing the implementation specific behaviour is Ok.
+-- and should not be treat as incompatibility (simply update test result then).
+
+SELECT round(-9223372036854775808, -2);

From b3944006cb9de882051fea2b4572a4c04c71c1b4 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Fri, 29 Jan 2021 04:41:55 +0300
Subject: [PATCH 605/611] Fix trivial bug in arrayEnumerateUniq

---
 src/Functions/array/arrayEnumerateExtended.h        |  3 +++
 .../0_stateless/01677_array_enumerate_bug.reference |  2 ++
 .../0_stateless/01677_array_enumerate_bug.sql       | 13 +++++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 tests/queries/0_stateless/01677_array_enumerate_bug.reference
 create mode 100644 tests/queries/0_stateless/01677_array_enumerate_bug.sql

diff --git a/src/Functions/array/arrayEnumerateExtended.h b/src/Functions/array/arrayEnumerateExtended.h
index 412fe9e7858..39bdd2a515e 100644
--- a/src/Functions/array/arrayEnumerateExtended.h
+++ b/src/Functions/array/arrayEnumerateExtended.h
@@ -353,6 +353,9 @@ bool FunctionArrayEnumerateExtended<Derived>::execute128bit(
         keys_bytes += key_sizes[j];
     }
 
+    if (keys_bytes > 16)
+        return false;
+
     executeMethod<MethodFixed>(offsets, columns, key_sizes, nullptr, res_values);
     return true;
 }
diff --git a/tests/queries/0_stateless/01677_array_enumerate_bug.reference b/tests/queries/0_stateless/01677_array_enumerate_bug.reference
new file mode 100644
index 00000000000..9c0e526801f
--- /dev/null
+++ b/tests/queries/0_stateless/01677_array_enumerate_bug.reference
@@ -0,0 +1,2 @@
+[1,1,2]
+[1,1,1]
diff --git a/tests/queries/0_stateless/01677_array_enumerate_bug.sql b/tests/queries/0_stateless/01677_array_enumerate_bug.sql
new file mode 100644
index 00000000000..0db0c51fe5b
--- /dev/null
+++ b/tests/queries/0_stateless/01677_array_enumerate_bug.sql
@@ -0,0 +1,13 @@
+-- there was a bug - missing check of the total size of keys for the case with hash table with 128bit key.
+
+SELECT arrayEnumerateUniq(arrayEnumerateUniq([toInt256(10), toInt256(100), toInt256(2)]), [toInt256(123), toInt256(1023), toInt256(123)]);
+
+SELECT arrayEnumerateUniq(
+    [111111, 222222, 333333],
+    [444444, 555555, 666666],
+    [111111, 222222, 333333],
+    [444444, 555555, 666666],
+    [111111, 222222, 333333],
+    [444444, 555555, 666666],
+    [111111, 222222, 333333],
+    [444444, 555555, 666666]);

From 9477f8a8b11bc42a0609140d9c85ab9aa9487e1b Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Fri, 29 Jan 2021 08:27:58 +0300
Subject: [PATCH 606/611] Revert "Remove old non-automated test"

This reverts commit 217d05443a654bb35b760c2d144aa3516d30fd97.
---
 src/Client/tests/CMakeLists.txt   |  2 ++
 src/Client/tests/test_connect.cpp | 59 +++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 src/Client/tests/test_connect.cpp

diff --git a/src/Client/tests/CMakeLists.txt b/src/Client/tests/CMakeLists.txt
index e69de29bb2d..d952c006bb5 100644
--- a/src/Client/tests/CMakeLists.txt
+++ b/src/Client/tests/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_executable(test-connect test_connect.cpp)
+target_link_libraries (test-connect PRIVATE dbms)
diff --git a/src/Client/tests/test_connect.cpp b/src/Client/tests/test_connect.cpp
new file mode 100644
index 00000000000..50075cc24a6
--- /dev/null
+++ b/src/Client/tests/test_connect.cpp
@@ -0,0 +1,59 @@
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <unistd.h>
+
+#include <iostream>
+#include <Poco/Net/StreamSocket.h>
+#include <Common/Exception.h>
+#include <IO/ReadHelpers.h>
+
+
+/** In a loop it connects to the server and immediately breaks the connection.
+  * Using the SO_LINGER option, we ensure that the connection is terminated by sending a RST packet (not FIN).
+  * This behavior causes a bug in the TCPServer implementation in the Poco library.
+  */
+int main(int argc, char ** argv)
+try
+{
+    for (size_t i = 0, num_iters = argc >= 2 ? DB::parse<size_t>(argv[1]) : 1; i < num_iters; ++i)
+    {
+        std::cerr << ".";
+
+        Poco::Net::SocketAddress address("localhost", 9000);
+
+        int fd = socket(PF_INET, SOCK_STREAM, IPPROTO_IP);
+
+        if (fd < 0)
+            DB::throwFromErrno("Cannot create socket", 0);
+
+        linger linger_value;
+        linger_value.l_onoff = 1;
+        linger_value.l_linger = 0;
+
+        if (0 != setsockopt(fd, SOL_SOCKET, SO_LINGER, &linger_value, sizeof(linger_value)))
+            DB::throwFromErrno("Cannot set linger", 0);
+
+        try
+        {
+            int res = connect(fd, address.addr(), address.length());
+
+            if (res != 0 && errno != EINPROGRESS && errno != EWOULDBLOCK)
+            {
+                close(fd);
+                DB::throwFromErrno("Cannot connect", 0);
+            }
+
+            close(fd);
+        }
+        catch (const Poco::Exception & e)
+        {
+            std::cerr << e.displayText() << "\n";
+        }
+    }
+
+    std::cerr << "\n";
+}
+catch (const Poco::Exception & e)
+{
+    std::cerr << e.displayText() << "\n";
+}

From bfcb12c2e9bcde8fd52b24534c6a160359137382 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Fri, 29 Jan 2021 09:13:43 +0300
Subject: [PATCH 607/611] Add test-connect tool

---
 src/Client/tests/test_connect.cpp | 102 +++++++++++++++++++++---------
 src/Interpreters/executeQuery.cpp |   1 -
 2 files changed, 71 insertions(+), 32 deletions(-)

diff --git a/src/Client/tests/test_connect.cpp b/src/Client/tests/test_connect.cpp
index 50075cc24a6..1259980f9a6 100644
--- a/src/Client/tests/test_connect.cpp
+++ b/src/Client/tests/test_connect.cpp
@@ -3,54 +3,94 @@
 #include <unistd.h>
 
 #include <iostream>
+#include <thread>
+#include <atomic>
 #include <Poco/Net/StreamSocket.h>
 #include <Common/Exception.h>
+#include <Common/Stopwatch.h>
 #include <IO/ReadHelpers.h>
 
 
 /** In a loop it connects to the server and immediately breaks the connection.
   * Using the SO_LINGER option, we ensure that the connection is terminated by sending a RST packet (not FIN).
-  * This behavior causes a bug in the TCPServer implementation in the Poco library.
+  * Long time ago this behavior caused a bug in the TCPServer implementation in the Poco library.
   */
 int main(int argc, char ** argv)
 try
 {
-    for (size_t i = 0, num_iters = argc >= 2 ? DB::parse<size_t>(argv[1]) : 1; i < num_iters; ++i)
+    size_t num_iterations = 1;
+    size_t num_threads = 1;
+    std::string host = "localhost";
+    uint16_t port = 9000;
+
+    if (argc >= 2)
+        num_iterations = DB::parse<size_t>(argv[1]);
+
+    if (argc >= 3)
+        num_threads = DB::parse<size_t>(argv[2]);
+
+    if (argc >= 4)
+        host = argv[3];
+
+    if (argc >= 5)
+        port = DB::parse<uint16_t>(argv[4]);
+
+    std::atomic_bool cancel{false};
+    std::vector<std::thread> threads(num_threads);
+    for (auto & thread : threads)
     {
-        std::cerr << ".";
-
-        Poco::Net::SocketAddress address("localhost", 9000);
-
-        int fd = socket(PF_INET, SOCK_STREAM, IPPROTO_IP);
-
-        if (fd < 0)
-            DB::throwFromErrno("Cannot create socket", 0);
-
-        linger linger_value;
-        linger_value.l_onoff = 1;
-        linger_value.l_linger = 0;
-
-        if (0 != setsockopt(fd, SOL_SOCKET, SO_LINGER, &linger_value, sizeof(linger_value)))
-            DB::throwFromErrno("Cannot set linger", 0);
-
-        try
+        thread = std::thread([&]
         {
-            int res = connect(fd, address.addr(), address.length());
-
-            if (res != 0 && errno != EINPROGRESS && errno != EWOULDBLOCK)
+            for (size_t i = 0; i < num_iterations && !cancel.load(std::memory_order_relaxed); ++i)
             {
-                close(fd);
-                DB::throwFromErrno("Cannot connect", 0);
-            }
+                std::cerr << ".";
 
-            close(fd);
-        }
-        catch (const Poco::Exception & e)
-        {
-            std::cerr << e.displayText() << "\n";
-        }
+                Poco::Net::SocketAddress address(host, port);
+
+                int fd = socket(PF_INET, SOCK_STREAM, IPPROTO_IP);
+
+                if (fd < 0)
+                    DB::throwFromErrno("Cannot create socket", 0);
+
+                linger linger_value;
+                linger_value.l_onoff = 1;
+                linger_value.l_linger = 0;
+
+                if (0 != setsockopt(fd, SOL_SOCKET, SO_LINGER, &linger_value, sizeof(linger_value)))
+                    DB::throwFromErrno("Cannot set linger", 0);
+
+                try
+                {
+                    Stopwatch watch;
+
+                    int res = connect(fd, address.addr(), address.length());
+
+                    if (res != 0 && errno != EINPROGRESS && errno != EWOULDBLOCK)
+                    {
+                        close(fd);
+                        DB::throwFromErrno("Cannot connect", 0);
+                    }
+
+                    close(fd);
+
+                    if (watch.elapsedSeconds() > 0.1)
+                    {
+                        std::cerr << watch.elapsedSeconds() << "\n";
+                        cancel = true;
+                        break;
+                    }
+                }
+                catch (const Poco::Exception & e)
+                {
+                    std::cerr << e.displayText() << "\n";
+                }
+            }
+        });
     }
 
+    for (auto & thread : threads)
+        thread.join();
+
     std::cerr << "\n";
 }
 catch (const Poco::Exception & e)
diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index 020e5af365a..50e891a3524 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -51,7 +51,6 @@
 #include <Interpreters/Context.h>
 #include <Common/ProfileEvents.h>
 
-#include <Interpreters/DNSCacheUpdater.h>
 #include <Common/SensitiveDataMasker.h>
 
 #include <Processors/Transforms/LimitsCheckingTransform.h>

From 5a92e633a12177168cee7e559ac9e82bec2dca90 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Fri, 29 Jan 2021 10:37:46 +0300
Subject: [PATCH 608/611] Remove useless headers

---
 src/Core/MySQL/MySQLClient.cpp                | 2 ++
 src/Core/MySQL/MySQLClient.h                  | 1 -
 src/Interpreters/Context.cpp                  | 1 -
 src/Storages/System/StorageSystemClusters.cpp | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Core/MySQL/MySQLClient.cpp b/src/Core/MySQL/MySQLClient.cpp
index f65fbe62274..e41b4128738 100644
--- a/src/Core/MySQL/MySQLClient.cpp
+++ b/src/Core/MySQL/MySQLClient.cpp
@@ -6,8 +6,10 @@
 #include <Core/MySQL/PacketsProtocolText.h>
 #include <Core/MySQL/PacketsReplication.h>
 #include <Core/MySQL/MySQLReplication.h>
+#include <Common/DNSResolver.h>
 #include <Poco/String.h>
 
+
 namespace DB
 {
 using namespace Generic;
diff --git a/src/Core/MySQL/MySQLClient.h b/src/Core/MySQL/MySQLClient.h
index 5835e980149..e503c985584 100644
--- a/src/Core/MySQL/MySQLClient.h
+++ b/src/Core/MySQL/MySQLClient.h
@@ -7,7 +7,6 @@
 #include <IO/WriteHelpers.h>
 #include <Poco/Net/NetException.h>
 #include <Poco/Net/StreamSocket.h>
-#include <Common/DNSResolver.h>
 #include <Common/Exception.h>
 #include <Common/NetException.h>
 #include <Core/MySQL/IMySQLWritePacket.h>
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index 69e09b36e64..d7fa4da44cd 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -50,7 +50,6 @@
 #include <Interpreters/SystemLog.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/DDLWorker.h>
-#include <Common/DNSResolver.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/UncompressedCache.h>
 #include <Parsers/ASTCreateQuery.h>
diff --git a/src/Storages/System/StorageSystemClusters.cpp b/src/Storages/System/StorageSystemClusters.cpp
index 83d165f54f7..ae8bcca2804 100644
--- a/src/Storages/System/StorageSystemClusters.cpp
+++ b/src/Storages/System/StorageSystemClusters.cpp
@@ -1,4 +1,3 @@
-#include <Common/DNSResolver.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Interpreters/Cluster.h>

From 0ee05d34fc487d044339337a6c96a8440be7ce97 Mon Sep 17 00:00:00 2001
From: Alexander Gololobov <agololobov@gmail.com>
Date: Fri, 29 Jan 2021 14:54:54 +0300
Subject: [PATCH 609/611] Fix dependency on ODBC for Yandex internal build

---
 src/Dictionaries/XDBCDictionarySource.cpp | 2 +-
 src/Dictionaries/ya.make                  | 5 ++++-
 src/Dictionaries/ya.make.in               | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Dictionaries/XDBCDictionarySource.cpp b/src/Dictionaries/XDBCDictionarySource.cpp
index aa27f4efc25..3615f72605f 100644
--- a/src/Dictionaries/XDBCDictionarySource.cpp
+++ b/src/Dictionaries/XDBCDictionarySource.cpp
@@ -21,7 +21,7 @@
 #include "registerDictionaries.h"
 
 #if USE_ODBC
-#    include <Poco/Data/ODBC/Connector.h>
+#    include <Poco/Data/ODBC/Connector.h> // Y_IGNORE
 #endif
 
 namespace DB
diff --git a/src/Dictionaries/ya.make b/src/Dictionaries/ya.make
index 19a0f5008b8..1e658430e27 100644
--- a/src/Dictionaries/ya.make
+++ b/src/Dictionaries/ya.make
@@ -6,12 +6,15 @@ LIBRARY()
 PEERDIR(
     clickhouse/src/Common
     contrib/libs/poco/Data
-    contrib/libs/poco/Data/ODBC
     contrib/libs/poco/MongoDB
     contrib/libs/poco/Redis
     contrib/libs/sparsehash
 )
 
+IF (USE_ODBC)
+    PEERDIR(contrib/libs/poco/Data/ODBC)
+ENDIF ()
+
 NO_COMPILER_WARNINGS()
 
 
diff --git a/src/Dictionaries/ya.make.in b/src/Dictionaries/ya.make.in
index 5df5803e7f4..e52b106d034 100644
--- a/src/Dictionaries/ya.make.in
+++ b/src/Dictionaries/ya.make.in
@@ -5,12 +5,15 @@ LIBRARY()
 PEERDIR(
     clickhouse/src/Common
     contrib/libs/poco/Data
-    contrib/libs/poco/Data/ODBC
     contrib/libs/poco/MongoDB
     contrib/libs/poco/Redis
     contrib/libs/sparsehash
 )
 
+IF (USE_ODBC)
+    PEERDIR(contrib/libs/poco/Data/ODBC)
+ENDIF ()
+
 NO_COMPILER_WARNINGS()
 
 

From 626a23afc7ff71eabfb89750d2c77307040d2e23 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Fri, 29 Jan 2021 15:51:10 +0300
Subject: [PATCH 610/611] Fix option

---
 docker/test/stateless/run.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker/test/stateless/run.sh b/docker/test/stateless/run.sh
index fb510a87fcd..575be721a54 100755
--- a/docker/test/stateless/run.sh
+++ b/docker/test/stateless/run.sh
@@ -53,10 +53,12 @@ function run_tests()
     if [ "$NUM_TRIES" -gt "1" ]; then
         ADDITIONAL_OPTIONS+=('--skip')
         ADDITIONAL_OPTIONS+=('00000_no_tests_to_skip')
+        ADDITIONAL_OPTIONS+=('--jobs')
+        ADDITIONAL_OPTIONS+=('4')
     fi
 
     clickhouse-test --testname --shard --zookeeper --hung-check --print-time \
-            --test-runs "$NUM_TRIES" --jobs 4 \
+            --test-runs "$NUM_TRIES" \
             "$SKIP_LIST_OPT" "${ADDITIONAL_OPTIONS[@]}" 2>&1 \
         | ts '%Y-%m-%d %H:%M:%S' \
         | tee -a test_output/test_result.txt

From 941f60a7b50973fb2a773b51c586bd521429d38f Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Fri, 29 Jan 2021 16:17:17 +0300
Subject: [PATCH 611/611] Temporary retrun dicttoxml to integration tests
 runner

---
 docker/test/integration/runner/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/test/integration/runner/Dockerfile b/docker/test/integration/runner/Dockerfile
index 56abf1122b2..f353931f0a0 100644
--- a/docker/test/integration/runner/Dockerfile
+++ b/docker/test/integration/runner/Dockerfile
@@ -63,6 +63,7 @@ RUN python3 -m pip install \
     cassandra-driver \
     confluent-kafka \
     dict2xml \
+    dicttoxml \
     docker \
     docker-compose==1.22.0 \
     grpcio \