From 869a6f6aa040af26ba45e6751e47637a1f409c34 Mon Sep 17 00:00:00 2001
From: Evgeniia Sudarikova <evgsudarikova@yandex-team.ru>
Date: Thu, 12 Nov 2020 16:25:05 +0300
Subject: [PATCH 01/99] Add EN and RU description

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

diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index f9c3c8a5d75..f720024f524 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -2233,4 +2233,14 @@ Possible values:
 
 Default value: `1`.
 
+## output_format_tsv_null_representation {#output_format_tsv_null_representation}
+
+Allows configurable `NULL` representation for [TSV](../../interfaces/formats.md#tabseparated) output format. The setting only controls output format and `\N` is the only supported `NULL` representation for TSV input format.
+
+Possible values:
+
+-   `\N` — Enabled.
+
+Default value: `\N`.
+
 [Original article](https://clickhouse.tech/docs/en/operations/settings/settings/) <!-- hide -->
diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index 39a996cb44e..9e192348f51 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -2095,4 +2095,14 @@ SELECT CAST(toNullable(toInt32(0)) AS Int32) as x, toTypeName(x);
 
 Значение по умолчанию: `1`.
 
+## output_format_tsv_null_representation {#output_format_tsv_null_representation}
+
+Позволяет настраивать представление `NULL` для формата выходных данных [TSV](../../interfaces/formats.md#tabseparated). Настройка управляет форматом выходных данных, `\N` является единственным поддерживаемым представлением для формата входных данных TSV.
+
+Возможные значения:
+
+-   `\N` — включено.
+
+Значение по умолчанию: `\N`.
+
 [Оригинальная статья](https://clickhouse.tech/docs/ru/operations/settings/settings/) <!--hide-->

From 9961182e86732f155a2193ce3c7c6286f37daccd Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Mon, 9 Nov 2020 20:31:51 +0800
Subject: [PATCH 02/99] Fix verbatim partition pruner

---
 src/Storages/MergeTree/KeyCondition.cpp                    | 7 +++++++
 .../0_stateless/01540_verbatim_partition_pruning.reference | 1 +
 .../0_stateless/01540_verbatim_partition_pruning.sql       | 7 +++++++
 3 files changed, 15 insertions(+)

diff --git a/src/Storages/MergeTree/KeyCondition.cpp b/src/Storages/MergeTree/KeyCondition.cpp
index 4caeafc093f..b89c68617b7 100644
--- a/src/Storages/MergeTree/KeyCondition.cpp
+++ b/src/Storages/MergeTree/KeyCondition.cpp
@@ -714,6 +714,13 @@ bool KeyCondition::canConstantBeWrappedByFunctions(
                 break;
             }
         }
+
+        // Check if we have enough columns to fulfill the action.
+        for (const auto & name : action.getNeededColumns())
+        {
+            if (!transform.has(name))
+                return false;
+        }
         action.execute(transform, true);
     }
 
diff --git a/tests/queries/0_stateless/01540_verbatim_partition_pruning.reference b/tests/queries/0_stateless/01540_verbatim_partition_pruning.reference
index 90888a9eaf5..b9338e6a9c4 100644
--- a/tests/queries/0_stateless/01540_verbatim_partition_pruning.reference
+++ b/tests/queries/0_stateless/01540_verbatim_partition_pruning.reference
@@ -1,3 +1,4 @@
 2	3
 9	5
 8	4
+1	2	3
diff --git a/tests/queries/0_stateless/01540_verbatim_partition_pruning.sql b/tests/queries/0_stateless/01540_verbatim_partition_pruning.sql
index 2ef9c9e8917..16ab51d1160 100644
--- a/tests/queries/0_stateless/01540_verbatim_partition_pruning.sql
+++ b/tests/queries/0_stateless/01540_verbatim_partition_pruning.sql
@@ -21,3 +21,10 @@ select * from xy where intHash64(x) % 2 = intHash64(2) % 2;
 select * from xy where x = 8;
 
 drop table if exists xy;
+
+-- Test if we provide enough columns to generate a partition value
+drop table if exists xyz;
+create table xyz(x int, y int, z int) engine MergeTree partition by if(toUInt8(x), y, z) order by x settings index_granularity = 1;
+insert into xyz values (1, 2, 3);
+select * from xyz where y = 2;
+drop table if exists xyz;

From bef6463cb4546ac3e1ec0c1d8171fc791675d6e0 Mon Sep 17 00:00:00 2001
From: Ivan Lezhankin <ilezhankin@yandex-team.ru>
Date: Fri, 13 Nov 2020 18:50:50 +0300
Subject: [PATCH 03/99] Implement tcpPort() function

---
 .../registerFunctionsMiscellaneous.cpp        |  2 +
 src/Functions/tcpPort.cpp                     | 49 +++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 src/Functions/tcpPort.cpp

diff --git a/src/Functions/registerFunctionsMiscellaneous.cpp b/src/Functions/registerFunctionsMiscellaneous.cpp
index 86c06b47b1d..2c0baa7bba4 100644
--- a/src/Functions/registerFunctionsMiscellaneous.cpp
+++ b/src/Functions/registerFunctionsMiscellaneous.cpp
@@ -65,6 +65,7 @@ void registerFunctionGlobalVariable(FunctionFactory &);
 void registerFunctionHasThreadFuzzer(FunctionFactory &);
 void registerFunctionInitializeAggregation(FunctionFactory &);
 void registerFunctionErrorCodeToName(FunctionFactory &);
+void registerFunctionTcpPort(FunctionFactory &);
 
 #if USE_ICU
 void registerFunctionConvertCharset(FunctionFactory &);
@@ -130,6 +131,7 @@ void registerFunctionsMiscellaneous(FunctionFactory & factory)
     registerFunctionHasThreadFuzzer(factory);
     registerFunctionInitializeAggregation(factory);
     registerFunctionErrorCodeToName(factory);
+    registerFunctionTcpPort(factory);
 
 #if USE_ICU
     registerFunctionConvertCharset(factory);
diff --git a/src/Functions/tcpPort.cpp b/src/Functions/tcpPort.cpp
new file mode 100644
index 00000000000..bd7ab0361e2
--- /dev/null
+++ b/src/Functions/tcpPort.cpp
@@ -0,0 +1,49 @@
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionFactory.h>
+
+
+namespace DB
+{
+
+namespace
+{
+
+class FunctionTcpPort : public IFunction
+{
+public:
+    static constexpr auto name = "tcpPort";
+
+    static FunctionPtr create(const Context & context)
+    {
+        return std::make_shared<FunctionTcpPort>(context.getTCPPort());
+    }
+
+    explicit FunctionTcpPort(UInt16 port_) : port(port_)
+    {
+    }
+
+    String getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 0; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes &) const override { return std::make_shared<DataTypeUInt16>(); }
+
+    bool isDeterministic() const override { return false; }
+
+    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        return DataTypeUInt16().createColumnConst(input_rows_count, port);
+    }
+
+private:
+    const UInt64 port;
+};
+
+}
+
+void registerFunctionTcpPort(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionTcpPort>();
+}
+
+}

From 6ef93ac73cac86399d8f7a674c46f03df4cb79bd Mon Sep 17 00:00:00 2001
From: zhang2014 <coswde@gmail.com>
Date: Mon, 16 Nov 2020 21:46:36 +0800
Subject: [PATCH 04/99] Try fix MaterializeMySQL SYNC with modify
 binlog_checksum

---
 src/Core/MySQL/MySQLClient.cpp                | 17 ++++++++---
 src/Core/MySQL/MySQLClient.h                  |  4 ++-
 src/Core/MySQL/MySQLReplication.cpp           |  3 +-
 src/Core/MySQL/MySQLReplication.h             |  4 +++
 src/Core/tests/mysql_protocol.cpp             |  6 ++--
 src/Databases/MySQL/MaterializeMetadata.cpp   | 24 ++++++++++++++++
 src/Databases/MySQL/MaterializeMetadata.h     |  3 ++
 .../MySQL/MaterializeMySQLSyncThread.cpp      | 27 ++++++++++++------
 src/IO/MySQLBinlogEventReadBuffer.cpp         | 28 +++++++++++--------
 src/IO/MySQLBinlogEventReadBuffer.h           |  6 ++--
 .../gtest_mysql_binlog_event_read_buffer.cpp  |  8 +++---
 .../materialize_with_ddl.py                   | 21 ++++++++++++++
 .../test_materialize_mysql_database/test.py   |  9 ++++++
 utils/check-mysql-binlog/main.cpp             |  5 +---
 14 files changed, 126 insertions(+), 39 deletions(-)

diff --git a/src/Core/MySQL/MySQLClient.cpp b/src/Core/MySQL/MySQLClient.cpp
index 9cb21a2d39a..f65fbe62274 100644
--- a/src/Core/MySQL/MySQLClient.cpp
+++ b/src/Core/MySQL/MySQLClient.cpp
@@ -6,6 +6,7 @@
 #include <Core/MySQL/PacketsProtocolText.h>
 #include <Core/MySQL/PacketsReplication.h>
 #include <Core/MySQL/MySQLReplication.h>
+#include <Poco/String.h>
 
 namespace DB
 {
@@ -132,11 +133,19 @@ void MySQLClient::ping()
     writeCommand(Command::COM_PING, "");
 }
 
-void MySQLClient::startBinlogDumpGTID(UInt32 slave_id, String replicate_db, String gtid_str)
+void MySQLClient::setBinlogChecksum(const String & binlog_checksum)
 {
-    /// Set binlog checksum to CRC32.
-    String checksum = "CRC32";
-    writeCommand(Command::COM_QUERY, "SET @master_binlog_checksum = '" + checksum + "'");
+    replication.setChecksumSignatureLength(Poco::toUpper(binlog_checksum) == "NONE" ? 0 : 4);
+}
+
+void MySQLClient::startBinlogDumpGTID(UInt32 slave_id, String replicate_db, String gtid_str, const String & binlog_checksum)
+{
+    /// Maybe CRC32 or NONE. mysqlbinlog.cc use NONE, see its below comments:
+    /// Make a notice to the server that this client is checksum-aware.
+    /// It does not need the first fake Rotate necessary checksummed.
+    writeCommand(Command::COM_QUERY, "SET @master_binlog_checksum = 'CRC32'");
+
+    setBinlogChecksum(binlog_checksum);
 
     /// Set heartbeat 1s.
     UInt64 period_ns = (1 * 1e9);
diff --git a/src/Core/MySQL/MySQLClient.h b/src/Core/MySQL/MySQLClient.h
index a31794acc42..5835e980149 100644
--- a/src/Core/MySQL/MySQLClient.h
+++ b/src/Core/MySQL/MySQLClient.h
@@ -29,10 +29,12 @@ public:
     void disconnect();
     void ping();
 
+    void setBinlogChecksum(const String & binlog_checksum);
+
     /// Start replication stream by GTID.
     /// replicate_db: replication database schema, events from other databases will be ignored.
     /// gtid: executed gtid sets format like 'hhhhhhhh-hhhh-hhhh-hhhh-hhhhhhhhhhhh:x-y'.
-    void startBinlogDumpGTID(UInt32 slave_id, String replicate_db, String gtid);
+    void startBinlogDumpGTID(UInt32 slave_id, String replicate_db, String gtid, const String & binlog_checksum);
 
     BinlogEventPtr readOneBinlogEvent(UInt64 milliseconds = 0);
     Position getPosition() const { return replication.getPosition(); }
diff --git a/src/Core/MySQL/MySQLReplication.cpp b/src/Core/MySQL/MySQLReplication.cpp
index 6ff1670777a..a33d65fcbd5 100644
--- a/src/Core/MySQL/MySQLReplication.cpp
+++ b/src/Core/MySQL/MySQLReplication.cpp
@@ -57,7 +57,6 @@ namespace MySQLReplication
         payload.readStrict(reinterpret_cast<char *>(&create_timestamp), 4);
         payload.readStrict(reinterpret_cast<char *>(&event_header_length), 1);
         assert(event_header_length == EVENT_HEADER_LENGTH);
-
         readStringUntilEOF(event_type_header_length, payload);
     }
 
@@ -745,7 +744,7 @@ namespace MySQLReplication
         // skip the generic response packets header flag.
         payload.ignore(1);
 
-        MySQLBinlogEventReadBuffer event_payload(payload);
+        MySQLBinlogEventReadBuffer event_payload(payload, checksum_signature_length);
 
         EventHeader event_header;
         event_header.parse(event_payload);
diff --git a/src/Core/MySQL/MySQLReplication.h b/src/Core/MySQL/MySQLReplication.h
index 394ac729d1b..bbefb368aaf 100644
--- a/src/Core/MySQL/MySQLReplication.h
+++ b/src/Core/MySQL/MySQLReplication.h
@@ -526,6 +526,8 @@ namespace MySQLReplication
         virtual BinlogEventPtr readOneEvent() = 0;
         virtual void setReplicateDatabase(String db) = 0;
         virtual void setGTIDSets(GTIDSets sets) = 0;
+        virtual void setChecksumSignatureLength(size_t checksum_signature_length_) = 0;
+
         virtual ~IFlavor() override = default;
     };
 
@@ -538,12 +540,14 @@ namespace MySQLReplication
         BinlogEventPtr readOneEvent() override { return event; }
         void setReplicateDatabase(String db) override { replicate_do_db = std::move(db); }
         void setGTIDSets(GTIDSets sets) override { position.gtid_sets = std::move(sets); }
+        void setChecksumSignatureLength(size_t checksum_signature_length_) override { checksum_signature_length = checksum_signature_length_; }
 
     private:
         Position position;
         BinlogEventPtr event;
         String replicate_do_db;
         std::shared_ptr<TableMapEvent> table_map;
+        size_t checksum_signature_length = 4;
 
         inline bool do_replicate() { return (replicate_do_db.empty() || table_map->schema == replicate_do_db); }
     };
diff --git a/src/Core/tests/mysql_protocol.cpp b/src/Core/tests/mysql_protocol.cpp
index 9dc46891241..98555ddcfe0 100644
--- a/src/Core/tests/mysql_protocol.cpp
+++ b/src/Core/tests/mysql_protocol.cpp
@@ -304,7 +304,8 @@ int main(int argc, char ** argv)
                 "user", boost::program_options::value<std::string>()->default_value("root"), "master user")(
                 "password", boost::program_options::value<std::string>()->required(), "master password")(
                 "gtid", boost::program_options::value<std::string>()->default_value(""), "executed GTID sets")(
-                "db", boost::program_options::value<std::string>()->required(), "replicate do db");
+                "db", boost::program_options::value<std::string>()->required(), "replicate do db")(
+                "binlog_checksum", boost::program_options::value<std::string>()->default_value("CRC32"), "master binlog_checksum");
 
             boost::program_options::variables_map options;
             boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), options);
@@ -319,6 +320,7 @@ int main(int argc, char ** argv)
             auto master_password = options.at("password").as<DB::String>();
             auto gtid_sets = options.at("gtid").as<DB::String>();
             auto replicate_db = options.at("db").as<DB::String>();
+            auto binlog_checksum = options.at("binlog_checksum").as<String>();
 
             std::cerr << "Master Host: " << host << ", Port: " << port << ", User: " << master_user << ", Password: " << master_password
                       << ", Replicate DB: " << replicate_db << ", GTID: " << gtid_sets << std::endl;
@@ -328,7 +330,7 @@ int main(int argc, char ** argv)
 
             /// Connect to the master.
             slave.connect();
-            slave.startBinlogDumpGTID(slave_id, replicate_db, gtid_sets);
+            slave.startBinlogDumpGTID(slave_id, replicate_db, gtid_sets, binlog_checksum);
 
             WriteBufferFromOStream cerr(std::cerr);
 
diff --git a/src/Databases/MySQL/MaterializeMetadata.cpp b/src/Databases/MySQL/MaterializeMetadata.cpp
index 3c5bfdec594..cacf03675b4 100644
--- a/src/Databases/MySQL/MaterializeMetadata.cpp
+++ b/src/Databases/MySQL/MaterializeMetadata.cpp
@@ -88,6 +88,29 @@ void MaterializeMetadata::fetchMasterStatus(mysqlxx::PoolWithFailover::Entry & c
     executed_gtid_set = (*master_status.getByPosition(4).column)[0].safeGet<String>();
 }
 
+void MaterializeMetadata::fetchMasterVariablesValue(const mysqlxx::PoolWithFailover::Entry & connection)
+{
+    Block variables_header{
+        {std::make_shared<DataTypeString>(), "Variable_name"},
+        {std::make_shared<DataTypeString>(), "Value"}
+    };
+
+    const String & fetch_query = "SHOW VARIABLES WHERE Variable_name = 'binlog_checksum'";
+    MySQLBlockInputStream variables_input(connection, fetch_query, variables_header, DEFAULT_BLOCK_SIZE);
+
+    while (Block variables_block = variables_input.read())
+    {
+        ColumnPtr variables_name = variables_block.getByName("Variable_name").column;
+        ColumnPtr variables_value = variables_block.getByName("Value").column;
+
+        for (size_t index = 0; index < variables_block.rows(); ++index)
+        {
+            if (variables_name->getDataAt(index) == "binlog_checksum")
+                binlog_checksum = variables_value->getDataAt(index).toString();
+        }
+    }
+}
+
 static Block getShowMasterLogHeader(const String & mysql_version)
 {
     if (startsWith(mysql_version, "5."))
@@ -193,6 +216,7 @@ MaterializeMetadata::MaterializeMetadata(
 
         locked_tables = true;
         fetchMasterStatus(connection);
+        fetchMasterVariablesValue(connection);
         connection->query("SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ;").execute();
         connection->query("START TRANSACTION /*!40100 WITH CONSISTENT SNAPSHOT */;").execute();
 
diff --git a/src/Databases/MySQL/MaterializeMetadata.h b/src/Databases/MySQL/MaterializeMetadata.h
index 5e77620e365..94dfc73e5df 100644
--- a/src/Databases/MySQL/MaterializeMetadata.h
+++ b/src/Databases/MySQL/MaterializeMetadata.h
@@ -34,10 +34,13 @@ struct MaterializeMetadata
 
     size_t data_version = 1;
     size_t meta_version = 2;
+    String binlog_checksum = "CRC32";
     std::unordered_map<String, String> need_dumping_tables;
 
     void fetchMasterStatus(mysqlxx::PoolWithFailover::Entry & connection);
 
+    void fetchMasterVariablesValue(const mysqlxx::PoolWithFailover::Entry & connection);
+
     bool checkBinlogFileExists(mysqlxx::PoolWithFailover::Entry & connection, const String & mysql_version) const;
 
     void transaction(const MySQLReplication::Position & position, const std::function<void()> & fun);
diff --git a/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp b/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp
index 7e42b2548b0..223f3466da4 100644
--- a/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp
+++ b/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp
@@ -340,7 +340,7 @@ std::optional<MaterializeMetadata> MaterializeMySQLSyncThread::prepareSynchroniz
                 connection->query("COMMIT").execute();
 
             client.connect();
-            client.startBinlogDumpGTID(randomNumber(), mysql_database_name, metadata.executed_gtid_set);
+            client.startBinlogDumpGTID(randomNumber(), mysql_database_name, metadata.executed_gtid_set, metadata.binlog_checksum);
             return metadata;
         }
         catch (...)
@@ -624,16 +624,27 @@ void MaterializeMySQLSyncThread::onEvent(Buffers & buffers, const BinlogEventPtr
         metadata.transaction(position_before_ddl, [&]() { buffers.commit(global_context); });
         metadata.transaction(client.getPosition(),[&](){ executeDDLAtomic(query_event); });
     }
-    else if (receive_event->header.type != HEARTBEAT_EVENT)
+    else
     {
-        const auto & dump_event_message = [&]()
+        /// MYSQL_UNHANDLED_EVENT
+        if (receive_event->header.type == ROTATE_EVENT)
         {
-            WriteBufferFromOwnString buf;
-            receive_event->dump(buf);
-            return buf.str();
-        };
+            /// Some behaviors(such as changing the value of "binlog_checksum") rotate the binlog file.
+            /// To ensure that the synchronization continues, we need to handle these events
+            metadata.fetchMasterVariablesValue(pool.get());
+            client.setBinlogChecksum(metadata.binlog_checksum);
+        }
+        else if (receive_event->header.type != HEARTBEAT_EVENT)
+        {
+            const auto & dump_event_message = [&]()
+            {
+                WriteBufferFromOwnString buf;
+                receive_event->dump(buf);
+                return buf.str();
+            };
 
-        LOG_DEBUG(log, "Skip MySQL event: \n {}", dump_event_message());
+            LOG_DEBUG(log, "Skip MySQL event: \n {}", dump_event_message());
+        }
     }
 }
 
diff --git a/src/IO/MySQLBinlogEventReadBuffer.cpp b/src/IO/MySQLBinlogEventReadBuffer.cpp
index 3a2aba045d3..c495cbdfd90 100644
--- a/src/IO/MySQLBinlogEventReadBuffer.cpp
+++ b/src/IO/MySQLBinlogEventReadBuffer.cpp
@@ -4,9 +4,12 @@
 namespace DB
 {
 
-MySQLBinlogEventReadBuffer::MySQLBinlogEventReadBuffer(ReadBuffer & in_)
-    : ReadBuffer(nullptr, 0, 0), in(in_)
+MySQLBinlogEventReadBuffer::MySQLBinlogEventReadBuffer(ReadBuffer & in_, size_t checksum_signature_length_)
+    : ReadBuffer(nullptr, 0, 0), in(in_), checksum_signature_length(checksum_signature_length_)
 {
+    if (checksum_signature_length)
+        checksum_buf = new char[checksum_signature_length];
+
     nextIfAtEnd();
 }
 
@@ -20,15 +23,15 @@ bool MySQLBinlogEventReadBuffer::nextImpl()
 
     if (checksum_buff_size == checksum_buff_limit)
     {
-        if (likely(in.available() > CHECKSUM_CRC32_SIGNATURE_LENGTH))
+        if (likely(in.available() > checksum_signature_length))
         {
-            working_buffer = ReadBuffer::Buffer(in.position(), in.buffer().end() - CHECKSUM_CRC32_SIGNATURE_LENGTH);
+            working_buffer = ReadBuffer::Buffer(in.position(), in.buffer().end() - checksum_signature_length);
             in.ignore(working_buffer.size());
             return true;
         }
 
-        in.readStrict(checksum_buf, CHECKSUM_CRC32_SIGNATURE_LENGTH);
-        checksum_buff_size = checksum_buff_limit = CHECKSUM_CRC32_SIGNATURE_LENGTH;
+        in.readStrict(checksum_buf, checksum_signature_length);
+        checksum_buff_size = checksum_buff_limit = checksum_signature_length;
     }
     else
     {
@@ -36,17 +39,17 @@ bool MySQLBinlogEventReadBuffer::nextImpl()
             checksum_buf[index] = checksum_buf[checksum_buff_limit + index];
 
         checksum_buff_size -= checksum_buff_limit;
-        size_t read_bytes = CHECKSUM_CRC32_SIGNATURE_LENGTH - checksum_buff_size;
-        in.readStrict(checksum_buf + checksum_buff_size, read_bytes);   /// Minimum CHECKSUM_CRC32_SIGNATURE_LENGTH bytes
-        checksum_buff_size = checksum_buff_limit = CHECKSUM_CRC32_SIGNATURE_LENGTH;
+        size_t read_bytes = checksum_signature_length - checksum_buff_size;
+        in.readStrict(checksum_buf + checksum_buff_size, read_bytes);   /// Minimum checksum_signature_length bytes
+        checksum_buff_size = checksum_buff_limit = checksum_signature_length;
     }
 
     if (in.eof())
         return false;
 
-    if (in.available() < CHECKSUM_CRC32_SIGNATURE_LENGTH)
+    if (in.available() < checksum_signature_length)
     {
-        size_t left_move_size = CHECKSUM_CRC32_SIGNATURE_LENGTH - in.available();
+        size_t left_move_size = checksum_signature_length - in.available();
         checksum_buff_limit = checksum_buff_size - left_move_size;
     }
 
@@ -60,6 +63,9 @@ MySQLBinlogEventReadBuffer::~MySQLBinlogEventReadBuffer()
     {
         /// ignore last 4 bytes
         nextIfAtEnd();
+
+        if (checksum_signature_length)
+            delete checksum_buf;
     }
     catch (...)
     {
diff --git a/src/IO/MySQLBinlogEventReadBuffer.h b/src/IO/MySQLBinlogEventReadBuffer.h
index e9452aa551e..c1c02b6406a 100644
--- a/src/IO/MySQLBinlogEventReadBuffer.h
+++ b/src/IO/MySQLBinlogEventReadBuffer.h
@@ -8,19 +8,19 @@ namespace DB
 class MySQLBinlogEventReadBuffer : public ReadBuffer
 {
 protected:
-    static const size_t CHECKSUM_CRC32_SIGNATURE_LENGTH = 4;
     ReadBuffer & in;
+    size_t checksum_signature_length;
 
     size_t checksum_buff_size = 0;
     size_t checksum_buff_limit = 0;
-    char checksum_buf[CHECKSUM_CRC32_SIGNATURE_LENGTH];
+    char * checksum_buf = nullptr;
 
     bool nextImpl() override;
 
 public:
     ~MySQLBinlogEventReadBuffer() override;
 
-    MySQLBinlogEventReadBuffer(ReadBuffer & in_);
+    MySQLBinlogEventReadBuffer(ReadBuffer & in_, size_t checksum_signature_length_);
 
 };
 
diff --git a/src/IO/tests/gtest_mysql_binlog_event_read_buffer.cpp b/src/IO/tests/gtest_mysql_binlog_event_read_buffer.cpp
index f4d39c73a7c..536e5a89ca9 100644
--- a/src/IO/tests/gtest_mysql_binlog_event_read_buffer.cpp
+++ b/src/IO/tests/gtest_mysql_binlog_event_read_buffer.cpp
@@ -13,7 +13,7 @@ TEST(MySQLBinlogEventReadBuffer, CheckBoundary)
         std::vector<char> memory_data(index, 0x01);
         ReadBufferFromMemory nested_in(memory_data.data(), index);
 
-        EXPECT_THROW({ MySQLBinlogEventReadBuffer binlog_in(nested_in); }, Exception);
+        EXPECT_THROW({ MySQLBinlogEventReadBuffer binlog_in(nested_in, 4); }, Exception);
     }
 }
 
@@ -23,7 +23,7 @@ TEST(MySQLBinlogEventReadBuffer, NiceBufferSize)
     std::vector<char> memory_data(6, 0x01);
     ReadBufferFromMemory nested_in(memory_data.data(), 6);
 
-    MySQLBinlogEventReadBuffer binlog_in(nested_in);
+    MySQLBinlogEventReadBuffer binlog_in(nested_in, 4);
     binlog_in.readStrict(res, 2);
     ASSERT_EQ(res[0], 0x01);
     ASSERT_EQ(res[1], 0x01);
@@ -46,7 +46,7 @@ TEST(MySQLBinlogEventReadBuffer, BadBufferSizes)
     }
 
     ConcatReadBuffer concat_buffer(nested_buffers);
-    MySQLBinlogEventReadBuffer binlog_in(concat_buffer);
+    MySQLBinlogEventReadBuffer binlog_in(concat_buffer, 4);
     binlog_in.readStrict(res, 4);
 
     for (const auto & res_byte : res)
@@ -71,7 +71,7 @@ TEST(MySQLBinlogEventReadBuffer, NiceAndBadBufferSizes)
     }
 
     ConcatReadBuffer concat_buffer(nested_buffers);
-    MySQLBinlogEventReadBuffer binlog_in(concat_buffer);
+    MySQLBinlogEventReadBuffer binlog_in(concat_buffer, 4);
     binlog_in.readStrict(res, 12);
 
     for (const auto & res_byte : res)
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 b97a1563212..189e28d5233 100644
--- a/tests/integration/test_materialize_mysql_database/materialize_with_ddl.py
+++ b/tests/integration/test_materialize_mysql_database/materialize_with_ddl.py
@@ -432,6 +432,7 @@ def query_event_with_empty_transaction(clickhouse_node, mysql_node, service_name
     clickhouse_node.query("DROP DATABASE test_database")
     mysql_node.query("DROP DATABASE test_database")
 
+
 def select_without_columns(clickhouse_node, mysql_node, service_name):
     mysql_node.query("CREATE DATABASE db")
     mysql_node.query("CREATE TABLE db.t (a INT PRIMARY KEY, b INT)")
@@ -461,3 +462,23 @@ def select_without_columns(clickhouse_node, mysql_node, service_name):
     clickhouse_node.query("DROP VIEW v")
     clickhouse_node.query("DROP DATABASE db")
     mysql_node.query("DROP DATABASE db")
+
+
+def insert_with_modify_binlog_checksum(clickhouse_node, mysql_node, service_name):
+    mysql_node.query("CREATE DATABASE test_checksum")
+    mysql_node.query("CREATE TABLE test_checksum.t (a INT PRIMARY KEY, b varchar(200))")
+    clickhouse_node.query("CREATE DATABASE test_checksum ENGINE = MaterializeMySQL('{}:3306', 'test_checksum', 'root', 'clickhouse')".format(service_name))
+    check_query(clickhouse_node, "SHOW TABLES FROM test_checksum FORMAT TSV", "t\n")
+    mysql_node.query("INSERT INTO test_checksum.t VALUES(1, '1111')")
+    check_query(clickhouse_node, "SELECT * FROM test_checksum ORDER BY a FORMAT TSV", "1\t1111\n")
+
+    mysql_node.query("SET GLOBAL binlog_checksum=NONE")
+    mysql_node.query("INSERT INTO test_checksum.t VALUES(2, '2222')")
+    check_query(clickhouse_node, "SELECT * FROM test_checksum ORDER BY a FORMAT TSV", "1\t1111\n2\t2222\n")
+
+    mysql_node.query("SET GLOBAL binlog_checksum=CRC32")
+    mysql_node.query("INSERT INTO test_checksum.t VALUES(3, '3333')")
+    check_query(clickhouse_node, "SELECT * FROM test_checksum ORDER BY a FORMAT TSV", "1\t1111\n2\t2222\n3\t3333\n")
+
+    clickhouse_node.query("DROP DATABASE test_checksum")
+    mysql_node.query("DROP DATABASE test_checksum")
diff --git a/tests/integration/test_materialize_mysql_database/test.py b/tests/integration/test_materialize_mysql_database/test.py
index 6df831e1e7d..6d617ea00e2 100644
--- a/tests/integration/test_materialize_mysql_database/test.py
+++ b/tests/integration/test_materialize_mysql_database/test.py
@@ -151,5 +151,14 @@ def test_materialize_database_ddl_with_empty_transaction_8_0(started_cluster, st
 def test_select_without_columns_5_7(started_cluster, started_mysql_5_7):
     materialize_with_ddl.select_without_columns(clickhouse_node, started_mysql_5_7, "mysql1")
 
+
 def test_select_without_columns_8_0(started_cluster, started_mysql_8_0):
     materialize_with_ddl.select_without_columns(clickhouse_node, started_mysql_8_0, "mysql8_0")
+
+
+def test_insert_with_modify_binlog_checksum_5_7(started_cluster, started_mysql_5_7):
+    materialize_with_ddl.insert_with_modify_binlog_checksum(clickhouse_node, started_mysql_5_7, "mysql1")
+
+
+def test_insert_with_modify_binlog_checksum_8_0(started_cluster, started_mysql_5_7):
+    materialize_with_ddl.insert_with_modify_binlog_checksum(clickhouse_node, started_mysql_5_7, "mysql1")
diff --git a/utils/check-mysql-binlog/main.cpp b/utils/check-mysql-binlog/main.cpp
index 0d831b84dce..ccdc4cd168c 100644
--- a/utils/check-mysql-binlog/main.cpp
+++ b/utils/check-mysql-binlog/main.cpp
@@ -18,10 +18,7 @@ static DB::MySQLReplication::BinlogEventPtr parseSingleEventBody(
 {
     DB::MySQLReplication::BinlogEventPtr event;
     DB::ReadBufferPtr limit_read_buffer = std::make_shared<DB::LimitReadBuffer>(payload, header.event_size - 19, false);
-    DB::ReadBufferPtr event_payload = limit_read_buffer;
-
-    if (exist_checksum)
-        event_payload = std::make_shared<DB::MySQLBinlogEventReadBuffer>(*limit_read_buffer);
+    DB::ReadBufferPtr event_payload = std::make_shared<DB::MySQLBinlogEventReadBuffer>(*limit_read_buffer, exist_checksum ? 4 : 0);
 
     switch (header.type)
     {

From b4fc2ecc0065cccce4de30ed6de055da0331b880 Mon Sep 17 00:00:00 2001
From: zhang2014 <coswde@gmail.com>
Date: Tue, 17 Nov 2020 09:41:35 +0800
Subject: [PATCH 05/99] Try fix integration test

---
 .../test_materialize_mysql_database/materialize_with_ddl.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 009d15a5db8..4b5355e08ff 100644
--- a/tests/integration/test_materialize_mysql_database/materialize_with_ddl.py
+++ b/tests/integration/test_materialize_mysql_database/materialize_with_ddl.py
@@ -496,15 +496,15 @@ def insert_with_modify_binlog_checksum(clickhouse_node, mysql_node, service_name
     clickhouse_node.query("CREATE DATABASE test_checksum ENGINE = MaterializeMySQL('{}:3306', 'test_checksum', 'root', 'clickhouse')".format(service_name))
     check_query(clickhouse_node, "SHOW TABLES FROM test_checksum FORMAT TSV", "t\n")
     mysql_node.query("INSERT INTO test_checksum.t VALUES(1, '1111')")
-    check_query(clickhouse_node, "SELECT * FROM test_checksum ORDER BY a FORMAT TSV", "1\t1111\n")
+    check_query(clickhouse_node, "SELECT * FROM test_checksum.t ORDER BY a FORMAT TSV", "1\t1111\n")
 
     mysql_node.query("SET GLOBAL binlog_checksum=NONE")
     mysql_node.query("INSERT INTO test_checksum.t VALUES(2, '2222')")
-    check_query(clickhouse_node, "SELECT * FROM test_checksum ORDER BY a FORMAT TSV", "1\t1111\n2\t2222\n")
+    check_query(clickhouse_node, "SELECT * FROM test_checksum.t ORDER BY a FORMAT TSV", "1\t1111\n2\t2222\n")
 
     mysql_node.query("SET GLOBAL binlog_checksum=CRC32")
     mysql_node.query("INSERT INTO test_checksum.t VALUES(3, '3333')")
-    check_query(clickhouse_node, "SELECT * FROM test_checksum ORDER BY a FORMAT TSV", "1\t1111\n2\t2222\n3\t3333\n")
+    check_query(clickhouse_node, "SELECT * FROM test_checksum.t ORDER BY a FORMAT TSV", "1\t1111\n2\t2222\n3\t3333\n")
 
     clickhouse_node.query("DROP DATABASE test_checksum")
     mysql_node.query("DROP DATABASE test_checksum")

From 389b88353489205278f22e9d34bac8983147dc93 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Tue, 17 Nov 2020 12:37:13 +0300
Subject: [PATCH 06/99] Fix index granularity calculation on block borders

---
 .../MergeTree/IMergeTreeDataPartWriter.cpp    | 12 ++++++++
 .../MergeTree/IMergeTreeDataPartWriter.h      |  9 ++++++
 .../MergeTree/MergeTreeDataPartWriterWide.cpp |  3 ++
 .../MergeTree/MergeTreeIndexGranularity.cpp   | 11 ++++++++
 .../MergeTree/MergeTreeIndexGranularity.h     |  4 +++
 ...aptive_granularity_block_borders.reference |  2 ++
 ...577_adaptive_granularity_block_borders.sql | 28 +++++++++++++++++++
 7 files changed, 69 insertions(+)
 create mode 100644 tests/queries/0_stateless/01577_adaptive_granularity_block_borders.reference
 create mode 100644 tests/queries/0_stateless/01577_adaptive_granularity_block_borders.sql

diff --git a/src/Storages/MergeTree/IMergeTreeDataPartWriter.cpp b/src/Storages/MergeTree/IMergeTreeDataPartWriter.cpp
index 143a9920b93..1cddeda9a5d 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPartWriter.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPartWriter.cpp
@@ -44,6 +44,18 @@ void IMergeTreeDataPartWriter::next()
     index_offset = next_index_offset;
 }
 
+void IMergeTreeDataPartWriter::adjustLastUnfinishedMark(size_t new_block_index_granularity)
+{
+    /// If amount of rest rows in last granule more than granularity of the new block
+    /// than finish it.
+    if (!index_granularity.empty() && index_offset > new_block_index_granularity)
+    {
+        size_t already_written_rows_in_last_granule = index_granularity.getLastMarkRows() - index_offset;
+        index_granularity.setLastMarkRows(already_written_rows_in_last_granule);
+        index_offset = 0;
+    }
+}
+
 IMergeTreeDataPartWriter::~IMergeTreeDataPartWriter() = default;
 
 }
diff --git a/src/Storages/MergeTree/IMergeTreeDataPartWriter.h b/src/Storages/MergeTree/IMergeTreeDataPartWriter.h
index 4a42a58a65b..906c3e1ed85 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPartWriter.h
+++ b/src/Storages/MergeTree/IMergeTreeDataPartWriter.h
@@ -62,6 +62,14 @@ public:
 protected:
     size_t getCurrentMark() const { return current_mark; }
     size_t getIndexOffset() const { return index_offset; }
+    /// Finishes our current unfinished mark if we have already written more rows for it
+    /// than granularity in the new block.
+    /// Example:
+    /// __|________|___. <- previous block with granularity 8 and last unfinished mark with 3 rows
+    /// new_block_index_granularity = 2, so
+    /// __|________|___|__|__|__|
+    ///                ^ finish last unfinished mark, new marks will have granularity 2
+    void adjustLastUnfinishedMark(size_t new_block_index_granularity);
 
     using SerializationState = IDataType::SerializeBinaryBulkStatePtr;
     using SerializationStates = std::unordered_map<String, SerializationState>;
@@ -84,6 +92,7 @@ private:
     /// Data is already written up to this mark.
     size_t current_mark = 0;
     /// The offset to the first row of the block for which you want to write the index.
+    /// Or how many rows we have to write for this last unfinished mark.
     size_t index_offset = 0;
 };
 
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
index c15c39e7b7f..0317f52001b 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
@@ -95,6 +95,9 @@ void MergeTreeDataPartWriterWide::write(const Block & block,
     if (compute_granularity)
     {
         size_t index_granularity_for_block = computeIndexGranularity(block);
+        /// Finish last unfinished mark rows it it's required
+        adjustLastUnfinishedMark(index_granularity_for_block);
+        /// Fill index granularity with granules of new size
         fillIndexGranularity(index_granularity_for_block, block.rows());
     }
 
diff --git a/src/Storages/MergeTree/MergeTreeIndexGranularity.cpp b/src/Storages/MergeTree/MergeTreeIndexGranularity.cpp
index bca0d0cb883..2db087a394f 100644
--- a/src/Storages/MergeTree/MergeTreeIndexGranularity.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexGranularity.cpp
@@ -55,6 +55,17 @@ void MergeTreeIndexGranularity::addRowsToLastMark(size_t rows_count)
         marks_rows_partial_sums.back() += rows_count;
 }
 
+void MergeTreeIndexGranularity::setLastMarkRows(size_t rows_count)
+{
+    if (marks_rows_partial_sums.empty())
+        marks_rows_partial_sums.push_back(rows_count);
+    else
+    {
+        marks_rows_partial_sums.back() -= getLastMarkRows();
+        marks_rows_partial_sums.back() += rows_count;
+    }
+}
+
 void MergeTreeIndexGranularity::popMark()
 {
     if (!marks_rows_partial_sums.empty())
diff --git a/src/Storages/MergeTree/MergeTreeIndexGranularity.h b/src/Storages/MergeTree/MergeTreeIndexGranularity.h
index 5aefd0f102b..bfb48511285 100644
--- a/src/Storages/MergeTree/MergeTreeIndexGranularity.h
+++ b/src/Storages/MergeTree/MergeTreeIndexGranularity.h
@@ -98,6 +98,10 @@ public:
     /// Extends last mark by rows_count.
     void addRowsToLastMark(size_t rows_count);
 
+    /// Set amount of rows to last mark
+    /// (add new mark if new have nothing)
+    void setLastMarkRows(size_t rows_count);
+
     /// Drops last mark if any exists.
     void popMark();
 
diff --git a/tests/queries/0_stateless/01577_adaptive_granularity_block_borders.reference b/tests/queries/0_stateless/01577_adaptive_granularity_block_borders.reference
new file mode 100644
index 00000000000..81c7e6e4df0
--- /dev/null
+++ b/tests/queries/0_stateless/01577_adaptive_granularity_block_borders.reference
@@ -0,0 +1,2 @@
+849
+102400
diff --git a/tests/queries/0_stateless/01577_adaptive_granularity_block_borders.sql b/tests/queries/0_stateless/01577_adaptive_granularity_block_borders.sql
new file mode 100644
index 00000000000..a73045f5a6f
--- /dev/null
+++ b/tests/queries/0_stateless/01577_adaptive_granularity_block_borders.sql
@@ -0,0 +1,28 @@
+DROP TABLE IF EXISTS adaptive_table;
+
+--- If granularity of consequent blocks differs a lot, then adaptive
+--- granularity will adjust amout of marks correctly. Data for test empirically
+--- derived, it's quite hard to get good parameters.
+
+CREATE TABLE adaptive_table(
+    key UInt64,
+    value String
+) ENGINE MergeTree()
+ORDER BY key
+SETTINGS index_granularity_bytes=1048576, min_bytes_for_wide_part = 0, enable_vertical_merge_algorithm = 0;
+
+SET max_block_size=900;
+
+-- There are about 900 marks for our settings.
+INSERT INTO adaptive_table SELECT number, if(number > 700, randomPrintableASCII(102400), randomPrintableASCII(1)) FROM numbers(10000);
+
+OPTIMIZE TABLE adaptive_table FINAL;
+
+SELECT marks FROM system.parts WHERE table = 'adaptive_table' and database=currentDatabase() and active;
+
+-- If we have computed granularity incorrectly than we will exceed this limit.
+SET max_memory_usage='30M';
+
+SELECT max(length(value)) FROM adaptive_table;
+
+DROP TABLE IF EXISTS adaptive_table;

From b4f025a5e6cfbde847d281ba8327513ac498f829 Mon Sep 17 00:00:00 2001
From: zhang2014 <coswde@gmail.com>
Date: Tue, 17 Nov 2020 17:44:03 +0800
Subject: [PATCH 07/99] trigger CI


From 70f898e66786fc4de56e9e30208af44885142efa Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 17 Nov 2020 15:34:31 +0300
Subject: [PATCH 08/99] Order inputs for ActionsDAG.

---
 src/Interpreters/ActionsDAG.cpp        | 54 +++++++++++++++++++++-----
 src/Interpreters/ActionsDAG.h          | 11 +++++-
 src/Interpreters/ExpressionActions.cpp | 33 ++++++++++++++--
 src/Interpreters/ExpressionActions.h   | 10 ++++-
 4 files changed, 91 insertions(+), 17 deletions(-)

diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index a788d6f84e3..0256090abc6 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -24,7 +24,7 @@ namespace ErrorCodes
 ActionsDAG::ActionsDAG(const NamesAndTypesList & inputs)
 {
     for (const auto & input : inputs)
-        addInput(input.name, input.type);
+        addInput(input.name, input.type, true);
 }
 
 ActionsDAG::ActionsDAG(const ColumnsWithTypeAndName & inputs)
@@ -32,9 +32,9 @@ ActionsDAG::ActionsDAG(const ColumnsWithTypeAndName & inputs)
     for (const auto & input : inputs)
     {
         if (input.column && isColumnConst(*input.column))
-            addInput(input);
+            addInput(input, true);
         else
-            addInput(input.name, input.type);
+            addInput(input.name, input.type, true);
     }
 }
 
@@ -46,6 +46,9 @@ ActionsDAG::Node & ActionsDAG::addNode(Node node, bool can_replace)
 
     auto & res = nodes.emplace_back(std::move(node));
 
+    if (res.type == ActionType::INPUT)
+        inputs.emplace_back(&res);
+
     index.replace(&res);
     return res;
 }
@@ -59,17 +62,17 @@ ActionsDAG::Node & ActionsDAG::getNode(const std::string & name)
     return **it;
 }
 
-const ActionsDAG::Node & ActionsDAG::addInput(std::string name, DataTypePtr type)
+const ActionsDAG::Node & ActionsDAG::addInput(std::string name, DataTypePtr type, bool can_replace)
 {
     Node node;
     node.type = ActionType::INPUT;
     node.result_type = std::move(type);
     node.result_name = std::move(name);
 
-    return addNode(std::move(node));
+    return addNode(std::move(node), can_replace);
 }
 
-const ActionsDAG::Node & ActionsDAG::addInput(ColumnWithTypeAndName column)
+const ActionsDAG::Node & ActionsDAG::addInput(ColumnWithTypeAndName column, bool can_replace)
 {
     Node node;
     node.type = ActionType::INPUT;
@@ -77,7 +80,7 @@ const ActionsDAG::Node & ActionsDAG::addInput(ColumnWithTypeAndName column)
     node.result_name = std::move(column.name);
     node.column = std::move(column.column);
 
-    return addNode(std::move(node));
+    return addNode(std::move(node), can_replace);
 }
 
 const ActionsDAG::Node & ActionsDAG::addColumn(ColumnWithTypeAndName column)
@@ -144,6 +147,14 @@ const ActionsDAG::Node & ActionsDAG::addFunction(
         compilation_cache = context.getCompiledExpressionCache();
 #endif
 
+    return addFunction(function, argument_names, std::move(result_name));
+}
+
+const ActionsDAG::Node & ActionsDAG::addFunction(
+        const FunctionOverloadResolverPtr & function,
+        const Names & argument_names,
+        std::string result_name)
+{
     size_t num_arguments = argument_names.size();
 
     Node node;
@@ -231,9 +242,8 @@ const ActionsDAG::Node & ActionsDAG::addFunction(
 NamesAndTypesList ActionsDAG::getRequiredColumns() const
 {
     NamesAndTypesList result;
-    for (const auto & node : nodes)
-        if (node.type == ActionType::INPUT)
-            result.emplace_back(node.result_name, node.result_type);
+    for (const auto & input : inputs)
+        result.emplace_back(input->result_name, input->result_type);
 
     return result;
 }
@@ -347,6 +357,8 @@ void ActionsDAG::removeUnusedActions()
     }
 
     nodes.remove_if([&](const Node & node) { return visited_nodes.count(&node) == 0; });
+    auto it = std::remove_if(inputs.begin(), inputs.end(), [&](const Node * node) { return visited_nodes.count(node) == 0; });
+    inputs.erase(it, inputs.end());
 }
 
 void ActionsDAG::addAliases(const NamesWithAliases & aliases, std::vector<Node *> & result_nodes)
@@ -442,6 +454,9 @@ ActionsDAGPtr ActionsDAG::clone() const
     for (const auto & node : index)
         actions->index.insert(copy_map[node]);
 
+    for (const auto & node : inputs)
+        actions->inputs.push_back(copy_map[node]);
+
     return actions;
 }
 
@@ -540,6 +555,7 @@ ActionsDAGPtr ActionsDAG::splitActionsBeforeArrayJoin(const NameSet & array_join
     std::list<Node> split_nodes;
     Index this_index;
     Index split_index;
+    Inputs new_inputs;
 
     struct Frame
     {
@@ -627,6 +643,7 @@ ActionsDAGPtr ActionsDAG::splitActionsBeforeArrayJoin(const NameSet & array_join
                                 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));
+                                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);
@@ -658,6 +675,7 @@ ActionsDAGPtr ActionsDAG::splitActionsBeforeArrayJoin(const NameSet & array_join
                         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));
+                        new_inputs.push_back(cur_data.to_this);
                     }
                 }
             }
@@ -676,12 +694,28 @@ ActionsDAGPtr ActionsDAG::splitActionsBeforeArrayJoin(const NameSet & array_join
     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);
+        else
+            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;
diff --git a/src/Interpreters/ActionsDAG.h b/src/Interpreters/ActionsDAG.h
index 4765456ca4f..5a5dbebdedd 100644
--- a/src/Interpreters/ActionsDAG.h
+++ b/src/Interpreters/ActionsDAG.h
@@ -151,6 +151,7 @@ public:
     };
 
     using Nodes = std::list<Node>;
+    using Inputs = std::vector<Node *>;
 
     struct ActionsSettings
     {
@@ -165,6 +166,7 @@ public:
 private:
     Nodes nodes;
     Index index;
+    Inputs inputs;
 
     ActionsSettings settings;
 
@@ -181,6 +183,7 @@ public:
 
     const Nodes & getNodes() const { return nodes; }
     const Index & getIndex() const { return index; }
+    const Inputs & getInputs() const { return inputs; }
 
     NamesAndTypesList getRequiredColumns() const;
     ColumnsWithTypeAndName getResultColumns() const;
@@ -190,11 +193,15 @@ public:
     std::string dumpNames() const;
     std::string dumpDAG() const;
 
-    const Node & addInput(std::string name, DataTypePtr type);
-    const Node & addInput(ColumnWithTypeAndName column);
+    const Node & addInput(std::string name, DataTypePtr type, bool can_replace = false);
+    const Node & addInput(ColumnWithTypeAndName column, bool can_replace = false);
     const Node & addColumn(ColumnWithTypeAndName column);
     const Node & addAlias(const std::string & name, std::string alias, bool can_replace = false);
     const Node & addArrayJoin(const std::string & source_name, std::string result_name);
+    const Node & addFunction(
+            const FunctionOverloadResolverPtr & function,
+            const Names & argument_names,
+            std::string result_name);
     const Node & addFunction(
             const FunctionOverloadResolverPtr & function,
             const Names & argument_names,
diff --git a/src/Interpreters/ExpressionActions.cpp b/src/Interpreters/ExpressionActions.cpp
index 53c08481fc2..4c332036b41 100644
--- a/src/Interpreters/ExpressionActions.cpp
+++ b/src/Interpreters/ExpressionActions.cpp
@@ -83,6 +83,7 @@ void ExpressionActions::linearizeActions()
 
     const auto & nodes = getNodes();
     const auto & index = actions_dag->getIndex();
+    const auto & inputs = actions_dag->getInputs();
 
     std::vector<Data> data(nodes.size());
     std::unordered_map<const Node *, size_t> reverse_index;
@@ -163,11 +164,11 @@ void ExpressionActions::linearizeActions()
         {
             /// Argument for input is special. It contains the position from required columns.
             ExpressionActions::Argument argument;
-            argument.pos = required_columns.size();
+            // argument.pos = required_columns.size();
             argument.needed_later = !cur.parents.empty();
             arguments.emplace_back(argument);
 
-            required_columns.push_back({node->result_name, node->result_type});
+            //required_columns.push_back({node->result_name, node->result_type});
         }
 
         actions.push_back({node, arguments, free_position});
@@ -199,6 +200,15 @@ void ExpressionActions::linearizeActions()
         ColumnWithTypeAndName col{node->column, node->result_type, node->result_name};
         sample_block.insert(std::move(col));
     }
+
+    for (const auto * input : inputs)
+    {
+        const auto & cur = data[reverse_index[input]];
+        auto pos = required_columns.size();
+        actions[cur.position].arguments.front().pos = pos;
+        required_columns.push_back({input->result_name, input->result_type});
+        input_positions[input->result_name].emplace_back(pos);
+    }
 }
 
 
@@ -412,7 +422,24 @@ void ExpressionActions::execute(Block & block, size_t & num_rows, bool dry_run)
         .num_rows = num_rows,
     };
 
-    execution_context.inputs_pos.reserve(required_columns.size());
+    execution_context.inputs_pos.assign(required_columns.size(), -1);
+
+    for (size_t pos = 0; pos < block.columns(); ++pos)
+    {
+        const auto & col = block.getByPosition(pos);
+        auto it = input_positions.find(col.name);
+        if (it != input_positions.end())
+        {
+            for (auto input_pos : it->second)
+            {
+                if (execution_context.inputs_pos[input_pos] < 0)
+                {
+                    execution_context.inputs_pos[input_pos] = pos;
+                    break;
+                }
+            }
+        }
+    }
 
     for (const auto & column : required_columns)
     {
diff --git a/src/Interpreters/ExpressionActions.h b/src/Interpreters/ExpressionActions.h
index f2f5862856b..2b1aa5e2456 100644
--- a/src/Interpreters/ExpressionActions.h
+++ b/src/Interpreters/ExpressionActions.h
@@ -44,10 +44,10 @@ public:
     struct Argument
     {
         /// Position in ExecutionContext::columns
-        size_t pos;
+        size_t pos = 0;
         /// True if there is another action which will use this column.
         /// Otherwise column will be removed.
-        bool needed_later;
+        bool needed_later = false;
     };
 
     using Arguments = std::vector<Argument>;
@@ -63,6 +63,11 @@ public:
 
     using Actions = std::vector<Action>;
 
+    /// This map helps to find input position bu it's name.
+    /// Key is a view to input::result_name.
+    /// Result is a list because it is allowed for inputs to have same names.
+    using NameToInputMap = std::unordered_map<std::string_view, std::list<size_t>>;
+
 private:
 
     ActionsDAGPtr actions_dag;
@@ -70,6 +75,7 @@ private:
     size_t num_columns = 0;
 
     NamesAndTypesList required_columns;
+    NameToInputMap input_positions;
     ColumnNumbers result_positions;
     Block sample_block;
 

From d007e5671dceabecb6bfcb393ab17687ae2d7a07 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 17 Nov 2020 15:39:41 +0300
Subject: [PATCH 09/99] Order inputs for ActionsDAG.

---
 src/Interpreters/ActionsDAG.cpp | 8 ++++----
 src/Interpreters/ActionsDAG.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index 0256090abc6..d046f7d4f2c 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -21,15 +21,15 @@ namespace ErrorCodes
 }
 
 
-ActionsDAG::ActionsDAG(const NamesAndTypesList & inputs)
+ActionsDAG::ActionsDAG(const NamesAndTypesList & inputs_)
 {
-    for (const auto & input : inputs)
+    for (const auto & input : inputs_)
         addInput(input.name, input.type, true);
 }
 
-ActionsDAG::ActionsDAG(const ColumnsWithTypeAndName & inputs)
+ActionsDAG::ActionsDAG(const ColumnsWithTypeAndName & inputs_)
 {
-    for (const auto & input : inputs)
+    for (const auto & input : inputs_)
     {
         if (input.column && isColumnConst(*input.column))
             addInput(input, true);
diff --git a/src/Interpreters/ActionsDAG.h b/src/Interpreters/ActionsDAG.h
index 5a5dbebdedd..7b959ff5e29 100644
--- a/src/Interpreters/ActionsDAG.h
+++ b/src/Interpreters/ActionsDAG.h
@@ -178,8 +178,8 @@ public:
     ActionsDAG() = default;
     ActionsDAG(const ActionsDAG &) = delete;
     ActionsDAG & operator=(const ActionsDAG &) = delete;
-    explicit ActionsDAG(const NamesAndTypesList & inputs);
-    explicit ActionsDAG(const ColumnsWithTypeAndName & inputs);
+    explicit ActionsDAG(const NamesAndTypesList & inputs_);
+    explicit ActionsDAG(const ColumnsWithTypeAndName & inputs_);
 
     const Nodes & getNodes() const { return nodes; }
     const Index & getIndex() const { return index; }

From 71d726ea214ef1a1d367ce2f9273f5f62746cdd9 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 17 Nov 2020 16:20:23 +0300
Subject: [PATCH 10/99] Order inputs for ActionsDAG.

---
 src/Interpreters/ExpressionActions.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/Interpreters/ExpressionActions.cpp b/src/Interpreters/ExpressionActions.cpp
index 4c332036b41..c1dec121c90 100644
--- a/src/Interpreters/ExpressionActions.cpp
+++ b/src/Interpreters/ExpressionActions.cpp
@@ -441,14 +441,6 @@ void ExpressionActions::execute(Block & block, size_t & num_rows, bool dry_run)
         }
     }
 
-    for (const auto & column : required_columns)
-    {
-        ssize_t pos = -1;
-        if (block.has(column.name))
-            pos = block.getPositionByName(column.name);
-        execution_context.inputs_pos.push_back(pos);
-    }
-
     execution_context.columns.resize(num_columns);
 
     for (const auto & action : actions)

From 1787cd89a73e37665bb586196b7514d50b771e68 Mon Sep 17 00:00:00 2001
From: Ivan Lezhankin <ilezhankin@yandex-team.ru>
Date: Tue, 17 Nov 2020 16:24:13 +0300
Subject: [PATCH 11/99] Implement tcpPort() function literal

---
 .../getDictionaryConfigurationFromAST.cpp     | 33 ++++++++++++++-----
 .../getDictionaryConfigurationFromAST.h       |  3 +-
 src/Interpreters/InterpreterCreateQuery.cpp   |  2 +-
 src/Parsers/ExpressionListParsers.cpp         |  5 +--
 .../01018_ddl_dictionaries_create.reference   |  2 +-
 .../01018_ddl_dictionaries_create.sql         |  2 +-
 6 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
index 430c1d591dd..40e86d590c4 100644
--- a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
+++ b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
@@ -14,6 +14,7 @@
 #include <Parsers/ASTFunctionWithKeyValueArguments.h>
 #include <Parsers/ASTDictionaryAttributeDeclaration.h>
 #include <Dictionaries/DictionaryFactory.h>
+#include <Functions/FunctionFactory.h>
 
 namespace DB
 {
@@ -356,7 +357,8 @@ NamesToTypeNames buildDictionaryAttributesConfiguration(
 void buildConfigurationFromFunctionWithKeyValueArguments(
     AutoPtr<Document> doc,
     AutoPtr<Element> root,
-    const ASTExpressionList * ast_expr_list)
+    const ASTExpressionList * ast_expr_list,
+    const Context & context)
 {
     const auto & children = ast_expr_list->children;
     for (size_t i = 0; i != children.size(); ++i)
@@ -365,19 +367,30 @@ void buildConfigurationFromFunctionWithKeyValueArguments(
         AutoPtr<Element> current_xml_element(doc->createElement(pair->first));
         root->appendChild(current_xml_element);
 
-        if (const auto * identifier = pair->second->as<const ASTIdentifier>(); identifier)
+        if (const auto * identifier = pair->second->as<const ASTIdentifier>())
         {
             AutoPtr<Text> value(doc->createTextNode(identifier->name()));
             current_xml_element->appendChild(value);
         }
-        else if (const auto * literal = pair->second->as<const ASTLiteral>(); literal)
+        else if (const auto * literal = pair->second->as<const ASTLiteral>())
         {
             AutoPtr<Text> value(doc->createTextNode(getFieldAsString(literal->value)));
             current_xml_element->appendChild(value);
         }
-        else if (const auto * list = pair->second->as<const ASTExpressionList>(); list)
+        else if (const auto * list = pair->second->as<const ASTExpressionList>())
         {
-            buildConfigurationFromFunctionWithKeyValueArguments(doc, current_xml_element, list);
+            buildConfigurationFromFunctionWithKeyValueArguments(doc, current_xml_element, list, context);
+        }
+        else if (const auto * func = pair->second->as<ASTFunction>())
+        {
+            auto builder = FunctionFactory::instance().tryGet(func->name, context);
+            auto function = builder->build({});
+            auto result = function->execute({}, {}, 0);
+
+            Field value;
+            result->get(0, value);
+            AutoPtr<Text> text_value(doc->createTextNode(getFieldAsString(value)));
+            current_xml_element->appendChild(text_value);
         }
         else
         {
@@ -406,13 +419,14 @@ void buildSourceConfiguration(
     AutoPtr<Document> doc,
     AutoPtr<Element> root,
     const ASTFunctionWithKeyValueArguments * source,
-    const ASTDictionarySettings * settings)
+    const ASTDictionarySettings * settings,
+    const Context & context)
 {
     AutoPtr<Element> outer_element(doc->createElement("source"));
     root->appendChild(outer_element);
     AutoPtr<Element> source_element(doc->createElement(source->name));
     outer_element->appendChild(source_element);
-    buildConfigurationFromFunctionWithKeyValueArguments(doc, source_element, source->elements->as<const ASTExpressionList>());
+    buildConfigurationFromFunctionWithKeyValueArguments(doc, source_element, source->elements->as<const ASTExpressionList>(), context);
 
     if (settings != nullptr)
     {
@@ -466,7 +480,8 @@ void checkPrimaryKey(const NamesToTypeNames & all_attrs, const Names & key_attrs
 }
 
 
-DictionaryConfigurationPtr getDictionaryConfigurationFromAST(const ASTCreateQuery & query, const std::string & database_)
+DictionaryConfigurationPtr
+getDictionaryConfigurationFromAST(const ASTCreateQuery & query, const Context & context, const std::string & database_)
 {
     checkAST(query);
 
@@ -510,7 +525,7 @@ DictionaryConfigurationPtr getDictionaryConfigurationFromAST(const ASTCreateQuer
     buildPrimaryKeyConfiguration(xml_document, structure_element, complex, pk_attrs, query.dictionary_attributes_list);
 
     buildLayoutConfiguration(xml_document, current_dictionary, dictionary_layout);
-    buildSourceConfiguration(xml_document, current_dictionary, query.dictionary->source, query.dictionary->dict_settings);
+    buildSourceConfiguration(xml_document, current_dictionary, query.dictionary->source, query.dictionary->dict_settings, context);
     buildLifetimeConfiguration(xml_document, current_dictionary, query.dictionary->lifetime);
 
     if (query.dictionary->range)
diff --git a/src/Dictionaries/getDictionaryConfigurationFromAST.h b/src/Dictionaries/getDictionaryConfigurationFromAST.h
index 3038f450914..5132e3c77e0 100644
--- a/src/Dictionaries/getDictionaryConfigurationFromAST.h
+++ b/src/Dictionaries/getDictionaryConfigurationFromAST.h
@@ -10,5 +10,6 @@ using DictionaryConfigurationPtr = Poco::AutoPtr<Poco::Util::AbstractConfigurati
 /// Convert dictionary AST to Poco::AbstractConfiguration
 /// This function is necessary because all loadable objects configuration are Poco::AbstractConfiguration
 /// Can throw exception if query is ill-formed
-DictionaryConfigurationPtr getDictionaryConfigurationFromAST(const ASTCreateQuery & query, const std::string & database_ = "");
+DictionaryConfigurationPtr
+getDictionaryConfigurationFromAST(const ASTCreateQuery & query, const Context & context, const std::string & database_ = "");
 }
diff --git a/src/Interpreters/InterpreterCreateQuery.cpp b/src/Interpreters/InterpreterCreateQuery.cpp
index 286d5269a64..d618c271ec8 100644
--- a/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuery.cpp
@@ -857,7 +857,7 @@ BlockIO InterpreterCreateQuery::createDictionary(ASTCreateQuery & create)
 
     if (create.attach)
     {
-        auto config = getDictionaryConfigurationFromAST(create);
+        auto config = getDictionaryConfigurationFromAST(create, context);
         auto modification_time = database->getObjectMetadataModificationTime(dictionary_name);
         database->attachDictionary(dictionary_name, DictionaryAttachInfo{query_ptr, config, modification_time});
     }
diff --git a/src/Parsers/ExpressionListParsers.cpp b/src/Parsers/ExpressionListParsers.cpp
index 0f06a0d2480..c1ec00befaf 100644
--- a/src/Parsers/ExpressionListParsers.cpp
+++ b/src/Parsers/ExpressionListParsers.cpp
@@ -735,6 +735,7 @@ bool ParserKeyValuePair::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
 {
     ParserIdentifier id_parser;
     ParserLiteral literal_parser;
+    ParserFunction func_parser;
 
     ASTPtr identifier;
     ASTPtr value;
@@ -742,8 +743,8 @@ bool ParserKeyValuePair::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
     if (!id_parser.parse(pos, identifier, expected))
         return false;
 
-    /// If it's not literal or identifier, than it's possible list of pairs
-    if (!literal_parser.parse(pos, value, expected) && !id_parser.parse(pos, value, expected))
+    /// If it's neither literal, nor identifier, nor function, than it's possible list of pairs
+    if (!func_parser.parse(pos, value, expected) && !literal_parser.parse(pos, value, expected) && !id_parser.parse(pos, value, expected))
     {
         ParserKeyValuePairsList kv_pairs_list;
         ParserToken open(TokenType::OpeningRoundBracket);
diff --git a/tests/queries/0_stateless/01018_ddl_dictionaries_create.reference b/tests/queries/0_stateless/01018_ddl_dictionaries_create.reference
index 5b020911d2e..e591300eddc 100644
--- a/tests/queries/0_stateless/01018_ddl_dictionaries_create.reference
+++ b/tests/queries/0_stateless/01018_ddl_dictionaries_create.reference
@@ -1,5 +1,5 @@
 =DICTIONARY in Ordinary DB
-CREATE DICTIONARY db_01018.dict1\n(\n    `key_column` UInt64 DEFAULT 0,\n    `second_column` UInt8 DEFAULT 1,\n    `third_column` String DEFAULT \'qqq\'\n)\nPRIMARY KEY key_column\nSOURCE(CLICKHOUSE(HOST \'localhost\' PORT 9000 USER \'default\' TABLE \'table_for_dict\' PASSWORD \'\' DB \'database_for_dict_01018\'))\nLIFETIME(MIN 1 MAX 10)\nLAYOUT(FLAT())
+CREATE DICTIONARY db_01018.dict1\n(\n    `key_column` UInt64 DEFAULT 0,\n    `second_column` UInt8 DEFAULT 1,\n    `third_column` String DEFAULT \'qqq\'\n)\nPRIMARY KEY key_column\nSOURCE(CLICKHOUSE(HOST \'localhost\' PORT tcpPort() USER \'default\' TABLE \'table_for_dict\' PASSWORD \'\' DB \'database_for_dict_01018\'))\nLIFETIME(MIN 1 MAX 10)\nLAYOUT(FLAT())
 dict1
 1
 db_01018	dict1
diff --git a/tests/queries/0_stateless/01018_ddl_dictionaries_create.sql b/tests/queries/0_stateless/01018_ddl_dictionaries_create.sql
index 3261b1e61d1..1a3733fd5cb 100644
--- a/tests/queries/0_stateless/01018_ddl_dictionaries_create.sql
+++ b/tests/queries/0_stateless/01018_ddl_dictionaries_create.sql
@@ -32,7 +32,7 @@ CREATE DICTIONARY db_01018.dict1
   third_column String DEFAULT 'qqq'
 )
 PRIMARY KEY key_column
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'table_for_dict' PASSWORD '' DB 'database_for_dict_01018'))
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB 'database_for_dict_01018'))
 LIFETIME(MIN 1 MAX 10)
 LAYOUT(FLAT());
 

From f897f7c93ff7be363dafe3de5a593dcb457251a1 Mon Sep 17 00:00:00 2001
From: Ivan Lezhankin <ilezhankin@yandex-team.ru>
Date: Tue, 17 Nov 2020 16:24:45 +0300
Subject: [PATCH 12/99] Refactor IFunction to execute with const arguments

---
 .../AggregateFunctionMLMethod.cpp             | 32 ++++++-------
 .../AggregateFunctionMLMethod.h               | 44 ++++++++---------
 src/AggregateFunctions/IAggregateFunction.h   |  4 +-
 src/Columns/ColumnAggregateFunction.cpp       |  2 +-
 src/Columns/ColumnAggregateFunction.h         |  2 +-
 src/Databases/DatabaseOrdinary.cpp            |  6 +--
 src/Databases/DatabaseWithDictionaries.cpp    |  4 +-
 src/Dictionaries/DictionaryFactory.cpp        |  2 +-
 .../tests/gtest_dictionary_configuration.cpp  | 17 +++----
 src/Functions/CustomWeekTransforms.h          |  2 +-
 src/Functions/DateTimeTransforms.h            |  2 +-
 src/Functions/FunctionBase64Conversion.h      |  2 +-
 src/Functions/FunctionBinaryArithmetic.h      | 22 ++++-----
 src/Functions/FunctionBitTestMany.h           |  4 +-
 src/Functions/FunctionCustomWeekToSomething.h |  2 +-
 .../FunctionDateOrDateTimeAddInterval.h       |  4 +-
 .../FunctionDateOrDateTimeToSomething.h       |  2 +-
 src/Functions/FunctionFQDN.cpp                |  2 +-
 src/Functions/FunctionJoinGet.cpp             |  2 +-
 src/Functions/FunctionJoinGet.h               |  2 +-
 src/Functions/FunctionMathBinaryFloat64.h     |  2 +-
 src/Functions/FunctionMathConstFloat64.h      |  2 +-
 src/Functions/FunctionMathUnary.h             |  2 +-
 src/Functions/FunctionNumericPredicate.h      |  2 +-
 src/Functions/FunctionStartsEndsWith.h        |  4 +-
 src/Functions/FunctionStringOrArrayToT.h      |  2 +-
 src/Functions/FunctionStringReplace.h         |  2 +-
 src/Functions/FunctionStringToString.h        |  2 +-
 src/Functions/FunctionUnaryArithmetic.h       |  2 +-
 src/Functions/FunctionUnixTimestamp64.h       |  2 +-
 src/Functions/FunctionsAES.h                  |  4 +-
 src/Functions/FunctionsBitmap.h               | 34 ++++++-------
 src/Functions/FunctionsCoding.h               | 34 ++++++-------
 src/Functions/FunctionsComparison.h           |  2 +-
 src/Functions/FunctionsConsistentHashing.h    |  4 +-
 src/Functions/FunctionsConversion.h           | 24 +++++-----
 src/Functions/FunctionsEmbeddedDictionaries.h |  8 ++--
 src/Functions/FunctionsExternalDictionaries.h | 48 +++++++++----------
 src/Functions/FunctionsExternalModels.cpp     |  4 +-
 src/Functions/FunctionsExternalModels.h       |  2 +-
 src/Functions/FunctionsHashing.h              | 18 +++----
 src/Functions/FunctionsJSON.cpp               |  2 +-
 src/Functions/FunctionsJSON.h                 |  6 +--
 src/Functions/FunctionsLogical.cpp            |  6 +--
 src/Functions/FunctionsLogical.h              |  4 +-
 src/Functions/FunctionsMiscellaneous.h        |  4 +-
 .../FunctionsMultiStringFuzzySearch.h         |  2 +-
 src/Functions/FunctionsMultiStringPosition.h  |  2 +-
 src/Functions/FunctionsMultiStringSearch.h    |  2 +-
 src/Functions/FunctionsRandom.h               |  4 +-
 src/Functions/FunctionsRound.h                |  6 +--
 src/Functions/FunctionsStringArray.h          | 12 ++---
 src/Functions/FunctionsStringSearch.h         |  2 +-
 src/Functions/FunctionsStringSearchToString.h |  2 +-
 src/Functions/FunctionsStringSimilarity.h     |  2 +-
 src/Functions/IFunction.cpp                   |  9 ++--
 src/Functions/IFunction.h                     |  5 +-
 src/Functions/IFunctionAdaptors.h             | 12 ++---
 src/Functions/IFunctionImpl.h                 |  8 ++--
 src/Functions/LeastGreatestGeneric.h          |  2 +-
 src/Functions/PerformanceAdaptors.h           |  2 +-
 src/Functions/URL/URLHierarchy.cpp            |  2 +-
 src/Functions/URL/URLPathHierarchy.cpp        |  2 +-
 .../URL/extractURLParameterNames.cpp          |  2 +-
 src/Functions/URL/extractURLParameters.cpp    |  2 +-
 src/Functions/URL/port.cpp                    |  2 +-
 src/Functions/abtesting.cpp                   |  2 +-
 src/Functions/addressToLine.cpp               |  2 +-
 src/Functions/addressToSymbol.cpp             |  2 +-
 src/Functions/appendTrailingCharIfAbsent.cpp  |  2 +-
 src/Functions/array/FunctionArrayMapped.h     |  2 +-
 src/Functions/array/array.cpp                 |  2 +-
 src/Functions/array/arrayConcat.cpp           |  2 +-
 src/Functions/array/arrayDistinct.cpp         |  4 +-
 src/Functions/array/arrayElement.cpp          | 48 ++++++++++---------
 src/Functions/array/arrayEnumerate.cpp        |  2 +-
 src/Functions/array/arrayEnumerateExtended.h  |  4 +-
 src/Functions/array/arrayEnumerateRanked.h    |  4 +-
 src/Functions/array/arrayFlatten.cpp          |  2 +-
 src/Functions/array/arrayIndex.h              | 16 +++----
 src/Functions/array/arrayIntersect.cpp        |  8 ++--
 src/Functions/array/arrayJoin.cpp             |  2 +-
 src/Functions/array/arrayPop.h                |  2 +-
 src/Functions/array/arrayPush.h               |  2 +-
 src/Functions/array/arrayReduce.cpp           |  4 +-
 src/Functions/array/arrayReduceInRanges.cpp   |  4 +-
 src/Functions/array/arrayResize.cpp           |  2 +-
 src/Functions/array/arrayReverse.cpp          |  4 +-
 src/Functions/array/arrayScalarProduct.h      | 12 ++---
 src/Functions/array/arraySlice.cpp            |  4 +-
 src/Functions/array/arrayUniq.cpp             |  4 +-
 src/Functions/array/arrayWithConstant.cpp     |  2 +-
 src/Functions/array/arrayZip.cpp              |  2 +-
 src/Functions/array/emptyArray.cpp            |  2 +-
 src/Functions/array/emptyArrayToSingle.cpp    |  6 +--
 src/Functions/array/hasAllAny.h               |  2 +-
 src/Functions/array/mapOp.cpp                 |  2 +-
 src/Functions/array/mapPopulateSeries.cpp     |  2 +-
 src/Functions/array/range.cpp                 |  2 +-
 src/Functions/assumeNotNull.cpp               |  2 +-
 src/Functions/bar.cpp                         |  4 +-
 src/Functions/bitmaskToList.cpp               |  4 +-
 src/Functions/blockNumber.cpp                 |  2 +-
 src/Functions/blockSerializedSize.cpp         |  2 +-
 src/Functions/blockSize.cpp                   |  2 +-
 src/Functions/buildId.cpp                     |  2 +-
 src/Functions/caseWithExpression.cpp          |  2 +-
 src/Functions/coalesce.cpp                    |  2 +-
 src/Functions/concat.cpp                      |  6 +--
 src/Functions/convertCharset.cpp              |  2 +-
 src/Functions/countDigits.cpp                 |  2 +-
 src/Functions/currentDatabase.cpp             |  2 +-
 src/Functions/currentUser.cpp                 |  2 +-
 src/Functions/dateDiff.cpp                    |  2 +-
 src/Functions/date_trunc.cpp                  |  2 +-
 src/Functions/defaultValueOfArgumentType.cpp  |  2 +-
 src/Functions/defaultValueOfTypeName.cpp      |  2 +-
 src/Functions/demange.cpp                     |  2 +-
 src/Functions/dumpColumnStructure.cpp         |  2 +-
 src/Functions/errorCodeToName.cpp             |  2 +-
 src/Functions/evalMLMethod.cpp                |  2 +-
 src/Functions/extractAllGroups.h              |  2 +-
 src/Functions/extractGroups.cpp               |  2 +-
 .../extractTimeZoneFromFunctionArguments.h    |  2 +-
 src/Functions/filesystem.cpp                  |  2 +-
 src/Functions/finalizeAggregation.cpp         |  2 +-
 src/Functions/formatDateTime.cpp              |  4 +-
 src/Functions/formatReadable.h                |  4 +-
 src/Functions/formatReadableTimeDelta.cpp     |  2 +-
 src/Functions/formatRow.cpp                   |  2 +-
 src/Functions/formatString.cpp                |  2 +-
 src/Functions/fuzzBits.cpp                    |  2 +-
 src/Functions/generateUUIDv4.cpp              |  4 +-
 src/Functions/geoToH3.cpp                     |  2 +-
 src/Functions/geohashDecode.cpp               |  2 +-
 src/Functions/geohashEncode.cpp               |  2 +-
 src/Functions/geohashesInBox.cpp              |  2 +-
 src/Functions/getMacro.cpp                    |  2 +-
 src/Functions/getScalar.cpp                   |  2 +-
 src/Functions/getSetting.cpp                  |  2 +-
 src/Functions/getSizeOfEnumType.cpp           |  2 +-
 src/Functions/globalVariable.cpp              |  2 +-
 src/Functions/greatCircleDistance.cpp         |  4 +-
 src/Functions/h3EdgeAngle.cpp                 |  2 +-
 src/Functions/h3EdgeLengthM.cpp               |  2 +-
 src/Functions/h3GetBaseCell.cpp               |  2 +-
 src/Functions/h3GetResolution.cpp             |  2 +-
 src/Functions/h3HexAreaM2.cpp                 |  2 +-
 src/Functions/h3IndexesAreNeighbors.cpp       |  2 +-
 src/Functions/h3IsValid.cpp                   |  2 +-
 src/Functions/h3ToChildren.cpp                |  2 +-
 src/Functions/h3ToParent.cpp                  |  2 +-
 src/Functions/h3ToString.cpp                  |  2 +-
 src/Functions/h3kRing.cpp                     |  2 +-
 src/Functions/hasColumnInTable.cpp            |  6 +--
 src/Functions/hasThreadFuzzer.cpp             |  2 +-
 src/Functions/hostName.cpp                    |  2 +-
 src/Functions/identity.cpp                    |  2 +-
 src/Functions/if.cpp                          | 30 ++++++------
 src/Functions/ifNotFinite.cpp                 |  2 +-
 src/Functions/ifNull.cpp                      |  2 +-
 src/Functions/ignore.cpp                      |  2 +-
 src/Functions/in.cpp                          |  2 +-
 src/Functions/initializeAggregation.cpp       |  4 +-
 src/Functions/isConstant.cpp                  |  2 +-
 src/Functions/isDecimalOverflow.cpp           |  2 +-
 src/Functions/isNotNull.cpp                   |  2 +-
 src/Functions/isNull.cpp                      |  2 +-
 src/Functions/isZeroOrNull.cpp                |  2 +-
 src/Functions/logTrace.cpp                    |  2 +-
 src/Functions/lowCardinalityIndices.cpp       |  2 +-
 src/Functions/lowCardinalityKeys.cpp          |  2 +-
 src/Functions/materialize.cpp                 |  2 +-
 src/Functions/multiIf.cpp                     |  2 +-
 src/Functions/neighbor.cpp                    |  2 +-
 src/Functions/normalizedQueryHash.cpp         |  2 +-
 src/Functions/now.cpp                         |  2 +-
 src/Functions/now64.cpp                       |  2 +-
 src/Functions/nullIf.cpp                      |  2 +-
 src/Functions/pointInEllipses.cpp             |  2 +-
 src/Functions/pointInPolygon.cpp              |  8 ++--
 src/Functions/randConstant.cpp                |  2 +-
 src/Functions/randomFixedString.cpp           |  4 +-
 src/Functions/randomPrintableASCII.cpp        |  2 +-
 src/Functions/randomString.cpp                |  4 +-
 src/Functions/randomStringUTF8.cpp            |  2 +-
 src/Functions/regexpQuoteMeta.cpp             |  2 +-
 src/Functions/reinterpretAs.cpp               |  2 +-
 src/Functions/reinterpretAsFixedString.cpp    |  2 +-
 src/Functions/reinterpretAsString.cpp         |  2 +-
 src/Functions/repeat.cpp                      |  2 +-
 src/Functions/replicate.cpp                   |  2 +-
 src/Functions/reverse.cpp                     |  2 +-
 src/Functions/rowNumberInAllBlocks.cpp        |  4 +-
 src/Functions/rowNumberInBlock.cpp            |  2 +-
 src/Functions/runningAccumulate.cpp           |  2 +-
 src/Functions/runningDifference.h             |  4 +-
 src/Functions/sleep.h                         |  2 +-
 src/Functions/stringToH3.cpp                  |  2 +-
 src/Functions/substring.cpp                   |  2 +-
 src/Functions/tcpPort.cpp                     |  2 +-
 src/Functions/throwIf.cpp                     |  2 +-
 src/Functions/tid.cpp                         |  2 +-
 src/Functions/timeSlots.cpp                   |  2 +-
 src/Functions/timezone.cpp                    |  2 +-
 src/Functions/toColumnTypeName.cpp            |  2 +-
 src/Functions/toFixedString.h                 |  4 +-
 src/Functions/toLowCardinality.cpp            |  2 +-
 src/Functions/toNullable.cpp                  |  2 +-
 src/Functions/toStartOfInterval.cpp           |  2 +-
 src/Functions/toTimeZone.cpp                  |  2 +-
 src/Functions/toTypeName.cpp                  |  2 +-
 src/Functions/today.cpp                       |  2 +-
 src/Functions/transform.cpp                   |  6 +--
 src/Functions/tuple.cpp                       |  2 +-
 src/Functions/tupleElement.cpp                |  2 +-
 src/Functions/uptime.cpp                      |  2 +-
 src/Functions/version.cpp                     |  2 +-
 src/Functions/visibleWidth.cpp                |  2 +-
 src/Functions/yesterday.cpp                   |  2 +-
 220 files changed, 471 insertions(+), 470 deletions(-)

diff --git a/src/AggregateFunctions/AggregateFunctionMLMethod.cpp b/src/AggregateFunctions/AggregateFunctionMLMethod.cpp
index 812794902df..6c5c5af2f1d 100644
--- a/src/AggregateFunctions/AggregateFunctionMLMethod.cpp
+++ b/src/AggregateFunctions/AggregateFunctionMLMethod.cpp
@@ -143,7 +143,7 @@ void LinearModelData::updateState()
 
 void LinearModelData::predict(
     ColumnVector<Float64>::Container & container,
-    ColumnsWithTypeAndName & arguments,
+    const ColumnsWithTypeAndName & arguments,
     size_t offset,
     size_t limit,
     const Context & context) const
@@ -264,8 +264,8 @@ void Adam::merge(const IWeightsUpdater & rhs, Float64 frac, Float64 rhs_frac)
         average_gradient[i] = average_gradient[i] * frac + adam_rhs.average_gradient[i] * rhs_frac;
         average_squared_gradient[i] = average_squared_gradient[i] * frac + adam_rhs.average_squared_gradient[i] * rhs_frac;
     }
-    beta1_powered_ *= adam_rhs.beta1_powered_;
-    beta2_powered_ *= adam_rhs.beta2_powered_;
+    beta1_powered *= adam_rhs.beta1_powered;
+    beta2_powered *= adam_rhs.beta2_powered;
 }
 
 void Adam::update(UInt64 batch_size, std::vector<Float64> & weights, Float64 & bias, Float64 learning_rate, const std::vector<Float64> & batch_gradient)
@@ -282,21 +282,21 @@ void Adam::update(UInt64 batch_size, std::vector<Float64> & weights, Float64 & b
     for (size_t i = 0; i != average_gradient.size(); ++i)
     {
         Float64 normed_gradient = batch_gradient[i] / batch_size;
-        average_gradient[i] = beta1_ * average_gradient[i] + (1 - beta1_) * normed_gradient;
-        average_squared_gradient[i] = beta2_ * average_squared_gradient[i] +
-                (1 - beta2_) * normed_gradient * normed_gradient;
+        average_gradient[i] = beta1 * average_gradient[i] + (1 - beta1) * normed_gradient;
+        average_squared_gradient[i] = beta2 * average_squared_gradient[i] +
+                (1 - beta2) * normed_gradient * normed_gradient;
     }
 
     for (size_t i = 0; i < weights.size(); ++i)
     {
         weights[i] += (learning_rate * average_gradient[i]) /
-                ((1 - beta1_powered_) * (sqrt(average_squared_gradient[i] / (1 - beta2_powered_)) + eps_));
+                ((1 - beta1_powered) * (sqrt(average_squared_gradient[i] / (1 - beta2_powered)) + eps));
     }
     bias += (learning_rate * average_gradient[weights.size()]) /
-            ((1 - beta1_powered_) * (sqrt(average_squared_gradient[weights.size()] / (1 - beta2_powered_)) + eps_));
+            ((1 - beta1_powered) * (sqrt(average_squared_gradient[weights.size()] / (1 - beta2_powered)) + eps));
 
-    beta1_powered_ *= beta1_;
-    beta2_powered_ *= beta2_;
+    beta1_powered *= beta1;
+    beta2_powered *= beta2;
 }
 
 void Adam::addToBatch(
@@ -348,7 +348,7 @@ void Nesterov::update(UInt64 batch_size, std::vector<Float64> & weights, Float64
 
     for (size_t i = 0; i < batch_gradient.size(); ++i)
     {
-        accumulated_gradient[i] = accumulated_gradient[i] * alpha_ + (learning_rate * batch_gradient[i]) / batch_size;
+        accumulated_gradient[i] = accumulated_gradient[i] * alpha + (learning_rate * batch_gradient[i]) / batch_size;
     }
     for (size_t i = 0; i < weights.size(); ++i)
     {
@@ -375,9 +375,9 @@ void Nesterov::addToBatch(
     std::vector<Float64> shifted_weights(weights.size());
     for (size_t i = 0; i != shifted_weights.size(); ++i)
     {
-        shifted_weights[i] = weights[i] + accumulated_gradient[i] * alpha_;
+        shifted_weights[i] = weights[i] + accumulated_gradient[i] * alpha;
     }
-    auto shifted_bias = bias + accumulated_gradient[weights.size()] * alpha_;
+    auto shifted_bias = bias + accumulated_gradient[weights.size()] * alpha;
 
     gradient_computer.compute(batch_gradient, shifted_weights, shifted_bias, l2_reg_coef, target, columns, row_num);
 }
@@ -411,7 +411,7 @@ void Momentum::update(UInt64 batch_size, std::vector<Float64> & weights, Float64
 
     for (size_t i = 0; i < batch_gradient.size(); ++i)
     {
-        accumulated_gradient[i] = accumulated_gradient[i] * alpha_ + (learning_rate * batch_gradient[i]) / batch_size;
+        accumulated_gradient[i] = accumulated_gradient[i] * alpha + (learning_rate * batch_gradient[i]) / batch_size;
     }
     for (size_t i = 0; i < weights.size(); ++i)
     {
@@ -448,7 +448,7 @@ void IWeightsUpdater::addToBatch(
 
 void LogisticRegression::predict(
     ColumnVector<Float64>::Container & container,
-    ColumnsWithTypeAndName & arguments,
+    const ColumnsWithTypeAndName & arguments,
     size_t offset,
     size_t limit,
     const std::vector<Float64> & weights,
@@ -516,7 +516,7 @@ void LogisticRegression::compute(
 
 void LinearRegression::predict(
     ColumnVector<Float64>::Container & container,
-    ColumnsWithTypeAndName & arguments,
+    const ColumnsWithTypeAndName & arguments,
     size_t offset,
     size_t limit,
     const std::vector<Float64> & weights,
diff --git a/src/AggregateFunctions/AggregateFunctionMLMethod.h b/src/AggregateFunctions/AggregateFunctionMLMethod.h
index 494907c4002..b6912405fef 100644
--- a/src/AggregateFunctions/AggregateFunctionMLMethod.h
+++ b/src/AggregateFunctions/AggregateFunctionMLMethod.h
@@ -23,7 +23,7 @@ GradientComputer class computes gradient according to its loss function
 class IGradientComputer
 {
 public:
-    IGradientComputer() {}
+    IGradientComputer() = default;
 
     virtual ~IGradientComputer() = default;
 
@@ -39,7 +39,7 @@ public:
 
     virtual void predict(
         ColumnVector<Float64>::Container & container,
-        ColumnsWithTypeAndName & arguments,
+        const ColumnsWithTypeAndName & arguments,
         size_t offset,
         size_t limit,
         const std::vector<Float64> & weights,
@@ -51,7 +51,7 @@ public:
 class LinearRegression : public IGradientComputer
 {
 public:
-    LinearRegression() {}
+    LinearRegression() = default;
 
     void compute(
         std::vector<Float64> & batch_gradient,
@@ -64,7 +64,7 @@ public:
 
     void predict(
         ColumnVector<Float64>::Container & container,
-        ColumnsWithTypeAndName & arguments,
+        const ColumnsWithTypeAndName & arguments,
         size_t offset,
         size_t limit,
         const std::vector<Float64> & weights,
@@ -76,7 +76,7 @@ public:
 class LogisticRegression : public IGradientComputer
 {
 public:
-    LogisticRegression() {}
+    LogisticRegression() = default;
 
     void compute(
         std::vector<Float64> & batch_gradient,
@@ -89,7 +89,7 @@ public:
 
     void predict(
         ColumnVector<Float64>::Container & container,
-        ColumnsWithTypeAndName & arguments,
+        const ColumnsWithTypeAndName & arguments,
         size_t offset,
         size_t limit,
         const std::vector<Float64> & weights,
@@ -147,9 +147,9 @@ public:
 class Momentum : public IWeightsUpdater
 {
 public:
-    Momentum() {}
+    Momentum() = default;
 
-    Momentum(Float64 alpha) : alpha_(alpha) {}
+    explicit Momentum(Float64 alpha_) : alpha(alpha_) {}
 
     void update(UInt64 batch_size, std::vector<Float64> & weights, Float64 & bias, Float64 learning_rate, const std::vector<Float64> & batch_gradient) override;
 
@@ -160,7 +160,7 @@ public:
     void read(ReadBuffer & buf) override;
 
 private:
-    Float64 alpha_{0.1};
+    Float64 alpha{0.1};
     std::vector<Float64> accumulated_gradient;
 };
 
@@ -168,9 +168,9 @@ private:
 class Nesterov : public IWeightsUpdater
 {
 public:
-    Nesterov() {}
+    Nesterov() = default;
 
-    Nesterov(Float64 alpha) : alpha_(alpha) {}
+    explicit Nesterov(Float64 alpha_) : alpha(alpha_) {}
 
     void addToBatch(
         std::vector<Float64> & batch_gradient,
@@ -191,7 +191,7 @@ public:
     void read(ReadBuffer & buf) override;
 
 private:
-    const Float64 alpha_ = 0.9;
+    const Float64 alpha = 0.9;
     std::vector<Float64> accumulated_gradient;
 };
 
@@ -201,8 +201,8 @@ class Adam : public IWeightsUpdater
 public:
     Adam()
     {
-        beta1_powered_ = beta1_;
-        beta2_powered_ = beta2_;
+        beta1_powered = beta1;
+        beta2_powered = beta2;
     }
 
     void addToBatch(
@@ -225,11 +225,11 @@ public:
 
 private:
     /// beta1 and beta2 hyperparameters have such recommended values
-    const Float64 beta1_ = 0.9;
-    const Float64 beta2_ = 0.999;
-    const Float64 eps_ = 0.000001;
-    Float64 beta1_powered_;
-    Float64 beta2_powered_;
+    const Float64 beta1 = 0.9;
+    const Float64 beta2 = 0.999;
+    const Float64 eps = 0.000001;
+    Float64 beta1_powered;
+    Float64 beta2_powered;
 
     std::vector<Float64> average_gradient;
     std::vector<Float64> average_squared_gradient;
@@ -241,7 +241,7 @@ private:
 class LinearModelData
 {
 public:
-    LinearModelData() {}
+    LinearModelData() = default;
 
     LinearModelData(
         Float64 learning_rate_,
@@ -261,7 +261,7 @@ public:
 
     void predict(
         ColumnVector<Float64>::Container & container,
-        ColumnsWithTypeAndName & arguments,
+        const ColumnsWithTypeAndName & arguments,
         size_t offset,
         size_t limit,
         const Context & context) const;
@@ -360,7 +360,7 @@ public:
     void predictValues(
         ConstAggregateDataPtr place,
         IColumn & to,
-        ColumnsWithTypeAndName & arguments,
+        const ColumnsWithTypeAndName & arguments,
         size_t offset,
         size_t limit,
         const Context & context) const override
diff --git a/src/AggregateFunctions/IAggregateFunction.h b/src/AggregateFunctions/IAggregateFunction.h
index 4f9552d2345..87f6a11406c 100644
--- a/src/AggregateFunctions/IAggregateFunction.h
+++ b/src/AggregateFunctions/IAggregateFunction.h
@@ -60,7 +60,7 @@ public:
         throw Exception("Prediction is not supported for " + getName(), ErrorCodes::NOT_IMPLEMENTED);
     }
 
-    virtual ~IAggregateFunction() {}
+    virtual ~IAggregateFunction() = default;
 
     /** Data manipulating functions. */
 
@@ -113,7 +113,7 @@ public:
     virtual void predictValues(
         ConstAggregateDataPtr /* place */,
         IColumn & /*to*/,
-        ColumnsWithTypeAndName & /*arguments*/,
+        const ColumnsWithTypeAndName & /*arguments*/,
         size_t /*offset*/,
         size_t /*limit*/,
         const Context & /*context*/) const
diff --git a/src/Columns/ColumnAggregateFunction.cpp b/src/Columns/ColumnAggregateFunction.cpp
index f5b266b6983..99b3342f314 100644
--- a/src/Columns/ColumnAggregateFunction.cpp
+++ b/src/Columns/ColumnAggregateFunction.cpp
@@ -161,7 +161,7 @@ MutableColumnPtr ColumnAggregateFunction::convertToValues(MutableColumnPtr colum
     return res;
 }
 
-MutableColumnPtr ColumnAggregateFunction::predictValues(ColumnsWithTypeAndName & arguments, const Context & context) const
+MutableColumnPtr ColumnAggregateFunction::predictValues(const ColumnsWithTypeAndName & arguments, const Context & context) const
 {
     MutableColumnPtr res = func->getReturnTypeToPredict()->createColumn();
     res->reserve(data.size());
diff --git a/src/Columns/ColumnAggregateFunction.h b/src/Columns/ColumnAggregateFunction.h
index 79e52e5769a..4e5e66542e9 100644
--- a/src/Columns/ColumnAggregateFunction.h
+++ b/src/Columns/ColumnAggregateFunction.h
@@ -119,7 +119,7 @@ public:
     const char * getFamilyName() const override { return "AggregateFunction"; }
     TypeIndex getDataType() const override { return TypeIndex::AggregateFunction; }
 
-    MutableColumnPtr predictValues(ColumnsWithTypeAndName & arguments, const Context & context) const;
+    MutableColumnPtr predictValues(const ColumnsWithTypeAndName & arguments, const Context & context) const;
 
     size_t size() const override
     {
diff --git a/src/Databases/DatabaseOrdinary.cpp b/src/Databases/DatabaseOrdinary.cpp
index a1d24226444..24e2bdcd6b2 100644
--- a/src/Databases/DatabaseOrdinary.cpp
+++ b/src/Databases/DatabaseOrdinary.cpp
@@ -67,14 +67,14 @@ namespace
     }
 
 
-    void tryAttachDictionary(const ASTPtr & query, DatabaseOrdinary & database, const String & metadata_path)
+    void tryAttachDictionary(const ASTPtr & query, DatabaseOrdinary & database, const String & metadata_path, const Context & context)
     {
         auto & create_query = query->as<ASTCreateQuery &>();
         assert(create_query.is_dictionary);
         try
         {
             Poco::File meta_file(metadata_path);
-            auto config = getDictionaryConfigurationFromAST(create_query, database.getDatabaseName());
+            auto config = getDictionaryConfigurationFromAST(create_query, context, database.getDatabaseName());
             time_t modification_time = meta_file.getLastModified().epochTime();
             database.attachDictionary(create_query.table, DictionaryAttachInfo{query, config, modification_time});
         }
@@ -190,7 +190,7 @@ void DatabaseOrdinary::loadStoredObjects(Context & context, bool has_force_resto
         auto create_query = query->as<const ASTCreateQuery &>();
         if (create_query.is_dictionary)
         {
-            tryAttachDictionary(query, *this, getMetadataPath() + name);
+            tryAttachDictionary(query, *this, getMetadataPath() + name, context);
 
             /// Messages, so that it's not boring to wait for the server to load for a long time.
             logAboutProgress(log, ++dictionaries_processed, total_dictionaries, watch);
diff --git a/src/Databases/DatabaseWithDictionaries.cpp b/src/Databases/DatabaseWithDictionaries.cpp
index 6c5173c986f..ee16f4ae15e 100644
--- a/src/Databases/DatabaseWithDictionaries.cpp
+++ b/src/Databases/DatabaseWithDictionaries.cpp
@@ -176,7 +176,7 @@ void DatabaseWithDictionaries::createDictionary(const Context & context, const S
     /// Add a temporary repository containing the dictionary.
     /// We need this temp repository to try loading the dictionary before actually attaching it to the database.
     auto temp_repository = external_loader.addConfigRepository(std::make_unique<ExternalLoaderTempConfigRepository>(
-        getDatabaseName(), dictionary_metadata_tmp_path, getDictionaryConfigurationFromAST(query->as<const ASTCreateQuery &>())));
+        getDatabaseName(), dictionary_metadata_tmp_path, getDictionaryConfigurationFromAST(query->as<const ASTCreateQuery &>(), context)));
 
     bool lazy_load = context.getConfigRef().getBool("dictionaries_lazy_load", true);
     if (!lazy_load)
@@ -186,7 +186,7 @@ void DatabaseWithDictionaries::createDictionary(const Context & context, const S
         external_loader.load(dict_id.getInternalDictionaryName());
     }
 
-    auto config = getDictionaryConfigurationFromAST(query->as<const ASTCreateQuery &>());
+    auto config = getDictionaryConfigurationFromAST(query->as<const ASTCreateQuery &>(), context);
     attachDictionary(dictionary_name, DictionaryAttachInfo{query, config, time(nullptr)});
     SCOPE_EXIT({
         if (!succeeded)
diff --git a/src/Dictionaries/DictionaryFactory.cpp b/src/Dictionaries/DictionaryFactory.cpp
index c33b7b5a3ae..ad19d7c20ea 100644
--- a/src/Dictionaries/DictionaryFactory.cpp
+++ b/src/Dictionaries/DictionaryFactory.cpp
@@ -62,7 +62,7 @@ DictionaryPtr DictionaryFactory::create(
 
 DictionaryPtr DictionaryFactory::create(const std::string & name, const ASTCreateQuery & ast, const Context & context) const
 {
-    auto configuration = getDictionaryConfigurationFromAST(ast);
+    auto configuration = getDictionaryConfigurationFromAST(ast, context);
     return DictionaryFactory::create(name, *configuration, "dictionary", context, true);
 }
 
diff --git a/src/Dictionaries/tests/gtest_dictionary_configuration.cpp b/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
index 62422124bd8..830d4655331 100644
--- a/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
+++ b/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
@@ -1,12 +1,13 @@
-#include <common/types.h>
-#include <Poco/Util/XMLConfiguration.h>
+#include <Dictionaries/getDictionaryConfigurationFromAST.h>
+#include <Dictionaries/registerDictionaries.h>
+#include <Interpreters/Context.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/DumpASTNode.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/formatAST.h>
 #include <Parsers/parseQuery.h>
-#include <Dictionaries/getDictionaryConfigurationFromAST.h>
-#include <Dictionaries/registerDictionaries.h>
+#include <Poco/Util/XMLConfiguration.h>
+#include <common/types.h>
 
 #include <gtest/gtest.h>
 
@@ -47,7 +48,7 @@ TEST(ConvertDictionaryAST, SimpleDictConfiguration)
     ParserCreateDictionaryQuery parser;
     ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
     ASTCreateQuery * create = ast->as<ASTCreateQuery>();
-    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create);
+    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, Context::createGlobal(Context::createShared().get()));
 
     /// name
     EXPECT_EQ(config->getString("dictionary.database"), "test");
@@ -115,7 +116,7 @@ TEST(ConvertDictionaryAST, TrickyAttributes)
     ParserCreateDictionaryQuery parser;
     ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
     ASTCreateQuery * create = ast->as<ASTCreateQuery>();
-    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create);
+    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, Context::createGlobal(Context::createShared().get()));
 
     Poco::Util::AbstractConfiguration::Keys keys;
     config->keys("dictionary.structure", keys);
@@ -160,7 +161,7 @@ TEST(ConvertDictionaryAST, ComplexKeyAndLayoutWithParams)
     ParserCreateDictionaryQuery parser;
     ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
     ASTCreateQuery * create = ast->as<ASTCreateQuery>();
-    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create);
+    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, Context::createGlobal(Context::createShared().get()));
 
     Poco::Util::AbstractConfiguration::Keys keys;
     config->keys("dictionary.structure.key", keys);
@@ -211,7 +212,7 @@ TEST(ConvertDictionaryAST, ComplexSource)
     ParserCreateDictionaryQuery parser;
     ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
     ASTCreateQuery * create = ast->as<ASTCreateQuery>();
-    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create);
+    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, Context::createGlobal(Context::createShared().get()));
     /// source
     EXPECT_EQ(config->getString("dictionary.source.mysql.host"), "localhost");
     EXPECT_EQ(config->getInt("dictionary.source.mysql.port"), 9000);
diff --git a/src/Functions/CustomWeekTransforms.h b/src/Functions/CustomWeekTransforms.h
index 53baaff8db9..afcbadc835c 100644
--- a/src/Functions/CustomWeekTransforms.h
+++ b/src/Functions/CustomWeekTransforms.h
@@ -116,7 +116,7 @@ template <typename FromDataType, typename ToDataType>
 struct CustomWeekTransformImpl
 {
     template <typename Transform>
-    static ColumnPtr execute(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/, Transform transform = {})
+    static ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/, Transform transform = {})
     {
         const auto op = Transformer<typename FromDataType::FieldType, typename ToDataType::FieldType, Transform>{std::move(transform)};
 
diff --git a/src/Functions/DateTimeTransforms.h b/src/Functions/DateTimeTransforms.h
index 52cc43c3847..4ad99b528ea 100644
--- a/src/Functions/DateTimeTransforms.h
+++ b/src/Functions/DateTimeTransforms.h
@@ -683,7 +683,7 @@ struct Transformer
 template <typename FromDataType, typename ToDataType, typename Transform>
 struct DateTimeTransformImpl
 {
-    static ColumnPtr execute(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/, const Transform & transform = {})
+    static ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/, const Transform & transform = {})
     {
         using Op = Transformer<typename FromDataType::FieldType, typename ToDataType::FieldType, Transform>;
 
diff --git a/src/Functions/FunctionBase64Conversion.h b/src/Functions/FunctionBase64Conversion.h
index adc131053e2..4bc2a779cf4 100644
--- a/src/Functions/FunctionBase64Conversion.h
+++ b/src/Functions/FunctionBase64Conversion.h
@@ -91,7 +91,7 @@ public:
         return std::make_shared<DataTypeString>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const ColumnPtr column_string = arguments[0].column;
         const ColumnString * input = checkAndGetColumn<ColumnString>(column_string.get());
diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index 43ff42956cd..7ffdc033a00 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -613,7 +613,7 @@ class FunctionBinaryArithmetic : public IFunction
     }
 
     /// Multiply aggregation state by integer constant: by merging it with itself specified number of times.
-    ColumnPtr executeAggregateMultiply(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const
+    ColumnPtr executeAggregateMultiply(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const
     {
         ColumnsWithTypeAndName new_arguments = arguments;
         if (WhichDataType(new_arguments[1].type).isAggregateFunction())
@@ -680,7 +680,7 @@ class FunctionBinaryArithmetic : public IFunction
     }
 
     /// Merge two aggregation states together.
-    ColumnPtr executeAggregateAddition(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const
+    ColumnPtr executeAggregateAddition(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const
     {
         const IColumn & lhs_column = *arguments[0].column;
         const IColumn & rhs_column = *arguments[1].column;
@@ -712,7 +712,7 @@ class FunctionBinaryArithmetic : public IFunction
             return column_to;
     }
 
-    ColumnPtr executeDateTimeIntervalPlusMinus(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type,
+    ColumnPtr executeDateTimeIntervalPlusMinus(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type,
                                                size_t input_rows_count, const FunctionOverloadResolverPtr & function_builder) const
     {
         ColumnsWithTypeAndName new_arguments = arguments;
@@ -847,7 +847,7 @@ public:
         return type_res;
     }
 
-    ColumnPtr executeFixedString(ColumnsWithTypeAndName & arguments) const
+    ColumnPtr executeFixedString(const ColumnsWithTypeAndName & arguments) const
     {
         using OpImpl = FixedStringOperationImpl<Op<UInt8, UInt8>>;
 
@@ -923,7 +923,7 @@ public:
     }
 
     template <typename A, typename B>
-    ColumnPtr executeNumeric(ColumnsWithTypeAndName & arguments, const A & left, const B & right) const
+    ColumnPtr executeNumeric(const ColumnsWithTypeAndName & arguments, const A & left, const B & right) const
     {
         using LeftDataType = std::decay_t<decltype(left)>;
         using RightDataType = std::decay_t<decltype(right)>;
@@ -1047,7 +1047,7 @@ public:
         return nullptr;
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         /// Special case when multiply aggregate function state
         if (isAggregateMultiply(arguments[0].type, arguments[1].type))
@@ -1181,7 +1181,7 @@ public:
     {
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         if (left.column && isColumnConst(*left.column) && arguments.size() == 1)
         {
@@ -1205,12 +1205,8 @@ public:
 
     bool hasInformationAboutMonotonicity() const override
     {
-        std::string_view name_ = Name::name;
-        if (name_ == "minus" || name_ == "plus" || name_ == "divide" || name_ == "intDiv")
-        {
-            return true;
-        }
-        return false;
+        std::string_view name = Name::name;
+        return (name == "minus" || name == "plus" || name == "divide" || name == "intDiv");
     }
 
     Monotonicity getMonotonicityForRange(const IDataType &, const Field & left_point, const Field & right_point) const override
diff --git a/src/Functions/FunctionBitTestMany.h b/src/Functions/FunctionBitTestMany.h
index 0c8b803bd22..6d527c66390 100644
--- a/src/Functions/FunctionBitTestMany.h
+++ b/src/Functions/FunctionBitTestMany.h
@@ -54,7 +54,7 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
     {
         const auto * value_col = arguments.front().column.get();
 
@@ -75,7 +75,7 @@ public:
 private:
     template <typename T>
     ColumnPtr execute(
-            ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type,
+            const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type,
             const IColumn * const value_col_untyped) const
     {
         if (const auto value_col = checkAndGetColumn<ColumnVector<T>>(value_col_untyped))
diff --git a/src/Functions/FunctionCustomWeekToSomething.h b/src/Functions/FunctionCustomWeekToSomething.h
index 74d6a2b5182..8a343cffb95 100644
--- a/src/Functions/FunctionCustomWeekToSomething.h
+++ b/src/Functions/FunctionCustomWeekToSomething.h
@@ -96,7 +96,7 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1, 2}; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         const IDataType * from_type = arguments[0].type.get();
         WhichDataType which(from_type);
diff --git a/src/Functions/FunctionDateOrDateTimeAddInterval.h b/src/Functions/FunctionDateOrDateTimeAddInterval.h
index bf2d20ceba7..70e2616eeac 100644
--- a/src/Functions/FunctionDateOrDateTimeAddInterval.h
+++ b/src/Functions/FunctionDateOrDateTimeAddInterval.h
@@ -305,7 +305,7 @@ private:
 template <typename FromDataType, typename ToDataType, typename Transform>
 struct DateTimeAddIntervalImpl
 {
-    static ColumnPtr execute(Transform transform, ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type)
+    static ColumnPtr execute(Transform transform, const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type)
     {
         using FromValueType = typename FromDataType::FieldType;
         using FromColumnType = typename FromDataType::ColumnType;
@@ -463,7 +463,7 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {2}; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
     {
         const IDataType * from_type = arguments[0].type.get();
         WhichDataType which(from_type);
diff --git a/src/Functions/FunctionDateOrDateTimeToSomething.h b/src/Functions/FunctionDateOrDateTimeToSomething.h
index 2d2e4a7ad6f..e0676f3dc0f 100644
--- a/src/Functions/FunctionDateOrDateTimeToSomething.h
+++ b/src/Functions/FunctionDateOrDateTimeToSomething.h
@@ -95,7 +95,7 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         const IDataType * from_type = arguments[0].type.get();
         WhichDataType which(from_type);
diff --git a/src/Functions/FunctionFQDN.cpp b/src/Functions/FunctionFQDN.cpp
index b47675d63b4..7b3b89eb511 100644
--- a/src/Functions/FunctionFQDN.cpp
+++ b/src/Functions/FunctionFQDN.cpp
@@ -34,7 +34,7 @@ public:
         return std::make_shared<DataTypeString>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         return result_type->createColumnConst(
             input_rows_count, getFQDNOrHostName())->convertToFullColumnIfConst();
diff --git a/src/Functions/FunctionJoinGet.cpp b/src/Functions/FunctionJoinGet.cpp
index 4e97951fbc0..6b15bf821b2 100644
--- a/src/Functions/FunctionJoinGet.cpp
+++ b/src/Functions/FunctionJoinGet.cpp
@@ -17,7 +17,7 @@ namespace ErrorCodes
 }
 
 template <bool or_null>
-ColumnPtr ExecutableFunctionJoinGet<or_null>::execute(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t)
+ColumnPtr ExecutableFunctionJoinGet<or_null>::execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const
 {
     ColumnsWithTypeAndName keys;
     for (size_t i = 2; i < arguments.size(); ++i)
diff --git a/src/Functions/FunctionJoinGet.h b/src/Functions/FunctionJoinGet.h
index 780b59e20f4..27f348e9698 100644
--- a/src/Functions/FunctionJoinGet.h
+++ b/src/Functions/FunctionJoinGet.h
@@ -24,7 +24,7 @@ public:
     bool useDefaultImplementationForLowCardinalityColumns() const override { return true; }
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr execute(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) override;
+    ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override;
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/FunctionMathBinaryFloat64.h b/src/Functions/FunctionMathBinaryFloat64.h
index ea222379e1c..0a0688dc75c 100644
--- a/src/Functions/FunctionMathBinaryFloat64.h
+++ b/src/Functions/FunctionMathBinaryFloat64.h
@@ -204,7 +204,7 @@ private:
         return nullptr;
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnWithTypeAndName & col_left = arguments[0];
         const ColumnWithTypeAndName & col_right = arguments[1];
diff --git a/src/Functions/FunctionMathConstFloat64.h b/src/Functions/FunctionMathConstFloat64.h
index 42729d5e9f6..f03f469bc35 100644
--- a/src/Functions/FunctionMathConstFloat64.h
+++ b/src/Functions/FunctionMathConstFloat64.h
@@ -25,7 +25,7 @@ private:
         return std::make_shared<DataTypeFloat64>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         return result_type->createColumnConst(input_rows_count, Impl::value);
     }
diff --git a/src/Functions/FunctionMathUnary.h b/src/Functions/FunctionMathUnary.h
index abf38d277f3..49b0428811a 100644
--- a/src/Functions/FunctionMathUnary.h
+++ b/src/Functions/FunctionMathUnary.h
@@ -148,7 +148,7 @@ private:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnWithTypeAndName & col = arguments[0];
         ColumnPtr res;
diff --git a/src/Functions/FunctionNumericPredicate.h b/src/Functions/FunctionNumericPredicate.h
index 825a8b0de15..72a17adac4c 100644
--- a/src/Functions/FunctionNumericPredicate.h
+++ b/src/Functions/FunctionNumericPredicate.h
@@ -46,7 +46,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const auto * in = arguments.front().column.get();
 
diff --git a/src/Functions/FunctionStartsEndsWith.h b/src/Functions/FunctionStartsEndsWith.h
index 612e0b3b046..2899bc259d5 100644
--- a/src/Functions/FunctionStartsEndsWith.h
+++ b/src/Functions/FunctionStartsEndsWith.h
@@ -63,7 +63,7 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const IColumn * haystack_column = arguments[0].column.get();
         const IColumn * needle_column = arguments[1].column.get();
@@ -159,7 +159,7 @@ public:
     #endif
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
diff --git a/src/Functions/FunctionStringOrArrayToT.h b/src/Functions/FunctionStringOrArrayToT.h
index f806106560c..6330d8f90d6 100644
--- a/src/Functions/FunctionStringOrArrayToT.h
+++ b/src/Functions/FunctionStringOrArrayToT.h
@@ -50,7 +50,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
     {
         const ColumnPtr column = arguments[0].column;
         if (const ColumnString * col = checkAndGetColumn<ColumnString>(column.get()))
diff --git a/src/Functions/FunctionStringReplace.h b/src/Functions/FunctionStringReplace.h
index 4ec85591726..bd8edbf9202 100644
--- a/src/Functions/FunctionStringReplace.h
+++ b/src/Functions/FunctionStringReplace.h
@@ -52,7 +52,7 @@ public:
         return std::make_shared<DataTypeString>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnPtr column_src = arguments[0].column;
         const ColumnPtr column_needle = arguments[1].column;
diff --git a/src/Functions/FunctionStringToString.h b/src/Functions/FunctionStringToString.h
index db85e85a053..4123b41c547 100644
--- a/src/Functions/FunctionStringToString.h
+++ b/src/Functions/FunctionStringToString.h
@@ -52,7 +52,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnPtr column = arguments[0].column;
         if (const ColumnString * col = checkAndGetColumn<ColumnString>(column.get()))
diff --git a/src/Functions/FunctionUnaryArithmetic.h b/src/Functions/FunctionUnaryArithmetic.h
index e62781cc3a1..389c171bfce 100644
--- a/src/Functions/FunctionUnaryArithmetic.h
+++ b/src/Functions/FunctionUnaryArithmetic.h
@@ -154,7 +154,7 @@ public:
         return result;
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         ColumnPtr result_column;
         bool valid = castType(arguments[0].type.get(), [&](const auto & type)
diff --git a/src/Functions/FunctionUnixTimestamp64.h b/src/Functions/FunctionUnixTimestamp64.h
index 2a5dee7734a..20e225990bd 100644
--- a/src/Functions/FunctionUnixTimestamp64.h
+++ b/src/Functions/FunctionUnixTimestamp64.h
@@ -65,7 +65,7 @@ public:
         }
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         using SourceColumnType = typename SourceDataType::ColumnType;
         using ResultColumnType = typename ResultDataType::ColumnType;
diff --git a/src/Functions/FunctionsAES.h b/src/Functions/FunctionsAES.h
index 68d8b41407d..5a5c5dc05b0 100644
--- a/src/Functions/FunctionsAES.h
+++ b/src/Functions/FunctionsAES.h
@@ -178,7 +178,7 @@ private:
         return std::make_shared<DataTypeString>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         using namespace OpenSSLDetails;
 
@@ -448,7 +448,7 @@ private:
         return std::make_shared<DataTypeString>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         using namespace OpenSSLDetails;
 
diff --git a/src/Functions/FunctionsBitmap.h b/src/Functions/FunctionsBitmap.h
index ec43ae6351f..93da4906658 100644
--- a/src/Functions/FunctionsBitmap.h
+++ b/src/Functions/FunctionsBitmap.h
@@ -122,7 +122,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /* input_rows_count */) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /* input_rows_count */) const override
     {
         const IDataType * from_type = arguments[0].type.get();
         const auto * array_type = typeid_cast<const DataTypeArray *>(from_type);
@@ -146,7 +146,7 @@ public:
 
 private:
     template <typename T>
-    ColumnPtr executeBitmapData(DataTypes & argument_types, ColumnsWithTypeAndName & arguments) const
+    ColumnPtr executeBitmapData(DataTypes & argument_types, const ColumnsWithTypeAndName & arguments) const
     {
         // input data
         const ColumnArray * array = typeid_cast<const ColumnArray *>(arguments[0].column.get());
@@ -207,7 +207,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         // input data
         const auto & return_type = result_type;
@@ -240,7 +240,7 @@ private:
 
     template <typename T>
     void executeIntType(
-            ColumnsWithTypeAndName & arguments, size_t input_rows_count, IColumn & res_data_col, ColumnArray::Offsets & res_offsets)
+            const ColumnsWithTypeAndName & arguments, size_t input_rows_count, IColumn & res_data_col, ColumnArray::Offsets & res_offsets)
         const
     {
         const ColumnAggregateFunction * column
@@ -299,7 +299,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const IDataType * from_type = arguments[0].type.get();
         const DataTypeAggregateFunction * aggr_type = typeid_cast<const DataTypeAggregateFunction *>(from_type);
@@ -321,7 +321,7 @@ private:
     using ToType = UInt64;
 
     template <typename T>
-    ColumnPtr executeIntType(ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
+    ColumnPtr executeIntType(const ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
     {
         const IColumn * column_ptrs[3];
         bool is_column_const[3];
@@ -417,7 +417,7 @@ public:
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
         for (size_t i = 0; i < 2; ++i)
         {
-            auto array_type = typeid_cast<const DataTypeArray *>(arguments[i + 1].get());
+            const auto * array_type = typeid_cast<const DataTypeArray *>(arguments[i + 1].get());
             String msg(i == 0 ? "Second" : "Third");
             msg += " argument for function " + getName() + " must be an UInt32 array but it has type " + arguments[i + 1]->getName() + ".";
             if (!array_type)
@@ -433,7 +433,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const IDataType * from_type = arguments[0].type.get();
         const DataTypeAggregateFunction * aggr_type = typeid_cast<const DataTypeAggregateFunction *>(from_type);
@@ -455,7 +455,7 @@ private:
     using ToType = UInt64;
 
     template <typename T>
-    ColumnPtr executeIntType(ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
+    ColumnPtr executeIntType(const ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
     {
         const IColumn * column_ptrs[3];
         bool is_column_const[3];
@@ -565,7 +565,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         auto col_to = ColumnVector<ToType>::create(input_rows_count);
         typename ColumnVector<ToType>::Container & vec_to = col_to->getData();
@@ -593,7 +593,7 @@ private:
 
     template <typename T>
     void executeIntType(
-            ColumnsWithTypeAndName & arguments, size_t input_rows_count, typename ColumnVector<ToType>::Container & vec_to) const
+            const ColumnsWithTypeAndName & arguments, size_t input_rows_count, typename ColumnVector<ToType>::Container & vec_to) const
     {
         const ColumnAggregateFunction * column
             = typeid_cast<const ColumnAggregateFunction *>(arguments[0].column.get());
@@ -735,7 +735,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         auto col_to = ColumnVector<UInt8>::create(input_rows_count);
         typename ColumnVector<UInt8>::Container & vec_to = col_to->getData();
@@ -761,7 +761,7 @@ public:
 private:
     template <typename T>
     void executeIntType(
-            ColumnsWithTypeAndName & arguments, size_t input_rows_count, typename ColumnVector<UInt8>::Container & vec_to) const
+            const ColumnsWithTypeAndName & arguments, size_t input_rows_count, typename ColumnVector<UInt8>::Container & vec_to) const
     {
         const IColumn * column_ptrs[2];
         bool is_column_const[2];
@@ -832,7 +832,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         auto col_to = ColumnVector<ToType>::create(input_rows_count);
         typename ColumnVector<ToType>::Container & vec_to = col_to->getData();
@@ -858,7 +858,7 @@ public:
 private:
     template <typename T>
     void executeIntType(
-            ColumnsWithTypeAndName & arguments, size_t input_rows_count, typename ColumnVector<ToType>::Container & vec_to) const
+            const ColumnsWithTypeAndName & arguments, size_t input_rows_count, typename ColumnVector<ToType>::Container & vec_to) const
     {
         const ColumnAggregateFunction * column_ptrs[2];
         bool is_column_const[2];
@@ -967,7 +967,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const IDataType * from_type = arguments[0].type.get();
         const DataTypeAggregateFunction * aggr_type = typeid_cast<const DataTypeAggregateFunction *>(from_type);
@@ -987,7 +987,7 @@ public:
 
 private:
     template <typename T>
-    ColumnPtr executeBitmapData(ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
+    ColumnPtr executeBitmapData(const ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
     {
         const ColumnAggregateFunction * column_ptrs[2];
         bool is_column_const[2];
diff --git a/src/Functions/FunctionsCoding.h b/src/Functions/FunctionsCoding.h
index 6ae75318f72..ac3262f5131 100644
--- a/src/Functions/FunctionsCoding.h
+++ b/src/Functions/FunctionsCoding.h
@@ -88,7 +88,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const auto & col_type_name = arguments[0];
         const ColumnPtr & column = col_type_name.column;
@@ -168,7 +168,7 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1, 2}; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const auto & col_type_name = arguments[0];
         const ColumnPtr & column = col_type_name.column;
@@ -277,7 +277,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnPtr & column = arguments[0].column;
 
@@ -339,7 +339,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnPtr & column = arguments[0].column;
 
@@ -407,7 +407,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnPtr & column = arguments[0].column;
 
@@ -460,7 +460,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const auto & col_type_name = arguments[0];
         const ColumnPtr & column = col_type_name.column;
@@ -578,7 +578,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnPtr & column = arguments[0].column;
 
@@ -688,7 +688,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnPtr & column = arguments[0].column;
 
@@ -755,7 +755,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnWithTypeAndName & col_type_name = arguments[0];
         const ColumnPtr & column = col_type_name.column;
@@ -857,7 +857,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnWithTypeAndName & col_type_name = arguments[0];
         const ColumnPtr & column = col_type_name.column;
@@ -1187,7 +1187,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const IColumn * column = arguments[0].column.get();
         ColumnPtr res_column;
@@ -1255,7 +1255,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnPtr & column = arguments[0].column;
 
@@ -1335,7 +1335,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         auto col_str = ColumnString::create();
         ColumnString::Chars & out_vec = col_str->getChars();
@@ -1461,7 +1461,7 @@ public:
         }
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const IColumn * in_column = arguments[0].column.get();
         ColumnPtr out_column;
@@ -1599,7 +1599,7 @@ public:
         }
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const IColumn * column = arguments[0].column.get();
         ColumnPtr res_column;
@@ -1668,7 +1668,7 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
 
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const auto & col_type_name_ip = arguments[0];
         const ColumnPtr & column_ip = col_type_name_ip.column;
@@ -1782,7 +1782,7 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
 
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const auto & col_type_name_ip = arguments[0];
         const ColumnPtr & column_ip = col_type_name_ip.column;
diff --git a/src/Functions/FunctionsComparison.h b/src/Functions/FunctionsComparison.h
index 057f52501e5..e674f8690ff 100644
--- a/src/Functions/FunctionsComparison.h
+++ b/src/Functions/FunctionsComparison.h
@@ -1136,7 +1136,7 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         const auto & col_with_type_and_name_left = arguments[0];
         const auto & col_with_type_and_name_right = arguments[1];
diff --git a/src/Functions/FunctionsConsistentHashing.h b/src/Functions/FunctionsConsistentHashing.h
index edadfd659e2..faf66579fc4 100644
--- a/src/Functions/FunctionsConsistentHashing.h
+++ b/src/Functions/FunctionsConsistentHashing.h
@@ -65,7 +65,7 @@ public:
         return {1};
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         if (isColumnConst(*arguments[1].column))
             return executeConstBuckets(arguments);
@@ -93,7 +93,7 @@ private:
         return static_cast<BucketsType>(buckets);
     }
 
-    ColumnPtr executeConstBuckets(ColumnsWithTypeAndName & arguments) const
+    ColumnPtr executeConstBuckets(const ColumnsWithTypeAndName & arguments) const
     {
         Field buckets_field = (*arguments[1].column)[0];
         BucketsType num_buckets;
diff --git a/src/Functions/FunctionsConversion.h b/src/Functions/FunctionsConversion.h
index 70e8904cfc1..6554c02b36a 100644
--- a/src/Functions/FunctionsConversion.h
+++ b/src/Functions/FunctionsConversion.h
@@ -102,7 +102,7 @@ struct ConvertImpl
 
     template <typename Additions = void *>
     static ColumnPtr NO_SANITIZE_UNDEFINED execute(
-        ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t /*input_rows_count*/,
+        const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t /*input_rows_count*/,
         Additions additions [[maybe_unused]] = Additions())
     {
         const ColumnWithTypeAndName & named_from = arguments[0];
@@ -442,7 +442,7 @@ struct FormatImpl<DataTypeDecimal<FieldType>>
 template <typename FieldType, typename Name>
 struct ConvertImpl<DataTypeEnum<FieldType>, DataTypeNumber<FieldType>, Name>
 {
-    static ColumnPtr execute(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/)
+    static ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/)
     {
         return arguments[0].column;
     }
@@ -455,7 +455,7 @@ struct ConvertImpl<FromDataType, std::enable_if_t<!std::is_same_v<FromDataType,
     using FromFieldType = typename FromDataType::FieldType;
     using ColVecType = std::conditional_t<IsDecimalNumber<FromFieldType>, ColumnDecimal<FromFieldType>, ColumnVector<FromFieldType>>;
 
-    static ColumnPtr execute(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/)
+    static ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/)
     {
         const auto & col_with_type_and_name = arguments[0];
         const auto & type = static_cast<const FromDataType &>(*col_with_type_and_name.type);
@@ -509,7 +509,7 @@ struct ConvertImpl<FromDataType, std::enable_if_t<!std::is_same_v<FromDataType,
 /// Generic conversion of any type to String.
 struct ConvertImplGenericToString
 {
-    static ColumnPtr execute(ColumnsWithTypeAndName & arguments)
+    static ColumnPtr execute(const ColumnsWithTypeAndName & arguments)
     {
         const auto & col_with_type_and_name = arguments[0];
         const IDataType & type = *col_with_type_and_name.type;
@@ -682,7 +682,7 @@ struct ConvertThroughParsing
     }
 
     template <typename Additions = void *>
-    static ColumnPtr execute(ColumnsWithTypeAndName & arguments, const DataTypePtr & res_type, size_t input_rows_count,
+    static ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & res_type, size_t input_rows_count,
                         Additions additions [[maybe_unused]] = Additions())
     {
         using ColVecTo = typename ToDataType::ColumnType;
@@ -932,7 +932,7 @@ struct ConvertImpl<DataTypeString, DataTypeUInt32, NameToUnixTimestamp>
 template <typename T, typename Name>
 struct ConvertImpl<std::enable_if_t<!T::is_parametric, T>, T, Name>
 {
-    static ColumnPtr execute(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/)
+    static ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/)
     {
         return arguments[0].column;
     }
@@ -945,7 +945,7 @@ struct ConvertImpl<std::enable_if_t<!T::is_parametric, T>, T, Name>
 template <typename Name>
 struct ConvertImpl<DataTypeFixedString, DataTypeString, Name>
 {
-    static ColumnPtr execute(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/)
+    static ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/)
     {
         if (const ColumnFixedString * col_from = checkAndGetColumn<ColumnFixedString>(arguments[0].column.get()))
         {
@@ -1141,7 +1141,7 @@ public:
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
     bool canBeExecutedOnDefaultArguments() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         try
         {
@@ -1186,7 +1186,7 @@ public:
     }
 
 private:
-    ColumnPtr executeInternal(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
+    ColumnPtr executeInternal(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
     {
         if (arguments.empty())
             throw Exception{"Function " + getName() + " expects at least 1 arguments",
@@ -1406,7 +1406,7 @@ public:
     }
 
     template <typename ConvertToDataType>
-    ColumnPtr executeInternal(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, UInt32 scale = 0) const
+    ColumnPtr executeInternal(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, UInt32 scale = 0) const
     {
         const IDataType * from_type = arguments[0].type.get();
 
@@ -1424,7 +1424,7 @@ public:
         return nullptr;
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         ColumnPtr result_column;
 
@@ -1880,7 +1880,7 @@ public:
     String getName() const override { return name; }
 
 protected:
-    ColumnPtr execute(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) override
+    ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         /// drop second argument, pass others
         ColumnsWithTypeAndName new_arguments{arguments.front()};
diff --git a/src/Functions/FunctionsEmbeddedDictionaries.h b/src/Functions/FunctionsEmbeddedDictionaries.h
index 7c1221601f6..01456365740 100644
--- a/src/Functions/FunctionsEmbeddedDictionaries.h
+++ b/src/Functions/FunctionsEmbeddedDictionaries.h
@@ -183,7 +183,7 @@ public:
 
     bool isDeterministic() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         /// The dictionary key that defines the "point of view".
         std::string dict_key;
@@ -279,7 +279,7 @@ public:
 
     bool isDeterministic() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         /// The dictionary key that defines the "point of view".
         std::string dict_key;
@@ -415,7 +415,7 @@ public:
 
     bool isDeterministic() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         /// The dictionary key that defines the "point of view".
         std::string dict_key;
@@ -620,7 +620,7 @@ public:
 
     bool isDeterministic() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         RegionsNames::Language language = RegionsNames::Language::ru;
 
diff --git a/src/Functions/FunctionsExternalDictionaries.h b/src/Functions/FunctionsExternalDictionaries.h
index 0fae3de1fb2..92a1389d212 100644
--- a/src/Functions/FunctionsExternalDictionaries.h
+++ b/src/Functions/FunctionsExternalDictionaries.h
@@ -163,7 +163,7 @@ private:
 
     bool isDeterministic() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         /** Do not require existence of the dictionary if the function is called for empty columns.
           * This is needed to allow successful query analysis on a server,
@@ -204,7 +204,7 @@ private:
 
     template <typename DictionaryType>
     ColumnPtr executeDispatchSimple(
-            ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
+            const ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
     {
         const auto * dict = typeid_cast<const DictionaryType *>(dict_ptr.get());
         if (!dict)
@@ -227,7 +227,7 @@ private:
 
     template <typename DictionaryType>
     ColumnPtr executeDispatchComplex(
-            ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
+            const ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
     {
         const auto * dict = typeid_cast<const DictionaryType *>(dict_ptr.get());
         if (!dict)
@@ -324,7 +324,7 @@ private:
 
     bool isDeterministic() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    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();
@@ -359,7 +359,7 @@ private:
 
     template <typename DictionaryType>
     ColumnPtr executeDispatch(
-            ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
+            const ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
     {
         const auto * dict = typeid_cast<const DictionaryType *>(dict_ptr.get());
         if (!dict)
@@ -388,7 +388,7 @@ private:
 
     template <typename DictionaryType>
     ColumnPtr executeDispatchComplex(
-            ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
+            const ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
     {
         const auto * dict = typeid_cast<const DictionaryType *>(dict_ptr.get());
         if (!dict)
@@ -423,7 +423,7 @@ private:
 
     template <typename DictionaryType>
     ColumnPtr executeDispatchRange(
-            ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
+            const ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
     {
         const auto * dict = typeid_cast<const DictionaryType *>(dict_ptr.get());
         if (!dict)
@@ -502,7 +502,7 @@ private:
 
     bool isDeterministic() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    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();
@@ -621,7 +621,7 @@ private:
 
     template <typename DictionaryType>
     ColumnPtr executeDispatchComplex(
-            ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
+            const ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
     {
         const auto * dict = typeid_cast<const DictionaryType *>(dict_ptr.get());
         if (!dict)
@@ -839,7 +839,7 @@ private:
 
     bool isDeterministic() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    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();
@@ -873,7 +873,7 @@ private:
     }
 
     template <typename DictionaryType>
-    ColumnPtr executeDispatch(ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
+    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)
@@ -926,7 +926,7 @@ private:
 
     template <typename DictionaryType>
     ColumnPtr executeDispatchComplex(
-            ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
+            const ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
     {
         const auto * dict = typeid_cast<const DictionaryType *>(dict_ptr.get());
         if (!dict)
@@ -967,7 +967,7 @@ private:
 
     template <typename DictionaryType>
     ColumnPtr executeDispatchRange(
-            ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
+            const ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
     {
         const auto * dict = typeid_cast<const DictionaryType *>(dict_ptr.get());
         if (!dict)
@@ -1094,7 +1094,7 @@ private:
 
     bool isDeterministic() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    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();
@@ -1127,7 +1127,7 @@ private:
     }
 
     template <typename DictionaryType>
-    ColumnPtr executeDispatch(ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
+    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)
@@ -1150,7 +1150,7 @@ private:
 
     template <typename DictionaryType>
     ColumnPtr executeDispatch(
-            ColumnsWithTypeAndName & arguments, const DictionaryType * dict,
+            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();
@@ -1189,7 +1189,7 @@ private:
 
     template <typename DictionaryType>
     ColumnPtr executeDispatch(
-            ColumnsWithTypeAndName & arguments, const DictionaryType * dict,
+            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();
@@ -1246,7 +1246,7 @@ private:
 
     template <typename DictionaryType>
     ColumnPtr executeDispatchComplex(
-            ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
+            const ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
     {
         const auto * dict = typeid_cast<const DictionaryType *>(dict_ptr.get());
         if (!dict)
@@ -1472,7 +1472,7 @@ private:
 
     bool isDeterministic() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    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);
     }
@@ -1613,7 +1613,7 @@ private:
 
     bool isDeterministic() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    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);
     }
@@ -1661,7 +1661,7 @@ private:
 
     bool isDeterministic() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    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();
@@ -1679,7 +1679,7 @@ private:
     }
 
     template <typename DictionaryType>
-    ColumnPtr executeDispatch(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, 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)
@@ -1814,7 +1814,7 @@ private:
 
     bool isDeterministic() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    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();
@@ -1832,7 +1832,7 @@ private:
     }
 
     template <typename DictionaryType>
-    ColumnPtr executeDispatch(ColumnsWithTypeAndName & arguments, const std::shared_ptr<const IDictionaryBase> & dict_ptr) const
+    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)
diff --git a/src/Functions/FunctionsExternalModels.cpp b/src/Functions/FunctionsExternalModels.cpp
index 9c1892012e1..ecec9383252 100644
--- a/src/Functions/FunctionsExternalModels.cpp
+++ b/src/Functions/FunctionsExternalModels.cpp
@@ -69,7 +69,7 @@ DataTypePtr FunctionModelEvaluate::getReturnTypeImpl(const ColumnsWithTypeAndNam
     return type;
 }
 
-ColumnPtr FunctionModelEvaluate::executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const
+ColumnPtr FunctionModelEvaluate::executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const
 {
     const auto * name_col = checkAndGetColumnConst<ColumnString>(arguments[0].column.get());
     if (!name_col)
@@ -85,7 +85,7 @@ ColumnPtr FunctionModelEvaluate::executeImpl(ColumnsWithTypeAndName & arguments,
     column_ptrs.reserve(arguments.size());
     for (auto arg : ext::range(1, arguments.size()))
     {
-        auto & column = arguments[arg].column;
+        const auto & column = arguments[arg].column;
         column_ptrs.push_back(column.get());
         if (auto full_column = column->convertToFullColumnIfConst())
         {
diff --git a/src/Functions/FunctionsExternalModels.h b/src/Functions/FunctionsExternalModels.h
index 336dc164248..9bb6cc5a77c 100644
--- a/src/Functions/FunctionsExternalModels.h
+++ b/src/Functions/FunctionsExternalModels.h
@@ -32,7 +32,7 @@ public:
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override;
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override;
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override;
 
 private:
     const ExternalModelsLoader & models_loader;
diff --git a/src/Functions/FunctionsHashing.h b/src/Functions/FunctionsHashing.h
index 17165e12e37..fca27fe2f14 100644
--- a/src/Functions/FunctionsHashing.h
+++ b/src/Functions/FunctionsHashing.h
@@ -555,7 +555,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         if (const ColumnString * col_from = checkAndGetColumn<ColumnString>(arguments[0].column.get()))
         {
@@ -616,7 +616,7 @@ private:
     using ToType = typename Impl::ReturnType;
 
     template <typename FromType>
-    ColumnPtr executeType(ColumnsWithTypeAndName & arguments) const
+    ColumnPtr executeType(const ColumnsWithTypeAndName & arguments) const
     {
         using ColVecType = std::conditional_t<IsDecimalNumber<FromType>, ColumnDecimal<FromType>, ColumnVector<FromType>>;
 
@@ -659,7 +659,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const IDataType * from_type = arguments[0].type.get();
         WhichDataType which(from_type);
@@ -713,7 +713,7 @@ public:
     #endif
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
@@ -1065,7 +1065,7 @@ public:
         return std::make_shared<DataTypeNumber<ToType>>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         size_t rows = input_rows_count;
         auto col_to = ColumnVector<ToType>::create(rows);
@@ -1107,7 +1107,7 @@ public:
     #endif
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
@@ -1230,7 +1230,7 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const auto arg_count = arguments.size();
 
@@ -1243,7 +1243,7 @@ public:
     }
 
 private:
-    ColumnPtr executeSingleArg(ColumnsWithTypeAndName & arguments) const
+    ColumnPtr executeSingleArg(const ColumnsWithTypeAndName & arguments) const
     {
         const auto * col_untyped = arguments.front().column.get();
 
@@ -1273,7 +1273,7 @@ private:
                 " of argument of function " + getName(), ErrorCodes::ILLEGAL_COLUMN};
     }
 
-    ColumnPtr executeTwoArgs(ColumnsWithTypeAndName & arguments) const
+    ColumnPtr executeTwoArgs(const ColumnsWithTypeAndName & arguments) const
     {
         const auto * level_col = arguments.back().column.get();
         if (!isColumnConst(*level_col))
diff --git a/src/Functions/FunctionsJSON.cpp b/src/Functions/FunctionsJSON.cpp
index 7478c1627af..7516600ac85 100644
--- a/src/Functions/FunctionsJSON.cpp
+++ b/src/Functions/FunctionsJSON.cpp
@@ -10,7 +10,7 @@ namespace ErrorCodes
 }
 
 
-std::vector<FunctionJSONHelpers::Move> FunctionJSONHelpers::prepareMoves(const char * function_name, ColumnsWithTypeAndName & columns, size_t first_index_argument, size_t num_index_arguments)
+std::vector<FunctionJSONHelpers::Move> FunctionJSONHelpers::prepareMoves(const char * function_name, const ColumnsWithTypeAndName & columns, size_t first_index_argument, size_t num_index_arguments)
 {
     std::vector<Move> moves;
     moves.reserve(num_index_arguments);
diff --git a/src/Functions/FunctionsJSON.h b/src/Functions/FunctionsJSON.h
index 0fcf1f57f82..aea5829eaef 100644
--- a/src/Functions/FunctionsJSON.h
+++ b/src/Functions/FunctionsJSON.h
@@ -55,7 +55,7 @@ public:
     class Executor
     {
     public:
-        static ColumnPtr run(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count)
+        static ColumnPtr run(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count)
         {
             MutableColumnPtr to{result_type->createColumn()};
             to->reserve(input_rows_count);
@@ -166,7 +166,7 @@ private:
         String key;
     };
 
-    static std::vector<Move> prepareMoves(const char * function_name, ColumnsWithTypeAndName & columns, size_t first_index_argument, size_t num_index_arguments);
+    static std::vector<Move> prepareMoves(const char * function_name, const ColumnsWithTypeAndName & columns, size_t first_index_argument, size_t num_index_arguments);
 
     /// Performs moves of types MoveType::Index and MoveType::ConstIndex.
     template <typename JSONParser>
@@ -286,7 +286,7 @@ public:
         return Impl<DummyJSONParser>::getReturnType(Name::name, arguments);
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         /// Choose JSONParser.
 #if USE_SIMDJSON
diff --git a/src/Functions/FunctionsLogical.cpp b/src/Functions/FunctionsLogical.cpp
index 3e19516daaa..ab8e1cfc0b2 100644
--- a/src/Functions/FunctionsLogical.cpp
+++ b/src/Functions/FunctionsLogical.cpp
@@ -509,7 +509,7 @@ DataTypePtr FunctionAnyArityLogical<Impl, Name>::getReturnTypeImpl(const DataTyp
 
 template <typename Impl, typename Name>
 ColumnPtr FunctionAnyArityLogical<Impl, Name>::executeImpl(
-    ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
+    const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
 {
     ColumnRawPtrs args_in;
     for (const auto & arg_index : arguments)
@@ -550,7 +550,7 @@ DataTypePtr FunctionUnaryLogical<Impl, Name>::getReturnTypeImpl(const DataTypes
 }
 
 template <template <typename> class Impl, typename T>
-ColumnPtr functionUnaryExecuteType(ColumnsWithTypeAndName & arguments)
+ColumnPtr functionUnaryExecuteType(const ColumnsWithTypeAndName & arguments)
 {
     if (auto col = checkAndGetColumn<ColumnVector<T>>(arguments[0].column.get()))
     {
@@ -567,7 +567,7 @@ ColumnPtr functionUnaryExecuteType(ColumnsWithTypeAndName & arguments)
 }
 
 template <template <typename> class Impl, typename Name>
-ColumnPtr FunctionUnaryLogical<Impl, Name>::executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const
+ColumnPtr FunctionUnaryLogical<Impl, Name>::executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const
 {
     ColumnPtr res;
     if (!((res = functionUnaryExecuteType<Impl, UInt8>(arguments))
diff --git a/src/Functions/FunctionsLogical.h b/src/Functions/FunctionsLogical.h
index 48ed0337ca9..a5579ebdf8a 100644
--- a/src/Functions/FunctionsLogical.h
+++ b/src/Functions/FunctionsLogical.h
@@ -154,7 +154,7 @@ public:
     /// Get result types by argument types. If the function does not apply to these arguments, throw an exception.
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override;
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override;
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override;
 
 #if USE_EMBEDDED_COMPILER
     bool isCompilableImpl(const DataTypes &) const override { return useDefaultImplementationForNulls(); }
@@ -217,7 +217,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override;
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override;
 
 #if USE_EMBEDDED_COMPILER
     bool isCompilableImpl(const DataTypes &) const override { return true; }
diff --git a/src/Functions/FunctionsMiscellaneous.h b/src/Functions/FunctionsMiscellaneous.h
index ce8a827b4cd..b3349b3c46e 100644
--- a/src/Functions/FunctionsMiscellaneous.h
+++ b/src/Functions/FunctionsMiscellaneous.h
@@ -35,7 +35,7 @@ public:
 
     String getName() const override { return "FunctionExpression"; }
 
-    ColumnPtr execute(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) override
+    ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         DB::Block expr_columns;
         for (size_t i = 0; i < arguments.size(); ++i)
@@ -119,7 +119,7 @@ public:
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
 
-    ColumnPtr execute(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) override
+    ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         Names names;
         DataTypes types;
diff --git a/src/Functions/FunctionsMultiStringFuzzySearch.h b/src/Functions/FunctionsMultiStringFuzzySearch.h
index 5b4c3edf3cc..551c6e97495 100644
--- a/src/Functions/FunctionsMultiStringFuzzySearch.h
+++ b/src/Functions/FunctionsMultiStringFuzzySearch.h
@@ -66,7 +66,7 @@ public:
         return Impl::getReturnType();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         using ResultType = typename Impl::ResultType;
 
diff --git a/src/Functions/FunctionsMultiStringPosition.h b/src/Functions/FunctionsMultiStringPosition.h
index 51369717d9e..2c0f2ae8f7b 100644
--- a/src/Functions/FunctionsMultiStringPosition.h
+++ b/src/Functions/FunctionsMultiStringPosition.h
@@ -73,7 +73,7 @@ public:
         return std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>());
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         using ResultType = typename Impl::ResultType;
 
diff --git a/src/Functions/FunctionsMultiStringSearch.h b/src/Functions/FunctionsMultiStringSearch.h
index 09491193f89..f1185c2d850 100644
--- a/src/Functions/FunctionsMultiStringSearch.h
+++ b/src/Functions/FunctionsMultiStringSearch.h
@@ -75,7 +75,7 @@ public:
         return Impl::getReturnType();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         using ResultType = typename Impl::ResultType;
 
diff --git a/src/Functions/FunctionsRandom.h b/src/Functions/FunctionsRandom.h
index dbe3ecd8027..f7b0ac8c2e0 100644
--- a/src/Functions/FunctionsRandom.h
+++ b/src/Functions/FunctionsRandom.h
@@ -74,7 +74,7 @@ public:
         return std::make_shared<DataTypeNumber<ToType>>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         auto col_to = ColumnVector<ToType>::create();
         typename ColumnVector<ToType>::Container & vec_to = col_to->getData();
@@ -102,7 +102,7 @@ public:
     #endif
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
diff --git a/src/Functions/FunctionsRound.h b/src/Functions/FunctionsRound.h
index 542463255d3..f942b894052 100644
--- a/src/Functions/FunctionsRound.h
+++ b/src/Functions/FunctionsRound.h
@@ -548,7 +548,7 @@ public:
         return arguments[0];
     }
 
-    static Scale getScaleArg(ColumnsWithTypeAndName & arguments)
+    static Scale getScaleArg(const ColumnsWithTypeAndName & arguments)
     {
         if (arguments.size() == 2)
         {
@@ -574,7 +574,7 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnWithTypeAndName & column = arguments[0];
         Scale scale_arg = getScaleArg(arguments);
@@ -656,7 +656,7 @@ public:
         return getLeastSupertype({type_x, type_arr_nested});
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t) const override
     {
         auto in_column = arguments[0].column;
         const auto & in_type = arguments[0].type;
diff --git a/src/Functions/FunctionsStringArray.h b/src/Functions/FunctionsStringArray.h
index 8e668381da1..6d1b8723653 100644
--- a/src/Functions/FunctionsStringArray.h
+++ b/src/Functions/FunctionsStringArray.h
@@ -75,7 +75,7 @@ public:
     }
 
     /// Initialize by the function arguments.
-    void init(ColumnsWithTypeAndName & /*arguments*/) {}
+    void init(const ColumnsWithTypeAndName & /*arguments*/) {}
 
     /// Called for each next string.
     void set(Pos pos_, Pos end_)
@@ -136,7 +136,7 @@ public:
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
     }
 
-    void init(ColumnsWithTypeAndName & arguments)
+    void init(const ColumnsWithTypeAndName & arguments)
     {
         const ColumnConst * col = checkAndGetColumnConstStringOrFixedString(arguments[0].column.get());
 
@@ -204,7 +204,7 @@ public:
         SplitByCharImpl::checkArguments(arguments);
     }
 
-    void init(ColumnsWithTypeAndName & arguments)
+    void init(const ColumnsWithTypeAndName & arguments)
     {
         const ColumnConst * col = checkAndGetColumnConstStringOrFixedString(arguments[0].column.get());
 
@@ -284,7 +284,7 @@ public:
     }
 
     /// Initialize by the function arguments.
-    void init(ColumnsWithTypeAndName & arguments)
+    void init(const ColumnsWithTypeAndName & arguments)
     {
         const ColumnConst * col = checkAndGetColumnConstStringOrFixedString(arguments[1].column.get());
 
@@ -361,7 +361,7 @@ public:
         return std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>());
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
     {
         Generator generator;
         generator.init(arguments);
@@ -536,7 +536,7 @@ public:
         return std::make_shared<DataTypeString>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
     {
         String delimiter;
         if (arguments.size() == 2)
diff --git a/src/Functions/FunctionsStringSearch.h b/src/Functions/FunctionsStringSearch.h
index 3dec1e94bfb..a649c43b5a4 100644
--- a/src/Functions/FunctionsStringSearch.h
+++ b/src/Functions/FunctionsStringSearch.h
@@ -97,7 +97,7 @@ public:
         return std::make_shared<DataTypeNumber<typename Impl::ResultType>>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
     {
         using ResultType = typename Impl::ResultType;
 
diff --git a/src/Functions/FunctionsStringSearchToString.h b/src/Functions/FunctionsStringSearchToString.h
index a8f9bda88ae..3b910ae51af 100644
--- a/src/Functions/FunctionsStringSearchToString.h
+++ b/src/Functions/FunctionsStringSearchToString.h
@@ -58,7 +58,7 @@ public:
         return std::make_shared<DataTypeString>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnPtr column = arguments[0].column;
         const ColumnPtr column_needle = arguments[1].column;
diff --git a/src/Functions/FunctionsStringSimilarity.h b/src/Functions/FunctionsStringSimilarity.h
index 54749f46c92..ba725fbd598 100644
--- a/src/Functions/FunctionsStringSimilarity.h
+++ b/src/Functions/FunctionsStringSimilarity.h
@@ -51,7 +51,7 @@ public:
         return std::make_shared<DataTypeNumber<typename Impl::ResultType>>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
     {
         using ResultType = typename Impl::ResultType;
 
diff --git a/src/Functions/IFunction.cpp b/src/Functions/IFunction.cpp
index 00e7b8a7c03..0a953a5419d 100644
--- a/src/Functions/IFunction.cpp
+++ b/src/Functions/IFunction.cpp
@@ -197,7 +197,7 @@ bool allArgumentsAreConstants(const ColumnsWithTypeAndName & args)
 }
 
 ColumnPtr ExecutableFunctionAdaptor::defaultImplementationForConstantArguments(
-    ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run)
+    const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const
 {
     ColumnNumbers arguments_to_remain_constants = impl->getArgumentsThatAreAlwaysConstant();
 
@@ -247,7 +247,8 @@ ColumnPtr ExecutableFunctionAdaptor::defaultImplementationForConstantArguments(
 }
 
 
-ColumnPtr ExecutableFunctionAdaptor::defaultImplementationForNulls(ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run)
+ColumnPtr ExecutableFunctionAdaptor::defaultImplementationForNulls(
+    const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const
 {
     if (args.empty() || !impl->useDefaultImplementationForNulls())
         return nullptr;
@@ -276,7 +277,7 @@ ColumnPtr ExecutableFunctionAdaptor::defaultImplementationForNulls(ColumnsWithTy
 }
 
 ColumnPtr ExecutableFunctionAdaptor::executeWithoutLowCardinalityColumns(
-    ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run)
+    const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const
 {
     if (auto res = defaultImplementationForConstantArguments(args, result_type, input_rows_count, dry_run))
         return res;
@@ -377,7 +378,7 @@ static void convertLowCardinalityColumnsToFull(ColumnsWithTypeAndName & args)
     }
 }
 
-ColumnPtr ExecutableFunctionAdaptor::execute(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run)
+ColumnPtr ExecutableFunctionAdaptor::execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const
 {
     if (impl->useDefaultImplementationForLowCardinalityColumns())
     {
diff --git a/src/Functions/IFunction.h b/src/Functions/IFunction.h
index f86e4f746d1..e94449335fb 100644
--- a/src/Functions/IFunction.h
+++ b/src/Functions/IFunction.h
@@ -46,7 +46,7 @@ public:
     /// Get the main function name.
     virtual String getName() const = 0;
 
-    virtual ColumnPtr execute(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) = 0;
+    virtual ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const = 0;
 
     virtual void createLowCardinalityResultCache(size_t cache_size) = 0;
 };
@@ -73,8 +73,7 @@ public:
     /// sample_columns should contain data types of arguments and values of constants, if relevant.
     virtual ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName & arguments) const = 0;
 
-    /// TODO: make const
-    virtual ColumnPtr execute(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run = false)
+    virtual ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run = false) const
     {
         return prepare(arguments)->execute(arguments, result_type, input_rows_count, dry_run);
     }
diff --git a/src/Functions/IFunctionAdaptors.h b/src/Functions/IFunctionAdaptors.h
index 521b7c6ef84..737d904f6c9 100644
--- a/src/Functions/IFunctionAdaptors.h
+++ b/src/Functions/IFunctionAdaptors.h
@@ -14,7 +14,7 @@ public:
 
     String getName() const final { return impl->getName(); }
 
-    ColumnPtr execute(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) final;
+    ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const final;
 
     void createLowCardinalityResultCache(size_t cache_size) override;
 
@@ -25,13 +25,13 @@ private:
     ExecutableFunctionLowCardinalityResultCachePtr low_cardinality_result_cache;
 
     ColumnPtr defaultImplementationForConstantArguments(
-            ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run);
+            const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const;
 
     ColumnPtr defaultImplementationForNulls(
-            ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run);
+            const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const;
 
     ColumnPtr executeWithoutLowCardinalityColumns(
-            ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run);
+            const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const;
 };
 
 class FunctionBaseAdaptor final : public IFunctionBase
@@ -147,11 +147,11 @@ public:
     String getName() const override { return function->getName(); }
 
 protected:
-    ColumnPtr execute(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) final
+    ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const final
     {
         return function->executeImpl(arguments, result_type, input_rows_count);
     }
-    ColumnPtr executeDryRun(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) final
+    ColumnPtr executeDryRun(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const final
     {
         return function->executeImplDryRun(arguments, result_type, input_rows_count);
     }
diff --git a/src/Functions/IFunctionImpl.h b/src/Functions/IFunctionImpl.h
index 0c4684143ae..a9ec6926c63 100644
--- a/src/Functions/IFunctionImpl.h
+++ b/src/Functions/IFunctionImpl.h
@@ -35,8 +35,8 @@ public:
 
     virtual String getName() const = 0;
 
-    virtual ColumnPtr execute(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) = 0;
-    virtual ColumnPtr executeDryRun(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count)
+    virtual ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const = 0;
+    virtual ColumnPtr executeDryRun(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
     {
         return execute(arguments, result_type, input_rows_count);
     }
@@ -197,8 +197,8 @@ public:
 
     virtual String getName() const = 0;
 
-    virtual ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const = 0;
-    virtual ColumnPtr executeImplDryRun(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
+    virtual ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const = 0;
+    virtual ColumnPtr executeImplDryRun(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
     {
         return executeImpl(arguments, result_type, input_rows_count);
     }
diff --git a/src/Functions/LeastGreatestGeneric.h b/src/Functions/LeastGreatestGeneric.h
index 077a22db061..b13286daded 100644
--- a/src/Functions/LeastGreatestGeneric.h
+++ b/src/Functions/LeastGreatestGeneric.h
@@ -46,7 +46,7 @@ private:
         return getLeastSupertype(types);
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         size_t num_arguments = arguments.size();
         if (1 == num_arguments)
diff --git a/src/Functions/PerformanceAdaptors.h b/src/Functions/PerformanceAdaptors.h
index e75c35a236f..5d4d013691c 100644
--- a/src/Functions/PerformanceAdaptors.h
+++ b/src/Functions/PerformanceAdaptors.h
@@ -204,7 +204,7 @@ public:
      * If FunctionInterface is IFunction, then "executeImpl" method of the implementation will be called
      * and "execute" otherwise.
      */
-    ColumnPtr selectAndExecute(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
+    ColumnPtr selectAndExecute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
     {
         if (implementations.empty())
             throw Exception("There are no available implementations for function " "TODO(dakovalkov): add name",
diff --git a/src/Functions/URL/URLHierarchy.cpp b/src/Functions/URL/URLHierarchy.cpp
index df7a9a0ae53..58d66d8a49d 100644
--- a/src/Functions/URL/URLHierarchy.cpp
+++ b/src/Functions/URL/URLHierarchy.cpp
@@ -29,7 +29,7 @@ public:
             ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
     }
 
-    void init(ColumnsWithTypeAndName & /*arguments*/) {}
+    void init(const ColumnsWithTypeAndName & /*arguments*/) {}
 
     /// Returns the position of the argument that is the column of rows
     static size_t getStringsArgumentPosition()
diff --git a/src/Functions/URL/URLPathHierarchy.cpp b/src/Functions/URL/URLPathHierarchy.cpp
index 2b75ebdf3df..e801f920881 100644
--- a/src/Functions/URL/URLPathHierarchy.cpp
+++ b/src/Functions/URL/URLPathHierarchy.cpp
@@ -28,7 +28,7 @@ public:
             ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
     }
 
-    void init(ColumnsWithTypeAndName & /*arguments*/) {}
+    void init(const ColumnsWithTypeAndName & /*arguments*/) {}
 
     /// Returns the position of the argument that is the column of rows
     static size_t getStringsArgumentPosition()
diff --git a/src/Functions/URL/extractURLParameterNames.cpp b/src/Functions/URL/extractURLParameterNames.cpp
index 5136e32fa42..ff0b8c2a035 100644
--- a/src/Functions/URL/extractURLParameterNames.cpp
+++ b/src/Functions/URL/extractURLParameterNames.cpp
@@ -34,7 +34,7 @@ public:
         return 0;
     }
 
-    void init(ColumnsWithTypeAndName & /*arguments*/) {}
+    void init(const ColumnsWithTypeAndName & /*arguments*/) {}
 
     /// Called for each next string.
     void set(Pos pos_, Pos end_)
diff --git a/src/Functions/URL/extractURLParameters.cpp b/src/Functions/URL/extractURLParameters.cpp
index 63cfa48f564..1eb0ae7f735 100644
--- a/src/Functions/URL/extractURLParameters.cpp
+++ b/src/Functions/URL/extractURLParameters.cpp
@@ -28,7 +28,7 @@ public:
             ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
     }
 
-    void init(ColumnsWithTypeAndName & /*arguments*/) {}
+    void init(const ColumnsWithTypeAndName & /*arguments*/) {}
 
     /// Returns the position of the argument that is the column of rows
     static size_t getStringsArgumentPosition()
diff --git a/src/Functions/URL/port.cpp b/src/Functions/URL/port.cpp
index b54420d6861..adc3ffa5001 100644
--- a/src/Functions/URL/port.cpp
+++ b/src/Functions/URL/port.cpp
@@ -48,7 +48,7 @@ struct FunctionPort : public IFunction
     }
 
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
     {
         UInt16 default_port = 0;
         if (arguments.size() == 2)
diff --git a/src/Functions/abtesting.cpp b/src/Functions/abtesting.cpp
index 051b1f6f0ef..30fcfda8b63 100644
--- a/src/Functions/abtesting.cpp
+++ b/src/Functions/abtesting.cpp
@@ -214,7 +214,7 @@ public:
         return true;
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         if (input_rows_count == 0)
             return ColumnString::create();
diff --git a/src/Functions/addressToLine.cpp b/src/Functions/addressToLine.cpp
index 4cf5884b094..0cee8365531 100644
--- a/src/Functions/addressToLine.cpp
+++ b/src/Functions/addressToLine.cpp
@@ -72,7 +72,7 @@ public:
         return true;
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const ColumnPtr & column = arguments[0].column;
         const ColumnUInt64 * column_concrete = checkAndGetColumn<ColumnUInt64>(column.get());
diff --git a/src/Functions/addressToSymbol.cpp b/src/Functions/addressToSymbol.cpp
index a9ffb7263b7..e0c87b7bbb9 100644
--- a/src/Functions/addressToSymbol.cpp
+++ b/src/Functions/addressToSymbol.cpp
@@ -64,7 +64,7 @@ public:
         return true;
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const SymbolIndex & symbol_index = SymbolIndex::instance();
 
diff --git a/src/Functions/appendTrailingCharIfAbsent.cpp b/src/Functions/appendTrailingCharIfAbsent.cpp
index 13502a4ed30..7ba9a870105 100644
--- a/src/Functions/appendTrailingCharIfAbsent.cpp
+++ b/src/Functions/appendTrailingCharIfAbsent.cpp
@@ -55,7 +55,7 @@ private:
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const auto & column = arguments[0].column;
         const auto & column_char = arguments[1].column;
diff --git a/src/Functions/array/FunctionArrayMapped.h b/src/Functions/array/FunctionArrayMapped.h
index d2d7d9e8159..e336a86d994 100644
--- a/src/Functions/array/FunctionArrayMapped.h
+++ b/src/Functions/array/FunctionArrayMapped.h
@@ -135,7 +135,7 @@ public:
         }
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         if (arguments.size() == 1)
         {
diff --git a/src/Functions/array/array.cpp b/src/Functions/array/array.cpp
index f4c728299d0..ef36069015c 100644
--- a/src/Functions/array/array.cpp
+++ b/src/Functions/array/array.cpp
@@ -30,7 +30,7 @@ public:
         return std::make_shared<DataTypeArray>(getLeastSupertype(arguments));
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         size_t num_elements = arguments.size();
 
diff --git a/src/Functions/array/arrayConcat.cpp b/src/Functions/array/arrayConcat.cpp
index 51260e4242f..5ab22dede19 100644
--- a/src/Functions/array/arrayConcat.cpp
+++ b/src/Functions/array/arrayConcat.cpp
@@ -49,7 +49,7 @@ public:
         return getLeastSupertype(arguments);
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         if (result_type->onlyNull())
             return result_type->createColumnConstWithDefaultValue(input_rows_count);
diff --git a/src/Functions/array/arrayDistinct.cpp b/src/Functions/array/arrayDistinct.cpp
index 174b60647d8..e3be840b01f 100644
--- a/src/Functions/array/arrayDistinct.cpp
+++ b/src/Functions/array/arrayDistinct.cpp
@@ -55,7 +55,7 @@ public:
         return std::make_shared<DataTypeArray>(nested_type);
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override;
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override;
 
 private:
     /// Initially allocate a piece of memory for 512 elements. NOTE: This is just a guess.
@@ -85,7 +85,7 @@ private:
 };
 
 
-ColumnPtr FunctionArrayDistinct::executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const
+ColumnPtr FunctionArrayDistinct::executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const
 {
     ColumnPtr array_ptr = arguments[0].column;
     const ColumnArray * array = checkAndGetColumn<ColumnArray>(array_ptr.get());
diff --git a/src/Functions/array/arrayElement.cpp b/src/Functions/array/arrayElement.cpp
index 28df945a267..46a384db449 100644
--- a/src/Functions/array/arrayElement.cpp
+++ b/src/Functions/array/arrayElement.cpp
@@ -46,40 +46,40 @@ public:
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override;
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override;
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override;
 
 private:
-    ColumnPtr perform(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type,
+    ColumnPtr perform(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type,
                       ArrayImpl::NullMapBuilder & builder, size_t input_rows_count) const;
 
     template <typename DataType>
-    static ColumnPtr executeNumberConst(ColumnsWithTypeAndName & arguments, const Field & index, ArrayImpl::NullMapBuilder & builder);
+    static ColumnPtr executeNumberConst(const ColumnsWithTypeAndName & arguments, const Field & index, ArrayImpl::NullMapBuilder & builder);
 
     template <typename IndexType, typename DataType>
-    static ColumnPtr executeNumber(ColumnsWithTypeAndName & arguments, const PaddedPODArray<IndexType> & indices, ArrayImpl::NullMapBuilder & builder);
+    static ColumnPtr executeNumber(const ColumnsWithTypeAndName & arguments, const PaddedPODArray<IndexType> & indices, ArrayImpl::NullMapBuilder & builder);
 
-    static ColumnPtr executeStringConst(ColumnsWithTypeAndName & arguments, const Field & index, ArrayImpl::NullMapBuilder & builder);
+    static ColumnPtr executeStringConst(const ColumnsWithTypeAndName & arguments, const Field & index, ArrayImpl::NullMapBuilder & builder);
 
     template <typename IndexType>
-    static ColumnPtr executeString(ColumnsWithTypeAndName & arguments, const PaddedPODArray<IndexType> & indices, ArrayImpl::NullMapBuilder & builder);
+    static ColumnPtr executeString(const ColumnsWithTypeAndName & arguments, const PaddedPODArray<IndexType> & indices, ArrayImpl::NullMapBuilder & builder);
 
-    static ColumnPtr executeGenericConst(ColumnsWithTypeAndName & arguments, const Field & index, ArrayImpl::NullMapBuilder & builder);
+    static ColumnPtr executeGenericConst(const ColumnsWithTypeAndName & arguments, const Field & index, ArrayImpl::NullMapBuilder & builder);
 
     template <typename IndexType>
-    static ColumnPtr executeGeneric(ColumnsWithTypeAndName & arguments, const PaddedPODArray<IndexType> & indices, ArrayImpl::NullMapBuilder & builder);
+    static ColumnPtr executeGeneric(const ColumnsWithTypeAndName & arguments, const PaddedPODArray<IndexType> & indices, ArrayImpl::NullMapBuilder & builder);
 
     template <typename IndexType>
-    static ColumnPtr executeConst(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type,
+    static ColumnPtr executeConst(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type,
                                   const PaddedPODArray <IndexType> & indices, ArrayImpl::NullMapBuilder & builder,
                                   size_t input_rows_count);
 
     template <typename IndexType>
-    ColumnPtr executeArgument(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type,
+    ColumnPtr executeArgument(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type,
                               ArrayImpl::NullMapBuilder & builder, size_t input_rows_count) const;
 
     /** For a tuple array, the function is evaluated component-wise for each element of the tuple.
       */
-    ColumnPtr executeTuple(ColumnsWithTypeAndName & arguments, size_t input_rows_count) const;
+    ColumnPtr executeTuple(const ColumnsWithTypeAndName & arguments, size_t input_rows_count) const;
 };
 
 
@@ -421,7 +421,7 @@ FunctionPtr FunctionArrayElement::create(const Context &)
 
 template <typename DataType>
 ColumnPtr FunctionArrayElement::executeNumberConst(
-    ColumnsWithTypeAndName & arguments, const Field & index, ArrayImpl::NullMapBuilder & builder)
+    const ColumnsWithTypeAndName & arguments, const Field & index, ArrayImpl::NullMapBuilder & builder)
 {
     const ColumnArray * col_array = checkAndGetColumn<ColumnArray>(arguments[0].column.get());
 
@@ -449,7 +449,7 @@ ColumnPtr FunctionArrayElement::executeNumberConst(
 
 template <typename IndexType, typename DataType>
 ColumnPtr FunctionArrayElement::executeNumber(
-    ColumnsWithTypeAndName & arguments, const PaddedPODArray<IndexType> & indices, ArrayImpl::NullMapBuilder & builder)
+    const ColumnsWithTypeAndName & arguments, const PaddedPODArray<IndexType> & indices, ArrayImpl::NullMapBuilder & builder)
 {
     const ColumnArray * col_array = checkAndGetColumn<ColumnArray>(arguments[0].column.get());
 
@@ -469,7 +469,8 @@ ColumnPtr FunctionArrayElement::executeNumber(
     return col_res;
 }
 
-ColumnPtr FunctionArrayElement::executeStringConst(ColumnsWithTypeAndName & arguments, const Field & index, ArrayImpl::NullMapBuilder & builder)
+ColumnPtr
+FunctionArrayElement::executeStringConst(const ColumnsWithTypeAndName & arguments, const Field & index, ArrayImpl::NullMapBuilder & builder)
 {
     const ColumnArray * col_array = checkAndGetColumn<ColumnArray>(arguments[0].column.get());
 
@@ -508,7 +509,8 @@ ColumnPtr FunctionArrayElement::executeStringConst(ColumnsWithTypeAndName & argu
 }
 
 template <typename IndexType>
-ColumnPtr FunctionArrayElement::executeString(ColumnsWithTypeAndName & arguments, const PaddedPODArray<IndexType> & indices, ArrayImpl::NullMapBuilder & builder)
+ColumnPtr FunctionArrayElement::executeString(
+    const ColumnsWithTypeAndName & arguments, const PaddedPODArray<IndexType> & indices, ArrayImpl::NullMapBuilder & builder)
 {
     const ColumnArray * col_array = checkAndGetColumn<ColumnArray>(arguments[0].column.get());
 
@@ -534,7 +536,8 @@ ColumnPtr FunctionArrayElement::executeString(ColumnsWithTypeAndName & arguments
     return col_res;
 }
 
-ColumnPtr FunctionArrayElement::executeGenericConst(ColumnsWithTypeAndName & arguments, const Field & index, ArrayImpl::NullMapBuilder & builder)
+ColumnPtr FunctionArrayElement::executeGenericConst(
+    const ColumnsWithTypeAndName & arguments, const Field & index, ArrayImpl::NullMapBuilder & builder)
 {
     const ColumnArray * col_array = checkAndGetColumn<ColumnArray>(arguments[0].column.get());
 
@@ -557,7 +560,8 @@ ColumnPtr FunctionArrayElement::executeGenericConst(ColumnsWithTypeAndName & arg
 }
 
 template <typename IndexType>
-ColumnPtr FunctionArrayElement::executeGeneric(ColumnsWithTypeAndName & arguments, const PaddedPODArray<IndexType> & indices, ArrayImpl::NullMapBuilder & builder)
+ColumnPtr FunctionArrayElement::executeGeneric(
+    const ColumnsWithTypeAndName & arguments, const PaddedPODArray<IndexType> & indices, ArrayImpl::NullMapBuilder & builder)
 {
     const ColumnArray * col_array = checkAndGetColumn<ColumnArray>(arguments[0].column.get());
 
@@ -574,7 +578,7 @@ ColumnPtr FunctionArrayElement::executeGeneric(ColumnsWithTypeAndName & argument
 }
 
 template <typename IndexType>
-ColumnPtr FunctionArrayElement::executeConst(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type,
+ColumnPtr FunctionArrayElement::executeConst(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type,
                                         const PaddedPODArray <IndexType> & indices, ArrayImpl::NullMapBuilder & builder,
                                         size_t input_rows_count)
 {
@@ -619,7 +623,7 @@ ColumnPtr FunctionArrayElement::executeConst(ColumnsWithTypeAndName & arguments,
 
 template <typename IndexType>
 ColumnPtr FunctionArrayElement::executeArgument(
-    ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, ArrayImpl::NullMapBuilder & builder, size_t input_rows_count) const
+    const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, ArrayImpl::NullMapBuilder & builder, size_t input_rows_count) const
 {
     auto index = checkAndGetColumn<ColumnVector<IndexType>>(arguments[1].column.get());
 
@@ -651,7 +655,7 @@ ColumnPtr FunctionArrayElement::executeArgument(
     return res;
 }
 
-ColumnPtr FunctionArrayElement::executeTuple(ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
+ColumnPtr FunctionArrayElement::executeTuple(const ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
 {
     const ColumnArray * col_array = typeid_cast<const ColumnArray *>(arguments[0].column.get());
 
@@ -725,7 +729,7 @@ DataTypePtr FunctionArrayElement::getReturnTypeImpl(const DataTypes & arguments)
     return array_type->getNestedType();
 }
 
-ColumnPtr FunctionArrayElement::executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
+ColumnPtr FunctionArrayElement::executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
 {
     /// Check nullability.
     bool is_array_of_nullable = false;
@@ -806,7 +810,7 @@ ColumnPtr FunctionArrayElement::executeImpl(ColumnsWithTypeAndName & arguments,
     }
 }
 
-ColumnPtr FunctionArrayElement::perform(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type,
+ColumnPtr FunctionArrayElement::perform(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type,
                                    ArrayImpl::NullMapBuilder & builder, size_t input_rows_count) const
 {
     ColumnPtr res;
diff --git a/src/Functions/array/arrayEnumerate.cpp b/src/Functions/array/arrayEnumerate.cpp
index 7e05158eff5..82bb25e2129 100644
--- a/src/Functions/array/arrayEnumerate.cpp
+++ b/src/Functions/array/arrayEnumerate.cpp
@@ -45,7 +45,7 @@ public:
         return std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt32>());
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
     {
         if (const ColumnArray * array = checkAndGetColumn<ColumnArray>(arguments[0].column.get()))
         {
diff --git a/src/Functions/array/arrayEnumerateExtended.h b/src/Functions/array/arrayEnumerateExtended.h
index 609b5debbc2..412fe9e7858 100644
--- a/src/Functions/array/arrayEnumerateExtended.h
+++ b/src/Functions/array/arrayEnumerateExtended.h
@@ -56,7 +56,7 @@ public:
         return std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt32>());
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override;
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override;
 
 private:
     /// Initially allocate a piece of memory for 64 elements. NOTE: This is just a guess.
@@ -121,7 +121,7 @@ private:
 
 
 template <typename Derived>
-ColumnPtr FunctionArrayEnumerateExtended<Derived>::executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const
+ColumnPtr FunctionArrayEnumerateExtended<Derived>::executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const
 {
     const ColumnArray::Offsets * offsets = nullptr;
     size_t num_arguments = arguments.size();
diff --git a/src/Functions/array/arrayEnumerateRanked.h b/src/Functions/array/arrayEnumerateRanked.h
index 4b7b39cbac5..a0d865f08fe 100644
--- a/src/Functions/array/arrayEnumerateRanked.h
+++ b/src/Functions/array/arrayEnumerateRanked.h
@@ -116,7 +116,7 @@ public:
         return type;
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override;
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override;
 
 private:
     /// Initially allocate a piece of memory for 64 elements. NOTE: This is just a guess.
@@ -150,7 +150,7 @@ static inline UInt128 ALWAYS_INLINE hash128depths(const std::vector<size_t> & in
 
 template <typename Derived>
 ColumnPtr FunctionArrayEnumerateRankedExtended<Derived>::executeImpl(
-        ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const
+        const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const
 {
     size_t num_arguments = arguments.size();
     ColumnRawPtrs data_columns;
diff --git a/src/Functions/array/arrayFlatten.cpp b/src/Functions/array/arrayFlatten.cpp
index da814e941af..f9330bcd432 100644
--- a/src/Functions/array/arrayFlatten.cpp
+++ b/src/Functions/array/arrayFlatten.cpp
@@ -39,7 +39,7 @@ public:
         return std::make_shared<DataTypeArray>(nested_type);
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         /** We create an array column with array elements as the most deep elements of nested arrays,
           * and construct offsets by selecting elements of most deep offsets by values of ancestor offsets.
diff --git a/src/Functions/array/arrayIndex.h b/src/Functions/array/arrayIndex.h
index db3ef439c35..bc9e0b5608d 100644
--- a/src/Functions/array/arrayIndex.h
+++ b/src/Functions/array/arrayIndex.h
@@ -396,9 +396,9 @@ public:
       * (they are vectors of Fields, which may represent the NULL value),
       * they do not require any preprocessing.
       */
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
     {
-        ColumnPtr& ptr = arguments[0].column;
+        const ColumnPtr & ptr = arguments[0].column;
 
         /**
          * The columns here have two general cases, either being Array(T) or Const(Array(T)).
@@ -578,7 +578,7 @@ private:
 
 #define INTEGRAL_TPL_PACK UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32, Float64
 
-    ColumnPtr executeOnNonNullable(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type) const
+    ColumnPtr executeOnNonNullable(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type) const
     {
         if (const auto* const left_arr = checkAndGetColumn<ColumnArray>(arguments[0].column.get()))
         {
@@ -639,7 +639,7 @@ private:
      * (s1, s1, s2, ...), (s2, s1, s2, ...), (s3, s1, s2, ...)
      */
     template <class ...Integral>
-    static inline ColumnPtr executeIntegral(ColumnsWithTypeAndName & arguments)
+    static inline ColumnPtr executeIntegral(const ColumnsWithTypeAndName & arguments)
     {
         const ColumnArray * const left = checkAndGetColumn<ColumnArray>(arguments[0].column.get());
 
@@ -732,7 +732,7 @@ private:
      *
      * Tips and tricks tried can be found at https://github.com/ClickHouse/ClickHouse/pull/12550 .
      */
-    static ColumnPtr executeLowCardinality(ColumnsWithTypeAndName & arguments)
+    static ColumnPtr executeLowCardinality(const ColumnsWithTypeAndName & arguments)
     {
         const ColumnArray * const col_array = checkAndGetColumn<ColumnArray>(arguments[0].column.get());
 
@@ -874,7 +874,7 @@ private:
 
 #undef INTEGRAL_TPL_PACK
 
-    static ColumnPtr executeString(ColumnsWithTypeAndName & arguments)
+    static ColumnPtr executeString(const ColumnsWithTypeAndName & arguments)
     {
         const ColumnArray * array = checkAndGetColumn<ColumnArray>(arguments[0].column.get());
 
@@ -963,7 +963,7 @@ private:
         return true;
     }
 
-    static ColumnPtr executeConst(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type)
+    static ColumnPtr executeConst(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type)
     {
         const ColumnConst * col_array = checkAndGetColumnConst<ColumnArray>(arguments[0].column.get());
 
@@ -1037,7 +1037,7 @@ private:
         }
     }
 
-    static ColumnPtr executeGeneric(ColumnsWithTypeAndName & arguments)
+    static ColumnPtr executeGeneric(const ColumnsWithTypeAndName & arguments)
     {
         const ColumnArray * col = checkAndGetColumn<ColumnArray>(arguments[0].column.get());
 
diff --git a/src/Functions/array/arrayIntersect.cpp b/src/Functions/array/arrayIntersect.cpp
index cce43cd8e62..1eb3e7ac6c3 100644
--- a/src/Functions/array/arrayIntersect.cpp
+++ b/src/Functions/array/arrayIntersect.cpp
@@ -48,7 +48,7 @@ public:
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override;
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override;
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override;
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
@@ -88,7 +88,7 @@ private:
         ColumnsWithTypeAndName casted;
     };
 
-    static CastArgumentsResult castColumns(ColumnsWithTypeAndName & arguments,
+    static CastArgumentsResult castColumns(const ColumnsWithTypeAndName & arguments,
                                            const DataTypePtr & return_type, const DataTypePtr & return_type_with_nulls);
     UnpackedArrays prepareArrays(const ColumnsWithTypeAndName & columns, ColumnsWithTypeAndName & initial_columns) const;
 
@@ -206,7 +206,7 @@ ColumnPtr FunctionArrayIntersect::castRemoveNullable(const ColumnPtr & column, c
 }
 
 FunctionArrayIntersect::CastArgumentsResult FunctionArrayIntersect::castColumns(
-    ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type, const DataTypePtr & return_type_with_nulls)
+    const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type, const DataTypePtr & return_type_with_nulls)
 {
     size_t num_args = arguments.size();
     ColumnsWithTypeAndName initial_columns(num_args);
@@ -373,7 +373,7 @@ FunctionArrayIntersect::UnpackedArrays FunctionArrayIntersect::prepareArrays(
     return arrays;
 }
 
-ColumnPtr FunctionArrayIntersect::executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
+ColumnPtr FunctionArrayIntersect::executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
 {
     const auto * return_type_array = checkAndGetDataType<DataTypeArray>(result_type.get());
 
diff --git a/src/Functions/array/arrayJoin.cpp b/src/Functions/array/arrayJoin.cpp
index 0faae52ab8d..c4991b0663e 100644
--- a/src/Functions/array/arrayJoin.cpp
+++ b/src/Functions/array/arrayJoin.cpp
@@ -54,7 +54,7 @@ public:
         return arr->getNestedType();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         throw Exception("Function " + getName() + " must not be executed directly.", ErrorCodes::FUNCTION_IS_SPECIAL);
     }
diff --git a/src/Functions/array/arrayPop.h b/src/Functions/array/arrayPop.h
index 41d2a8d5080..f33666afe35 100644
--- a/src/Functions/array/arrayPop.h
+++ b/src/Functions/array/arrayPop.h
@@ -39,7 +39,7 @@ public:
         return arguments[0];
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         const auto & return_type = result_type;
 
diff --git a/src/Functions/array/arrayPush.h b/src/Functions/array/arrayPush.h
index 183fab34460..67356e85284 100644
--- a/src/Functions/array/arrayPush.h
+++ b/src/Functions/array/arrayPush.h
@@ -47,7 +47,7 @@ public:
         return std::make_shared<DataTypeArray>(getLeastSupertype(types));
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type, size_t input_rows_count) const override
     {
         if (return_type->onlyNull())
             return return_type->createColumnConstWithDefaultValue(input_rows_count);
diff --git a/src/Functions/array/arrayReduce.cpp b/src/Functions/array/arrayReduce.cpp
index 416c7bb787b..342a4b18854 100644
--- a/src/Functions/array/arrayReduce.cpp
+++ b/src/Functions/array/arrayReduce.cpp
@@ -49,7 +49,7 @@ public:
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override;
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override;
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override;
 
 private:
     /// lazy initialization in getReturnTypeImpl
@@ -105,7 +105,7 @@ DataTypePtr FunctionArrayReduce::getReturnTypeImpl(const ColumnsWithTypeAndName
 }
 
 
-ColumnPtr FunctionArrayReduce::executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
+ColumnPtr FunctionArrayReduce::executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
 {
     IAggregateFunction & agg_func = *aggregate_function;
     std::unique_ptr<Arena> arena = std::make_unique<Arena>();
diff --git a/src/Functions/array/arrayReduceInRanges.cpp b/src/Functions/array/arrayReduceInRanges.cpp
index afcf62a2a42..9839d2a8fe7 100644
--- a/src/Functions/array/arrayReduceInRanges.cpp
+++ b/src/Functions/array/arrayReduceInRanges.cpp
@@ -52,7 +52,7 @@ public:
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override;
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override;
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override;
 
 private:
     /// lazy initialization in getReturnTypeImpl
@@ -123,7 +123,7 @@ DataTypePtr FunctionArrayReduceInRanges::getReturnTypeImpl(const ColumnsWithType
 }
 
 
-ColumnPtr FunctionArrayReduceInRanges::executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
+ColumnPtr FunctionArrayReduceInRanges::executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
 {
     IAggregateFunction & agg_func = *aggregate_function;
     std::unique_ptr<Arena> arena = std::make_unique<Arena>();
diff --git a/src/Functions/array/arrayResize.cpp b/src/Functions/array/arrayResize.cpp
index 5c48bb84734..0f7f20d7747 100644
--- a/src/Functions/array/arrayResize.cpp
+++ b/src/Functions/array/arrayResize.cpp
@@ -63,7 +63,7 @@ public:
             return std::make_shared<DataTypeArray>(getLeastSupertype({array_type->getNestedType(), arguments[2]}));
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type, size_t input_rows_count) const override
     {
         if (return_type->onlyNull())
             return return_type->createColumnConstWithDefaultValue(input_rows_count);
diff --git a/src/Functions/array/arrayReverse.cpp b/src/Functions/array/arrayReverse.cpp
index a303f2fecad..1eb07c53497 100644
--- a/src/Functions/array/arrayReverse.cpp
+++ b/src/Functions/array/arrayReverse.cpp
@@ -41,7 +41,7 @@ public:
         return arguments[0];
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t) const override;
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t) const override;
 
 private:
     template <typename T>
@@ -53,7 +53,7 @@ private:
 };
 
 
-ColumnPtr FunctionArrayReverse::executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const
+ColumnPtr FunctionArrayReverse::executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const
 {
     const ColumnArray * array = checkAndGetColumn<ColumnArray>(arguments[0].column.get());
     if (!array)
diff --git a/src/Functions/array/arrayScalarProduct.h b/src/Functions/array/arrayScalarProduct.h
index 22580756b14..a74bdf147ba 100644
--- a/src/Functions/array/arrayScalarProduct.h
+++ b/src/Functions/array/arrayScalarProduct.h
@@ -31,7 +31,7 @@ private:
     using ResultColumnType = ColumnVector<typename Method::ResultType>;
 
     template <typename T>
-    ColumnPtr executeNumber(ColumnsWithTypeAndName & arguments) const
+    ColumnPtr executeNumber(const ColumnsWithTypeAndName & arguments) const
     {
         ColumnPtr res;
         if (   (res = executeNumberNumber<T, UInt8>(arguments))
@@ -51,7 +51,7 @@ private:
 
 
     template <typename T, typename U>
-    ColumnPtr executeNumberNumber(ColumnsWithTypeAndName & arguments) const
+    ColumnPtr executeNumberNumber(const ColumnsWithTypeAndName & arguments) const
     {
         ColumnPtr col1 = arguments[0].column->convertToFullColumnIfConst();
         ColumnPtr col2 = arguments[1].column->convertToFullColumnIfConst();
@@ -126,7 +126,7 @@ public:
         return Method::getReturnType(nested_types[0], nested_types[1]);
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /* input_rows_count */) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /* input_rows_count */) const override
     {
         ColumnPtr res;
         if (!((res = executeNumber<UInt8>(arguments))
@@ -139,9 +139,9 @@ public:
             || (res = executeNumber<Int64>(arguments))
             || (res = executeNumber<Float32>(arguments))
             || (res = executeNumber<Float64>(arguments))))
-            throw Exception{"Illegal column " + arguments[0].column->getName() + " of first argument of function "
-                                + getName(),
-                            ErrorCodes::ILLEGAL_COLUMN};
+            throw Exception{
+                "Illegal column " + arguments[0].column->getName() + " of first argument of function " + getName(),
+                ErrorCodes::ILLEGAL_COLUMN};
 
         return res;
     }
diff --git a/src/Functions/array/arraySlice.cpp b/src/Functions/array/arraySlice.cpp
index 814385bcbe7..0044de0e93e 100644
--- a/src/Functions/array/arraySlice.cpp
+++ b/src/Functions/array/arraySlice.cpp
@@ -69,12 +69,12 @@ public:
         return arguments[0];
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type, size_t input_rows_count) const override
     {
         if (return_type->onlyNull())
             return return_type->createColumnConstWithDefaultValue(input_rows_count);
 
-        auto & array_column = arguments[0].column;
+        auto array_column = arguments[0].column;
         const auto & offset_column = arguments[1].column;
         const auto & length_column = arguments.size() > 2 ? arguments[2].column : nullptr;
 
diff --git a/src/Functions/array/arrayUniq.cpp b/src/Functions/array/arrayUniq.cpp
index 39d8efea3b4..70246872f6b 100644
--- a/src/Functions/array/arrayUniq.cpp
+++ b/src/Functions/array/arrayUniq.cpp
@@ -57,7 +57,7 @@ public:
         return std::make_shared<DataTypeUInt32>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override;
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override;
 
 private:
     /// Initially allocate a piece of memory for 512 elements. NOTE: This is just a guess.
@@ -121,7 +121,7 @@ private:
 };
 
 
-ColumnPtr FunctionArrayUniq::executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const
+ColumnPtr FunctionArrayUniq::executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const
 {
     const ColumnArray::Offsets * offsets = nullptr;
     const size_t num_arguments = arguments.size();
diff --git a/src/Functions/array/arrayWithConstant.cpp b/src/Functions/array/arrayWithConstant.cpp
index 03303006842..f9fc0ac3b66 100644
--- a/src/Functions/array/arrayWithConstant.cpp
+++ b/src/Functions/array/arrayWithConstant.cpp
@@ -47,7 +47,7 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
     bool useDefaultImplementationForNulls() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t num_rows) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t num_rows) const override
     {
         const auto * col_num = arguments[0].column.get();
         const auto * col_value = arguments[1].column.get();
diff --git a/src/Functions/array/arrayZip.cpp b/src/Functions/array/arrayZip.cpp
index ab5dd45786c..5a377355710 100644
--- a/src/Functions/array/arrayZip.cpp
+++ b/src/Functions/array/arrayZip.cpp
@@ -55,7 +55,7 @@ public:
         return std::make_shared<DataTypeArray>(std::make_shared<DataTypeTuple>(arguments_types));
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         size_t num_arguments = arguments.size();
 
diff --git a/src/Functions/array/emptyArray.cpp b/src/Functions/array/emptyArray.cpp
index 94b28a971ca..ac227370180 100644
--- a/src/Functions/array/emptyArray.cpp
+++ b/src/Functions/array/emptyArray.cpp
@@ -44,7 +44,7 @@ private:
         return std::make_shared<DataTypeArray>(std::make_shared<DataType>());
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         using UnderlyingColumnType = typename TypeToColumnType<typename DataType::FieldType>::ColumnType;
 
diff --git a/src/Functions/array/emptyArrayToSingle.cpp b/src/Functions/array/emptyArrayToSingle.cpp
index 7b159b38f7f..e3bfe62ac22 100644
--- a/src/Functions/array/emptyArrayToSingle.cpp
+++ b/src/Functions/array/emptyArrayToSingle.cpp
@@ -45,7 +45,7 @@ public:
         return arguments[0];
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override;
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override;
 };
 
 
@@ -53,7 +53,7 @@ namespace
 {
     namespace FunctionEmptyArrayToSingleImpl
     {
-        ColumnPtr executeConst(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count)
+        ColumnPtr executeConst(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count)
         {
             if (const ColumnConst * const_array = checkAndGetColumnConst<ColumnArray>(arguments[0].column.get()))
             {
@@ -367,7 +367,7 @@ namespace
 }
 
 
-ColumnPtr FunctionEmptyArrayToSingle::executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
+ColumnPtr FunctionEmptyArrayToSingle::executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
 {
     if (auto res = FunctionEmptyArrayToSingleImpl::executeConst(arguments, result_type, input_rows_count))
         return res;
diff --git a/src/Functions/array/hasAllAny.h b/src/Functions/array/hasAllAny.h
index ec3d479c6b3..b35c5996652 100644
--- a/src/Functions/array/hasAllAny.h
+++ b/src/Functions/array/hasAllAny.h
@@ -49,7 +49,7 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         size_t rows = input_rows_count;
         size_t num_args = arguments.size();
diff --git a/src/Functions/array/mapOp.cpp b/src/Functions/array/mapOp.cpp
index 1ffb3ad26f6..62662099961 100644
--- a/src/Functions/array/mapOp.cpp
+++ b/src/Functions/array/mapOp.cpp
@@ -226,7 +226,7 @@ private:
 #undef MATCH_EXECUTE
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
     {
         const DataTypeTuple * tup_type = checkAndGetDataType<DataTypeTuple>((arguments[0]).type.get());
         const DataTypeArray * key_array_type = checkAndGetDataType<DataTypeArray>(tup_type->getElements()[0].get());
diff --git a/src/Functions/array/mapPopulateSeries.cpp b/src/Functions/array/mapPopulateSeries.cpp
index e740bbbef4a..46c99dba483 100644
--- a/src/Functions/array/mapPopulateSeries.cpp
+++ b/src/Functions/array/mapPopulateSeries.cpp
@@ -241,7 +241,7 @@ private:
         }
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
     {
         auto col1 = arguments[0];
         auto col2 = arguments[1];
diff --git a/src/Functions/array/range.cpp b/src/Functions/array/range.cpp
index bcf936a7329..1a057458175 100644
--- a/src/Functions/array/range.cpp
+++ b/src/Functions/array/range.cpp
@@ -337,7 +337,7 @@ private:
         return ColumnArray::create(std::move(data_col), std::move(offsets_col));
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         ColumnPtr res;
         if (arguments.size() == 1)
diff --git a/src/Functions/assumeNotNull.cpp b/src/Functions/assumeNotNull.cpp
index 2b4c4ae6159..ab0d50c8c56 100644
--- a/src/Functions/assumeNotNull.cpp
+++ b/src/Functions/assumeNotNull.cpp
@@ -39,7 +39,7 @@ public:
         return removeNullable(arguments[0]);
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
     {
         const ColumnPtr & col = arguments[0].column;
 
diff --git a/src/Functions/bar.cpp b/src/Functions/bar.cpp
index c3c3c8ce8e5..12b22bae80c 100644
--- a/src/Functions/bar.cpp
+++ b/src/Functions/bar.cpp
@@ -67,7 +67,7 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1, 2, 3}; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         Int64 min = extractConstant<Int64>(arguments, 1, "Second"); /// The level at which the line has zero length.
         Int64 max = extractConstant<Int64>(arguments, 2, "Third"); /// The level at which the line has the maximum length.
@@ -106,7 +106,7 @@ public:
 
 private:
     template <typename T>
-    T extractConstant(ColumnsWithTypeAndName & arguments, size_t argument_pos, const char * which_argument) const
+    T extractConstant(const ColumnsWithTypeAndName & arguments, size_t argument_pos, const char * which_argument) const
     {
         const auto & column = *arguments[argument_pos].column;
 
diff --git a/src/Functions/bitmaskToList.cpp b/src/Functions/bitmaskToList.cpp
index 0eb9b36e7eb..ccd163895ff 100644
--- a/src/Functions/bitmaskToList.cpp
+++ b/src/Functions/bitmaskToList.cpp
@@ -52,7 +52,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         ColumnPtr res;
         if (!((res = executeType<UInt8>(arguments))
@@ -91,7 +91,7 @@ private:
     }
 
     template <typename T>
-    ColumnPtr executeType(ColumnsWithTypeAndName & columns) const
+    ColumnPtr executeType(const ColumnsWithTypeAndName & columns) const
     {
         if (const ColumnVector<T> * col_from = checkAndGetColumn<ColumnVector<T>>(columns[0].column.get()))
         {
diff --git a/src/Functions/blockNumber.cpp b/src/Functions/blockNumber.cpp
index ef25bb75c73..512dd9bcf29 100644
--- a/src/Functions/blockNumber.cpp
+++ b/src/Functions/blockNumber.cpp
@@ -51,7 +51,7 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         size_t current_columns_number = columns_number++;
         return ColumnUInt64::create(input_rows_count, current_columns_number);
diff --git a/src/Functions/blockSerializedSize.cpp b/src/Functions/blockSerializedSize.cpp
index 07ae0d17173..9c9b380ffef 100644
--- a/src/Functions/blockSerializedSize.cpp
+++ b/src/Functions/blockSerializedSize.cpp
@@ -30,7 +30,7 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         UInt64 size = 0;
 
diff --git a/src/Functions/blockSize.cpp b/src/Functions/blockSize.cpp
index a117493e07f..f08c0b0d963 100644
--- a/src/Functions/blockSize.cpp
+++ b/src/Functions/blockSize.cpp
@@ -43,7 +43,7 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return ColumnUInt64::create(input_rows_count, input_rows_count);
     }
diff --git a/src/Functions/buildId.cpp b/src/Functions/buildId.cpp
index 75fe2cab076..ffe3da27153 100644
--- a/src/Functions/buildId.cpp
+++ b/src/Functions/buildId.cpp
@@ -38,7 +38,7 @@ public:
         return std::make_shared<DataTypeString>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeString().createColumnConst(input_rows_count, SymbolIndex::instance().getBuildIDHex());
     }
diff --git a/src/Functions/caseWithExpression.cpp b/src/Functions/caseWithExpression.cpp
index 711cea8f460..195eb7e72ae 100644
--- a/src/Functions/caseWithExpression.cpp
+++ b/src/Functions/caseWithExpression.cpp
@@ -45,7 +45,7 @@ public:
         return getLeastSupertype(dst_array_types);
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         if (args.empty())
             throw Exception{"Function " + getName() + " expects at least 1 argument",
diff --git a/src/Functions/coalesce.cpp b/src/Functions/coalesce.cpp
index f237bccb1d9..12521185532 100644
--- a/src/Functions/coalesce.cpp
+++ b/src/Functions/coalesce.cpp
@@ -87,7 +87,7 @@ public:
         return res;
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         /// coalesce(arg0, arg1, ..., argN) is essentially
         /// multiIf(isNotNull(arg0), assumeNotNull(arg0), isNotNull(arg1), assumeNotNull(arg1), ..., argN)
diff --git a/src/Functions/concat.cpp b/src/Functions/concat.cpp
index 2a18c9f9a60..de4d5e9efc4 100644
--- a/src/Functions/concat.cpp
+++ b/src/Functions/concat.cpp
@@ -72,7 +72,7 @@ public:
         return std::make_shared<DataTypeString>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         /// Format function is not proven to be faster for two arguments.
         /// Actually there is overhead of 2 to 5 extra instructions for each string for checking empty strings in FormatImpl.
@@ -87,7 +87,7 @@ public:
 private:
     const Context & context;
 
-    ColumnPtr executeBinary(ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
+    ColumnPtr executeBinary(const ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
     {
         const IColumn * c0 = arguments[0].column.get();
         const IColumn * c1 = arguments[1].column.get();
@@ -114,7 +114,7 @@ private:
         return c_res;
     }
 
-    ColumnPtr executeFormatImpl(ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
+    ColumnPtr executeFormatImpl(const ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
     {
         const size_t num_arguments = arguments.size();
         assert(num_arguments >= 2);
diff --git a/src/Functions/convertCharset.cpp b/src/Functions/convertCharset.cpp
index ac5413b262b..c32bbc358f5 100644
--- a/src/Functions/convertCharset.cpp
+++ b/src/Functions/convertCharset.cpp
@@ -184,7 +184,7 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1, 2}; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnWithTypeAndName & arg_from = arguments[0];
         const ColumnWithTypeAndName & arg_charset_from = arguments[1];
diff --git a/src/Functions/countDigits.cpp b/src/Functions/countDigits.cpp
index 1e5a75e1ea5..4469e11a421 100644
--- a/src/Functions/countDigits.cpp
+++ b/src/Functions/countDigits.cpp
@@ -48,7 +48,7 @@ public:
         return std::make_shared<DataTypeUInt8>(); /// Up to 255 decimal digits.
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const auto & src_column = arguments[0];
         if (!src_column.column)
diff --git a/src/Functions/currentDatabase.cpp b/src/Functions/currentDatabase.cpp
index aff224d5240..17dbc8d98e4 100644
--- a/src/Functions/currentDatabase.cpp
+++ b/src/Functions/currentDatabase.cpp
@@ -41,7 +41,7 @@ public:
 
     bool isDeterministic() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeString().createColumnConst(input_rows_count, db_name);
     }
diff --git a/src/Functions/currentUser.cpp b/src/Functions/currentUser.cpp
index f2ef8affc45..77eb2228d19 100644
--- a/src/Functions/currentUser.cpp
+++ b/src/Functions/currentUser.cpp
@@ -41,7 +41,7 @@ public:
 
     bool isDeterministic() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeString().createColumnConst(input_rows_count, user_name);
     }
diff --git a/src/Functions/dateDiff.cpp b/src/Functions/dateDiff.cpp
index 941fbe04d61..54833eb359f 100644
--- a/src/Functions/dateDiff.cpp
+++ b/src/Functions/dateDiff.cpp
@@ -83,7 +83,7 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0, 3}; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const auto * unit_column = checkAndGetColumnConst<ColumnString>(arguments[0].column.get());
         if (!unit_column)
diff --git a/src/Functions/date_trunc.cpp b/src/Functions/date_trunc.cpp
index 40356de2bda..f55b3b56536 100644
--- a/src/Functions/date_trunc.cpp
+++ b/src/Functions/date_trunc.cpp
@@ -117,7 +117,7 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0, 2}; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         ColumnsWithTypeAndName temp_columns(arguments.size());
         temp_columns[0] = arguments[1];
diff --git a/src/Functions/defaultValueOfArgumentType.cpp b/src/Functions/defaultValueOfArgumentType.cpp
index 191a1554e23..a46715ffaad 100644
--- a/src/Functions/defaultValueOfArgumentType.cpp
+++ b/src/Functions/defaultValueOfArgumentType.cpp
@@ -36,7 +36,7 @@ public:
         return arguments[0];
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const IDataType & type = *arguments[0].type;
         return type.createColumnConst(input_rows_count, type.getDefault());
diff --git a/src/Functions/defaultValueOfTypeName.cpp b/src/Functions/defaultValueOfTypeName.cpp
index c1f45bb45d9..4f6d19bbc53 100644
--- a/src/Functions/defaultValueOfTypeName.cpp
+++ b/src/Functions/defaultValueOfTypeName.cpp
@@ -49,7 +49,7 @@ public:
         return DataTypeFactory::instance().get(col_type_const->getValue<String>());
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         const IDataType & type = *result_type;
         return type.createColumnConst(input_rows_count, type.getDefault());
diff --git a/src/Functions/demange.cpp b/src/Functions/demange.cpp
index 080e9042f2e..d6cddc18f7a 100644
--- a/src/Functions/demange.cpp
+++ b/src/Functions/demange.cpp
@@ -61,7 +61,7 @@ public:
         return true;
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const ColumnPtr & column = arguments[0].column;
         const ColumnString * column_concrete = checkAndGetColumn<ColumnString>(column.get());
diff --git a/src/Functions/dumpColumnStructure.cpp b/src/Functions/dumpColumnStructure.cpp
index 9ba5196e76f..723b76616ed 100644
--- a/src/Functions/dumpColumnStructure.cpp
+++ b/src/Functions/dumpColumnStructure.cpp
@@ -36,7 +36,7 @@ public:
         return std::make_shared<DataTypeString>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const auto & elem = arguments[0];
 
diff --git a/src/Functions/errorCodeToName.cpp b/src/Functions/errorCodeToName.cpp
index 01fd5632288..20e80e457c9 100644
--- a/src/Functions/errorCodeToName.cpp
+++ b/src/Functions/errorCodeToName.cpp
@@ -36,7 +36,7 @@ public:
         return std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>());
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & res_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & res_type, size_t input_rows_count) const override
     {
         const auto & input_column = *arguments[0].column;
         auto col_res = res_type->createColumn();
diff --git a/src/Functions/evalMLMethod.cpp b/src/Functions/evalMLMethod.cpp
index 821fbf3ad20..03d26db4043 100644
--- a/src/Functions/evalMLMethod.cpp
+++ b/src/Functions/evalMLMethod.cpp
@@ -62,7 +62,7 @@ public:
         return type->getReturnTypeToPredict();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         if (arguments.empty())
             throw Exception("Function " + getName() + " requires at least one argument", ErrorCodes::BAD_ARGUMENTS);
diff --git a/src/Functions/extractAllGroups.h b/src/Functions/extractAllGroups.h
index 3f8003a287d..ba14be2a217 100644
--- a/src/Functions/extractAllGroups.h
+++ b/src/Functions/extractAllGroups.h
@@ -70,7 +70,7 @@ public:
         return std::make_shared<DataTypeArray>(std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()));
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         static const auto MAX_GROUPS_COUNT = 128;
 
diff --git a/src/Functions/extractGroups.cpp b/src/Functions/extractGroups.cpp
index eda3d4559cb..3f21be09e88 100644
--- a/src/Functions/extractGroups.cpp
+++ b/src/Functions/extractGroups.cpp
@@ -51,7 +51,7 @@ public:
         return std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>());
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const ColumnPtr column_haystack = arguments[0].column;
         const ColumnPtr column_needle = arguments[1].column;
diff --git a/src/Functions/extractTimeZoneFromFunctionArguments.h b/src/Functions/extractTimeZoneFromFunctionArguments.h
index 5081e5138a9..6323b45f568 100644
--- a/src/Functions/extractTimeZoneFromFunctionArguments.h
+++ b/src/Functions/extractTimeZoneFromFunctionArguments.h
@@ -17,6 +17,6 @@ std::string extractTimeZoneNameFromFunctionArguments(
     const ColumnsWithTypeAndName & arguments, size_t time_zone_arg_num, size_t datetime_arg_num);
 
 const DateLUTImpl & extractTimeZoneFromFunctionArguments(
-    ColumnsWithTypeAndName & arguments, size_t time_zone_arg_num, size_t datetime_arg_num);
+    const ColumnsWithTypeAndName & arguments, size_t time_zone_arg_num, size_t datetime_arg_num);
 
 }
diff --git a/src/Functions/filesystem.cpp b/src/Functions/filesystem.cpp
index 2be23972b9f..879c48dbe67 100644
--- a/src/Functions/filesystem.cpp
+++ b/src/Functions/filesystem.cpp
@@ -50,7 +50,7 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeUInt64().createColumnConst(input_rows_count, static_cast<UInt64>(Impl::get(spaceinfo)));
     }
diff --git a/src/Functions/finalizeAggregation.cpp b/src/Functions/finalizeAggregation.cpp
index 4b9b9d24433..91d80e1d692 100644
--- a/src/Functions/finalizeAggregation.cpp
+++ b/src/Functions/finalizeAggregation.cpp
@@ -54,7 +54,7 @@ public:
         return type->getReturnType();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         auto column = arguments.at(0).column;
         if (!typeid_cast<const ColumnAggregateFunction *>(column.get()))
diff --git a/src/Functions/formatDateTime.cpp b/src/Functions/formatDateTime.cpp
index 6a4ba63d0d9..362390a2cbc 100644
--- a/src/Functions/formatDateTime.cpp
+++ b/src/Functions/formatDateTime.cpp
@@ -340,7 +340,7 @@ public:
         return std::make_shared<DataTypeString>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, [[maybe_unused]] size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, [[maybe_unused]] size_t input_rows_count) const override
     {
         ColumnPtr res;
         if constexpr (support_integer)
@@ -398,7 +398,7 @@ public:
     }
 
     template <typename DataType>
-    ColumnPtr executeType(ColumnsWithTypeAndName & arguments, const DataTypePtr &) const
+    ColumnPtr executeType(const ColumnsWithTypeAndName & arguments, const DataTypePtr &) const
     {
         auto * times = checkAndGetColumn<typename DataType::ColumnType>(arguments[0].column.get());
         if (!times)
diff --git a/src/Functions/formatReadable.h b/src/Functions/formatReadable.h
index 5d89512d3a6..ae70c1afa87 100644
--- a/src/Functions/formatReadable.h
+++ b/src/Functions/formatReadable.h
@@ -49,7 +49,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         ColumnPtr res;
         if (!((res = executeType<UInt8>(arguments))
@@ -71,7 +71,7 @@ public:
 
 private:
     template <typename T>
-    ColumnPtr executeType(ColumnsWithTypeAndName & arguments) const
+    ColumnPtr executeType(const ColumnsWithTypeAndName & arguments) const
     {
         if (const ColumnVector<T> * col_from = checkAndGetColumn<ColumnVector<T>>(arguments[0].column.get()))
         {
diff --git a/src/Functions/formatReadableTimeDelta.cpp b/src/Functions/formatReadableTimeDelta.cpp
index 2b574f672d3..8600e1b1095 100644
--- a/src/Functions/formatReadableTimeDelta.cpp
+++ b/src/Functions/formatReadableTimeDelta.cpp
@@ -89,7 +89,7 @@ public:
         Years
     };
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         StringRef maximum_unit_str;
         if (arguments.size() == 2)
diff --git a/src/Functions/formatRow.cpp b/src/Functions/formatRow.cpp
index 5e233cf4489..e8f82669aae 100644
--- a/src/Functions/formatRow.cpp
+++ b/src/Functions/formatRow.cpp
@@ -47,7 +47,7 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0}; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         auto col_str = ColumnString::create();
         ColumnString::Chars & vec = col_str->getChars();
diff --git a/src/Functions/formatString.cpp b/src/Functions/formatString.cpp
index ca8f6a9b042..c97692bcb10 100644
--- a/src/Functions/formatString.cpp
+++ b/src/Functions/formatString.cpp
@@ -67,7 +67,7 @@ public:
         return std::make_shared<DataTypeString>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const ColumnPtr & c0 = arguments[0].column;
         const ColumnConst * c0_const_string = typeid_cast<const ColumnConst *>(&*c0);
diff --git a/src/Functions/fuzzBits.cpp b/src/Functions/fuzzBits.cpp
index 9094b90da30..70dff438fae 100644
--- a/src/Functions/fuzzBits.cpp
+++ b/src/Functions/fuzzBits.cpp
@@ -78,7 +78,7 @@ public:
     bool isDeterministic() const override { return false; }
     bool isDeterministicInScopeOfQuery() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         auto col_in_untyped = arguments[0].column;
         const double inverse_probability = assert_cast<const ColumnConst &>(*arguments[1].column).getValue<double>();
diff --git a/src/Functions/generateUUIDv4.cpp b/src/Functions/generateUUIDv4.cpp
index 7b80295b9d0..e519f5217b5 100644
--- a/src/Functions/generateUUIDv4.cpp
+++ b/src/Functions/generateUUIDv4.cpp
@@ -30,7 +30,7 @@ public:
 
     bool isDeterministic() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         auto col_res = ColumnVector<UInt128>::create();
         typename ColumnVector<UInt128>::Container & vec_to = col_res->getData();
@@ -70,7 +70,7 @@ public:
     #endif
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
diff --git a/src/Functions/geoToH3.cpp b/src/Functions/geoToH3.cpp
index 257c73daa4c..6518043d15f 100644
--- a/src/Functions/geoToH3.cpp
+++ b/src/Functions/geoToH3.cpp
@@ -63,7 +63,7 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const auto * col_lon = arguments[0].column.get();
         const auto * col_lat = arguments[1].column.get();
diff --git a/src/Functions/geohashDecode.cpp b/src/Functions/geohashDecode.cpp
index 590b6ffddaa..7e73b501bd5 100644
--- a/src/Functions/geohashDecode.cpp
+++ b/src/Functions/geohashDecode.cpp
@@ -75,7 +75,7 @@ public:
         return true;
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const IColumn * encoded = arguments[0].column.get();
         ColumnPtr res_column;
diff --git a/src/Functions/geohashEncode.cpp b/src/Functions/geohashEncode.cpp
index 4a6e17181ad..794e77b4e24 100644
--- a/src/Functions/geohashEncode.cpp
+++ b/src/Functions/geohashEncode.cpp
@@ -100,7 +100,7 @@ public:
 
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const IColumn * longitude = arguments[0].column.get();
         const IColumn * latitude = arguments[1].column.get();
diff --git a/src/Functions/geohashesInBox.cpp b/src/Functions/geohashesInBox.cpp
index 07af764da3e..0e18916053f 100644
--- a/src/Functions/geohashesInBox.cpp
+++ b/src/Functions/geohashesInBox.cpp
@@ -159,7 +159,7 @@ public:
         result = std::move(col_res);
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const IColumn * lon_min = arguments[0].column.get();
         const IColumn * lat_min = arguments[1].column.get();
diff --git a/src/Functions/getMacro.cpp b/src/Functions/getMacro.cpp
index fe833974302..949016d862d 100644
--- a/src/Functions/getMacro.cpp
+++ b/src/Functions/getMacro.cpp
@@ -64,7 +64,7 @@ public:
     /** convertToFullColumn needed because in distributed query processing,
       *    each server returns its own value.
       */
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         const IColumn * arg_column = arguments[0].column.get();
         const ColumnString * arg_string = checkAndGetColumnConstData<ColumnString>(arg_column);
diff --git a/src/Functions/getScalar.cpp b/src/Functions/getScalar.cpp
index a196f5f0434..4803c5a81d5 100644
--- a/src/Functions/getScalar.cpp
+++ b/src/Functions/getScalar.cpp
@@ -51,7 +51,7 @@ public:
         return scalar.type;
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return ColumnConst::create(scalar.column, input_rows_count);
     }
diff --git a/src/Functions/getSetting.cpp b/src/Functions/getSetting.cpp
index 9a96f6ef4e5..5da5f902d8c 100644
--- a/src/Functions/getSetting.cpp
+++ b/src/Functions/getSetting.cpp
@@ -50,7 +50,7 @@ public:
         return type;
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         return result_type->createColumnConst(input_rows_count, value);
     }
diff --git a/src/Functions/getSizeOfEnumType.cpp b/src/Functions/getSizeOfEnumType.cpp
index 34d6067883b..dea56bd3063 100644
--- a/src/Functions/getSizeOfEnumType.cpp
+++ b/src/Functions/getSizeOfEnumType.cpp
@@ -49,7 +49,7 @@ public:
         throw Exception("The argument for function " + getName() + " must be Enum", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         return getResultIfAlwaysReturnsConstantAndHasArguments(arguments)->cloneResized(input_rows_count);
     }
diff --git a/src/Functions/globalVariable.cpp b/src/Functions/globalVariable.cpp
index 8f6bc228465..55561af4d10 100644
--- a/src/Functions/globalVariable.cpp
+++ b/src/Functions/globalVariable.cpp
@@ -58,7 +58,7 @@ public:
             return variable->second.type;
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         const ColumnWithTypeAndName & col = arguments[0];
         String variable_name = assert_cast<const ColumnConst &>(*col.column).getValue<String>();
diff --git a/src/Functions/greatCircleDistance.cpp b/src/Functions/greatCircleDistance.cpp
index 294e39c7276..ee4d89be2ae 100644
--- a/src/Functions/greatCircleDistance.cpp
+++ b/src/Functions/greatCircleDistance.cpp
@@ -255,7 +255,7 @@ private:
         return std::make_shared<DataTypeFloat32>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         auto dst = ColumnVector<Float32>::create();
         auto & dst_data = dst->getData();
@@ -296,7 +296,7 @@ public:
     #endif
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
diff --git a/src/Functions/h3EdgeAngle.cpp b/src/Functions/h3EdgeAngle.cpp
index 7b0b1cdc3a7..58ce5def111 100644
--- a/src/Functions/h3EdgeAngle.cpp
+++ b/src/Functions/h3EdgeAngle.cpp
@@ -50,7 +50,7 @@ public:
         return std::make_shared<DataTypeFloat64>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const auto * col_hindex = arguments[0].column.get();
 
diff --git a/src/Functions/h3EdgeLengthM.cpp b/src/Functions/h3EdgeLengthM.cpp
index d22074ceee0..8f8aebc857e 100644
--- a/src/Functions/h3EdgeLengthM.cpp
+++ b/src/Functions/h3EdgeLengthM.cpp
@@ -55,7 +55,7 @@ public:
         return std::make_shared<DataTypeFloat64>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const auto * col_hindex = arguments[0].column.get();
 
diff --git a/src/Functions/h3GetBaseCell.cpp b/src/Functions/h3GetBaseCell.cpp
index f9bc8bcea20..92d9ee5e3e0 100644
--- a/src/Functions/h3GetBaseCell.cpp
+++ b/src/Functions/h3GetBaseCell.cpp
@@ -47,7 +47,7 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const auto * col_hindex = arguments[0].column.get();
 
diff --git a/src/Functions/h3GetResolution.cpp b/src/Functions/h3GetResolution.cpp
index c73d7ed4f4c..f2676ccbb82 100644
--- a/src/Functions/h3GetResolution.cpp
+++ b/src/Functions/h3GetResolution.cpp
@@ -47,7 +47,7 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const auto * col_hindex = arguments[0].column.get();
 
diff --git a/src/Functions/h3HexAreaM2.cpp b/src/Functions/h3HexAreaM2.cpp
index f1e74591785..c7a16b57465 100644
--- a/src/Functions/h3HexAreaM2.cpp
+++ b/src/Functions/h3HexAreaM2.cpp
@@ -50,7 +50,7 @@ public:
         return std::make_shared<DataTypeFloat64>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const auto * col_hindex = arguments[0].column.get();
 
diff --git a/src/Functions/h3IndexesAreNeighbors.cpp b/src/Functions/h3IndexesAreNeighbors.cpp
index bddaffd96bc..d43fca15012 100644
--- a/src/Functions/h3IndexesAreNeighbors.cpp
+++ b/src/Functions/h3IndexesAreNeighbors.cpp
@@ -53,7 +53,7 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const auto * col_hindex_origin = arguments[0].column.get();
         const auto * col_hindex_dest = arguments[1].column.get();
diff --git a/src/Functions/h3IsValid.cpp b/src/Functions/h3IsValid.cpp
index bd99f57af3e..2918431e3b6 100644
--- a/src/Functions/h3IsValid.cpp
+++ b/src/Functions/h3IsValid.cpp
@@ -47,7 +47,7 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const auto * col_hindex = arguments[0].column.get();
 
diff --git a/src/Functions/h3ToChildren.cpp b/src/Functions/h3ToChildren.cpp
index 8c0d4d23e96..b63d4efc83e 100644
--- a/src/Functions/h3ToChildren.cpp
+++ b/src/Functions/h3ToChildren.cpp
@@ -62,7 +62,7 @@ public:
         return std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>());
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const auto * col_hindex = arguments[0].column.get();
         const auto * col_resolution = arguments[1].column.get();
diff --git a/src/Functions/h3ToParent.cpp b/src/Functions/h3ToParent.cpp
index cbdbbedfcd6..73c1d002df5 100644
--- a/src/Functions/h3ToParent.cpp
+++ b/src/Functions/h3ToParent.cpp
@@ -56,7 +56,7 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const auto * col_hindex = arguments[0].column.get();
         const auto * col_resolution = arguments[1].column.get();
diff --git a/src/Functions/h3ToString.cpp b/src/Functions/h3ToString.cpp
index 01d1b02809a..16d7d14964a 100644
--- a/src/Functions/h3ToString.cpp
+++ b/src/Functions/h3ToString.cpp
@@ -48,7 +48,7 @@ public:
         return std::make_shared<DataTypeString>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const auto * col_hindex = arguments[0].column.get();
 
diff --git a/src/Functions/h3kRing.cpp b/src/Functions/h3kRing.cpp
index 883c20d6324..fd4a8ac57e8 100644
--- a/src/Functions/h3kRing.cpp
+++ b/src/Functions/h3kRing.cpp
@@ -59,7 +59,7 @@ public:
         return std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>());
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const auto * col_hindex = arguments[0].column.get();
         const auto * col_k = arguments[1].column.get();
diff --git a/src/Functions/hasColumnInTable.cpp b/src/Functions/hasColumnInTable.cpp
index bf49c4dff16..d5fe00e025f 100644
--- a/src/Functions/hasColumnInTable.cpp
+++ b/src/Functions/hasColumnInTable.cpp
@@ -56,7 +56,7 @@ public:
 
     bool isDeterministic() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override;
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override;
 
 private:
     const Context & global_context;
@@ -85,9 +85,9 @@ DataTypePtr FunctionHasColumnInTable::getReturnTypeImpl(const ColumnsWithTypeAnd
 }
 
 
-ColumnPtr FunctionHasColumnInTable::executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const
+ColumnPtr FunctionHasColumnInTable::executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const
 {
-    auto get_string_from_columns = [&](ColumnWithTypeAndName & column) -> String
+    auto get_string_from_columns = [&](const ColumnWithTypeAndName & column) -> String
     {
         const ColumnConst * const_column = checkAndGetColumnConst<ColumnString>(column.column.get());
         return const_column->getValue<String>();
diff --git a/src/Functions/hasThreadFuzzer.cpp b/src/Functions/hasThreadFuzzer.cpp
index de237cb027a..545ac0175f2 100644
--- a/src/Functions/hasThreadFuzzer.cpp
+++ b/src/Functions/hasThreadFuzzer.cpp
@@ -36,7 +36,7 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeUInt8().createColumnConst(input_rows_count, ThreadFuzzer::instance().isEffective());
     }
diff --git a/src/Functions/hostName.cpp b/src/Functions/hostName.cpp
index ee3715f51bd..fbc0e92452d 100644
--- a/src/Functions/hostName.cpp
+++ b/src/Functions/hostName.cpp
@@ -45,7 +45,7 @@ public:
     /** convertToFullColumn needed because in distributed query processing,
       *    each server returns its own value.
       */
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         return result_type->createColumnConst(
             input_rows_count, DNSResolver::instance().getHostName())->convertToFullColumnIfConst();
diff --git a/src/Functions/identity.cpp b/src/Functions/identity.cpp
index d939c621b56..ee73ab595a7 100644
--- a/src/Functions/identity.cpp
+++ b/src/Functions/identity.cpp
@@ -31,7 +31,7 @@ public:
         return arguments.front();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         return arguments.front().column;
     }
diff --git a/src/Functions/if.cpp b/src/Functions/if.cpp
index d7afe6db8e0..8b19016f3f7 100644
--- a/src/Functions/if.cpp
+++ b/src/Functions/if.cpp
@@ -177,7 +177,7 @@ public:
 
 private:
     template <typename T0, typename T1>
-    static UInt32 decimalScale(ColumnsWithTypeAndName & arguments [[maybe_unused]])
+    static UInt32 decimalScale(const ColumnsWithTypeAndName & arguments [[maybe_unused]])
     {
         if constexpr (IsDecimalNumber<T0> && IsDecimalNumber<T1>)
         {
@@ -194,7 +194,7 @@ private:
     template <typename T0, typename T1, typename ColVecT0, typename ColVecT1>
     ColumnPtr executeRightType(
             const ColumnUInt8 * cond_col,
-            ColumnsWithTypeAndName & arguments,
+            const ColumnsWithTypeAndName & arguments,
             const ColVecT0 * col_left) const
     {
         using ResultType = typename NumberTraits::ResultOfIf<T0, T1>::Type;
@@ -219,7 +219,7 @@ private:
     template <typename T0, typename T1, typename ColVecT0, typename ColVecT1>
     ColumnPtr executeConstRightType(
             const ColumnUInt8 * cond_col,
-            ColumnsWithTypeAndName & arguments,
+            const ColumnsWithTypeAndName & arguments,
             const ColumnConst * col_left) const
     {
         using ResultType = typename NumberTraits::ResultOfIf<T0, T1>::Type;
@@ -244,7 +244,7 @@ private:
     template <typename T0, typename T1, typename ColVecT0, typename ColVecT1>
     ColumnPtr executeRightTypeArray(
         [[maybe_unused]] const ColumnUInt8 * cond_col,
-        [[maybe_unused]] ColumnsWithTypeAndName & arguments,
+        [[maybe_unused]] const ColumnsWithTypeAndName & arguments,
         [[maybe_unused]] const DataTypePtr result_type,
         [[maybe_unused]] const ColumnArray * col_left_array,
         [[maybe_unused]] size_t input_rows_count) const
@@ -299,7 +299,7 @@ private:
     template <typename T0, typename T1, typename ColVecT0, typename ColVecT1>
     ColumnPtr executeConstRightTypeArray(
         [[maybe_unused]] const ColumnUInt8 * cond_col,
-        [[maybe_unused]] ColumnsWithTypeAndName & arguments,
+        [[maybe_unused]] const ColumnsWithTypeAndName & arguments,
         [[maybe_unused]] const DataTypePtr & result_type,
         [[maybe_unused]] const ColumnConst * col_left_const_array,
         [[maybe_unused]] size_t input_rows_count) const
@@ -353,7 +353,7 @@ private:
     }
 
     template <typename T0, typename T1>
-    ColumnPtr executeTyped(const ColumnUInt8 * cond_col, ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
+    ColumnPtr executeTyped(const ColumnUInt8 * cond_col, const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
     {
         using ColVecT0 = std::conditional_t<IsDecimalNumber<T0>, ColumnDecimal<T0>, ColumnVector<T0>>;
         using ColVecT1 = std::conditional_t<IsDecimalNumber<T1>, ColumnDecimal<T1>, ColumnVector<T1>>;
@@ -395,7 +395,7 @@ private:
         if (!left_ok)
             return nullptr;
 
-        ColumnWithTypeAndName & right_column_typed = arguments[2];
+        const ColumnWithTypeAndName & right_column_typed = arguments[2];
         if (!right_column)
             throw Exception("Illegal column " + right_column_typed.column->getName() + " of third argument of function " + getName(),
                 ErrorCodes::ILLEGAL_COLUMN);
@@ -403,7 +403,7 @@ private:
         return right_column;
     }
 
-    static ColumnPtr executeString(const ColumnUInt8 * cond_col, ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type)
+    static ColumnPtr executeString(const ColumnUInt8 * cond_col, const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type)
     {
         const IColumn * col_then_untyped = arguments[1].column.get();
         const IColumn * col_else_untyped = arguments[2].column.get();
@@ -492,7 +492,7 @@ private:
         return nullptr;
     }
 
-    static ColumnPtr executeGenericArray(const ColumnUInt8 * cond_col, ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type)
+    static ColumnPtr executeGenericArray(const ColumnUInt8 * cond_col, const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type)
     {
         /// For generic implementation, arrays must be of same type.
         if (!arguments[1].type->equals(*arguments[2].type))
@@ -532,7 +532,7 @@ private:
         return nullptr;
     }
 
-    ColumnPtr executeTuple(ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
+    ColumnPtr executeTuple(const ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
     {
         /// Calculate function for each corresponding elements of tuples.
 
@@ -577,7 +577,7 @@ private:
     }
 
     static ColumnPtr executeGeneric(
-        const ColumnUInt8 * cond_col, ColumnsWithTypeAndName & arguments, size_t input_rows_count)
+        const ColumnUInt8 * cond_col, const ColumnsWithTypeAndName & arguments, size_t input_rows_count)
     {
         /// Convert both columns to the common type (if needed).
         const ColumnWithTypeAndName & arg1 = arguments[1];
@@ -642,7 +642,7 @@ private:
         return result_column;
     }
 
-    ColumnPtr executeForConstAndNullableCondition(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const
+    ColumnPtr executeForConstAndNullableCondition(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const
     {
         const ColumnWithTypeAndName & arg_cond = arguments[0];
         bool cond_is_null = arg_cond.column->onlyNull();
@@ -744,7 +744,7 @@ private:
         return column;
     }
 
-    ColumnPtr executeForNullableThenElse(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
+    ColumnPtr executeForNullableThenElse(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
     {
         const ColumnWithTypeAndName & arg_cond = arguments[0];
         const ColumnWithTypeAndName & arg_then = arguments[1];
@@ -808,7 +808,7 @@ private:
             materializeColumnIfConst(result_nested_column), materializeColumnIfConst(result_null_mask));
     }
 
-    ColumnPtr executeForNullThenElse(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
+    ColumnPtr executeForNullThenElse(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
     {
         const ColumnWithTypeAndName & arg_cond = arguments[0];
         const ColumnWithTypeAndName & arg_then = arguments[1];
@@ -923,7 +923,7 @@ public:
         return getLeastSupertype({arguments[1], arguments[2]});
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         ColumnPtr res;
         if (   (res = executeForConstAndNullableCondition(arguments, result_type, input_rows_count))
diff --git a/src/Functions/ifNotFinite.cpp b/src/Functions/ifNotFinite.cpp
index e4feabab3f8..88b23da0126 100644
--- a/src/Functions/ifNotFinite.cpp
+++ b/src/Functions/ifNotFinite.cpp
@@ -41,7 +41,7 @@ public:
         return if_type;
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         ColumnsWithTypeAndName is_finite_columns{arguments[0]};
         auto is_finite = FunctionFactory::instance().get("isFinite", context)->build(is_finite_columns);
diff --git a/src/Functions/ifNull.cpp b/src/Functions/ifNull.cpp
index f69bb86aa9b..af29fa0e1f0 100644
--- a/src/Functions/ifNull.cpp
+++ b/src/Functions/ifNull.cpp
@@ -49,7 +49,7 @@ public:
         return getLeastSupertype({removeNullable(arguments[0]), arguments[1]});
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         /// Always null.
         if (arguments[0].type->onlyNull())
diff --git a/src/Functions/ignore.cpp b/src/Functions/ignore.cpp
index e97c595de63..7f78973907e 100644
--- a/src/Functions/ignore.cpp
+++ b/src/Functions/ignore.cpp
@@ -40,7 +40,7 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeUInt8().createColumnConst(input_rows_count, 0u);
     }
diff --git a/src/Functions/in.cpp b/src/Functions/in.cpp
index 683983dc416..b9a0c81b508 100644
--- a/src/Functions/in.cpp
+++ b/src/Functions/in.cpp
@@ -80,7 +80,7 @@ public:
 
     bool useDefaultImplementationForNulls() const override { return null_is_skipped; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, [[maybe_unused]] size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, [[maybe_unused]] size_t input_rows_count) const override
     {
         if constexpr (ignore_set)
             return ColumnUInt8::create(input_rows_count, 0u);
diff --git a/src/Functions/initializeAggregation.cpp b/src/Functions/initializeAggregation.cpp
index 7d0eab8db26..4b90b7956c5 100644
--- a/src/Functions/initializeAggregation.cpp
+++ b/src/Functions/initializeAggregation.cpp
@@ -41,7 +41,7 @@ public:
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override;
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override;
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override;
 
 private:
     mutable AggregateFunctionPtr aggregate_function;
@@ -87,7 +87,7 @@ DataTypePtr FunctionInitializeAggregation::getReturnTypeImpl(const ColumnsWithTy
 }
 
 
-ColumnPtr FunctionInitializeAggregation::executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
+ColumnPtr FunctionInitializeAggregation::executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
 {
     IAggregateFunction & agg_func = *aggregate_function;
     std::unique_ptr<Arena> arena = std::make_unique<Arena>();
diff --git a/src/Functions/isConstant.cpp b/src/Functions/isConstant.cpp
index b67929ac6f4..09e14226b70 100644
--- a/src/Functions/isConstant.cpp
+++ b/src/Functions/isConstant.cpp
@@ -37,7 +37,7 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const auto & elem = arguments[0];
         return ColumnUInt8::create(input_rows_count, isColumnConst(*elem.column));
diff --git a/src/Functions/isDecimalOverflow.cpp b/src/Functions/isDecimalOverflow.cpp
index 323c9951a96..c4c02e3763e 100644
--- a/src/Functions/isDecimalOverflow.cpp
+++ b/src/Functions/isDecimalOverflow.cpp
@@ -60,7 +60,7 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const auto & src_column = arguments[0];
         if (!src_column.column)
diff --git a/src/Functions/isNotNull.cpp b/src/Functions/isNotNull.cpp
index 5e05c2c1ab0..104547ac485 100644
--- a/src/Functions/isNotNull.cpp
+++ b/src/Functions/isNotNull.cpp
@@ -39,7 +39,7 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const ColumnWithTypeAndName & elem = arguments[0];
         if (const auto * nullable = checkAndGetColumn<ColumnNullable>(*elem.column))
diff --git a/src/Functions/isNull.cpp b/src/Functions/isNull.cpp
index 5947633c2a3..8aee78c1aaa 100644
--- a/src/Functions/isNull.cpp
+++ b/src/Functions/isNull.cpp
@@ -38,7 +38,7 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
     {
         const ColumnWithTypeAndName & elem = arguments[0];
         if (const auto * nullable = checkAndGetColumn<ColumnNullable>(*elem.column))
diff --git a/src/Functions/isZeroOrNull.cpp b/src/Functions/isZeroOrNull.cpp
index 1655027d966..ceaa03dee14 100644
--- a/src/Functions/isZeroOrNull.cpp
+++ b/src/Functions/isZeroOrNull.cpp
@@ -49,7 +49,7 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const ColumnPtr & input_column = arguments[0].column;
 
diff --git a/src/Functions/logTrace.cpp b/src/Functions/logTrace.cpp
index 15485a2a389..6f2719588f2 100644
--- a/src/Functions/logTrace.cpp
+++ b/src/Functions/logTrace.cpp
@@ -36,7 +36,7 @@ namespace
             return std::make_shared<DataTypeUInt8>();
         }
 
-        ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+        ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
         {
             String message;
             if (const ColumnConst * col = checkAndGetColumnConst<ColumnString>(arguments[0].column.get()))
diff --git a/src/Functions/lowCardinalityIndices.cpp b/src/Functions/lowCardinalityIndices.cpp
index a70880c199b..67bee2f0d3f 100644
--- a/src/Functions/lowCardinalityIndices.cpp
+++ b/src/Functions/lowCardinalityIndices.cpp
@@ -41,7 +41,7 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const auto & arg = arguments[0];
         auto indexes_col = typeid_cast<const ColumnLowCardinality *>(arg.column.get())->getIndexesPtr();
diff --git a/src/Functions/lowCardinalityKeys.cpp b/src/Functions/lowCardinalityKeys.cpp
index 234e901c5e0..a7cb6b45550 100644
--- a/src/Functions/lowCardinalityKeys.cpp
+++ b/src/Functions/lowCardinalityKeys.cpp
@@ -39,7 +39,7 @@ public:
         return type->getDictionaryType();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const auto & arg = arguments[0];
         const auto * low_cardinality_column = typeid_cast<const ColumnLowCardinality *>(arg.column.get());
diff --git a/src/Functions/materialize.cpp b/src/Functions/materialize.cpp
index c7e02e615da..9c6ca5ae43c 100644
--- a/src/Functions/materialize.cpp
+++ b/src/Functions/materialize.cpp
@@ -39,7 +39,7 @@ public:
         return arguments[0];
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         return arguments[0].column->convertToFullColumnIfConst();
     }
diff --git a/src/Functions/multiIf.cpp b/src/Functions/multiIf.cpp
index 9caa77abf90..e3eb9fabcbe 100644
--- a/src/Functions/multiIf.cpp
+++ b/src/Functions/multiIf.cpp
@@ -106,7 +106,7 @@ public:
         return getLeastSupertype(types_of_branches);
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         /** We will gather values from columns in branches to result column,
         *  depending on values of conditions.
diff --git a/src/Functions/neighbor.cpp b/src/Functions/neighbor.cpp
index 131fcc3d60a..942d23b31cc 100644
--- a/src/Functions/neighbor.cpp
+++ b/src/Functions/neighbor.cpp
@@ -77,7 +77,7 @@ public:
         return arguments[0];
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         const ColumnWithTypeAndName & source_elem = arguments[0];
         const ColumnWithTypeAndName & offset_elem = arguments[1];
diff --git a/src/Functions/normalizedQueryHash.cpp b/src/Functions/normalizedQueryHash.cpp
index 9285ec1ddf7..a3e9f2a58ed 100644
--- a/src/Functions/normalizedQueryHash.cpp
+++ b/src/Functions/normalizedQueryHash.cpp
@@ -158,7 +158,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnPtr column = arguments[0].column;
         if (const ColumnString * col = checkAndGetColumn<ColumnString>(column.get()))
diff --git a/src/Functions/now.cpp b/src/Functions/now.cpp
index b8ef974a982..79870ace007 100644
--- a/src/Functions/now.cpp
+++ b/src/Functions/now.cpp
@@ -29,7 +29,7 @@ public:
 
     String getName() const override { return "now"; }
 
-    ColumnPtr execute(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) override
+    ColumnPtr execute(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeDateTime().createColumnConst(
                 input_rows_count,
diff --git a/src/Functions/now64.cpp b/src/Functions/now64.cpp
index ad19541b6c5..fb6f7a0366d 100644
--- a/src/Functions/now64.cpp
+++ b/src/Functions/now64.cpp
@@ -82,7 +82,7 @@ public:
         return std::make_shared<DataTypeDateTime64>(scale);
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         const UInt32 scale = assert_cast<const DataTypeDateTime64 *>(result_type.get())->getScale();
         return result_type->createColumnConst(input_rows_count, nowSubsecond(scale));
diff --git a/src/Functions/nullIf.cpp b/src/Functions/nullIf.cpp
index 3f94e2f30a1..200425a7b83 100644
--- a/src/Functions/nullIf.cpp
+++ b/src/Functions/nullIf.cpp
@@ -43,7 +43,7 @@ public:
         return makeNullable(arguments[0]);
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         /// nullIf(col1, col2) == if(col1 = col2, NULL, col1)
 
diff --git a/src/Functions/pointInEllipses.cpp b/src/Functions/pointInEllipses.cpp
index 162b83e96de..4edd400d55d 100644
--- a/src/Functions/pointInEllipses.cpp
+++ b/src/Functions/pointInEllipses.cpp
@@ -87,7 +87,7 @@ private:
         return std::make_shared<DataTypeUInt8>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const auto size = input_rows_count;
 
diff --git a/src/Functions/pointInPolygon.cpp b/src/Functions/pointInPolygon.cpp
index 73dc32d83e6..3fd369cb4be 100644
--- a/src/Functions/pointInPolygon.cpp
+++ b/src/Functions/pointInPolygon.cpp
@@ -150,7 +150,7 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         const IColumn * point_col = arguments[0].column.get();
         const auto * const_tuple_col = checkAndGetColumn<ColumnConst>(point_col);
@@ -469,7 +469,7 @@ private:
         }
     }
 
-    void parseConstPolygonWithHolesFromMultipleColumns(ColumnsWithTypeAndName & arguments, Polygon & out_polygon) const
+    void parseConstPolygonWithHolesFromMultipleColumns(const ColumnsWithTypeAndName & arguments, Polygon & out_polygon) const
     {
         for (size_t i = 1; i < arguments.size(); ++i)
         {
@@ -507,7 +507,7 @@ private:
         }
     }
 
-    void parseConstPolygonFromSingleColumn(ColumnsWithTypeAndName & arguments, Polygon & out_polygon) const
+    void parseConstPolygonFromSingleColumn(const ColumnsWithTypeAndName & arguments, Polygon & out_polygon) const
     {
         if (isTwoDimensionalArray(*arguments[1].type))
         {
@@ -540,7 +540,7 @@ private:
         }
     }
 
-    void parseConstPolygon(ColumnsWithTypeAndName & arguments, Polygon & out_polygon) const
+    void parseConstPolygon(const ColumnsWithTypeAndName & arguments, Polygon & out_polygon) const
     {
         if (arguments.size() == 2)
             parseConstPolygonFromSingleColumn(arguments, out_polygon);
diff --git a/src/Functions/randConstant.cpp b/src/Functions/randConstant.cpp
index f978ef0616d..acc178ae974 100644
--- a/src/Functions/randConstant.cpp
+++ b/src/Functions/randConstant.cpp
@@ -22,7 +22,7 @@ public:
 
 bool useDefaultImplementationForNulls() const override { return false; }
 
-    ColumnPtr execute(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) override
+    ColumnPtr execute(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeNumber<ToType>().createColumnConst(input_rows_count, value);
     }
diff --git a/src/Functions/randomFixedString.cpp b/src/Functions/randomFixedString.cpp
index a28a093dd8d..2e493ddb43d 100644
--- a/src/Functions/randomFixedString.cpp
+++ b/src/Functions/randomFixedString.cpp
@@ -52,7 +52,7 @@ public:
     bool isDeterministic() const override { return false; }
     bool isDeterministicInScopeOfQuery() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const size_t n = assert_cast<const ColumnConst &>(*arguments[0].column).getValue<UInt64>();
 
@@ -88,7 +88,7 @@ public:
     #endif
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
diff --git a/src/Functions/randomPrintableASCII.cpp b/src/Functions/randomPrintableASCII.cpp
index 6ba5c72b114..ce7f809c151 100644
--- a/src/Functions/randomPrintableASCII.cpp
+++ b/src/Functions/randomPrintableASCII.cpp
@@ -57,7 +57,7 @@ public:
     bool isDeterministic() const override { return false; }
     bool isDeterministicInScopeOfQuery() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         auto col_to = ColumnString::create();
         ColumnString::Chars & data_to = col_to->getChars();
diff --git a/src/Functions/randomString.cpp b/src/Functions/randomString.cpp
index 513c1b299e0..f51a75c0422 100644
--- a/src/Functions/randomString.cpp
+++ b/src/Functions/randomString.cpp
@@ -57,7 +57,7 @@ public:
     bool isDeterministic() const override { return false; }
     bool isDeterministicInScopeOfQuery() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         auto col_to = ColumnString::create();
         ColumnString::Chars & data_to = col_to->getChars();
@@ -108,7 +108,7 @@ public:
     #endif
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
diff --git a/src/Functions/randomStringUTF8.cpp b/src/Functions/randomStringUTF8.cpp
index 23011ad109f..1873a5afde3 100644
--- a/src/Functions/randomStringUTF8.cpp
+++ b/src/Functions/randomStringUTF8.cpp
@@ -49,7 +49,7 @@ public:
     bool isDeterministic() const override { return false; }
     bool isDeterministicInScopeOfQuery() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         auto col_to = ColumnString::create();
         ColumnString::Chars & data_to = col_to->getChars();
diff --git a/src/Functions/regexpQuoteMeta.cpp b/src/Functions/regexpQuoteMeta.cpp
index 86b5144bded..a5ab5166fe3 100644
--- a/src/Functions/regexpQuoteMeta.cpp
+++ b/src/Functions/regexpQuoteMeta.cpp
@@ -51,7 +51,7 @@ public:
         return std::make_shared<DataTypeString>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const ColumnPtr & column_string = arguments[0].column;
         const ColumnString * input = checkAndGetColumn<ColumnString>(column_string.get());
diff --git a/src/Functions/reinterpretAs.cpp b/src/Functions/reinterpretAs.cpp
index 1c309505ac9..64facaf0840 100644
--- a/src/Functions/reinterpretAs.cpp
+++ b/src/Functions/reinterpretAs.cpp
@@ -86,7 +86,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         if (const ColumnString * col_from = typeid_cast<const ColumnString *>(arguments[0].column.get()))
         {
diff --git a/src/Functions/reinterpretAsFixedString.cpp b/src/Functions/reinterpretAsFixedString.cpp
index 172b1587af6..465e7dffc6a 100644
--- a/src/Functions/reinterpretAsFixedString.cpp
+++ b/src/Functions/reinterpretAsFixedString.cpp
@@ -66,7 +66,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
     {
         const IColumn & src = *arguments[0].column;
         MutableColumnPtr dst = result_type->createColumn();
diff --git a/src/Functions/reinterpretAsString.cpp b/src/Functions/reinterpretAsString.cpp
index 6df416ed32d..70db8f315bd 100644
--- a/src/Functions/reinterpretAsString.cpp
+++ b/src/Functions/reinterpretAsString.cpp
@@ -68,7 +68,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
     {
         const IColumn & src = *arguments[0].column;
         MutableColumnPtr dst = result_type->createColumn();
diff --git a/src/Functions/repeat.cpp b/src/Functions/repeat.cpp
index 63af62af9af..2b80e5a9cfd 100644
--- a/src/Functions/repeat.cpp
+++ b/src/Functions/repeat.cpp
@@ -165,7 +165,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
     {
         const auto & strcolumn = arguments[0].column;
         const auto & numcolumn = arguments[1].column;
diff --git a/src/Functions/replicate.cpp b/src/Functions/replicate.cpp
index 2fcbcc57c52..adbb37a7c91 100644
--- a/src/Functions/replicate.cpp
+++ b/src/Functions/replicate.cpp
@@ -48,7 +48,7 @@ public:
         return std::make_shared<DataTypeArray>(arguments[0]);
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
     {
         ColumnPtr first_column = arguments[0].column;
         const ColumnArray * array_column = checkAndGetColumn<ColumnArray>(arguments[1].column.get());
diff --git a/src/Functions/reverse.cpp b/src/Functions/reverse.cpp
index 8fa064c9a01..16676eaa936 100644
--- a/src/Functions/reverse.cpp
+++ b/src/Functions/reverse.cpp
@@ -89,7 +89,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
     {
         const ColumnPtr column = arguments[0].column;
         if (const ColumnString * col = checkAndGetColumn<ColumnString>(column.get()))
diff --git a/src/Functions/rowNumberInAllBlocks.cpp b/src/Functions/rowNumberInAllBlocks.cpp
index 2d2d7b09d7f..3aeaade7137 100644
--- a/src/Functions/rowNumberInAllBlocks.cpp
+++ b/src/Functions/rowNumberInAllBlocks.cpp
@@ -51,12 +51,12 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
-    ColumnPtr executeImplDryRun(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImplDryRun(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return ColumnUInt64::create(input_rows_count);
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         size_t current_row_number = rows.fetch_add(input_rows_count);
 
diff --git a/src/Functions/rowNumberInBlock.cpp b/src/Functions/rowNumberInBlock.cpp
index 85e777877bc..0a5cf63041f 100644
--- a/src/Functions/rowNumberInBlock.cpp
+++ b/src/Functions/rowNumberInBlock.cpp
@@ -46,7 +46,7 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         auto column = ColumnUInt64::create();
         auto & data = column->getData();
diff --git a/src/Functions/runningAccumulate.cpp b/src/Functions/runningAccumulate.cpp
index 77e822a155f..1a01b88e22c 100644
--- a/src/Functions/runningAccumulate.cpp
+++ b/src/Functions/runningAccumulate.cpp
@@ -73,7 +73,7 @@ public:
         return type->getReturnType();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnAggregateFunction * column_with_states
             = typeid_cast<const ColumnAggregateFunction *>(&*arguments.at(0).column);
diff --git a/src/Functions/runningDifference.h b/src/Functions/runningDifference.h
index ae7c148dcef..00874272496 100644
--- a/src/Functions/runningDifference.h
+++ b/src/Functions/runningDifference.h
@@ -165,9 +165,9 @@ public:
         return res;
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
-        auto & src = arguments.at(0);
+        const auto & src = arguments.at(0);
 
         /// When column is constant, its difference is zero.
         if (isColumnConst(*src.column))
diff --git a/src/Functions/sleep.h b/src/Functions/sleep.h
index 4faac7d1cf2..6dca6b5f84c 100644
--- a/src/Functions/sleep.h
+++ b/src/Functions/sleep.h
@@ -69,7 +69,7 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
     {
         const IColumn * col = arguments[0].column.get();
 
diff --git a/src/Functions/stringToH3.cpp b/src/Functions/stringToH3.cpp
index 65e7fa20314..575382ec40f 100644
--- a/src/Functions/stringToH3.cpp
+++ b/src/Functions/stringToH3.cpp
@@ -52,7 +52,7 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const auto * col_hindex = arguments[0].column.get();
 
diff --git a/src/Functions/substring.cpp b/src/Functions/substring.cpp
index a8aadff1919..cc2e1c70fd5 100644
--- a/src/Functions/substring.cpp
+++ b/src/Functions/substring.cpp
@@ -118,7 +118,7 @@ public:
         return col_res;
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         size_t number_of_arguments = arguments.size();
 
diff --git a/src/Functions/tcpPort.cpp b/src/Functions/tcpPort.cpp
index bd7ab0361e2..52acf0ade54 100644
--- a/src/Functions/tcpPort.cpp
+++ b/src/Functions/tcpPort.cpp
@@ -30,7 +30,7 @@ public:
 
     bool isDeterministic() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeUInt16().createColumnConst(input_rows_count, port);
     }
diff --git a/src/Functions/throwIf.cpp b/src/Functions/throwIf.cpp
index 77067b352b5..f74ab29186a 100644
--- a/src/Functions/throwIf.cpp
+++ b/src/Functions/throwIf.cpp
@@ -65,7 +65,7 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         std::optional<String> custom_message;
         if (arguments.size() == 2)
diff --git a/src/Functions/tid.cpp b/src/Functions/tid.cpp
index e4d92e2e273..44321deb15f 100644
--- a/src/Functions/tid.cpp
+++ b/src/Functions/tid.cpp
@@ -21,7 +21,7 @@ namespace
 
         DataTypePtr getReturnTypeImpl(const DataTypes &) const override { return std::make_shared<DataTypeUInt64>(); }
 
-        ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+        ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
         {
             auto current_tid = getThreadId();
             return DataTypeUInt64().createColumnConst(input_rows_count, current_tid);
diff --git a/src/Functions/timeSlots.cpp b/src/Functions/timeSlots.cpp
index 35ffc51d8cb..ef5902eba11 100644
--- a/src/Functions/timeSlots.cpp
+++ b/src/Functions/timeSlots.cpp
@@ -145,7 +145,7 @@ public:
         return std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>(extractTimeZoneNameFromFunctionArguments(arguments, 3, 0)));
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
     {
         const auto * starts = checkAndGetColumn<ColumnUInt32>(arguments[0].column.get());
         const auto * const_starts = checkAndGetColumnConst<ColumnUInt32>(arguments[0].column.get());
diff --git a/src/Functions/timezone.cpp b/src/Functions/timezone.cpp
index a3c484e6da0..4522f21c8b2 100644
--- a/src/Functions/timezone.cpp
+++ b/src/Functions/timezone.cpp
@@ -37,7 +37,7 @@ public:
 
     bool isDeterministic() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeString().createColumnConst(input_rows_count, DateLUT::instance().getTimeZone());
     }
diff --git a/src/Functions/toColumnTypeName.cpp b/src/Functions/toColumnTypeName.cpp
index 3d9de33e7fb..2b59accba84 100644
--- a/src/Functions/toColumnTypeName.cpp
+++ b/src/Functions/toColumnTypeName.cpp
@@ -36,7 +36,7 @@ public:
         return std::make_shared<DataTypeString>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeString().createColumnConst(input_rows_count, arguments[0].column->getName());
     }
diff --git a/src/Functions/toFixedString.h b/src/Functions/toFixedString.h
index 890686c52a9..de1ff7e8084 100644
--- a/src/Functions/toFixedString.h
+++ b/src/Functions/toFixedString.h
@@ -52,13 +52,13 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const auto n = arguments[1].column->getUInt(0);
         return executeForN(arguments, n);
     }
 
-    static ColumnPtr executeForN(ColumnsWithTypeAndName & arguments, const size_t n)
+    static ColumnPtr executeForN(const ColumnsWithTypeAndName & arguments, const size_t n)
     {
         const auto & column = arguments[0].column;
 
diff --git a/src/Functions/toLowCardinality.cpp b/src/Functions/toLowCardinality.cpp
index e8389a6a495..fe06b2d6087 100644
--- a/src/Functions/toLowCardinality.cpp
+++ b/src/Functions/toLowCardinality.cpp
@@ -32,7 +32,7 @@ public:
         return std::make_shared<DataTypeLowCardinality>(arguments[0]);
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & res_type, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & res_type, size_t /*input_rows_count*/) const override
     {
         auto arg_num = arguments[0];
         const auto & arg = arguments[0];
diff --git a/src/Functions/toNullable.cpp b/src/Functions/toNullable.cpp
index 94c35bf84a1..5758fe41adf 100644
--- a/src/Functions/toNullable.cpp
+++ b/src/Functions/toNullable.cpp
@@ -35,7 +35,7 @@ public:
         return makeNullable(arguments[0]);
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
     {
         return makeNullable(arguments[0].column);
     }
diff --git a/src/Functions/toStartOfInterval.cpp b/src/Functions/toStartOfInterval.cpp
index 23a511b992c..6f5a52ca182 100644
--- a/src/Functions/toStartOfInterval.cpp
+++ b/src/Functions/toStartOfInterval.cpp
@@ -226,7 +226,7 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1, 2}; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /* input_rows_count */) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /* input_rows_count */) const override
     {
         const auto & time_column = arguments[0];
         const auto & interval_column = arguments[1];
diff --git a/src/Functions/toTimeZone.cpp b/src/Functions/toTimeZone.cpp
index d50907a26cf..fbf3a0778a6 100644
--- a/src/Functions/toTimeZone.cpp
+++ b/src/Functions/toTimeZone.cpp
@@ -54,7 +54,7 @@ public:
         return std::make_shared<DataTypeDateTime64>(date_time64->getScale(), time_zone_name);
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         return arguments[0].column;
     }
diff --git a/src/Functions/toTypeName.cpp b/src/Functions/toTypeName.cpp
index d34b651f6c8..5de07e1d386 100644
--- a/src/Functions/toTypeName.cpp
+++ b/src/Functions/toTypeName.cpp
@@ -22,7 +22,7 @@ public:
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
 
     /// Execute the function on the columns.
-    ColumnPtr execute(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) override
+    ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeString().createColumnConst(input_rows_count, arguments[0].type->getName());
     }
diff --git a/src/Functions/today.cpp b/src/Functions/today.cpp
index 108d0b90371..65373058540 100644
--- a/src/Functions/today.cpp
+++ b/src/Functions/today.cpp
@@ -20,7 +20,7 @@ public:
 
     String getName() const override { return "today"; }
 
-    ColumnPtr execute(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) override
+    ColumnPtr execute(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeDate().createColumnConst(input_rows_count, day_value);
     }
diff --git a/src/Functions/transform.cpp b/src/Functions/transform.cpp
index 6a83b8fe0ea..ab589be9c07 100644
--- a/src/Functions/transform.cpp
+++ b/src/Functions/transform.cpp
@@ -143,7 +143,7 @@ public:
         }
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         const ColumnConst * array_from = checkAndGetColumnConst<ColumnArray>(arguments[1].column.get());
         const ColumnConst * array_to = checkAndGetColumnConst<ColumnArray>(arguments[2].column.get());
@@ -184,7 +184,7 @@ public:
     }
 
 private:
-    static ColumnPtr executeConst(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count)
+    static ColumnPtr executeConst(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count)
     {
         /// Materialize the input column and compute the function as usual.
 
@@ -723,7 +723,7 @@ private:
     mutable Cache cache;
 
     /// Can be called from different threads. It works only on the first call.
-    void initialize(const Array & from, const Array & to, ColumnsWithTypeAndName & arguments) const
+    void initialize(const Array & from, const Array & to, const ColumnsWithTypeAndName & arguments) const
     {
         if (cache.initialized)
             return;
diff --git a/src/Functions/tuple.cpp b/src/Functions/tuple.cpp
index 6d24391ed46..379d8eae011 100644
--- a/src/Functions/tuple.cpp
+++ b/src/Functions/tuple.cpp
@@ -73,7 +73,7 @@ public:
         return std::make_shared<DataTypeTuple>(types);
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         size_t tuple_size = arguments.size();
         Columns tuple_columns(tuple_size);
diff --git a/src/Functions/tupleElement.cpp b/src/Functions/tupleElement.cpp
index 01b109d4861..dbfa802a414 100644
--- a/src/Functions/tupleElement.cpp
+++ b/src/Functions/tupleElement.cpp
@@ -79,7 +79,7 @@ public:
         return out_return_type;
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         Columns array_offsets;
 
diff --git a/src/Functions/uptime.cpp b/src/Functions/uptime.cpp
index 1650885ee13..b5662a87c93 100644
--- a/src/Functions/uptime.cpp
+++ b/src/Functions/uptime.cpp
@@ -39,7 +39,7 @@ public:
 
     bool isDeterministic() const override { return false; }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeUInt32().createColumnConst(input_rows_count, static_cast<UInt64>(uptime));
     }
diff --git a/src/Functions/version.cpp b/src/Functions/version.cpp
index 73c31ae59a2..c07cda4091b 100644
--- a/src/Functions/version.cpp
+++ b/src/Functions/version.cpp
@@ -36,7 +36,7 @@ public:
         return std::make_shared<DataTypeString>();
     }
 
-    ColumnPtr executeImpl(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeString().createColumnConst(input_rows_count, VERSION_STRING);
     }
diff --git a/src/Functions/visibleWidth.cpp b/src/Functions/visibleWidth.cpp
index 4945e93412e..fb9509184ae 100644
--- a/src/Functions/visibleWidth.cpp
+++ b/src/Functions/visibleWidth.cpp
@@ -46,7 +46,7 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
 
     /// Execute the function on the columns.
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         auto & src = arguments[0];
         size_t size = input_rows_count;
diff --git a/src/Functions/yesterday.cpp b/src/Functions/yesterday.cpp
index 28d29add3e4..7c0d1ebd38b 100644
--- a/src/Functions/yesterday.cpp
+++ b/src/Functions/yesterday.cpp
@@ -18,7 +18,7 @@ public:
 
     String getName() const override { return "yesterday"; }
 
-    ColumnPtr execute(ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) override
+    ColumnPtr execute(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeDate().createColumnConst(input_rows_count, day_value);
     }

From 54f0338e222a18a935f195ba045c9027c501d67b Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 17 Nov 2020 17:51:05 +0300
Subject: [PATCH 13/99] Add converting logic to ActionsDAG.

---
 src/Interpreters/ActionsDAG.cpp | 134 ++++++++++++++++++++++++++++----
 src/Interpreters/ActionsDAG.h   |  27 +++++--
 2 files changed, 142 insertions(+), 19 deletions(-)

diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index d046f7d4f2c..ccae78b665f 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -1,7 +1,10 @@
 #include <Interpreters/ActionsDAG.h>
 
 #include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeString.h>
 #include <Functions/IFunction.h>
+#include <Functions/IFunctionAdaptors.h>
+#include <Functions/FunctionsConversion.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/ExpressionJIT.h>
 #include <IO/WriteBufferFromString.h>
@@ -18,6 +21,8 @@ namespace ErrorCodes
     extern const int DUPLICATE_COLUMN;
     extern const int UNKNOWN_IDENTIFIER;
     extern const int TYPE_MISMATCH;
+    extern const int NUMBER_OF_COLUMNS_DOESNT_MATCH;
+    extern const int THERE_IS_NO_COLUMN;
 }
 
 
@@ -83,7 +88,7 @@ const ActionsDAG::Node & ActionsDAG::addInput(ColumnWithTypeAndName column, bool
     return addNode(std::move(node), can_replace);
 }
 
-const ActionsDAG::Node & ActionsDAG::addColumn(ColumnWithTypeAndName column)
+const ActionsDAG::Node & ActionsDAG::addColumn(ColumnWithTypeAndName column, bool can_replace)
 {
     if (!column.column)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot add column {} because it is nullptr", column.name);
@@ -94,7 +99,7 @@ const ActionsDAG::Node & ActionsDAG::addColumn(ColumnWithTypeAndName column)
     node.result_name = std::move(column.name);
     node.column = std::move(column.column);
 
-    return addNode(std::move(node));
+    return addNode(std::move(node), can_replace);
 }
 
 const ActionsDAG::Node & ActionsDAG::addAlias(const std::string & name, std::string alias, bool can_replace)
@@ -147,28 +152,33 @@ const ActionsDAG::Node & ActionsDAG::addFunction(
         compilation_cache = context.getCompiledExpressionCache();
 #endif
 
-    return addFunction(function, argument_names, std::move(result_name));
+    Inputs children;
+    children.reserve(argument_names.size());
+    for (const auto & name : argument_names)
+        children.push_back(&getNode(name));
+
+    addFunction(function, children, std::move(result_name), false);
 }
 
-const ActionsDAG::Node & ActionsDAG::addFunction(
+ActionsDAG::Node & ActionsDAG::addFunction(
         const FunctionOverloadResolverPtr & function,
-        const Names & argument_names,
-        std::string result_name)
+        Inputs children,
+        std::string result_name,
+        bool can_replace)
 {
-    size_t num_arguments = argument_names.size();
+    size_t num_arguments = children.size();
 
     Node node;
     node.type = ActionType::FUNCTION;
     node.function_builder = function;
-    node.children.reserve(num_arguments);
+    node.children = std::move(children);
 
     bool all_const = true;
     ColumnsWithTypeAndName arguments(num_arguments);
 
     for (size_t i = 0; i < num_arguments; ++i)
     {
-        auto & child = getNode(argument_names[i]);
-        node.children.emplace_back(&child);
+        auto & child = *node.children[i];
         node.allow_constant_folding = node.allow_constant_folding && child.allow_constant_folding;
 
         ColumnWithTypeAndName argument;
@@ -224,18 +234,18 @@ const ActionsDAG::Node & ActionsDAG::addFunction(
     if (result_name.empty())
     {
         result_name = function->getName() + "(";
-        for (size_t i = 0; i < argument_names.size(); ++i)
+        for (size_t i = 0; i < num_arguments; ++i)
         {
             if (i)
                 result_name += ", ";
-            result_name += argument_names[i];
+            result_name += node.children[i]->result_name;
         }
         result_name += ")";
     }
 
     node.result_name = std::move(result_name);
 
-    return addNode(std::move(node));
+    return addNode(std::move(node), can_replace);
 }
 
 
@@ -546,6 +556,102 @@ bool ActionsDAG::empty() const
     return true;
 }
 
+ActionsDAGPtr ActionsDAG::makeConvertingActions(
+    const ColumnsWithTypeAndName & source,
+    const ColumnsWithTypeAndName & result,
+    MatchColumnsMode mode,
+    bool ignore_constant_values)
+{
+    size_t num_input_columns = source.size();
+    size_t num_result_columns = result.size();
+
+    if (mode == MatchColumnsMode::Position && num_input_columns != num_result_columns)
+        throw Exception("Number of columns doesn't match", ErrorCodes::NUMBER_OF_COLUMNS_DOESNT_MATCH);
+
+    auto actions_dag = std::make_shared<ActionsDAG>(source);
+    std::vector<Node *> projection(num_result_columns);
+
+    FunctionOverloadResolverPtr func_builder_cast =
+            std::make_shared<FunctionOverloadResolverAdaptor>(CastOverloadResolver::createImpl(false));
+
+    std::map<std::string_view, std::list<size_t>> inputs;
+    if (mode == MatchColumnsMode::Name)
+    {
+        for (size_t pos = 0; pos < actions_dag->inputs.size(); ++pos)
+            inputs[actions_dag->inputs[pos]->result_name].push_back(pos);
+    }
+
+    for (size_t result_col_num = 0; result_col_num < num_result_columns; ++result_col_num)
+    {
+        const auto & res_elem = result[result_col_num];
+        Node * src_node = nullptr;
+
+        switch (mode)
+        {
+            case MatchColumnsMode::Position:
+            {
+                src_node = actions_dag->inputs[result_col_num];
+                break;
+            }
+
+            case MatchColumnsMode::Name:
+            {
+                auto & input = inputs[res_elem.name];
+                if (input.empty())
+                    throw Exception("Cannot find column " + backQuoteIfNeed(res_elem.name) + " in source stream",
+                                    ErrorCodes::THERE_IS_NO_COLUMN);
+
+                src_node = actions_dag->inputs[input.front()];
+                input.pop_front();
+                break;
+            }
+        }
+
+        /// Check constants.
+
+        if (const auto * res_const = typeid_cast<const ColumnConst *>(res_elem.column.get()))
+        {
+            if (const auto * src_const = typeid_cast<const ColumnConst *>(src_node->column.get()))
+            {
+                if (ignore_constant_values)
+                   src_node = const_cast<Node *>(&actions_dag->addColumn(res_elem, true));
+                else if (res_const->getField() != src_const->getField())
+                    throw Exception("Cannot convert column " + backQuoteIfNeed(res_elem.name) + " because "
+                                    "it is constant but values of constants are different in source and result",
+                                    ErrorCodes::ILLEGAL_COLUMN);
+            }
+            else
+                throw Exception("Cannot convert column " + backQuoteIfNeed(res_elem.name) + " because "
+                                "it is non constant in source stream but must be constant in result",
+                                ErrorCodes::ILLEGAL_COLUMN);
+        }
+
+        if (!res_elem.type->equals(*res_elem.type))
+        {
+            ColumnWithTypeAndName column;
+            column.name = res_elem.type->getName();
+            column.column = DataTypeString().createColumnConst(0, column.name);
+            column.type = std::make_shared<DataTypeString>();
+
+            auto * right_arg = const_cast<Node *>(&actions_dag->addColumn(std::move(column), true));
+            auto * left_arg = src_node;
+
+            Inputs children = { left_arg, right_arg };
+            src_node = &actions_dag->addFunction(func_builder_cast, children, "", true);
+        }
+
+        if (src_node->result_name != res_elem.name)
+            src_node = const_cast<Node *>(&actions_dag->addAlias(src_node->result_name, res_elem.name, true));
+
+        projection[result_col_num] = src_node;
+    }
+
+    actions_dag->removeUnusedActions(projection);
+    actions_dag->projectInput();
+
+    return actions_dag;
+}
+
 ActionsDAGPtr ActionsDAG::splitActionsBeforeArrayJoin(const NameSet & array_joined_columns)
 {
     /// Split DAG into two parts.
@@ -702,7 +808,7 @@ ActionsDAGPtr ActionsDAG::splitActionsBeforeArrayJoin(const NameSet & array_join
         const auto & cur = data[input];
         if (cur.to_this)
             this_inputs.push_back(cur.to_this);
-        else
+        else if (cur.to_split)
             split_inputs.push_back(cur.to_split);
     }
 
diff --git a/src/Interpreters/ActionsDAG.h b/src/Interpreters/ActionsDAG.h
index 7b959ff5e29..2e16475180b 100644
--- a/src/Interpreters/ActionsDAG.h
+++ b/src/Interpreters/ActionsDAG.h
@@ -195,13 +195,9 @@ public:
 
     const Node & addInput(std::string name, DataTypePtr type, bool can_replace = false);
     const Node & addInput(ColumnWithTypeAndName column, bool can_replace = false);
-    const Node & addColumn(ColumnWithTypeAndName column);
+    const Node & addColumn(ColumnWithTypeAndName column, bool can_replace = false);
     const Node & addAlias(const std::string & name, std::string alias, bool can_replace = false);
     const Node & addArrayJoin(const std::string & source_name, std::string result_name);
-    const Node & addFunction(
-            const FunctionOverloadResolverPtr & function,
-            const Names & argument_names,
-            std::string result_name);
     const Node & addFunction(
             const FunctionOverloadResolverPtr & function,
             const Names & argument_names,
@@ -234,10 +230,31 @@ public:
 
     ActionsDAGPtr clone() const;
 
+
+    enum class MatchColumnsMode
+    {
+        /// Require same number of columns in source and result. Match columns by corresponding positions, regardless to names.
+        Position,
+        /// Find columns in source by their names. Allow excessive columns in source.
+        Name,
+    };
+
+    static ActionsDAGPtr makeConvertingActions(
+        const ColumnsWithTypeAndName & source,
+        const ColumnsWithTypeAndName & result,
+        MatchColumnsMode mode,
+        bool ignore_constant_values = false); /// Do not check that constants are same. Use value from result_header.
+
 private:
     Node & addNode(Node node, bool can_replace = false);
     Node & getNode(const std::string & name);
 
+    ActionsDAG::Node & addFunction(
+            const FunctionOverloadResolverPtr & function,
+            Inputs children,
+            std::string result_name,
+            bool can_replace);
+
     ActionsDAGPtr cloneEmpty() const
     {
         auto actions = std::make_shared<ActionsDAG>();

From 97d07ae3a9ae07f808222b3351b3b609d8df8108 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 17 Nov 2020 17:54:37 +0300
Subject: [PATCH 14/99] Add converting logic to ActionsDAG.

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

diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index ccae78b665f..02d4d096d9b 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -157,7 +157,7 @@ const ActionsDAG::Node & ActionsDAG::addFunction(
     for (const auto & name : argument_names)
         children.push_back(&getNode(name));
 
-    addFunction(function, children, std::move(result_name), false);
+    return addFunction(function, children, std::move(result_name), false);
 }
 
 ActionsDAG::Node & ActionsDAG::addFunction(

From a7e1fb11c64bf13c5422ac9a574ff8dad9c8dfc0 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 17 Nov 2020 18:26:06 +0300
Subject: [PATCH 15/99] Add converting logic to ActionsDAG.

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

diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index 02d4d096d9b..4823a71aa10 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -808,7 +808,7 @@ ActionsDAGPtr ActionsDAG::splitActionsBeforeArrayJoin(const NameSet & array_join
         const auto & cur = data[input];
         if (cur.to_this)
             this_inputs.push_back(cur.to_this);
-        else if (cur.to_split)
+        if (cur.to_split)
             split_inputs.push_back(cur.to_split);
     }
 

From cc0134f3613e7d6d9eeaddbfaad576ccf92a7e11 Mon Sep 17 00:00:00 2001
From: zhang2014 <coswde@gmail.com>
Date: Tue, 17 Nov 2020 23:29:02 +0800
Subject: [PATCH 16/99] Try fix asan build

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

diff --git a/src/IO/MySQLBinlogEventReadBuffer.cpp b/src/IO/MySQLBinlogEventReadBuffer.cpp
index c495cbdfd90..b2c37ddb8d0 100644
--- a/src/IO/MySQLBinlogEventReadBuffer.cpp
+++ b/src/IO/MySQLBinlogEventReadBuffer.cpp
@@ -65,7 +65,7 @@ MySQLBinlogEventReadBuffer::~MySQLBinlogEventReadBuffer()
         nextIfAtEnd();
 
         if (checksum_signature_length)
-            delete checksum_buf;
+            delete[] checksum_buf;
     }
     catch (...)
     {

From ed2452fbff5093df3dc6b79bd3139878192a1e4e Mon Sep 17 00:00:00 2001
From: Ivan <5627721+abyss7@users.noreply.github.com>
Date: Tue, 17 Nov 2020 18:32:40 +0300
Subject: [PATCH 17/99] Fix build

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

diff --git a/src/Functions/extractTimeZoneFromFunctionArguments.cpp b/src/Functions/extractTimeZoneFromFunctionArguments.cpp
index 08d883cc5d5..9d6e54a599e 100644
--- a/src/Functions/extractTimeZoneFromFunctionArguments.cpp
+++ b/src/Functions/extractTimeZoneFromFunctionArguments.cpp
@@ -52,7 +52,7 @@ std::string extractTimeZoneNameFromFunctionArguments(const ColumnsWithTypeAndNam
     }
 }
 
-const DateLUTImpl & extractTimeZoneFromFunctionArguments(ColumnsWithTypeAndName & arguments, size_t time_zone_arg_num, size_t datetime_arg_num)
+const DateLUTImpl & extractTimeZoneFromFunctionArguments(const ColumnsWithTypeAndName & arguments, size_t time_zone_arg_num, size_t datetime_arg_num)
 {
     if (arguments.size() == time_zone_arg_num + 1)
     {

From fd3ee6d8af9a1f2160f00c80ae206e47bfa2ab1e Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 17 Nov 2020 18:57:11 +0300
Subject: [PATCH 18/99] Add converting logic to ActionsDAG.

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

diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index 4823a71aa10..2d4eb1462a0 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -749,7 +749,9 @@ ActionsDAGPtr ActionsDAG::splitActionsBeforeArrayJoin(const NameSet & array_join
                                 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));
-                                new_inputs.push_back(child_data.to_this);
+
+                                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);
@@ -781,7 +783,9 @@ ActionsDAGPtr ActionsDAG::splitActionsBeforeArrayJoin(const NameSet & array_join
                         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));
-                        new_inputs.push_back(cur_data.to_this);
+
+                        if (copy.type != ActionType::INPUT)
+                            new_inputs.push_back(cur_data.to_this);
                     }
                 }
             }

From 26ec254c6932c22efbcc34b09195e7610ba80e18 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 17 Nov 2020 19:24:25 +0300
Subject: [PATCH 19/99] Fix style.

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

diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index 2d4eb1462a0..30f063d8b95 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -23,6 +23,7 @@ namespace ErrorCodes
     extern const int TYPE_MISMATCH;
     extern const int NUMBER_OF_COLUMNS_DOESNT_MATCH;
     extern const int THERE_IS_NO_COLUMN;
+    extern const int ILLEGAL_COLUMN;
 }
 
 

From 13eceff55cb7877b900277461b95c9ac88fc276c Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 17 Nov 2020 20:16:55 +0300
Subject: [PATCH 20/99] Remove Converting transform and step.

---
 .../ClusterProxy/SelectStreamFactory.cpp      |  11 +-
 src/Interpreters/InterpreterInsertQuery.cpp   |  10 +-
 src/Interpreters/InterpreterSelectQuery.cpp   |   9 +-
 src/Processors/QueryPipeline.cpp              |  12 +-
 src/Processors/QueryPlan/ArrayJoinStep.cpp    |  11 +-
 src/Processors/QueryPlan/ConvertingStep.cpp   |  77 ----------
 src/Processors/QueryPlan/ConvertingStep.h     |  25 ----
 src/Processors/QueryPlan/ExpressionStep.cpp   |  10 +-
 src/Processors/QueryPlan/FilterStep.cpp       |  10 +-
 .../Transforms/ConvertingTransform.cpp        | 137 ------------------
 .../Transforms/ConvertingTransform.h          |  57 --------
 src/Processors/ya.make                        |   2 -
 src/Storages/StorageBuffer.cpp                |  18 ++-
 src/Storages/StorageMerge.cpp                 |  11 +-
 src/Storages/StorageTableFunction.h           |  14 +-
 src/Storages/StorageView.cpp                  |  10 +-
 16 files changed, 93 insertions(+), 331 deletions(-)
 delete mode 100644 src/Processors/QueryPlan/ConvertingStep.cpp
 delete mode 100644 src/Processors/QueryPlan/ConvertingStep.h
 delete mode 100644 src/Processors/Transforms/ConvertingTransform.cpp
 delete mode 100644 src/Processors/Transforms/ConvertingTransform.h

diff --git a/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp b/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
index 3017550aaf1..0020db52d3c 100644
--- a/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
+++ b/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
@@ -10,11 +10,10 @@
 
 #include <common/logger_useful.h>
 #include <Processors/Pipe.h>
-#include <Processors/Transforms/ConvertingTransform.h>
 #include <Processors/Sources/RemoteSource.h>
 #include <Processors/Sources/DelayedSource.h>
 #include <Processors/QueryPlan/QueryPlan.h>
-#include <Processors/QueryPlan/ConvertingStep.h>
+#include <Processors/QueryPlan/ExpressionStep.h>
 
 
 namespace ProfileEvents
@@ -87,7 +86,13 @@ std::unique_ptr<QueryPlan> createLocalPlan(
     /// Convert header structure to expected.
     /// Also we ignore constants from result and replace it with constants from header.
     /// It is needed for functions like `now64()` or `randConstant()` because their values may be different.
-    auto converting = std::make_unique<ConvertingStep>(query_plan->getCurrentDataStream(), header, true);
+    auto convert_actions_dag = ActionsDAG::makeConvertingActions(
+            query_plan->getCurrentDataStream().header.getColumnsWithTypeAndName(),
+            header.getColumnsWithTypeAndName(),
+            ActionsDAG::MatchColumnsMode::Name,
+            true);
+
+    auto converting = std::make_unique<ExpressionStep>(query_plan->getCurrentDataStream(), convert_actions_dag);
     converting->setStepDescription("Convert block structure for query from local replica");
     query_plan->addStep(std::move(converting));
 
diff --git a/src/Interpreters/InterpreterInsertQuery.cpp b/src/Interpreters/InterpreterInsertQuery.cpp
index aa8bcd74ea6..34d4c5e365c 100644
--- a/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/src/Interpreters/InterpreterInsertQuery.cpp
@@ -26,7 +26,7 @@
 #include <Processors/NullSink.h>
 #include <Processors/Sources/SinkToOutputStream.h>
 #include <Processors/Sources/SourceFromInputStream.h>
-#include <Processors/Transforms/ConvertingTransform.h>
+#include <Processors/Transforms/ExpressionTransform.h>
 #include <Storages/StorageDistributed.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <Common/checkStackSize.h>
@@ -378,11 +378,15 @@ BlockIO InterpreterInsertQuery::execute()
     else if (query.select || query.watch)
     {
         const auto & header = out_streams.at(0)->getHeader();
+        auto actions_dag = ActionsDAG::makeConvertingActions(
+                res.pipeline.getHeader().getColumnsWithTypeAndName(),
+                header.getColumnsWithTypeAndName(),
+                ActionsDAG::MatchColumnsMode::Position);
+        auto actions = std::make_shared<ExpressionActions>(actions_dag);
 
         res.pipeline.addSimpleTransform([&](const Block & in_header) -> ProcessorPtr
         {
-            return std::make_shared<ConvertingTransform>(in_header, header,
-                    ConvertingTransform::MatchColumnsMode::Position);
+            return std::make_shared<ExpressionTransform>(in_header, actions);
         });
 
         res.pipeline.setSinks([&](const Block &, QueryPipeline::StreamType type) -> ProcessorPtr
diff --git a/src/Interpreters/InterpreterSelectQuery.cpp b/src/Interpreters/InterpreterSelectQuery.cpp
index 2eee269efe1..0017c227e5d 100644
--- a/src/Interpreters/InterpreterSelectQuery.cpp
+++ b/src/Interpreters/InterpreterSelectQuery.cpp
@@ -78,7 +78,6 @@
 #include <ext/map.h>
 #include <ext/scope_guard.h>
 #include <memory>
-#include <Processors/QueryPlan/ConvertingStep.h>
 
 
 namespace DB
@@ -479,7 +478,13 @@ void InterpreterSelectQuery::buildQueryPlan(QueryPlan & query_plan)
     /// We must guarantee that result structure is the same as in getSampleBlock()
     if (!blocksHaveEqualStructure(query_plan.getCurrentDataStream().header, result_header))
     {
-        auto converting = std::make_unique<ConvertingStep>(query_plan.getCurrentDataStream(), result_header, true);
+        auto convert_actions_dag = ActionsDAG::makeConvertingActions(
+                query_plan.getCurrentDataStream().header.getColumnsWithTypeAndName(),
+                result_header.getColumnsWithTypeAndName(),
+                ActionsDAG::MatchColumnsMode::Name,
+                true);
+
+        auto converting = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), convert_actions_dag);
         query_plan.addStep(std::move(converting));
     }
 }
diff --git a/src/Processors/QueryPipeline.cpp b/src/Processors/QueryPipeline.cpp
index 516a9a77b71..ffcab2e7a8d 100644
--- a/src/Processors/QueryPipeline.cpp
+++ b/src/Processors/QueryPipeline.cpp
@@ -5,7 +5,7 @@
 #include <Processors/Transforms/TotalsHavingTransform.h>
 #include <Processors/Transforms/ExtremesTransform.h>
 #include <Processors/Transforms/CreatingSetsTransform.h>
-#include <Processors/Transforms/ConvertingTransform.h>
+#include <Processors/Transforms/ExpressionTransform.h>
 #include <Processors/Transforms/MergingAggregatedMemoryEfficientTransform.h>
 #include <Processors/Formats/IOutputFormat.h>
 #include <Processors/Sources/SourceFromInputStream.h>
@@ -14,6 +14,7 @@
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/ExpressionActions.h>
 #include <Common/typeid_cast.h>
 #include <Common/CurrentThread.h>
 #include <Processors/DelayedPortsProcessor.h>
@@ -226,10 +227,15 @@ QueryPipeline QueryPipeline::unitePipelines(
 
         if (!pipeline.isCompleted())
         {
+            auto actions_dag = ActionsDAG::makeConvertingActions(
+                    pipeline.getHeader().getColumnsWithTypeAndName(),
+                    common_header.getColumnsWithTypeAndName(),
+                    ActionsDAG::MatchColumnsMode::Position);
+            auto actions = std::make_shared<ExpressionActions>(actions_dag);
+
             pipeline.addSimpleTransform([&](const Block & header)
             {
-               return std::make_shared<ConvertingTransform>(
-                       header, common_header, ConvertingTransform::MatchColumnsMode::Position);
+               return std::make_shared<ExpressionTransform>(header, actions);
             });
         }
 
diff --git a/src/Processors/QueryPlan/ArrayJoinStep.cpp b/src/Processors/QueryPlan/ArrayJoinStep.cpp
index 402f7d4a318..b71d2176e52 100644
--- a/src/Processors/QueryPlan/ArrayJoinStep.cpp
+++ b/src/Processors/QueryPlan/ArrayJoinStep.cpp
@@ -1,8 +1,9 @@
 #include <Processors/QueryPlan/ArrayJoinStep.h>
 #include <Processors/Transforms/ArrayJoinTransform.h>
-#include <Processors/Transforms/ConvertingTransform.h>
+#include <Processors/Transforms/ExpressionTransform.h>
 #include <Processors/QueryPipeline.h>
 #include <Interpreters/ArrayJoinAction.h>
+#include <Interpreters/ExpressionActions.h>
 #include <IO/Operators.h>
 
 namespace DB
@@ -55,9 +56,15 @@ void ArrayJoinStep::transformPipeline(QueryPipeline & pipeline)
 
     if (res_header && !blocksHaveEqualStructure(res_header, output_stream->header))
     {
+        auto actions_dag = ActionsDAG::makeConvertingActions(
+                pipeline.getHeader().getColumnsWithTypeAndName(),
+                res_header.getColumnsWithTypeAndName(),
+                ActionsDAG::MatchColumnsMode::Name);
+        auto actions = std::make_shared<ExpressionActions>(actions_dag);
+
         pipeline.addSimpleTransform([&](const Block & header)
         {
-            return std::make_shared<ConvertingTransform>(header, res_header, ConvertingTransform::MatchColumnsMode::Name);
+            return std::make_shared<ExpressionTransform>(header, actions);
         });
     }
 }
diff --git a/src/Processors/QueryPlan/ConvertingStep.cpp b/src/Processors/QueryPlan/ConvertingStep.cpp
deleted file mode 100644
index 3f5b6bf4bb4..00000000000
--- a/src/Processors/QueryPlan/ConvertingStep.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-#include <Processors/QueryPlan/ConvertingStep.h>
-#include <Processors/QueryPipeline.h>
-#include <Processors/Transforms/ConvertingTransform.h>
-#include <IO/Operators.h>
-
-namespace DB
-{
-
-static ITransformingStep::Traits getTraits()
-{
-    return ITransformingStep::Traits
-    {
-        {
-            .preserves_distinct_columns = true,
-            .returns_single_stream = false,
-            .preserves_number_of_streams = true,
-            .preserves_sorting = true,
-        },
-        {
-            .preserves_number_of_rows = true,
-        }
-    };
-}
-
-ConvertingStep::ConvertingStep(const DataStream & input_stream_, Block result_header_, bool ignore_constant_values_)
-    : ITransformingStep(input_stream_, result_header_, getTraits())
-    , result_header(std::move(result_header_))
-    , ignore_constant_values(ignore_constant_values_)
-{
-    updateDistinctColumns(output_stream->header, output_stream->distinct_columns);
-}
-
-void ConvertingStep::transformPipeline(QueryPipeline & pipeline)
-{
-    pipeline.addSimpleTransform([&](const Block & header)
-    {
-        return std::make_shared<ConvertingTransform>(header, result_header, ConvertingTransform::MatchColumnsMode::Name, ignore_constant_values);
-    });
-}
-
-void ConvertingStep::describeActions(FormatSettings & settings) const
-{
-    const auto & header = input_streams[0].header;
-    auto conversion = ConvertingTransform(header, result_header, ConvertingTransform::MatchColumnsMode::Name, ignore_constant_values)
-            .getConversion();
-
-    auto dump_description = [&](const ColumnWithTypeAndName & elem, bool is_const)
-    {
-        settings.out << elem.name << ' ' << elem.type->getName() << (is_const ? " Const" : "") << '\n';
-    };
-
-    String prefix(settings.offset, ' ');
-
-    for (size_t i = 0; i < conversion.size(); ++i)
-    {
-        const auto & from = header.getByPosition(conversion[i]);
-        const auto & to = result_header.getByPosition(i);
-
-        bool from_const = from.column && isColumnConst(*from.column);
-        bool to_const = to.column && isColumnConst(*to.column);
-
-        settings.out << prefix;
-
-        if (from.name == to.name && from.type->equals(*to.type) && from_const == to_const)
-            dump_description(from, from_const);
-        else
-        {
-            dump_description(to, to_const);
-            settings.out << " ← ";
-            dump_description(from, from_const);
-        }
-
-        settings.out << '\n';
-    }
-}
-
-}
diff --git a/src/Processors/QueryPlan/ConvertingStep.h b/src/Processors/QueryPlan/ConvertingStep.h
deleted file mode 100644
index 70fd34330d1..00000000000
--- a/src/Processors/QueryPlan/ConvertingStep.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-#include <Processors/QueryPlan/ITransformingStep.h>
-
-namespace DB
-{
-
-/// Convert one block structure to another. See ConvertingTransform.
-class ConvertingStep : public ITransformingStep
-{
-public:
-    ConvertingStep(const DataStream & input_stream_, Block result_header_, bool ignore_constant_values_ = false);
-
-    String getName() const override { return "Converting"; }
-
-    void transformPipeline(QueryPipeline & pipeline) override;
-
-    void describeActions(FormatSettings & settings) const override;
-
-private:
-    Block result_header;
-    /// Do not check that constants are same. Use value from result_header.
-    bool ignore_constant_values;
-};
-
-}
diff --git a/src/Processors/QueryPlan/ExpressionStep.cpp b/src/Processors/QueryPlan/ExpressionStep.cpp
index 6c7c5867b7f..6e148909bed 100644
--- a/src/Processors/QueryPlan/ExpressionStep.cpp
+++ b/src/Processors/QueryPlan/ExpressionStep.cpp
@@ -1,7 +1,6 @@
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/Transforms/ExpressionTransform.h>
 #include <Processors/QueryPipeline.h>
-#include <Processors/Transforms/ConvertingTransform.h>
 #include <Processors/Transforms/JoiningTransform.h>
 #include <Interpreters/ExpressionActions.h>
 #include <IO/Operators.h>
@@ -75,10 +74,15 @@ void ExpressionStep::transformPipeline(QueryPipeline & pipeline)
 
     if (!blocksHaveEqualStructure(pipeline.getHeader(), output_stream->header))
     {
+        auto convert_actions_dag = ActionsDAG::makeConvertingActions(
+                pipeline.getHeader().getColumnsWithTypeAndName(),
+                output_stream->header.getColumnsWithTypeAndName(),
+                ActionsDAG::MatchColumnsMode::Name);
+        auto convert_actions = std::make_shared<ExpressionActions>(convert_actions_dag);
+
         pipeline.addSimpleTransform([&](const Block & header)
         {
-            return std::make_shared<ConvertingTransform>(header, output_stream->header,
-                                                         ConvertingTransform::MatchColumnsMode::Name);
+            return std::make_shared<ExpressionTransform>(header, convert_actions);
         });
     }
 }
diff --git a/src/Processors/QueryPlan/FilterStep.cpp b/src/Processors/QueryPlan/FilterStep.cpp
index 63dbc2b63b4..8fb405e685b 100644
--- a/src/Processors/QueryPlan/FilterStep.cpp
+++ b/src/Processors/QueryPlan/FilterStep.cpp
@@ -1,7 +1,7 @@
 #include <Processors/QueryPlan/FilterStep.h>
 #include <Processors/Transforms/FilterTransform.h>
 #include <Processors/QueryPipeline.h>
-#include <Processors/Transforms/ConvertingTransform.h>
+#include <Processors/Transforms/ExpressionTransform.h>
 #include <Interpreters/ExpressionActions.h>
 #include <IO/Operators.h>
 
@@ -67,9 +67,15 @@ void FilterStep::transformPipeline(QueryPipeline & pipeline)
 
     if (!blocksHaveEqualStructure(pipeline.getHeader(), output_stream->header))
     {
+        auto convert_actions_dag = ActionsDAG::makeConvertingActions(
+                pipeline.getHeader().getColumnsWithTypeAndName(),
+                output_stream->header.getColumnsWithTypeAndName(),
+                ActionsDAG::MatchColumnsMode::Name);
+        auto convert_actions = std::make_shared<ExpressionActions>(convert_actions_dag);
+
         pipeline.addSimpleTransform([&](const Block & header)
         {
-            return std::make_shared<ConvertingTransform>(header, output_stream->header, ConvertingTransform::MatchColumnsMode::Name);
+            return std::make_shared<ExpressionTransform>(header, convert_actions);
         });
     }
 }
diff --git a/src/Processors/Transforms/ConvertingTransform.cpp b/src/Processors/Transforms/ConvertingTransform.cpp
deleted file mode 100644
index 2d927e0fbde..00000000000
--- a/src/Processors/Transforms/ConvertingTransform.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-#include <Processors/Transforms/ConvertingTransform.h>
-
-#include <Interpreters/castColumn.h>
-#include <Columns/ColumnConst.h>
-#include <Parsers/IAST.h>
-#include <Common/typeid_cast.h>
-#include <Common/quoteString.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int THERE_IS_NO_COLUMN;
-    extern const int ILLEGAL_COLUMN;
-    extern const int NUMBER_OF_COLUMNS_DOESNT_MATCH;
-}
-
-static ColumnPtr castColumnWithDiagnostic(
-    const ColumnWithTypeAndName & src_elem,
-    const ColumnWithTypeAndName & res_elem)
-{
-    try
-    {
-        return castColumn(src_elem, res_elem.type);
-    }
-    catch (Exception & e)
-    {
-        e.addMessage("while converting source column " + backQuoteIfNeed(src_elem.name) +
-                     " to destination column " + backQuoteIfNeed(res_elem.name));
-        throw;
-    }
-}
-
-ConvertingTransform::ConvertingTransform(
-    Block source_header_,
-    Block result_header_,
-    MatchColumnsMode mode_,
-    bool ignore_constant_values_)
-    : ISimpleTransform(std::move(source_header_), std::move(result_header_), false)
-    , conversion(getOutputPort().getHeader().columns())
-    , ignore_constant_values(ignore_constant_values_)
-{
-    const auto & source = getInputPort().getHeader();
-    const auto & result = getOutputPort().getHeader();
-
-    size_t num_input_columns = source.columns();
-    size_t num_result_columns = result.columns();
-
-    if (mode_ == MatchColumnsMode::Position && num_input_columns != num_result_columns)
-        throw Exception("Number of columns doesn't match", ErrorCodes::NUMBER_OF_COLUMNS_DOESNT_MATCH);
-
-    for (size_t result_col_num = 0; result_col_num < num_result_columns; ++result_col_num)
-    {
-        const auto & res_elem = result.getByPosition(result_col_num);
-
-        switch (mode_)
-        {
-            case MatchColumnsMode::Position:
-                conversion[result_col_num] = result_col_num;
-                break;
-
-            case MatchColumnsMode::Name:
-                /// It may seem strange, but sometimes block may have columns with the same name.
-                /// For this specific case, try to get column from the same position if it has correct name first.
-                if (result_col_num < source.columns() && source.getByPosition(result_col_num).name == res_elem.name)
-                    conversion[result_col_num] = result_col_num;
-                else if (source.has(res_elem.name))
-                    conversion[result_col_num] = source.getPositionByName(res_elem.name);
-                else
-                    throw Exception("Cannot find column " + backQuoteIfNeed(res_elem.name) + " in source stream",
-                                    ErrorCodes::THERE_IS_NO_COLUMN);
-                break;
-        }
-
-        const auto & src_elem = source.getByPosition(conversion[result_col_num]);
-
-        /// Check constants.
-
-        if (const auto * res_const = typeid_cast<const ColumnConst *>(res_elem.column.get()))
-        {
-            if (const auto * src_const = typeid_cast<const ColumnConst *>(src_elem.column.get()))
-            {
-                if (!ignore_constant_values && res_const->getField() != src_const->getField())
-                    throw Exception("Cannot convert column " + backQuoteIfNeed(res_elem.name) + " because "
-                                    "it is constant but values of constants are different in source and result",
-                                    ErrorCodes::ILLEGAL_COLUMN);
-            }
-            else
-                throw Exception("Cannot convert column " + backQuoteIfNeed(res_elem.name) + " because "
-                                "it is non constant in source stream but must be constant in result",
-                                ErrorCodes::ILLEGAL_COLUMN);
-        }
-
-        /// Check conversion by dry run CAST function.
-
-        castColumnWithDiagnostic(src_elem, res_elem);
-    }
-}
-
-void ConvertingTransform::transform(Chunk & chunk)
-{
-    const auto & source = getInputPort().getHeader();
-    const auto & result = getOutputPort().getHeader();
-
-    auto num_rows = chunk.getNumRows();
-    auto src_columns = chunk.detachColumns();
-
-    size_t num_res_columns = conversion.size();
-
-    Columns res_columns;
-    res_columns.reserve(num_res_columns);
-
-    for (size_t res_pos = 0; res_pos < num_res_columns; ++res_pos)
-    {
-        auto src_elem = source.getByPosition(conversion[res_pos]);
-        src_elem.column = src_columns[conversion[res_pos]];
-        auto res_elem = result.getByPosition(res_pos);
-
-        if (ignore_constant_values && isColumnConst(*res_elem.column))
-        {
-            res_columns.emplace_back(res_elem.column->cloneResized(num_rows));
-            continue;
-        }
-
-        ColumnPtr converted = castColumnWithDiagnostic(src_elem, res_elem);
-
-        if (!isColumnConst(*res_elem.column))
-            converted = converted->convertToFullColumnIfConst();
-
-        res_columns.emplace_back(std::move(converted));
-    }
-
-    chunk.setColumns(std::move(res_columns), num_rows);
-}
-
-}
diff --git a/src/Processors/Transforms/ConvertingTransform.h b/src/Processors/Transforms/ConvertingTransform.h
deleted file mode 100644
index 4ae74457998..00000000000
--- a/src/Processors/Transforms/ConvertingTransform.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#pragma once
-
-#include <Processors/ISimpleTransform.h>
-#include <Core/ColumnNumbers.h>
-
-
-namespace DB
-{
-
-/** Convert one block structure to another:
-  *
-  * Leaves only necessary columns;
-  *
-  * Columns are searched in source first by name;
-  *  and if there is no column with same name, then by position.
-  *
-  * Converting types of matching columns (with CAST function).
-  *
-  * Materializing columns which are const in source and non-const in result,
-  *  throw if they are const in result and non const in source,
-  *   or if they are const and have different values.
-  */
-class ConvertingTransform : public ISimpleTransform
-{
-public:
-    enum class MatchColumnsMode
-    {
-        /// Require same number of columns in source and result. Match columns by corresponding positions, regardless to names.
-        Position,
-        /// Find columns in source by their names. Allow excessive columns in source.
-        Name,
-    };
-
-    ConvertingTransform(
-        Block source_header_,
-        Block result_header_,
-        MatchColumnsMode mode_,
-        bool ignore_constant_values_ = false); /// Do not check that constants are same. Use value from result_header.
-
-    String getName() const override { return "Converting"; }
-
-    const ColumnNumbers & getConversion() const { return conversion; }
-
-protected:
-    void transform(Chunk & chunk) override;
-
-private:
-    /// How to construct result block. Position in source block, where to get each column.
-    ColumnNumbers conversion;
-    /// Do not check that constants are same. Use value from result_header.
-    /// This is needed in case run functions which are constant in query scope,
-    /// but may return different result being executed remotely, like `now64()` or `randConstant()`.
-    /// In this case we replace constants from remote source to constatns from initiator.
-    bool ignore_constant_values;
-};
-
-}
diff --git a/src/Processors/ya.make b/src/Processors/ya.make
index d9253c7b152..eacc0c44d24 100644
--- a/src/Processors/ya.make
+++ b/src/Processors/ya.make
@@ -95,7 +95,6 @@ SRCS(
     QueryPlan/AddingMissedStep.cpp
     QueryPlan/AggregatingStep.cpp
     QueryPlan/ArrayJoinStep.cpp
-    QueryPlan/ConvertingStep.cpp
     QueryPlan/CreatingSetsStep.cpp
     QueryPlan/CubeStep.cpp
     QueryPlan/DistinctStep.cpp
@@ -135,7 +134,6 @@ SRCS(
     Transforms/AggregatingInOrderTransform.cpp
     Transforms/AggregatingTransform.cpp
     Transforms/ArrayJoinTransform.cpp
-    Transforms/ConvertingTransform.cpp
     Transforms/CopyTransform.cpp
     Transforms/CreatingSetsTransform.cpp
     Transforms/CubeTransform.cpp
diff --git a/src/Storages/StorageBuffer.cpp b/src/Storages/StorageBuffer.cpp
index a2c2325bcc1..30543f2e094 100644
--- a/src/Storages/StorageBuffer.cpp
+++ b/src/Storages/StorageBuffer.cpp
@@ -22,7 +22,7 @@
 #include <common/logger_useful.h>
 #include <common/getThreadId.h>
 #include <ext/range.h>
-#include <Processors/QueryPlan/ConvertingStep.h>
+#include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/Transforms/FilterTransform.h>
 #include <Processors/Transforms/ExpressionTransform.h>
 #include <Processors/Sources/SourceFromInputStream.h>
@@ -248,9 +248,12 @@ void StorageBuffer::read(
                     adding_missed->setStepDescription("Add columns missing in destination table");
                     query_plan.addStep(std::move(adding_missed));
 
-                    auto converting = std::make_unique<ConvertingStep>(
-                            query_plan.getCurrentDataStream(),
-                            header);
+                    auto actions_dag = ActionsDAG::makeConvertingActions(
+                            query_plan.getCurrentDataStream().header.getColumnsWithTypeAndName(),
+                            header.getColumnsWithTypeAndName(),
+                            ActionsDAG::MatchColumnsMode::Name);
+
+                    auto converting = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), actions_dag);
 
                     converting->setStepDescription("Convert destination table columns to Buffer table structure");
                     query_plan.addStep(std::move(converting));
@@ -339,7 +342,12 @@ void StorageBuffer::read(
     /// Convert structure from table to structure from buffer.
     if (!blocksHaveEqualStructure(query_plan.getCurrentDataStream().header, result_header))
     {
-        auto converting = std::make_unique<ConvertingStep>(query_plan.getCurrentDataStream(), result_header);
+        auto convert_actions_dag = ActionsDAG::makeConvertingActions(
+                query_plan.getCurrentDataStream().header.getColumnsWithTypeAndName(),
+                result_header.getColumnsWithTypeAndName(),
+                ActionsDAG::MatchColumnsMode::Name);
+
+        auto converting = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), convert_actions_dag);
         query_plan.addStep(std::move(converting));
     }
 
diff --git a/src/Storages/StorageMerge.cpp b/src/Storages/StorageMerge.cpp
index 3e6f99878a6..a6b3918f8a7 100644
--- a/src/Storages/StorageMerge.cpp
+++ b/src/Storages/StorageMerge.cpp
@@ -25,7 +25,7 @@
 #include <Processors/Transforms/MaterializingTransform.h>
 #include <Processors/ConcatProcessor.h>
 #include <Processors/Transforms/AddingConstColumnTransform.h>
-#include <Processors/Transforms/ConvertingTransform.h>
+#include <Processors/Transforms/ExpressionTransform.h>
 
 
 namespace DB
@@ -456,9 +456,16 @@ void StorageMerge::convertingSourceStream(
     QueryProcessingStage::Enum processed_stage)
 {
     Block before_block_header = pipe.getHeader();
+
+    auto convert_actions_dag = ActionsDAG::makeConvertingActions(
+            pipe.getHeader().getColumnsWithTypeAndName(),
+            header.getColumnsWithTypeAndName(),
+            ActionsDAG::MatchColumnsMode::Name);
+    auto convert_actions = std::make_shared<ExpressionActions>(convert_actions_dag);
+
     pipe.addSimpleTransform([&](const Block & stream_header)
     {
-        return std::make_shared<ConvertingTransform>(stream_header, header, ConvertingTransform::MatchColumnsMode::Name);
+        return std::make_shared<ExpressionTransform>(stream_header, convert_actions);
     });
 
     auto where_expression = query->as<ASTSelectQuery>()->where();
diff --git a/src/Storages/StorageTableFunction.h b/src/Storages/StorageTableFunction.h
index e0488ecf06e..7bdd6469ebc 100644
--- a/src/Storages/StorageTableFunction.h
+++ b/src/Storages/StorageTableFunction.h
@@ -4,7 +4,7 @@
 #include <Processors/Pipe.h>
 #include <Storages/StorageProxy.h>
 #include <Common/CurrentThread.h>
-#include <Processors/Transforms/ConvertingTransform.h>
+#include <Processors/Transforms/ExpressionTransform.h>
 #include <Interpreters/getHeaderForProcessingStage.h>
 
 
@@ -89,12 +89,16 @@ public:
         {
             auto to_header = getHeaderForProcessingStage(*this, column_names, metadata_snapshot,
                                                          query_info, context, processed_stage);
+
+            auto convert_actions_dag = ActionsDAG::makeConvertingActions(
+                    pipe.getHeader().getColumnsWithTypeAndName(),
+                    to_header.getColumnsWithTypeAndName(),
+                    ActionsDAG::MatchColumnsMode::Name);
+            auto convert_actions = std::make_shared<ExpressionActions>(convert_actions_dag);
+
             pipe.addSimpleTransform([&](const Block & header)
             {
-                return std::make_shared<ConvertingTransform>(
-                       header,
-                       to_header,
-                       ConvertingTransform::MatchColumnsMode::Name);
+                return std::make_shared<ExpressionTransform>(header, convert_actions);
             });
         }
         return pipe;
diff --git a/src/Storages/StorageView.cpp b/src/Storages/StorageView.cpp
index 66f06264b82..38349ef8df9 100644
--- a/src/Storages/StorageView.cpp
+++ b/src/Storages/StorageView.cpp
@@ -15,9 +15,8 @@
 
 #include <Processors/Pipe.h>
 #include <Processors/Transforms/MaterializingTransform.h>
-#include <Processors/Transforms/ConvertingTransform.h>
 #include <Processors/QueryPlan/MaterializingStep.h>
-#include <Processors/QueryPlan/ConvertingStep.h>
+#include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/SettingQuotaAndLimitsStep.h>
 
 namespace DB
@@ -94,7 +93,12 @@ void StorageView::read(
 
     /// And also convert to expected structure.
     auto header = metadata_snapshot->getSampleBlockForColumns(column_names, getVirtuals(), getStorageID());
-    auto converting = std::make_unique<ConvertingStep>(query_plan.getCurrentDataStream(), header);
+    auto convert_actions_dag = ActionsDAG::makeConvertingActions(
+            query_plan.getCurrentDataStream().header.getColumnsWithTypeAndName(),
+            header.getColumnsWithTypeAndName(),
+            ActionsDAG::MatchColumnsMode::Name);
+
+    auto converting = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), convert_actions_dag);
     converting->setStepDescription("Convert VIEW subquery result to VIEW table structure");
     query_plan.addStep(std::move(converting));
 }

From d9a83a6086b1a48206ea50892cf6b5ee383bf27e Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 17 Nov 2020 21:36:13 +0300
Subject: [PATCH 21/99] Remove Converting transform and step.

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

diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index 30f063d8b95..0c2e3e36133 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -627,7 +627,7 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
                                 ErrorCodes::ILLEGAL_COLUMN);
         }
 
-        if (!res_elem.type->equals(*res_elem.type))
+        if (!res_elem.type->equals(*src_node->result_type))
         {
             ColumnWithTypeAndName column;
             column.name = res_elem.type->getName();
@@ -638,7 +638,7 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
             auto * left_arg = src_node;
 
             Inputs children = { left_arg, right_arg };
-            src_node = &actions_dag->addFunction(func_builder_cast, children, "", true);
+            src_node = &actions_dag->addFunction(func_builder_cast, std::move(children), {}, true);
         }
 
         if (src_node->result_name != res_elem.name)

From 76346c05630e620ea7bbbfa699d238de793fe7a1 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 17 Nov 2020 22:43:26 +0300
Subject: [PATCH 22/99] Remove Converting transform and step.

---
 src/Functions/materialize.cpp   | 44 +------------------------------
 src/Functions/materialize.h     | 46 +++++++++++++++++++++++++++++++++
 src/Interpreters/ActionsDAG.cpp | 12 +++++++++
 3 files changed, 59 insertions(+), 43 deletions(-)
 create mode 100644 src/Functions/materialize.h

diff --git a/src/Functions/materialize.cpp b/src/Functions/materialize.cpp
index c7e02e615da..c9fdd019be7 100644
--- a/src/Functions/materialize.cpp
+++ b/src/Functions/materialize.cpp
@@ -1,51 +1,9 @@
-#include <Functions/IFunctionImpl.h>
 #include <Functions/FunctionFactory.h>
+#include <Functions/materialize.h>
 
 
 namespace DB
 {
-namespace
-{
-
-/** materialize(x) - materialize the constant
-  */
-class FunctionMaterialize : public IFunction
-{
-public:
-    static constexpr auto name = "materialize";
-    static FunctionPtr create(const Context &)
-    {
-        return std::make_shared<FunctionMaterialize>();
-    }
-
-    bool useDefaultImplementationForNulls() const override
-    {
-        return false;
-    }
-
-    /// Get the function name.
-    String getName() const override
-    {
-        return name;
-    }
-
-    size_t getNumberOfArguments() const override
-    {
-        return 1;
-    }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
-    {
-        return arguments[0];
-    }
-
-    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
-    {
-        return arguments[0].column->convertToFullColumnIfConst();
-    }
-};
-
-}
 
 void registerFunctionMaterialize(FunctionFactory & factory)
 {
diff --git a/src/Functions/materialize.h b/src/Functions/materialize.h
new file mode 100644
index 00000000000..9146911ba93
--- /dev/null
+++ b/src/Functions/materialize.h
@@ -0,0 +1,46 @@
+#pragma once
+#include <Functions/IFunctionImpl.h>
+#include <Functions/FunctionFactory.h>
+
+namespace DB
+{
+
+/** materialize(x) - materialize the constant
+  */
+class FunctionMaterialize : public IFunction
+{
+public:
+    static constexpr auto name = "materialize";
+    static FunctionPtr create(const Context &)
+    {
+        return std::make_shared<FunctionMaterialize>();
+    }
+
+    bool useDefaultImplementationForNulls() const override
+    {
+        return false;
+    }
+
+    /// Get the function name.
+    String getName() const override
+    {
+        return name;
+    }
+
+    size_t getNumberOfArguments() const override
+    {
+        return 1;
+    }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        return arguments[0];
+    }
+
+    ColumnPtr executeImpl(ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    {
+        return arguments[0].column->convertToFullColumnIfConst();
+    }
+};
+
+}
diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index 0c2e3e36133..cc6d03be440 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -5,6 +5,7 @@
 #include <Functions/IFunction.h>
 #include <Functions/IFunctionAdaptors.h>
 #include <Functions/FunctionsConversion.h>
+#include <Functions/materialize.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/ExpressionJIT.h>
 #include <IO/WriteBufferFromString.h>
@@ -575,6 +576,11 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
     FunctionOverloadResolverPtr func_builder_cast =
             std::make_shared<FunctionOverloadResolverAdaptor>(CastOverloadResolver::createImpl(false));
 
+    FunctionOverloadResolverPtr func_builder_materialize =
+            std::make_shared<FunctionOverloadResolverAdaptor>(
+                    std::make_unique<DefaultOverloadResolver>(
+                            std::make_shared<FunctionMaterialize>()));
+
     std::map<std::string_view, std::list<size_t>> inputs;
     if (mode == MatchColumnsMode::Name)
     {
@@ -641,6 +647,12 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
             src_node = &actions_dag->addFunction(func_builder_cast, std::move(children), {}, true);
         }
 
+        if (src_node->column && isColumnConst(*src_node->column))
+        {
+            Inputs children = {src_node};
+            src_node = &actions_dag->addFunction(func_builder_materialize, std::move(children), {}, true);
+        }
+
         if (src_node->result_name != res_elem.name)
             src_node = const_cast<Node *>(&actions_dag->addAlias(src_node->result_name, res_elem.name, true));
 

From 8dd76a3ab5547ad339e74cdb06dfcdbb0af9234a Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Wed, 18 Nov 2020 00:31:30 +0300
Subject: [PATCH 23/99] Remove Converting transform and step.

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

diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index cc6d03be440..9d4e5a24416 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -647,7 +647,7 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
             src_node = &actions_dag->addFunction(func_builder_cast, std::move(children), {}, true);
         }
 
-        if (src_node->column && isColumnConst(*src_node->column))
+        if (src_node->column && isColumnConst(*src_node->column) && !(res_elem.column && isColumnConst(*res_elem.column)))
         {
             Inputs children = {src_node};
             src_node = &actions_dag->addFunction(func_builder_materialize, std::move(children), {}, true);

From a24dab766fc636047c6721512f3e9dab2eac597f Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Wed, 18 Nov 2020 12:08:51 +0300
Subject: [PATCH 24/99] Remove Converting transform and step.

---
 src/Interpreters/ActionsDAG.cpp | 7 +++++--
 src/Interpreters/ActionsDAG.h   | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index 9d4e5a24416..a08945b51fa 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -106,8 +106,11 @@ const ActionsDAG::Node & ActionsDAG::addColumn(ColumnWithTypeAndName column, boo
 
 const ActionsDAG::Node & ActionsDAG::addAlias(const std::string & name, std::string alias, bool can_replace)
 {
-    auto & child = getNode(name);
+    return addAlias(getNode(name), alias, can_replace);
+}
 
+ActionsDAG::Node & ActionsDAG::addAlias(Node & child, std::string alias, bool can_replace)
+{
     Node node;
     node.type = ActionType::ALIAS;
     node.result_type = child.result_type;
@@ -654,7 +657,7 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
         }
 
         if (src_node->result_name != res_elem.name)
-            src_node = const_cast<Node *>(&actions_dag->addAlias(src_node->result_name, res_elem.name, true));
+            src_node = &actions_dag->addAlias(*src_node, res_elem.name, true);
 
         projection[result_col_num] = src_node;
     }
diff --git a/src/Interpreters/ActionsDAG.h b/src/Interpreters/ActionsDAG.h
index 2e16475180b..20e9399612c 100644
--- a/src/Interpreters/ActionsDAG.h
+++ b/src/Interpreters/ActionsDAG.h
@@ -249,7 +249,8 @@ private:
     Node & addNode(Node node, bool can_replace = false);
     Node & getNode(const std::string & name);
 
-    ActionsDAG::Node & addFunction(
+    Node & addAlias(Node & child, std::string alias, bool can_replace);
+    Node & addFunction(
             const FunctionOverloadResolverPtr & function,
             Inputs children,
             std::string result_name,

From 354620b5a14590055f101dc9b128a11bd0b294d9 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Wed, 18 Nov 2020 12:35:32 +0300
Subject: [PATCH 25/99] Remove Converting transform and step.

---
 src/Functions/FunctionsConversion.h | 49 ++++++++++++++++++++++-------
 src/Interpreters/ActionsDAG.cpp     |  8 +++--
 2 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/src/Functions/FunctionsConversion.h b/src/Functions/FunctionsConversion.h
index 70e8904cfc1..b4593730ae0 100644
--- a/src/Functions/FunctionsConversion.h
+++ b/src/Functions/FunctionsConversion.h
@@ -1874,8 +1874,15 @@ class ExecutableFunctionCast : public IExecutableFunctionImpl
 public:
     using WrapperType = std::function<ColumnPtr(ColumnsWithTypeAndName &, const DataTypePtr &, const ColumnNullable *, size_t)>;
 
-    explicit ExecutableFunctionCast(WrapperType && wrapper_function_, const char * name_)
-            : wrapper_function(std::move(wrapper_function_)), name(name_) {}
+    struct Diagnostic
+    {
+        std::string column_from;
+        std::string column_to;
+    };
+
+    explicit ExecutableFunctionCast(
+            WrapperType && wrapper_function_, const char * name_, std::optional<Diagnostic> diagnostic_)
+            : wrapper_function(std::move(wrapper_function_)), name(name_), diagnostic(std::move(diagnostic_)) {}
 
     String getName() const override { return name; }
 
@@ -1887,7 +1894,17 @@ protected:
         if (arguments.size() > 2)
             new_arguments.insert(std::end(new_arguments), std::next(std::begin(arguments), 2), std::end(arguments));
 
-        return wrapper_function(new_arguments, result_type, nullptr, input_rows_count);
+        try
+        {
+            return wrapper_function(new_arguments, result_type, nullptr, input_rows_count);
+        }
+        catch (Exception & e)
+        {
+            if (diagnostic)
+                e.addMessage("while converting source column " + backQuoteIfNeed(diagnostic->column_from) +
+                             " to destination column " + backQuoteIfNeed(diagnostic->column_to));
+            throw;
+        }
     }
 
     bool useDefaultImplementationForNulls() const override { return false; }
@@ -1898,6 +1915,7 @@ protected:
 private:
     WrapperType wrapper_function;
     const char * name;
+    std::optional<Diagnostic> diagnostic;
 };
 
 
@@ -1908,11 +1926,12 @@ class FunctionCast final : public IFunctionBaseImpl
 public:
     using WrapperType = std::function<ColumnPtr(ColumnsWithTypeAndName &, const DataTypePtr &, const ColumnNullable *, size_t)>;
     using MonotonicityForRange = std::function<Monotonicity(const IDataType &, const Field &, const Field &)>;
+    using Diagnostic = ExecutableFunctionCast::Diagnostic;
 
     FunctionCast(const char * name_, MonotonicityForRange && monotonicity_for_range_
-            , const DataTypes & argument_types_, const DataTypePtr & return_type_)
-            : name(name_), monotonicity_for_range(monotonicity_for_range_)
-            , argument_types(argument_types_), return_type(return_type_)
+        , const DataTypes & argument_types_, const DataTypePtr & return_type_, std::optional<Diagnostic> diagnostic_)
+        : name(name_), monotonicity_for_range(monotonicity_for_range_)
+        , argument_types(argument_types_), return_type(return_type_), diagnostic(std::move(diagnostic_))
     {
     }
 
@@ -1922,7 +1941,7 @@ public:
     ExecutableFunctionImplPtr prepare(const ColumnsWithTypeAndName & /*sample_columns*/) const override
     {
         return std::make_unique<ExecutableFunctionCast>(
-                prepareUnpackDictionaries(getArgumentTypes()[0], getResultType()), name);
+                prepareUnpackDictionaries(getArgumentTypes()[0], getResultType()), name, diagnostic);
     }
 
     String getName() const override { return name; }
@@ -1948,6 +1967,8 @@ private:
     DataTypes argument_types;
     DataTypePtr return_type;
 
+    std::optional<Diagnostic> diagnostic;
+
     template <typename DataType>
     WrapperType createWrapper(const DataTypePtr & from_type, const DataType * const, bool requested_result_is_nullable) const
     {
@@ -2558,14 +2579,19 @@ class CastOverloadResolver : public IFunctionOverloadResolverImpl
 {
 public:
     using MonotonicityForRange = FunctionCast::MonotonicityForRange;
+    using Diagnostic = FunctionCast::Diagnostic;
 
     static constexpr auto name = "CAST";
 
     static FunctionOverloadResolverImplPtr create(const Context & context);
-    static FunctionOverloadResolverImplPtr createImpl(bool keep_nullable) { return std::make_unique<CastOverloadResolver>(keep_nullable); }
+    static FunctionOverloadResolverImplPtr createImpl(bool keep_nullable, std::optional<Diagnostic> diagnostic = {})
+    {
+        return std::make_unique<CastOverloadResolver>(keep_nullable, std::move(diagnostic));
+    }
 
-    explicit CastOverloadResolver(bool keep_nullable_)
-        : keep_nullable(keep_nullable_)
+
+    explicit CastOverloadResolver(bool keep_nullable_, std::optional<Diagnostic> diagnostic_ = {})
+        : keep_nullable(keep_nullable_), diagnostic(std::move(diagnostic_))
     {}
 
     String getName() const override { return name; }
@@ -2584,7 +2610,7 @@ protected:
             data_types[i] = arguments[i].type;
 
         auto monotonicity = getMonotonicityInformation(arguments.front().type, return_type.get());
-        return std::make_unique<FunctionCast>(name, std::move(monotonicity), data_types, return_type);
+        return std::make_unique<FunctionCast>(name, std::move(monotonicity), data_types, return_type, diagnostic);
     }
 
     DataTypePtr getReturnType(const ColumnsWithTypeAndName & arguments) const override
@@ -2612,6 +2638,7 @@ protected:
 
 private:
     bool keep_nullable;
+    std::optional<Diagnostic> diagnostic;
 
     template <typename DataType>
     static auto monotonicityForType(const DataType * const)
diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index a08945b51fa..438badf09e7 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -576,9 +576,6 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
     auto actions_dag = std::make_shared<ActionsDAG>(source);
     std::vector<Node *> projection(num_result_columns);
 
-    FunctionOverloadResolverPtr func_builder_cast =
-            std::make_shared<FunctionOverloadResolverAdaptor>(CastOverloadResolver::createImpl(false));
-
     FunctionOverloadResolverPtr func_builder_materialize =
             std::make_shared<FunctionOverloadResolverAdaptor>(
                     std::make_unique<DefaultOverloadResolver>(
@@ -646,6 +643,11 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
             auto * right_arg = const_cast<Node *>(&actions_dag->addColumn(std::move(column), true));
             auto * left_arg = src_node;
 
+            CastOverloadResolver::Diagnostic diagnostic = {src_node->result_name, res_elem.name};
+            FunctionOverloadResolverPtr func_builder_cast =
+                    std::make_shared<FunctionOverloadResolverAdaptor>(
+                            CastOverloadResolver::createImpl(false, std::move(diagnostic)));
+
             Inputs children = { left_arg, right_arg };
             src_node = &actions_dag->addFunction(func_builder_cast, std::move(children), {}, true);
         }

From 947a29e378261954c70ca32845c1da0c7c322aa6 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Wed, 18 Nov 2020 12:38:03 +0300
Subject: [PATCH 26/99] Remove Converting transform and step.

---
 src/Functions/FunctionsConversion.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Functions/FunctionsConversion.h b/src/Functions/FunctionsConversion.h
index b4593730ae0..1e2249bf583 100644
--- a/src/Functions/FunctionsConversion.h
+++ b/src/Functions/FunctionsConversion.h
@@ -35,6 +35,7 @@
 #include <Columns/ColumnsCommon.h>
 #include <Common/FieldVisitors.h>
 #include <Common/assert_cast.h>
+#include <Common/quoteString.h>
 #include <Functions/IFunctionAdaptors.h>
 #include <Functions/FunctionsMiscellaneous.h>
 #include <Functions/FunctionHelpers.h>

From 266596783a0fba96e10737a0d90400add9055ff1 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Wed, 18 Nov 2020 12:45:46 +0300
Subject: [PATCH 27/99] Remove Converting transform and step.

---
 src/Functions/FunctionsConversion.h | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Functions/FunctionsConversion.h b/src/Functions/FunctionsConversion.h
index 1e2249bf583..3421e56a1cc 100644
--- a/src/Functions/FunctionsConversion.h
+++ b/src/Functions/FunctionsConversion.h
@@ -1941,8 +1941,18 @@ public:
 
     ExecutableFunctionImplPtr prepare(const ColumnsWithTypeAndName & /*sample_columns*/) const override
     {
-        return std::make_unique<ExecutableFunctionCast>(
-                prepareUnpackDictionaries(getArgumentTypes()[0], getResultType()), name, diagnostic);
+        try
+        {
+            return std::make_unique<ExecutableFunctionCast>(
+                    prepareUnpackDictionaries(getArgumentTypes()[0], getResultType()), name, diagnostic);
+        }
+        catch (Exception & e)
+        {
+            if (diagnostic)
+                e.addMessage("while converting source column " + backQuoteIfNeed(diagnostic->column_from) +
+                             " to destination column " + backQuoteIfNeed(diagnostic->column_to));
+            throw;
+        }
     }
 
     String getName() const override { return name; }

From 12217fb7adf3b1de5113052317c1e7cee00fb62d Mon Sep 17 00:00:00 2001
From: Ivan <5627721+abyss7@users.noreply.github.com>
Date: Wed, 18 Nov 2020 13:44:16 +0300
Subject: [PATCH 28/99] Fix build

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

diff --git a/src/Interpreters/ExpressionJIT.cpp b/src/Interpreters/ExpressionJIT.cpp
index 056d23299b7..d097b149433 100644
--- a/src/Interpreters/ExpressionJIT.cpp
+++ b/src/Interpreters/ExpressionJIT.cpp
@@ -275,7 +275,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr execute(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t block_size) override
+    ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t block_size) const override
     {
         auto col_res = result_type->createColumn();
 

From c2ff8a421c2ba7597af61e3ea3e16b1b87798896 Mon Sep 17 00:00:00 2001
From: sundy-li <543950155@qq.com>
Date: Wed, 18 Nov 2020 19:57:28 +0800
Subject: [PATCH 29/99] bump up rocksdb version to  v6.14.5

---
 .gitmodules                          | 2 +-
 contrib/rocksdb-cmake/CMakeLists.txt | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 61b1fe27a4c..081724c54c8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -196,7 +196,7 @@
 [submodule "contrib/rocksdb"]
 	path = contrib/rocksdb
 	url = https://github.com/facebook/rocksdb
-	branch = v6.11.4
+	branch = v6.14.5
 [submodule "contrib/xz"]
        path = contrib/xz
        url = https://github.com/xz-mirror/xz
diff --git a/contrib/rocksdb-cmake/CMakeLists.txt b/contrib/rocksdb-cmake/CMakeLists.txt
index 07c6861b406..9e850a6e781 100644
--- a/contrib/rocksdb-cmake/CMakeLists.txt
+++ b/contrib/rocksdb-cmake/CMakeLists.txt
@@ -347,8 +347,9 @@ set(SOURCES
         ${ROCKSDB_SOURCE_DIR}/db/blob/blob_file_builder.cc
         ${ROCKSDB_SOURCE_DIR}/db/blob/blob_file_garbage.cc
         ${ROCKSDB_SOURCE_DIR}/db/blob/blob_file_meta.cc
+        ${ROCKSDB_SOURCE_DIR}/db/blob/blob_file_reader.cc
         ${ROCKSDB_SOURCE_DIR}/db/blob/blob_log_format.cc
-        ${ROCKSDB_SOURCE_DIR}/db/blob/blob_log_reader.cc
+        ${ROCKSDB_SOURCE_DIR}/db/blob/blob_log_sequential_reader.cc
         ${ROCKSDB_SOURCE_DIR}/db/blob/blob_log_writer.cc
         ${ROCKSDB_SOURCE_DIR}/db/builder.cc
         ${ROCKSDB_SOURCE_DIR}/db/c.cc
@@ -394,6 +395,8 @@ set(SOURCES
         ${ROCKSDB_SOURCE_DIR}/db/memtable_list.cc
         ${ROCKSDB_SOURCE_DIR}/db/merge_helper.cc
         ${ROCKSDB_SOURCE_DIR}/db/merge_operator.cc
+        ${ROCKSDB_SOURCE_DIR}/db/output_validator.cc
+        ${ROCKSDB_SOURCE_DIR}/db/periodic_work_scheduler.cc
         ${ROCKSDB_SOURCE_DIR}/db/range_del_aggregator.cc
         ${ROCKSDB_SOURCE_DIR}/db/range_tombstone_fragmenter.cc
         ${ROCKSDB_SOURCE_DIR}/db/repair.cc
@@ -451,12 +454,12 @@ set(SOURCES
         ${ROCKSDB_SOURCE_DIR}/monitoring/perf_level.cc
         ${ROCKSDB_SOURCE_DIR}/monitoring/persistent_stats_history.cc
         ${ROCKSDB_SOURCE_DIR}/monitoring/statistics.cc
-        ${ROCKSDB_SOURCE_DIR}/monitoring/stats_dump_scheduler.cc
         ${ROCKSDB_SOURCE_DIR}/monitoring/thread_status_impl.cc
         ${ROCKSDB_SOURCE_DIR}/monitoring/thread_status_updater.cc
         ${ROCKSDB_SOURCE_DIR}/monitoring/thread_status_util.cc
         ${ROCKSDB_SOURCE_DIR}/monitoring/thread_status_util_debug.cc
         ${ROCKSDB_SOURCE_DIR}/options/cf_options.cc
+        ${ROCKSDB_SOURCE_DIR}/options/configurable.cc
         ${ROCKSDB_SOURCE_DIR}/options/db_options.cc
         ${ROCKSDB_SOURCE_DIR}/options/options.cc
         ${ROCKSDB_SOURCE_DIR}/options/options_helper.cc
@@ -507,6 +510,7 @@ set(SOURCES
         ${ROCKSDB_SOURCE_DIR}/table/sst_file_dumper.cc
         ${ROCKSDB_SOURCE_DIR}/table/sst_file_reader.cc
         ${ROCKSDB_SOURCE_DIR}/table/sst_file_writer.cc
+        ${ROCKSDB_SOURCE_DIR}/table/table_factory.cc
         ${ROCKSDB_SOURCE_DIR}/table/table_properties.cc
         ${ROCKSDB_SOURCE_DIR}/table/two_level_iterator.cc
         ${ROCKSDB_SOURCE_DIR}/test_util/sync_point.cc
@@ -515,6 +519,7 @@ set(SOURCES
         ${ROCKSDB_SOURCE_DIR}/test_util/transaction_test_util.cc
         ${ROCKSDB_SOURCE_DIR}/tools/block_cache_analyzer/block_cache_trace_analyzer.cc
         ${ROCKSDB_SOURCE_DIR}/tools/dump/db_dump_tool.cc
+        ${ROCKSDB_SOURCE_DIR}/tools/io_tracer_parser_tool.cc
         ${ROCKSDB_SOURCE_DIR}/tools/ldb_cmd.cc
         ${ROCKSDB_SOURCE_DIR}/tools/ldb_tool.cc
         ${ROCKSDB_SOURCE_DIR}/tools/sst_dump_tool.cc

From 7080f424e27f0e7e2c75804d2edd65bcbaa8c0fa Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Wed, 18 Nov 2020 15:04:13 +0300
Subject: [PATCH 30/99] Fix bug for skip indices and make code more complex

---
 .../MergeTree/IMergeTreeDataPartWriter.cpp    | 19 ++++++--
 .../MergeTree/IMergeTreeDataPartWriter.h      | 18 ++++---
 .../MergeTreeDataPartWriterOnDisk.cpp         | 47 +++++++++++++------
 .../MergeTree/MergeTreeDataPartWriterOnDisk.h | 13 +++--
 .../MergeTree/MergeTreeDataPartWriterWide.cpp |  2 +-
 .../0_stateless/00955_test_final_mark.sql     |  8 ++--
 6 files changed, 73 insertions(+), 34 deletions(-)

diff --git a/src/Storages/MergeTree/IMergeTreeDataPartWriter.cpp b/src/Storages/MergeTree/IMergeTreeDataPartWriter.cpp
index 1cddeda9a5d..d291a447d1c 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPartWriter.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPartWriter.cpp
@@ -44,16 +44,27 @@ void IMergeTreeDataPartWriter::next()
     index_offset = next_index_offset;
 }
 
-void IMergeTreeDataPartWriter::adjustLastUnfinishedMark(size_t new_block_index_granularity)
+bool IMergeTreeDataPartWriter::adjustLastUnfinishedMark(size_t new_block_index_granularity)
 {
-    /// If amount of rest rows in last granule more than granularity of the new block
+    /// If amount of rest rows in the last granule more then granularity of the new block
     /// than finish it.
     if (!index_granularity.empty() && index_offset > new_block_index_granularity)
     {
         size_t already_written_rows_in_last_granule = index_granularity.getLastMarkRows() - index_offset;
-        index_granularity.setLastMarkRows(already_written_rows_in_last_granule);
-        index_offset = 0;
+        /// We can still write some rows to the last granule
+        if (already_written_rows_in_last_granule < new_block_index_granularity)
+        {
+            index_granularity.setLastMarkRows(new_block_index_granularity);
+            index_offset = new_block_index_granularity - already_written_rows_in_last_granule;
+        }
+        else /// Our last granule is already full, let's start the new one
+        {
+            index_granularity.setLastMarkRows(already_written_rows_in_last_granule);
+            index_offset = 0;
+        }
+        return true;
     }
+    return false;
 }
 
 IMergeTreeDataPartWriter::~IMergeTreeDataPartWriter() = default;
diff --git a/src/Storages/MergeTree/IMergeTreeDataPartWriter.h b/src/Storages/MergeTree/IMergeTreeDataPartWriter.h
index 906c3e1ed85..9a6ffca1adb 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPartWriter.h
+++ b/src/Storages/MergeTree/IMergeTreeDataPartWriter.h
@@ -63,29 +63,33 @@ protected:
     size_t getCurrentMark() const { return current_mark; }
     size_t getIndexOffset() const { return index_offset; }
     /// Finishes our current unfinished mark if we have already written more rows for it
-    /// than granularity in the new block.
+    /// than granularity in the new block. Return true if last mark actually was adjusted.
     /// Example:
     /// __|________|___. <- previous block with granularity 8 and last unfinished mark with 3 rows
     /// new_block_index_granularity = 2, so
     /// __|________|___|__|__|__|
     ///                ^ finish last unfinished mark, new marks will have granularity 2
-    void adjustLastUnfinishedMark(size_t new_block_index_granularity);
+    bool adjustLastUnfinishedMark(size_t new_block_index_granularity);
 
     using SerializationState = IDataType::SerializeBinaryBulkStatePtr;
     using SerializationStates = std::unordered_map<String, SerializationState>;
 
     MergeTreeData::DataPartPtr data_part;
     const MergeTreeData & storage;
-    StorageMetadataPtr metadata_snapshot;
-    NamesAndTypesList columns_list;
-    MergeTreeIndices skip_indices;
+    const StorageMetadataPtr metadata_snapshot;
+    const NamesAndTypesList columns_list;
+    const MergeTreeIndices skip_indices;
     MergeTreeIndexGranularity index_granularity;
-    MergeTreeWriterSettings settings;
-    bool with_final_mark;
+    const MergeTreeWriterSettings settings;
+    const bool with_final_mark;
 
     size_t next_mark = 0;
     size_t next_index_offset = 0;
 
+    /// When we were writing fresh block granularity of the last mark was adjusted
+    /// See adjustLastUnfinishedMark
+    bool last_granule_was_adjusted = false;
+
     MutableColumns index_columns;
 
 private:
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
index 0ec10f9db76..31d78dd48a7 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
@@ -184,7 +184,8 @@ void MergeTreeDataPartWriterOnDisk::initSkipIndices()
                         default_codec, settings.max_compress_block_size,
                         0, settings.aio_threshold));
         skip_indices_aggregators.push_back(index_helper->createIndexAggregator());
-        skip_index_filling.push_back(0);
+        marks_in_skip_index_aggregator.push_back(0);
+        rows_in_skip_index_aggregator_last_mark.push_back(0);
     }
 
     skip_indices_initialized = true;
@@ -256,9 +257,11 @@ void MergeTreeDataPartWriterOnDisk::calculateAndSerializeSkipIndices(const Block
         skip_index_current_data_mark = skip_index_data_mark;
         while (prev_pos < rows)
         {
+            bool new_block_started = prev_pos == 0;
             UInt64 limit = 0;
             size_t current_index_offset = getIndexOffset();
-            if (prev_pos == 0 && current_index_offset != 0)
+            /// We start new block, but have an offset from previous one
+            if (new_block_started && current_index_offset != 0)
             {
                 limit = current_index_offset;
             }
@@ -270,10 +273,15 @@ void MergeTreeDataPartWriterOnDisk::calculateAndSerializeSkipIndices(const Block
             else
             {
                 limit = index_granularity.getMarkRows(skip_index_current_data_mark);
+                /// We just started new block serialization but last unfinished mark was shrinked to it's current_size
+                /// it may happen that we have already aggregated current_size of rows of more for skip_index, but not flushed it to disk
+                /// because previous granule size was bigger. So do it here.
+                if (new_block_started && last_granule_was_adjusted && rows_in_skip_index_aggregator_last_mark[i] >= limit)
+                    accountMarkForSkipIdxAndFlushIfNeeded(i);
+
                 if (skip_indices_aggregators[i]->empty())
                 {
                     skip_indices_aggregators[i] = index_helper->createIndexAggregator();
-                    skip_index_filling[i] = 0;
 
                     if (stream.compressed.offset() >= settings.min_compress_block_size)
                         stream.compressed.next();
@@ -285,24 +293,19 @@ void MergeTreeDataPartWriterOnDisk::calculateAndSerializeSkipIndices(const Block
                     if (settings.can_use_adaptive_granularity)
                         writeIntBinary(1UL, stream.marks);
                 }
+
                 /// this mark is aggregated, go to the next one
                 skip_index_current_data_mark++;
             }
 
             size_t pos = prev_pos;
             skip_indices_aggregators[i]->update(skip_indexes_block, &pos, limit);
+            rows_in_skip_index_aggregator_last_mark[i] = (pos - prev_pos);
 
-            if (pos == prev_pos + limit)
-            {
-                ++skip_index_filling[i];
-
-                /// write index if it is filled
-                if (skip_index_filling[i] == index_helper->index.granularity)
-                {
-                    skip_indices_aggregators[i]->getGranuleAndReset()->serializeBinary(stream.compressed);
-                    skip_index_filling[i] = 0;
-                }
-            }
+            /// We just aggregated all rows in current mark, add new mark to skip_index marks counter
+            /// and flush on disk if we already aggregated required amount of marks.
+            if (rows_in_skip_index_aggregator_last_mark[i] == limit)
+                accountMarkForSkipIdxAndFlushIfNeeded(i);
             prev_pos = pos;
         }
     }
@@ -360,7 +363,21 @@ void MergeTreeDataPartWriterOnDisk::finishSkipIndicesSerialization(
 
     skip_indices_streams.clear();
     skip_indices_aggregators.clear();
-    skip_index_filling.clear();
+    marks_in_skip_index_aggregator.clear();
+    rows_in_skip_index_aggregator_last_mark.clear();
+}
+
+void MergeTreeDataPartWriterOnDisk::accountMarkForSkipIdxAndFlushIfNeeded(size_t skip_index_pos)
+{
+    ++marks_in_skip_index_aggregator[skip_index_pos];
+
+    /// write index if it is filled
+    if (marks_in_skip_index_aggregator[skip_index_pos] == skip_indices[skip_index_pos]->index.granularity)
+    {
+        skip_indices_aggregators[skip_index_pos]->getGranuleAndReset()->serializeBinary(skip_indices_streams[skip_index_pos]->compressed);
+        marks_in_skip_index_aggregator[skip_index_pos] = 0;
+        rows_in_skip_index_aggregator_last_mark[skip_index_pos] = 0;
+    }
 }
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h
index 55da413c9fb..743b130188d 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h
@@ -97,8 +97,7 @@ protected:
     const String marks_file_extension;
     CompressionCodecPtr default_codec;
 
-    bool compute_granularity;
-    bool need_finish_last_granule;
+    const bool compute_granularity;
 
     /// Number of marsk in data from which skip indices have to start
     /// aggregation. I.e. it's data mark number, not skip indices mark.
@@ -106,7 +105,10 @@ protected:
 
     std::vector<StreamPtr> skip_indices_streams;
     MergeTreeIndexAggregators skip_indices_aggregators;
-    std::vector<size_t> skip_index_filling;
+    /// Amount of marks currently serialized in skip index aggregator
+    std::vector<size_t> marks_in_skip_index_aggregator;
+    /// Amount of rows currently serialized in skip index aggregator for last mark
+    std::vector<size_t> rows_in_skip_index_aggregator_last_mark;
 
     std::unique_ptr<WriteBufferFromFileBase> index_file_stream;
     std::unique_ptr<HashingWriteBuffer> index_stream;
@@ -125,6 +127,11 @@ protected:
 private:
     /// Index is already serialized up to this mark.
     size_t index_mark = 0;
+
+    /// Increment corresponding marks_in_skip_index_aggregator[skip_index_pos]
+    /// value and flush skip_indices_streams[skip_index_pos] to disk if we have
+    /// aggregated enough marks
+    void accountMarkForSkipIdxAndFlushIfNeeded(size_t skip_index_pos);
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
index 0317f52001b..21ae8335af1 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
@@ -96,7 +96,7 @@ void MergeTreeDataPartWriterWide::write(const Block & block,
     {
         size_t index_granularity_for_block = computeIndexGranularity(block);
         /// Finish last unfinished mark rows it it's required
-        adjustLastUnfinishedMark(index_granularity_for_block);
+        last_granule_was_adjusted = adjustLastUnfinishedMark(index_granularity_for_block);
         /// Fill index granularity with granules of new size
         fillIndexGranularity(index_granularity_for_block, block.rows());
     }
diff --git a/tests/queries/0_stateless/00955_test_final_mark.sql b/tests/queries/0_stateless/00955_test_final_mark.sql
index 50ca3d008f9..929ac931a94 100644
--- a/tests/queries/0_stateless/00955_test_final_mark.sql
+++ b/tests/queries/0_stateless/00955_test_final_mark.sql
@@ -119,7 +119,7 @@ INSERT INTO mt_without_pk (d, x, y, z, `n.Age`, `n.Name`) VALUES (toDate('2018-1
 
 SELECT COUNT(*) FROM mt_without_pk WHERE x > toDateTime('2018-10-01 23:57:57');
 
-SELECT sum(marks) FROM system.parts WHERE table = 'mt_without_pk' AND active=1;
+SELECT sum(marks) FROM system.parts WHERE table = 'mt_without_pk' AND active=1 AND database=currentDatabase();
 
 INSERT INTO mt_without_pk (d, x, y, z, `n.Age`, `n.Name`) VALUES (toDate('2018-10-01'), toDateTime('2018-10-01 07:57:57'), [4, 4, 4], 14, [111, 222], ['Lui', 'Dave']), (toDate('2018-10-01'), toDateTime('2018-10-01 08:57:57'), [5, 5, 5], 15, [333, 444], ['John', 'Mike']), (toDate('2018-10-01'), toDateTime('2018-10-01 09:57:57'), [6, 6, 6], 16, [555, 666, 777], ['Alex', 'Jim', 'Tom']);
 
@@ -127,7 +127,7 @@ OPTIMIZE TABLE mt_without_pk FINAL;
 
 SELECT COUNT(*) FROM mt_without_pk WHERE x > toDateTime('2018-10-01 23:57:57');
 
-SELECT sum(marks) FROM system.parts WHERE table = 'mt_without_pk' AND active=1;
+SELECT sum(marks) FROM system.parts WHERE table = 'mt_without_pk' AND active=1  AND database=currentDatabase();
 
 DROP TABLE IF EXISTS mt_without_pk;
 
@@ -149,7 +149,7 @@ INSERT INTO mt_with_small_granularity (d, x, y, z, `n.Age`, `n.Name`) VALUES (to
 
 SELECT COUNT(*) FROM mt_with_small_granularity WHERE x > toDateTime('2018-10-01 23:57:57');
 
-SELECT sum(marks) FROM system.parts WHERE table = 'mt_with_small_granularity' AND active=1;
+SELECT sum(marks) FROM system.parts WHERE table = 'mt_with_small_granularity' AND active=1  AND database=currentDatabase();
 
 INSERT INTO mt_with_small_granularity (d, x, y, z, `n.Age`, `n.Name`) VALUES (toDate('2018-10-01'), toDateTime('2018-10-01 07:57:57'), [4, 4, 4], 14, [111, 222], ['Lui', 'Dave']), (toDate('2018-10-01'), toDateTime('2018-10-01 08:57:57'), [5, 5, 5], 15, [333, 444], ['John', 'Mike']), (toDate('2018-10-01'), toDateTime('2018-10-01 09:57:57'), [6, 6, 6], 16, [555, 666, 777], ['Alex', 'Jim', 'Tom']);
 
@@ -157,6 +157,6 @@ OPTIMIZE TABLE mt_with_small_granularity FINAL;
 
 SELECT COUNT(*) FROM mt_with_small_granularity WHERE x > toDateTime('2018-10-01 23:57:57');
 
-SELECT sum(marks) FROM system.parts WHERE table = 'mt_with_small_granularity' AND active=1;
+SELECT sum(marks) FROM system.parts WHERE table = 'mt_with_small_granularity' AND active=1  AND database=currentDatabase();
 
 DROP TABLE IF EXISTS mt_with_small_granularity;

From ddd62edf53a667063d37ca7aefa37dd955fdd7e3 Mon Sep 17 00:00:00 2001
From: sundy-li <543950155@qq.com>
Date: Wed, 18 Nov 2020 20:12:18 +0800
Subject: [PATCH 31/99] add submodule commits

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

diff --git a/contrib/rocksdb b/contrib/rocksdb
index 963314ffd68..35d8e36ef1b 160000
--- a/contrib/rocksdb
+++ b/contrib/rocksdb
@@ -1 +1 @@
-Subproject commit 963314ffd681596ef2738a95249fe4c1163ef87a
+Subproject commit 35d8e36ef1b8e3e0759ca81215f855226a0a54bd

From f7041c1b55c4b6b29fe74f0b5e51df8a20419ddd Mon Sep 17 00:00:00 2001
From: Ivan Lezhankin <ilezhankin@yandex-team.ru>
Date: Wed, 18 Nov 2020 16:24:16 +0300
Subject: [PATCH 32/99] Fix style and ya.make

---
 src/Functions/array/arrayScalarProduct.h | 6 ++++--
 src/Functions/ya.make                    | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Functions/array/arrayScalarProduct.h b/src/Functions/array/arrayScalarProduct.h
index a74bdf147ba..2ff8b88b2f0 100644
--- a/src/Functions/array/arrayScalarProduct.h
+++ b/src/Functions/array/arrayScalarProduct.h
@@ -139,9 +139,11 @@ public:
             || (res = executeNumber<Int64>(arguments))
             || (res = executeNumber<Float32>(arguments))
             || (res = executeNumber<Float64>(arguments))))
-            throw Exception{
+            throw Exception
+            {
                 "Illegal column " + arguments[0].column->getName() + " of first argument of function " + getName(),
-                ErrorCodes::ILLEGAL_COLUMN};
+                ErrorCodes::ILLEGAL_COLUMN
+            };
 
         return res;
     }
diff --git a/src/Functions/ya.make b/src/Functions/ya.make
index 06a26355631..847f1d76730 100644
--- a/src/Functions/ya.make
+++ b/src/Functions/ya.make
@@ -423,6 +423,7 @@ SRCS(
     subtractYears.cpp
     tan.cpp
     tanh.cpp
+    tcpPort.cpp
     tgamma.cpp
     throwIf.cpp
     tid.cpp

From ca0740d333df3330bd40dc5a776eb4b4076cd5f0 Mon Sep 17 00:00:00 2001
From: Ivan Lezhankin <ilezhankin@yandex-team.ru>
Date: Wed, 18 Nov 2020 17:58:55 +0300
Subject: [PATCH 33/99] Fix gtest for dictionaries

---
 .../tests/gtest_dictionary_configuration.cpp  | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/Dictionaries/tests/gtest_dictionary_configuration.cpp b/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
index efa4f12d76b..ce263f0bdf5 100644
--- a/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
+++ b/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
@@ -25,7 +25,15 @@ static std::string configurationToString(const DictionaryConfigurationPtr & conf
     return oss.str();
 }
 
-TEST(ConvertDictionaryAST, SimpleDictConfiguration)
+class ConvertDictionaryAST : public ::testing::Test
+{
+    protected:
+        ConvertDictionaryAST() : context(Context::createGlobal(Context::createShared().get())) {}
+
+        Context context;
+};
+
+TEST_F(ConvertDictionaryAST, SimpleDictConfiguration)
 {
     if (!registered)
     {
@@ -48,7 +56,7 @@ TEST(ConvertDictionaryAST, SimpleDictConfiguration)
     ParserCreateDictionaryQuery parser;
     ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
     ASTCreateQuery * create = ast->as<ASTCreateQuery>();
-    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, Context::createGlobal(Context::createShared().get()));
+    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, context);
 
     /// name
     EXPECT_EQ(config->getString("dictionary.database"), "test");
@@ -94,7 +102,7 @@ TEST(ConvertDictionaryAST, SimpleDictConfiguration)
 }
 
 
-TEST(ConvertDictionaryAST, TrickyAttributes)
+TEST_F(ConvertDictionaryAST, TrickyAttributes)
 {
     if (!registered)
     {
@@ -116,7 +124,7 @@ TEST(ConvertDictionaryAST, TrickyAttributes)
     ParserCreateDictionaryQuery parser;
     ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
     ASTCreateQuery * create = ast->as<ASTCreateQuery>();
-    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, Context::createGlobal(Context::createShared().get()));
+    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, context);
 
     Poco::Util::AbstractConfiguration::Keys keys;
     config->keys("dictionary.structure", keys);
@@ -138,7 +146,7 @@ TEST(ConvertDictionaryAST, TrickyAttributes)
 }
 
 
-TEST(ConvertDictionaryAST, ComplexKeyAndLayoutWithParams)
+TEST_F(ConvertDictionaryAST, ComplexKeyAndLayoutWithParams)
 {
     if (!registered)
     {
@@ -161,7 +169,7 @@ TEST(ConvertDictionaryAST, ComplexKeyAndLayoutWithParams)
     ParserCreateDictionaryQuery parser;
     ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
     ASTCreateQuery * create = ast->as<ASTCreateQuery>();
-    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, Context::createGlobal(Context::createShared().get()));
+    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, context);
 
     Poco::Util::AbstractConfiguration::Keys keys;
     config->keys("dictionary.structure.key", keys);
@@ -189,7 +197,7 @@ TEST(ConvertDictionaryAST, ComplexKeyAndLayoutWithParams)
 }
 
 
-TEST(ConvertDictionaryAST, ComplexSource)
+TEST_F(ConvertDictionaryAST, ComplexSource)
 {
     if (!registered)
     {
@@ -212,7 +220,7 @@ TEST(ConvertDictionaryAST, ComplexSource)
     ParserCreateDictionaryQuery parser;
     ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
     ASTCreateQuery * create = ast->as<ASTCreateQuery>();
-    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, Context::createGlobal(Context::createShared().get()));
+    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, context);
     /// source
     EXPECT_EQ(config->getString("dictionary.source.mysql.host"), "localhost");
     EXPECT_EQ(config->getInt("dictionary.source.mysql.port"), 9000);

From f43f61a10bc9417aefd4c85b21bc7485001a360a Mon Sep 17 00:00:00 2001
From: Ivan Lezhankin <ilezhankin@yandex-team.ru>
Date: Wed, 18 Nov 2020 19:19:39 +0300
Subject: [PATCH 34/99] Another gtest fix

---
 .../tests/gtest_dictionary_configuration.cpp     | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/Dictionaries/tests/gtest_dictionary_configuration.cpp b/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
index ce263f0bdf5..25b154280eb 100644
--- a/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
+++ b/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
@@ -25,15 +25,9 @@ static std::string configurationToString(const DictionaryConfigurationPtr & conf
     return oss.str();
 }
 
-class ConvertDictionaryAST : public ::testing::Test
-{
-    protected:
-        ConvertDictionaryAST() : context(Context::createGlobal(Context::createShared().get())) {}
+Context context = Context::createGlobal(Context::createShared().get());
 
-        Context context;
-};
-
-TEST_F(ConvertDictionaryAST, SimpleDictConfiguration)
+TEST(ConvertDictionaryAST, SimpleDictConfiguration)
 {
     if (!registered)
     {
@@ -102,7 +96,7 @@ TEST_F(ConvertDictionaryAST, SimpleDictConfiguration)
 }
 
 
-TEST_F(ConvertDictionaryAST, TrickyAttributes)
+TEST(ConvertDictionaryAST, TrickyAttributes)
 {
     if (!registered)
     {
@@ -146,7 +140,7 @@ TEST_F(ConvertDictionaryAST, TrickyAttributes)
 }
 
 
-TEST_F(ConvertDictionaryAST, ComplexKeyAndLayoutWithParams)
+TEST(ConvertDictionaryAST, ComplexKeyAndLayoutWithParams)
 {
     if (!registered)
     {
@@ -197,7 +191,7 @@ TEST_F(ConvertDictionaryAST, ComplexKeyAndLayoutWithParams)
 }
 
 
-TEST_F(ConvertDictionaryAST, ComplexSource)
+TEST(ConvertDictionaryAST, ComplexSource)
 {
     if (!registered)
     {

From 48645eae33fad648b2f7295ccd7d4a3143d3608e Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Wed, 11 Nov 2020 01:04:59 +0300
Subject: [PATCH 35/99] Add cutToFirstSignificantSubdomainWithWWW()

Sometimes it is odd to get TLD itself from the
cutToFirstSignificantSubdomain() (since you will not get TLD itself if
you pass it directly):
- cutToFirstSignificantSubdomain('org')            -> ""
- cutToFirstSignificantSubdomain('www.org')        -> org
- cutToFirstSignificantSubdomain('kernel.org')     -> kernel.org
- cutToFirstSignificantSubdomain('www.kernel.org') -> kernel.org

So add one more function to get www.org in this case:
- cutToFirstSignificantSubdomainWithWWW('org')            -> ""
- cutToFirstSignificantSubdomainWithWWW('www.org')        -> www.org
- cutToFirstSignificantSubdomainWithWWW('kernel.org')     -> kernel.org
- cutToFirstSignificantSubdomainWithWWW('www.kernel.org') -> kernel.org

P.S. not sure about the naming though, so it will great if someone has
suggestion for the name.
---
 docs/en/sql-reference/functions/url-functions.md | 16 +++++++++++++++-
 .../URL/cutToFirstSignificantSubdomain.cpp       |  9 +++++++--
 src/Functions/URL/firstSignificantSubdomain.cpp  |  2 +-
 src/Functions/URL/firstSignificantSubdomain.h    |  3 ++-
 .../0_stateless/00398_url_functions.reference    |  9 +++++++++
 .../queries/0_stateless/00398_url_functions.sql  | 10 ++++++++++
 6 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/docs/en/sql-reference/functions/url-functions.md b/docs/en/sql-reference/functions/url-functions.md
index ad63a5b72ac..0da74ce1b0e 100644
--- a/docs/en/sql-reference/functions/url-functions.md
+++ b/docs/en/sql-reference/functions/url-functions.md
@@ -115,7 +115,21 @@ Returns the “first significant subdomain”. This is a non-standard concept sp
 
 Returns the part of the domain that includes top-level subdomains up to the “first significant subdomain” (see the explanation above).
 
-For example, `cutToFirstSignificantSubdomain('https://news.yandex.com.tr/') = 'yandex.com.tr'`.
+For example:
+
+-   `cutToFirstSignificantSubdomain('https://news.yandex.com.tr/') = 'yandex.com.tr'`.
+-   `cutToFirstSignificantSubdomain('www.tr') = 'tr'`.
+-   `cutToFirstSignificantSubdomain('tr') = ''`.
+
+### cutToFirstSignificantSubdomainWithWWW {#cuttofirstsignificantsubdomainwithwww}
+
+Returns the part of the domain that includes top-level subdomains up to the “first significant subdomain”, without stripping "www".
+
+For example:
+
+-   `cutToFirstSignificantSubdomain('https://news.yandex.com.tr/') = 'yandex.com.tr'`.
+-   `cutToFirstSignificantSubdomain('www.tr') = 'www.tr'`.
+-   `cutToFirstSignificantSubdomain('tr') = ''`.
 
 ### port(URL\[, default_port = 0\]) {#port}
 
diff --git a/src/Functions/URL/cutToFirstSignificantSubdomain.cpp b/src/Functions/URL/cutToFirstSignificantSubdomain.cpp
index 4e0f718b796..43d614a7036 100644
--- a/src/Functions/URL/cutToFirstSignificantSubdomain.cpp
+++ b/src/Functions/URL/cutToFirstSignificantSubdomain.cpp
@@ -6,6 +6,7 @@
 namespace DB
 {
 
+template <bool without_www>
 struct CutToFirstSignificantSubdomain
 {
     static size_t getReserveLengthForElement() { return 15; }
@@ -18,7 +19,7 @@ struct CutToFirstSignificantSubdomain
         Pos tmp_data;
         size_t tmp_length;
         Pos domain_end;
-        ExtractFirstSignificantSubdomain::execute(data, size, tmp_data, tmp_length, &domain_end);
+        ExtractFirstSignificantSubdomain<without_www>::execute(data, size, tmp_data, tmp_length, &domain_end);
 
         if (tmp_length == 0)
             return;
@@ -29,11 +30,15 @@ struct CutToFirstSignificantSubdomain
 };
 
 struct NameCutToFirstSignificantSubdomain { static constexpr auto name = "cutToFirstSignificantSubdomain"; };
-using FunctionCutToFirstSignificantSubdomain = FunctionStringToString<ExtractSubstringImpl<CutToFirstSignificantSubdomain>, NameCutToFirstSignificantSubdomain>;
+using FunctionCutToFirstSignificantSubdomain = FunctionStringToString<ExtractSubstringImpl<CutToFirstSignificantSubdomain<true>>, NameCutToFirstSignificantSubdomain>;
+
+struct NameCutToFirstSignificantSubdomainWithWWW { static constexpr auto name = "cutToFirstSignificantSubdomainWithWWW"; };
+using FunctionCutToFirstSignificantSubdomainWithWWW = FunctionStringToString<ExtractSubstringImpl<CutToFirstSignificantSubdomain<false>>, NameCutToFirstSignificantSubdomainWithWWW>;
 
 void registerFunctionCutToFirstSignificantSubdomain(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionCutToFirstSignificantSubdomain>();
+    factory.registerFunction<FunctionCutToFirstSignificantSubdomainWithWWW>();
 }
 
 }
diff --git a/src/Functions/URL/firstSignificantSubdomain.cpp b/src/Functions/URL/firstSignificantSubdomain.cpp
index d34ee6314fc..7db18824375 100644
--- a/src/Functions/URL/firstSignificantSubdomain.cpp
+++ b/src/Functions/URL/firstSignificantSubdomain.cpp
@@ -7,7 +7,7 @@ namespace DB
 {
 
 struct NameFirstSignificantSubdomain { static constexpr auto name = "firstSignificantSubdomain"; };
-using FunctionFirstSignificantSubdomain = FunctionStringToString<ExtractSubstringImpl<ExtractFirstSignificantSubdomain>, NameFirstSignificantSubdomain>;
+using FunctionFirstSignificantSubdomain = FunctionStringToString<ExtractSubstringImpl<ExtractFirstSignificantSubdomain<true>>, NameFirstSignificantSubdomain>;
 
 void registerFunctionFirstSignificantSubdomain(FunctionFactory & factory)
 {
diff --git a/src/Functions/URL/firstSignificantSubdomain.h b/src/Functions/URL/firstSignificantSubdomain.h
index e3869417dd5..522e7905f69 100644
--- a/src/Functions/URL/firstSignificantSubdomain.h
+++ b/src/Functions/URL/firstSignificantSubdomain.h
@@ -7,6 +7,7 @@
 namespace DB
 {
 
+template <bool without_www>
 struct ExtractFirstSignificantSubdomain
 {
     static size_t getReserveLengthForElement() { return 10; }
@@ -18,7 +19,7 @@ struct ExtractFirstSignificantSubdomain
 
         Pos tmp;
         size_t domain_length;
-        ExtractDomain<true>::execute(data, size, tmp, domain_length);
+        ExtractDomain<without_www>::execute(data, size, tmp, domain_length);
 
         if (domain_length == 0)
             return;
diff --git a/tests/queries/0_stateless/00398_url_functions.reference b/tests/queries/0_stateless/00398_url_functions.reference
index c926240b4f7..e84fe65eadb 100644
--- a/tests/queries/0_stateless/00398_url_functions.reference
+++ b/tests/queries/0_stateless/00398_url_functions.reference
@@ -78,6 +78,15 @@ example.com
 example.com
 example.com
 example.com
+com
+
+====CUT TO FIRST SIGNIFICANT SUBDOMAIN WITH WWW====
+
+www.com
+example.com
+example.com
+example.com
+example.com
 ====CUT WWW====
 http://example.com
 http://example.com:1234
diff --git a/tests/queries/0_stateless/00398_url_functions.sql b/tests/queries/0_stateless/00398_url_functions.sql
index c689844d08d..4b8e2a3f065 100644
--- a/tests/queries/0_stateless/00398_url_functions.sql
+++ b/tests/queries/0_stateless/00398_url_functions.sql
@@ -86,6 +86,16 @@ SELECT cutToFirstSignificantSubdomain('http://paul@www.example.com/a/b/c?a=b#d=f
 SELECT cutToFirstSignificantSubdomain('//paul@www.example.com/a/b/c?a=b#d=f');
 SELECT cutToFirstSignificantSubdomain('www.example.com');
 SELECT cutToFirstSignificantSubdomain('example.com');
+SELECT cutToFirstSignificantSubdomain('www.com');
+SELECT cutToFirstSignificantSubdomain('com');
+
+SELECT '====CUT TO FIRST SIGNIFICANT SUBDOMAIN WITH WWW====';
+SELECT cutToFirstSignificantSubdomainWithWWW('http://com');
+SELECT cutToFirstSignificantSubdomainWithWWW('http://www.com');
+SELECT cutToFirstSignificantSubdomainWithWWW('http://www.example.com');
+SELECT cutToFirstSignificantSubdomainWithWWW('http://www.foo.example.com');
+SELECT cutToFirstSignificantSubdomainWithWWW('http://www.example.com:1');
+SELECT cutToFirstSignificantSubdomainWithWWW('http://www.example.com/');
 
 SELECT '====CUT WWW====';
 SELECT cutWWW('http://www.example.com');

From 17977e4c4b699f5acdf5cb8c949f30dfc91a7d2e Mon Sep 17 00:00:00 2001
From: Ivan Lezhankin <ilezhankin@yandex-team.ru>
Date: Wed, 18 Nov 2020 21:24:58 +0300
Subject: [PATCH 36/99] Use global context for gtests

---
 .../tests/gtest_dictionary_configuration.cpp          | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Dictionaries/tests/gtest_dictionary_configuration.cpp b/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
index 25b154280eb..389199bfe61 100644
--- a/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
+++ b/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
@@ -7,6 +7,7 @@
 #include <Parsers/formatAST.h>
 #include <Parsers/parseQuery.h>
 #include <Poco/Util/XMLConfiguration.h>
+#include <Common/tests/gtest_global_context.h>
 #include <common/types.h>
 
 #include <gtest/gtest.h>
@@ -25,8 +26,6 @@ static std::string configurationToString(const DictionaryConfigurationPtr & conf
     return oss.str();
 }
 
-Context context = Context::createGlobal(Context::createShared().get());
-
 TEST(ConvertDictionaryAST, SimpleDictConfiguration)
 {
     if (!registered)
@@ -50,7 +49,7 @@ TEST(ConvertDictionaryAST, SimpleDictConfiguration)
     ParserCreateDictionaryQuery parser;
     ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
     ASTCreateQuery * create = ast->as<ASTCreateQuery>();
-    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, context);
+    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, getContext().context);
 
     /// name
     EXPECT_EQ(config->getString("dictionary.database"), "test");
@@ -118,7 +117,7 @@ TEST(ConvertDictionaryAST, TrickyAttributes)
     ParserCreateDictionaryQuery parser;
     ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
     ASTCreateQuery * create = ast->as<ASTCreateQuery>();
-    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, context);
+    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, getContext().context);
 
     Poco::Util::AbstractConfiguration::Keys keys;
     config->keys("dictionary.structure", keys);
@@ -163,7 +162,7 @@ TEST(ConvertDictionaryAST, ComplexKeyAndLayoutWithParams)
     ParserCreateDictionaryQuery parser;
     ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
     ASTCreateQuery * create = ast->as<ASTCreateQuery>();
-    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, context);
+    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, getContext().context);
 
     Poco::Util::AbstractConfiguration::Keys keys;
     config->keys("dictionary.structure.key", keys);
@@ -214,7 +213,7 @@ TEST(ConvertDictionaryAST, ComplexSource)
     ParserCreateDictionaryQuery parser;
     ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
     ASTCreateQuery * create = ast->as<ASTCreateQuery>();
-    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, context);
+    DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, getContext().context);
     /// source
     EXPECT_EQ(config->getString("dictionary.source.mysql.host"), "localhost");
     EXPECT_EQ(config->getInt("dictionary.source.mysql.port"), 9000);

From f1650291d8c30d847b5fd931e6d06d92b5e77e24 Mon Sep 17 00:00:00 2001
From: Ivan <5627721+abyss7@users.noreply.github.com>
Date: Wed, 18 Nov 2020 23:05:53 +0300
Subject: [PATCH 37/99] Fix gcc-10 build

---
 src/Functions/FunctionBinaryArithmetic.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index 7ffdc033a00..8c684d3578f 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -1205,8 +1205,8 @@ public:
 
     bool hasInformationAboutMonotonicity() const override
     {
-        std::string_view name = Name::name;
-        return (name == "minus" || name == "plus" || name == "divide" || name == "intDiv");
+        std::string_view name_ = Name::name;
+        return (name_ == "minus" || name_ == "plus" || name_ == "divide" || name_ == "intDiv");
     }
 
     Monotonicity getMonotonicityForRange(const IDataType &, const Field & left_point, const Field & right_point) const override

From 8a7376247b39759516a26a558f97321161243a04 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Wed, 18 Nov 2020 23:06:58 +0300
Subject: [PATCH 38/99] Add a comment about rotation policy into server config

---
 programs/server/config.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/programs/server/config.xml b/programs/server/config.xml
index e17b59671af..21def379535 100644
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@@ -11,6 +11,9 @@
         <level>trace</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
         <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
+        <!-- Rotation policy
+             See https://github.com/pocoproject/poco/blob/poco-1.9.4-release/Foundation/include/Poco/FileChannel.h#L54-L85
+          -->
         <size>1000M</size>
         <count>10</count>
         <!-- <console>1</console> --> <!-- Default behavior is autodetection (log to console if not daemon mode and is tty) -->

From dd0fccae47a2e1e8f0460e8228ac719373d678c3 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Thu, 19 Nov 2020 00:55:37 +0300
Subject: [PATCH 39/99] Disable rotation of the logs in tests (on CI)

Right now due to rotation the archive with the clickhouse-server.log
maybe not full, for example:
- not full - https://clickhouse-test-reports.s3.yandex.net/16947/caf5f98db2ae39dd911f7d1fc0a7c2cc382b1c53/functional_stateless_tests_(ubsan)/clickhouse-server.log (no messages about server start)
- full     - https://clickhouse-test-reports.s3.yandex.net/16993/d1f52dc72d417580c4088cf3880593176416bea2/functional_stateless_tests_(thread).html

And sometimes rotated part may include relative part of the log, so it
is better to disable it.
---
 programs/server/config.d/logging_no_rotate.xml | 1 +
 tests/config/config.d/logging_no_rotate.xml    | 8 ++++++++
 tests/config/install.sh                        | 1 +
 3 files changed, 10 insertions(+)
 create mode 120000 programs/server/config.d/logging_no_rotate.xml
 create mode 100644 tests/config/config.d/logging_no_rotate.xml

diff --git a/programs/server/config.d/logging_no_rotate.xml b/programs/server/config.d/logging_no_rotate.xml
new file mode 120000
index 00000000000..cd66c69b3ed
--- /dev/null
+++ b/programs/server/config.d/logging_no_rotate.xml
@@ -0,0 +1 @@
+../../../tests/config/config.d/logging_no_rotate.xml
\ No newline at end of file
diff --git a/tests/config/config.d/logging_no_rotate.xml b/tests/config/config.d/logging_no_rotate.xml
new file mode 100644
index 00000000000..2c34585437b
--- /dev/null
+++ b/tests/config/config.d/logging_no_rotate.xml
@@ -0,0 +1,8 @@
+<yandex>
+    <logger>
+        <!-- Disable rotation
+             https://pocoproject.org/docs/Poco.FileChannel.html
+        -->
+        <size>never</size>
+    </logger>
+</yandex>
diff --git a/tests/config/install.sh b/tests/config/install.sh
index f6fae181ac8..71a788f1ca4 100755
--- a/tests/config/install.sh
+++ b/tests/config/install.sh
@@ -28,6 +28,7 @@ ln -sf $SRC_PATH/config.d/clusters.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/graphite.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/database_atomic.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/test_cluster_with_incorrect_pw.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/logging_no_rotate.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/users.d/log_queries.xml $DEST_SERVER_PATH/users.d/
 ln -sf $SRC_PATH/users.d/readonly.xml $DEST_SERVER_PATH/users.d/
 ln -sf $SRC_PATH/users.d/access_management.xml $DEST_SERVER_PATH/users.d/

From bed93ef71343c7b7069fa52fdfbecc2517747fc1 Mon Sep 17 00:00:00 2001
From: zhang2014 <coswde@gmail.com>
Date: Thu, 19 Nov 2020 12:02:43 +0800
Subject: [PATCH 40/99] Try fix review comment

---
 src/IO/MySQLBinlogEventReadBuffer.cpp | 15 +++++++++------
 src/IO/MySQLBinlogEventReadBuffer.h   |  4 +++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/IO/MySQLBinlogEventReadBuffer.cpp b/src/IO/MySQLBinlogEventReadBuffer.cpp
index b2c37ddb8d0..5b1d23545a2 100644
--- a/src/IO/MySQLBinlogEventReadBuffer.cpp
+++ b/src/IO/MySQLBinlogEventReadBuffer.cpp
@@ -4,11 +4,17 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 MySQLBinlogEventReadBuffer::MySQLBinlogEventReadBuffer(ReadBuffer & in_, size_t checksum_signature_length_)
     : ReadBuffer(nullptr, 0, 0), in(in_), checksum_signature_length(checksum_signature_length_)
 {
-    if (checksum_signature_length)
-        checksum_buf = new char[checksum_signature_length];
+    if (checksum_signature_length > MAX_CHECKSUM_SIGNATURE_LENGTH)
+        throw Exception("LOGICAL ERROR: checksum_signature_length must be less than MAX_CHECKSUM_SIGNATURE_LENGTH. It is a bug.",
+            ErrorCodes::LOGICAL_ERROR);
 
     nextIfAtEnd();
 }
@@ -61,11 +67,8 @@ MySQLBinlogEventReadBuffer::~MySQLBinlogEventReadBuffer()
 {
     try
     {
-        /// ignore last 4 bytes
+        /// ignore last checksum_signature_length bytes
         nextIfAtEnd();
-
-        if (checksum_signature_length)
-            delete[] checksum_buf;
     }
     catch (...)
     {
diff --git a/src/IO/MySQLBinlogEventReadBuffer.h b/src/IO/MySQLBinlogEventReadBuffer.h
index c1c02b6406a..d31e19d82b8 100644
--- a/src/IO/MySQLBinlogEventReadBuffer.h
+++ b/src/IO/MySQLBinlogEventReadBuffer.h
@@ -8,12 +8,14 @@ namespace DB
 class MySQLBinlogEventReadBuffer : public ReadBuffer
 {
 protected:
+    static const size_t MAX_CHECKSUM_SIGNATURE_LENGTH = 4;
+
     ReadBuffer & in;
     size_t checksum_signature_length;
 
     size_t checksum_buff_size = 0;
     size_t checksum_buff_limit = 0;
-    char * checksum_buf = nullptr;
+    char checksum_buf[MAX_CHECKSUM_SIGNATURE_LENGTH];
 
     bool nextImpl() override;
 

From 9df9691ccb2c3c1f61282dce1458bb29330c0f08 Mon Sep 17 00:00:00 2001
From: zhang2014 <coswde@gmail.com>
Date: Thu, 19 Nov 2020 13:01:23 +0800
Subject: [PATCH 41/99] Try fix integration test

---
 tests/integration/test_materialize_mysql_database/test.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/integration/test_materialize_mysql_database/test.py b/tests/integration/test_materialize_mysql_database/test.py
index 9cddff8cae4..7881dcc222e 100644
--- a/tests/integration/test_materialize_mysql_database/test.py
+++ b/tests/integration/test_materialize_mysql_database/test.py
@@ -176,10 +176,10 @@ def test_insert_with_modify_binlog_checksum_5_7(started_cluster, started_mysql_5
     materialize_with_ddl.insert_with_modify_binlog_checksum(clickhouse_node, started_mysql_5_7, "mysql1")
 
 
-def test_insert_with_modify_binlog_checksum_8_0(started_cluster, started_mysql_5_7):
-    materialize_with_ddl.insert_with_modify_binlog_checksum(clickhouse_node, started_mysql_5_7, "mysql1")
+def test_insert_with_modify_binlog_checksum_8_0(started_cluster, started_mysql_8_0):
+    materialize_with_ddl.insert_with_modify_binlog_checksum(clickhouse_node, started_mysql_8_0, "mysql8_0")
+
 
-    
 def test_materialize_database_err_sync_user_privs_5_7(started_cluster, started_mysql_5_7):
     try:
         materialize_with_ddl.err_sync_user_privs_with_materialize_mysql_database(clickhouse_node, started_mysql_5_7, "mysql1")

From b711331e2c33fa99cf90189e814c5ebdfd07c53a Mon Sep 17 00:00:00 2001
From: Ivan <5627721+abyss7@users.noreply.github.com>
Date: Thu, 19 Nov 2020 10:14:23 +0300
Subject: [PATCH 42/99] Update visibleWidth.cpp

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

diff --git a/src/Functions/visibleWidth.cpp b/src/Functions/visibleWidth.cpp
index fb9509184ae..1fe36208de9 100644
--- a/src/Functions/visibleWidth.cpp
+++ b/src/Functions/visibleWidth.cpp
@@ -48,7 +48,7 @@ public:
     /// Execute the function on the columns.
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
-        auto & src = arguments[0];
+        const auto & src = arguments[0];
         size_t size = input_rows_count;
 
         auto res_col = ColumnUInt64::create(size);

From 8b6fbea1992dec1faaf01b2aa5694aeb4ab9ebe1 Mon Sep 17 00:00:00 2001
From: tavplubix <tavplubix@gmail.com>
Date: Thu, 19 Nov 2020 12:47:24 +0300
Subject: [PATCH 43/99] trigger CI

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

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 4b5355e08ff..f0b69c84be9 100644
--- a/tests/integration/test_materialize_mysql_database/materialize_with_ddl.py
+++ b/tests/integration/test_materialize_mysql_database/materialize_with_ddl.py
@@ -556,4 +556,3 @@ def err_sync_user_privs_with_materialize_mysql_database(clickhouse_node, mysql_n
 
     mysql_node.query("DROP DATABASE priv_err_db;")
     mysql_node.grant_min_priv_for_user("test")
-

From cdceafdd894da9259ca5ad60040bdefa90208b55 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Thu, 19 Nov 2020 13:25:39 +0300
Subject: [PATCH 44/99] Trying to make read_in_order_many_parts more stable

---
 tests/performance/read_in_order_many_parts.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/performance/read_in_order_many_parts.xml b/tests/performance/read_in_order_many_parts.xml
index b45655a6f21..ca713935426 100644
--- a/tests/performance/read_in_order_many_parts.xml
+++ b/tests/performance/read_in_order_many_parts.xml
@@ -3,6 +3,7 @@
         <optimize_aggregation_in_order>1</optimize_aggregation_in_order>
         <optimize_read_in_order>1</optimize_read_in_order>
         <max_partitions_per_insert_block>2000</max_partitions_per_insert_block>
+        <max_insert_block_size>10000000</max_insert_block_size>
         <max_threads>8</max_threads>
     </settings>
 
@@ -16,8 +17,10 @@
         </substitution>
     </substitutions>
 
-    <create_query>CREATE TABLE mt_{parts}_parts(id UInt32, val1 UInt32, val2 UInt32) ENGINE = MergeTree ORDER BY val1 PARTITION BY id % {parts}</create_query>
-    <fill_query>INSERT INTO mt_{parts}_parts SELECT number, rand() % 10000, rand() FROM numbers_mt(100000000)</fill_query>
+    <create_query>CREATE TABLE mt_{parts}_parts(id UInt32, val1 UInt32, val2 UInt32) ENGINE = MergeTree ORDER BY val1 PARTITION BY id % {parts} SETTINGS parts_to_throw_insert=10000, parts_to_delay_insert=10000</create_query>
+    <fill_query>SYSTEM STOP MERGES mt_{parts}_parts</fill_query>
+    <fill_query>INSERT INTO mt_{parts}_parts SELECT number, rand() % 10000, rand() FROM numbers_mt(100000000) SETTINGS max_block_size=10000000</fill_query>
+    <fill_query>SYSTEM START MERGES mt_{parts}_parts</fill_query>
     <fill_query>OPTIMIZE TABLE mt_{parts}_parts FINAL</fill_query>
 
     <query>SELECT val2 FROM mt_{parts}_parts ORDER BY val1 LIMIT 1000000 FORMAT Null</query>

From 87f7e0b3998fcacebc96f57b08d5e9975af6fd11 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Thu, 19 Nov 2020 15:04:09 +0300
Subject: [PATCH 45/99] More compatible watches in TestKeeper

---
 src/Common/ZooKeeper/TestKeeper.cpp | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/Common/ZooKeeper/TestKeeper.cpp b/src/Common/ZooKeeper/TestKeeper.cpp
index 4ae26d874fb..5f34a60c34e 100644
--- a/src/Common/ZooKeeper/TestKeeper.cpp
+++ b/src/Common/ZooKeeper/TestKeeper.cpp
@@ -511,19 +511,30 @@ void TestKeeper::processingThread()
                 if (expired)
                     break;
 
-                if (info.watch)
-                {
-                    auto & watches_type = dynamic_cast<const ListRequest *>(info.request.get())
-                        ? list_watches
-                        : watches;
-
-                    watches_type[info.request->getPath()].emplace_back(std::move(info.watch));
-                }
 
                 ++zxid;
 
                 info.request->addRootPath(root_path);
                 auto [response, _] = info.request->process(container, zxid);
+
+                if (info.watch)
+                {
+                    /// To be compatible with real ZooKeeper we add watch if request was successful (i.e. node exists)
+                    /// or if it was exists request which allows to add watches for non existing nodes.
+                    if (response->error == Error::ZOK)
+                    {
+                        auto & watches_type = dynamic_cast<const ListRequest *>(info.request.get())
+                            ? list_watches
+                            : watches;
+
+                        watches_type[info.request->getPath()].emplace_back(std::move(info.watch));
+                    }
+                    else if (response->error == Error::ZNONODE && dynamic_cast<const ExistsRequest *>(info.request.get()))
+                    {
+                        watches[info.request->getPath()].emplace_back(std::move(info.watch));
+                    }
+                }
+
                 if (response->error == Error::ZOK)
                     info.request->processWatches(watches, list_watches);
 

From 425dc4b11bdc36e4bf2ba621d4a0e94019357a44 Mon Sep 17 00:00:00 2001
From: Nicolae Vartolomei <nv@cloudflare.com>
Date: Thu, 15 Oct 2020 17:17:16 +0100
Subject: [PATCH 46/99] Add unique identifiers IMergeTreeDataPart structure

For now uuids are not generated at all, they are present only if the
part is updated manually (as you can see in the integration test).

The only place where they can be seen today by an end user is in
`system.parts` table. I was looking for hiding this column behind an
option but couldn't find an easy way to do that.

Likely this is also required for WAL, but need to think how not to break
compatibility.

Relates to #13574, https://github.com/ClickHouse/ClickHouse/issues/13574

Next 1: In the upcoming PR the plan is to integrate de-duplication based on
these fingerprints in the query pipeline.

Next 2: We'll enable automatic generation of uuids and come up with a
way for conditionally sending uuids when processing distributed queries
only when part movement is in progress.
---
 src/Storages/MergeTree/DataPartsExchange.cpp  | 19 ++++---
 src/Storages/MergeTree/DataPartsExchange.h    |  2 +-
 src/Storages/MergeTree/IMergeTreeDataPart.cpp | 20 +++++++
 src/Storages/MergeTree/IMergeTreeDataPart.h   | 10 ++++
 .../MergeTree/MergeTreeDataMergerMutator.cpp  |  8 +++
 .../MergeTree/MergedBlockOutputStream.cpp     |  9 ++++
 src/Storages/System/StorageSystemParts.cpp    |  3 ++
 tests/integration/test_part_uuid/__init__.py  |  0
 .../test_part_uuid/configs/remote_servers.xml | 18 +++++++
 tests/integration/test_part_uuid/test.py      | 53 +++++++++++++++++++
 10 files changed, 134 insertions(+), 8 deletions(-)
 create mode 100644 tests/integration/test_part_uuid/__init__.py
 create mode 100644 tests/integration/test_part_uuid/configs/remote_servers.xml
 create mode 100644 tests/integration/test_part_uuid/test.py

diff --git a/src/Storages/MergeTree/DataPartsExchange.cpp b/src/Storages/MergeTree/DataPartsExchange.cpp
index 5ab0cc4612f..1958bb4101a 100644
--- a/src/Storages/MergeTree/DataPartsExchange.cpp
+++ b/src/Storages/MergeTree/DataPartsExchange.cpp
@@ -45,6 +45,7 @@ constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_PARTS_SIZE = 1;
 constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_PARTS_SIZE_AND_TTL_INFOS = 2;
 constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_PARTS_TYPE = 3;
 constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_PARTS_DEFAULT_COMPRESSION = 4;
+constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_PARTS_UUID = 5;
 
 
 std::string getEndpointId(const std::string & node_id)
@@ -109,7 +110,7 @@ void Service::processQuery(const Poco::Net::HTMLForm & params, ReadBuffer & /*bo
     }
 
     /// We pretend to work as older server version, to be sure that client will correctly process our version
-    response.addCookie({"server_protocol_version", toString(std::min(client_protocol_version, REPLICATION_PROTOCOL_VERSION_WITH_PARTS_DEFAULT_COMPRESSION))});
+    response.addCookie({"server_protocol_version", toString(std::min(client_protocol_version, REPLICATION_PROTOCOL_VERSION_WITH_PARTS_UUID))});
 
     ++total_sends;
     SCOPE_EXIT({--total_sends;});
@@ -142,8 +143,7 @@ void Service::processQuery(const Poco::Net::HTMLForm & params, ReadBuffer & /*bo
             sendPartFromMemory(part, out);
         else
         {
-            bool send_default_compression_file = client_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_DEFAULT_COMPRESSION;
-            sendPartFromDisk(part, out, send_default_compression_file);
+            sendPartFromDisk(part, out, client_protocol_version);
         }
     }
     catch (const NetException &)
@@ -176,7 +176,7 @@ void Service::sendPartFromMemory(const MergeTreeData::DataPartPtr & part, WriteB
     block_out.write(part_in_memory->block);
 }
 
-void Service::sendPartFromDisk(const MergeTreeData::DataPartPtr & part, WriteBuffer & out, bool send_default_compression_file)
+void Service::sendPartFromDisk(const MergeTreeData::DataPartPtr & part, WriteBuffer & out, int client_protocol_version)
 {
     /// We'll take a list of files from the list of checksums.
     MergeTreeData::DataPart::Checksums checksums = part->checksums;
@@ -184,8 +184,12 @@ void Service::sendPartFromDisk(const MergeTreeData::DataPartPtr & part, WriteBuf
     auto file_names_without_checksums = part->getFileNamesWithoutChecksums();
     for (const auto & file_name : file_names_without_checksums)
     {
-        if (!send_default_compression_file && file_name == IMergeTreeDataPart::DEFAULT_COMPRESSION_CODEC_FILE_NAME)
+        if (client_protocol_version < REPLICATION_PROTOCOL_VERSION_WITH_PARTS_DEFAULT_COMPRESSION && file_name == IMergeTreeDataPart::DEFAULT_COMPRESSION_CODEC_FILE_NAME)
             continue;
+
+        if (client_protocol_version < REPLICATION_PROTOCOL_VERSION_WITH_PARTS_UUID && file_name == IMergeTreeDataPart::UUID_FILE_NAME)
+            continue;
+
         checksums.files[file_name] = {};
     }
 
@@ -263,7 +267,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
     {
         {"endpoint",                getEndpointId(replica_path)},
         {"part",                    part_name},
-        {"client_protocol_version", toString(REPLICATION_PROTOCOL_VERSION_WITH_PARTS_DEFAULT_COMPRESSION)},
+        {"client_protocol_version", toString(REPLICATION_PROTOCOL_VERSION_WITH_PARTS_UUID)},
         {"compress",                "false"}
     });
 
@@ -430,7 +434,8 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
 
         if (file_name != "checksums.txt" &&
             file_name != "columns.txt" &&
-            file_name != IMergeTreeDataPart::DEFAULT_COMPRESSION_CODEC_FILE_NAME)
+            file_name != IMergeTreeDataPart::DEFAULT_COMPRESSION_CODEC_FILE_NAME &&
+            file_name != IMergeTreeDataPart::UUID_FILE_NAME)
             checksums.addFile(file_name, file_size, expected_hash);
 
         if (sync)
diff --git a/src/Storages/MergeTree/DataPartsExchange.h b/src/Storages/MergeTree/DataPartsExchange.h
index 52a34a2239a..063d3e91d1a 100644
--- a/src/Storages/MergeTree/DataPartsExchange.h
+++ b/src/Storages/MergeTree/DataPartsExchange.h
@@ -32,7 +32,7 @@ public:
 private:
     MergeTreeData::DataPartPtr findPart(const String & name);
     void sendPartFromMemory(const MergeTreeData::DataPartPtr & part, WriteBuffer & out);
-    void sendPartFromDisk(const MergeTreeData::DataPartPtr & part, WriteBuffer & out, bool send_default_compression_file);
+    void sendPartFromDisk(const MergeTreeData::DataPartPtr & part, WriteBuffer & out, int client_protocol_version);
 
 private:
     /// StorageReplicatedMergeTree::shutdown() waits for all parts exchange handlers to finish,
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.cpp b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
index ffc2dd62ce0..38d2e712ec3 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
@@ -410,6 +410,7 @@ void IMergeTreeDataPart::loadColumnsChecksumsIndexes(bool require_columns_checks
     /// Motivation: memory for index is shared between queries - not belong to the query itself.
     MemoryTracker::BlockerInThread temporarily_disable_memory_tracker;
 
+    loadUUID();
     loadColumns(require_columns_checksums);
     loadChecksums(require_columns_checksums);
     loadIndexGranularity();
@@ -482,9 +483,14 @@ NameSet IMergeTreeDataPart::getFileNamesWithoutChecksums() const
 
     NameSet result = {"checksums.txt", "columns.txt"};
     String default_codec_path = getFullRelativePath() + DEFAULT_COMPRESSION_CODEC_FILE_NAME;
+
     if (volume->getDisk()->exists(default_codec_path))
         result.emplace(DEFAULT_COMPRESSION_CODEC_FILE_NAME);
 
+    String uuid_path = getFullRelativePath() + UUID_FILE_NAME;
+    if (volume->getDisk()->exists(uuid_path))
+        result.emplace(UUID_FILE_NAME);
+
     return result;
 }
 
@@ -726,6 +732,19 @@ void IMergeTreeDataPart::loadTTLInfos()
     }
 }
 
+void IMergeTreeDataPart::loadUUID()
+{
+    String path = getFullRelativePath() + UUID_FILE_NAME;
+
+    if (volume->getDisk()->exists(path))
+    {
+        auto in = openForReading(volume->getDisk(), path);
+        readText(uuid, *in);
+        if (uuid == UUIDHelpers::Nil)
+            throw Exception("Unexpected empty " + String(UUID_FILE_NAME) + " in part: " + name, ErrorCodes::LOGICAL_ERROR);
+    }
+}
+
 void IMergeTreeDataPart::loadColumns(bool require)
 {
     String path = getFullRelativePath() + "columns.txt";
@@ -894,6 +913,7 @@ void IMergeTreeDataPart::remove() const
             for (const auto & file : {"checksums.txt", "columns.txt"})
                 volume->getDisk()->remove(to + "/" + file);
 
+            volume->getDisk()->removeIfExists(to + "/" + UUID_FILE_NAME);
             volume->getDisk()->removeIfExists(to + "/" + DEFAULT_COMPRESSION_CODEC_FILE_NAME);
             volume->getDisk()->removeIfExists(to + "/" + DELETE_ON_DESTROY_MARKER_FILE_NAME);
 
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.h b/src/Storages/MergeTree/IMergeTreeDataPart.h
index 21932ba445c..284ec667d0a 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.h
@@ -164,6 +164,11 @@ public:
     String name;
     MergeTreePartInfo info;
 
+    /// Part unique identifier.
+    /// The intention is to use it for identifying cases where the same part is
+    /// processed by multiple shards.
+    UUID uuid;
+
     VolumePtr volume;
 
     /// A directory path (relative to storage's path) where part data is actually stored
@@ -348,6 +353,8 @@ public:
 
     static inline constexpr auto DELETE_ON_DESTROY_MARKER_FILE_NAME = "delete-on-destroy.txt";
 
+    static inline constexpr auto UUID_FILE_NAME = "uuid.txt";
+
     /// Checks that all TTLs (table min/max, column ttls, so on) for part
     /// calculated. Part without calculated TTL may exist if TTL was added after
     /// part creation (using alter query with materialize_ttl setting).
@@ -384,6 +391,9 @@ private:
     /// In compact parts order of columns is necessary
     NameToPosition column_name_to_position;
 
+    /// Reads part unique identifier (if exists) from uuid.txt
+    void loadUUID();
+
     /// Reads columns names and types from columns.txt
     void loadColumns(bool require);
 
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
index 055a5ec7b7a..e889056cd75 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
@@ -1138,6 +1138,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mutatePartToTempor
         future_part.name, future_part.type, future_part.part_info, single_disk_volume, "tmp_mut_" + future_part.name);
 
     new_data_part->is_temp = true;
+    new_data_part->uuid = source_part->uuid;
     new_data_part->ttl_infos = source_part->ttl_infos;
 
     /// It shouldn't be changed by mutation.
@@ -1818,6 +1819,13 @@ void MergeTreeDataMergerMutator::finalizeMutatedPart(
     const CompressionCodecPtr & codec)
 {
     auto disk = new_data_part->volume->getDisk();
+
+    if (new_data_part->uuid != UUIDHelpers::Nil)
+    {
+        auto out = disk->writeFile(new_data_part->getFullRelativePath() + IMergeTreeDataPart::UUID_FILE_NAME, 4096);
+        writeUUIDText(new_data_part->uuid, *out);
+    }
+
     if (need_remove_expired_values)
     {
         /// Write a file with ttl infos in json format.
diff --git a/src/Storages/MergeTree/MergedBlockOutputStream.cpp b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
index 1b40f9ab292..83c59780a0b 100644
--- a/src/Storages/MergeTree/MergedBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
@@ -133,6 +133,15 @@ void MergedBlockOutputStream::finalizePartOnDisk(
     MergeTreeData::DataPart::Checksums & checksums,
     bool sync)
 {
+    if (new_part->uuid != UUIDHelpers::Nil)
+    {
+        auto out = volume->getDisk()->writeFile(part_path + IMergeTreeDataPart::UUID_FILE_NAME, 4096);
+        writeUUIDText(new_part->uuid, *out);
+        out->finalize();
+        if (sync)
+            out->sync();
+    }
+
     if (storage.format_version >= MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING || isCompactPart(new_part))
     {
         new_part->partition.store(storage, volume->getDisk(), part_path, checksums);
diff --git a/src/Storages/System/StorageSystemParts.cpp b/src/Storages/System/StorageSystemParts.cpp
index 757aea661e2..7ae20ed024e 100644
--- a/src/Storages/System/StorageSystemParts.cpp
+++ b/src/Storages/System/StorageSystemParts.cpp
@@ -7,6 +7,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeUUID.h>
 #include <Storages/VirtualColumnUtils.h>
 #include <Databases/IDatabase.h>
 #include <Parsers/queryToString.h>
@@ -20,6 +21,7 @@ StorageSystemParts::StorageSystemParts(const StorageID & table_id_)
     {
         {"partition",                                   std::make_shared<DataTypeString>()},
         {"name",                                        std::make_shared<DataTypeString>()},
+        {"uuid",                                        std::make_shared<DataTypeUUID>()},
         {"part_type",                                   std::make_shared<DataTypeString>()},
         {"active",                                      std::make_shared<DataTypeUInt8>()},
         {"marks",                                       std::make_shared<DataTypeUInt64>()},
@@ -93,6 +95,7 @@ void StorageSystemParts::processNextStorage(MutableColumns & columns_, const Sto
             columns_[i++]->insert(out.str());
         }
         columns_[i++]->insert(part->name);
+        columns_[i++]->insert(part->uuid);
         columns_[i++]->insert(part->getTypeName());
         columns_[i++]->insert(part_state == State::Committed);
         columns_[i++]->insert(part->getMarksCount());
diff --git a/tests/integration/test_part_uuid/__init__.py b/tests/integration/test_part_uuid/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_part_uuid/configs/remote_servers.xml b/tests/integration/test_part_uuid/configs/remote_servers.xml
new file mode 100644
index 00000000000..998a969e87e
--- /dev/null
+++ b/tests/integration/test_part_uuid/configs/remote_servers.xml
@@ -0,0 +1,18 @@
+<yandex>
+    <remote_servers>
+        <test_cluster>
+            <shard>
+                <replica>
+                    <host>node1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>node2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster>
+    </remote_servers>
+</yandex>
\ No newline at end of file
diff --git a/tests/integration/test_part_uuid/test.py b/tests/integration/test_part_uuid/test.py
new file mode 100644
index 00000000000..a00575c2504
--- /dev/null
+++ b/tests/integration/test_part_uuid/test.py
@@ -0,0 +1,53 @@
+import time
+import uuid
+
+import pytest
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+
+node1 = cluster.add_instance(
+    'node1',
+    main_configs=['configs/remote_servers.xml'],
+    with_zookeeper=True)
+
+node2 = cluster.add_instance(
+    'node2',
+    main_configs=['configs/remote_servers.xml'],
+    with_zookeeper=True)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def test_part_uuid(started_cluster):
+    test_uuid = str(uuid.uuid4())
+
+    for ix, n in enumerate([node1, node2]):
+        n.query("""
+        CREATE TABLE t(key UInt64, value UInt64)
+        ENGINE ReplicatedMergeTree('/clickhouse/tables/t', '{}')
+        ORDER BY tuple()
+        """.format(ix))
+
+    node1.query("INSERT INTO t VALUES (1, 1)")
+
+    node1.query("ALTER TABLE t DETACH PARTITION tuple()")
+    node1.exec_in_container([
+        "bash", "-c",
+        "echo '{}' > /var/lib/clickhouse/data/default/t/detached/{}/uuid.txt".format(test_uuid, "all_0_0_0")
+    ])
+    node1.query("ALTER TABLE t ATTACH PARTITION tuple()")
+    node1.query("ALTER TABLE t UPDATE value = 1 WHERE key = 1")
+
+    assert test_uuid == node1.query("SELECT uuid FROM system.parts WHERE table = 't' AND active ORDER BY name").strip()
+
+    node2.query("SYSTEM SYNC REPLICA t")
+    assert test_uuid == node2.query("SELECT uuid FROM system.parts WHERE table = 't' AND active ORDER BY name").strip()

From 746f8e45f522de8e689f4cae8a6645354f8b746d Mon Sep 17 00:00:00 2001
From: Nicolae Vartolomei <nv@cloudflare.com>
Date: Thu, 29 Oct 2020 16:18:25 +0000
Subject: [PATCH 47/99] All new parts must have uuids

---
 src/Storages/MergeTree/DataPartsExchange.cpp  | 16 ++++++-
 src/Storages/MergeTree/DataPartsExchange.h    |  2 +
 src/Storages/MergeTree/MergeTreeData.cpp      |  2 +-
 .../MergeTree/MergeTreeDataMergerMutator.cpp  |  7 ++-
 .../MergeTree/MergeTreeDataMergerMutator.h    |  1 +
 .../MergeTree/MergeTreeDataPartInMemory.cpp   |  1 +
 .../MergeTree/MergeTreeDataWriter.cpp         |  1 +
 .../MergeTree/MergeTreeWriteAheadLog.cpp      | 48 ++++++++++++++++---
 .../MergeTree/MergeTreeWriteAheadLog.h        | 10 ++--
 .../MergeTree/MergedBlockOutputStream.cpp     |  4 +-
 .../ReplicatedMergeTreeBlockOutputStream.cpp  |  1 +
 .../MergeTree/ReplicatedMergeTreeLogEntry.cpp | 46 +++++++++++++-----
 .../MergeTree/ReplicatedMergeTreeLogEntry.h   |  1 +
 src/Storages/StorageMergeTree.cpp             |  4 +-
 src/Storages/StorageReplicatedMergeTree.cpp   |  6 ++-
 15 files changed, 119 insertions(+), 31 deletions(-)

diff --git a/src/Storages/MergeTree/DataPartsExchange.cpp b/src/Storages/MergeTree/DataPartsExchange.cpp
index 1958bb4101a..af71039b4ea 100644
--- a/src/Storages/MergeTree/DataPartsExchange.cpp
+++ b/src/Storages/MergeTree/DataPartsExchange.cpp
@@ -139,6 +139,9 @@ void Service::processQuery(const Poco::Net::HTMLForm & params, ReadBuffer & /*bo
         if (client_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_TYPE)
             writeStringBinary(part->getType().toString(), out);
 
+        if (client_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_UUID)
+            writeUUIDText(part->uuid, out);
+
         if (isInMemoryPart(part))
             sendPartFromMemory(part, out);
         else
@@ -322,6 +325,10 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
     if (server_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_TYPE)
         readStringBinary(part_type, in);
 
+    UUID part_uuid;
+    if (server_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_UUID)
+        readUUIDText(part_uuid, in);
+
     auto storage_id = data.getStorageID();
     String new_part_path = part_type == "InMemory" ? "memory" : data.getFullPathOnDisk(reservation->getDisk()) + part_name + "/";
     auto entry = data.global_context.getReplicatedFetchList().insert(
@@ -331,12 +338,14 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
 
     in.setNextCallback(ReplicatedFetchReadCallback(*entry));
 
-    return part_type == "InMemory" ? downloadPartToMemory(part_name, metadata_snapshot, std::move(reservation), in)
-        : downloadPartToDisk(part_name, replica_path, to_detached, tmp_prefix_, sync, std::move(reservation), in);
+
+    return part_type == "InMemory" ? downloadPartToMemory(part_name, part_uuid, metadata_snapshot, std::move(reservation), in)
+                                   : downloadPartToDisk(part_name, part_uuid, replica_path, to_detached, tmp_prefix_, sync, std::move(reservation), in);
 }
 
 MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToMemory(
     const String & part_name,
+    const UUID & part_uuid,
     const StorageMetadataPtr & metadata_snapshot,
     ReservationPtr reservation,
     PooledReadWriteBufferFromHTTP & in)
@@ -352,6 +361,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToMemory(
     MergeTreeData::MutableDataPartPtr new_data_part =
         std::make_shared<MergeTreeDataPartInMemory>(data, part_name, volume);
 
+    new_data_part->uuid = part_uuid;
     new_data_part->is_temp = true;
     new_data_part->setColumns(block.getNamesAndTypesList());
     new_data_part->minmax_idx.update(block, data.minmax_idx_columns);
@@ -368,6 +378,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToMemory(
 
 MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
     const String & part_name,
+    const UUID & part_uuid,
     const String & replica_path,
     bool to_detached,
     const String & tmp_prefix_,
@@ -446,6 +457,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
 
     auto volume = std::make_shared<SingleDiskVolume>("volume_" + part_name, disk, 0);
     MergeTreeData::MutableDataPartPtr new_data_part = data.createPart(part_name, volume, part_relative_path);
+    new_data_part->uuid = part_uuid;
     new_data_part->is_temp = true;
     new_data_part->modification_time = time(nullptr);
     new_data_part->loadColumnsChecksumsIndexes(true, false);
diff --git a/src/Storages/MergeTree/DataPartsExchange.h b/src/Storages/MergeTree/DataPartsExchange.h
index 063d3e91d1a..d306cdef419 100644
--- a/src/Storages/MergeTree/DataPartsExchange.h
+++ b/src/Storages/MergeTree/DataPartsExchange.h
@@ -71,6 +71,7 @@ public:
 private:
     MergeTreeData::MutableDataPartPtr downloadPartToDisk(
             const String & part_name,
+            const UUID & part_uuid,
             const String & replica_path,
             bool to_detached,
             const String & tmp_prefix_,
@@ -80,6 +81,7 @@ private:
 
     MergeTreeData::MutableDataPartPtr downloadPartToMemory(
             const String & part_name,
+            const UUID & part_uuid,
             const StorageMetadataPtr & metadata_snapshot,
             ReservationPtr reservation,
             PooledReadWriteBufferFromHTTP & in);
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index a11dd25d8e3..954b730ce83 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -2003,7 +2003,7 @@ bool MergeTreeData::renameTempPartAndReplace(
     if (part_in_memory && getSettings()->in_memory_parts_enable_wal)
     {
         auto wal = getWriteAheadLog();
-        wal->addPart(part_in_memory->block, part_in_memory->name);
+        wal->addPart(part_in_memory);
     }
 
     if (out_covered_parts)
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
index e889056cd75..fe4a903ba5b 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
@@ -681,6 +681,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTempor
         single_disk_volume,
         TMP_PREFIX + future_part.name);
 
+    new_data_part->uuid = future_part.uuid;
     new_data_part->setColumns(storage_columns);
     new_data_part->partition.assign(future_part.getPartition());
     new_data_part->is_temp = true;
@@ -1137,8 +1138,8 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mutatePartToTempor
     auto new_data_part = data.createPart(
         future_part.name, future_part.type, future_part.part_info, single_disk_volume, "tmp_mut_" + future_part.name);
 
+    new_data_part->uuid = future_part.uuid;
     new_data_part->is_temp = true;
-    new_data_part->uuid = source_part->uuid;
     new_data_part->ttl_infos = source_part->ttl_infos;
 
     /// It shouldn't be changed by mutation.
@@ -1820,8 +1821,10 @@ void MergeTreeDataMergerMutator::finalizeMutatedPart(
 {
     auto disk = new_data_part->volume->getDisk();
 
-    if (new_data_part->uuid != UUIDHelpers::Nil)
     {
+        if (new_data_part->uuid == UUIDHelpers::Nil)
+            throw Exception("Empty IMergeTreeDataPart#uuid in finalize for part: " + new_data_part->name, ErrorCodes::LOGICAL_ERROR);
+
         auto out = disk->writeFile(new_data_part->getFullRelativePath() + IMergeTreeDataPart::UUID_FILE_NAME, 4096);
         writeUUIDText(new_data_part->uuid, *out);
     }
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.h b/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
index 570bbecb165..2499042b69c 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
@@ -19,6 +19,7 @@ class MergeProgressCallback;
 struct FutureMergedMutatedPart
 {
     String name;
+    UUID uuid;
     String path;
     MergeTreeDataPartType type;
     MergeTreePartInfo part_info;
diff --git a/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp b/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
index ce56efe744f..1d70ff9d6c4 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
@@ -74,6 +74,7 @@ void MergeTreeDataPartInMemory::flushToDisk(const String & base_path, const Stri
     auto new_type = storage.choosePartTypeOnDisk(block.bytes(), rows_count);
     auto new_data_part = storage.createPart(name, new_type, info, volume, new_relative_path);
 
+    new_data_part->uuid = uuid;
     new_data_part->setColumns(columns);
     new_data_part->partition.value.assign(partition.value);
     new_data_part->minmax_idx = minmax_idx;
diff --git a/src/Storages/MergeTree/MergeTreeDataWriter.cpp b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
index e42bb786f46..116e9b8cb81 100644
--- a/src/Storages/MergeTree/MergeTreeDataWriter.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
@@ -247,6 +247,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(BlockWithPa
         createVolumeFromReservation(reservation, volume),
         TMP_PREFIX + part_name);
 
+    new_data_part->uuid = UUIDHelpers::generateV4();
     new_data_part->setColumns(columns);
     new_data_part->partition = std::move(partition);
     new_data_part->minmax_idx = std::move(minmax_idx);
diff --git a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp b/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
index 4b5ae580257..9b14b3412fe 100644
--- a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
+++ b/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
@@ -2,7 +2,9 @@
 #include <Storages/MergeTree/MergeTreeDataPartInMemory.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/MergedBlockOutputStream.h>
+#include <IO/MemoryReadWriteBuffer.h>
 #include <IO/ReadHelpers.h>
+#include <IO/copyData.h>
 #include <Poco/File.h>
 #include <sys/time.h>
 
@@ -56,18 +58,23 @@ void MergeTreeWriteAheadLog::init()
     bytes_at_last_sync = 0;
 }
 
-void MergeTreeWriteAheadLog::addPart(const Block & block, const String & part_name)
+void MergeTreeWriteAheadLog::addPart(DataPartInMemoryPtr & part)
 {
     std::unique_lock lock(write_mutex);
 
-    auto part_info = MergeTreePartInfo::fromPartName(part_name, storage.format_version);
+    auto part_info = MergeTreePartInfo::fromPartName(part->name, storage.format_version);
     min_block_number = std::min(min_block_number, part_info.min_block);
     max_block_number = std::max(max_block_number, part_info.max_block);
 
     writeIntBinary(WAL_VERSION, *out);
+
+    ActionMetadata metadata{};
+    metadata.part_uuid = part->uuid;
+    metadata.write(*out);
+
     writeIntBinary(static_cast<UInt8>(ActionType::ADD_PART), *out);
-    writeStringBinary(part_name, *out);
-    block_out->write(block);
+    writeStringBinary(part->name, *out);
+    block_out->write(part->block);
     block_out->flush();
     sync(lock);
 
@@ -81,6 +88,10 @@ void MergeTreeWriteAheadLog::dropPart(const String & part_name)
     std::unique_lock lock(write_mutex);
 
     writeIntBinary(WAL_VERSION, *out);
+
+    ActionMetadata metadata{};
+    metadata.write(*out);
+
     writeIntBinary(static_cast<UInt8>(ActionType::DROP_PART), *out);
     writeStringBinary(part_name, *out);
     out->next();
@@ -136,6 +147,17 @@ MergeTreeData::MutableDataPartsVector MergeTreeWriteAheadLog::restore(const Stor
                 auto part_disk = storage.reserveSpace(0)->getDisk();
                 auto single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + part_name, disk, 0);
 
+                /// Likely part written by older ClickHouse version which didn't support UUIDs.
+                if (metadata.part_uuid == UUIDHelpers::Nil)
+                {
+                    /// Defensive check. Since WAL version 1 we expect all parts to have UUID.
+                    if (version > 0)
+                        throw Exception("Unexpected empty part_uuid in entry version: " + toString(version), ErrorCodes::CORRUPTED_DATA);
+                    metadata.part_uuid = UUIDHelpers::generateV4();
+                }
+
+                /// TODO(nv) Create part should check for empty UUIDs and crash.
+
                 part = storage.createPart(
                     part_name,
                     MergeTreeDataPartType::IN_MEMORY,
@@ -143,6 +165,8 @@ MergeTreeData::MutableDataPartsVector MergeTreeWriteAheadLog::restore(const Stor
                     single_disk_volume,
                     part_name);
 
+                part->uuid = metadata.part_uuid;
+
                 block = block_in.read();
             }
             else
@@ -249,8 +273,8 @@ void MergeTreeWriteAheadLog::ActionMetadata::read(ReadBuffer & meta_in)
 
     UInt32 metadata_start = meta_in.offset();
 
-    /// For the future: read metadata here.
-
+    if (meta_in.hasPendingData())
+        readUUIDText(part_uuid, meta_in);
 
     /// Skip extra fields if any. If min_compatible_version is lower than WAL_VERSION it means
     /// that the fields are not critical for the correctness.
@@ -260,6 +284,16 @@ void MergeTreeWriteAheadLog::ActionMetadata::read(ReadBuffer & meta_in)
 void MergeTreeWriteAheadLog::ActionMetadata::write(WriteBuffer & meta_out) const
 {
     writeIntBinary(min_compatible_version, meta_out);
-    writeVarUInt(static_cast<UInt32>(0), meta_out);
+
+    /// Write metadata to a temporary buffer first to compute the size.
+    MemoryWriteBuffer buf{};
+
+    writeUUIDText(part_uuid, buf);
+
+    buf.finalize();
+    auto read_buf = buf.tryGetReadBuffer();
+
+    writeVarUInt(static_cast<UInt32>(read_buf->available()), meta_out);
+    copyData(*read_buf, meta_out);
 }
 }
diff --git a/src/Storages/MergeTree/MergeTreeWriteAheadLog.h b/src/Storages/MergeTree/MergeTreeWriteAheadLog.h
index f4cf8ddc315..92330e4dcb4 100644
--- a/src/Storages/MergeTree/MergeTreeWriteAheadLog.h
+++ b/src/Storages/MergeTree/MergeTreeWriteAheadLog.h
@@ -2,9 +2,10 @@
 
 #include <DataStreams/NativeBlockInputStream.h>
 #include <DataStreams/NativeBlockOutputStream.h>
-#include <Storages/MergeTree/IMergeTreeDataPart.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <Disks/IDisk.h>
+#include <Storages/MergeTree/IMergeTreeDataPart.h>
+#include <Storages/MergeTree/MergeTreeDataPartInMemory.h>
 
 namespace DB
 {
@@ -36,11 +37,14 @@ public:
         /// The same approach can be used recursively inside metadata.
         UInt8 min_compatible_version = 0;
 
+        /// Actual metadata.
+        UUID part_uuid = UUIDHelpers::Nil;
+
         void write(WriteBuffer & meta_out) const;
         void read(ReadBuffer & meta_in);
     };
 
-    constexpr static UInt8 WAL_VERSION = 0;
+    constexpr static UInt8 WAL_VERSION = 1;
     constexpr static auto WAL_FILE_NAME = "wal";
     constexpr static auto WAL_FILE_EXTENSION = ".bin";
     constexpr static auto DEFAULT_WAL_FILE_NAME = "wal.bin";
@@ -50,7 +54,7 @@ public:
 
     ~MergeTreeWriteAheadLog();
 
-    void addPart(const Block & block, const String & part_name);
+    void addPart(DataPartInMemoryPtr & part);
     void dropPart(const String & part_name);
     std::vector<MergeTreeMutableDataPartPtr> restore(const StorageMetadataPtr & metadata_snapshot);
 
diff --git a/src/Storages/MergeTree/MergedBlockOutputStream.cpp b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
index 83c59780a0b..23d050ad796 100644
--- a/src/Storages/MergeTree/MergedBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
@@ -133,8 +133,10 @@ void MergedBlockOutputStream::finalizePartOnDisk(
     MergeTreeData::DataPart::Checksums & checksums,
     bool sync)
 {
-    if (new_part->uuid != UUIDHelpers::Nil)
     {
+        if (new_part->uuid == UUIDHelpers::Nil)
+            throw Exception("Empty IMergeTreeDataPart#uuid in finalize for part: " + new_part->name, ErrorCodes::LOGICAL_ERROR);
+
         auto out = volume->getDisk()->writeFile(part_path + IMergeTreeDataPart::UUID_FILE_NAME, 4096);
         writeUUIDText(new_part->uuid, *out);
         out->finalize();
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.cpp
index c8530943873..9bf1de5d03c 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.cpp
@@ -264,6 +264,7 @@ void ReplicatedMergeTreeBlockOutputStream::commitPart(
             log_entry.create_time = time(nullptr);
             log_entry.source_replica = storage.replica_name;
             log_entry.new_part_name = part->name;
+            /// TODO maybe add UUID here as well?
             log_entry.quorum = quorum;
             log_entry.block_id = block_id;
             log_entry.new_part_type = part->getType();
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
index b79717fc54c..93299d52175 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
@@ -31,13 +31,18 @@ void ReplicatedMergeTreeLogEntryData::writeText(WriteBuffer & out) const
             break;
 
         case MERGE_PARTS:
+            assert(new_part_uuid != UUIDHelpers::Nil);
+
             out << "merge\n";
             for (const String & s : source_parts)
                 out << s << '\n';
             out << "into\n" << new_part_name;
             out << "\ndeduplicate: " << deduplicate;
+
             if (merge_type != MergeType::REGULAR)
                 out <<"\nmerge_type: " << static_cast<UInt64>(merge_type);
+
+            out << "\ninto_uuid: " << new_part_uuid;
             break;
 
         case DROP_RANGE:
@@ -70,10 +75,14 @@ void ReplicatedMergeTreeLogEntryData::writeText(WriteBuffer & out) const
             break;
 
         case MUTATE_PART:
+            assert(new_part_uuid != UUIDHelpers::Nil);
+
             out << "mutate\n"
                 << source_parts.at(0) << "\n"
                 << "to\n"
-                << new_part_name;
+                << new_part_name
+                << "\nto_uuid\n"
+                << new_part_uuid;
 
             if (isAlterMutation())
                 out << "\nalter_version\n" << alter_version;
@@ -156,15 +165,21 @@ void ReplicatedMergeTreeLogEntryData::readText(ReadBuffer & in)
             in >> "\ndeduplicate: " >> deduplicate;
 
             /// Trying to be more backward compatible
-            in >> "\n";
-            if (checkString("merge_type: ", in))
+            while (!trailing_newline_found)
             {
-                UInt64 value;
-                in >> value;
-                merge_type = checkAndGetMergeType(value);
+                in >> "\n";
+
+                if (checkString("merge_type: ", in))
+                {
+                    UInt64 value;
+                    in >> value;
+                    merge_type = checkAndGetMergeType(value);
+                }
+                else if (checkString("into_uuid: ", in))
+                    in >> new_part_uuid;
+                else
+                    trailing_newline_found = true;
             }
-            else
-                trailing_newline_found = true;
         }
     }
     else if (type_str == "drop" || type_str == "detach")
@@ -198,12 +213,17 @@ void ReplicatedMergeTreeLogEntryData::readText(ReadBuffer & in)
            >> new_part_name;
         source_parts.push_back(source_part);
 
-        in >> "\n";
+        while (!trailing_newline_found)
+        {
+            in >> "\n";
 
-        if (in.eof())
-            trailing_newline_found = true;
-        else if (checkString("alter_version\n", in))
-            in >> alter_version;
+            if (checkString("alter_version\n", in))
+                in >> alter_version;
+            else if (checkString("to_uuid\n", in))
+                in >> new_part_uuid;
+            else
+                trailing_newline_found = true;
+        }
     }
     else if (type_str == "alter")
     {
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
index e14a884ca1c..9d11888c792 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
@@ -77,6 +77,7 @@ struct ReplicatedMergeTreeLogEntryData
     MergeTreeDataPartType new_part_type;
     String block_id;                        /// For parts of level zero, the block identifier for deduplication (node name in /blocks/).
     mutable String actual_new_part_name;    /// GET_PART could actually fetch a part covering 'new_part_name'.
+    UUID new_part_uuid;
 
     Strings source_parts;
     bool deduplicate = false; /// Do deduplicate on merge
diff --git a/src/Storages/StorageMergeTree.cpp b/src/Storages/StorageMergeTree.cpp
index 4d4b35ce7c4..838266e7825 100644
--- a/src/Storages/StorageMergeTree.cpp
+++ b/src/Storages/StorageMergeTree.cpp
@@ -641,6 +641,7 @@ std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::se
     auto data_settings = getSettings();
 
     FutureMergedMutatedPart future_part;
+    future_part.uuid = UUIDHelpers::generateV4();
 
     /// You must call destructor with unlocked `currently_processing_in_background_mutex`.
     CurrentlyMergingPartsTaggerPtr merging_tagger;
@@ -862,7 +863,8 @@ std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::se
         future_part.parts.push_back(part);
         future_part.part_info = new_part_info;
         future_part.name = part->getNewName(new_part_info);
-        future_part.type = part->getType();
+        future_part.uuid = UUIDHelpers::generateV4();
+            future_part.type = part->getType();
 
         tagger = std::make_unique<CurrentlyMergingPartsTagger>(future_part, MergeTreeDataMergerMutator::estimateNeededDiskSpace({part}), *this, metadata_snapshot, true);
         return std::make_shared<MergeMutateSelectedEntry>(future_part, std::move(tagger), commands);
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index dc254ae536e..dea6318808a 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -1443,6 +1443,7 @@ bool StorageReplicatedMergeTree::tryExecuteMerge(const LogEntry & entry)
         throw Exception("Future merged part name " + backQuote(future_merged_part.name) + " differs from part name in log entry: "
             + backQuote(entry.new_part_name), ErrorCodes::BAD_DATA_PART_NAME);
     }
+    future_merged_part.uuid = entry.new_part_uuid;
     future_merged_part.updatePath(*this, reserved_space);
     future_merged_part.merge_type = entry.merge_type;
 
@@ -1567,9 +1568,10 @@ bool StorageReplicatedMergeTree::tryExecutePartMutation(const StorageReplicatedM
     Transaction transaction(*this);
 
     FutureMergedMutatedPart future_mutated_part;
+    future_mutated_part.name = entry.new_part_name;
+    future_mutated_part.uuid = entry.new_part_uuid;
     future_mutated_part.parts.push_back(source_part);
     future_mutated_part.part_info = new_part_info;
-    future_mutated_part.name = entry.new_part_name;
     future_mutated_part.updatePath(*this, reserved_space);
     future_mutated_part.type = source_part->getType();
 
@@ -2824,6 +2826,7 @@ StorageReplicatedMergeTree::CreateMergeEntryResult StorageReplicatedMergeTree::c
     entry.type = LogEntry::MERGE_PARTS;
     entry.source_replica = replica_name;
     entry.new_part_name = merged_name;
+    entry.new_part_uuid = UUIDHelpers::generateV4();
     entry.new_part_type = merged_part_type;
     entry.merge_type = merge_type;
     entry.deduplicate = deduplicate;
@@ -2899,6 +2902,7 @@ StorageReplicatedMergeTree::CreateMergeEntryResult StorageReplicatedMergeTree::c
     entry.source_replica = replica_name;
     entry.source_parts.push_back(part.name);
     entry.new_part_name = new_part_name;
+    entry.new_part_uuid = UUIDHelpers::generateV4();
     entry.create_time = time(nullptr);
     entry.alter_version = alter_version;
 

From b6a330de77661aea157995b5724c0db1ea76d026 Mon Sep 17 00:00:00 2001
From: Nicolae Vartolomei <nv@cloudflare.com>
Date: Fri, 30 Oct 2020 17:11:13 +0000
Subject: [PATCH 48/99] Allow running subset of tests in fasttest

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

diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index aef967b6b41..c95344eeca2 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -15,6 +15,9 @@ stage=${stage:-}
 # empty parameter.
 read -ra FASTTEST_CMAKE_FLAGS <<< "${FASTTEST_CMAKE_FLAGS:-}"
 
+# Run only matching tests.
+FASTTEST_FOCUS=${FASTTEST_FOCUS:-""}
+
 FASTTEST_WORKSPACE=$(readlink -f "${FASTTEST_WORKSPACE:-.}")
 FASTTEST_SOURCE=$(readlink -f "${FASTTEST_SOURCE:-$FASTTEST_WORKSPACE/ch}")
 FASTTEST_BUILD=$(readlink -f "${FASTTEST_BUILD:-${BUILD:-$FASTTEST_WORKSPACE/build}}")
@@ -291,7 +294,7 @@ TESTS_TO_SKIP=(
     01563_distributed_query_finish
 )
 
-time clickhouse-test -j 8 --order=random --no-long --testname --shard --zookeeper --skip "${TESTS_TO_SKIP[@]}" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/test_log.txt"
+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")

From e7266625e84afd0e892687a432f85a5fe7978b62 Mon Sep 17 00:00:00 2001
From: Mikhail Filimonov <mfilimonov@altinity.com>
Date: Thu, 19 Nov 2020 14:52:44 +0100
Subject: [PATCH 49/99] Update cctz to the latest master, update tzdb to 2020d.

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

diff --git a/contrib/cctz b/contrib/cctz
index 7a2db4ece6e..260ba195ef6 160000
--- a/contrib/cctz
+++ b/contrib/cctz
@@ -1 +1 @@
-Subproject commit 7a2db4ece6e0f1b246173cbdb62711ae258ee841
+Subproject commit 260ba195ef6c489968bae8c88c62a67cdac5ff9d

From f1b8906418017409225e54f518555a091a5bc635 Mon Sep 17 00:00:00 2001
From: Nico Piderman <nico.piderman@gmail.com>
Date: Thu, 19 Nov 2020 15:44:58 +0100
Subject: [PATCH 50/99] Minor grammar correction in error messages

Noticed this when I got an error loading some JSONEachRow data.
'while read the value of' -> 'while reading the value of'.
---
 .../Formats/Impl/JSONCompactEachRowRowInputFormat.cpp           | 2 +-
 src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp       | 2 +-
 src/Processors/Formats/Impl/RegexpRowInputFormat.cpp            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
index 49c8d29ca2f..f20e764dcfd 100644
--- a/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
@@ -225,7 +225,7 @@ void JSONCompactEachRowRowInputFormat::readField(size_t index, MutableColumns &
     }
     catch (Exception & e)
     {
-        e.addMessage("(while read the value of key " +  getPort().getHeader().getByPosition(index).name + ")");
+        e.addMessage("(while reading the value of key " +  getPort().getHeader().getByPosition(index).name + ")");
         throw;
     }
 }
diff --git a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
index 0bdd102de1c..234839b41f5 100644
--- a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
@@ -163,7 +163,7 @@ void JSONEachRowRowInputFormat::readField(size_t index, MutableColumns & columns
     }
     catch (Exception & e)
     {
-        e.addMessage("(while read the value of key " + columnName(index) + ")");
+        e.addMessage("(while reading the value of key " + columnName(index) + ")");
         throw;
     }
 }
diff --git a/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp b/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
index d193a502f2e..c3f9d07b893 100644
--- a/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
@@ -102,7 +102,7 @@ bool RegexpRowInputFormat::readField(size_t index, MutableColumns & columns)
     }
     catch (Exception & e)
     {
-        e.addMessage("(while read the value of column " +  getPort().getHeader().getByPosition(index).name + ")");
+        e.addMessage("(while reading the value of column " +  getPort().getHeader().getByPosition(index).name + ")");
         throw;
     }
     return read;

From a15b8afa73cc2370ae4ff7127b1254f362d66a7c Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Thu, 19 Nov 2020 19:07:36 +0300
Subject: [PATCH 51/99] Don't add tons of client coverage files in stateful
 tests with coverage

---
 docker/test/stateful_with_coverage/run.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/docker/test/stateful_with_coverage/run.sh b/docker/test/stateful_with_coverage/run.sh
index aaf7e0a44ac..7a21c397ce5 100755
--- a/docker/test/stateful_with_coverage/run.sh
+++ b/docker/test/stateful_with_coverage/run.sh
@@ -86,20 +86,20 @@ while /bin/true; do
     sleep 2
 done &
 
-LLVM_PROFILE_FILE='client_%h_%p_%m.profraw' clickhouse-client --query "SHOW DATABASES"
-LLVM_PROFILE_FILE='client_%h_%p_%m.profraw' clickhouse-client --query "ATTACH DATABASE datasets ENGINE = Ordinary"
-LLVM_PROFILE_FILE='client_%h_%p_%m.profraw' clickhouse-client --query "CREATE DATABASE test"
+LLVM_PROFILE_FILE='client_coverage.profraw' clickhouse-client --query "SHOW DATABASES"
+LLVM_PROFILE_FILE='client_coverage.profraw' clickhouse-client --query "ATTACH DATABASE datasets ENGINE = Ordinary"
+LLVM_PROFILE_FILE='client_coverage.profraw' clickhouse-client --query "CREATE DATABASE test"
 
 kill_clickhouse
 start_clickhouse
 
 sleep 10
 
-LLVM_PROFILE_FILE='client_%h_%p_%m.profraw' clickhouse-client --query "SHOW TABLES FROM datasets"
-LLVM_PROFILE_FILE='client_%h_%p_%m.profraw' clickhouse-client --query "SHOW TABLES FROM test"
-LLVM_PROFILE_FILE='client_%h_%p_%m.profraw' clickhouse-client --query "RENAME TABLE datasets.hits_v1 TO test.hits"
-LLVM_PROFILE_FILE='client_%h_%p_%m.profraw' clickhouse-client --query "RENAME TABLE datasets.visits_v1 TO test.visits"
-LLVM_PROFILE_FILE='client_%h_%p_%m.profraw' clickhouse-client --query "SHOW TABLES FROM test"
+LLVM_PROFILE_FILE='client_coverage.profraw' clickhouse-client --query "SHOW TABLES FROM datasets"
+LLVM_PROFILE_FILE='client_coverage.profraw' clickhouse-client --query "SHOW TABLES FROM test"
+LLVM_PROFILE_FILE='client_coverage.profraw' clickhouse-client --query "RENAME TABLE datasets.hits_v1 TO test.hits"
+LLVM_PROFILE_FILE='client_coverage.profraw' clickhouse-client --query "RENAME TABLE datasets.visits_v1 TO test.visits"
+LLVM_PROFILE_FILE='client_coverage.profraw' clickhouse-client --query "SHOW TABLES FROM test"
 
 if grep -q -- "--use-skip-list" /usr/bin/clickhouse-test; then
     SKIP_LIST_OPT="--use-skip-list"
@@ -109,7 +109,7 @@ fi
 # more idiologically correct.
 read -ra ADDITIONAL_OPTIONS <<< "${ADDITIONAL_OPTIONS:-}"
 
-LLVM_PROFILE_FILE='client_%h_%p_%m.profraw' clickhouse-test --testname --shard --zookeeper --no-stateless --hung-check --print-time "$SKIP_LIST_OPT" "${ADDITIONAL_OPTIONS[@]}" "$SKIP_TESTS_OPTION" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee test_output/test_result.txt
+LLVM_PROFILE_FILE='client_coverage.profraw' clickhouse-test --testname --shard --zookeeper --no-stateless --hung-check --print-time "$SKIP_LIST_OPT" "${ADDITIONAL_OPTIONS[@]}" "$SKIP_TESTS_OPTION" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee test_output/test_result.txt
 
 kill_clickhouse
 

From 3f01096c86b13b070f0396410f07b21993683b77 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Thu, 19 Nov 2020 20:03:20 +0300
Subject: [PATCH 52/99] Less verbose logging when fetch is impossible

---
 src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
index 6bdc83bde60..837819f21f2 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
@@ -1048,13 +1048,11 @@ bool ReplicatedMergeTreeQueue::shouldExecuteLogEntry(
     }
 
     /// Check that fetches pool is not overloaded
-    if (entry.type == LogEntry::GET_PART)
+    if (entry.type == LogEntry::GET_PART && !storage.canExecuteFetch(entry, out_postpone_reason))
     {
-        if (!storage.canExecuteFetch(entry, out_postpone_reason))
-        {
-            LOG_TRACE(log, out_postpone_reason);
-            return false;
-        }
+        /// Don't print log message about this, because we can have a lot of fetches,
+        /// for example during replica recovery.
+        return false;
     }
 
     if (entry.type == LogEntry::MERGE_PARTS || entry.type == LogEntry::MUTATE_PART)

From 50a7bc2a8a64e775573dbaad651fa078bdfbc9c3 Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Thu, 19 Nov 2020 21:06:58 +0300
Subject: [PATCH 53/99] Update settings.md

---
 docs/ru/operations/settings/settings.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index 9e192348f51..3e0abfa31df 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -2099,10 +2099,6 @@ SELECT CAST(toNullable(toInt32(0)) AS Int32) as x, toTypeName(x);
 
 Позволяет настраивать представление `NULL` для формата выходных данных [TSV](../../interfaces/formats.md#tabseparated). Настройка управляет форматом выходных данных, `\N` является единственным поддерживаемым представлением для формата входных данных TSV.
 
-Возможные значения:
-
--   `\N` — включено.
-
 Значение по умолчанию: `\N`.
 
 [Оригинальная статья](https://clickhouse.tech/docs/ru/operations/settings/settings/) <!--hide-->

From 3610074a83cf604418d3171c45463fcbea1bc71e Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Thu, 19 Nov 2020 21:07:15 +0300
Subject: [PATCH 54/99] Update settings.md

---
 docs/en/operations/settings/settings.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index f720024f524..d69011dcf22 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -2237,10 +2237,6 @@ Default value: `1`.
 
 Allows configurable `NULL` representation for [TSV](../../interfaces/formats.md#tabseparated) output format. The setting only controls output format and `\N` is the only supported `NULL` representation for TSV input format.
 
-Possible values:
-
--   `\N` — Enabled.
-
 Default value: `\N`.
 
 [Original article](https://clickhouse.tech/docs/en/operations/settings/settings/) <!-- hide -->

From 75f04fac40e06977c43aa8e97ff1c32092e4d761 Mon Sep 17 00:00:00 2001
From: sevirov <72220289+sevirov@users.noreply.github.com>
Date: Thu, 19 Nov 2020 21:12:22 +0300
Subject: [PATCH 55/99] DOCSUP-4162: Document the system.replicated_fetches
 system table (#16900)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Create replicated_fetches.md

Задокументировал системную таблицу system.replicated_fetches.

* Edit and translate replicated_fetches.md

Поправил английскую версию и перевел на русский язык.

* Update replicated_fetches.md

Внес поправки.

* Update replicated_fetches.md

Внес изменения в русскую версию.

Co-authored-by: Dmitriy <sevirov@yandex-team.ru>
---
 .../system-tables/replicated_fetches.md       | 70 +++++++++++++++++++
 .../system-tables/replicated_fetches.md       | 70 +++++++++++++++++++
 2 files changed, 140 insertions(+)
 create mode 100644 docs/en/operations/system-tables/replicated_fetches.md
 create mode 100644 docs/ru/operations/system-tables/replicated_fetches.md

diff --git a/docs/en/operations/system-tables/replicated_fetches.md b/docs/en/operations/system-tables/replicated_fetches.md
new file mode 100644
index 00000000000..bc7e6335c0d
--- /dev/null
+++ b/docs/en/operations/system-tables/replicated_fetches.md
@@ -0,0 +1,70 @@
+# system.replicated_fetches {#system_tables-replicated_fetches}
+
+Contains information about currently running background fetches.
+
+Columns:
+
+-   `database` ([String](../../sql-reference/data-types/string.md)) — Name of the database.
+
+-   `table` ([String](../../sql-reference/data-types/string.md)) — Name of the table.
+
+-   `elapsed` ([Float64](../../sql-reference/data-types/float.md)) — The time elapsed (in seconds) since showing currently running background fetches started.
+
+-   `progress` ([Float64](../../sql-reference/data-types/float.md)) — The percentage of completed work from 0 to 1.
+
+-   `result_part_name` ([String](../../sql-reference/data-types/string.md)) — The name of the part that will be formed as the result of showing currently running background fetches.
+
+-   `result_part_path` ([String](../../sql-reference/data-types/string.md)) — Absolute path to the part that will be formed as the result of showing currently running background fetches.
+
+-   `partition_id` ([String](../../sql-reference/data-types/string.md)) — ID of the partition.
+
+-   `total_size_bytes_compressed` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The total size (in bytes) of the compressed data in the result part.
+
+-   `bytes_read_compressed` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of compressed bytes read from the result part.
+
+-   `source_replica_path` ([String](../../sql-reference/data-types/string.md)) — Absolute path to the source replica.
+
+-   `source_replica_hostname` ([String](../../sql-reference/data-types/string.md)) — Hostname of the source replica.
+
+-   `source_replica_port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — Port number of the source replica.
+
+-   `interserver_scheme` ([String](../../sql-reference/data-types/string.md)) — Name of the interserver scheme.
+
+-   `URI` ([String](../../sql-reference/data-types/string.md)) — Uniform resource identifier.
+
+-   `to_detached` ([UInt8](../../sql-reference/data-types/int-uint.md)) — The flag indicates whether the currently running background fetch is being performed using the `TO DETACHED` expression.
+
+-   `thread_id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Thread identifier.
+
+**Example**
+
+``` sql
+SELECT * FROM system.replicated_fetches LIMIT 1 FORMAT Vertical;
+```
+
+``` text
+Row 1:
+──────
+database:                    default
+table:                       t
+elapsed:                     7.243039876
+progress:                    0.41832135995612835
+result_part_name:            all_0_0_0
+result_part_path:            /var/lib/clickhouse/store/700/70080a04-b2de-4adf-9fa5-9ea210e81766/all_0_0_0/
+partition_id:                all
+total_size_bytes_compressed: 1052783726
+bytes_read_compressed:       440401920
+source_replica_path:         /clickhouse/test/t/replicas/1
+source_replica_hostname:     node1
+source_replica_port:         9009
+interserver_scheme:          http
+URI:                         http://node1:9009/?endpoint=DataPartsExchange%3A%2Fclickhouse%2Ftest%2Ft%2Freplicas%2F1&part=all_0_0_0&client_protocol_version=4&compress=false
+to_detached:                 0
+thread_id:                   54
+```
+
+**See Also**
+
+-   [Managing ReplicatedMergeTree Tables](../../sql-reference/statements/system/#query-language-system-replicated)
+
+[Original article](https://clickhouse.tech/docs/en/operations/system_tables/replicated_fetches) <!--hide-->
diff --git a/docs/ru/operations/system-tables/replicated_fetches.md b/docs/ru/operations/system-tables/replicated_fetches.md
new file mode 100644
index 00000000000..94584f390ee
--- /dev/null
+++ b/docs/ru/operations/system-tables/replicated_fetches.md
@@ -0,0 +1,70 @@
+# system.replicated_fetches {#system_tables-replicated_fetches}
+
+Содержит информацию о выполняемых в данный момент фоновых операциях скачивания кусков данных с других реплик.
+
+Столбцы:
+
+-   `database` ([String](../../sql-reference/data-types/string.md)) — имя базы данных.
+
+-   `table` ([String](../../sql-reference/data-types/string.md)) — имя таблицы.
+
+-   `elapsed` ([Float64](../../sql-reference/data-types/float.md)) — время, прошедшее от момента начала скачивания куска, в секундах.
+
+-   `progress` ([Float64](../../sql-reference/data-types/float.md)) — доля выполненной работы от 0 до 1.
+
+-   `result_part_name` ([String](../../sql-reference/data-types/string.md)) — имя скачиваемого куска.
+
+-   `result_part_path` ([String](../../sql-reference/data-types/string.md)) — абсолютный путь к скачиваемому куску.
+
+-   `partition_id` ([String](../../sql-reference/data-types/string.md)) — идентификатор партиции.
+
+-   `total_size_bytes_compressed` ([UInt64](../../sql-reference/data-types/int-uint.md)) — общий размер сжатой информации в скачиваемом куске в байтах.
+
+-   `bytes_read_compressed` ([UInt64](../../sql-reference/data-types/int-uint.md)) — размер сжатой информации, считанной из скачиваемого куска, в байтах.
+
+-   `source_replica_path` ([String](../../sql-reference/data-types/string.md)) — абсолютный путь к исходной реплике.
+
+-   `source_replica_hostname` ([String](../../sql-reference/data-types/string.md)) — имя хоста исходной реплики.
+
+-   `source_replica_port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — номер порта исходной реплики.
+
+-   `interserver_scheme` ([String](../../sql-reference/data-types/string.md)) — имя межсерверной схемы.
+
+-   `URI` ([String](../../sql-reference/data-types/string.md)) — универсальный идентификатор ресурса.
+
+-   `to_detached` ([UInt8](../../sql-reference/data-types/int-uint.md)) — флаг, указывающий на использование выражения `TO DETACHED` в текущих фоновых операциях.
+
+-   `thread_id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — идентификатор потока.
+
+**Пример**
+
+``` sql
+SELECT * FROM system.replicated_fetches LIMIT 1 FORMAT Vertical;
+```
+
+``` text
+Row 1:
+──────
+database:                    default
+table:                       t
+elapsed:                     7.243039876
+progress:                    0.41832135995612835
+result_part_name:            all_0_0_0
+result_part_path:            /var/lib/clickhouse/store/700/70080a04-b2de-4adf-9fa5-9ea210e81766/all_0_0_0/
+partition_id:                all
+total_size_bytes_compressed: 1052783726
+bytes_read_compressed:       440401920
+source_replica_path:         /clickhouse/test/t/replicas/1
+source_replica_hostname:     node1
+source_replica_port:         9009
+interserver_scheme:          http
+URI:                         http://node1:9009/?endpoint=DataPartsExchange%3A%2Fclickhouse%2Ftest%2Ft%2Freplicas%2F1&part=all_0_0_0&client_protocol_version=4&compress=false
+to_detached:                 0
+thread_id:                   54
+```
+
+**Смотрите также**
+
+-   [Управление таблицами ReplicatedMergeTree](../../sql-reference/statements/system/#query-language-system-replicated)
+
+[Оригинальная статья](https://clickhouse.tech/docs/en/operations/system_tables/replicated_fetches) <!--hide-->

From 1a467930a770d3121afce8f5f7a21d16f20cc542 Mon Sep 17 00:00:00 2001
From: Denny Crane <deniszhuravlov@gmail.com>
Date: Thu, 19 Nov 2020 15:52:52 -0400
Subject: [PATCH 56/99] final_parallel

---
 docs/ru/sql-reference/statements/select/from.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/ru/sql-reference/statements/select/from.md b/docs/ru/sql-reference/statements/select/from.md
index 491bbfe892b..8facf140118 100644
--- a/docs/ru/sql-reference/statements/select/from.md
+++ b/docs/ru/sql-reference/statements/select/from.md
@@ -27,9 +27,9 @@ toc_title: FROM
 
 ### Недостатки {#drawbacks}
 
-Запросы, которые используют `FINAL` выполняются не так быстро, как аналогичные запросы без него, потому что:
+Запросы, которые используют `FINAL` выполняются немного медленее, чем аналогичные запросы без него, потому что:
 
--   Запрос выполняется в одном потоке, и данные мёржатся во время выполнения запроса.
+-   Данные мёржатся во время выполнения запроса.
 -   Запросы с модификатором `FINAL` читают столбцы первичного ключа в дополнение к столбцам, используемым в запросе.
 
 **В большинстве случаев избегайте использования `FINAL`.** Общий подход заключается в использовании агрегирующих запросов, которые предполагают, что фоновые процессы движков семейства `MergeTree` ещё не случились  (например, сами отбрасывают дубликаты). {## TODO: examples ##}

From ceb42affdcff234d5a768d373058d5052a55ef8a Mon Sep 17 00:00:00 2001
From: Denny Crane <deniszhuravlov@gmail.com>
Date: Thu, 19 Nov 2020 15:56:00 -0400
Subject: [PATCH 57/99] final_parallel

---
 docs/en/sql-reference/statements/select/from.md | 4 ++--
 1 file 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 dbfd5431861..71586e15a31 100644
--- a/docs/en/sql-reference/statements/select/from.md
+++ b/docs/en/sql-reference/statements/select/from.md
@@ -27,9 +27,9 @@ It is applicable when selecting data from tables that use the [MergeTree](../../
 
 ### Drawbacks {#drawbacks}
 
-Queries that use `FINAL` are executed not as fast as similar queries that don’t, because:
+Queries that use `FINAL` are executed slightly slower than similar queries that don’t, because:
 
--   Query is executed in a single thread and data is merged during query execution.
+-   Data is merged during query execution.
 -   Queries with `FINAL` read primary key columns in addition to the columns specified in the query.
 
 **In most cases, avoid using `FINAL`.** The common approach is to use different queries that assume the background processes of the `MergeTree` engine have’t happened yet and deal with it by applying aggregation (for example, to discard duplicates). {## TODO: examples ##}

From 95a203c8cae686ed29c319f87e02c98e8d5aa5d7 Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@ttxit.com>
Date: Fri, 20 Nov 2020 15:21:36 +0800
Subject: [PATCH 58/99] Fixed a problem with the translation of the document

Fixed a problem with the translation of the document
---
 docs/zh/operations/monitoring.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/zh/operations/monitoring.md b/docs/zh/operations/monitoring.md
index a5c30e46f4c..73896d3f8c1 100644
--- a/docs/zh/operations/monitoring.md
+++ b/docs/zh/operations/monitoring.md
@@ -33,10 +33,10 @@ ClickHouse 收集的指标项：
 -   服务用于计算的资源占用的各种指标。
 -   关于查询处理的常见统计信息。
 
-可以在 [系统指标](system-tables/metrics.md#system_tables-metrics) ，[系统事件](system-tables/events.md#system_tables-events) 以及[系统异步指标](system-tables/asynchronous_metrics.md#system_tables-asynchronous_metrics) 等系统表查看所有的指标项。
+可以在[系统指标](system-tables/metrics.md#system_tables-metrics)，[系统事件](system-tables/events.md#system_tables-events)以及[系统异步指标](system-tables/asynchronous_metrics.md#system_tables-asynchronous_metrics)等系统表查看所有的指标项。
 
-可以配置ClickHouse 往 [石墨](https://github.com/graphite-project)导入指标。 参考 [石墨部分](server-configuration-parameters/settings.md#server_configuration_parameters-graphite) 配置文件。在配置指标导出之前，需要参考Graphite[官方教程](https://graphite.readthedocs.io/en/latest/install.html)搭建服务。
+可以配置ClickHouse向[Graphite](https://github.com/graphite-project)推送监控信息并导入指标。参考[Graphite监控](server-configuration-parameters/settings.md#server_configuration_parameters-graphite)配置文件。在配置指标导出之前，需要参考[Graphite官方教程](https://graphite.readthedocs.io/en/latest/install.html)搭建Graphite服务。
 
-此外，您可以通过HTTP API监视服务器可用性。 将HTTP GET请求发送到 `/ping`。 如果服务器可用，它将以 `200 OK` 响应。
+此外，您可以通过HTTP API监视服务器可用性。将HTTP GET请求发送到`/ping`。如果服务器可用，它将以 `200 OK` 响应。
 
-要监视服务器集群的配置，应设置[max_replica_delay_for_distributed_queries](settings/settings.md#settings-max_replica_delay_for_distributed_queries)参数并使用HTTP资源`/replicas_status`。 如果副本可用，并且不延迟在其他副本之后，则对`/replicas_status`的请求将返回200 OK。 如果副本滞后，请求将返回 `503 HTTP_SERVICE_UNAVAILABLE`，包括有关待办事项大小的信息。
+要监视服务器集群的配置，应设置[max_replica_delay_for_distributed_queries](settings/settings.md#settings-max_replica_delay_for_distributed_queries)参数并使用HTTP资源`/replicas_status`。 如果副本可用，并且不延迟在其他副本之后，则对`/replicas_status`的请求将返回`200 OK`。 如果副本滞后，请求将返回`503 HTTP_SERVICE_UNAVAILABLE`，包括有关待办事项大小的信息。

From 78860bf2bde71eeeea5dcc25d4f17a0a1d8e71c4 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Fri, 20 Nov 2020 11:48:06 +0300
Subject: [PATCH 59/99] Improvements in coverage images

---
 docker/test/coverage/Dockerfile               |  8 +-
 docker/test/stateful_with_coverage/Dockerfile |  4 +-
 docker/test/stateful_with_coverage/run.sh     | 83 +++++++------------
 .../test/stateless_with_coverage/Dockerfile   |  6 +-
 docker/test/stateless_with_coverage/run.sh    | 43 ++++++----
 5 files changed, 67 insertions(+), 77 deletions(-)

diff --git a/docker/test/coverage/Dockerfile b/docker/test/coverage/Dockerfile
index 32020951539..cea1a63cf6f 100644
--- a/docker/test/coverage/Dockerfile
+++ b/docker/test/coverage/Dockerfile
@@ -7,8 +7,10 @@ ENV SOURCE_DIR=/build
 ENV OUTPUT_DIR=/output
 ENV IGNORE='.*contrib.*'
 
-CMD mkdir -p /build/obj-x86_64-linux-gnu && cd /build/obj-x86_64-linux-gnu && CC=clang-10 CXX=clang++-10 cmake .. && cd /; \
+RUN apt-get update && apt-get install cmake --yes --no-install-recommends
+
+CMD mkdir -p /build/obj-x86_64-linux-gnu && cd /build/obj-x86_64-linux-gnu && CC=clang-11 CXX=clang++-11 cmake .. && cd /; \
     dpkg -i /package_folder/clickhouse-common-static_*.deb; \
-    llvm-profdata-10 merge -sparse ${COVERAGE_DIR}/* -o clickhouse.profdata && \
-    llvm-cov-10 export /usr/bin/clickhouse -instr-profile=clickhouse.profdata -j=16 -format=lcov -skip-functions -ignore-filename-regex $IGNORE > output.lcov && \
+    llvm-profdata-11 merge -sparse ${COVERAGE_DIR}/* -o clickhouse.profdata && \
+    llvm-cov-11 export /usr/bin/clickhouse -instr-profile=clickhouse.profdata -j=16 -format=lcov -skip-functions -ignore-filename-regex $IGNORE > output.lcov && \
     genhtml output.lcov --ignore-errors source --output-directory ${OUTPUT_DIR}
diff --git a/docker/test/stateful_with_coverage/Dockerfile b/docker/test/stateful_with_coverage/Dockerfile
index f5d66ed5013..ac6645b9463 100644
--- a/docker/test/stateful_with_coverage/Dockerfile
+++ b/docker/test/stateful_with_coverage/Dockerfile
@@ -1,12 +1,12 @@
 # docker build -t yandex/clickhouse-stateful-test-with-coverage .
-FROM yandex/clickhouse-stateless-test
+FROM yandex/clickhouse-stateless-test-with-coverage
 
 RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main" >> /etc/apt/sources.list
 
 RUN apt-get update -y \
     && env DEBIAN_FRONTEND=noninteractive \
         apt-get install --yes --no-install-recommends \
-        python3-requests
+        python3-requests procps psmisc
 
 COPY s3downloader /s3downloader
 COPY run.sh /run.sh
diff --git a/docker/test/stateful_with_coverage/run.sh b/docker/test/stateful_with_coverage/run.sh
index 7a21c397ce5..5fc6350fad8 100755
--- a/docker/test/stateful_with_coverage/run.sh
+++ b/docker/test/stateful_with_coverage/run.sh
@@ -1,40 +1,44 @@
 #!/bin/bash
 
 kill_clickhouse () {
-    kill "$(pgrep -u clickhouse)" 2>/dev/null
+    echo "clickhouse pids $(pgrep -u clickhouse)" | ts '%Y-%m-%d %H:%M:%S'
+    pkill -f "clickhouse-server" 2>/dev/null
 
-    for _ in {1..10}
+
+    for _ in {1..120}
     do
-        if ! kill -0 "$(pgrep -u clickhouse)"; then
-            echo "No clickhouse process"
-            break
-        else
-            echo "Process $(pgrep -u clickhouse) still alive"
-            sleep 10
-        fi
+        if ! pkill -0 -f "clickhouse-server" ; then break ; fi
+        echo "ClickHouse still alive" | ts '%Y-%m-%d %H:%M:%S'
+        sleep 1
     done
+
+    if pkill -0 -f "clickhouse-server"
+    then
+        pstree -apgT
+        jobs
+        echo "Failed to kill the ClickHouse server"  | ts '%Y-%m-%d %H:%M:%S'
+        return 1
+    fi
 }
 
 start_clickhouse () {
     LLVM_PROFILE_FILE='server_%h_%p_%m.profraw' sudo -Eu clickhouse /usr/bin/clickhouse-server --config /etc/clickhouse-server/config.xml &
-}
-
-wait_llvm_profdata () {
-    while kill -0 "$(pgrep llvm-profdata-10)"
+    counter=0
+    until clickhouse-client --query "SELECT 1"
     do
-        echo "Waiting for profdata $(pgrep llvm-profdata-10) still alive"
-        sleep 3
+        if [ "$counter" -gt 120 ]
+        then
+            echo "Cannot start clickhouse-server"
+            cat /var/log/clickhouse-server/stdout.log
+            tail -n1000 /var/log/clickhouse-server/stderr.log
+            tail -n1000 /var/log/clickhouse-server/clickhouse-server.log
+            break
+        fi
+        sleep 0.5
+        counter=$((counter + 1))
     done
 }
 
-merge_client_files_in_background () {
-    client_files=$(ls /client_*profraw 2>/dev/null)
-    if [ -n "$client_files" ]
-    then
-        llvm-profdata-10 merge -sparse "$client_files" -o "merged_client_$(date +%s).profraw"
-        rm "$client_files"
-    fi
-}
 
 chmod 777 /
 
@@ -51,26 +55,7 @@ chmod 777 -R /var/log/clickhouse-server/
 # install test configs
 /usr/share/clickhouse-test/config/install.sh
 
-function start()
-{
-    counter=0
-    until clickhouse-client --query "SELECT 1"
-    do
-        if [ "$counter" -gt 120 ]
-        then
-            echo "Cannot start clickhouse-server"
-            cat /var/log/clickhouse-server/stdout.log
-            tail -n1000 /var/log/clickhouse-server/stderr.log
-            tail -n1000 /var/log/clickhouse-server/clickhouse-server.log
-            break
-        fi
-        timeout 120 service clickhouse-server start
-        sleep 0.5
-        counter=$((counter + 1))
-    done
-}
-
-start
+start_clickhouse
 
 # shellcheck disable=SC2086 # No quotes because I want to split it into words.
 if ! /s3downloader --dataset-names $DATASETS; then
@@ -81,10 +66,6 @@ fi
 
 chmod 777 -R /var/lib/clickhouse
 
-while /bin/true; do
-    merge_client_files_in_background
-    sleep 2
-done &
 
 LLVM_PROFILE_FILE='client_coverage.profraw' clickhouse-client --query "SHOW DATABASES"
 LLVM_PROFILE_FILE='client_coverage.profraw' clickhouse-client --query "ATTACH DATABASE datasets ENGINE = Ordinary"
@@ -93,14 +74,13 @@ LLVM_PROFILE_FILE='client_coverage.profraw' clickhouse-client --query "CREATE DA
 kill_clickhouse
 start_clickhouse
 
-sleep 10
-
 LLVM_PROFILE_FILE='client_coverage.profraw' clickhouse-client --query "SHOW TABLES FROM datasets"
 LLVM_PROFILE_FILE='client_coverage.profraw' clickhouse-client --query "SHOW TABLES FROM test"
 LLVM_PROFILE_FILE='client_coverage.profraw' clickhouse-client --query "RENAME TABLE datasets.hits_v1 TO test.hits"
 LLVM_PROFILE_FILE='client_coverage.profraw' clickhouse-client --query "RENAME TABLE datasets.visits_v1 TO test.visits"
 LLVM_PROFILE_FILE='client_coverage.profraw' clickhouse-client --query "SHOW TABLES FROM test"
 
+
 if grep -q -- "--use-skip-list" /usr/bin/clickhouse-test; then
     SKIP_LIST_OPT="--use-skip-list"
 fi
@@ -113,11 +93,6 @@ LLVM_PROFILE_FILE='client_coverage.profraw' clickhouse-test --testname --shard -
 
 kill_clickhouse
 
-wait_llvm_profdata
-
 sleep 3
 
-wait_llvm_profdata # 100% merged all parts
-
-
 cp /*.profraw /profraw ||:
diff --git a/docker/test/stateless_with_coverage/Dockerfile b/docker/test/stateless_with_coverage/Dockerfile
index 1d6a85adf9e..f7379ba5568 100644
--- a/docker/test/stateless_with_coverage/Dockerfile
+++ b/docker/test/stateless_with_coverage/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-stateless-with-coverage-test .
+# docker build -t yandex/clickhouse-stateless-test-with-coverage .
 # TODO: that can be based on yandex/clickhouse-stateless-test (llvm version and CMD differs)
 FROM yandex/clickhouse-test-base
 
@@ -28,7 +28,9 @@ RUN apt-get update -y \
             lsof \
             unixodbc \
             wget \
-            qemu-user-static
+            qemu-user-static \
+            procps \
+            psmisc
 
 RUN mkdir -p /tmp/clickhouse-odbc-tmp \
    && wget -nv -O - ${odbc_driver_url} | tar --strip-components=1 -xz -C /tmp/clickhouse-odbc-tmp \
diff --git a/docker/test/stateless_with_coverage/run.sh b/docker/test/stateless_with_coverage/run.sh
index 758591df618..4e4d9430a11 100755
--- a/docker/test/stateless_with_coverage/run.sh
+++ b/docker/test/stateless_with_coverage/run.sh
@@ -2,27 +2,41 @@
 
 kill_clickhouse () {
     echo "clickhouse pids $(pgrep -u clickhouse)" | ts '%Y-%m-%d %H:%M:%S'
-    kill "$(pgrep -u clickhouse)" 2>/dev/null
+    pkill -f "clickhouse-server" 2>/dev/null
 
-    for _ in {1..10}
+
+    for _ in {1..120}
     do
-        if ! kill -0 "$(pgrep -u clickhouse)"; then
-            echo "No clickhouse process" | ts '%Y-%m-%d %H:%M:%S'
-            break
-        else
-            echo "Process $(pgrep -u clickhouse) still alive" | ts '%Y-%m-%d %H:%M:%S'
-            sleep 10
-        fi
+        if ! pkill -0 -f "clickhouse-server" ; then break ; fi
+        echo "ClickHouse still alive" | ts '%Y-%m-%d %H:%M:%S'
+        sleep 1
     done
 
-    echo "Will try to send second kill signal for sure"
-    kill "$(pgrep -u clickhouse)" 2>/dev/null
-    sleep 5
-    echo "clickhouse pids $(pgrep -u clickhouse)" | ts '%Y-%m-%d %H:%M:%S'
+    if pkill -0 -f "clickhouse-server"
+    then
+        pstree -apgT
+        jobs
+        echo "Failed to kill the ClickHouse server"  | ts '%Y-%m-%d %H:%M:%S'
+        return 1
+    fi
 }
 
 start_clickhouse () {
     LLVM_PROFILE_FILE='server_%h_%p_%m.profraw' sudo -Eu clickhouse /usr/bin/clickhouse-server --config /etc/clickhouse-server/config.xml &
+    counter=0
+    until clickhouse-client --query "SELECT 1"
+    do
+        if [ "$counter" -gt 120 ]
+        then
+            echo "Cannot start clickhouse-server"
+            cat /var/log/clickhouse-server/stdout.log
+            tail -n1000 /var/log/clickhouse-server/stderr.log
+            tail -n1000 /var/log/clickhouse-server/clickhouse-server.log
+            break
+        fi
+        sleep 0.5
+        counter=$((counter + 1))
+    done
 }
 
 chmod 777 /
@@ -44,9 +58,6 @@ chmod 777 -R /var/log/clickhouse-server/
 
 start_clickhouse
 
-sleep 10
-
-
 if grep -q -- "--use-skip-list" /usr/bin/clickhouse-test; then
     SKIP_LIST_OPT="--use-skip-list"
 fi

From 1d9d586e20806e733efe139bcdfc0ebfaff691a5 Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Fri, 6 Nov 2020 22:07:56 +0800
Subject: [PATCH 60/99] Make global_context consistent.

---
 src/Databases/DatabaseDictionary.cpp          |  4 +--
 src/Databases/DatabaseDictionary.h            |  2 +-
 .../MySQL/DatabaseConnectionMySQL.cpp         |  1 +
 src/Dictionaries/XDBCDictionarySource.cpp     |  2 +-
 src/Interpreters/Context.cpp                  | 14 ++++----
 src/Interpreters/Context.h                    |  6 ++--
 src/Interpreters/DatabaseCatalog.cpp          | 36 +++++++++----------
 src/Interpreters/DatabaseCatalog.h            |  9 +++--
 ...ExternalLoaderDatabaseConfigRepository.cpp |  4 +--
 src/Storages/Distributed/DirectoryMonitor.cpp | 16 ++++-----
 src/Storages/Kafka/KafkaBlockInputStream.cpp  |  1 +
 src/Storages/Kafka/KafkaBlockInputStream.h    |  1 -
 src/Storages/Kafka/KafkaBlockOutputStream.cpp |  2 +-
 src/Storages/Kafka/KafkaBlockOutputStream.h   |  1 -
 src/Storages/Kafka/StorageKafka.cpp           |  3 +-
 src/Storages/Kafka/StorageKafka.h             |  5 ++-
 src/Storages/MergeTree/MergeTreeData.cpp      |  2 +-
 .../RabbitMQ/RabbitMQBlockInputStream.cpp     |  6 ++--
 .../RabbitMQ/RabbitMQBlockInputStream.h       |  3 +-
 .../RabbitMQ/RabbitMQBlockOutputStream.h      |  3 +-
 src/Storages/RabbitMQ/StorageRabbitMQ.cpp     |  2 +-
 src/Storages/RabbitMQ/StorageRabbitMQ.h       |  4 +--
 .../WriteBufferToRabbitMQProducer.cpp         | 10 +++---
 .../RabbitMQ/WriteBufferToRabbitMQProducer.h  |  4 +--
 src/Storages/StorageBuffer.cpp                |  4 +--
 src/Storages/StorageBuffer.h                  | 13 ++++---
 src/Storages/StorageDistributed.cpp           | 14 ++++----
 src/Storages/StorageDistributed.h             |  2 +-
 src/Storages/StorageMerge.cpp                 |  3 +-
 src/Storages/StorageMerge.h                   |  3 +-
 src/Storages/StorageMongoDB.cpp               |  7 ++--
 src/Storages/StorageMongoDB.h                 |  5 +--
 src/Storages/StorageMySQL.cpp                 |  2 +-
 src/Storages/StorageMySQL.h                   |  3 +-
 src/Storages/StorageS3.cpp                    |  8 ++---
 src/Storages/StorageS3.h                      |  4 +--
 src/TableFunctions/TableFunctionMySQL.cpp     |  1 +
 37 files changed, 104 insertions(+), 106 deletions(-)

diff --git a/src/Databases/DatabaseDictionary.cpp b/src/Databases/DatabaseDictionary.cpp
index 3732139c66a..ff5510f0bf9 100644
--- a/src/Databases/DatabaseDictionary.cpp
+++ b/src/Databases/DatabaseDictionary.cpp
@@ -44,10 +44,10 @@ namespace
     }
 }
 
-DatabaseDictionary::DatabaseDictionary(const String & name_, const Context & global_context_)
+DatabaseDictionary::DatabaseDictionary(const String & name_, const Context & context_)
     : IDatabase(name_)
     , log(&Poco::Logger::get("DatabaseDictionary(" + database_name + ")"))
-    , global_context(global_context_.getGlobalContext())
+    , global_context(context_.getGlobalContext())
 {
 }
 
diff --git a/src/Databases/DatabaseDictionary.h b/src/Databases/DatabaseDictionary.h
index c3c6a53a894..2cfc6ef3285 100644
--- a/src/Databases/DatabaseDictionary.h
+++ b/src/Databases/DatabaseDictionary.h
@@ -22,7 +22,7 @@ namespace DB
 class DatabaseDictionary final : public IDatabase
 {
 public:
-    DatabaseDictionary(const String & name_, const Context & global_context);
+    DatabaseDictionary(const String & name_, const Context & context_);
 
     String getEngineName() const override
     {
diff --git a/src/Databases/MySQL/DatabaseConnectionMySQL.cpp b/src/Databases/MySQL/DatabaseConnectionMySQL.cpp
index 03d218d132f..45483055739 100644
--- a/src/Databases/MySQL/DatabaseConnectionMySQL.cpp
+++ b/src/Databases/MySQL/DatabaseConnectionMySQL.cpp
@@ -13,6 +13,7 @@
 #    include <Databases/MySQL/FetchTablesColumnsList.h>
 #    include <Formats/MySQLBlockInputStream.h>
 #    include <IO/Operators.h>
+#    include <Interpreters/Context.h>
 #    include <Parsers/ASTCreateQuery.h>
 #    include <Parsers/ASTFunction.h>
 #    include <Parsers/ParserCreateQuery.h>
diff --git a/src/Dictionaries/XDBCDictionarySource.cpp b/src/Dictionaries/XDBCDictionarySource.cpp
index 793d8da7390..832c30ed4b7 100644
--- a/src/Dictionaries/XDBCDictionarySource.cpp
+++ b/src/Dictionaries/XDBCDictionarySource.cpp
@@ -120,7 +120,7 @@ XDBCDictionarySource::XDBCDictionarySource(
     , invalidate_query{config_.getString(config_prefix_ + ".invalidate_query", "")}
     , bridge_helper{bridge_}
     , timeouts{ConnectionTimeouts::getHTTPTimeouts(context_)}
-    , global_context(context_)
+    , global_context(context_.getGlobalContext())
 {
     bridge_url = bridge_helper->getMainURI();
 
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index 54ee7713e95..21b69b6319d 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -336,9 +336,9 @@ struct ContextShared
     ReplicatedFetchList replicated_fetch_list;
     ConfigurationPtr users_config;                          /// Config with the users, profiles and quotas sections.
     InterserverIOHandler interserver_io_handler;            /// Handler for interserver communication.
-    std::optional<BackgroundSchedulePool> buffer_flush_schedule_pool; /// A thread pool that can do background flush for Buffer tables.
-    std::optional<BackgroundSchedulePool> schedule_pool;    /// A thread pool that can run different jobs in background (used in replicated tables)
-    std::optional<BackgroundSchedulePool> distributed_schedule_pool; /// A thread pool that can run different jobs in background (used for distributed sends)
+    mutable std::optional<BackgroundSchedulePool> buffer_flush_schedule_pool; /// A thread pool that can do background flush for Buffer tables.
+    mutable std::optional<BackgroundSchedulePool> schedule_pool;    /// A thread pool that can run different jobs in background (used in replicated tables)
+    mutable std::optional<BackgroundSchedulePool> distributed_schedule_pool; /// A thread pool that can run different jobs in background (used for distributed sends)
     MultiVersion<Macros> macros;                            /// Substitutions extracted from config.
     std::unique_ptr<DDLWorker> ddl_worker;                  /// Process ddl commands from zk.
     /// Rules for selecting the compression settings, depending on the size of the part.
@@ -484,7 +484,7 @@ Context Context::createGlobal(ContextShared * shared)
 
 void Context::initGlobal()
 {
-    DatabaseCatalog::init(this);
+    DatabaseCatalog::init(*this);
     TemporaryLiveViewCleaner::init(*this);
 }
 
@@ -1401,7 +1401,7 @@ void Context::dropCaches() const
         shared->mark_cache->reset();
 }
 
-BackgroundSchedulePool & Context::getBufferFlushSchedulePool()
+BackgroundSchedulePool & Context::getBufferFlushSchedulePool() const
 {
     auto lock = getLock();
     if (!shared->buffer_flush_schedule_pool)
@@ -1443,7 +1443,7 @@ BackgroundTaskSchedulingSettings Context::getBackgroundMoveTaskSchedulingSetting
     return task_settings;
 }
 
-BackgroundSchedulePool & Context::getSchedulePool()
+BackgroundSchedulePool & Context::getSchedulePool() const
 {
     auto lock = getLock();
     if (!shared->schedule_pool)
@@ -1454,7 +1454,7 @@ BackgroundSchedulePool & Context::getSchedulePool()
     return *shared->schedule_pool;
 }
 
-BackgroundSchedulePool & Context::getDistributedSchedulePool()
+BackgroundSchedulePool & Context::getDistributedSchedulePool() const
 {
     auto lock = getLock();
     if (!shared->distributed_schedule_pool)
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index 02a57b5d966..d583f3d970f 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -519,9 +519,9 @@ public:
     BackgroundTaskSchedulingSettings getBackgroundProcessingTaskSchedulingSettings() const;
     BackgroundTaskSchedulingSettings getBackgroundMoveTaskSchedulingSettings() const;
 
-    BackgroundSchedulePool & getBufferFlushSchedulePool();
-    BackgroundSchedulePool & getSchedulePool();
-    BackgroundSchedulePool & getDistributedSchedulePool();
+    BackgroundSchedulePool & getBufferFlushSchedulePool() const;
+    BackgroundSchedulePool & getSchedulePool() const;
+    BackgroundSchedulePool & getDistributedSchedulePool() const;
 
     /// Has distributed_ddl configuration or not.
     bool hasDistributedDDL() const;
diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index 03ec4ccb1eb..81e99b742fe 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -39,7 +39,7 @@ namespace ErrorCodes
 
 TemporaryTableHolder::TemporaryTableHolder(const Context & context_,
                                            const TemporaryTableHolder::Creator & creator, const ASTPtr & query)
-    : global_context(&context_.getGlobalContext())
+    : global_context(context_.getGlobalContext())
     , temporary_tables(DatabaseCatalog::instance().getDatabaseForTemporaryTables().get())
 {
     ASTPtr original_create;
@@ -62,7 +62,7 @@ TemporaryTableHolder::TemporaryTableHolder(const Context & context_,
     }
     auto table_id = StorageID(DatabaseCatalog::TEMPORARY_DATABASE, global_name, id);
     auto table = creator(table_id);
-    temporary_tables->createTable(*global_context, global_name, table, original_create);
+    temporary_tables->createTable(global_context, global_name, table, original_create);
     table->startup();
 }
 
@@ -107,7 +107,7 @@ TemporaryTableHolder & TemporaryTableHolder::operator = (TemporaryTableHolder &&
 TemporaryTableHolder::~TemporaryTableHolder()
 {
     if (id != UUIDHelpers::Nil)
-        temporary_tables->dropTable(*global_context, "_tmp_" + toString(id));
+        temporary_tables->dropTable(global_context, "_tmp_" + toString(id));
 }
 
 StorageID TemporaryTableHolder::getGlobalTableID() const
@@ -117,7 +117,7 @@ StorageID TemporaryTableHolder::getGlobalTableID() const
 
 StoragePtr TemporaryTableHolder::getTable() const
 {
-    auto table = temporary_tables->tryGetTable("_tmp_" + toString(id), *global_context);
+    auto table = temporary_tables->tryGetTable("_tmp_" + toString(id), global_context);
     if (!table)
         throw Exception("Temporary table " + getGlobalTableID().getNameForLogs() + " not found", ErrorCodes::LOGICAL_ERROR);
     return table;
@@ -126,13 +126,13 @@ StoragePtr TemporaryTableHolder::getTable() const
 
 void DatabaseCatalog::loadDatabases()
 {
-    drop_delay_sec = global_context->getConfigRef().getInt("database_atomic_delay_before_drop_table_sec", default_drop_delay_sec);
+    drop_delay_sec = global_context.getConfigRef().getInt("database_atomic_delay_before_drop_table_sec", default_drop_delay_sec);
 
-    auto db_for_temporary_and_external_tables = std::make_shared<DatabaseMemory>(TEMPORARY_DATABASE, *global_context);
+    auto db_for_temporary_and_external_tables = std::make_shared<DatabaseMemory>(TEMPORARY_DATABASE, global_context);
     attachDatabase(TEMPORARY_DATABASE, db_for_temporary_and_external_tables);
 
     loadMarkedAsDroppedTables();
-    auto task_holder = global_context->getSchedulePool().createTask("DatabaseCatalog", [this](){ this->dropTableDataTask(); });
+    auto task_holder = global_context.getSchedulePool().createTask("DatabaseCatalog", [this](){ this->dropTableDataTask(); });
     drop_task = std::make_unique<BackgroundSchedulePoolTaskHolder>(std::move(task_holder));
     (*drop_task)->activate();
     std::lock_guard lock{tables_marked_dropped_mutex};
@@ -328,11 +328,11 @@ DatabasePtr DatabaseCatalog::detachDatabase(const String & database_name, bool d
     if (drop)
     {
         /// Delete the database.
-        db->drop(*global_context);
+        db->drop(global_context);
 
         /// Old ClickHouse versions did not store database.sql files
         Poco::File database_metadata_file(
-                global_context->getPath() + "metadata/" + escapeForFileName(database_name) + ".sql");
+                global_context.getPath() + "metadata/" + escapeForFileName(database_name) + ".sql");
         if (database_metadata_file.exists())
             database_metadata_file.remove(false);
     }
@@ -505,14 +505,12 @@ void DatabaseCatalog::updateUUIDMapping(const UUID & uuid, DatabasePtr database,
 
 std::unique_ptr<DatabaseCatalog> DatabaseCatalog::database_catalog;
 
-DatabaseCatalog::DatabaseCatalog(Context * global_context_)
+DatabaseCatalog::DatabaseCatalog(Context & global_context_)
     : global_context(global_context_), log(&Poco::Logger::get("DatabaseCatalog"))
 {
-    if (!global_context)
-        throw Exception("DatabaseCatalog is not initialized. It's a bug.", ErrorCodes::LOGICAL_ERROR);
 }
 
-DatabaseCatalog & DatabaseCatalog::init(Context * global_context_)
+DatabaseCatalog & DatabaseCatalog::init(Context & global_context_)
 {
     if (database_catalog)
     {
@@ -651,7 +649,7 @@ void DatabaseCatalog::loadMarkedAsDroppedTables()
     /// we should load them and enqueue cleanup to remove data from store/ and metadata from ZooKeeper
 
     std::map<String, StorageID> dropped_metadata;
-    String path = global_context->getPath() + "metadata_dropped/";
+    String path = global_context.getPath() + "metadata_dropped/";
 
     if (!std::filesystem::exists(path))
     {
@@ -706,7 +704,7 @@ void DatabaseCatalog::loadMarkedAsDroppedTables()
 
 String DatabaseCatalog::getPathForDroppedMetadata(const StorageID & table_id) const
 {
-    return global_context->getPath() + "metadata_dropped/" +
+    return global_context.getPath() + "metadata_dropped/" +
            escapeForFileName(table_id.getDatabaseName()) + "." +
            escapeForFileName(table_id.getTableName()) + "." +
            toString(table_id.uuid) + ".sql";
@@ -729,7 +727,7 @@ void DatabaseCatalog::enqueueDroppedTableCleanup(StorageID table_id, StoragePtr
     {
         /// Try load table from metadata to drop it correctly (e.g. remove metadata from zk or remove data from all volumes)
         LOG_INFO(log, "Trying load partially dropped table {} from {}", table_id.getNameForLogs(), dropped_metadata_path);
-        ASTPtr ast = DatabaseOnDisk::parseQueryFromMetadata(log, *global_context, dropped_metadata_path, /*throw_on_error*/ false, /*remove_empty*/false);
+        ASTPtr ast = DatabaseOnDisk::parseQueryFromMetadata(log, global_context, dropped_metadata_path, /*throw_on_error*/ false, /*remove_empty*/false);
         auto * create = typeid_cast<ASTCreateQuery *>(ast.get());
         assert(!create || create->uuid == table_id.uuid);
 
@@ -740,7 +738,7 @@ void DatabaseCatalog::enqueueDroppedTableCleanup(StorageID table_id, StoragePtr
             create->table = table_id.table_name;
             try
             {
-                table = createTableFromAST(*create, table_id.getDatabaseName(), data_path, *global_context, false).second;
+                table = createTableFromAST(*create, table_id.getDatabaseName(), data_path, global_context, false).second;
                 table->is_dropped = true;
             }
             catch (...)
@@ -867,7 +865,7 @@ void DatabaseCatalog::dropTableFinally(const TableMarkedAsDropped & table)
 
     /// Even if table is not loaded, try remove its data from disk.
     /// TODO remove data from all volumes
-    String data_path = global_context->getPath() + "store/" + getPathForUUID(table.table_id.uuid);
+    String data_path = global_context.getPath() + "store/" + getPathForUUID(table.table_id.uuid);
     Poco::File table_data_dir{data_path};
     if (table_data_dir.exists())
     {
@@ -901,7 +899,7 @@ String DatabaseCatalog::resolveDictionaryName(const String & name) const
     String maybe_database_name = name.substr(0, pos);
     String maybe_table_name = name.substr(pos + 1);
 
-    auto db_and_table = tryGetDatabaseAndTable({maybe_database_name, maybe_table_name}, *global_context);
+    auto db_and_table = tryGetDatabaseAndTable({maybe_database_name, maybe_table_name}, global_context);
     if (!db_and_table.first)
         return name;
     assert(db_and_table.second);
diff --git a/src/Interpreters/DatabaseCatalog.h b/src/Interpreters/DatabaseCatalog.h
index 2fd5c8d2be8..5146c786f64 100644
--- a/src/Interpreters/DatabaseCatalog.h
+++ b/src/Interpreters/DatabaseCatalog.h
@@ -73,7 +73,6 @@ struct TemporaryTableHolder : boost::noncopyable
 {
     typedef std::function<StoragePtr(const StorageID &)> Creator;
 
-    TemporaryTableHolder() = default;
     TemporaryTableHolder(const Context & context, const Creator & creator, const ASTPtr & query = {});
 
     /// Creates temporary table with Engine=Memory
@@ -95,7 +94,7 @@ struct TemporaryTableHolder : boost::noncopyable
 
     operator bool () const { return id != UUIDHelpers::Nil; }
 
-    const Context * global_context = nullptr;
+    const Context & global_context;
     IDatabase * temporary_tables = nullptr;
     UUID id = UUIDHelpers::Nil;
 };
@@ -111,7 +110,7 @@ public:
     static constexpr const char * TEMPORARY_DATABASE = "_temporary_and_external_tables";
     static constexpr const char * SYSTEM_DATABASE = "system";
 
-    static DatabaseCatalog & init(Context * global_context_);
+    static DatabaseCatalog & init(Context & global_context_);
     static DatabaseCatalog & instance();
     static void shutdown();
 
@@ -199,7 +198,7 @@ private:
     // make emplace(global_context_) compile with private constructor ¯\_(ツ)_/¯.
     static std::unique_ptr<DatabaseCatalog> database_catalog;
 
-    DatabaseCatalog(Context * global_context_);
+    DatabaseCatalog(Context & global_context_);
     void assertDatabaseExistsUnlocked(const String & database_name) const;
     void assertDatabaseDoesntExistUnlocked(const String & database_name) const;
 
@@ -240,7 +239,7 @@ private:
     using UUIDToDatabaseMap = std::unordered_map<UUID, DatabasePtr>;
 
     /// For some reason Context is required to get Storage from Database object
-    Context * global_context;
+    Context & global_context;
     mutable std::mutex databases_mutex;
 
     ViewDependencies view_dependencies;
diff --git a/src/Interpreters/ExternalLoaderDatabaseConfigRepository.cpp b/src/Interpreters/ExternalLoaderDatabaseConfigRepository.cpp
index bd29bfb8970..41269b91b5f 100644
--- a/src/Interpreters/ExternalLoaderDatabaseConfigRepository.cpp
+++ b/src/Interpreters/ExternalLoaderDatabaseConfigRepository.cpp
@@ -42,8 +42,8 @@ namespace
 }
 
 
-ExternalLoaderDatabaseConfigRepository::ExternalLoaderDatabaseConfigRepository(IDatabase & database_, const Context & global_context_)
-    : global_context(global_context_.getGlobalContext())
+ExternalLoaderDatabaseConfigRepository::ExternalLoaderDatabaseConfigRepository(IDatabase & database_, const Context & context_)
+    : global_context(context_.getGlobalContext())
     , database_name(database_.getDatabaseName())
     , database(database_)
 {
diff --git a/src/Storages/Distributed/DirectoryMonitor.cpp b/src/Storages/Distributed/DirectoryMonitor.cpp
index 43a957a2fd9..47da0a10d9e 100644
--- a/src/Storages/Distributed/DirectoryMonitor.cpp
+++ b/src/Storages/Distributed/DirectoryMonitor.cpp
@@ -83,13 +83,13 @@ StorageDistributedDirectoryMonitor::StorageDistributedDirectoryMonitor(
     : storage(storage_)
     , pool(std::move(pool_))
     , path{path_ + '/'}
-    , should_batch_inserts(storage.global_context->getSettingsRef().distributed_directory_monitor_batch_inserts)
-    , min_batched_block_size_rows(storage.global_context->getSettingsRef().min_insert_block_size_rows)
-    , min_batched_block_size_bytes(storage.global_context->getSettingsRef().min_insert_block_size_bytes)
+    , should_batch_inserts(storage.global_context.getSettingsRef().distributed_directory_monitor_batch_inserts)
+    , min_batched_block_size_rows(storage.global_context.getSettingsRef().min_insert_block_size_rows)
+    , min_batched_block_size_bytes(storage.global_context.getSettingsRef().min_insert_block_size_bytes)
     , current_batch_file_path{path + "current_batch.txt"}
-    , default_sleep_time{storage.global_context->getSettingsRef().distributed_directory_monitor_sleep_time_ms.totalMilliseconds()}
+    , default_sleep_time{storage.global_context.getSettingsRef().distributed_directory_monitor_sleep_time_ms.totalMilliseconds()}
     , sleep_time{default_sleep_time}
-    , max_sleep_time{storage.global_context->getSettingsRef().distributed_directory_monitor_max_sleep_time_ms.totalMilliseconds()}
+    , max_sleep_time{storage.global_context.getSettingsRef().distributed_directory_monitor_max_sleep_time_ms.totalMilliseconds()}
     , log{&Poco::Logger::get(getLoggerName())}
     , monitor_blocker(monitor_blocker_)
     , metric_pending_files(CurrentMetrics::DistributedFilesToInsert, 0)
@@ -249,7 +249,7 @@ ConnectionPoolPtr StorageDistributedDirectoryMonitor::createPool(const std::stri
 
     auto pools = createPoolsForAddresses(name, pool_factory);
 
-    const auto settings = storage.global_context->getSettings();
+    const auto settings = storage.global_context.getSettings();
     return pools.size() == 1 ? pools.front() : std::make_shared<ConnectionPoolWithFailover>(pools,
         settings.load_balancing,
         settings.distributed_replica_error_half_life.totalSeconds(),
@@ -308,7 +308,7 @@ bool StorageDistributedDirectoryMonitor::processFiles(const std::map<UInt64, std
 void StorageDistributedDirectoryMonitor::processFile(const std::string & file_path)
 {
     LOG_TRACE(log, "Started processing `{}`", file_path);
-    auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(storage.global_context->getSettingsRef());
+    auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(storage.global_context.getSettingsRef());
 
     try
     {
@@ -483,7 +483,7 @@ struct StorageDistributedDirectoryMonitor::Batch
 
             Poco::File{tmp_file}.renameTo(parent.current_batch_file_path);
         }
-        auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(parent.storage.global_context->getSettingsRef());
+        auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(parent.storage.global_context.getSettingsRef());
         auto connection = parent.pool->get(timeouts);
 
         bool batch_broken = false;
diff --git a/src/Storages/Kafka/KafkaBlockInputStream.cpp b/src/Storages/Kafka/KafkaBlockInputStream.cpp
index c5f598a756c..6a137bd4b8b 100644
--- a/src/Storages/Kafka/KafkaBlockInputStream.cpp
+++ b/src/Storages/Kafka/KafkaBlockInputStream.cpp
@@ -6,6 +6,7 @@
 #include <Storages/Kafka/ReadBufferFromKafkaConsumer.h>
 #include <Processors/Formats/InputStreamFromInputFormat.h>
 #include <common/logger_useful.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {
diff --git a/src/Storages/Kafka/KafkaBlockInputStream.h b/src/Storages/Kafka/KafkaBlockInputStream.h
index ae632103653..517df6ecaf7 100644
--- a/src/Storages/Kafka/KafkaBlockInputStream.h
+++ b/src/Storages/Kafka/KafkaBlockInputStream.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <DataStreams/IBlockInputStream.h>
-#include <Interpreters/Context.h>
 
 #include <Storages/Kafka/StorageKafka.h>
 #include <Storages/Kafka/ReadBufferFromKafkaConsumer.h>
diff --git a/src/Storages/Kafka/KafkaBlockOutputStream.cpp b/src/Storages/Kafka/KafkaBlockOutputStream.cpp
index e7bf562339f..dc5b5283cdc 100644
--- a/src/Storages/Kafka/KafkaBlockOutputStream.cpp
+++ b/src/Storages/Kafka/KafkaBlockOutputStream.cpp
@@ -1,4 +1,4 @@
-#include "KafkaBlockOutputStream.h"
+#include <Storages/Kafka/KafkaBlockOutputStream.h>
 
 #include <Formats/FormatFactory.h>
 #include <Storages/Kafka/WriteBufferToKafkaProducer.h>
diff --git a/src/Storages/Kafka/KafkaBlockOutputStream.h b/src/Storages/Kafka/KafkaBlockOutputStream.h
index 1121d2a119e..715ed39b8d6 100644
--- a/src/Storages/Kafka/KafkaBlockOutputStream.h
+++ b/src/Storages/Kafka/KafkaBlockOutputStream.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <DataStreams/IBlockOutputStream.h>
-#include <Interpreters/Context.h>
 #include <Storages/Kafka/StorageKafka.h>
 
 namespace DB
diff --git a/src/Storages/Kafka/StorageKafka.cpp b/src/Storages/Kafka/StorageKafka.cpp
index effd2869be2..388c21c6ad6 100644
--- a/src/Storages/Kafka/StorageKafka.cpp
+++ b/src/Storages/Kafka/StorageKafka.cpp
@@ -33,6 +33,7 @@
 #include <Common/typeid_cast.h>
 #include <common/logger_useful.h>
 #include <Common/quoteString.h>
+#include <Interpreters/Context.h>
 #include <Processors/Sources/SourceFromInputStream.h>
 #include <librdkafka/rdkafka.h>
 #include <common/getFQDNOrHostName.h>
@@ -169,7 +170,7 @@ namespace
 
 StorageKafka::StorageKafka(
     const StorageID & table_id_,
-    Context & context_,
+    const Context & context_,
     const ColumnsDescription & columns_,
     std::unique_ptr<KafkaSettings> kafka_settings_)
     : IStorage(table_id_)
diff --git a/src/Storages/Kafka/StorageKafka.h b/src/Storages/Kafka/StorageKafka.h
index 4257f1c1854..8ec8e718011 100644
--- a/src/Storages/Kafka/StorageKafka.h
+++ b/src/Storages/Kafka/StorageKafka.h
@@ -4,7 +4,6 @@
 #include <Storages/IStorage.h>
 #include <Storages/Kafka/Buffer_fwd.h>
 #include <Storages/Kafka/KafkaSettings.h>
-#include <Interpreters/Context.h>
 #include <Common/SettingsChanges.h>
 
 #include <Poco/Semaphore.h>
@@ -69,13 +68,13 @@ public:
 protected:
     StorageKafka(
         const StorageID & table_id_,
-        Context & context_,
+        const Context & context_,
         const ColumnsDescription & columns_,
         std::unique_ptr<KafkaSettings> kafka_settings_);
 
 private:
     // Configuration and state
-    Context & global_context;
+    const Context & global_context;
     std::unique_ptr<KafkaSettings> kafka_settings;
     const Names topics;
     const String brokers;
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index a11dd25d8e3..0d7d8257574 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -134,7 +134,7 @@ MergeTreeData::MergeTreeData(
     bool attach,
     BrokenPartCallback broken_part_callback_)
     : IStorage(table_id_)
-    , global_context(context_)
+    , global_context(context_.getGlobalContext())
     , merging_params(merging_params_)
     , require_part_metadata(require_part_metadata_)
     , relative_data_path(relative_data_path_)
diff --git a/src/Storages/RabbitMQ/RabbitMQBlockInputStream.cpp b/src/Storages/RabbitMQ/RabbitMQBlockInputStream.cpp
index 830c6224b9e..0909f858fe4 100644
--- a/src/Storages/RabbitMQ/RabbitMQBlockInputStream.cpp
+++ b/src/Storages/RabbitMQ/RabbitMQBlockInputStream.cpp
@@ -1,6 +1,8 @@
-#include <Formats/FormatFactory.h>
-#include <Processors/Formats/InputStreamFromInputFormat.h>
 #include <Storages/RabbitMQ/RabbitMQBlockInputStream.h>
+
+#include <Formats/FormatFactory.h>
+#include <Interpreters/Context.h>
+#include <Processors/Formats/InputStreamFromInputFormat.h>
 #include <Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h>
 
 namespace ErrorCodes
diff --git a/src/Storages/RabbitMQ/RabbitMQBlockInputStream.h b/src/Storages/RabbitMQ/RabbitMQBlockInputStream.h
index 5f2c2a62018..2ef1ab70b95 100644
--- a/src/Storages/RabbitMQ/RabbitMQBlockInputStream.h
+++ b/src/Storages/RabbitMQ/RabbitMQBlockInputStream.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <DataStreams/IBlockInputStream.h>
-#include <Interpreters/Context.h>
 #include <Storages/RabbitMQ/StorageRabbitMQ.h>
 #include <Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h>
 
@@ -38,7 +37,7 @@ public:
 private:
     StorageRabbitMQ & storage;
     StorageMetadataPtr metadata_snapshot;
-    Context context;
+    const Context & context;
     Names column_names;
     const size_t max_block_size;
     bool ack_in_suffix;
diff --git a/src/Storages/RabbitMQ/RabbitMQBlockOutputStream.h b/src/Storages/RabbitMQ/RabbitMQBlockOutputStream.h
index f8ed79438f4..7e5c22f9f39 100644
--- a/src/Storages/RabbitMQ/RabbitMQBlockOutputStream.h
+++ b/src/Storages/RabbitMQ/RabbitMQBlockOutputStream.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <DataStreams/IBlockOutputStream.h>
-#include <Interpreters/Context.h>
 #include <Storages/RabbitMQ/StorageRabbitMQ.h>
 
 
@@ -23,7 +22,7 @@ public:
 private:
     StorageRabbitMQ & storage;
     StorageMetadataPtr metadata_snapshot;
-    Context context;
+    const Context & context;
     ProducerBufferPtr buffer;
     BlockOutputStreamPtr child;
 };
diff --git a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
index f9e3c0558d3..d32cbaf66ae 100644
--- a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
+++ b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
@@ -69,7 +69,7 @@ namespace ExchangeType
 
 StorageRabbitMQ::StorageRabbitMQ(
         const StorageID & table_id_,
-        Context & context_,
+        const Context & context_,
         const ColumnsDescription & columns_,
         std::unique_ptr<RabbitMQSettings> rabbitmq_settings_)
         : IStorage(table_id_)
diff --git a/src/Storages/RabbitMQ/StorageRabbitMQ.h b/src/Storages/RabbitMQ/StorageRabbitMQ.h
index 37627178e8b..ebdc7cd8f68 100644
--- a/src/Storages/RabbitMQ/StorageRabbitMQ.h
+++ b/src/Storages/RabbitMQ/StorageRabbitMQ.h
@@ -67,12 +67,12 @@ public:
 protected:
     StorageRabbitMQ(
             const StorageID & table_id_,
-            Context & context_,
+            const Context & context_,
             const ColumnsDescription & columns_,
             std::unique_ptr<RabbitMQSettings> rabbitmq_settings_);
 
 private:
-    Context global_context;
+    const Context & global_context;
     Context rabbitmq_context;
     std::unique_ptr<RabbitMQSettings> rabbitmq_settings;
 
diff --git a/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp b/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp
index 134c00bdc17..ac94659d321 100644
--- a/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp
+++ b/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp
@@ -1,7 +1,9 @@
 #include <Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h>
-#include "Core/Block.h"
-#include "Columns/ColumnString.h"
-#include "Columns/ColumnsNumber.h"
+
+#include <Core/Block.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <Interpreters/Context.h>
 #include <common/logger_useful.h>
 #include <amqpcpp.h>
 #include <uv.h>
@@ -25,7 +27,7 @@ namespace ErrorCodes
 
 WriteBufferToRabbitMQProducer::WriteBufferToRabbitMQProducer(
         std::pair<String, UInt16> & parsed_address_,
-        Context & global_context,
+        const Context & global_context,
         const std::pair<String, String> & login_password_,
         const Names & routing_keys_,
         const String & exchange_name_,
diff --git a/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h b/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h
index 28fa5df8111..6fa4ca9587f 100644
--- a/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h
+++ b/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h
@@ -9,7 +9,7 @@
 #include <Storages/RabbitMQ/RabbitMQHandler.h>
 #include <Common/ConcurrentBoundedQueue.h>
 #include <Core/BackgroundSchedulePool.h>
-#include <Interpreters/Context.h>
+#include <Core/Names.h>
 
 namespace DB
 {
@@ -19,7 +19,7 @@ class WriteBufferToRabbitMQProducer : public WriteBuffer
 public:
     WriteBufferToRabbitMQProducer(
             std::pair<String, UInt16> & parsed_address_,
-            Context & global_context,
+            const Context & global_context,
             const std::pair<String, String> & login_password_,
             const Names & routing_keys_,
             const String & exchange_name_,
diff --git a/src/Storages/StorageBuffer.cpp b/src/Storages/StorageBuffer.cpp
index a2c2325bcc1..b95e2a0a6be 100644
--- a/src/Storages/StorageBuffer.cpp
+++ b/src/Storages/StorageBuffer.cpp
@@ -65,14 +65,14 @@ StorageBuffer::StorageBuffer(
     const StorageID & table_id_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
-    Context & context_,
+    const Context & context_,
     size_t num_shards_,
     const Thresholds & min_thresholds_,
     const Thresholds & max_thresholds_,
     const StorageID & destination_id_,
     bool allow_materialized_)
     : IStorage(table_id_)
-    , global_context(context_)
+    , global_context(context_.getGlobalContext())
     , num_shards(num_shards_), buffers(num_shards_)
     , min_thresholds(min_thresholds_)
     , max_thresholds(max_thresholds_)
diff --git a/src/Storages/StorageBuffer.h b/src/Storages/StorageBuffer.h
index 3c8c4b8a040..be9443c005a 100644
--- a/src/Storages/StorageBuffer.h
+++ b/src/Storages/StorageBuffer.h
@@ -9,7 +9,6 @@
 #include <Storages/IStorage.h>
 #include <DataStreams/IBlockOutputStream.h>
 #include <Poco/Event.h>
-#include <Interpreters/Context.h>
 
 
 namespace Poco { class Logger; }
@@ -82,7 +81,13 @@ public:
     void startup() override;
     /// Flush all buffers into the subordinate table and stop background thread.
     void shutdown() override;
-    bool optimize(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, const ASTPtr & partition, bool final, bool deduplicate, const Context & context) override;
+    bool optimize(
+        const ASTPtr & query,
+        const StorageMetadataPtr & metadata_snapshot,
+        const ASTPtr & partition,
+        bool final,
+        bool deduplicate,
+        const Context & context) override;
 
     bool supportsSampling() const override { return true; }
     bool supportsPrewhere() const override
@@ -112,7 +117,7 @@ public:
 
 
 private:
-    Context global_context;
+    const Context & global_context;
 
     struct Buffer
     {
@@ -165,7 +170,7 @@ protected:
         const StorageID & table_id_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
-        Context & context_,
+        const Context & context_,
         size_t num_shards_,
         const Thresholds & min_thresholds_,
         const Thresholds & max_thresholds_,
diff --git a/src/Storages/StorageDistributed.cpp b/src/Storages/StorageDistributed.cpp
index 911842be5e5..c6a5694843e 100644
--- a/src/Storages/StorageDistributed.cpp
+++ b/src/Storages/StorageDistributed.cpp
@@ -366,10 +366,10 @@ StorageDistributed::StorageDistributed(
     : IStorage(id_)
     , remote_database(remote_database_)
     , remote_table(remote_table_)
-    , global_context(std::make_unique<Context>(context_))
+    , global_context(context_.getGlobalContext())
     , log(&Poco::Logger::get("StorageDistributed (" + id_.table_name + ")"))
     , owned_cluster(std::move(owned_cluster_))
-    , cluster_name(global_context->getMacros()->expand(cluster_name_))
+    , cluster_name(global_context.getMacros()->expand(cluster_name_))
     , has_sharding_key(sharding_key_)
     , relative_data_path(relative_data_path_)
 {
@@ -380,14 +380,14 @@ StorageDistributed::StorageDistributed(
 
     if (sharding_key_)
     {
-        sharding_key_expr = buildShardingKeyExpression(sharding_key_, *global_context, storage_metadata.getColumns().getAllPhysical(), false);
+        sharding_key_expr = buildShardingKeyExpression(sharding_key_, global_context, storage_metadata.getColumns().getAllPhysical(), false);
         sharding_key_column_name = sharding_key_->getColumnName();
         sharding_key_is_deterministic = isExpressionActionsDeterministics(sharding_key_expr);
     }
 
     if (!relative_data_path.empty())
     {
-        storage_policy = global_context->getStoragePolicy(storage_policy_name_);
+        storage_policy = global_context.getStoragePolicy(storage_policy_name_);
         data_volume = storage_policy->getVolume(0);
         if (storage_policy->getVolumes().size() > 1)
             LOG_WARNING(log, "Storage policy for Distributed table has multiple volumes. "
@@ -397,7 +397,7 @@ StorageDistributed::StorageDistributed(
     /// Sanity check. Skip check if the table is already created to allow the server to start.
     if (!attach_ && !cluster_name.empty())
     {
-        size_t num_local_shards = global_context->getCluster(cluster_name)->getLocalShardCount();
+        size_t num_local_shards = global_context.getCluster(cluster_name)->getLocalShardCount();
         if (num_local_shards && remote_database == id_.database_name && remote_table == id_.table_name)
             throw Exception("Distributed table " + id_.table_name + " looks at itself", ErrorCodes::INFINITE_LOOP);
     }
@@ -719,7 +719,7 @@ StorageDistributedDirectoryMonitor& StorageDistributed::requireDirectoryMonitor(
     {
         node_data.connection_pool = StorageDistributedDirectoryMonitor::createPool(name, *this);
         node_data.directory_monitor = std::make_unique<StorageDistributedDirectoryMonitor>(
-            *this, path, node_data.connection_pool, monitors_blocker, global_context->getDistributedSchedulePool());
+            *this, path, node_data.connection_pool, monitors_blocker, global_context.getDistributedSchedulePool());
     }
     return *node_data.directory_monitor;
 }
@@ -741,7 +741,7 @@ size_t StorageDistributed::getShardCount() const
 
 ClusterPtr StorageDistributed::getCluster() const
 {
-    return owned_cluster ? owned_cluster : global_context->getCluster(cluster_name);
+    return owned_cluster ? owned_cluster : global_context.getCluster(cluster_name);
 }
 
 ClusterPtr StorageDistributed::getOptimizedCluster(const Context & context, const StorageMetadataPtr & metadata_snapshot, const ASTPtr & query_ptr) const
diff --git a/src/Storages/StorageDistributed.h b/src/Storages/StorageDistributed.h
index 790592033d8..58ade73b4cf 100644
--- a/src/Storages/StorageDistributed.h
+++ b/src/Storages/StorageDistributed.h
@@ -130,7 +130,7 @@ public:
     String remote_table;
     ASTPtr remote_table_function_ptr;
 
-    std::unique_ptr<Context> global_context;
+    const Context & global_context;
     Poco::Logger * log;
 
     /// Used to implement TableFunctionRemote.
diff --git a/src/Storages/StorageMerge.cpp b/src/Storages/StorageMerge.cpp
index 3e6f99878a6..fe53383ce2f 100644
--- a/src/Storages/StorageMerge.cpp
+++ b/src/Storages/StorageMerge.cpp
@@ -5,6 +5,7 @@
 #include <Storages/StorageFactory.h>
 #include <Storages/VirtualColumnUtils.h>
 #include <Storages/AlterCommands.h>
+#include <Interpreters/Context.h>
 #include <Interpreters/TreeRewriter.h>
 #include <Interpreters/ExpressionActions.h>
 #include <Interpreters/evaluateConstantExpression.h>
@@ -76,7 +77,7 @@ StorageMerge::StorageMerge(
     : IStorage(table_id_)
     , source_database(source_database_)
     , table_name_regexp(table_name_regexp_)
-    , global_context(context_)
+    , global_context(context_.getGlobalContext())
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
diff --git a/src/Storages/StorageMerge.h b/src/Storages/StorageMerge.h
index cdd8778d69f..681ea7015e7 100644
--- a/src/Storages/StorageMerge.h
+++ b/src/Storages/StorageMerge.h
@@ -4,7 +4,6 @@
 
 #include <Common/OptimizedRegularExpression.h>
 #include <Storages/IStorage.h>
-#include <Interpreters/Context.h>
 
 
 namespace DB
@@ -50,7 +49,7 @@ public:
 private:
     String source_database;
     OptimizedRegularExpression table_name_regexp;
-    Context global_context;
+    const Context & global_context;
 
     using StorageWithLockAndName = std::tuple<StoragePtr, TableLockHolder, String>;
     using StorageListWithLocks = std::list<StorageWithLockAndName>;
diff --git a/src/Storages/StorageMongoDB.cpp b/src/Storages/StorageMongoDB.cpp
index b9ac2443472..be1159b1a63 100644
--- a/src/Storages/StorageMongoDB.cpp
+++ b/src/Storages/StorageMongoDB.cpp
@@ -34,8 +34,7 @@ StorageMongoDB::StorageMongoDB(
     const std::string & username_,
     const std::string & password_,
     const ColumnsDescription & columns_,
-    const ConstraintsDescription & constraints_,
-    const Context & context_)
+    const ConstraintsDescription & constraints_)
     : IStorage(table_id_)
     , host(host_)
     , port(port_)
@@ -43,7 +42,6 @@ StorageMongoDB::StorageMongoDB(
     , collection_name(collection_name_)
     , username(username_)
     , password(password_)
-    , global_context(context_)
     , connection{std::make_shared<Poco::MongoDB::Connection>(host, port)}
 {
     StorageInMemoryMetadata storage_metadata;
@@ -114,8 +112,7 @@ void registerStorageMongoDB(StorageFactory & factory)
             username,
             password,
             args.columns,
-            args.constraints,
-            args.context);
+            args.constraints);
     },
     {
         .source_access_type = AccessType::MONGO,
diff --git a/src/Storages/StorageMongoDB.h b/src/Storages/StorageMongoDB.h
index 3ed03576478..d7b71495574 100644
--- a/src/Storages/StorageMongoDB.h
+++ b/src/Storages/StorageMongoDB.h
@@ -3,7 +3,6 @@
 #include <ext/shared_ptr_helper.h>
 
 #include <Storages/IStorage.h>
-#include <Interpreters/Context.h>
 
 #include <Poco/MongoDB/Connection.h>
 
@@ -28,8 +27,7 @@ public:
         const std::string & username_,
         const std::string & password_,
         const ColumnsDescription & columns_,
-        const ConstraintsDescription & constraints_,
-        const Context & context_);
+        const ConstraintsDescription & constraints_);
 
     std::string getName() const override { return "MongoDB"; }
 
@@ -51,7 +49,6 @@ private:
     std::string username;
     std::string password;
 
-    Context global_context;
     std::shared_ptr<Poco::MongoDB::Connection> connection;
 };
 
diff --git a/src/Storages/StorageMySQL.cpp b/src/Storages/StorageMySQL.cpp
index e5c59a794e1..defac1b57cf 100644
--- a/src/Storages/StorageMySQL.cpp
+++ b/src/Storages/StorageMySQL.cpp
@@ -55,7 +55,7 @@ StorageMySQL::StorageMySQL(
     , replace_query{replace_query_}
     , on_duplicate_clause{on_duplicate_clause_}
     , pool(std::move(pool_))
-    , global_context(context_)
+    , global_context(context_.getGlobalContext())
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
diff --git a/src/Storages/StorageMySQL.h b/src/Storages/StorageMySQL.h
index acab8f9290e..645f3600eee 100644
--- a/src/Storages/StorageMySQL.h
+++ b/src/Storages/StorageMySQL.h
@@ -8,7 +8,6 @@
 
 #    include <ext/shared_ptr_helper.h>
 
-#    include <Interpreters/Context.h>
 #    include <Storages/IStorage.h>
 #    include <mysqlxx/Pool.h>
 
@@ -57,7 +56,7 @@ private:
     std::string on_duplicate_clause;
 
     mysqlxx::Pool pool;
-    Context global_context;
+    const Context & global_context;
 };
 
 }
diff --git a/src/Storages/StorageS3.cpp b/src/Storages/StorageS3.cpp
index e5c16dad958..334ee480078 100644
--- a/src/Storages/StorageS3.cpp
+++ b/src/Storages/StorageS3.cpp
@@ -194,17 +194,17 @@ StorageS3::StorageS3(
     UInt64 min_upload_part_size_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
-    Context & context_,
+    const Context & context_,
     const String & compression_method_)
     : IStorage(table_id_)
     , uri(uri_)
-    , context_global(context_)
+    , global_context(context_.getGlobalContext())
     , format_name(format_name_)
     , min_upload_part_size(min_upload_part_size_)
     , compression_method(compression_method_)
     , name(uri_.storage_name)
 {
-    context_global.getRemoteHostFilter().checkURL(uri_.uri);
+    global_context.getRemoteHostFilter().checkURL(uri_.uri);
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
     storage_metadata.setConstraints(constraints_);
@@ -325,7 +325,7 @@ BlockOutputStreamPtr StorageS3::write(const ASTPtr & /*query*/, const StorageMet
 {
     return std::make_shared<StorageS3BlockOutputStream>(
         format_name, min_upload_part_size, metadata_snapshot->getSampleBlock(),
-        context_global, chooseCompressionMethod(uri.endpoint, compression_method),
+        global_context, chooseCompressionMethod(uri.endpoint, compression_method),
         client, uri.bucket, uri.key);
 }
 
diff --git a/src/Storages/StorageS3.h b/src/Storages/StorageS3.h
index 1ecc9409671..96f0cf02e88 100644
--- a/src/Storages/StorageS3.h
+++ b/src/Storages/StorageS3.h
@@ -33,7 +33,7 @@ public:
         UInt64 min_upload_part_size_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
-        Context & context_,
+        const Context & context_,
         const String & compression_method_ = "");
 
     String getName() const override
@@ -56,7 +56,7 @@ public:
 
 private:
     S3::URI uri;
-    const Context & context_global;
+    const Context & global_context;
 
     String format_name;
     UInt64 min_upload_part_size;
diff --git a/src/TableFunctions/TableFunctionMySQL.cpp b/src/TableFunctions/TableFunctionMySQL.cpp
index 7281ae434e5..d6a62dc68b4 100644
--- a/src/TableFunctions/TableFunctionMySQL.cpp
+++ b/src/TableFunctions/TableFunctionMySQL.cpp
@@ -10,6 +10,7 @@
 #    include <DataTypes/convertMySQLDataType.h>
 #    include <Formats/MySQLBlockInputStream.h>
 #    include <IO/Operators.h>
+#    include <Interpreters/Context.h>
 #    include <Interpreters/evaluateConstantExpression.h>
 #    include <Parsers/ASTFunction.h>
 #    include <Parsers/ASTLiteral.h>

From 94293ca3ce1029b38d03b84082b7cf129d96e340 Mon Sep 17 00:00:00 2001
From: Nicolae Vartolomei <nv@cloudflare.com>
Date: Mon, 2 Nov 2020 14:38:18 +0000
Subject: [PATCH 61/99] Assign UUIDs to parts only when configured to do so

Avoid breaking backwards compatibility by default for now.
---
 src/Storages/MergeTree/DataPartsExchange.cpp  |  2 +-
 src/Storages/MergeTree/IMergeTreeDataPart.h   |  2 +-
 .../MergeTree/MergeTreeDataMergerMutator.cpp  |  4 +-
 .../MergeTree/MergeTreeDataMergerMutator.h    |  2 +-
 src/Storages/MergeTree/MergeTreeSettings.h    |  1 +
 .../MergeTree/MergeTreeWriteAheadLog.cpp      | 11 ----
 .../MergeTree/MergedBlockOutputStream.cpp     |  4 +-
 .../MergeTree/ReplicatedMergeTreeLogEntry.cpp | 27 ++++++----
 .../MergeTree/ReplicatedMergeTreeLogEntry.h   |  2 +-
 src/Storages/StorageMergeTree.cpp             | 10 ++--
 src/Storages/StorageReplicatedMergeTree.cpp   | 40 ++++++++++----
 src/Storages/StorageReplicatedMergeTree.h     |  2 +
 .../test_part_uuid/configs/merge_tree.xml     |  6 +++
 .../test_part_uuid/configs/remote_servers.xml |  2 +-
 tests/integration/test_part_uuid/test.py      | 52 ++++++++++++++-----
 15 files changed, 110 insertions(+), 57 deletions(-)
 create mode 100644 tests/integration/test_part_uuid/configs/merge_tree.xml

diff --git a/src/Storages/MergeTree/DataPartsExchange.cpp b/src/Storages/MergeTree/DataPartsExchange.cpp
index af71039b4ea..44a43d25e05 100644
--- a/src/Storages/MergeTree/DataPartsExchange.cpp
+++ b/src/Storages/MergeTree/DataPartsExchange.cpp
@@ -325,7 +325,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
     if (server_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_TYPE)
         readStringBinary(part_type, in);
 
-    UUID part_uuid;
+    UUID part_uuid = UUIDHelpers::Nil;
     if (server_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_UUID)
         readUUIDText(part_uuid, in);
 
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.h b/src/Storages/MergeTree/IMergeTreeDataPart.h
index 284ec667d0a..1c617402f67 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.h
@@ -167,7 +167,7 @@ public:
     /// Part unique identifier.
     /// The intention is to use it for identifying cases where the same part is
     /// processed by multiple shards.
-    UUID uuid;
+    UUID uuid = UUIDHelpers::Nil;
 
     VolumePtr volume;
 
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
index fe4a903ba5b..1151f73bbed 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
@@ -1821,10 +1821,8 @@ void MergeTreeDataMergerMutator::finalizeMutatedPart(
 {
     auto disk = new_data_part->volume->getDisk();
 
+    if (new_data_part->uuid != UUIDHelpers::Nil)
     {
-        if (new_data_part->uuid == UUIDHelpers::Nil)
-            throw Exception("Empty IMergeTreeDataPart#uuid in finalize for part: " + new_data_part->name, ErrorCodes::LOGICAL_ERROR);
-
         auto out = disk->writeFile(new_data_part->getFullRelativePath() + IMergeTreeDataPart::UUID_FILE_NAME, 4096);
         writeUUIDText(new_data_part->uuid, *out);
     }
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.h b/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
index 2499042b69c..a66b1869761 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
@@ -19,7 +19,7 @@ class MergeProgressCallback;
 struct FutureMergedMutatedPart
 {
     String name;
-    UUID uuid;
+    UUID uuid = UUIDHelpers::Nil;
     String path;
     MergeTreeDataPartType type;
     MergeTreePartInfo part_info;
diff --git a/src/Storages/MergeTree/MergeTreeSettings.h b/src/Storages/MergeTree/MergeTreeSettings.h
index c3e5c27e177..b2889af4f11 100644
--- a/src/Storages/MergeTree/MergeTreeSettings.h
+++ b/src/Storages/MergeTree/MergeTreeSettings.h
@@ -107,6 +107,7 @@ struct Settings;
     M(String, storage_policy, "default", "Name of storage disk policy", 0) \
     M(Bool, allow_nullable_key, false, "Allow Nullable types as primary keys.", 0) \
     M(Bool, remove_empty_parts, true, "Remove empty parts after they were pruned by TTL, mutation, or collapsing merge algorithm", 0) \
+    M(Bool, assign_part_uuids, false, "Generate UUIDs for parts. Before enabling check that all replicas support new format.", 0) \
     \
     /** Settings for testing purposes */ \
     M(Bool, randomize_part_type, false, "For testing purposes only. Randomizes part type between wide and compact", 0) \
diff --git a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp b/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
index 9b14b3412fe..778505d93ef 100644
--- a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
+++ b/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
@@ -147,17 +147,6 @@ MergeTreeData::MutableDataPartsVector MergeTreeWriteAheadLog::restore(const Stor
                 auto part_disk = storage.reserveSpace(0)->getDisk();
                 auto single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + part_name, disk, 0);
 
-                /// Likely part written by older ClickHouse version which didn't support UUIDs.
-                if (metadata.part_uuid == UUIDHelpers::Nil)
-                {
-                    /// Defensive check. Since WAL version 1 we expect all parts to have UUID.
-                    if (version > 0)
-                        throw Exception("Unexpected empty part_uuid in entry version: " + toString(version), ErrorCodes::CORRUPTED_DATA);
-                    metadata.part_uuid = UUIDHelpers::generateV4();
-                }
-
-                /// TODO(nv) Create part should check for empty UUIDs and crash.
-
                 part = storage.createPart(
                     part_name,
                     MergeTreeDataPartType::IN_MEMORY,
diff --git a/src/Storages/MergeTree/MergedBlockOutputStream.cpp b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
index 23d050ad796..83c59780a0b 100644
--- a/src/Storages/MergeTree/MergedBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
@@ -133,10 +133,8 @@ void MergedBlockOutputStream::finalizePartOnDisk(
     MergeTreeData::DataPart::Checksums & checksums,
     bool sync)
 {
+    if (new_part->uuid != UUIDHelpers::Nil)
     {
-        if (new_part->uuid == UUIDHelpers::Nil)
-            throw Exception("Empty IMergeTreeDataPart#uuid in finalize for part: " + new_part->name, ErrorCodes::LOGICAL_ERROR);
-
         auto out = volume->getDisk()->writeFile(part_path + IMergeTreeDataPart::UUID_FILE_NAME, 4096);
         writeUUIDText(new_part->uuid, *out);
         out->finalize();
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
index 93299d52175..1d9f518568b 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
@@ -19,7 +19,14 @@ namespace ErrorCodes
 
 void ReplicatedMergeTreeLogEntryData::writeText(WriteBuffer & out) const
 {
-    out << "format version: 4\n"
+    UInt8 format_version = 4;
+
+    /// Conditionally bump format_version only when uuid has been assigned.
+    /// If some other feature requires bumping format_version to >= 5 then this code becomes no-op.
+    if (new_part_uuid != UUIDHelpers::Nil)
+        format_version = std::min(format_version, static_cast<UInt8>(5));
+
+    out << "format version: " << format_version << "\n"
         << "create_time: " << LocalDateTime(create_time ? create_time : time(nullptr)) << "\n"
         << "source replica: " << source_replica << '\n'
         << "block_id: " << escape << block_id << '\n';
@@ -31,8 +38,6 @@ void ReplicatedMergeTreeLogEntryData::writeText(WriteBuffer & out) const
             break;
 
         case MERGE_PARTS:
-            assert(new_part_uuid != UUIDHelpers::Nil);
-
             out << "merge\n";
             for (const String & s : source_parts)
                 out << s << '\n';
@@ -42,7 +47,9 @@ void ReplicatedMergeTreeLogEntryData::writeText(WriteBuffer & out) const
             if (merge_type != MergeType::REGULAR)
                 out <<"\nmerge_type: " << static_cast<UInt64>(merge_type);
 
-            out << "\ninto_uuid: " << new_part_uuid;
+            if (new_part_uuid != UUIDHelpers::Nil)
+                out << "\ninto_uuid: " << new_part_uuid;
+
             break;
 
         case DROP_RANGE:
@@ -75,14 +82,14 @@ void ReplicatedMergeTreeLogEntryData::writeText(WriteBuffer & out) const
             break;
 
         case MUTATE_PART:
-            assert(new_part_uuid != UUIDHelpers::Nil);
-
             out << "mutate\n"
                 << source_parts.at(0) << "\n"
                 << "to\n"
-                << new_part_name
-                << "\nto_uuid\n"
-                << new_part_uuid;
+                << new_part_name;
+
+            if (new_part_uuid != UUIDHelpers::Nil)
+                out << "\nto_uuid\n"
+                    << new_part_uuid;
 
             if (isAlterMutation())
                 out << "\nalter_version\n" << alter_version;
@@ -122,7 +129,7 @@ void ReplicatedMergeTreeLogEntryData::readText(ReadBuffer & in)
 
     in >> "format version: " >> format_version >> "\n";
 
-    if (format_version < 1 || format_version > 4)
+    if (format_version < 1 || format_version > 5)
         throw Exception("Unknown ReplicatedMergeTreeLogEntry format version: " + DB::toString(format_version), ErrorCodes::UNKNOWN_FORMAT_VERSION);
 
     if (format_version >= 2)
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
index 9d11888c792..4b384171dde 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
@@ -77,7 +77,7 @@ struct ReplicatedMergeTreeLogEntryData
     MergeTreeDataPartType new_part_type;
     String block_id;                        /// For parts of level zero, the block identifier for deduplication (node name in /blocks/).
     mutable String actual_new_part_name;    /// GET_PART could actually fetch a part covering 'new_part_name'.
-    UUID new_part_uuid;
+    UUID new_part_uuid = UUIDHelpers::Nil;
 
     Strings source_parts;
     bool deduplicate = false; /// Do deduplicate on merge
diff --git a/src/Storages/StorageMergeTree.cpp b/src/Storages/StorageMergeTree.cpp
index 838266e7825..df310582803 100644
--- a/src/Storages/StorageMergeTree.cpp
+++ b/src/Storages/StorageMergeTree.cpp
@@ -641,7 +641,9 @@ std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::se
     auto data_settings = getSettings();
 
     FutureMergedMutatedPart future_part;
-    future_part.uuid = UUIDHelpers::generateV4();
+
+    if (storage_settings.get()->assign_part_uuids)
+        future_part.uuid = UUIDHelpers::generateV4();
 
     /// You must call destructor with unlocked `currently_processing_in_background_mutex`.
     CurrentlyMergingPartsTaggerPtr merging_tagger;
@@ -797,6 +799,9 @@ std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::se
     size_t max_ast_elements = global_context.getSettingsRef().max_expanded_ast_elements;
 
     FutureMergedMutatedPart future_part;
+    if (storage_settings.get()->assign_part_uuids)
+        future_part.uuid = UUIDHelpers::generateV4();
+
     MutationCommands commands;
 
     CurrentlyMergingPartsTaggerPtr tagger;
@@ -863,8 +868,7 @@ std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::se
         future_part.parts.push_back(part);
         future_part.part_info = new_part_info;
         future_part.name = part->getNewName(new_part_info);
-        future_part.uuid = UUIDHelpers::generateV4();
-            future_part.type = part->getType();
+        future_part.type = part->getType();
 
         tagger = std::make_unique<CurrentlyMergingPartsTagger>(future_part, MergeTreeDataMergerMutator::estimateNeededDiskSpace({part}), *this, metadata_snapshot, true);
         return std::make_shared<MergeMutateSelectedEntry>(future_part, std::move(tagger), commands);
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index dea6318808a..623562b400e 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -2707,11 +2707,22 @@ void StorageReplicatedMergeTree::mergeSelectingTask()
                 getTotalMergesWithTTLInMergeList() < storage_settings_ptr->max_number_of_merges_with_ttl_in_pool;
 
             FutureMergedMutatedPart future_merged_part;
+            if (storage_settings.get()->assign_part_uuids)
+                future_merged_part.uuid = UUIDHelpers::generateV4();
+
             if (max_source_parts_size_for_merge > 0 &&
                 merger_mutator.selectPartsToMerge(future_merged_part, false, max_source_parts_size_for_merge, merge_pred, merge_with_ttl_allowed, nullptr))
             {
-                create_result = createLogEntryToMergeParts(zookeeper, future_merged_part.parts,
-                    future_merged_part.name, future_merged_part.type, deduplicate, nullptr, merge_pred.getVersion(), future_merged_part.merge_type);
+                create_result = createLogEntryToMergeParts(
+                    zookeeper,
+                    future_merged_part.parts,
+                    future_merged_part.name,
+                    future_merged_part.uuid,
+                    future_merged_part.type,
+                    deduplicate,
+                    nullptr,
+                    merge_pred.getVersion(),
+                    future_merged_part.merge_type);
             }
             /// If there are many mutations in queue, it may happen, that we cannot enqueue enough merges to merge all new parts
             else if (max_source_part_size_for_mutation > 0 && queue.countMutations() > 0
@@ -2728,8 +2739,12 @@ void StorageReplicatedMergeTree::mergeSelectingTask()
                     if (!desired_mutation_version)
                         continue;
 
-                    create_result = createLogEntryToMutatePart(*part,
-                        desired_mutation_version->first, desired_mutation_version->second, merge_pred.getVersion());
+                    create_result = createLogEntryToMutatePart(
+                        *part,
+                        future_merged_part.uuid,
+                        desired_mutation_version->first,
+                        desired_mutation_version->second,
+                        merge_pred.getVersion());
 
                     if (create_result == CreateMergeEntryResult::Ok)
                         break;
@@ -2791,6 +2806,7 @@ StorageReplicatedMergeTree::CreateMergeEntryResult StorageReplicatedMergeTree::c
     zkutil::ZooKeeperPtr & zookeeper,
     const DataPartsVector & parts,
     const String & merged_name,
+    const UUID & merged_part_uuid,
     const MergeTreeDataPartType & merged_part_type,
     bool deduplicate,
     ReplicatedMergeTreeLogEntryData * out_log_entry,
@@ -2826,7 +2842,7 @@ StorageReplicatedMergeTree::CreateMergeEntryResult StorageReplicatedMergeTree::c
     entry.type = LogEntry::MERGE_PARTS;
     entry.source_replica = replica_name;
     entry.new_part_name = merged_name;
-    entry.new_part_uuid = UUIDHelpers::generateV4();
+    entry.new_part_uuid = merged_part_uuid;
     entry.new_part_type = merged_part_type;
     entry.merge_type = merge_type;
     entry.deduplicate = deduplicate;
@@ -2875,7 +2891,7 @@ StorageReplicatedMergeTree::CreateMergeEntryResult StorageReplicatedMergeTree::c
 
 
 StorageReplicatedMergeTree::CreateMergeEntryResult StorageReplicatedMergeTree::createLogEntryToMutatePart(
-    const IMergeTreeDataPart & part, Int64 mutation_version, int32_t alter_version, int32_t log_version)
+    const IMergeTreeDataPart & part, const UUID & new_part_uuid, Int64 mutation_version, int32_t alter_version, int32_t log_version)
 {
     auto zookeeper = getZooKeeper();
 
@@ -2902,7 +2918,7 @@ StorageReplicatedMergeTree::CreateMergeEntryResult StorageReplicatedMergeTree::c
     entry.source_replica = replica_name;
     entry.source_parts.push_back(part.name);
     entry.new_part_name = new_part_name;
-    entry.new_part_uuid = UUIDHelpers::generateV4();
+    entry.new_part_uuid = new_part_uuid;
     entry.create_time = time(nullptr);
     entry.alter_version = alter_version;
 
@@ -3846,6 +3862,9 @@ bool StorageReplicatedMergeTree::optimize(
                     ReplicatedMergeTreeMergePredicate can_merge = queue.getMergePredicate(zookeeper);
 
                     FutureMergedMutatedPart future_merged_part;
+                    if (storage_settings.get()->assign_part_uuids)
+                        future_merged_part.uuid = UUIDHelpers::generateV4();
+
                     bool selected = merger_mutator.selectAllPartsToMergeWithinPartition(
                         future_merged_part, disk_space, can_merge, partition_id, true, nullptr);
 
@@ -3855,7 +3874,7 @@ bool StorageReplicatedMergeTree::optimize(
                     ReplicatedMergeTreeLogEntryData merge_entry;
                     CreateMergeEntryResult create_result = createLogEntryToMergeParts(
                         zookeeper, future_merged_part.parts,
-                        future_merged_part.name, future_merged_part.type, deduplicate,
+                        future_merged_part.name, future_merged_part.uuid, future_merged_part.type, deduplicate,
                         &merge_entry, can_merge.getVersion(), future_merged_part.merge_type);
 
                     if (create_result == CreateMergeEntryResult::MissingPart)
@@ -3881,6 +3900,9 @@ bool StorageReplicatedMergeTree::optimize(
                 ReplicatedMergeTreeMergePredicate can_merge = queue.getMergePredicate(zookeeper);
 
                 FutureMergedMutatedPart future_merged_part;
+                if (storage_settings.get()->assign_part_uuids)
+                    future_merged_part.uuid = UUIDHelpers::generateV4();
+
                 String disable_reason;
                 bool selected = false;
                 if (!partition)
@@ -3909,7 +3931,7 @@ bool StorageReplicatedMergeTree::optimize(
                 ReplicatedMergeTreeLogEntryData merge_entry;
                 CreateMergeEntryResult create_result = createLogEntryToMergeParts(
                     zookeeper, future_merged_part.parts,
-                    future_merged_part.name, future_merged_part.type, deduplicate,
+                    future_merged_part.name, future_merged_part.uuid, future_merged_part.type, deduplicate,
                     &merge_entry, can_merge.getVersion(), future_merged_part.merge_type);
 
                 if (create_result == CreateMergeEntryResult::MissingPart)
diff --git a/src/Storages/StorageReplicatedMergeTree.h b/src/Storages/StorageReplicatedMergeTree.h
index 3b4a80bd3bf..3cca265a024 100644
--- a/src/Storages/StorageReplicatedMergeTree.h
+++ b/src/Storages/StorageReplicatedMergeTree.h
@@ -464,6 +464,7 @@ private:
         zkutil::ZooKeeperPtr & zookeeper,
         const DataPartsVector & parts,
         const String & merged_name,
+        const UUID & merged_part_uuid,
         const MergeTreeDataPartType & merged_part_type,
         bool deduplicate,
         ReplicatedMergeTreeLogEntryData * out_log_entry,
@@ -472,6 +473,7 @@ private:
 
     CreateMergeEntryResult createLogEntryToMutatePart(
         const IMergeTreeDataPart & part,
+        const UUID & new_part_uuid,
         Int64 mutation_version,
         int32_t alter_version,
         int32_t log_version);
diff --git a/tests/integration/test_part_uuid/configs/merge_tree.xml b/tests/integration/test_part_uuid/configs/merge_tree.xml
new file mode 100644
index 00000000000..c45c2822108
--- /dev/null
+++ b/tests/integration/test_part_uuid/configs/merge_tree.xml
@@ -0,0 +1,6 @@
+<yandex>
+    <merge_tree>
+        <assign_part_uuids>1</assign_part_uuids>
+        <randomize_part_type>1</randomize_part_type>
+    </merge_tree>
+</yandex>
diff --git a/tests/integration/test_part_uuid/configs/remote_servers.xml b/tests/integration/test_part_uuid/configs/remote_servers.xml
index 998a969e87e..ebce4697529 100644
--- a/tests/integration/test_part_uuid/configs/remote_servers.xml
+++ b/tests/integration/test_part_uuid/configs/remote_servers.xml
@@ -15,4 +15,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
\ No newline at end of file
+</yandex>
diff --git a/tests/integration/test_part_uuid/test.py b/tests/integration/test_part_uuid/test.py
index a00575c2504..3229ee7fba2 100644
--- a/tests/integration/test_part_uuid/test.py
+++ b/tests/integration/test_part_uuid/test.py
@@ -1,4 +1,3 @@
-import time
 import uuid
 
 import pytest
@@ -9,12 +8,12 @@ cluster = ClickHouseCluster(__file__)
 
 node1 = cluster.add_instance(
     'node1',
-    main_configs=['configs/remote_servers.xml'],
+    main_configs=['configs/remote_servers.xml', 'configs/merge_tree.xml'],
     with_zookeeper=True)
 
 node2 = cluster.add_instance(
     'node2',
-    main_configs=['configs/remote_servers.xml'],
+    main_configs=['configs/remote_servers.xml', 'configs/merge_tree.xml'],
     with_zookeeper=True)
 
 
@@ -28,7 +27,7 @@ def started_cluster():
 
 
 def test_part_uuid(started_cluster):
-    test_uuid = str(uuid.uuid4())
+    uuid_zero = uuid.UUID(bytes=b"\x00" * 16)
 
     for ix, n in enumerate([node1, node2]):
         n.query("""
@@ -37,17 +36,44 @@ def test_part_uuid(started_cluster):
         ORDER BY tuple()
         """.format(ix))
 
+    # Test insert assigns uuid to part.
     node1.query("INSERT INTO t VALUES (1, 1)")
 
-    node1.query("ALTER TABLE t DETACH PARTITION tuple()")
-    node1.exec_in_container([
-        "bash", "-c",
-        "echo '{}' > /var/lib/clickhouse/data/default/t/detached/{}/uuid.txt".format(test_uuid, "all_0_0_0")
-    ])
-    node1.query("ALTER TABLE t ATTACH PARTITION tuple()")
-    node1.query("ALTER TABLE t UPDATE value = 1 WHERE key = 1")
+    uuids = set()
+    for node in [node1, node2]:
+        node.query("SYSTEM SYNC REPLICA t")
+        part_initial_uuid = uuid.UUID(node.query("SELECT uuid FROM system.parts WHERE table = 't' AND active ORDER BY name").strip())
+        uuids.add(part_initial_uuid)
+        assert uuid_zero != part_initial_uuid
+    assert len(uuids) == 1, "expect the same uuid on all the replicas"
 
-    assert test_uuid == node1.query("SELECT uuid FROM system.parts WHERE table = 't' AND active ORDER BY name").strip()
+    # Test detach / attach.
+    node1.query("ALTER TABLE t DETACH PARTITION tuple(); ALTER TABLE t ATTACH PARTITION tuple()")
+
+    for node in [node1, node2]:
+        node.query("SYSTEM SYNC REPLICA t")
+        part_reattach_uuid = uuid.UUID(node.query(
+            "SELECT uuid FROM system.parts WHERE table = 't' AND active ORDER BY name").strip())
+        assert part_initial_uuid == part_reattach_uuid
+
+    # Test mutation assigns new non-zero uuids.
+    node1.query("ALTER TABLE t UPDATE value = 1 WHERE key = 1 SETTINGS mutations_sync = 2")
+    part_mutate_uuid = uuid.UUID(node1.query("SELECT uuid FROM system.parts WHERE table = 't' AND active ORDER BY name").strip())
+    assert part_mutate_uuid not in [uuid_zero, part_initial_uuid]
 
     node2.query("SYSTEM SYNC REPLICA t")
-    assert test_uuid == node2.query("SELECT uuid FROM system.parts WHERE table = 't' AND active ORDER BY name").strip()
+    assert part_mutate_uuid == uuid.UUID(node2.query(
+        "SELECT uuid FROM system.parts WHERE table = 't' AND active ORDER BY name").strip())
+
+    # Test merge assigns new non-zero uuids.
+    node2.query("INSERT INTO t VALUES (1, 1)")
+    node2.query("OPTIMIZE TABLE t FINAL")
+
+    uuids = set()
+    for node in [node1, node2]:
+        node.query("SYSTEM SYNC REPLICA t")
+        part_merge_uuid = uuid.UUID(node.query(
+            "SELECT uuid FROM system.parts WHERE table = 't' AND active ORDER BY name").strip())
+        uuids.add(part_merge_uuid)
+        assert part_mutate_uuid not in [uuid_zero, part_merge_uuid]
+    assert len(uuids) == 1, "expect the same uuid on all the replicas"

From 040aba9f855bddccd9b5bdfe47857563df64bd5a Mon Sep 17 00:00:00 2001
From: Nicolae Vartolomei <nv@cloudflare.com>
Date: Mon, 2 Nov 2020 18:52:50 +0000
Subject: [PATCH 62/99] Add uuid.txt to checksums for parts stored on disk

We are breaking backwards compatibility anyway (but agted by a setting)
---
 src/Storages/MergeTree/DataPartsExchange.cpp           | 10 ++--------
 src/Storages/MergeTree/DataPartsExchange.h             |  1 -
 src/Storages/MergeTree/IMergeTreeDataPart.cpp          |  5 -----
 src/Storages/MergeTree/MergeTreeData.h                 |  1 +
 src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp  |  5 ++++-
 src/Storages/MergeTree/MergeTreeDataWriter.cpp         |  4 +++-
 src/Storages/MergeTree/MergedBlockOutputStream.cpp     |  5 ++++-
 src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp |  2 +-
 8 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/Storages/MergeTree/DataPartsExchange.cpp b/src/Storages/MergeTree/DataPartsExchange.cpp
index 44a43d25e05..f85f9501fcf 100644
--- a/src/Storages/MergeTree/DataPartsExchange.cpp
+++ b/src/Storages/MergeTree/DataPartsExchange.cpp
@@ -190,9 +190,6 @@ void Service::sendPartFromDisk(const MergeTreeData::DataPartPtr & part, WriteBuf
         if (client_protocol_version < REPLICATION_PROTOCOL_VERSION_WITH_PARTS_DEFAULT_COMPRESSION && file_name == IMergeTreeDataPart::DEFAULT_COMPRESSION_CODEC_FILE_NAME)
             continue;
 
-        if (client_protocol_version < REPLICATION_PROTOCOL_VERSION_WITH_PARTS_UUID && file_name == IMergeTreeDataPart::UUID_FILE_NAME)
-            continue;
-
         checksums.files[file_name] = {};
     }
 
@@ -340,7 +337,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
 
 
     return part_type == "InMemory" ? downloadPartToMemory(part_name, part_uuid, metadata_snapshot, std::move(reservation), in)
-                                   : downloadPartToDisk(part_name, part_uuid, replica_path, to_detached, tmp_prefix_, sync, std::move(reservation), in);
+                                   : downloadPartToDisk(part_name, replica_path, to_detached, tmp_prefix_, sync, std::move(reservation), in);
 }
 
 MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToMemory(
@@ -378,7 +375,6 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToMemory(
 
 MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
     const String & part_name,
-    const UUID & part_uuid,
     const String & replica_path,
     bool to_detached,
     const String & tmp_prefix_,
@@ -445,8 +441,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
 
         if (file_name != "checksums.txt" &&
             file_name != "columns.txt" &&
-            file_name != IMergeTreeDataPart::DEFAULT_COMPRESSION_CODEC_FILE_NAME &&
-            file_name != IMergeTreeDataPart::UUID_FILE_NAME)
+            file_name != IMergeTreeDataPart::DEFAULT_COMPRESSION_CODEC_FILE_NAME)
             checksums.addFile(file_name, file_size, expected_hash);
 
         if (sync)
@@ -457,7 +452,6 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
 
     auto volume = std::make_shared<SingleDiskVolume>("volume_" + part_name, disk, 0);
     MergeTreeData::MutableDataPartPtr new_data_part = data.createPart(part_name, volume, part_relative_path);
-    new_data_part->uuid = part_uuid;
     new_data_part->is_temp = true;
     new_data_part->modification_time = time(nullptr);
     new_data_part->loadColumnsChecksumsIndexes(true, false);
diff --git a/src/Storages/MergeTree/DataPartsExchange.h b/src/Storages/MergeTree/DataPartsExchange.h
index d306cdef419..0a359474d2d 100644
--- a/src/Storages/MergeTree/DataPartsExchange.h
+++ b/src/Storages/MergeTree/DataPartsExchange.h
@@ -71,7 +71,6 @@ public:
 private:
     MergeTreeData::MutableDataPartPtr downloadPartToDisk(
             const String & part_name,
-            const UUID & part_uuid,
             const String & replica_path,
             bool to_detached,
             const String & tmp_prefix_,
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.cpp b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
index 38d2e712ec3..aa37e62d099 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
@@ -487,10 +487,6 @@ NameSet IMergeTreeDataPart::getFileNamesWithoutChecksums() const
     if (volume->getDisk()->exists(default_codec_path))
         result.emplace(DEFAULT_COMPRESSION_CODEC_FILE_NAME);
 
-    String uuid_path = getFullRelativePath() + UUID_FILE_NAME;
-    if (volume->getDisk()->exists(uuid_path))
-        result.emplace(UUID_FILE_NAME);
-
     return result;
 }
 
@@ -913,7 +909,6 @@ void IMergeTreeDataPart::remove() const
             for (const auto & file : {"checksums.txt", "columns.txt"})
                 volume->getDisk()->remove(to + "/" + file);
 
-            volume->getDisk()->removeIfExists(to + "/" + UUID_FILE_NAME);
             volume->getDisk()->removeIfExists(to + "/" + DEFAULT_COMPRESSION_CODEC_FILE_NAME);
             volume->getDisk()->removeIfExists(to + "/" + DELETE_ON_DESTROY_MARKER_FILE_NAME);
 
diff --git a/src/Storages/MergeTree/MergeTreeData.h b/src/Storages/MergeTree/MergeTreeData.h
index 34faafb3b1f..e0d03cc9c02 100644
--- a/src/Storages/MergeTree/MergeTreeData.h
+++ b/src/Storages/MergeTree/MergeTreeData.h
@@ -732,6 +732,7 @@ protected:
     friend class MergeTreeDataMergerMutator;
     friend struct ReplicatedMergeTreeTableMetadata;
     friend class StorageReplicatedMergeTree;
+    friend class MergeTreeDataWriter;
 
     bool require_part_metadata;
 
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
index 1151f73bbed..3972f75c8a8 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
@@ -1824,7 +1824,10 @@ void MergeTreeDataMergerMutator::finalizeMutatedPart(
     if (new_data_part->uuid != UUIDHelpers::Nil)
     {
         auto out = disk->writeFile(new_data_part->getFullRelativePath() + IMergeTreeDataPart::UUID_FILE_NAME, 4096);
-        writeUUIDText(new_data_part->uuid, *out);
+        HashingWriteBuffer out_hashing(*out);
+        writeUUIDText(new_data_part->uuid, out_hashing);
+        new_data_part->checksums.files[IMergeTreeDataPart::UUID_FILE_NAME].file_size = out_hashing.count();
+        new_data_part->checksums.files[IMergeTreeDataPart::UUID_FILE_NAME].file_hash = out_hashing.getHash();
     }
 
     if (need_remove_expired_values)
diff --git a/src/Storages/MergeTree/MergeTreeDataWriter.cpp b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
index 116e9b8cb81..e65a8e22f32 100644
--- a/src/Storages/MergeTree/MergeTreeDataWriter.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
@@ -247,7 +247,9 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(BlockWithPa
         createVolumeFromReservation(reservation, volume),
         TMP_PREFIX + part_name);
 
-    new_data_part->uuid = UUIDHelpers::generateV4();
+    if (data.storage_settings.get()->assign_part_uuids)
+        new_data_part->uuid = UUIDHelpers::generateV4();
+
     new_data_part->setColumns(columns);
     new_data_part->partition = std::move(partition);
     new_data_part->minmax_idx = std::move(minmax_idx);
diff --git a/src/Storages/MergeTree/MergedBlockOutputStream.cpp b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
index 83c59780a0b..42d310da485 100644
--- a/src/Storages/MergeTree/MergedBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
@@ -136,7 +136,10 @@ void MergedBlockOutputStream::finalizePartOnDisk(
     if (new_part->uuid != UUIDHelpers::Nil)
     {
         auto out = volume->getDisk()->writeFile(part_path + IMergeTreeDataPart::UUID_FILE_NAME, 4096);
-        writeUUIDText(new_part->uuid, *out);
+        HashingWriteBuffer out_hashing(*out);
+        writeUUIDText(new_part->uuid, out_hashing);
+        checksums.files[IMergeTreeDataPart::UUID_FILE_NAME].file_size = out_hashing.count();
+        checksums.files[IMergeTreeDataPart::UUID_FILE_NAME].file_hash = out_hashing.getHash();
         out->finalize();
         if (sync)
             out->sync();
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
index 1d9f518568b..055a2970c82 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
@@ -24,7 +24,7 @@ void ReplicatedMergeTreeLogEntryData::writeText(WriteBuffer & out) const
     /// Conditionally bump format_version only when uuid has been assigned.
     /// If some other feature requires bumping format_version to >= 5 then this code becomes no-op.
     if (new_part_uuid != UUIDHelpers::Nil)
-        format_version = std::min(format_version, static_cast<UInt8>(5));
+        format_version = std::max(format_version, static_cast<UInt8>(5));
 
     out << "format version: " << format_version << "\n"
         << "create_time: " << LocalDateTime(create_time ? create_time : time(nullptr)) << "\n"

From 7c8bc1c04e6c2a6a4173fc3e704ad89e93633b2f Mon Sep 17 00:00:00 2001
From: Nicolae Vartolomei <nv@cloudflare.com>
Date: Mon, 2 Nov 2020 22:36:32 +0000
Subject: [PATCH 63/99] Use JSON metadata in WAL

---
 .../MergeTree/MergeTreeWriteAheadLog.cpp      | 52 +++++++++++++------
 .../MergeTree/MergeTreeWriteAheadLog.h        |  6 +++
 .../configs/merge_tree_in_memory.xml          |  6 +++
 .../{merge_tree.xml => merge_tree_uuids.xml}  |  1 -
 tests/integration/test_part_uuid/test.py      | 33 +++++++++++-
 5 files changed, 79 insertions(+), 19 deletions(-)
 create mode 100644 tests/integration/test_part_uuid/configs/merge_tree_in_memory.xml
 rename tests/integration/test_part_uuid/configs/{merge_tree.xml => merge_tree_uuids.xml} (66%)

diff --git a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp b/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
index 778505d93ef..f36275bfd35 100644
--- a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
+++ b/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
@@ -5,7 +5,10 @@
 #include <IO/MemoryReadWriteBuffer.h>
 #include <IO/ReadHelpers.h>
 #include <IO/copyData.h>
-#include <Poco/File.h>
+#include <Poco/JSON/JSON.h>
+#include <Poco/JSON/Object.h>
+#include <Poco/JSON/Stringifier.h>
+#include <Poco/JSON/Parser.h>
 #include <sys/time.h>
 
 namespace DB
@@ -250,6 +253,29 @@ MergeTreeWriteAheadLog::tryParseMinMaxBlockNumber(const String & filename)
     return std::make_pair(min_block, max_block);
 }
 
+String MergeTreeWriteAheadLog::ActionMetadata::toJSON() const
+{
+    Poco::JSON::Object json;
+
+    if (part_uuid != UUIDHelpers::Nil)
+        json.set(JSON_KEY_PART_UUID, toString(part_uuid));
+
+    std::ostringstream oss; // STYLE_CHECK_ALLOW_STD_STRING_STREAM
+    oss.exceptions(std::ios::failbit);
+    json.stringify(oss);
+
+    return oss.str();
+}
+
+void MergeTreeWriteAheadLog::ActionMetadata::fromJSON(const String & buf)
+{
+    Poco::JSON::Parser parser;
+    auto json = parser.parse(buf).extract<Poco::JSON::Object::Ptr>();
+
+    if (json->has(JSON_KEY_PART_UUID))
+        part_uuid = parseFromString<UUID>(json->getValue<std::string>(JSON_KEY_PART_UUID));
+}
+
 void MergeTreeWriteAheadLog::ActionMetadata::read(ReadBuffer & meta_in)
 {
     readIntBinary(min_compatible_version, meta_in);
@@ -260,29 +286,23 @@ void MergeTreeWriteAheadLog::ActionMetadata::read(ReadBuffer & meta_in)
     size_t metadata_size;
     readVarUInt(metadata_size, meta_in);
 
-    UInt32 metadata_start = meta_in.offset();
+    if (metadata_size == 0)
+        return;
 
-    if (meta_in.hasPendingData())
-        readUUIDText(part_uuid, meta_in);
+    String buf(metadata_size, ' ');
+    meta_in.readStrict(buf.data(), metadata_size);
 
-    /// Skip extra fields if any. If min_compatible_version is lower than WAL_VERSION it means
-    /// that the fields are not critical for the correctness.
-    meta_in.ignore(metadata_size - (meta_in.offset() - metadata_start));
+    fromJSON(buf);
 }
 
 void MergeTreeWriteAheadLog::ActionMetadata::write(WriteBuffer & meta_out) const
 {
     writeIntBinary(min_compatible_version, meta_out);
 
-    /// Write metadata to a temporary buffer first to compute the size.
-    MemoryWriteBuffer buf{};
+    String ser_meta = toJSON();
 
-    writeUUIDText(part_uuid, buf);
-
-    buf.finalize();
-    auto read_buf = buf.tryGetReadBuffer();
-
-    writeVarUInt(static_cast<UInt32>(read_buf->available()), meta_out);
-    copyData(*read_buf, meta_out);
+    writeVarUInt(static_cast<UInt32>(ser_meta.length()), meta_out);
+    writeString(ser_meta, meta_out);
 }
+
 }
diff --git a/src/Storages/MergeTree/MergeTreeWriteAheadLog.h b/src/Storages/MergeTree/MergeTreeWriteAheadLog.h
index 92330e4dcb4..3b8dc5befc0 100644
--- a/src/Storages/MergeTree/MergeTreeWriteAheadLog.h
+++ b/src/Storages/MergeTree/MergeTreeWriteAheadLog.h
@@ -42,6 +42,12 @@ public:
 
         void write(WriteBuffer & meta_out) const;
         void read(ReadBuffer & meta_in);
+
+    private:
+        static constexpr auto JSON_KEY_PART_UUID = "part_uuid";
+
+        String toJSON() const;
+        void fromJSON(const String & buf);
     };
 
     constexpr static UInt8 WAL_VERSION = 1;
diff --git a/tests/integration/test_part_uuid/configs/merge_tree_in_memory.xml b/tests/integration/test_part_uuid/configs/merge_tree_in_memory.xml
new file mode 100644
index 00000000000..83d36f33795
--- /dev/null
+++ b/tests/integration/test_part_uuid/configs/merge_tree_in_memory.xml
@@ -0,0 +1,6 @@
+<yandex>
+    <merge_tree>
+        <min_rows_for_compact_part>1000</min_rows_for_compact_part>
+        <min_rows_for_wide_part>1000</min_rows_for_wide_part>
+    </merge_tree>
+</yandex>
diff --git a/tests/integration/test_part_uuid/configs/merge_tree.xml b/tests/integration/test_part_uuid/configs/merge_tree_uuids.xml
similarity index 66%
rename from tests/integration/test_part_uuid/configs/merge_tree.xml
rename to tests/integration/test_part_uuid/configs/merge_tree_uuids.xml
index c45c2822108..8369c916848 100644
--- a/tests/integration/test_part_uuid/configs/merge_tree.xml
+++ b/tests/integration/test_part_uuid/configs/merge_tree_uuids.xml
@@ -1,6 +1,5 @@
 <yandex>
     <merge_tree>
         <assign_part_uuids>1</assign_part_uuids>
-        <randomize_part_type>1</randomize_part_type>
     </merge_tree>
 </yandex>
diff --git a/tests/integration/test_part_uuid/test.py b/tests/integration/test_part_uuid/test.py
index 3229ee7fba2..1dfeb17b9b8 100644
--- a/tests/integration/test_part_uuid/test.py
+++ b/tests/integration/test_part_uuid/test.py
@@ -8,12 +8,12 @@ cluster = ClickHouseCluster(__file__)
 
 node1 = cluster.add_instance(
     'node1',
-    main_configs=['configs/remote_servers.xml', 'configs/merge_tree.xml'],
+    main_configs=['configs/remote_servers.xml', 'configs/merge_tree_uuids.xml'],
     with_zookeeper=True)
 
 node2 = cluster.add_instance(
     'node2',
-    main_configs=['configs/remote_servers.xml', 'configs/merge_tree.xml'],
+    main_configs=['configs/remote_servers.xml', 'configs/merge_tree_uuids.xml', 'configs/merge_tree_in_memory.xml'],
     with_zookeeper=True)
 
 
@@ -77,3 +77,32 @@ def test_part_uuid(started_cluster):
         uuids.add(part_merge_uuid)
         assert part_mutate_uuid not in [uuid_zero, part_merge_uuid]
     assert len(uuids) == 1, "expect the same uuid on all the replicas"
+
+
+def test_part_uuid_wal(started_cluster):
+    uuid_zero = uuid.UUID(bytes=b"\x00" * 16)
+
+    for ix, n in enumerate([node1, node2]):
+        n.query("""
+        CREATE TABLE t_wal(key UInt64, value UInt64)
+        ENGINE ReplicatedMergeTree('/clickhouse/tables/t_wal', '{}')
+        ORDER BY tuple()
+        """.format(ix))
+
+    node2.query("INSERT INTO t_wal VALUES (1, 1)")
+
+    uuids = set()
+    for node in [node1, node2]:
+        node.query("SYSTEM SYNC REPLICA t")
+        part_initial_uuid = uuid.UUID(node.query("SELECT uuid FROM system.parts WHERE table = 't_wal' AND active ORDER BY name").strip())
+        assert "InMemory" == node.query("SELECT part_type FROM system.parts WHERE table = 't_wal' AND active ORDER BY name").strip()
+        uuids.add(part_initial_uuid)
+        assert uuid_zero != part_initial_uuid
+    assert len(uuids) == 1, "expect the same uuid on all the replicas"
+
+    # Test detach / attach table to trigger WAL processing.
+    for node in [node1, node2]:
+        node.query("DETACH TABLE t_wal; ATTACH TABLE t_wal")
+        part_reattach_uuid = uuid.UUID(node.query(
+            "SELECT uuid FROM system.parts WHERE table = 't_wal' AND active ORDER BY name").strip())
+        assert part_initial_uuid == part_reattach_uuid

From 3dcc2eeb01b5edea83ccb0285de8a64b4aeeec3d Mon Sep 17 00:00:00 2001
From: robot-clickhouse <robot-clickhouse@yandex-team.ru>
Date: Fri, 20 Nov 2020 18:20:26 +0300
Subject: [PATCH 64/99] Update version_date.tsv after release 20.11.4.13

---
 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 3b59dbfb460..e95489e6ee0 100644
--- a/utils/list-versions/version_date.tsv
+++ b/utils/list-versions/version_date.tsv
@@ -1,3 +1,4 @@
+v20.11.4.13-stable	2020-11-20
 v20.11.3.3-stable	2020-11-13
 v20.11.2.1-stable	2020-11-11
 v20.10.4.1-stable	2020-11-13

From 210616371777cfb5580090c8c24ae043dbb831a2 Mon Sep 17 00:00:00 2001
From: robot-clickhouse <robot-clickhouse@yandex-team.ru>
Date: Fri, 20 Nov 2020 18:35:00 +0300
Subject: [PATCH 65/99] Update version_date.tsv after release 20.10.5.10

---
 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 e95489e6ee0..21cf99b691c 100644
--- a/utils/list-versions/version_date.tsv
+++ b/utils/list-versions/version_date.tsv
@@ -1,6 +1,7 @@
 v20.11.4.13-stable	2020-11-20
 v20.11.3.3-stable	2020-11-13
 v20.11.2.1-stable	2020-11-11
+v20.10.5.10-stable	2020-11-20
 v20.10.4.1-stable	2020-11-13
 v20.10.3.30-stable	2020-10-29
 v20.10.2.20-stable	2020-10-23

From 6d1b84b06b115b33964c5db3726ec79e9b98df7e Mon Sep 17 00:00:00 2001
From: robot-clickhouse <robot-clickhouse@yandex-team.ru>
Date: Fri, 20 Nov 2020 18:52:09 +0300
Subject: [PATCH 66/99] Update version_date.tsv after release 20.9.6.14

---
 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 21cf99b691c..dc48cb4c81d 100644
--- a/utils/list-versions/version_date.tsv
+++ b/utils/list-versions/version_date.tsv
@@ -5,6 +5,7 @@ v20.10.5.10-stable	2020-11-20
 v20.10.4.1-stable	2020-11-13
 v20.10.3.30-stable	2020-10-29
 v20.10.2.20-stable	2020-10-23
+v20.9.6.14-stable	2020-11-20
 v20.9.5.5-stable	2020-11-13
 v20.9.4.76-stable	2020-10-29
 v20.9.3.45-stable	2020-10-09

From 2cdb7bc3f6c00a8556649831904a3b5513d5b36d Mon Sep 17 00:00:00 2001
From: V <1571275+vickyi@users.noreply.github.com>
Date: Fri, 20 Nov 2020 23:58:25 +0800
Subject: [PATCH 67/99] wrong translation

fix wrong translation
---
 docs/zh/getting-started/playground.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/zh/getting-started/playground.md b/docs/zh/getting-started/playground.md
index 192203c6fe6..3eac3905f23 100644
--- a/docs/zh/getting-started/playground.md
+++ b/docs/zh/getting-started/playground.md
@@ -21,15 +21,15 @@ toc_title: "\u266A\u64CD\u573A\u266A"
 
 ClickHouse体验还有如下：
 [ClickHouse管理服务](https://cloud.yandex.com/services/managed-clickhouse)
-实例托管 [Yandex云](https://cloud.yandex.com/).
-更多信息 [云提供商](../commercial/cloud.md).
+实例托管 [Yandex云](https://cloud.yandex.com/)。
+更多信息 [云提供商](../commercial/cloud.md)。
 
 ClickHouse体验平台界面实际上是通过ClickHouse [HTTP API](../interfaces/http.md)接口实现的.
 体验平台后端只是一个ClickHouse集群，没有任何额外的服务器端应用程序。
 体验平台也同样提供了ClickHouse HTTPS服务端口。
 
-您可以使用任何HTTP客户端向体验平台进行查询，例如 [curl](https://curl.haxx.se) 或 [wget](https://www.gnu.org/software/wget/)，或使用以下方式建立连接 [JDBC](../interfaces/jdbc.md) 或 [ODBC](../interfaces/odbc.md) 司机
-有关支持ClickHouse的软件产品的更多信息，请访问 [这里](../interfaces/index.md).
+您可以使用任何HTTP客户端向体验平台进行查询，例如 [curl](https://curl.haxx.se) 或 [wget](https://www.gnu.org/software/wget/)，或使用以下方式建立连接 [JDBC](../interfaces/jdbc.md) 或 [ODBC](../interfaces/odbc.md) 驱动。
+有关支持ClickHouse的软件产品的更多信息，请访问 [这里](../interfaces/index.md)。
 
 | 参数     | 值                                    |
 |:---------|:--------------------------------------|

From 5c5d2ac281c2dff8a716d0060b26c16633e94038 Mon Sep 17 00:00:00 2001
From: robot-clickhouse <robot-clickhouse@yandex-team.ru>
Date: Fri, 20 Nov 2020 19:23:48 +0300
Subject: [PATCH 68/99] Update version_date.tsv after release 20.8.7.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 dc48cb4c81d..95ed2565a61 100644
--- a/utils/list-versions/version_date.tsv
+++ b/utils/list-versions/version_date.tsv
@@ -10,6 +10,7 @@ v20.9.5.5-stable	2020-11-13
 v20.9.4.76-stable	2020-10-29
 v20.9.3.45-stable	2020-10-09
 v20.9.2.20-stable	2020-09-22
+v20.8.7.15-lts	2020-11-20
 v20.8.6.6-lts	2020-11-13
 v20.8.5.45-lts	2020-10-29
 v20.8.4.11-lts	2020-10-09

From 382e6d08557deb5fb291c7d6e3a94be5fa652adb Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Fri, 20 Nov 2020 19:52:50 +0300
Subject: [PATCH 69/99] Review fix.

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

diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index 438badf09e7..3ea48af7daa 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -615,7 +615,6 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
         }
 
         /// Check constants.
-
         if (const auto * res_const = typeid_cast<const ColumnConst *>(res_elem.column.get()))
         {
             if (const auto * src_const = typeid_cast<const ColumnConst *>(src_node->column.get()))
@@ -633,6 +632,7 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
                                 ErrorCodes::ILLEGAL_COLUMN);
         }
 
+        /// Add CAST function to convert into result type if needed.
         if (!res_elem.type->equals(*src_node->result_type))
         {
             ColumnWithTypeAndName column;
diff --git a/src/Interpreters/ActionsDAG.h b/src/Interpreters/ActionsDAG.h
index 20e9399612c..ca54dab7231 100644
--- a/src/Interpreters/ActionsDAG.h
+++ b/src/Interpreters/ActionsDAG.h
@@ -239,6 +239,9 @@ public:
         Name,
     };
 
+    /// Create ActionsDAG which converts block structure from source to result.
+    /// It is needed to convert result from different sources to the same structure, e.g. for UNION query.
+    /// Conversion should be possible with only usage of CAST function and renames.
     static ActionsDAGPtr makeConvertingActions(
         const ColumnsWithTypeAndName & source,
         const ColumnsWithTypeAndName & result,
diff --git a/src/Interpreters/ExpressionActions.cpp b/src/Interpreters/ExpressionActions.cpp
index c1dec121c90..f0dcf830c82 100644
--- a/src/Interpreters/ExpressionActions.cpp
+++ b/src/Interpreters/ExpressionActions.cpp
@@ -164,7 +164,6 @@ void ExpressionActions::linearizeActions()
         {
             /// Argument for input is special. It contains the position from required columns.
             ExpressionActions::Argument argument;
-            // argument.pos = required_columns.size();
             argument.needed_later = !cur.parents.empty();
             arguments.emplace_back(argument);
 

From 9d509cfc56d842405281fffc39f445304de20092 Mon Sep 17 00:00:00 2001
From: "Matwey V. Kornilov" <matwey.kornilov@gmail.com>
Date: Sat, 21 Nov 2020 13:26:38 +0300
Subject: [PATCH 70/99] Add missed <stdexcept>

std::logic_error is used at line 294, so the appropriate header is required.
---
 base/common/StringRef.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/base/common/StringRef.h b/base/common/StringRef.h
index b51b95456cb..ac9d7c47b72 100644
--- a/base/common/StringRef.h
+++ b/base/common/StringRef.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cassert>
+#include <stdexcept> // for std::logic_error
 #include <string>
 #include <vector>
 #include <functional>

From 8931d3eb6fd652ee01dd7d69bcb48b7b7b1d004a Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 20 Nov 2020 23:23:47 +0300
Subject: [PATCH 71/99] Do not use SET via <full_query> in perf tests

Since if the connection will be closed (by some reason), then the
setting will not be applied after transparent reconnect (since only
native clickhouse-client can do this, since it parses the query, but
perf tests uses python driver).

Just use inplace SETTINGS clause or <settings>.
---
 tests/performance/joins_in_memory_pmj.xml               | 5 ++++-
 tests/performance/materialized_view_parallel_insert.xml | 2 +-
 tests/performance/parallel_insert.xml                   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/performance/joins_in_memory_pmj.xml b/tests/performance/joins_in_memory_pmj.xml
index 2b9596e1591..1ca3fd49d50 100644
--- a/tests/performance/joins_in_memory_pmj.xml
+++ b/tests/performance/joins_in_memory_pmj.xml
@@ -1,6 +1,9 @@
 <test max_ignored_relative_change="0.8">
     <create_query>CREATE TABLE ints (i64 Int64, i32 Int32, i16 Int16, i8 Int8) ENGINE = Memory</create_query>
-    <create_query>SET join_algorithm = 'partial_merge'</create_query>
+
+    <settings>
+        <join_algorithm>partial_merge</join_algorithm>
+    </settings>
 
     <fill_query>INSERT INTO ints SELECT number AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000)</fill_query>
     <fill_query>INSERT INTO ints SELECT 10000 + number % 1000 AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000)</fill_query>
diff --git a/tests/performance/materialized_view_parallel_insert.xml b/tests/performance/materialized_view_parallel_insert.xml
index 4b71354dec3..24b8989443f 100644
--- a/tests/performance/materialized_view_parallel_insert.xml
+++ b/tests/performance/materialized_view_parallel_insert.xml
@@ -18,13 +18,13 @@
             -- do not select anything because we only need column types
             LIMIT 0
     </create_query>
-    <fill_query>SET max_insert_threads=8</fill_query>
     <fill_query>SYSTEM STOP MERGES</fill_query>
 
     <query>
         INSERT INTO hits_mv
         SELECT CounterID, EventDate, UserID, Title
         FROM hits_10m_single
+        SETTINGS max_insert_threads=8
     </query>
 
     <drop_query>SYSTEM START MERGES</drop_query>
diff --git a/tests/performance/parallel_insert.xml b/tests/performance/parallel_insert.xml
index 4050e771cb8..08c1532e963 100644
--- a/tests/performance/parallel_insert.xml
+++ b/tests/performance/parallel_insert.xml
@@ -19,13 +19,13 @@
             -- do not select anything because we only need column types
             LIMIT 0
     </create_query>
-    <fill_query>SET max_insert_threads=8</fill_query>
     <fill_query>SYSTEM STOP MERGES</fill_query>
 
     <query>
         INSERT INTO hits2
         SELECT CounterID, EventDate, UserID, Title
         FROM hits_10m_single
+        SETTINGS max_insert_threads=8
     </query>
 
     <drop_query>SYSTEM START MERGES</drop_query>

From f6d16ee43ed5fd9452286317135ea5b928172f14 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sat, 21 Nov 2020 13:55:24 +0300
Subject: [PATCH 72/99] Force clickhouse-driver >= 1.1.5 for
 settings-as-strings support for perf-tests image

---
 docker/test/performance-comparison/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/test/performance-comparison/Dockerfile b/docker/test/performance-comparison/Dockerfile
index 76cadc3ce11..004bac02918 100644
--- a/docker/test/performance-comparison/Dockerfile
+++ b/docker/test/performance-comparison/Dockerfile
@@ -30,7 +30,7 @@ RUN apt-get update \
             tzdata \
             vim \
             wget \
-    && pip3 --no-cache-dir install clickhouse_driver scipy \
+    && pip3 --no-cache-dir install 'clickhouse-driver>=0.1.5' scipy \
     && apt-get purge --yes python3-dev g++ \
     && apt-get autoremove --yes \
     && apt-get clean \

From 3ddb0ac53ead903763593ca14526a18ef7570cf8 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sat, 21 Nov 2020 13:58:15 +0300
Subject: [PATCH 73/99] Configure logging for perf test runner

---
 docker/test/performance-comparison/perf.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/test/performance-comparison/perf.py b/docker/test/performance-comparison/perf.py
index 337f13690b6..46c37aebe4d 100755
--- a/docker/test/performance-comparison/perf.py
+++ b/docker/test/performance-comparison/perf.py
@@ -14,10 +14,12 @@ import string
 import sys
 import time
 import traceback
+import logging
 import xml.etree.ElementTree as et
 from threading import Thread
 from scipy import stats
 
+logging.basicConfig(format='%(asctime)s: %(levelname)s: %(module)s: %(message)s', level='WARNING')
 
 total_start_seconds = time.perf_counter()
 stage_start_seconds = total_start_seconds

From d676e2f5c59375edd9d0020572307bb62f41b938 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sat, 21 Nov 2020 13:51:34 +0300
Subject: [PATCH 74/99] Pass settings for perf tests via protocol over SET
 query

Thus they will be applied on reconnects, since clickhouse-driver may
implicitly do it if the connection has been failed.
---
 docker/test/performance-comparison/perf.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/docker/test/performance-comparison/perf.py b/docker/test/performance-comparison/perf.py
index 46c37aebe4d..2568f7ac066 100755
--- a/docker/test/performance-comparison/perf.py
+++ b/docker/test/performance-comparison/perf.py
@@ -173,12 +173,9 @@ reportStageEnd('drop-1')
 settings = root.findall('settings/*')
 for conn_index, c in enumerate(all_connections):
     for s in settings:
-        try:
-            q = f"set {s.tag} = '{s.text}'"
-            c.execute(q)
-            print(f'set\t{conn_index}\t{c.last_query.elapsed}\t{tsv_escape(q)}')
-        except:
-            print(traceback.format_exc(), file=sys.stderr)
+        # requires clickhouse-driver >= 1.1.5 to accept arbitrary new settings
+        # (https://github.com/mymarilyn/clickhouse-driver/pull/142)
+        c.settings[s.tag] = s.text
 
 reportStageEnd('settings')
 

From 268b15f221f97708a532858a3cf4d949fdee305c Mon Sep 17 00:00:00 2001
From: fenglv <fenglv15@mails.ucas.ac.cn>
Date: Sat, 21 Nov 2020 12:59:40 +0000
Subject: [PATCH 75/99] fix toUInt256 stack overflow

---
 src/Functions/FunctionsConversion.h                    |  3 +++
 .../01581_to_int256_uint256_inf_nan.reference          |  6 ++++++
 .../0_stateless/01581_to_int256_uint256_inf_nan.sql    | 10 ++++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 tests/queries/0_stateless/01581_to_int256_uint256_inf_nan.reference
 create mode 100644 tests/queries/0_stateless/01581_to_int256_uint256_inf_nan.sql

diff --git a/src/Functions/FunctionsConversion.h b/src/Functions/FunctionsConversion.h
index 70e8904cfc1..0bf4f3f506c 100644
--- a/src/Functions/FunctionsConversion.h
+++ b/src/Functions/FunctionsConversion.h
@@ -153,6 +153,9 @@ struct ConvertImpl
                 {
                     if constexpr (std::is_same_v<FromFieldType, UInt128> || std::is_same_v<ToFieldType, UInt128>)
                         throw Exception("Unexpected UInt128 to big int conversion", ErrorCodes::NOT_IMPLEMENTED);
+                    /// If From Data is Nan or Inf, throw exception
+                    else if (!isFinite(vec_from[i]))
+                        throw Exception("Unexpected inf or nan to big int conversion", ErrorCodes::NOT_IMPLEMENTED);
                     else
                         vec_to[i] = bigint_cast<ToFieldType>(vec_from[i]);
                 }
diff --git a/tests/queries/0_stateless/01581_to_int256_uint256_inf_nan.reference b/tests/queries/0_stateless/01581_to_int256_uint256_inf_nan.reference
new file mode 100644
index 00000000000..37883cc6c47
--- /dev/null
+++ b/tests/queries/0_stateless/01581_to_int256_uint256_inf_nan.reference
@@ -0,0 +1,6 @@
+-9223372036854775808
+170141183460469231731687303715884105727
+-9223372036854775808
+170141183460469231731687303715884105727
+0
+0
diff --git a/tests/queries/0_stateless/01581_to_int256_uint256_inf_nan.sql b/tests/queries/0_stateless/01581_to_int256_uint256_inf_nan.sql
new file mode 100644
index 00000000000..b28fc80774f
--- /dev/null
+++ b/tests/queries/0_stateless/01581_to_int256_uint256_inf_nan.sql
@@ -0,0 +1,10 @@
+SELECT toInt64(inf);
+SELECT toInt128(inf);
+SELECT toInt256(inf); -- { serverError 48 }
+SELECT toInt64(nan);
+SELECT toInt128(nan);
+SELECT toInt256(nan); -- { serverError 48 }
+SELECT toUInt64(inf);
+SELECT toUInt256(inf); -- { serverError 48 }
+SELECT toUInt64(nan);
+SELECT toUInt256(nan); -- { serverError 48 }

From 20937c71a91183aa7d4facc02737779ff64a6010 Mon Sep 17 00:00:00 2001
From: Denny Crane <deniszhuravlov@gmail.com>
Date: Sat, 21 Nov 2020 14:57:30 -0400
Subject: [PATCH 76/99] Update group-by.md

removed obsolete info about groupby
---
 docs/ru/sql-reference/statements/select/group-by.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/docs/ru/sql-reference/statements/select/group-by.md b/docs/ru/sql-reference/statements/select/group-by.md
index a0454ef1d91..660f2aac88d 100644
--- a/docs/ru/sql-reference/statements/select/group-by.md
+++ b/docs/ru/sql-reference/statements/select/group-by.md
@@ -86,8 +86,6 @@ SELECT
 FROM hits
 ```
 
-Но, в отличие от стандартного SQL, если в таблице нет строк (вообще нет или после фильтрации с помощью WHERE), в качестве результата возвращается пустой результат, а не результат из одной строки, содержащий «начальные» значения агрегатных функций.
-
 В отличие от MySQL (и в соответствии со стандартом SQL), вы не можете получить какое-нибудь значение некоторого столбца, не входящего в ключ или агрегатную функцию (за исключением константных выражений). Для обхода этого вы можете воспользоваться агрегатной функцией any (получить первое попавшееся значение) или min/max.
 
 Пример:
@@ -103,10 +101,6 @@ GROUP BY domain
 
 GROUP BY вычисляет для каждого встретившегося различного значения ключей, набор значений агрегатных функций.
 
-Не поддерживается GROUP BY по столбцам-массивам.
-
-Не поддерживается указание констант в качестве аргументов агрегатных функций. Пример: `sum(1)`. Вместо этого, вы можете избавиться от констант. Пример: `count()`.
-
 ## Детали реализации {#implementation-details}
 
 Агрегация является одной из наиболее важных возможностей столбцовых СУБД, и поэтому её реализация является одной из наиболее сильно оптимизированных частей ClickHouse. По умолчанию агрегирование выполняется в памяти с помощью хэш-таблицы. Она имеет более 40 специализаций, которые выбираются автоматически в зависимости от типов данных ключа группировки.

From badb7b1ba5b047f1b28bd3be2f8c1ae1d276fcff Mon Sep 17 00:00:00 2001
From: Denny Crane <deniszhuravlov@gmail.com>
Date: Sat, 21 Nov 2020 14:58:58 -0400
Subject: [PATCH 77/99] Update group-by.md

removed obsolete info about groupby
---
 docs/en/sql-reference/statements/select/group-by.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/docs/en/sql-reference/statements/select/group-by.md b/docs/en/sql-reference/statements/select/group-by.md
index 6cb99f285f2..3f5cd7d62f9 100644
--- a/docs/en/sql-reference/statements/select/group-by.md
+++ b/docs/en/sql-reference/statements/select/group-by.md
@@ -88,8 +88,6 @@ SELECT
 FROM hits
 ```
 
-However, in contrast to standard SQL, if the table doesn’t have any rows (either there aren’t any at all, or there aren’t any after using WHERE to filter), an empty result is returned, and not the result from one of the rows containing the initial values of aggregate functions.
-
 As opposed to MySQL (and conforming to standard SQL), you can’t get some value of some column that is not in a key or aggregate function (except constant expressions). To work around this, you can use the ‘any’ aggregate function (get the first encountered value) or ‘min/max’.
 
 Example:
@@ -105,10 +103,6 @@ GROUP BY domain
 
 For every different key value encountered, `GROUP BY` calculates a set of aggregate function values.
 
-`GROUP BY` is not supported for array columns.
-
-A constant can’t be specified as arguments for aggregate functions. Example: `sum(1)`. Instead of this, you can get rid of the constant. Example: `count()`.
-
 ## Implementation Details {#implementation-details}
 
 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.

From 935a747b90583b92146742261317cd39b3b8ae5f Mon Sep 17 00:00:00 2001
From: Denny Crane <deniszhuravlov@gmail.com>
Date: Sat, 21 Nov 2020 15:05:11 -0400
Subject: [PATCH 78/99] Update index.md

removed obsolete info about sum
---
 docs/ru/sql-reference/aggregate-functions/index.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/ru/sql-reference/aggregate-functions/index.md b/docs/ru/sql-reference/aggregate-functions/index.md
index e7f6acee738..4a7768f587f 100644
--- a/docs/ru/sql-reference/aggregate-functions/index.md
+++ b/docs/ru/sql-reference/aggregate-functions/index.md
@@ -44,8 +44,6 @@ SELECT sum(y) FROM t_null_big
 └────────┘
 ```
 
-Функция `sum` работает с `NULL` как с `0`. В частности, это означает, что если на вход в функцию подать выборку, где все значения `NULL`, то результат будет `0`, а не `NULL`.
-
 Теперь с помощью функции `groupArray` сформируем массив из столбца `y`:
 
 ``` sql

From dd7b9f2387f47cfe603c3d6c852d1d8bd96b860f Mon Sep 17 00:00:00 2001
From: Denny Crane <deniszhuravlov@gmail.com>
Date: Sat, 21 Nov 2020 15:05:34 -0400
Subject: [PATCH 79/99] Update index.md

removed obsolete info about sum
---
 docs/en/sql-reference/aggregate-functions/index.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/en/sql-reference/aggregate-functions/index.md b/docs/en/sql-reference/aggregate-functions/index.md
index 270b7d8db39..543a5d3fed8 100644
--- a/docs/en/sql-reference/aggregate-functions/index.md
+++ b/docs/en/sql-reference/aggregate-functions/index.md
@@ -44,8 +44,6 @@ SELECT sum(y) FROM t_null_big
 └────────┘
 ```
 
-The `sum` function interprets `NULL` as `0`. In particular, this means that if the function receives input of a selection where all the values are `NULL`, then the result will be `0`, not `NULL`.
-
 Now you can use the `groupArray` function to create an array from the `y` column:
 
 ``` sql

From 33217c5b49a97e938b418b0fff95082411e7603c Mon Sep 17 00:00:00 2001
From: AnaUvarova <64017504+AnaUvarova@users.noreply.github.com>
Date: Sat, 21 Nov 2020 22:47:34 +0300
Subject: [PATCH 80/99] DOCSUP-1954 initialize aggregation description (#16793)

* Draft

* Draft+

* host fixes

* host fixes

* ++

* ++

* +++

* Edits, part 1: + parametres and clarification

* Edits

* Fix host

* Update docs/en/sql-reference/aggregate-functions/reference/initializeAggregation.md

Co-authored-by: BayoNet <da-daos@yandex.ru>

* nano-fixes and russian translation

* Final edits

Co-authored-by: BayoNet <da-daos@yandex.ru>
---
 .../reference/initializeAggregation.md        | 37 +++++++++++++++++
 .../reference/initializeAggregation.md        | 40 +++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 docs/en/sql-reference/aggregate-functions/reference/initializeAggregation.md
 create mode 100644 docs/ru/sql-reference/aggregate-functions/reference/initializeAggregation.md

diff --git a/docs/en/sql-reference/aggregate-functions/reference/initializeAggregation.md b/docs/en/sql-reference/aggregate-functions/reference/initializeAggregation.md
new file mode 100644
index 00000000000..ea44d5f1ddd
--- /dev/null
+++ b/docs/en/sql-reference/aggregate-functions/reference/initializeAggregation.md
@@ -0,0 +1,37 @@
+---
+toc_priority: 150
+---
+
+## initializeAggregation {#initializeaggregation}
+
+Initializes aggregation for your input rows. It is intended for the functions with the suffix `State`.
+Use it for tests or to process columns of types `AggregateFunction` and `AggregationgMergeTree`.
+
+**Syntax**
+
+``` sql
+initializeAggregation (aggregate_function, column_1, column_2);
+```
+
+**Parameters**
+
+-   `aggregate_function` — Name of the aggregation function. The state of this function — the creating one. [String](../../../sql-reference/data-types/string.md#string).
+-   `column_n` — The column to translate it into the function as it's argument. [String](../../../sql-reference/data-types/string.md#string).
+
+**Returned value(s)**
+
+Returns the result of the aggregation for your input rows. The return type will be the same as the return type of function, that `initializeAgregation` takes as first argument.
+For example for functions with the suffix `State` the return type will be `AggregateFunction`.
+
+**Example**
+
+Query:
+
+```sql
+SELECT uniqMerge(state) FROM (SELECT initializeAggregation('uniqState', number % 3) AS state FROM system.numbers LIMIT 10000);
+```
+Result:
+
+┌─uniqMerge(state)─┐
+│                3 │
+└──────────────────┘
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/initializeAggregation.md b/docs/ru/sql-reference/aggregate-functions/reference/initializeAggregation.md
new file mode 100644
index 00000000000..a2e3764193e
--- /dev/null
+++ b/docs/ru/sql-reference/aggregate-functions/reference/initializeAggregation.md
@@ -0,0 +1,40 @@
+---
+toc_priority: 150
+---
+
+## initializeAggregation {#initializeaggregation}
+
+Инициализирует агрегацию для введеных строчек. Предназначена для функций с суффиксом `State`.
+Поможет вам проводить тесты или работать со столбцами типов: `AggregateFunction` и `AggregationgMergeTree`.
+
+**Синтаксис**
+
+``` sql
+initializeAggregation (aggregate_function, column_1, column_2);
+```
+
+**Параметры**
+
+-   `aggregate_function` — название функции агрегации, состояние которой нужно создать. [String](../../../sql-reference/data-types/string.md#string).
+-   `column_n` — столбец, который передается в функцию агрегации как аргумент. [String](../../../sql-reference/data-types/string.md#string).
+
+**Возвращаемое значение**
+
+Возвращает результат агрегации введенной информации. Тип возвращаемого значения такой же, как и для функции, которая становится первым аргументом для `initializeAgregation`.
+
+Пример:
+
+Возвращаемый тип функций с суффиксом `State`  — `AggregateFunction`.
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT uniqMerge(state) FROM (SELECT initializeAggregation('uniqState', number % 3) AS state FROM system.numbers LIMIT 10000);
+```
+Результат:
+
+┌─uniqMerge(state)─┐
+│                3 │
+└──────────────────┘

From 276ba4223476a1fd3135b38615046b07e5275b1c Mon Sep 17 00:00:00 2001
From: olgarev <56617294+olgarev@users.noreply.github.com>
Date: Sat, 21 Nov 2020 23:06:29 +0300
Subject: [PATCH 81/99] DOCSUP-2864: Documented WITH ROLLUP and WITH CUBE
 sections of the SELECT query (#17094)

* Docs en,ru

* Explanation added

Co-authored-by: Olga Revyakina <revolg@yandex-team.ru>
---
 .../statements/select/group-by.md             | 150 +++++++++++++++++-
 .../sql-reference/statements/select/index.md  |   2 +-
 .../statements/select/group-by.md             | 147 +++++++++++++++++
 .../sql-reference/statements/select/index.md  |   2 +-
 4 files changed, 298 insertions(+), 3 deletions(-)

diff --git a/docs/en/sql-reference/statements/select/group-by.md b/docs/en/sql-reference/statements/select/group-by.md
index 3f5cd7d62f9..500a09dcbef 100644
--- a/docs/en/sql-reference/statements/select/group-by.md
+++ b/docs/en/sql-reference/statements/select/group-by.md
@@ -6,7 +6,7 @@ toc_title: GROUP BY
 
 `GROUP BY` clause switches the `SELECT` query into an aggregation mode, which works as follows:
 
--   `GROUP BY` clause contains a list of expressions (or a single expression, which is considered to be the list of length one). This list acts as a “grouping key”, while each individual expression will be referred to as a “key expressions”.
+-   `GROUP BY` clause contains a list of expressions (or a single expression, which is considered to be the list of length one). This list acts as a “grouping key”, while each individual expression will be referred to as a “key expression”.
 -   All the expressions in the [SELECT](../../../sql-reference/statements/select/index.md), [HAVING](../../../sql-reference/statements/select/having.md), and [ORDER BY](../../../sql-reference/statements/select/order-by.md) clauses **must** be calculated based on key expressions **or** on [aggregate functions](../../../sql-reference/aggregate-functions/index.md) over non-key expressions (including plain columns). In other words, each column selected from the table must be used either in a key expression or inside an aggregate function, but not both.
 -   Result of aggregating `SELECT` query will contain as many rows as there were unique values of “grouping key” in source table. Usually this signficantly reduces the row count, often by orders of magnitude, but not necessarily: row count stays the same if all “grouping key” values were distinct.
 
@@ -45,6 +45,154 @@ You can see that `GROUP BY` for `y = NULL` summed up `x`, as if `NULL` is this v
 
 If you pass several keys to `GROUP BY`, the result will give you all the combinations of the selection, as if `NULL` were a specific value.
 
+## WITH ROLLUP Modifier {#with-rollup-modifier}
+
+`WITH ROLLUP` modifier is used to calculate subtotals for the key expressions, based on their order in the `GROUP BY` list. The subtotals rows are added after the result table.
+
+The subtotals are calculated in the reverse order: at first subtotals are calculated for the last key expression in the list, then for the previous one, and so on up to the first key expression. 
+
+In the subtotals rows the values of already "grouped" key expressions are set to `0` or empty line.
+
+!!! note "Note"
+    Mind that [HAVING](../../../sql-reference/statements/select/having.md) clause can affect the subtotals results.
+
+**Example**    
+
+Consider the table t:
+
+```text
+┌─year─┬─month─┬─day─┐
+│ 2019 │     1 │   5 │
+│ 2019 │     1 │  15 │
+│ 2020 │     1 │   5 │
+│ 2020 │     1 │  15 │
+│ 2020 │    10 │   5 │
+│ 2020 │    10 │  15 │
+└──────┴───────┴─────┘
+```
+
+Query:
+
+```sql
+SELECT year, month, day, count(*) FROM t GROUP BY year, month, day WITH ROLLUP;
+```
+As `GROUP BY` section has three key expressions, the result contains four tables with subtotals "rolled up" from right to left:
+
+- `GROUP BY year, month, day`;
+- `GROUP BY year, month` (and `day` column is filled with zeros);
+- `GROUP BY year` (now `month, day` columns are both filled with zeros);
+- and totals (and all three key expression columns are zeros).
+
+```text
+┌─year─┬─month─┬─day─┬─count()─┐
+│ 2020 │    10 │  15 │       1 │
+│ 2020 │     1 │   5 │       1 │
+│ 2019 │     1 │   5 │       1 │
+│ 2020 │     1 │  15 │       1 │
+│ 2019 │     1 │  15 │       1 │
+│ 2020 │    10 │   5 │       1 │
+└──────┴───────┴─────┴─────────┘
+┌─year─┬─month─┬─day─┬─count()─┐
+│ 2019 │     1 │   0 │       2 │
+│ 2020 │     1 │   0 │       2 │
+│ 2020 │    10 │   0 │       2 │
+└──────┴───────┴─────┴─────────┘
+┌─year─┬─month─┬─day─┬─count()─┐
+│ 2019 │     0 │   0 │       2 │
+│ 2020 │     0 │   0 │       4 │
+└──────┴───────┴─────┴─────────┘
+┌─year─┬─month─┬─day─┬─count()─┐
+│    0 │     0 │   0 │       6 │
+└──────┴───────┴─────┴─────────┘
+```
+
+## WITH CUBE Modifier {#with-cube-modifier}
+
+`WITH CUBE` modifier is used to calculate subtotals for every combination of the key expressions in the `GROUP BY` list. The subtotals rows are added after the result table.
+
+In the subtotals rows the values of all "grouped" key expressions are set to `0` or empty line.
+
+!!! note "Note"
+    Mind that [HAVING](../../../sql-reference/statements/select/having.md) clause can affect the subtotals results.
+
+**Example**      
+
+Consider the table t:
+
+```text
+┌─year─┬─month─┬─day─┐
+│ 2019 │     1 │   5 │
+│ 2019 │     1 │  15 │
+│ 2020 │     1 │   5 │
+│ 2020 │     1 │  15 │
+│ 2020 │    10 │   5 │
+│ 2020 │    10 │  15 │
+└──────┴───────┴─────┘
+```
+
+Query:
+
+```sql
+SELECT year, month, day, count(*) FROM t GROUP BY year, month, day WITH CUBE;
+```
+
+As `GROUP BY` section has three key expressions, the result contains eight tables with subtotals for all key expression combinations:
+
+- `GROUP BY year, month, day`   
+- `GROUP BY year, month` 
+- `GROUP BY year, day`
+- `GROUP BY year` 
+- `GROUP BY month, day` 
+- `GROUP BY month` 
+- `GROUP BY day` 
+- and totals.
+
+Columns, excluded from `GROUP BY`, are filled with zeros.
+
+```text
+┌─year─┬─month─┬─day─┬─count()─┐
+│ 2020 │    10 │  15 │       1 │
+│ 2020 │     1 │   5 │       1 │
+│ 2019 │     1 │   5 │       1 │
+│ 2020 │     1 │  15 │       1 │
+│ 2019 │     1 │  15 │       1 │
+│ 2020 │    10 │   5 │       1 │
+└──────┴───────┴─────┴─────────┘
+┌─year─┬─month─┬─day─┬─count()─┐
+│ 2019 │     1 │   0 │       2 │
+│ 2020 │     1 │   0 │       2 │
+│ 2020 │    10 │   0 │       2 │
+└──────┴───────┴─────┴─────────┘
+┌─year─┬─month─┬─day─┬─count()─┐
+│ 2020 │     0 │   5 │       2 │
+│ 2019 │     0 │   5 │       1 │
+│ 2020 │     0 │  15 │       2 │
+│ 2019 │     0 │  15 │       1 │
+└──────┴───────┴─────┴─────────┘
+┌─year─┬─month─┬─day─┬─count()─┐
+│ 2019 │     0 │   0 │       2 │
+│ 2020 │     0 │   0 │       4 │
+└──────┴───────┴─────┴─────────┘
+┌─year─┬─month─┬─day─┬─count()─┐
+│    0 │     1 │   5 │       2 │
+│    0 │    10 │  15 │       1 │
+│    0 │    10 │   5 │       1 │
+│    0 │     1 │  15 │       2 │
+└──────┴───────┴─────┴─────────┘
+┌─year─┬─month─┬─day─┬─count()─┐
+│    0 │     1 │   0 │       4 │
+│    0 │    10 │   0 │       2 │
+└──────┴───────┴─────┴─────────┘
+┌─year─┬─month─┬─day─┬─count()─┐
+│    0 │     0 │   5 │       3 │
+│    0 │     0 │  15 │       3 │
+└──────┴───────┴─────┴─────────┘
+┌─year─┬─month─┬─day─┬─count()─┐
+│    0 │     0 │   0 │       6 │
+└──────┴───────┴─────┴─────────┘
+```
+
+
 ## WITH TOTALS Modifier {#with-totals-modifier}
 
 If the `WITH TOTALS` modifier is specified, another row will be calculated. This row will have key columns containing default values (zeros or empty lines), and columns of aggregate functions with the values calculated across all the rows (the “total” values).
diff --git a/docs/en/sql-reference/statements/select/index.md b/docs/en/sql-reference/statements/select/index.md
index 3107f791eb9..901b850fc46 100644
--- a/docs/en/sql-reference/statements/select/index.md
+++ b/docs/en/sql-reference/statements/select/index.md
@@ -20,7 +20,7 @@ SELECT [DISTINCT] expr_list
 [GLOBAL] [ANY|ALL|ASOF] [INNER|LEFT|RIGHT|FULL|CROSS] [OUTER|SEMI|ANTI] JOIN (subquery)|table (ON <expr_list>)|(USING <column_list>)
 [PREWHERE expr]
 [WHERE expr]
-[GROUP BY expr_list] [WITH TOTALS]
+[GROUP BY expr_list] [WITH ROLLUP|WITH CUBE] [WITH TOTALS]
 [HAVING expr]
 [ORDER BY expr_list] [WITH FILL] [FROM expr] [TO expr] [STEP expr]
 [LIMIT [offset_value, ]n BY columns]
diff --git a/docs/ru/sql-reference/statements/select/group-by.md b/docs/ru/sql-reference/statements/select/group-by.md
index 660f2aac88d..0c8a29d0c26 100644
--- a/docs/ru/sql-reference/statements/select/group-by.md
+++ b/docs/ru/sql-reference/statements/select/group-by.md
@@ -43,6 +43,153 @@ toc_title: GROUP BY
 
 Если в `GROUP BY` передать несколько ключей, то в результате мы получим все комбинации выборки, как если бы `NULL` был конкретным значением.
 
+## Модификатор WITH ROLLUP {#with-rollup-modifier}
+
+Модификатор `WITH ROLLUP` применяется для подсчета подытогов для ключевых выражений. При этом учитывается порядок следования ключевых выражений в списке `GROUP BY`. Подытоги подсчитываются в обратном порядке: сначала для последнего ключевого выражения в списке, потом для предпоследнего и так далее вплоть до самого первого ключевого выражения.
+
+Строки с подытогами добавляются в конец результирующей таблицы. В колонках, по которым строки уже сгруппированы, указывается значение `0` или пустая строка.
+
+!!! note "Примечание"
+    Если в запросе есть секция [HAVING](../../../sql-reference/statements/select/having.md), она может повлиять на результаты расчета подытогов.
+
+**Пример**    
+
+Рассмотрим таблицу t:
+
+```text
+┌─year─┬─month─┬─day─┐
+│ 2019 │     1 │   5 │
+│ 2019 │     1 │  15 │
+│ 2020 │     1 │   5 │
+│ 2020 │     1 │  15 │
+│ 2020 │    10 │   5 │
+│ 2020 │    10 │  15 │
+└──────┴───────┴─────┘
+```
+
+Запрос:
+
+```sql
+SELECT year, month, day, count(*) FROM t GROUP BY year, month, day WITH ROLLUP;
+```
+
+Поскольку секция `GROUP BY` содержит три ключевых выражения, результат состоит из четырех таблиц с подытогами, которые как бы "сворачиваются" справа налево:
+
+- `GROUP BY year, month, day`;
+- `GROUP BY year, month` (а колонка `day` заполнена нулями);
+- `GROUP BY year` (теперь обе колонки `month, day` заполнены нулями);
+- и общий итог (все три колонки с ключевыми выражениями заполнены нулями).
+
+```text
+┌─year─┬─month─┬─day─┬─count()─┐
+│ 2020 │    10 │  15 │       1 │
+│ 2020 │     1 │   5 │       1 │
+│ 2019 │     1 │   5 │       1 │
+│ 2020 │     1 │  15 │       1 │
+│ 2019 │     1 │  15 │       1 │
+│ 2020 │    10 │   5 │       1 │
+└──────┴───────┴─────┴─────────┘
+┌─year─┬─month─┬─day─┬─count()─┐
+│ 2019 │     1 │   0 │       2 │
+│ 2020 │     1 │   0 │       2 │
+│ 2020 │    10 │   0 │       2 │
+└──────┴───────┴─────┴─────────┘
+┌─year─┬─month─┬─day─┬─count()─┐
+│ 2019 │     0 │   0 │       2 │
+│ 2020 │     0 │   0 │       4 │
+└──────┴───────┴─────┴─────────┘
+┌─year─┬─month─┬─day─┬─count()─┐
+│    0 │     0 │   0 │       6 │
+└──────┴───────┴─────┴─────────┘
+```
+
+## Модификатор WITH CUBE {#with-cube-modifier}
+
+Модификатор `WITH CUBE` применятеся для расчета подытогов по всем комбинациям группировки ключевых выражений в списке `GROUP BY`. 
+
+Строки с подытогами добавляются в конец результирующей таблицы. В колонках, по которым выполняется группировка, указывается значение `0` или пустая строка.
+
+!!! note "Примечание"
+    Если в запросе есть секция [HAVING](../../../sql-reference/statements/select/having.md), она может повлиять на результаты расчета подытогов.
+
+**Пример**  
+
+Рассмотрим таблицу t:
+
+```text
+┌─year─┬─month─┬─day─┐
+│ 2019 │     1 │   5 │
+│ 2019 │     1 │  15 │
+│ 2020 │     1 │   5 │
+│ 2020 │     1 │  15 │
+│ 2020 │    10 │   5 │
+│ 2020 │    10 │  15 │
+└──────┴───────┴─────┘
+```
+
+Query:
+
+```sql
+SELECT year, month, day, count(*) FROM t GROUP BY year, month, day WITH CUBE;
+```
+
+Поскольку секция `GROUP BY` содержит три ключевых выражения, результат состоит из восьми таблиц с подытогами — по таблице для каждой комбинации ключевых выражений:
+
+- `GROUP BY year, month, day`   
+- `GROUP BY year, month` 
+- `GROUP BY year, day`
+- `GROUP BY year` 
+- `GROUP BY month, day` 
+- `GROUP BY month` 
+- `GROUP BY day` 
+- и общий итог.
+
+Колонки, которые не участвуют в `GROUP BY`, заполнены нулями.
+
+```text
+┌─year─┬─month─┬─day─┬─count()─┐
+│ 2020 │    10 │  15 │       1 │
+│ 2020 │     1 │   5 │       1 │
+│ 2019 │     1 │   5 │       1 │
+│ 2020 │     1 │  15 │       1 │
+│ 2019 │     1 │  15 │       1 │
+│ 2020 │    10 │   5 │       1 │
+└──────┴───────┴─────┴─────────┘
+┌─year─┬─month─┬─day─┬─count()─┐
+│ 2019 │     1 │   0 │       2 │
+│ 2020 │     1 │   0 │       2 │
+│ 2020 │    10 │   0 │       2 │
+└──────┴───────┴─────┴─────────┘
+┌─year─┬─month─┬─day─┬─count()─┐
+│ 2020 │     0 │   5 │       2 │
+│ 2019 │     0 │   5 │       1 │
+│ 2020 │     0 │  15 │       2 │
+│ 2019 │     0 │  15 │       1 │
+└──────┴───────┴─────┴─────────┘
+┌─year─┬─month─┬─day─┬─count()─┐
+│ 2019 │     0 │   0 │       2 │
+│ 2020 │     0 │   0 │       4 │
+└──────┴───────┴─────┴─────────┘
+┌─year─┬─month─┬─day─┬─count()─┐
+│    0 │     1 │   5 │       2 │
+│    0 │    10 │  15 │       1 │
+│    0 │    10 │   5 │       1 │
+│    0 │     1 │  15 │       2 │
+└──────┴───────┴─────┴─────────┘
+┌─year─┬─month─┬─day─┬─count()─┐
+│    0 │     1 │   0 │       4 │
+│    0 │    10 │   0 │       2 │
+└──────┴───────┴─────┴─────────┘
+┌─year─┬─month─┬─day─┬─count()─┐
+│    0 │     0 │   5 │       3 │
+│    0 │     0 │  15 │       3 │
+└──────┴───────┴─────┴─────────┘
+┌─year─┬─month─┬─day─┬─count()─┐
+│    0 │     0 │   0 │       6 │
+└──────┴───────┴─────┴─────────┘
+```
+
+
 ## Модификатор WITH TOTALS {#with-totals-modifier}
 
 Если указан модификатор `WITH TOTALS`, то будет посчитана ещё одна строчка, в которой в столбцах-ключах будут содержаться значения по умолчанию (нули, пустые строки), а в столбцах агрегатных функций - значения, посчитанные по всем строкам («тотальные» значения).
diff --git a/docs/ru/sql-reference/statements/select/index.md b/docs/ru/sql-reference/statements/select/index.md
index f5fe2788370..c2e05f05079 100644
--- a/docs/ru/sql-reference/statements/select/index.md
+++ b/docs/ru/sql-reference/statements/select/index.md
@@ -18,7 +18,7 @@ SELECT [DISTINCT] expr_list
 [GLOBAL] [ANY|ALL|ASOF] [INNER|LEFT|RIGHT|FULL|CROSS] [OUTER|SEMI|ANTI] JOIN (subquery)|table (ON <expr_list>)|(USING <column_list>)
 [PREWHERE expr]
 [WHERE expr]
-[GROUP BY expr_list] [WITH TOTALS]
+[GROUP BY expr_list] [WITH ROLLUP|WITH CUBE] [WITH TOTALS]
 [HAVING expr]
 [ORDER BY expr_list] [WITH FILL] [FROM expr] [TO expr] [STEP expr] 
 [LIMIT [offset_value, ]n BY columns]

From 1cdb447b77a34d32da67c5a94150d0c27a35da1b Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Sun, 22 Nov 2020 07:38:31 +0300
Subject: [PATCH 82/99] Update date-time-functions.md

---
 .../sql-reference/functions/date-time-functions.md  | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/docs/en/sql-reference/functions/date-time-functions.md b/docs/en/sql-reference/functions/date-time-functions.md
index 5f4d31225b8..63b356e27e6 100644
--- a/docs/en/sql-reference/functions/date-time-functions.md
+++ b/docs/en/sql-reference/functions/date-time-functions.md
@@ -535,18 +535,7 @@ dateDiff('unit', startdate, enddate, [timezone])
 
 -   `unit` — Time unit, in which the returned value is expressed. [String](../../sql-reference/syntax.md#syntax-string-literal).
 
-        Supported values:
-
-        | unit   |
-        | ---- |
-        |second  |
-        |minute  |
-        |hour    |
-        |day     |
-        |week    |
-        |month   |
-        |quarter |
-        |year    |
+        Supported values: second, minute, hour, day, week, month, quarter, year.
 
 -   `startdate` — The first time value to compare. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
 

From 6b2fa22000a7be9fed448a96d63dafeccf104212 Mon Sep 17 00:00:00 2001
From: zhang2014 <coswde@gmail.com>
Date: Thu, 5 Nov 2020 23:54:31 +0800
Subject: [PATCH 83/99] ISSUES-16605 try fix MySQL handler affected rows when
 insert select query

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

diff --git a/src/Server/MySQLHandler.cpp b/src/Server/MySQLHandler.cpp
index c88b9016e84..076a5d72125 100644
--- a/src/Server/MySQLHandler.cpp
+++ b/src/Server/MySQLHandler.cpp
@@ -328,6 +328,9 @@ void MySQLHandler::comQuery(ReadBuffer & payload)
 
         Context query_context = connection_context;
 
+        size_t affected_rows = 0;
+        query_context.setProgressCallback([&](const Progress & progress) { affected_rows += progress.written_rows; });
+
         executeQuery(should_replace ? replacement : payload, *out, true, query_context,
             [&with_output](const String &, const String &, const String &, const String &)
             {
@@ -336,7 +339,7 @@ void MySQLHandler::comQuery(ReadBuffer & payload)
         );
 
         if (!with_output)
-            packet_endpoint->sendPacket(OKPacket(0x00, client_capability_flags, 0, 0, 0), true);
+            packet_endpoint->sendPacket(OKPacket(0x00, client_capability_flags, affected_rows, 0, 0), true);
     }
 }
 

From a6dbba59324d79d6e50ca635b935c3f52858a6e3 Mon Sep 17 00:00:00 2001
From: zhang2014 <coswde@gmail.com>
Date: Fri, 6 Nov 2020 00:10:27 +0800
Subject: [PATCH 84/99] ISSUES-16605 add integration test

---
 tests/integration/test_mysql_protocol/test.py | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/tests/integration/test_mysql_protocol/test.py b/tests/integration/test_mysql_protocol/test.py
index 04cbef59af7..a8df0db05b7 100644
--- a/tests/integration/test_mysql_protocol/test.py
+++ b/tests/integration/test_mysql_protocol/test.py
@@ -154,6 +154,36 @@ def test_mysql_client_exception(mysql_client, server_address):
                             "ERROR 1000 (00000) at line 1: Poco::Exception. Code: 1000, e.code() = 2002, e.displayText() = mysqlxx::ConnectionFailed: Can't connect to MySQL server on '127.0.0.1' (115) ((nullptr):0)"
 
 
+def test_mysql_affected_rows(mysql_client, server_address):
+    code, (stdout, stderr) = mysql_client.exec_run('''
+        mysql --protocol tcp -h {host} -P {port} default -u default --password=123
+        -e "CREATE TABLE IF NOT EXISTS default.t1 (n UInt64) ENGINE MergeTree() ORDER BY tuple();"
+    '''.format(host=server_address, port=server_port), demux=True)
+    assert code == 0
+
+    code, (stdout, stderr) = mysql_client.exec_run('''
+        mysql -vvv --protocol tcp -h {host} -P {port} default -u default --password=123
+        -e "INSERT INTO default.t1(n) VALUES(1);"
+    '''.format(host=server_address, port=server_port), demux=True)
+
+    assert code == 0
+    assert "1 rows affected" in stdout
+
+    code, (stdout, stderr) = mysql_client.exec_run('''
+        mysql -vvv --protocol tcp -h {host} -P {port} default -u default --password=123
+        -e "INSERT INTO default.t1(n) SELECT * FROM numbers(1000)"
+    '''.format(host=server_address, port=server_port), demux=True)
+
+    assert code == 0
+    assert "1000 rows affected" in stdout
+
+    code, (stdout, stderr) = mysql_client.exec_run('''
+        mysql --protocol tcp -h {host} -P {port} default -u default --password=123
+        -e "DROP TABLE default.t1;"
+    '''.format(host=server_address, port=server_port), demux=True)
+    assert code == 0
+
+
 def test_mysql_replacement_query(mysql_client, server_address):
     # SHOW TABLE STATUS LIKE.
     code, (stdout, stderr) = mysql_client.exec_run('''

From 5b3154b2988d735d321c975646853180edf70f48 Mon Sep 17 00:00:00 2001
From: zhang2014 <coswde@gmail.com>
Date: Fri, 6 Nov 2020 09:54:33 +0800
Subject: [PATCH 85/99] ISSUES-16605 try fix integration test failure

---
 tests/integration/test_mysql_protocol/test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/integration/test_mysql_protocol/test.py b/tests/integration/test_mysql_protocol/test.py
index a8df0db05b7..8b4be51191f 100644
--- a/tests/integration/test_mysql_protocol/test.py
+++ b/tests/integration/test_mysql_protocol/test.py
@@ -167,7 +167,7 @@ def test_mysql_affected_rows(mysql_client, server_address):
     '''.format(host=server_address, port=server_port), demux=True)
 
     assert code == 0
-    assert "1 rows affected" in stdout
+    assert "1 rows affected" in stdout.decode()
 
     code, (stdout, stderr) = mysql_client.exec_run('''
         mysql -vvv --protocol tcp -h {host} -P {port} default -u default --password=123
@@ -175,7 +175,7 @@ def test_mysql_affected_rows(mysql_client, server_address):
     '''.format(host=server_address, port=server_port), demux=True)
 
     assert code == 0
-    assert "1000 rows affected" in stdout
+    assert "1000 rows affected" in stdout.decode()
 
     code, (stdout, stderr) = mysql_client.exec_run('''
         mysql --protocol tcp -h {host} -P {port} default -u default --password=123

From e1e5eede869d281d96b3046b43315d6660728807 Mon Sep 17 00:00:00 2001
From: zhang2014 <coswde@gmail.com>
Date: Fri, 6 Nov 2020 18:28:37 +0800
Subject: [PATCH 86/99] ISSUES-16605 try fix integration failure

---
 tests/integration/test_mysql_protocol/test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/test_mysql_protocol/test.py b/tests/integration/test_mysql_protocol/test.py
index 8b4be51191f..e2f787f9ee3 100644
--- a/tests/integration/test_mysql_protocol/test.py
+++ b/tests/integration/test_mysql_protocol/test.py
@@ -167,7 +167,7 @@ def test_mysql_affected_rows(mysql_client, server_address):
     '''.format(host=server_address, port=server_port), demux=True)
 
     assert code == 0
-    assert "1 rows affected" in stdout.decode()
+    assert "1 row affected" in stdout.decode()
 
     code, (stdout, stderr) = mysql_client.exec_run('''
         mysql -vvv --protocol tcp -h {host} -P {port} default -u default --password=123

From 0985029f49e2614b548990ae261a67297c902df8 Mon Sep 17 00:00:00 2001
From: zhang2014 <coswde@gmail.com>
Date: Wed, 11 Nov 2020 20:46:43 +0800
Subject: [PATCH 87/99] trigger CI


From ade04b5dc462b807a9d1496c213ef6cb404b7049 Mon Sep 17 00:00:00 2001
From: zhang2014 <coswde@gmail.com>
Date: Sun, 22 Nov 2020 20:42:55 +0800
Subject: [PATCH 88/99] ISSUES-16605 try fix review comment

---
 src/Server/MySQLHandler.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Server/MySQLHandler.cpp b/src/Server/MySQLHandler.cpp
index 076a5d72125..957930ad43b 100644
--- a/src/Server/MySQLHandler.cpp
+++ b/src/Server/MySQLHandler.cpp
@@ -328,8 +328,15 @@ void MySQLHandler::comQuery(ReadBuffer & payload)
 
         Context query_context = connection_context;
 
-        size_t affected_rows = 0;
-        query_context.setProgressCallback([&](const Progress & progress) { affected_rows += progress.written_rows; });
+        std::atomic<size_t> affected_rows {0};
+        auto prev = query_context.getProgressCallback();
+        query_context.setProgressCallback([&, prev = prev](const Progress & progress)
+        {
+            if (prev)
+                prev(progress);
+
+            affected_rows += progress.written_rows;
+        });
 
         executeQuery(should_replace ? replacement : payload, *out, true, query_context,
             [&with_output](const String &, const String &, const String &, const String &)

From 1a073f700fa6cd6fb3f7344ae41eca9345f1f21c Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Mon, 23 Nov 2020 05:44:42 +0300
Subject: [PATCH 89/99] Fix exception message

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

diff --git a/src/AggregateFunctions/AggregateFunctionGroupArrayInsertAt.h b/src/AggregateFunctions/AggregateFunctionGroupArrayInsertAt.h
index d84c99aec57..6a5f2fbc899 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArrayInsertAt.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupArrayInsertAt.h
@@ -80,7 +80,7 @@ public:
         }
 
         if (!isUnsignedInteger(arguments[1]))
-            throw Exception("Second argument of aggregate function " + getName() + " must be integer.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            throw Exception("Second argument of aggregate function " + getName() + " must be unsigned integer.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
         if (default_value.isNull())
             default_value = type->getDefault();

From 8bf02ee5bb1ed3489ef587a75c035f2f20ec139b Mon Sep 17 00:00:00 2001
From: Y Lu <1838324+drag0nglass@users.noreply.github.com>
Date: Mon, 23 Nov 2020 14:10:36 +0800
Subject: [PATCH 90/99] Update bitmap-functions.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Inappropriate wording in Chinese. Even '罗林位图'(direct transliteration) is better than '呻吟声'(means sound of moaning).
As for the Roaring Bitmap is a well-known novel approach in the context of data structure that outperforms the other conventional compression bitmaps (by the year 2018), it can be kept as is.
---
 docs/zh/sql-reference/functions/bitmap-functions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/sql-reference/functions/bitmap-functions.md b/docs/zh/sql-reference/functions/bitmap-functions.md
index d2018f5d9c1..5a6baf2f217 100644
--- a/docs/zh/sql-reference/functions/bitmap-functions.md
+++ b/docs/zh/sql-reference/functions/bitmap-functions.md
@@ -6,7 +6,7 @@
 
 我们使用RoaringBitmap实际存储位图对象，当基数小于或等于32时，它使用Set保存。当基数大于32时，它使用RoaringBitmap保存。这也是为什么低基数集的存储更快的原因。
 
-有关RoaringBitmap的更多信息，请参阅：[呻吟声](https://github.com/RoaringBitmap/CRoaring)。
+有关RoaringBitmap的更多信息，请参阅：[RoaringBitmap](https://github.com/RoaringBitmap/CRoaring)。
 
 ## bitmapBuild {#bitmapbuild}
 

From 2c982b4ccf71823b82a3924234a4687543234b75 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Mon, 23 Nov 2020 09:35:08 +0300
Subject: [PATCH 91/99] Fix race condition; history and sharing capabilities

---
 programs/server/play.html | 92 ++++++++++++++++++++++++++++-----------
 1 file changed, 66 insertions(+), 26 deletions(-)

diff --git a/programs/server/play.html b/programs/server/play.html
index 22eea0002ca..eabeb6b71ad 100644
--- a/programs/server/play.html
+++ b/programs/server/play.html
@@ -30,17 +30,6 @@
     It can be done in background, e.g. wait 100 ms after address/credentials change and do the check.
     Also it can provide visual indication that credentials are correct.
 
-    3. Add history in localstorage. Integrate with history API.
-    There can be a counter in localstorage, that will be appended to location #fragment.
-    The 'back', 'forward' buttons in browser should work.
-    Also there should be UI element to list all the queries from history and select from the list.
-
-    4. Trivial sharing capabilities.
-    Sharing is only possible when system.query_log is accessible. Read the X-ClickHouse-QueryId from the response.
-    Share button will: - emit SYSTEM FLUSH LOGS if not readonly; - find the query in the query_log;
-    - generate an URL with the query id and: server address if not equal to the URL's host; user name if not default;
-    indication that password should be entered in case of non-empty password.
-
     -->
 
     <style type="text/css">
@@ -299,14 +288,21 @@
 
 <script type="text/javascript">
 
+    /// Incremental request number. When response is received,
+    /// if it's request number does not equal to the current request number, response will be ignored.
+    /// This is to avoid race conditions.
+    var request_num = 0;
+
+    /// Save query in history only if it is different.
+    var previous_query = '';
+
     /// Substitute the address of the server where the page is served.
     if (location.protocol != 'file:') {
         document.getElementById('url').value = location.origin;
     }
 
-    function post()
+    function postImpl(posted_request_num, query)
     {
-        /// TODO: Avoid race condition on subsequent requests when responses may come out of order.
         /// TODO: Check if URL already contains query string (append parameters).
 
         var url = document.getElementById('url').value +
@@ -318,7 +314,6 @@
             /// Safety settings to prevent results that browser cannot display.
             '&max_result_rows=1000&max_result_bytes=10000000&result_overflow_mode=break';
 
-        var query = document.getElementById('query').value;
         var xhr = new XMLHttpRequest;
 
         xhr.open('POST', url, true);
@@ -326,18 +321,25 @@
 
         xhr.onreadystatechange = function()
         {
-            if (this.readyState === XMLHttpRequest.DONE) {
-                if (this.status === 200) {
-                    var json;
-                    try { json = JSON.parse(this.response); } catch (e) {}
-                    if (json !== undefined && json.statistics !== undefined) {
-                        renderResult(json);
-                    } else {
-                        renderUnparsedResult(this.response);
-                    }
-                } else {
-                    /// TODO: Proper rendering of network errors.
-                    renderError(this.response);
+            if (posted_request_num != request_num) {
+                return;
+            } else if (this.readyState === XMLHttpRequest.DONE) {
+                renderResponse(this.status, this.response);
+
+                /// The query is saved in browser history (in state JSON object)
+                /// as well as in URL fragment identifier.
+                if (query != previous_query) {
+                    previous_query = query;
+                    var title = "ClickHouse Query: " + query;
+                    history.pushState(
+                        {
+                            query: query,
+                            status: this.status,
+                            response: this.response.length > 100000 ? null : this.response  /// Lower than the browser's limit.
+                        },
+                        title,
+                        window.location.pathname + '#' + window.btoa(query));
+                    document.title = title;
                 }
             } else {
                 //console.log(this);
@@ -345,6 +347,44 @@
         }
     }
 
+    function renderResponse(status, response) {
+        if (status === 200) {
+            var json;
+            try { json = JSON.parse(response); } catch (e) {}
+            if (json !== undefined && json.statistics !== undefined) {
+                renderResult(json);
+            } else {
+                renderUnparsedResult(response);
+            }
+        } else {
+            /// TODO: Proper rendering of network errors.
+            renderError(response);
+        }
+    }
+
+    window.onpopstate = function(event) {
+        if (!event.state) {
+            return;
+        }
+        document.getElementById('query').value = event.state.query;
+        if (!event.state.response) {
+            clear();
+            return;
+        }
+        renderResponse(event.state.status, event.state.response);
+    };
+
+    if (window.location.hash) {
+        document.getElementById('query').value = window.atob(window.location.hash.substr(1));
+    }
+
+    function post()
+    {
+        ++request_num;
+        var query = document.getElementById('query').value;
+        postImpl(request_num, query);
+    }
+
     document.getElementById('run').onclick = function()
     {
         post();

From 5058c56ecf40c4ad60833b9d638ee5e94f32e13d Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Mon, 23 Nov 2020 10:15:33 +0300
Subject: [PATCH 92/99] Add favicon; add loading indicator

---
 programs/server/play.html | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/programs/server/play.html b/programs/server/play.html
index eabeb6b71ad..f7f9190884c 100644
--- a/programs/server/play.html
+++ b/programs/server/play.html
@@ -1,6 +1,7 @@
 <html> <!-- TODO If I write DOCTYPE HTML something changes but I don't know what. -->
 <head>
     <meta charset="UTF-8">
+    <link rel="icon" href="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI1NCIgaGVpZ2h0PSI0OCIgdmlld0JveD0iMCAwIDkgOCI+PHN0eWxlPi5ve2ZpbGw6I2ZjMH0ucntmaWxsOnJlZH08L3N0eWxlPjxwYXRoIGQ9Ik0wLDcgaDEgdjEgaC0xIHoiIGNsYXNzPSJyIi8+PHBhdGggZD0iTTAsMCBoMSB2NyBoLTEgeiIgY2xhc3M9Im8iLz48cGF0aCBkPSJNMiwwIGgxIHY4IGgtMSB6IiBjbGFzcz0ibyIvPjxwYXRoIGQ9Ik00LDAgaDEgdjggaC0xIHoiIGNsYXNzPSJvIi8+PHBhdGggZD0iTTYsMCBoMSB2OCBoLTEgeiIgY2xhc3M9Im8iLz48cGF0aCBkPSJNOCwzLjI1IGgxIHYxLjUgaC0xIHoiIGNsYXNzPSJvIi8+PC9zdmc+">
     <title>ClickHouse Query</title>
 
     <!-- Code Style:
@@ -262,6 +263,22 @@
         {
             color: var(--null-color);
         }
+
+        #hourglass
+        {
+            display: none;
+            padding-left: 1rem;
+            font-size: 110%;
+            color: #888;
+        }
+
+        #check-mark
+        {
+            display: none;
+            padding-left: 1rem;
+            font-size: 110%;
+            color: #080;
+        }
     </style>
 </head>
 
@@ -275,6 +292,8 @@
     <div id="run_div">
         <button class="shadow" id="run">Run</button>
         <span class="hint">&nbsp;(Ctrl+Enter)</span>
+        <span id="hourglass">⧗</span>
+        <span id="check-mark">✔</span>
         <span id="stats"></span>
         <span id="toggle-dark">🌑</span><span id="toggle-light">🌞</span>
     </div>
@@ -319,6 +338,9 @@
         xhr.open('POST', url, true);
         xhr.send(query);
 
+        document.getElementById('check-mark').style.display = 'none';
+        document.getElementById('hourglass').style.display = 'inline';
+
         xhr.onreadystatechange = function()
         {
             if (posted_request_num != request_num) {
@@ -348,6 +370,8 @@
     }
 
     function renderResponse(status, response) {
+        document.getElementById('hourglass').style.display = 'none';
+
         if (status === 200) {
             var json;
             try { json = JSON.parse(response); } catch (e) {}
@@ -356,6 +380,7 @@
             } else {
                 renderUnparsedResult(response);
             }
+            document.getElementById('check-mark').style.display = 'inline';
         } else {
             /// TODO: Proper rendering of network errors.
             renderError(response);
@@ -390,7 +415,7 @@
         post();
     }
 
-    document.getElementById('query').onkeypress = function(event)
+    document.onkeypress = function(event)
     {
         /// Firefox has code 13 for Enter and Chromium has code 10.
         if (event.ctrlKey && (event.charCode == 13 || event.charCode == 10)) {
@@ -412,6 +437,9 @@
         document.getElementById('error').style.display = 'none';
 
         document.getElementById('stats').innerText = '';
+
+        document.getElementById('hourglass').style.display = 'none';
+        document.getElementById('check-mark').style.display = 'none';
     }
 
     function renderResult(response)

From f3e567b4b4d6602949e1969c8c65eb25a5e90c7f Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Mon, 23 Nov 2020 10:15:52 +0300
Subject: [PATCH 93/99] Update roadmap

---
 programs/server/play.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/programs/server/play.html b/programs/server/play.html
index f7f9190884c..d78a60ff83b 100644
--- a/programs/server/play.html
+++ b/programs/server/play.html
@@ -22,11 +22,7 @@
 
     <!-- Development Roadmap:
 
-    1. Add indication that the query was sent and when the query has been finished.
-    Do not use any animated spinners. Just a text or check mark.
-    Eliminate race conditions (results from the previous query should be ignored on arrival, the previous request should be cancelled).
-
-    2. Support readonly servers.
+    1. Support readonly servers.
     Check if readonly = 1 (with SELECT FROM system.settings) to avoid sending settings. It can be done once on address/credentials change.
     It can be done in background, e.g. wait 100 ms after address/credentials change and do the check.
     Also it can provide visual indication that credentials are correct.

From 67e9901cda042b9b7aa9055813bba0738998efb5 Mon Sep 17 00:00:00 2001
From: robot-clickhouse <robot-clickhouse@yandex-team.ru>
Date: Mon, 23 Nov 2020 10:26:45 +0300
Subject: [PATCH 94/99] Auto version update to [20.12.1.5236] [54443]

---
 cmake/autogenerated_versions.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/autogenerated_versions.txt b/cmake/autogenerated_versions.txt
index 0e65568f185..dab60ae2b1e 100644
--- a/cmake/autogenerated_versions.txt
+++ b/cmake/autogenerated_versions.txt
@@ -3,7 +3,7 @@ SET(VERSION_REVISION 54443)
 SET(VERSION_MAJOR 20)
 SET(VERSION_MINOR 12)
 SET(VERSION_PATCH 1)
-SET(VERSION_GITHASH c53725fb1f846fda074347607ab582fbb9c6f7a1)
-SET(VERSION_DESCRIBE v20.12.1.1-prestable)
-SET(VERSION_STRING 20.12.1.1)
+SET(VERSION_GITHASH e581f9ccfc5c64867b0f488cce72412fd2966471)
+SET(VERSION_DESCRIBE v20.12.1.5236-prestable)
+SET(VERSION_STRING 20.12.1.5236)
 # end of autochange

From dc19fba36f6fea661a8a532aa3a22484b5ac2e9a Mon Sep 17 00:00:00 2001
From: robot-clickhouse <robot-clickhouse@yandex-team.ru>
Date: Mon, 23 Nov 2020 10:29:26 +0300
Subject: [PATCH 95/99] Auto version update to [20.13.1.1] [54444]

---
 cmake/autogenerated_versions.txt                   |  8 ++++----
 debian/changelog                                   |  4 ++--
 docker/client/Dockerfile                           |  2 +-
 docker/server/Dockerfile                           |  2 +-
 docker/test/Dockerfile                             |  2 +-
 .../System/StorageSystemContributors.generated.cpp | 14 ++++++++++++++
 6 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/cmake/autogenerated_versions.txt b/cmake/autogenerated_versions.txt
index dab60ae2b1e..87a30c9effc 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 54443)
+SET(VERSION_REVISION 54444)
 SET(VERSION_MAJOR 20)
-SET(VERSION_MINOR 12)
+SET(VERSION_MINOR 13)
 SET(VERSION_PATCH 1)
 SET(VERSION_GITHASH e581f9ccfc5c64867b0f488cce72412fd2966471)
-SET(VERSION_DESCRIBE v20.12.1.5236-prestable)
-SET(VERSION_STRING 20.12.1.5236)
+SET(VERSION_DESCRIBE v20.13.1.1-prestable)
+SET(VERSION_STRING 20.13.1.1)
 # end of autochange
diff --git a/debian/changelog b/debian/changelog
index 3da82efd47e..5ea6b472e46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-clickhouse (20.12.1.1) unstable; urgency=low
+clickhouse (20.13.1.1) unstable; urgency=low
 
   * Modified source code
 
- -- clickhouse-release <clickhouse-release@yandex-team.ru>  Thu, 05 Nov 2020 21:52:47 +0300
+ -- clickhouse-release <clickhouse-release@yandex-team.ru>  Mon, 23 Nov 2020 10:29:24 +0300
diff --git a/docker/client/Dockerfile b/docker/client/Dockerfile
index 2223b942429..3ef6b8c8b32 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=20.12.1.*
+ARG version=20.13.1.*
 
 RUN apt-get update \
     && apt-get install --yes --no-install-recommends \
diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile
index 1ce6e427409..f7e107a2fc9 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=20.12.1.*
+ARG version=20.13.1.*
 ARG gosu_ver=1.10
 
 RUN apt-get update \
diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile
index cd2bead5616..8e3b5193874 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=20.12.1.*
+ARG version=20.13.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 1540a43716f..39dc74822e0 100644
--- a/src/Storages/System/StorageSystemContributors.generated.cpp
+++ b/src/Storages/System/StorageSystemContributors.generated.cpp
@@ -93,6 +93,7 @@ const char * auto_contributors[] {
     "Anton Zhabolenko",
     "Ariel Robaldo",
     "Arsen Hakobyan",
+    "ArtCorp",
     "Artem Andreenko",
     "Artem Gavrilov",
     "Artem Hnilov",
@@ -104,6 +105,7 @@ const char * auto_contributors[] {
     "Arthur Petukhovsky",
     "Arthur Tokarchuk",
     "Arthur Wong",
+    "Artur",
     "Artur Beglaryan",
     "AsiaKorushkina",
     "Atri Sharma",
@@ -259,6 +261,7 @@ const char * auto_contributors[] {
     "Jochen Schalanda",
     "John",
     "Jonatas Freitas",
+    "Kang Liu",
     "Karl Pietrzak",
     "Keiji Yoshida",
     "Kiran",
@@ -353,6 +356,7 @@ const char * auto_contributors[] {
     "NeZeD [Mac Pro]",
     "Neeke Gao",
     "Nico Mandery",
+    "Nico Piderman",
     "Nicolae Vartolomei",
     "Nik",
     "Nikhil Raman",
@@ -379,7 +383,9 @@ const char * auto_contributors[] {
     "Olga Revyakina",
     "Orivej Desh",
     "Oskar Wojciski",
+    "OuO",
     "Paramtamtam",
+    "Patrick Zippenfenig",
     "Pavel",
     "Pavel Kartaviy",
     "Pavel Kartavyy",
@@ -461,6 +467,7 @@ const char * auto_contributors[] {
     "Tsarkova Anastasia",
     "Ubuntu",
     "Ubus",
+    "V",
     "VDimir",
     "Vadim",
     "Vadim Plakhtinskiy",
@@ -527,6 +534,7 @@ const char * auto_contributors[] {
     "Yury Stankevich",
     "Zhichang Yu",
     "Zhipeng",
+    "a.palagashvili",
     "abdrakhmanov",
     "abyss7",
     "achimbab",
@@ -546,6 +554,7 @@ const char * auto_contributors[] {
     "ana-uvarova",
     "andrei-karpliuk",
     "andrewsg",
+    "annvsh",
     "anrodigina",
     "antikvist",
     "anton",
@@ -613,8 +622,10 @@ const char * auto_contributors[] {
     "ggerogery",
     "giordyb",
     "glockbender",
+    "gyuton",
     "hao.he",
     "hcz",
+    "heng zhao",
     "hexiaoting",
     "hotid",
     "hustnn",
@@ -694,6 +705,7 @@ const char * auto_contributors[] {
     "pufit",
     "pyos",
     "qianlixiang",
+    "qianmoQ",
     "quid",
     "r1j1k",
     "rainbowsysu",
@@ -716,6 +728,7 @@ const char * auto_contributors[] {
     "spyros87",
     "stavrolia",
     "stepenhu",
+    "su-houzhen",
     "sundy",
     "sundy-li",
     "sundyli",
@@ -727,6 +740,7 @@ const char * auto_contributors[] {
     "tavplubix",
     "topvisor",
     "tyrionhuang",
+    "ubuntu",
     "unegare",
     "unknown",
     "urgordeadbeef",

From 56651a94c4e6b5d6e56774927fc016843f20a635 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Mon, 23 Nov 2020 10:52:33 +0300
Subject: [PATCH 96/99] Slightly more correct

---
 programs/server/play.html | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/programs/server/play.html b/programs/server/play.html
index d78a60ff83b..6fcf5e76c11 100644
--- a/programs/server/play.html
+++ b/programs/server/play.html
@@ -332,10 +332,6 @@
         var xhr = new XMLHttpRequest;
 
         xhr.open('POST', url, true);
-        xhr.send(query);
-
-        document.getElementById('check-mark').style.display = 'none';
-        document.getElementById('hourglass').style.display = 'inline';
 
         xhr.onreadystatechange = function()
         {
@@ -363,6 +359,11 @@
                 //console.log(this);
             }
         }
+
+        document.getElementById('check-mark').style.display = 'none';
+        document.getElementById('hourglass').style.display = 'inline';
+
+        xhr.send(query);
     }
 
     function renderResponse(status, response) {
@@ -507,7 +508,7 @@
     function renderError(response)
     {
         clear();
-        document.getElementById('error').innerText = response;
+        document.getElementById('error').innerText = response ? response : "No response.";
         document.getElementById('error').style.display = 'block';
     }
 

From fdc11cb739f2ebcaf89db21bde57b9ecbb407388 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Mon, 23 Nov 2020 11:05:13 +0300
Subject: [PATCH 97/99] Minor improvements

---
 programs/server/play.html | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/programs/server/play.html b/programs/server/play.html
index 6fcf5e76c11..37869228c04 100644
--- a/programs/server/play.html
+++ b/programs/server/play.html
@@ -316,15 +316,24 @@
         document.getElementById('url').value = location.origin;
     }
 
+    /// Substitute user name if it's specified in the query string
+    var user_from_url = (new URL(window.location)).searchParams.get('user');
+    if (user_from_url) {
+        document.getElementById('user').value = user_from_url;
+    }
+
     function postImpl(posted_request_num, query)
     {
         /// TODO: Check if URL already contains query string (append parameters).
 
+        var user = document.getElementById('user').value;
+        var password = document.getElementById('password').value;
+
         var url = document.getElementById('url').value +
             /// Ask server to allow cross-domain requests.
             '?add_http_cors_header=1' +
-            '&user=' + encodeURIComponent(document.getElementById('user').value) +
-            '&password=' + encodeURIComponent(document.getElementById('password').value) +
+            '&user=' + encodeURIComponent(user) +
+            '&password=' + encodeURIComponent(password) +
             '&default_format=JSONCompact' +
             /// Safety settings to prevent results that browser cannot display.
             '&max_result_rows=1000&max_result_bytes=10000000&result_overflow_mode=break';
@@ -352,7 +361,7 @@
                             response: this.response.length > 100000 ? null : this.response  /// Lower than the browser's limit.
                         },
                         title,
-                        window.location.pathname + '#' + window.btoa(query));
+                        window.location.pathname + '?user=' + encodeURIComponent(user) + '#' + window.btoa(query));
                     document.title = title;
                 }
             } else {

From d423ce34a118457153fae274c37c96a82d1eaf79 Mon Sep 17 00:00:00 2001
From: damozhaeva <68770561+damozhaeva@users.noreply.github.com>
Date: Mon, 23 Nov 2020 14:52:09 +0300
Subject: [PATCH 98/99] DOCSUP-3584 edit and translate (#17176)

* Edit and translate.

* Update docs/ru/operations/utilities/clickhouse-obfuscator.md

Co-authored-by: BayoNet <da-daos@yandex.ru>

* Update docs/ru/operations/utilities/clickhouse-obfuscator.md

Co-authored-by: BayoNet <da-daos@yandex.ru>

* Update docs/ru/operations/utilities/clickhouse-obfuscator.md

Co-authored-by: BayoNet <da-daos@yandex.ru>

* Update docs/ru/operations/utilities/clickhouse-obfuscator.md

Co-authored-by: BayoNet <da-daos@yandex.ru>

* Update docs/ru/operations/utilities/clickhouse-obfuscator.md

Co-authored-by: BayoNet <da-daos@yandex.ru>

* Update docs/ru/operations/utilities/clickhouse-obfuscator.md

Co-authored-by: BayoNet <da-daos@yandex.ru>

* Update docs/ru/operations/utilities/clickhouse-obfuscator.md

Co-authored-by: BayoNet <da-daos@yandex.ru>

* Update docs/en/operations/utilities/clickhouse-obfuscator.md

Co-authored-by: BayoNet <da-daos@yandex.ru>

* Update docs/en/operations/utilities/clickhouse-obfuscator.md

Co-authored-by: BayoNet <da-daos@yandex.ru>

* Update docs/en/operations/utilities/clickhouse-obfuscator.md

Co-authored-by: BayoNet <da-daos@yandex.ru>

* Update docs/ru/operations/utilities/clickhouse-obfuscator.md

Co-authored-by: BayoNet <da-daos@yandex.ru>

* Update docs/en/operations/utilities/clickhouse-obfuscator.md

Co-authored-by: BayoNet <da-daos@yandex.ru>

Co-authored-by: Daria Mozhaeva <dmozhaeva@yandex-team.ru>
Co-authored-by: BayoNet <da-daos@yandex.ru>
---
 .../utilities/clickhouse-obfuscator.md        | 84 +++++++++----------
 .../utilities/clickhouse-obfuscator.md        | 43 ++++++++++
 2 files changed, 85 insertions(+), 42 deletions(-)
 create mode 100644 docs/ru/operations/utilities/clickhouse-obfuscator.md

diff --git a/docs/en/operations/utilities/clickhouse-obfuscator.md b/docs/en/operations/utilities/clickhouse-obfuscator.md
index 8a2ea1eecf6..7fd608fcac0 100644
--- a/docs/en/operations/utilities/clickhouse-obfuscator.md
+++ b/docs/en/operations/utilities/clickhouse-obfuscator.md
@@ -1,42 +1,42 @@
-# ClickHouse obfuscator
-
-Simple tool for table data obfuscation.
-
-It reads input table and produces output table, that retain some properties of input, but contains different data.
-It allows to publish almost real production data for usage in benchmarks.
-
-It is designed to retain the following properties of data:
-- cardinalities of values (number of distinct values) for every column and for every tuple of columns;
-- conditional cardinalities: number of distinct values of one column under condition on value of another column;
-- probability distributions of absolute value of integers; sign of signed integers; exponent and sign for floats;
-- probability distributions of length of strings;
-- probability of zero values of numbers; empty strings and arrays, NULLs;
-- data compression ratio when compressed with LZ77 and entropy family of codecs;
-- continuity (magnitude of difference) of time values across table; continuity of floating point values.
-- date component of DateTime values;
-- UTF-8 validity of string values;
-- string values continue to look somewhat natural.
-
-Most of the properties above are viable for performance testing:
-
-reading data, filtering, aggregation and sorting will work at almost the same speed
-as on original data due to saved cardinalities, magnitudes, compression ratios, etc.
-
-It works in deterministic fashion: you define a seed value and transform is totally determined by input data and by seed.
-Some transforms are one to one and could be reversed, so you need to have large enough seed and keep it in secret.
-
-It use some cryptographic primitives to transform data, but from the cryptographic point of view,
-It doesn't do anything properly and you should never consider the result as secure, unless you have other reasons for it.
-
-It may retain some data you don't want to publish.
-
-It always leave numbers 0, 1, -1 as is. Also it leaves dates, lengths of arrays and null flags exactly as in source data.
-For example, you have a column IsMobile in your table with values 0 and 1. In transformed data, it will have the same value.
-So, the user will be able to count exact ratio of mobile traffic.
-
-Another example, suppose you have some private data in your table, like user email and you don't want to publish any single email address.
-If your table is large enough and contain multiple different emails and there is no email that have very high frequency than all others,
-It will perfectly anonymize all data. But if you have small amount of different values in a column, it can possibly reproduce some of them.
-And you should take care and look at exact algorithm, how this tool works, and probably fine tune some of it command line parameters.
-
-This tool works fine only with reasonable amount of data (at least 1000s of rows).
+# ClickHouse obfuscator
+
+A simple tool for table data obfuscation.
+
+It reads an input table and produces an output table, that retains some properties of input, but contains different data.
+It allows publishing almost real production data for usage in benchmarks.
+
+It is designed to retain the following properties of data:
+- cardinalities of values (number of distinct values) for every column and every tuple of columns;
+- conditional cardinalities: number of distinct values of one column under the condition on the value of another column;
+- probability distributions of the absolute value of integers; the sign of signed integers; exponent and sign for floats;
+- probability distributions of the length of strings;
+- probability of zero values of numbers; empty strings and arrays, `NULL`s;
+
+- data compression ratio when compressed with LZ77 and entropy family of codecs;
+- continuity (magnitude of difference) of time values across the table; continuity of floating-point values;
+- date component of `DateTime` values;
+
+- UTF-8 validity of string values;
+- string values look natural.
+
+Most of the properties above are viable for performance testing:
+
+reading data, filtering, aggregatio, and sorting will work at almost the same speed
+as on original data due to saved cardinalities, magnitudes, compression ratios, etc.
+
+It works in a deterministic fashion: you define a seed value and the transformation is determined by input data and by seed.
+Some transformations are one to one and could be reversed, so you need to have a large seed and keep it in secret.
+
+It uses some cryptographic primitives to transform data but from the cryptographic point of view, it doesn't do it properly, that is why you should not consider the result as secure unless you have another reason. The result may retain some data you don't want to publish.
+
+
+It always leaves 0, 1, -1 numbers, dates, lengths of arrays, and null flags exactly as in source data.
+For example, you have a column `IsMobile` in your table with values 0 and 1. In transformed data, it will have the same value.
+
+So, the user will be able to count the exact ratio of mobile traffic.
+
+Let's give another example. When you have some private data in your table, like user email and you don't want to publish any single email address.
+If your table is large enough and contains multiple different emails and no email has a very high frequency than all others, it will anonymize all data. But if you have a small number of different values in a column, it can reproduce some of them.
+You should look at the working algorithm of this tool works, and fine-tune its command line parameters.
+
+This tool works fine only with an average amount of data (at least 1000s of rows).
diff --git a/docs/ru/operations/utilities/clickhouse-obfuscator.md b/docs/ru/operations/utilities/clickhouse-obfuscator.md
new file mode 100644
index 00000000000..a52d538965b
--- /dev/null
+++ b/docs/ru/operations/utilities/clickhouse-obfuscator.md
@@ -0,0 +1,43 @@
+# Обфускатор ClickHouse
+
+Простой инструмент для обфускации табличных данных.
+
+Он считывает данные входной таблицы и создает выходную таблицу, которая сохраняет некоторые свойства входных данных, но при этом содержит другие данные.
+
+Это позволяет публиковать практически реальные данные и использовать их в тестах на производительность.
+
+Обфускатор предназначен для сохранения следующих свойств данных:
+- кардинальность (количество уникальных данных) для каждого столбца и каждого кортежа столбцов;
+- условная кардинальность: количество уникальных данных одного столбца в соответствии со значением другого столбца;
+- вероятностные распределения абсолютного значения целых чисел; знак числа типа Int; показатель степени и знак для чисел с плавающей запятой;
+- вероятностное распределение длины строк;
+- вероятность нулевых значений чисел; пустые строки и массивы, `NULL`;
+- степень сжатия данных алгоритмом LZ77 и семейством энтропийных  кодеков;
+
+- непрерывность (величина разницы) значений времени в таблице; непрерывность значений с плавающей запятой;
+- дату из значений `DateTime`;
+
+- кодировка UTF-8 значений строки;
+- строковые значения выглядят естественным образом.
+
+
+Большинство перечисленных выше свойств пригодны для тестирования производительности. Чтение данных, фильтрация, агрегирование и сортировка будут работать почти с той же скоростью, что и исходные данные, благодаря сохраненной кардинальности, величине, степени сжатия и т. д.
+
+Он работает детерминированно. Вы задаёте значение инициализатора, а преобразование полностью определяется входными данными и инициализатором.
+
+Некоторые преобразования выполняются один к одному, и их можно отменить. Поэтому нужно использовать большое значение инициализатора и хранить его в секрете.
+
+
+Обфускатор использует некоторые криптографические примитивы для преобразования данных, но, с криптографической точки зрения, результат будет небезопасным. В нем могут сохраниться данные, которые не следует публиковать.
+
+
+Он всегда оставляет без изменений числа 0, 1, -1, даты, длины массивов и нулевые флаги.
+Например, если у вас есть столбец `IsMobile` в таблице со значениями 0 и 1, то в преобразованных данных он будет иметь то же значение.
+
+Таким образом, пользователь сможет посчитать точное соотношение мобильного трафика.
+
+Давайте рассмотрим случай, когда у вас есть какие-то личные данные в таблице (например,  электронная почта пользователя), и вы не хотите их публиковать.
+Если ваша таблица достаточно большая и содержит несколько разных электронных почтовых адресов, и ни один из них не встречается часто, то обфускатор полностью анонимизирует все данные. Но, если у вас есть небольшое количество разных значений в столбце, он может скопировать некоторые из них.
+В этом случае вам следует посмотреть на алгоритм работы инструмента и настроить параметры командной строки.
+
+Обфускатор полезен в работе со средним объемом данных (не менее 1000 строк).

From e76f7c316b85a69bf7a1fd2493de991e6e92e1ca Mon Sep 17 00:00:00 2001
From: Anna <42538400+adevyatova@users.noreply.github.com>
Date: Mon, 23 Nov 2020 16:11:15 +0300
Subject: [PATCH 99/99] DOCSUP-4280: Update the SELECT query (#17231)

* Add description for column modifiers

* Update index.md

* Update docs/en/sql-reference/statements/select/index.md

* Update docs/en/sql-reference/statements/select/index.md

Co-authored-by: BayoNet <da-daos@yandex.ru>
---
 .../sql-reference/statements/select/index.md  | 109 +++++++++++++++++-
 1 file changed, 108 insertions(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/statements/select/index.md b/docs/en/sql-reference/statements/select/index.md
index 901b850fc46..fb1548f0abb 100644
--- a/docs/en/sql-reference/statements/select/index.md
+++ b/docs/en/sql-reference/statements/select/index.md
@@ -159,4 +159,111 @@ If the query omits the `DISTINCT`, `GROUP BY` and `ORDER BY` clauses and the `IN
 
 For more information, see the section “Settings”. It is possible to use external sorting (saving temporary tables to a disk) and external aggregation.
 
-{## [Original article](https://clickhouse.tech/docs/en/sql-reference/statements/select/) ##}
+## SELECT modifiers {#select-modifiers}
+
+You can use the following modifiers in `SELECT` queries.
+
+### APPLY {#apply-modifier}
+
+Allows you to invoke some function for each row returned by an outer table expression of a query. 
+
+**Syntax:**
+
+``` sql
+SELECT <expr> APPLY( <func> ) FROM [db.]table_name
+```
+
+**Example:** 
+
+``` sql
+CREATE TABLE columns_transformers (i Int64, j Int16, k Int64) ENGINE = MergeTree ORDER by (i);
+INSERT INTO columns_transformers VALUES (100, 10, 324), (120, 8, 23);
+SELECT * APPLY(sum) FROM columns_transformers;
+```
+
+```
+┌─sum(i)─┬─sum(j)─┬─sum(k)─┐
+│    220 │     18 │    347 │
+└────────┴────────┴────────┘
+```
+
+### EXCEPT {#except-modifier}
+
+Specifies the names of one or more columns to exclude from the result. All matching column names are omitted from the output.
+
+**Syntax:**
+
+``` sql
+SELECT <expr> EXCEPT ( col_name1 [, col_name2, col_name3, ...] ) FROM [db.]table_name
+```
+
+**Example:**
+
+``` sql
+SELECT * EXCEPT (i) from columns_transformers;
+```
+
+```
+┌──j─┬───k─┐
+│ 10 │ 324 │
+│  8 │  23 │
+└────┴─────┘
+```
+
+### REPLACE {#replace-modifier}
+
+Specifies one or more [expression aliases](../../../sql-reference/syntax.md#syntax-expression_aliases). Each alias must match a column name from the `SELECT *` statement. In the output column list, the column that matches the alias is replaced by the expression in that `REPLACE`.
+
+This modifier does not change the names or order of columns. However, it can change the value and the value type.
+
+**Syntax:**
+
+``` sql
+SELECT <expr> REPLACE( <expr> AS col_name) from [db.]table_name
+```
+
+**Example:**
+
+``` sql
+SELECT * REPLACE(i + 1 AS i) from columns_transformers;
+```
+
+```
+┌───i─┬──j─┬───k─┐
+│ 101 │ 10 │ 324 │
+│ 121 │  8 │  23 │
+└─────┴────┴─────┘
+```
+
+### Modifier Combinations {#modifier-combinations}
+
+You can use each modifier separately or combine them.
+
+**Examples:**
+
+Using the same modifier multiple times.
+
+``` sql
+SELECT COLUMNS('[jk]') APPLY(toString) APPLY(length) APPLY(max) from columns_transformers;
+```
+
+```
+┌─max(length(toString(j)))─┬─max(length(toString(k)))─┐
+│                        2 │                        3 │
+└──────────────────────────┴──────────────────────────┘
+```
+
+Using multiple modifiers in a single query.
+
+``` sql
+SELECT * REPLACE(i + 1 AS i) EXCEPT (j) APPLY(sum) from columns_transformers;
+```
+
+```
+┌─sum(plus(i, 1))─┬─sum(k)─┐
+│             222 │    347 │
+└─────────────────┴────────┘
+```
+
+[Original article](https://clickhouse.tech/docs/en/sql-reference/statements/select/)
+<!--hide-->